|
Lines 65-70
Link Here
|
| 65 |
import org.netbeans.modules.xml.retriever.RetrieveEntry; |
65 |
import org.netbeans.modules.xml.retriever.RetrieveEntry; |
| 66 |
import org.netbeans.modules.xml.retriever.XMLCatalogProvider; |
66 |
import org.netbeans.modules.xml.retriever.XMLCatalogProvider; |
| 67 |
import org.netbeans.modules.xml.retriever.catalog.CatalogWriteModel; |
67 |
import org.netbeans.modules.xml.retriever.catalog.CatalogWriteModel; |
|
|
68 |
import org.netbeans.modules.xml.retriever.catalog.Utilities; |
| 68 |
import org.netbeans.modules.xml.retriever.catalog.Utilities.DocumentTypesEnum; |
69 |
import org.netbeans.modules.xml.retriever.catalog.Utilities.DocumentTypesEnum; |
| 69 |
import org.openide.filesystems.FileObject; |
70 |
import org.openide.filesystems.FileObject; |
| 70 |
import org.openide.filesystems.FileUtil; |
71 |
import org.openide.filesystems.FileUtil; |
|
Lines 123-130
Link Here
|
| 123 |
} |
124 |
} |
| 124 |
URI cfuri = null; |
125 |
URI cfuri = null; |
| 125 |
if(!relativePathToCatalogFile.isAbsolute()){ |
126 |
if(!relativePathToCatalogFile.isAbsolute()){ |
| 126 |
FileObject prjRtFO = prj.getProjectDirectory(); |
127 |
if (prj != null) { |
| 127 |
cfuri = FileUtil.toFile(prjRtFO).toURI().resolve(relativePathToCatalogFile); |
128 |
FileObject prjRtFO = prj.getProjectDirectory(); |
|
|
129 |
cfuri = FileUtil.toFile(prjRtFO).toURI().resolve(relativePathToCatalogFile); |
| 130 |
} else { |
| 131 |
// For Maven based projects the project directory doesn't contain cached catalogs. |
| 132 |
// In these cases should be used catalog.xml within destination directory. |
| 133 |
cfuri = destinationDir.getParent().getURL().toURI().resolve(Utilities.PRIVATE_CATALOG_URI_STR); |
| 134 |
} |
| 128 |
}else{ |
135 |
}else{ |
| 129 |
cfuri = relativePathToCatalogFile; |
136 |
cfuri = relativePathToCatalogFile; |
| 130 |
} |
137 |
} |