diff options
| author | csalter | 2005-06-07 04:31:53 +0000 |
|---|---|---|
| committer | csalter | 2005-06-07 04:31:53 +0000 |
| commit | 03741ab7660cbb069a1a4138f6ed33b0a9d91ab8 (patch) | |
| tree | f8bfeae6f63ceefab49f17b2d152f1252cf97270 /bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core | |
| parent | 1c0cccec92f521b3e22cb1da405fe5461c2e4306 (diff) | |
| download | webtools.sourceediting-03741ab7660cbb069a1a4138f6ed33b0a9d91ab8.tar.gz webtools.sourceediting-03741ab7660cbb069a1a4138f6ed33b0a9d91ab8.tar.xz webtools.sourceediting-03741ab7660cbb069a1a4138f6ed33b0a9d91ab8.zip | |
changed IdResolver to URIResolver
Diffstat (limited to 'bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core')
| -rw-r--r-- | bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDModelBuilder.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDModelBuilder.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDModelBuilder.java index 259547ef55..ff9aaac900 100644 --- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDModelBuilder.java +++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDModelBuilder.java @@ -19,6 +19,8 @@ import org.eclipse.emf.ecore.EEnumLiteral; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver; +import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin; import org.eclipse.wst.dtd.core.internal.DTDCoreMessages; import org.eclipse.wst.dtd.core.internal.emf.DTDAnyContent; import org.eclipse.wst.dtd.core.internal.emf.DTDAttribute; @@ -59,8 +61,6 @@ import org.eclipse.wst.dtd.core.internal.saxparser.ElementDecl; import org.eclipse.wst.dtd.core.internal.saxparser.EntityDecl; import org.eclipse.wst.dtd.core.internal.saxparser.ErrorMessage; import org.eclipse.wst.dtd.core.internal.saxparser.NotationDecl; -import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver; -import org.eclipse.wst.xml.uriresolver.internal.util.IdResolverImpl; public class DTDModelBuilder extends DTDSaxArtifactVisitor { DTD dtd; @@ -261,8 +261,8 @@ public class DTDModelBuilder extends DTDSaxArtifactVisitor { String systemId = entityDecl.getSystemId(); String publicId = entityDecl.getPublicId(); if (systemId != null) { - IdResolver idResolver = new IdResolverImpl(dtd.getName()); - String uri = idResolver.resolveId(publicId, systemId); + URIResolver idResolver = URIResolverPlugin.createResolver(); + String uri = idResolver.resolve(dtd.getName(), publicId, systemId); ExternalDTDModel ed = dtdUtil.getExternalDTDModel(resources, uri); if (ed != null) { DTDFile referenceDtdFile = ed.getExternalDTDFile(); |