From c17d2165ea20325fc78f95791875ffa4c785e548 Mon Sep 17 00:00:00 2001 From: "David A. Madore" Date: Sat, 3 Sep 2011 13:15:49 +0200 Subject: Remove now useless cruft ("daml magic" URLs). --- org/madore/damlengine/Resolver.java | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/org/madore/damlengine/Resolver.java b/org/madore/damlengine/Resolver.java index fa2f188..fdbfe97 100644 --- a/org/madore/damlengine/Resolver.java +++ b/org/madore/damlengine/Resolver.java @@ -117,27 +117,6 @@ public final class Resolver return systemId; } - protected String damlMagic(String uri) { - if ( uri.equals("x-daml-magic://daml/weblog/doindex.xml") ) - return "IGNORE"; - else if ( uri.equals("x-daml-magic://daml/weblog/domaxentries.xml") ) - return "INCLUDE"; - else if ( uri.equals("x-daml-magic://daml/weblog/maxentries.xml") ) - return "20"; - else if ( uri.equals("x-daml-magic://daml/weblog/domonth.xml") ) - return "IGNORE"; - else if ( uri.equals("x-daml-magic://daml/weblog/month.xml") ) - return ""; - else if ( uri.equals("x-daml-magic://daml/weblog/docategory.xml") ) - return "IGNORE"; - else if ( uri.equals("x-daml-magic://daml/weblog/category-en.xml") ) - return ""; - else if ( uri.equals("x-daml-magic://daml/weblog/category-fr.xml") ) - return ""; - else - return null; - } - // Interface LSResourceResolver public LSInput resolveResource(String type, @@ -145,10 +124,6 @@ public final class Resolver String publicId, String systemId, String baseURI) { - String str = damlMagic(systemId); - if ( str != null ) - return new DOMInputImpl(publicId, systemId, baseURI, - str, "UTF-8"); String resolved = resolve(namespaceURI, publicId, systemId, baseURI); return new DOMInputImpl(publicId, resolved, baseURI); } @@ -157,12 +132,6 @@ public final class Resolver public InputSource resolveEntity(String publicId, String systemId) throws SAXException { - String str = damlMagic(systemId); - if ( str != null ) { - InputSource source = new InputSource(new StringReader(str)); - source.setPublicId(publicId); - return source; - } String resolved = resolve(null, publicId, systemId, null); InputSource source = new InputSource(resolved); source.setPublicId(publicId); @@ -174,12 +143,6 @@ public final class Resolver public InputSource resolveEntity(String name, String publicId, String baseURI, String systemId) throws SAXException { - String str = damlMagic(systemId); - if ( str != null ) { - InputSource source = new InputSource(new StringReader(str)); - source.setPublicId(publicId); - return source; - } String resolved = resolve(null, publicId, systemId, baseURI); InputSource source = new InputSource(resolved); source.setPublicId(publicId); -- cgit v1.2.3