Author: scabanovich Date: 2007-07-20 09:45:42 -0400 (Fri, 20 Jul 2007) New Revision: 2549 Removed: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XMLEntityResolver.java Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/MetaLibLoader.java Log: EXIN-86 deprecated XMLEntityResolver removed Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/MetaLibLoader.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/MetaLibLoader.java 2007-07-20 13:45:10 UTC (rev 2548) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/MetaLibLoader.java 2007-07-20 13:45:42 UTC (rev 2549) @@ -20,13 +20,14 @@ import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.model.util.*; +import org.jboss.tools.common.xml.XMLEntityResolver; public class MetaLibLoader { public static String DOC_PUBLICID = "-//Red Hat, Inc.//DTD Meta 1.0//EN"; static { try { - Class c = MetaLibLoader.class; + Class<?> c = MetaLibLoader.class; XMLEntityResolver.registerPublicEntity(DOC_PUBLICID, FileLocator.resolve(c.getResource("/meta/meta.dtd")).toString()); } catch (Exception e) { ModelPlugin.getPluginLog().logError(e); Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XMLEntityResolver.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XMLEntityResolver.java 2007-07-20 13:45:10 UTC (rev 2548) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XMLEntityResolver.java 2007-07-20 13:45:42 UTC (rev 2549) @@ -1,39 +0,0 @@ -/** - * @deprecated - */ - -package org.jboss.tools.common.model.util; - -import org.xml.sax.*; - -public class XMLEntityResolver implements EntityResolver { - - public static void registerPublicEntity(String publicId, String url) { - org.jboss.tools.common.xml.XMLEntityResolver.registerPublicEntity(publicId, url); - } - - public static void registerSystemEntity(String systemId, String url) { - org.jboss.tools.common.xml.XMLEntityResolver.registerSystemEntity(systemId, url); - } - - public static EntityResolver getInstance() { - return new XMLEntityResolver(); - } - - EntityResolver impl; - - private XMLEntityResolver() { - impl = getInstance(); - } - - public InputSource resolveEntity(String publicId, String systemId) - throws SAXException, java.io.IOException { - return impl.resolveEntity(publicId, systemId); - } - - public InputSource resolveEntity2(String publicId, String systemId) - throws SAXException, java.io.IOException { - return impl.resolveEntity(publicId, systemId); - } - -} \ No newline at end of file