GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
diff -u -r1.14 -r1.15
--- Main.java 17 Oct 2006 23:20:17 -0000 1.14
+++ Main.java 14 Dec 2007 21:48:14 -0000 1.15
@@ -8,16 +8,18 @@
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
+
import javax.swing.filechooser.FileFilter;
+
import org.jdom.Document;
import org.jdom.input.SAXBuilder;
import org.jdom.output.Format;
import org.jdom.output.XMLOutputter;
-import org.lcsim.util.xml.ElementFactory;
-import org.lcsim.geometry.compact.Detector;
+import org.lcsim.geometry.compact.ClasspathEntityResolver;
import org.lcsim.geometry.compact.CompactReader;
+import org.lcsim.geometry.compact.Detector;
import org.lcsim.geometry.compact.converter.Converter;
-import org.lcsim.util.cache.CachingEntityResolver;
+import org.lcsim.util.xml.ElementFactory;
/**
*
@@ -61,7 +63,7 @@
stream.close();
SAXBuilder builder = new SAXBuilder();
- builder.setEntityResolver(new CachingEntityResolver());
+ builder.setEntityResolver(new ClasspathEntityResolver("/org/lcsim"));
builder.setValidation(true);
builder.setFeature("http://apache.org/xml/features/validation/schema",true);
builder.build(new ByteArrayInputStream(stream.toByteArray()));