You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mk...@apache.org on 2003/04/01 22:35:37 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/xsltc DOM.java DOMCache.java NodeIterator.java Translet.java TransletOutputHandler.java
mkwan 2003/04/01 12:35:37
Modified: java/src/org/apache/xalan/xsltc DOM.java DOMCache.java
NodeIterator.java Translet.java
Removed: java/src/org/apache/xalan/xsltc TransletOutputHandler.java
Log:
Merging XSLTC_DTM and common serializer to the head
Changes in org.apache.xalan.xsltc.
1. Remove TransletOutputHandler.java
2. Adapt the XSLTC interfaces to the DTM model.
Revision Changes Path
1.14 +40 -32 xml-xalan/java/src/org/apache/xalan/xsltc/DOM.java
Index: DOM.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/DOM.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DOM.java 21 Feb 2003 19:24:42 -0000 1.13
+++ DOM.java 1 Apr 2003 20:35:37 -0000 1.14
@@ -63,65 +63,65 @@
package org.apache.xalan.xsltc;
+import org.apache.xalan.xsltc.runtime.Hashtable;
+import org.apache.xml.dtm.DTMAxisIterator;
+
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.apache.xml.serializer.SerializationHandler;
+
public interface DOM {
public final static int FIRST_TYPE = 0;
public final static int NO_TYPE = -1;
- public final static int ROOT = 0;
- public final static int TEXT = 1;
- public final static int NAMESPACE = 2;
- public final static int ELEMENT = 3;
- public final static int ATTRIBUTE = 4;
- public final static int PROCESSING_INSTRUCTION = 5;
- public final static int COMMENT = 6;
-
- public final static int NTYPES = 7;
-
+
// 0 is reserved for NodeIterator.END
public final static int NULL = 0;
- // index of root node
- public final static int ROOTNODE = 1;
// used by some node iterators to know which node to return
public final static int RETURN_CURRENT = 0;
public final static int RETURN_PARENT = 1;
-
+
+ // Constants used by getResultTreeFrag to indicate the types of the RTFs.
+ public final static int SIMPLE_RTF = 0;
+ public final static int ADAPTIVE_RTF = 1;
+ public final static int TREE_RTF = 2;
+
/** returns singleton iterator containg the document root */
- public NodeIterator getIterator();
+ public DTMAxisIterator getIterator();
public String getStringValue();
-
- public NodeIterator getChildren(final int node);
- public NodeIterator getTypedChildren(final int type);
- public NodeIterator getAxisIterator(final int axis);
- public NodeIterator getTypedAxisIterator(final int axis, final int type);
- public NodeIterator getNthDescendant(int node, int n, boolean includeself);
- public NodeIterator getNamespaceAxisIterator(final int axis, final int ns);
- public NodeIterator getNodeValueIterator(NodeIterator iter, int returnType,
+
+ public DTMAxisIterator getChildren(final int node);
+ public DTMAxisIterator getTypedChildren(final int type);
+ public DTMAxisIterator getAxisIterator(final int axis);
+ public DTMAxisIterator getTypedAxisIterator(final int axis, final int type);
+ public DTMAxisIterator getNthDescendant(int node, int n, boolean includeself);
+ public DTMAxisIterator getNamespaceAxisIterator(final int axis, final int ns);
+ public DTMAxisIterator getNodeValueIterator(DTMAxisIterator iter, int returnType,
String value, boolean op);
- public NodeIterator orderNodes(NodeIterator source, int node);
+ public DTMAxisIterator orderNodes(DTMAxisIterator source, int node);
public String getNodeName(final int node);
+ public String getNodeNameX(final int node);
public String getNamespaceName(final int node);
- public int getType(final int node);
+ public int getExpandedTypeID(final int node);
public int getNamespaceType(final int node);
public int getParent(final int node);
public int getAttributeNode(final int gType, final int element);
- public String getNodeValue(final int node);
- public void copy(final int node, TransletOutputHandler handler)
+ public String getStringValueX(final int node);
+ public void copy(final int node, SerializationHandler handler)
throws TransletException;
- public void copy(NodeIterator nodes, TransletOutputHandler handler)
+ public void copy(DTMAxisIterator nodes, SerializationHandler handler)
throws TransletException;
- public String shallowCopy(final int node, TransletOutputHandler handler)
+ public String shallowCopy(final int node, SerializationHandler handler)
throws TransletException;
public boolean lessThan(final int node1, final int node2);
- public void characters(final int textNode, TransletOutputHandler handler)
+ public void characters(final int textNode, SerializationHandler handler)
throws TransletException;
public Node makeNode(int index);
- public Node makeNode(NodeIterator iter);
+ public Node makeNode(DTMAxisIterator iter);
public NodeList makeNodeList(int index);
- public NodeList makeNodeList(NodeIterator iter);
+ public NodeList makeNodeList(DTMAxisIterator iter);
public String getLanguage(int node);
public int getSize();
public String getDocumentURI(int node);
@@ -131,4 +131,12 @@
public boolean isAttribute(final int node);
public String lookupNamespace(int node, String prefix)
throws TransletException;
+ public int getNodeIdent(final int nodehandle);
+ public int getNodeHandle(final int nodeId);
+ public DOM getResultTreeFrag(int initialSize, int rtfType);
+ public SerializationHandler getOutputDomBuilder();
+ public int getNSType(int node);
+ public int getDocument();
+ public String getUnparsedEntityURI(String name);
+ public Hashtable getElementsWithIDs();
}
1.5 +7 -13 xml-xalan/java/src/org/apache/xalan/xsltc/DOMCache.java
Index: DOMCache.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/DOMCache.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DOMCache.java 30 Jan 2003 18:45:58 -0000 1.4
+++ DOMCache.java 1 Apr 2003 20:35:37 -0000 1.5
@@ -62,7 +62,6 @@
package org.apache.xalan.xsltc;
-import org.apache.xalan.xsltc.dom.DOMImpl;
public interface DOMCache {
@@ -74,23 +73,18 @@
* Parser _parser = new Parser();
* DOMImpl _dom = new DOMImpl();
* _parser.setDocumentHandler(_dom.getBuilder());
+ * _parser.setDTDHandler(_dom.getBuilder());
* _parser.parse(uri);
*
- * (2) building indicies for all ID elements (declared in DTD):
+ * (2) giving the translet an early opportunity to extract anything from
+ * the DOMImpl that it would like
*
- * DTDMonitor _dtdMonitor = new DTDMonitor();
- * _parser.setDTDHandler(_dtdMonitor);
- * translet.setIndexSize(dom.getSize());
- * dtd.buildIdIndex(dom, mask, translet);
+ * translet.documentPrepass(_dom);
*
- * (3) passing unparsed entity URI elements from DTD to translet:
- *
- * translet.setUnparsedEntityURIs(dtd.getUnparsedEntityURIs());
- *
- * (4) setting the document URI:
+ * (3) setting the document URI:
*
* _dom.setDocumentURI(uri);
*/
- public DOMImpl retrieveDocument(String uri, int mask, Translet translet);
+ public DOM retrieveDocument(String uri, int mask, Translet translet);
}
1.4 +4 -2 xml-xalan/java/src/org/apache/xalan/xsltc/NodeIterator.java
Index: NodeIterator.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/NodeIterator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NodeIterator.java 27 Jan 2003 18:44:35 -0000 1.3
+++ NodeIterator.java 1 Apr 2003 20:35:37 -0000 1.4
@@ -63,8 +63,10 @@
package org.apache.xalan.xsltc;
+import org.apache.xml.dtm.DTM;
+
public interface NodeIterator extends Cloneable {
- public static final int END = DOM.NULL;
+ public static final int END = DTM.NULL;
/**
* Callers should not call next() after it returns END.
1.6 +10 -7 xml-xalan/java/src/org/apache/xalan/xsltc/Translet.java
Index: Translet.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/Translet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Translet.java 27 Jan 2003 18:44:35 -0000 1.5
+++ Translet.java 1 Apr 2003 20:35:37 -0000 1.6
@@ -63,20 +63,23 @@
package org.apache.xalan.xsltc;
+import org.apache.xml.dtm.DTMAxisIterator;
+import org.apache.xml.serializer.SerializationHandler;
+
public interface Translet {
- public void transform(DOM document, TransletOutputHandler handler)
+ public void transform(DOM document, SerializationHandler handler)
throws TransletException;
- public void transform(DOM document, TransletOutputHandler[] handlers)
+ public void transform(DOM document, SerializationHandler[] handlers)
throws TransletException;
- public void transform(DOM document, NodeIterator iterator,
- TransletOutputHandler handler)
+ public void transform(DOM document, DTMAxisIterator iterator,
+ SerializationHandler handler)
throws TransletException;
public Object addParameter(String name, Object value);
- public void buildKeys(DOM document, NodeIterator iterator,
- TransletOutputHandler handler, int root)
+ public void buildKeys(DOM document, DTMAxisIterator iterator,
+ SerializationHandler handler, int root)
throws TransletException;
public void addAuxiliaryClass(Class auxClass);
public Class getAuxiliaryClass(String className);
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org