moved parts of XML parsing into shared library

[javainspect.git] / src / main / java / eu / svjatoslav / inspector / xml / xsd / XSD.java

diff --git a/src/main/java/eu/svjatoslav/inspector/xml/xsd/XSD.java b/src/main/java/eu/svjatoslav/inspector/xml/xsd/XSD.java
index 3d5ff45..2b60bf4 100644 (file)
--- a/src/main/java/eu/svjatoslav/inspector/xml/xsd/XSD.java
+++ b/src/main/java/eu/svjatoslav/inspector/xml/xsd/XSD.java
@@ -1,19 +1,17 @@
 package eu.svjatoslav.inspector.xml.xsd;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
+import eu.svjatoslav.commons.data.xml.XmlElement;
+import eu.svjatoslav.commons.data.xml.XmlHelper;
+
 public class XSD {
 
        private static final String XMLNS_PREFIX = "xmlns:";
@@ -30,44 +28,16 @@ public class XSD {
                        }
        }
 
-       public void parse(final InputStream inputStream) {
-
-               final DocumentBuilderFactory builderFactory = DocumentBuilderFactory
-                               .newInstance();
-
-               DocumentBuilder builder = null;
-               try {
-                       builder = builderFactory.newDocumentBuilder();
-               } catch (final ParserConfigurationException e) {
-                       e.printStackTrace();
-               }
-
-               Document document;
-               try {
-                       document = builder.parse(inputStream);
-               } catch (final SAXException e) {
-                       e.printStackTrace();
-                       return;
-               } catch (final IOException e) {
-                       e.printStackTrace();
-                       return;
-               }
+       public void parse(final InputStream inputStream) throws SAXException,
+                       IOException, ParserConfigurationException {
 
-               final XmlElement xsdSchema = new XmlElement(
-                               document.getDocumentElement());
+               final XmlElement xsdSchema = XmlHelper.parseXml(inputStream);
 
                detectNamespaces(xsdSchema);
 
                System.out.println(xsdSchema.toString());
        }
 
-       public void parse(final String filePath) throws FileNotFoundException {
-
-               final FileInputStream inputStream = new FileInputStream(filePath);
-
-               parse(inputStream);
-       }
-
        @Override
        public String toString() {
                final StringBuffer result = new StringBuffer();