X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmir%2Futil%2FXMLReader.java;h=19628c8e187118072eed629cd65269e15c48a96a;hb=ec1cfb8a6514978753009168cca91f64a70c6691;hp=6b53f8e1bf583628830f8d17eb5f946cec26696d;hpb=0af4c00cb9990c3d6f365413f00654b2851f6071;p=mir.git

diff --git a/source/mir/util/XMLReader.java b/source/mir/util/XMLReader.java
index 6b53f8e1..19628c8e 100755
--- a/source/mir/util/XMLReader.java
+++ b/source/mir/util/XMLReader.java
@@ -1,319 +1,345 @@
-/*
- * Copyright (C) 2001, 2002  The Mir-coders group
- *
- * This file is part of Mir.
- *
- * Mir is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Mir is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mir; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
- */
-
-package mir.util;
-
-import java.io.*;
-import java.util.*;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-
-import multex.Failure;
-import multex.Exc;
-
-public class XMLReader {
-  private Locator locator;
-  private String filename;
-
-  public void parseFile(String aFileName, SectionHandler aRootHandler, List aUsedFiles) throws XMLReaderFailure, XMLReaderExc {
-    try {
-      SAXParserFactory parserFactory = SAXParserFactory.newInstance();
-
-      parserFactory.setNamespaceAware(false);
-      parserFactory.setValidating(true);
-
-      XMLReaderHandler handler = new XMLReaderHandler(parserFactory, aRootHandler, aUsedFiles);
-
-      handler.includeFile(aFileName);
-    }
-    catch (Throwable e) {
-      Throwable t = getRootCause(e);
-
-      if (t instanceof XMLReaderExc) {
-        ((XMLReaderExc) t).setLocation(filename, locator.getLineNumber(), locator.getColumnNumber());
-        throw (XMLReaderExc) t;
-      }
-
-      if (t instanceof XMLReaderFailure) {
-        throw (XMLReaderFailure) t;
-      }
-
-      throw new XMLReaderFailure(t);
-    }
-  }
-
-  private Throwable getRootCause(Throwable t) {
-    if (t instanceof SAXParseException && ((SAXParseException) t).getException()!=null) {
-      return getRootCause(((SAXParseException) t).getException());
-    }
-    else if (t instanceof Failure && ((Failure) t).getCause()!=null) {
-      return getRootCause(((Failure) t).getCause());
-    }
-    else return t;
-  }
-
-  private class XMLReaderHandler extends DefaultHandler {
-    private Stack includeFileStack;
-    private SAXParserFactory parserFactory;
-    private SectionsManager manager;
-    private List usedFiles;
-    private InputSource inputSource;
-
-    public XMLReaderHandler(SAXParserFactory aParserFactory, SectionHandler aRootHandler, List aUsedFiles) {
-      super();
-
-      includeFileStack=new Stack();
-      parserFactory=aParserFactory;
-      includeFileStack = new Stack();
-      manager = new SectionsManager();
-      usedFiles = aUsedFiles;
-      manager.pushHandler(aRootHandler);
-   }
-
-    public String getLocatorDescription(Locator aLocator) {
-      return aLocator.getPublicId()+" ("+aLocator.getLineNumber()+")";
-    }
-
-    public void setDocumentLocator(Locator aLocator) {
-      locator=aLocator;
-    }
-
-    private void includeFile(String aFileName) throws XMLReaderExc, XMLReaderFailure, SAXParseException, SAXException {
-      File file;
-      SAXParser parser;
-
-      try {
-        if (!includeFileStack.empty())
-          file = new File(new File((String) includeFileStack.peek()).getParent(), aFileName);
-        else
-          file = new File(aFileName);
-
-        System.err.println("about to include "+file.getCanonicalPath());
-
-        if (includeFileStack.contains(file.getCanonicalPath())) {
-          throw new XMLReaderExc("recursive inclusion of file "+file.getCanonicalPath());
-        }
-
-        usedFiles.add(file);
-
-        parser=parserFactory.newSAXParser();
-
-        inputSource = new InputSource(new FileInputStream(file));
-        inputSource.setPublicId(file.getCanonicalPath());
-
-        includeFileStack.push(file.getCanonicalPath());
-        filename = file.getCanonicalPath();
-        try {
-          parser.parse(inputSource, this);
-        }
-        finally {
-          includeFileStack.pop();
-        }
-        if (!includeFileStack.empty())
-          filename = (String) includeFileStack.peek();
-      }
-      catch (ParserConfigurationException e) {
-        throw new XMLReaderExc("Internal exception while including \""+aFileName+"\": "+e.getMessage());
-      }
-      catch (SAXParseException e) {
-        throw e;
-      }
-      catch (XMLReaderFailure e) {
-        throw e;
-      }
-      catch (FileNotFoundException e) {
-        throw new XMLReaderExc("Include file \""+aFileName+"\" not found: "+e.getMessage());
-      }
-      catch (IOException e) {
-        throw new XMLReaderExc("unable to open include file \""+aFileName+"\": "+e.getMessage());
-      }
-    }
-
-    public void startElement(String aUri, String aTag, String aQualifiedName, Attributes anAttributes) throws SAXException {
-      Map attributesMap;
-      int i;
-
-      try {
-        if (aQualifiedName.equals("include")) {
-          String fileName=anAttributes.getValue("file");
-
-          if (fileName==null) {
-            throw new XMLReaderExc("include has no file attribute");
-          }
-
-          includeFile(fileName);
-        }
-        else {
-          attributesMap = new HashMap();
-          for (i=0; i<anAttributes.getLength(); i++)
-            attributesMap.put(anAttributes.getQName(i), anAttributes.getValue(i));
-
-          SectionHandler handler = manager.currentHandler().startElement(aQualifiedName, attributesMap);
-
-          manager.pushHandler( handler );
-        }
-      }
-      catch (XMLReaderExc e) {
-        throw new SAXParseException(e.getMessage(), null, e);
-      }
-      catch (Exception e) {
-        throw new SAXException(e);
-      }
-    }
-
-    public void endElement(String aUri, String aTag, String aQualifiedName) throws SAXException {
-      try
-      {
-        if (!aQualifiedName.equals("include")) {
-          SectionHandler handler = manager.popHandler();
-
-          handler.finishSection();
-
-          if (!manager.isEmpty()) {
-            manager.currentHandler().endElement(handler);
-          }
-        }
-      }
-      catch (XMLReaderExc e) {
-        throw new SAXParseException(e.getMessage(), null, e);
-      }
-      catch (Exception e) {
-        throw new SAXException(e);
-      }
-    }
-
-    public void characters(char[] aBuffer, int aStart, int anEnd) throws SAXParseException {
-      String text = new String(aBuffer, aStart, anEnd).trim();
-      if ( text.length() > 0) {
-        throw new SAXParseException("Text not allowed", null, new XMLReaderExc("Text not allowed"));
-      }
-    }
-  }
-
-  private class SectionsManager {
-    Stack handlerStack;
-
-    public SectionsManager() {
-      handlerStack = new Stack();
-    }
-
-    public void pushHandler(SectionHandler aSectionHandler) {
-      handlerStack.push(aSectionHandler);
-    }
-
-    public SectionHandler popHandler() {
-      return (SectionHandler) handlerStack.pop();
-    }
-
-    public SectionHandler currentHandler() {
-      return (SectionHandler) handlerStack.peek();
-    }
-
-    public boolean isEmpty() {
-      return handlerStack.isEmpty();
-    }
-  }
-
-  public static interface SectionHandler {
-    public abstract SectionHandler startElement(String aTag, Map anAttributes) throws XMLReaderExc;
-
-    public abstract void endElement(SectionHandler aHandler) throws XMLReaderExc;
-
-    public void finishSection() throws XMLReaderExc;
-  }
-
-  public static abstract class AbstractSectionHandler implements SectionHandler {
-    public SectionHandler startElement(String aTag, Map anAttributes) throws XMLReaderExc {
-      return null;
-    };
-
-    public void endElement(SectionHandler aHandler) throws XMLReaderExc {
-    };
-
-    public void finishSection() throws XMLReaderExc {
-    }
-  }
-
-  public static class XMLReaderExc extends Exc {
-    private boolean hasLocation;
-    private String filename;
-    private int lineNr;
-    private int columnNr;
-
-    public XMLReaderExc(String aMessage) {
-      super(aMessage);
-      hasLocation = false;
-    }
-
-    protected void setLocation(String aFilename, int aLineNr, int aColumnNr) {
-      filename = aFilename;
-      lineNr = aLineNr;
-      columnNr = aColumnNr;
-      hasLocation = true;
-    }
-
-    public boolean getHasLocation() {
-      return hasLocation;
-    }
-
-    public int getLineNr() {
-      return lineNr;
-    }
-
-    public int getColumnNr() {
-      return columnNr;
-    }
-
-    public String getFilename() {
-      return filename;
-    }
-  }
-
-  public static class XMLReaderFailure extends Failure {
-    public XMLReaderFailure(String aMessage, Throwable aCause) {
-      super(aMessage, aCause);
-    }
-
-    public XMLReaderFailure(Throwable aCause) {
-      super(aCause.getMessage(), aCause);
-    }
-  }
-
+/*
+ * Copyright (C) 2001, 2002 The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your version.
+ */
+package mir.util;
+
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Stack;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import multex.Exc;
+import multex.Failure;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.DefaultHandler;
+
+public class XMLReader {
+  private Locator locator;
+  private String filename;
+  private boolean namespaceAware;
+
+  public XMLReader() {
+    this(false);
+  }
+
+  public XMLReader(boolean aNameSpaceAware) {
+    namespaceAware = aNameSpaceAware;
+    filename="";
+  }
+
+  public void parseFile(String aFileName, SectionHandler aRootHandler) throws XMLReaderFailure, XMLReaderExc {
+    filename= aFileName;
+    try {
+      parseInputStream(new FileInputStream(aFileName), aRootHandler);
+    }
+    catch (Throwable t) {
+      throw new XMLReaderFailure(t);
+    }
+  }
+
+  public void parseInputStream(InputStream anInputStream, SectionHandler aRootHandler) throws XMLReaderFailure, XMLReaderExc {
+    try {
+      SAXParserFactory parserFactory = SAXParserFactory.newInstance();
+
+      parserFactory.setNamespaceAware(true);
+      parserFactory.setValidating(true);
+
+      XMLReaderHandler handler = new XMLReaderHandler(parserFactory, aRootHandler);
+
+      handler.processInputStream(anInputStream);
+    }
+    catch (Throwable e) {
+      Throwable t = ExceptionFunctions.traceCauseException(e);
+
+      if (t instanceof XMLReaderExc) {
+        if (locator!=null && filename!=null)
+          ((XMLReaderExc) t).setLocation(filename, locator.getLineNumber(), locator.getColumnNumber());
+        throw (XMLReaderExc) t;
+      }
+
+      if (t instanceof XMLReaderFailure) {
+        throw (XMLReaderFailure) t;
+      }
+
+      throw new XMLReaderFailure(t);
+    }
+  }
+
+  private class XMLReaderHandler extends DefaultHandler {
+    private SAXParserFactory parserFactory;
+    private SectionsManager manager;
+    private InputSource inputSource;
+
+    public XMLReaderHandler(SAXParserFactory aParserFactory, SectionHandler aRootHandler) {
+      super();
+
+      parserFactory=aParserFactory;
+      manager = new SectionsManager();
+      manager.pushHandler(aRootHandler);
+   }
+
+    public void setDocumentLocator(Locator aLocator) {
+      locator=aLocator;
+    }
+
+    private void processInputStream(InputStream anInputStream) throws XMLReaderExc, XMLReaderFailure {
+      try {
+        SAXParser parser=parserFactory.newSAXParser();
+
+        inputSource = new InputSource(anInputStream);
+        parser.parse(inputSource, this);
+      }
+      catch (ParserConfigurationException e) {
+        throw new XMLReaderExc("Internal exception: "+e.getMessage());
+      }
+      catch (Throwable e) {
+        throw new XMLReaderFailure(e);
+      }
+    }
+
+    public void startElement(String aUri, String aLocalName, String aQualifiedName, Attributes anAttributes) throws SAXException {
+      Map attributesMap;
+      int i;
+
+      try {
+        attributesMap = new HashMap();
+
+        if (namespaceAware)
+          for (i=0; i<anAttributes.getLength(); i++)
+            attributesMap.put(new XMLName(anAttributes.getURI(i), anAttributes.getLocalName(i)), anAttributes.getValue(i));
+        else
+          for (i=0; i<anAttributes.getLength(); i++)
+            attributesMap.put(anAttributes.getLocalName(i), anAttributes.getValue(i));
+
+        SectionHandler handler = manager.currentHandler().startElement(new XMLName(aUri, aLocalName), attributesMap);
+
+        manager.pushHandler( handler );
+      }
+      catch (XMLReaderExc e) {
+        throw new SAXParseException(e.getMessage(), null, e);
+      }
+      catch (Exception e) {
+        throw new SAXException(e);
+      }
+    }
+
+    public void endElement(String aUri, String aLocalName, String aQualifiedName) throws SAXException {
+      try
+      {
+        if (!aQualifiedName.equals("include")) {
+          SectionHandler handler = manager.popHandler();
+
+          handler.finishSection();
+
+          if (!manager.isEmpty()) {
+            manager.currentHandler().endElement(handler);
+          }
+        }
+      }
+      catch (XMLReaderExc e) {
+        throw new SAXParseException(e.getMessage(), null, e);
+      }
+      catch (Exception e) {
+        throw new SAXException(e);
+      }
+    }
+
+    public void characters(char[] aBuffer, int aStart, int anEnd) throws SAXException {
+      try {
+        String text = new String(aBuffer, aStart, anEnd);
+
+        manager.currentHandler().characters(text);
+      }
+      catch (XMLReaderExc e) {
+        throw new SAXParseException(e.getMessage(), null, e);
+      }
+      catch (Exception e) {
+        throw new SAXException(e);
+      }
+    }
+  }
+
+  private class SectionsManager {
+    Stack handlerStack;
+
+    public SectionsManager() {
+      handlerStack = new Stack();
+    }
+
+    public void pushHandler(SectionHandler aSectionHandler) {
+      handlerStack.push(aSectionHandler);
+    }
+
+    public SectionHandler popHandler() {
+      return (SectionHandler) handlerStack.pop();
+    }
+
+    public SectionHandler currentHandler() {
+      return (SectionHandler) handlerStack.peek();
+    }
+
+    public boolean isEmpty() {
+      return handlerStack.isEmpty();
+    }
+  }
+
+  public static interface SectionHandler {
+    public abstract SectionHandler startElement(XMLName aTag, Map anAttributes) throws XMLReaderExc;
+
+    public abstract void endElement(SectionHandler aHandler) throws XMLReaderExc;
+
+    public void characters(String aCharacters) throws XMLReaderExc;
+
+    public void finishSection() throws XMLReaderExc;
+  }
+
+  public static abstract class AbstractSectionHandler implements SectionHandler {
+    public SectionHandler startElement(XMLName aTag, Map anAttributes) throws XMLReaderExc {
+      return startElement(aTag.getLocalName(), anAttributes);
+    };
+
+    public SectionHandler startElement(String aLocalName, Map anAttributes) throws XMLReaderExc {
+      return null;
+    };
+
+    public void endElement(SectionHandler aHandler) throws XMLReaderExc {
+    };
+
+    public void finishSection() throws XMLReaderExc {
+    }
+
+    public void characters(String aCharacters) throws XMLReaderExc {
+      if ( aCharacters.trim().length() > 0) {
+        throw new XMLReaderExc("Text not allowed");
+      }
+    }
+  }
+
+  public static class XMLReaderExc extends Exc {
+    private boolean hasLocation;
+    private String filename;
+    private int lineNr;
+    private int columnNr;
+
+    public XMLReaderExc(String aMessage) {
+      super(aMessage);
+      hasLocation = false;
+    }
+
+    protected void setLocation(String aFilename, int aLineNr, int aColumnNr) {
+      filename = aFilename;
+      lineNr = aLineNr;
+      columnNr = aColumnNr;
+      hasLocation = true;
+    }
+
+    public boolean getHasLocation() {
+      return hasLocation;
+    }
+
+    public int getLineNr() {
+      return lineNr;
+    }
+
+    public int getColumnNr() {
+      return columnNr;
+    }
+
+    public String getFilename() {
+      return filename;
+    }
+  }
+
+  public static class XMLReaderFailure extends Failure {
+    public XMLReaderFailure(String aMessage, Throwable aCause) {
+      super(aMessage, aCause);
+    }
+
+    public XMLReaderFailure(Throwable aCause) {
+      super(aCause.getMessage(), aCause);
+    }
+  }
+
+  public static class XMLName {
+    private String namespaceURI;
+    private String localName;
+
+    public XMLName(String aLocalName) {
+      this(aLocalName, null);
+    }
+
+    public XMLName(String aNamespaceURI, String aLocalName) {
+      namespaceURI = aNamespaceURI;
+      localName = aLocalName;
+    }
+
+    public String getNamespaceURI() {
+      return namespaceURI;
+    }
+
+    public String getLocalName() {
+      return localName;
+    }
+
+    public int hashCode() {
+      if (namespaceURI == null)
+        return localName.hashCode();
+      else
+        return localName.hashCode() + 3*namespaceURI.hashCode();
+    }
+
+    public String toString() {
+      return namespaceURI+":"+localName;
+    }
+
+    public boolean equals(Object anObject) {
+      if (anObject instanceof XMLName) {
+        if (namespaceURI==null)
+          return (((XMLName) anObject).namespaceURI == null) &&
+                 localName.equals(((XMLName) anObject).localName);
+        else
+          return namespaceURI.equals(((XMLName) anObject).namespaceURI) &&
+                 localName.equals(((XMLName) anObject).localName);
+      }
+      else
+        return false;
+    }
+  }
+
 }
\ No newline at end of file