You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by jk...@apache.org on 2001/04/26 21:14:38 UTC
cvs commit: xml-xalan/java/src/org/apache/xml/dtm DTMFilter.java DTMIterator.java
jkesselm 01/04/26 12:14:37
Modified: java/src/org/apache/xml/dtm Tag: DTM_EXP DTMFilter.java
DTMIterator.java
Log:
Whups. Some problems merging two separate sets of changes.
MERGED.
Revision Changes Path
No revision
No revision
1.1.2.5 +4 -5 xml-xalan/java/src/org/apache/xml/dtm/Attic/DTMFilter.java
Index: DTMFilter.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/Attic/DTMFilter.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- DTMFilter.java 2001/04/26 18:06:37 1.1.2.4
+++ DTMFilter.java 2001/04/26 19:14:35 1.1.2.5
@@ -159,7 +159,7 @@
* are modeled by DTM but not by the DOM. Make sure this does not
* conflict with {@link org.w3c.dom.traversal.NodeFilter}.
* <p>
- * ISSUE: Might be safer to start from higher bits and work down,
+ * %REVIEW% Might be safer to start from higher bits and work down,
* to leave room for the DOM to expand its set of constants... Or,
* possibly, to create a DTM-specific field for these additional bits.
*/
@@ -170,7 +170,7 @@
* a function. Make sure this does not conflict with
* {@link org.w3c.dom.traversal.NodeFilter}.
* <p>
- * ISSUE: Might be safer to start from higher bits and work down,
+ * %REVIEW% Might be safer to start from higher bits and work down,
* to leave room for the DOM to expand its set of constants... Or,
* possibly, to create a DTM-specific field for these additional bits.
*/
@@ -196,8 +196,6 @@
* it is not normally called directly from
* user code.
* <p>
- * TODO: Is 0xFFFF really better than '*'?
- * <p>
* TODO: Should this be setNameMatch(expandedName) followed by accept()?
* Or will we really be testing a different name at every invocation?
*
@@ -218,7 +216,8 @@
* @param whatToShow one of SHOW_XXX values.
* @param expandedName a value defining the exanded name as defined in
* the DTM interface. Wild cards will be defined
- * by 0xFFFF in the high word and/or in the low word.
+ * by 0xFFFF in the namespace and/or localname
+ * portion of the expandedName.
* @return one of FILTER_ACCEPT, FILTER_REJECT, or FILTER_SKIP. */
public short acceptNode(int nodeHandle, int whatToShow, int expandedName);
1.1.2.5 +10 -10 xml-xalan/java/src/org/apache/xml/dtm/Attic/DTMIterator.java
Index: DTMIterator.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/Attic/DTMIterator.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- DTMIterator.java 2001/04/26 18:06:37 1.1.2.4
+++ DTMIterator.java 2001/04/26 19:14:36 1.1.2.5
@@ -86,6 +86,8 @@
{
// Constants returned by acceptNode, borrowed from the DOM Traversal chapter
+ // %REVIEW% Should we explicitly initialize them from, eg,
+ // org.w3c.dom.traversal.NodeFilter.FILTER_ACCEPT?
/**
* Accept the node.
@@ -126,8 +128,6 @@
* iterator may be passed without a DTMManager, this allows the
* caller to easily get the DTM using just the iterator.
*
- * TODO: Do we really need this, given getDTMManager()?
- *
* @param nodeHandle the nodeHandle.
*
* @return a non-null DTM reference.
@@ -157,7 +157,7 @@
* Reset the root node of the <code>DTMIterator</code>, overriding
* the value specified when it was created. Note the root node is
* not the root node of the document tree, but the context node from
- * where the itteration begins.
+ * where the iteration begins.
*
* @param nodeHandle int Handle of the context node.
*/
@@ -196,11 +196,11 @@
* to show the entity reference node and set
* <code>expandEntityReferences</code> to false.</p>
*
- * NOTE: In DTM we will generally have fully expanded entity references
- * when the document tree was built, and thus this flag will have no effect.
+ * <p>NOTE: In Xalan's use of DTM we will generally have fully expanded
+ * entity references when the document tree was built, and thus this
+ * flag will have no effect.</p>
*
- * @return true if entity references will be expanded.
- */
+ * @return true if entity references will be expanded. */
public boolean getExpandEntityReferences();
/**
@@ -229,10 +229,10 @@
* calls to <code>nextNode</code> or <code>previousNode</code> will
* raise a runtime exception.
*
- * TODO: This method may not be required in DTMIterator.
+ * %REVIEW% This method may not be required in DTMIterator.
* It was needed in DOMIterator because data linkages were
* established to support the "maintain relative position" semantic
- * under document mutation... but if DTM decides it doesn't need
+ * under document mutation... but if DTM doesn't need
* that semantic, we probably don't need to worry about this
* cleanup. On the other hand, at worst it's a harmless no-op...
*/
@@ -263,7 +263,7 @@
* be cached, enabling random access, and giving the ability to do
* sorts and the like. They are not cached by default.
*
- * TODO: Shouldn't the other random-access methods throw an exception
+ * %REVIEW% Shouldn't the other random-access methods throw an exception
* if they're called on a DTMIterator with this flag set false?
*
* @param b true if the nodes should be cached.
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org