Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlgoubet2019-09-19 04:42:35 -0400
committerlgoubet2019-09-19 04:42:35 -0400
commit029f49dd7fd2d30120e778c4d73f973a227ef80a (patch)
tree5ec732b057cba9dd358a81503be289ff72cca3d3
parent92fc0d18d0f3d89ae41ea1e72943b2288be0e2b4 (diff)
downloadorg.eclipse.emf.compare-029f49dd7fd2d30120e778c4d73f973a227ef80a.tar.gz
org.eclipse.emf.compare-029f49dd7fd2d30120e778c4d73f973a227ef80a.tar.xz
org.eclipse.emf.compare-029f49dd7fd2d30120e778c4d73f973a227ef80a.zip
EMF Compare does not support relative xsi:schemaLocation declarations
-rw-r--r--plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/NotifyingParserPool.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/NotifyingParserPool.java b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/NotifyingParserPool.java
index 89452d4e9..54f3b5545 100644
--- a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/NotifyingParserPool.java
+++ b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/NotifyingParserPool.java
@@ -247,6 +247,9 @@ public class NotifyingParserPool extends XMLParserPoolImpl {
if (stringTokenizer.hasMoreTokens()) {
String value = stringTokenizer.nextToken();
URI uri = URI.createURI(value);
+ if (uri.isRelative()) {
+ uri = uri.resolve(delegateHelper.getResource().getURI());
+ }
for (Object listener : namespaceDeclarationListeners.getListeners()) {
((INamespaceDeclarationListener)listener).schemaLocationDeclared(key, uri);
}

Back to the top