SAX XML fixes

hansonr · hansonr · commit dd35a50cf7c1 · 2018-08-20T23:29:21.000-05:00
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1,5 +1 @@
-<<<<<<< HEAD
-20180820200147 
-=======
-20180820101854 
->>>>>>> branch 'yadav1' of https://github.com/BobHanson/java2script.git
+20180820232825 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/timestamp
@@ -1,5 +1 @@
-<<<<<<< HEAD
-20180820200147 
-=======
-20180820101854 
->>>>>>> branch 'yadav1' of https://github.com/BobHanson/java2script.git
+20180820232825 
diff --git a/sources/net.sf.j2s.java.core/src/javax/xml/parsers/SAXParserFactory.java b/sources/net.sf.j2s.java.core/src/javax/xml/parsers/SAXParserFactory.java
@@ -94,6 +94,11 @@ public SAXParser newSAXParser() {
 				for (Object name : props.keySet()) {
 					r.setProperty((String) name, props.getProperty((String)name));
 				}
+			} else if (p instanceof org.xml.sax.XMLReader) {
+				org.xml.sax.XMLReader r = (org.xml.sax.XMLReader) p;
+				for (Object name : props.keySet()) {
+					r.setProperty((String) name, props.getProperty((String)name));
+				}
 			}
 			return p;
 		} catch (Exception e) {
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSSAXParser.java b/sources/net.sf.j2s.java.core/src/swingjs/JSSAXParser.java
@@ -26,6 +26,7 @@
 import org.xml.sax.SAXNotSupportedException;
 import org.xml.sax.SAXParseException;
 import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.DefaultHandler;
 
 @SuppressWarnings({"deprecation"})
 public class JSSAXParser implements Parser, XMLReader {
@@ -62,7 +63,7 @@ public void setErrorHandler(ErrorHandler handler) {
 		this.errorHandler = handler;
 	}
 
-	public void parse(InputSource source, JSSAXContentHandler handler) throws SAXException, IOException {
+	public void parse(InputSource source, DefaultHandler handler) throws SAXException, IOException {
 		setContentHandler(handler);
 		parseSource(source);
 	}
@@ -122,12 +123,12 @@ private DOMNode parseXML(String data) {
 	 * @return reconfigured data
 	 */
 	private String removeProcessing(String data) {
-		if (data.indexOf("<?") >= 0) {
+		if (false && data.indexOf("<?") >= 0) { // doesn't seem to be necessary?
 			getUniqueSequence(data);
 			data = PT.rep(PT.rep(data,  "<?", "<![CDATA[" + uniqueSeq), "?>", "]]>");
 			if (data.startsWith("<!")) {
-				data = "<pre>" + data + "</pre>";
-				havePre = true;
+			data = "<pre>" + data + "</pre>";
+			havePre = true;
 			}
 		}
 	  return data;
@@ -153,8 +154,10 @@ private void error(Exception e) throws SAXException {
   private boolean ver2;
   
   
+	private static final int ELEMENT_TYPE = 1;
+
   /**
-   * early Jmol method allowing reading data from an XHTML document
+   * Using JQuery to reading data from an XHTML document
    * 
    * @param doc
    * @throws SAXException
@@ -167,7 +170,26 @@ private void parseDocument(DOMNode doc) throws SAXException {
 			contentHandler.startDocument();
 		else
 			docHandler.startDocument();
-		walkDOMTree((DOMNode) DOMNode.getAttr(doc, "firstChild"), havePre);
+		
+		// We must continue down until we have the root node.
+		
+		DOMNode element = (DOMNode) DOMNode.getAttr(doc, "firstChild");
+	
+		// skipping type 8 (processing directive) and type 10 (doctype) and anything
+		// that is not 1 (element)
+		
+		/**
+		 * @j2sNative
+		 * 
+		 * var type;
+		 * while (element && (type = element.nodeType) != 1) {
+		 *   element = element.nextSibling;
+		 *   }
+		 * 
+		 */
+		
+		
+		walkDOMTree(element, havePre);
 		if (ver2)
 			contentHandler.endDocument();
 		else

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,11 @@ public SAXParser newSAXParser() {`
`94`	`94`	`for (Object name : props.keySet()) {`
`95`	`95`	`r.setProperty((String) name, props.getProperty((String)name));`
`96`	`96`	`}`
	`97`	`+ } else if (p instanceof org.xml.sax.XMLReader) {`
	`98`	`+ org.xml.sax.XMLReader r = (org.xml.sax.XMLReader) p;`
	`99`	`+ for (Object name : props.keySet()) {`
	`100`	`+ r.setProperty((String) name, props.getProperty((String)name));`
	`101`	`+ }`
`97`	`102`	`}`
`98`	`103`	`return p;`
`99`	`104`	`} catch (Exception e) {`