You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sb...@apache.org on 2001/01/02 04:47:19 UTC
cvs commit: xml-xalan/java/src/org/apache/xpath/res package.html
sboag 01/01/01 19:47:19
Modified: java/src/org/apache/xpath Arg.java DOM2Helper.java
DOMHelper.java Expression.java NodeSet.java
SourceTreeManager.java VariableStack.java
XPath.java XPathContext.java XPathException.java
package.html
java/src/org/apache/xpath/axes AncestorWalker.java
AttributeIterator.java AttributeWalker.java
AttributeWalkerOneStep.java AxesWalker.java
ChildIterator.java ChildTestIterator.java
DescendantIterator.java DescendantOrSelfWalker.java
FilterExprWalker.java LocPathIterator.java
ParentWalker.java PrecedingWalker.java
PredicatedNodeTest.java RootWalker.java
RootWalkerMultiStep.java SelfWalker.java
UnionPathIterator.java package.html
java/src/org/apache/xpath/compiler OpMap.java
XPathParser.java package.html
java/src/org/apache/xpath/functions FuncExtFunction.java
FuncSystemProperty.java Function2Args.java
Function3Args.java FunctionMultiArgs.java
FunctionOneArg.java package.html
java/src/org/apache/xpath/objects XBoolean.java
XBooleanStatic.java XNumber.java XObject.java
XRTreeFrag.java package.html
java/src/org/apache/xpath/operations And.java Operation.java
Or.java UnaryOperation.java Variable.java
package.html
java/src/org/apache/xpath/patterns AncestorStepPattern.java
FunctionPattern.java NodeTest.java StepPattern.java
UnionPattern.java package.html
java/src/org/apache/xpath/res package.html
Log:
Javadoc work, to make the javadocs build clean.
Revision Changes Path
1.10 +1 -1 xml-xalan/java/src/org/apache/xpath/Arg.java
Index: Arg.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/Arg.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Arg.java 2000/12/21 22:32:31 1.9
+++ Arg.java 2001/01/02 03:47:13 1.10
@@ -105,7 +105,7 @@
* Get the value for this argument.
*
* @return the argument's stored XObject value.
- * @see #setVal()
+ * @see #setVal(XObject)
*/
public XObject getVal()
{
1.13 +11 -22 xml-xalan/java/src/org/apache/xpath/DOM2Helper.java
Index: DOM2Helper.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/DOM2Helper.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DOM2Helper.java 2000/12/21 22:32:31 1.12
+++ DOM2Helper.java 2001/01/02 03:47:13 1.13
@@ -77,12 +77,9 @@
import javax.xml.transform.TransformerException;
/**
- * <meta name="usage" content="general"/>
- * Provides XSLTProcessor an interface to the Xerces XML parser. This
- * liaison should be used if Xerces DOM nodes are being processed as
- * the source tree or as the result tree.
- * @see org.apache.xalan.xslt.XSLTProcessor
- * @see org.apache.xml.parsers
+ * <meta name="usage" content="advanced"/>
+ * This class provides a DOM level 2 "helper", which provides services currently
+ * not provided be the DOM standard.
*/
public class DOM2Helper extends DOMHelper
{
@@ -126,8 +123,8 @@
/** Field m_doc: Document Node for the document this helper is currently
* accessing or building
- * @see setDocument
- * @see getDocument
+ * @see #setDocument
+ * @see #getDocument
* */
private Document m_doc;
@@ -135,7 +132,7 @@
* Specify which document this helper is currently operating on.
*
* @param doc The DOM Document node for this document.
- * @see getDocument
+ * @see #getDocument
*/
public void setDocument(Document doc)
{
@@ -146,7 +143,7 @@
* Query which document this helper is currently operating on.
*
* @return The DOM Document node for this document.
- * @see setDocument
+ * @see #setDocument
*/
public Document getDocument()
{
@@ -172,16 +169,8 @@
*
* @param source The input source for the top-level of the
* XML document.
- * @exception javax.xml.transform.TransformerException Any SAX exception, possibly
- * wrapping another exception.
- * @exception java.io.IOException An IO exception from the parser,
- * possibly from a byte stream or character stream
- * supplied by the application.
- * @see org.xml.sax.InputSource
- * @see org.xml.sax.XMLReader#setContentHandler
- * @see org.xml.sax.XMLReader#setErrorHandler
*
- * @throws TransformerException
+ * @throws TransformerException if any checked exception is thrown.
*/
public void parse(InputSource source) throws TransformerException
{
@@ -314,10 +303,10 @@
*/
public Node getParentOfNode(Node node)
{
- Node parent=node.getParentNode();
- if(parent==null && (Node.ATTRIBUTE_NODE == node.getNodeType()) )
+ Node parent=node.getParentNode();
+ if(parent==null && (Node.ATTRIBUTE_NODE == node.getNodeType()) )
parent=((Attr) node).getOwnerElement();
- return parent;
+ return parent;
}
/**
1.26 +3 -3 xml-xalan/java/src/org/apache/xpath/DOMHelper.java
Index: DOMHelper.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/DOMHelper.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- DOMHelper.java 2000/12/27 22:25:42 1.25
+++ DOMHelper.java 2001/01/02 03:47:13 1.26
@@ -76,7 +76,7 @@
import javax.xml.parsers.ParserConfigurationException;
/**
- * <meta name="usage" content="internal"/>
+ * <meta name="usage" content="advanced"/>
* This class provides a front-end to DOM implementations, providing
* a number of utility functions that either aren't yet standardized
* by the DOM spec or that are defined in optional DOM modules and
@@ -830,7 +830,7 @@
*
* @return String in the form "namespaceURI:localname" if the node
* belongs to a namespace, or simply "localname" if it doesn't.
- * @see getExpandedAttributeName
+ * @see #getExpandedAttributeName
*/
public String getExpandedElementName(Element elem)
{
@@ -852,7 +852,7 @@
*
* @return String in the form "namespaceURI:localname" if the node
* belongs to a namespace, or simply "localname" if it doesn't.
- * @see getExpandedElementName
+ * @see #getExpandedElementName
*/
public String getExpandedAttributeName(Attr attr)
{
1.13 +1 -0 xml-xalan/java/src/org/apache/xpath/Expression.java
Index: Expression.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/Expression.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Expression.java 2000/12/27 22:23:34 1.12
+++ Expression.java 2001/01/02 03:47:13 1.13
@@ -87,6 +87,7 @@
/**
* The location where this expression was built from. Need for diagnostic
* messages. May be null.
+ * @serial
*/
protected SourceLocator m_slocator;
1.10 +31 -30 xml-xalan/java/src/org/apache/xpath/NodeSet.java
Index: NodeSet.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/NodeSet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- NodeSet.java 2000/12/18 00:04:53 1.9
+++ NodeSet.java 2001/01/02 03:47:13 1.10
@@ -286,7 +286,7 @@
* to nextNode() returns the first node in the set.
* @return The next <code>Node</code> in the set being iterated over, or
* <code>null</code> if there are no more members in that set.
- * @exception DOMException
+ * @throws DOMException
* INVALID_STATE_ERR: Raised if this method is called after the
* <code>detach</code> method was invoked.
*/
@@ -310,10 +310,10 @@
* iterator backwards in the set.
* @return The previous <code>Node</code> in the set being iterated over,
* or<code>null</code> if there are no more members in that set.
- * @exception DOMException
+ * @throws DOMException
* INVALID_STATE_ERR: Raised if this method is called after the
* <code>detach</code> method was invoked.
- * @exception RuntimeException thrown if this NodeSet is not of
+ * @throws RuntimeException thrown if this NodeSet is not of
* a cached type, and hence doesn't know what the previous node was.
*/
public Node previousNode() throws DOMException
@@ -368,7 +368,7 @@
* @param index Position to advance (or retreat) to, with
* 0 requesting the reset ("fresh") position and -1 (or indeed
* any out-of-bounds value) requesting the final position.
- * @exception RuntimeException thrown if this NodeSet is not
+ * @throws RuntimeException thrown if this NodeSet is not
* one of the types which supports indexing/counting.
*/
public void runTo(int index)
@@ -425,7 +425,7 @@
* operation
*
* @param n Node to be added
- * @exception RuntimeException thrown if this NodeSet is not of
+ * @throws RuntimeException thrown if this NodeSet is not of
* a mutable type.
*/
public void addNode(Node n)
@@ -443,7 +443,7 @@
* @param n Node to be added
* @param pos Offset at which the node is to be inserted,
* with 0 being the first position.
- * @exception RuntimeException thrown if this NodeSet is not of
+ * @throws RuntimeException thrown if this NodeSet is not of
* a mutable type.
*/
public void insertNode(Node n, int pos)
@@ -459,7 +459,7 @@
* Remove a node.
*
* @param n Node to be added
- * @exception RuntimeException thrown if this NodeSet is not of
+ * @throws RuntimeException thrown if this NodeSet is not of
* a mutable type.
*/
public void removeNode(Node n)
@@ -477,7 +477,7 @@
*
* @param nodelist List of nodes which should now be referenced by
* this NodeSet.
- * @exception RuntimeException thrown if this NodeSet is not of
+ * @throws RuntimeException thrown if this NodeSet is not of
* a mutable type.
*/
public void addNodes(NodeList nodelist)
@@ -517,7 +517,7 @@
* ambiguity.)</p>
*
* @param ns NodeSet whose members should be merged into this NodeSet.
- * @exception RuntimeException thrown if this NodeSet is not of
+ * @throws RuntimeException thrown if this NodeSet is not of
* a mutable type.
*/
public void addNodes(NodeSet ns)
@@ -534,7 +534,7 @@
* document order. Null references are not added.
*
* @param iterator NodeIterator which yields the nodes to be added.
- * @exception RuntimeException thrown if this NodeSet is not of
+ * @throws RuntimeException thrown if this NodeSet is not of
* a mutable type.
*/
public void addNodes(NodeIterator iterator)
@@ -562,7 +562,7 @@
*
* @param nodelist List of nodes to be added
* @param support The XPath runtime context.
- * @exception RuntimeException thrown if this NodeSet is not of
+ * @throws RuntimeException thrown if this NodeSet is not of
* a mutable type.
*/
public void addNodesInDocOrder(NodeList nodelist, XPathContext support)
@@ -590,7 +590,7 @@
*
* @param iterator NodeIterator which yields the nodes to be added.
* @param support The XPath runtime context.
- * @exception RuntimeException thrown if this NodeSet is not of
+ * @throws RuntimeException thrown if this NodeSet is not of
* a mutable type.
*/
public void addNodesInDocOrder(NodeIterator iterator, XPathContext support)
@@ -617,7 +617,7 @@
* @param support The XPath runtime context.
*
* @return false always.
- * @exception RuntimeException thrown if this NodeSet is not of
+ * @throws RuntimeException thrown if this NodeSet is not of
* a mutable type.
*/
private boolean addNodesInDocOrder(int start, int end, int testIndex,
@@ -681,7 +681,7 @@
* @param test true if we should test for doc order
* @param support The XPath runtime context.
* @return insertIndex.
- * @exception RuntimeException thrown if this NodeSet is not of
+ * @throws RuntimeException thrown if this NodeSet is not of
* a mutable type.
*/
public int addNodeInDocOrder(Node node, boolean test, XPathContext support)
@@ -758,7 +758,7 @@
* @param support The XPath runtime context.
*
* @return The index where it was inserted.
- * @exception RuntimeException thrown if this NodeSet is not of
+ * @throws RuntimeException thrown if this NodeSet is not of
* a mutable type.
*/
public int addNodeInDocOrder(Node node, XPathContext support)
@@ -784,7 +784,7 @@
* Append a Node onto the vector.
*
* @param value The node to be added.
- * @exception RuntimeException thrown if this NodeSet is not of
+ * @throws RuntimeException thrown if this NodeSet is not of
* a mutable type.
*/
public void addElement(Node value)
@@ -804,7 +804,7 @@
*
* @param value The node to be inserted.
* @param at The index where the insert should occur.
- * @exception RuntimeException thrown if this NodeSet is not of
+ * @throws RuntimeException thrown if this NodeSet is not of
* a mutable type.
*/
public void insertElementAt(Node value, int at)
@@ -820,7 +820,7 @@
* Append the nodes to the list.
*
* @param nodes The nodes to be appended to this node set.
- * @exception RuntimeException thrown if this NodeSet is not of
+ * @throws RuntimeException thrown if this NodeSet is not of
* a mutable type.
*/
public void appendNodes(NodeVector nodes)
@@ -837,7 +837,7 @@
* Each component in this vector with an index greater or equal to
* the specified index is shifted upward to have an index one greater
* than the value it had previously.
- * @exception RuntimeException thrown if this NodeSet is not of
+ * @throws RuntimeException thrown if this NodeSet is not of
* a mutable type.
*/
public void removeAllElements()
@@ -859,7 +859,7 @@
* @param s The node to be removed.
*
* @return True if the node was successfully removed
- * @exception RuntimeException thrown if this NodeSet is not of
+ * @throws RuntimeException thrown if this NodeSet is not of
* a mutable type.
*/
public boolean removeElement(Node s)
@@ -878,7 +878,7 @@
* the value it had previously.
*
* @param i The index of the node to be removed.
- * @exception RuntimeException thrown if this NodeSet is not of
+ * @throws RuntimeException thrown if this NodeSet is not of
* a mutable type.
*/
public void removeElementAt(int i)
@@ -899,7 +899,7 @@
*
* @param node The node to be set.
* @param index The index of the node to be replaced.
- * @exception RuntimeException thrown if this NodeSet is not of
+ * @throws RuntimeException thrown if this NodeSet is not of
* a mutable type.
*/
public void setElementAt(Node node, int index)
@@ -980,7 +980,7 @@
/** If this node is being used as an iterator, the next index that nextNode()
* will return. */
- protected int m_next = 0;
+ transient protected int m_next = 0;
/**
* Get the current position, which is one less than
@@ -998,7 +998,7 @@
/**
* Set the current position in the node set.
* @param i Must be a valid index.
- * @exception RuntimeException thrown if this NodeSet is not of
+ * @throws RuntimeException thrown if this NodeSet is not of
* a cached type, and thus doesn't permit indexed access.
*/
public void setCurrentPos(int i)
@@ -1015,7 +1015,7 @@
* Return the last fetched node. Needed to support the UnionPathIterator.
*
* @return the last fetched node.
- * @exception RuntimeException thrown if this NodeSet is not of
+ * @throws RuntimeException thrown if this NodeSet is not of
* a cached type, and thus doesn't permit indexed access.
*/
public Node getCurrentNode()
@@ -1032,10 +1032,11 @@
}
/** True if this list can be mutated. */
- protected boolean m_mutable = true;
+ transient protected boolean m_mutable = true;
- /** True if this list is cached. */
- protected boolean m_cacheNodes = true;
+ /** True if this list is cached.
+ * @serial */
+ transient protected boolean m_cacheNodes = true;
/**
* Get whether or not this is a cached node set.
@@ -1055,7 +1056,7 @@
* that all nodes are cached.
*
* @param b true if this node set should be cached.
- * @exception RuntimeException thrown if an attempt is made to
+ * @throws RuntimeException thrown if an attempt is made to
* request caching after we've already begun stepping through the
* nodes in this set.
*/
@@ -1071,7 +1072,7 @@
}
- private int m_last = 0;
+ transient private int m_last = 0;
public int getLast()
{
1.21 +0 -2 xml-xalan/java/src/org/apache/xpath/SourceTreeManager.java
Index: SourceTreeManager.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/SourceTreeManager.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- SourceTreeManager.java 2000/12/21 01:34:33 1.20
+++ SourceTreeManager.java 2001/01/02 03:47:13 1.21
@@ -237,8 +237,6 @@
* @param source The Source object to act as the key.
*
* @return The node that is associated with the Source, or null if not found.
- *
- * @throws TransformerException
*/
public Node getNode(Source source)
{
1.25 +5 -2 xml-xalan/java/src/org/apache/xpath/VariableStack.java
Index: VariableStack.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/VariableStack.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- VariableStack.java 2000/12/21 20:38:23 1.24
+++ VariableStack.java 2001/01/02 03:47:13 1.25
@@ -486,6 +486,7 @@
/**
* Hold the position of the start of the current element frame.
+ * @serial
*/
private IntStack m_elemFramePos = new IntStack();
@@ -494,12 +495,14 @@
*/
private static final Stack m_emptyStackFrame = new Stack();
- /** The top of the globals space. */
+ /** The top of the globals space.
+ * @serial */
private int m_globalStackFrameIndex = -1;
/** Where to start the current search for a variable.
* If this is -1, the search should start at the top
- * of the stack. */
+ * of the stack.
+ * @serial */
private int m_searchStart = -1;
} // end XSLArgStack
1.14 +6 -4 xml-xalan/java/src/org/apache/xpath/XPath.java
Index: XPath.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/XPath.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XPath.java 2000/12/18 00:04:53 1.13
+++ XPath.java 2001/01/02 03:47:13 1.14
@@ -97,7 +97,8 @@
public class XPath implements Serializable
{
- /** The top of the expression tree. */
+ /** The top of the expression tree.
+ * @serial */
private Expression m_mainExp;
/**
@@ -146,7 +147,8 @@
m_mainExp.setSourceLocator(l);
}
- /** The pattern string, mainly kept around for diagnostic purposes. */
+ /** The pattern string, mainly kept around for diagnostic purposes.
+ * @serial */
String m_patternString;
/**
@@ -213,14 +215,14 @@
* @param contextNode The node that "." expresses.
* @param namespaceContext The context in which namespaces in the
* XPath are supposed to be expanded.
- * @exception TransformerException thrown if the active ProblemListener decides
+ * @throws TransformerException thrown if the active ProblemListener decides
* the error condition is severe enough to halt processing.
* @param callback Interface that implements the processLocatedNode method.
* @param callbackInfo Object that will be passed to the processLocatedNode method.
* @param stopAtFirst True if the search should stop once the first node in document
* order is found.
* @return The result of the XPath or null if callbacks are used.
- * @exception TransformerException thrown if
+ * @throws TransformerException thrown if
* the error condition is severe enough to halt processing.
*
* @throws javax.xml.transform.TransformerException
1.17 +1 -1 xml-xalan/java/src/org/apache/xpath/XPathContext.java
Index: XPathContext.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/XPathContext.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XPathContext.java 2000/12/18 00:04:53 1.16
+++ XPathContext.java 2001/01/02 03:47:13 1.17
@@ -118,7 +118,7 @@
/**
* Create an XPathContext instance.
* @param owner Value that can be retrieved via the getOwnerObject() method.
- * @see getOwnerObject
+ * @see #getOwnerObject
*/
public XPathContext(Object owner)
{
1.6 +4 -2 xml-xalan/java/src/org/apache/xpath/XPathException.java
Index: XPathException.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/XPathException.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XPathException.java 2000/12/18 00:04:53 1.5
+++ XPathException.java 2001/01/02 03:47:13 1.6
@@ -72,7 +72,8 @@
public class XPathException extends TransformerException
{
- /** The home of the expression that caused the error. */
+ /** The home of the expression that caused the error.
+ * @serial */
Object m_styleNode = null;
/**
@@ -84,7 +85,8 @@
return m_styleNode;
}
- /** A nested exception. */
+ /** A nested exception.
+ * @serial */
protected Exception m_exception;
/**
1.3 +0 -4 xml-xalan/java/src/org/apache/xpath/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/package.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- package.html 2000/09/07 19:56:07 1.2
+++ package.html 2001/01/02 03:47:13 1.3
@@ -3,10 +3,6 @@
<body>
<p>Implementation of XPath; for the most part, only classes meant for public use are
found at this root level of the XPath packages.<p>
- <dl>
- <dt><b>Version: </b></dt><dd>Alpha, 2.0.0, July 05, 2000</dd>
- <dt><b>Author: </b></dt><dd><a href="mailto:scott_boag@lotus.com">Scott Boag</a></dd>
- </dl>
</body>
</html>
1.5 +5 -4 xml-xalan/java/src/org/apache/xpath/axes/AncestorWalker.java
Index: AncestorWalker.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/AncestorWalker.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AncestorWalker.java 2000/12/17 17:40:00 1.4
+++ AncestorWalker.java 2001/01/02 03:47:14 1.5
@@ -150,11 +150,12 @@
/** Stack of ancestors. We have to do this instead of
* just using getParent on the fly, because we have to walk the ancestors
- * in document order. */
- protected Stack m_ancestors;
+ * in document order. */
+ transient protected Stack m_ancestors;
- /** The position within the stack */
- protected int m_ancestorsPos;
+ /** The position within the stack.
+ * @serial */
+ transient protected int m_ancestorsPos;
/**
* Tell what's the maximum level this axes can descend to.
1.7 +3 -3 xml-xalan/java/src/org/apache/xpath/axes/AttributeIterator.java
Index: AttributeIterator.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/AttributeIterator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AttributeIterator.java 2000/12/31 11:06:35 1.6
+++ AttributeIterator.java 2001/01/02 03:47:14 1.7
@@ -175,7 +175,7 @@
* @return The next <code>Node</code> in the set being iterated over, or
* <code>null</code> if there are no more members in that set.
*
- * @exception DOMException
+ * @throws DOMException
* INVALID_STATE_ERR: Raised if this method is called after the
* <code>detach</code> method was invoked.
*/
@@ -287,8 +287,8 @@
transient private NamedNodeMap m_attributeList;
/** The position within the attribute list. */
- private int m_attrListPos = 0;
+ transient private int m_attrListPos = 0;
/** The number of attributes within the list. */
- private int m_nAttrs = 0;
+ transient private int m_nAttrs = 0;
}
1.7 +3 -3 xml-xalan/java/src/org/apache/xpath/axes/AttributeWalker.java
Index: AttributeWalker.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/AttributeWalker.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AttributeWalker.java 2000/12/17 17:40:00 1.6
+++ AttributeWalker.java 2001/01/02 03:47:14 1.7
@@ -152,11 +152,11 @@
/** The attribute list for the given context. */
transient NamedNodeMap m_attributeList;
- /** The position within the attribute list. */
- int m_attrListPos;
+ /** The position within the attribute list. */
+ transient int m_attrListPos;
/** The number of attributes within the list. */
- int m_nAttrs;
+ transient int m_nAttrs;
/**
* Tell what's the maximum level this axes can descend to.
1.7 +2 -2 xml-xalan/java/src/org/apache/xpath/axes/AttributeWalkerOneStep.java
Index: AttributeWalkerOneStep.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/AttributeWalkerOneStep.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AttributeWalkerOneStep.java 2000/12/17 17:40:00 1.6
+++ AttributeWalkerOneStep.java 2001/01/02 03:47:14 1.7
@@ -74,10 +74,10 @@
transient NamedNodeMap m_attributeList;
/** The current index into m_attributeList. -1 to start. */
- int m_attrListPos;
+ transient int m_attrListPos;
/** The number of attributes in m_attributeList, or -2 if no attributes. */
- int m_nAttrs;
+ transient int m_nAttrs;
/**
* The root node of the TreeWalker.
1.18 +19 -15 xml-xalan/java/src/org/apache/xpath/axes/AxesWalker.java
Index: AxesWalker.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/AxesWalker.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- AxesWalker.java 2000/12/27 22:24:11 1.17
+++ AxesWalker.java 2001/01/02 03:47:14 1.18
@@ -335,7 +335,7 @@
*
* @return The node at which the TreeWalker is currently positioned, only null
* if setRoot has not yet been called.
- * @exception DOMException
+ * @throws DOMException
* NOT_SUPPORTED_ERR: Raised if the specified <code>currentNode</code>
* is<code>null</code> .
*/
@@ -1317,11 +1317,11 @@
// These are useful to enable if you want to turn diagnostics messages
// on or off temporarily from another module.
- // public static boolean DEBUG = true;
- // public static boolean DEBUG_WAITING = true;
- // public static boolean DEBUG_TRAVERSAL = true;
- // public static boolean DEBUG_LOCATED = true;
- // public static boolean DEBUG_PREDICATECOUNTING = false;
+// public static boolean DEBUG = false;
+// public static boolean DEBUG_WAITING = false;
+// public static boolean DEBUG_TRAVERSAL = false;
+// public static boolean DEBUG_LOCATED = false;
+// public static boolean DEBUG_PREDICATECOUNTING = false;
/** General static debug flag. Setting this to false will suppress some
* of the output messages caused by the other debug categories. */
@@ -1330,9 +1330,6 @@
/** If true, diagnostic messages about the waiting queue will be posted. */
static final boolean DEBUG_WAITING = false;
- /** For diagnostic purposes, tells if we already did a subtree dump. */
- static boolean m_didDumpAll = false;
-
/** If true, diagnostic messages about the tree traversal will be posted. */
static final boolean DEBUG_TRAVERSAL = false;
@@ -1340,6 +1337,9 @@
* been 'located' will be posted. */
static final boolean DEBUG_LOCATED = false;
+ /** For diagnostic purposes, tells if we already did a subtree dump. */
+ static boolean m_didDumpAll = false;
+
/** String passed to {@link org.w3c.dom.Node#isSupported} to see if it implements
* a {@link org.apache.xpath.patterns.NodeTestFilter} interface. */
public static final String FEATURE_NODETESTFILTER = "NodeTestFilter";
@@ -1362,31 +1362,35 @@
/**
* The arg length of the XPath step. Does not change after the constructor.
* TODO: Can this be removed since it is only valuable at compile time?
+ * @serial
*/
private int m_argLen;
/**
* The step type of the XPath step. Does not change after the constructor.
+ * @serial
*/
private int m_stepType;
/** Fairly short lived flag to tell if we switched to a waiting walker. */
- private boolean m_didSwitch = false;
+ transient private boolean m_didSwitch = false;
/** True if this walker has found it's last node. */
- boolean m_isDone = false;
+ transient boolean m_isDone = false;
/** True if an itteration has not begun. */
- boolean m_isFresh;
+ transient boolean m_isFresh;
/** An estimation of the next level that this walker will traverse to. Not
* always accurate. */
- protected int m_nextLevelAmount;
+ transient protected int m_nextLevelAmount;
- /** The next walker in the location step chain. */
+ /** The next walker in the location step chain.
+ * @serial */
protected AxesWalker m_nextWalker;
- /** The previous walker in the location step chain, or null. */
+ /** The previous walker in the location step chain, or null.
+ * @serial */
AxesWalker m_prevWalker;
}
1.5 +1 -1 xml-xalan/java/src/org/apache/xpath/axes/ChildIterator.java
Index: ChildIterator.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/ChildIterator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChildIterator.java 2000/12/27 22:24:11 1.4
+++ ChildIterator.java 2001/01/02 03:47:14 1.5
@@ -96,7 +96,7 @@
* @return The next <code>Node</code> in the set being iterated over, or
* <code>null</code> if there are no more members in that set.
*
- * @exception DOMException
+ * @throws DOMException
* INVALID_STATE_ERR: Raised if this method is called after the
* <code>detach</code> method was invoked.
*/
1.8 +1 -1 xml-xalan/java/src/org/apache/xpath/axes/ChildTestIterator.java
Index: ChildTestIterator.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/ChildTestIterator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChildTestIterator.java 2000/12/31 11:06:35 1.7
+++ ChildTestIterator.java 2001/01/02 03:47:14 1.8
@@ -132,7 +132,7 @@
* @return The next <code>Node</code> in the set being iterated over, or
* <code>null</code> if there are no more members in that set.
*
- * @exception DOMException
+ * @throws DOMException
* INVALID_STATE_ERR: Raised if this method is called after the
* <code>detach</code> method was invoked.
*/
1.7 +5 -3 xml-xalan/java/src/org/apache/xpath/axes/DescendantIterator.java
Index: DescendantIterator.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/DescendantIterator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DescendantIterator.java 2000/12/31 11:06:35 1.6
+++ DescendantIterator.java 2001/01/02 03:47:14 1.7
@@ -153,7 +153,7 @@
* @return The next <code>Node</code> in the set being iterated over, or
* <code>null</code> if there are no more members in that set.
*
- * @exception DOMException
+ * @throws DOMException
* INVALID_STATE_ERR: Raised if this method is called after the
* <code>detach</code> method was invoked.
*/
@@ -302,9 +302,11 @@
/** The top of the subtree, may not be the same as m_context if "//foo" pattern. */
transient private Node m_startContext;
- /** True if this is a descendants-or-self axes. */
+ /** True if this is a descendants-or-self axes.
+ * @serial */
private boolean m_orSelf;
- /** True if this is a descendants-or-self axes. */
+ /** True if this is a descendants-or-self axes.
+ * @serial */
private boolean m_fromRoot;
}
1.4 +1 -1 xml-xalan/java/src/org/apache/xpath/axes/DescendantOrSelfWalker.java
Index: DescendantOrSelfWalker.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/DescendantOrSelfWalker.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DescendantOrSelfWalker.java 2000/12/17 17:40:00 1.3
+++ DescendantOrSelfWalker.java 2001/01/02 03:47:14 1.4
@@ -115,5 +115,5 @@
}
/** True if the self (root, context node) has been returned. */
- boolean m_processedSelf;
+ transient boolean m_processedSelf;
}
1.13 +2 -1 xml-xalan/java/src/org/apache/xpath/axes/FilterExprWalker.java
Index: FilterExprWalker.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/FilterExprWalker.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FilterExprWalker.java 2000/12/27 22:24:11 1.12
+++ FilterExprWalker.java 2001/01/02 03:47:15 1.13
@@ -287,7 +287,8 @@
return setCurrentIfNotNull(next);
}
- /** The contained expression. Should be non-null. */
+ /** The contained expression. Should be non-null.
+ * @serial */
private Expression m_expr;
/** The result of executing m_expr. Needs to be deep cloned on clone op. */
1.23 +16 -11 xml-xalan/java/src/org/apache/xpath/axes/LocPathIterator.java
Index: LocPathIterator.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/LocPathIterator.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- LocPathIterator.java 2000/12/27 22:24:11 1.22
+++ LocPathIterator.java 2001/01/02 03:47:15 1.23
@@ -431,7 +431,7 @@
* iterator backwards in the set.
* @return The previous <code>Node</code> in the set being iterated over,
* or<code>null</code> if there are no more members in that set.
- * @exception DOMException
+ * @throws DOMException
* INVALID_STATE_ERR: Raised if this method is called after the
* <code>detach</code> method was invoked.
*/
@@ -616,7 +616,7 @@
* to nextNode() returns the first node in the set.
* @return The next <code>Node</code> in the set being iterated over, or
* <code>null</code> if there are no more members in that set.
- * @exception DOMException
+ * @throws DOMException
* INVALID_STATE_ERR: Raised if this method is called after the
* <code>detach</code> method was invoked.
*/
@@ -995,31 +995,32 @@
//============= State Data =============
/** The starting point in m_waiting where the waiting step walkers are. */
- int m_waitingBottom = 0;
+ transient int m_waitingBottom = 0;
/**
* An index to the point in the variable stack where we should
* begin variable searches for this iterator.
* This is -1 if m_isTopLevel is false.
*/
- int m_varStackPos = -1;
+ transient int m_varStackPos = -1;
/**
* An index into the variable stack where the variable context
* ends, i.e. at the point we should terminate the search and
* go looking for global variables.
*/
- int m_varStackContext;
+ transient int m_varStackContext;
/**
* Value determined at compile time, indicates that this is an
* iterator at the top level of the expression, rather than inside
* a predicate.
+ * @serial
*/
private boolean m_isTopLevel = false;
/** The index of the last node in the iteration. */
- private int m_last = 0;
+ transient private int m_last = 0;
/* The pool for cloned iterators. Iterators need to be cloned
* because the hold running state, and thus the original iterator
@@ -1036,14 +1037,16 @@
*/
transient NodeSet m_cachedNodes;
- /** The last used step walker in the walker list. */
+ /** The last used step walker in the walker list.
+ * @serial */
protected AxesWalker m_lastUsedWalker;
- /** The head of the step walker list. */
+ /** The head of the step walker list.
+ * @serial */
protected AxesWalker m_firstWalker;
/** This is true if nextNode returns null. */
- protected boolean m_foundLast = false;
+ transient protected boolean m_foundLast = false;
/**
* Quicker access to the DOM helper than going through the
@@ -1068,6 +1071,7 @@
/**
* Fast access to the current prefix resolver. It isn't really
* clear that this is needed.
+ * @serial
*/
protected PrefixResolver m_prefixResolver;
@@ -1082,18 +1086,19 @@
* is a cached iterator, and is being used as random access
* NodeList.
*/
- protected int m_next = 0;
+ transient protected int m_next = 0;
/**
* The list of "waiting" step walkers.
* @see org.apache.xpath.axes.AxesWalker
*/
- private Vector m_waiting = null;
+ transient private Vector m_waiting = null;
/**
* The analysis pattern built by the WalkerFactory.
* TODO: Move to LocPathIterator.
* @see org.apache.xpath.axes.WalkerFactory
+ * @serial
*/
protected int m_analysis = 0x00000000;
}
1.5 +1 -1 xml-xalan/java/src/org/apache/xpath/axes/ParentWalker.java
Index: ParentWalker.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/ParentWalker.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ParentWalker.java 2000/12/17 17:40:01 1.4
+++ ParentWalker.java 2001/01/02 03:47:15 1.5
@@ -120,7 +120,7 @@
}
/** True if we already obtained the parent node. */
- boolean m_gotParent;
+ transient boolean m_gotParent;
/**
* Tell what's the maximum level this axes can descend to.
1.8 +0 -2 xml-xalan/java/src/org/apache/xpath/axes/PrecedingWalker.java
Index: PrecedingWalker.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/PrecedingWalker.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PrecedingWalker.java 2000/12/18 08:48:20 1.7
+++ PrecedingWalker.java 2001/01/02 03:47:15 1.8
@@ -107,8 +107,6 @@
/**
* Reset the proximity positions counts.
- *
- * @throws javax.xml.transform.TransformerException
*/
public void resetProximityPositions(){}
1.3 +6 -6 xml-xalan/java/src/org/apache/xpath/axes/PredicatedNodeTest.java
Index: PredicatedNodeTest.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/PredicatedNodeTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PredicatedNodeTest.java 2000/12/27 22:24:11 1.2
+++ PredicatedNodeTest.java 2001/01/02 03:47:15 1.3
@@ -179,8 +179,6 @@
/**
* Reset the proximity positions counts.
- *
- * @throws javax.xml.transform.TransformerException
*/
public void resetProximityPositions()
{
@@ -456,23 +454,25 @@
return false;
}
- /** The owning location path iterator. */
+ /** The owning location path iterator.
+ * @serial */
protected LocPathIterator m_lpi;
/**
* Which predicate we are executing.
*/
- int m_predicateIndex = -1;
+ transient int m_predicateIndex = -1;
/** The list of predicate expressions. Is static and does not need
- * to be deep cloned. */
+ * to be deep cloned.
+ * @serial */
private Expression[] m_predicates;
/**
* An array of counts that correspond to the number
* of predicates the step contains.
*/
- protected int[] m_proximityPositions;
+ transient protected int[] m_proximityPositions;
/** If true, diagnostic messages about predicate execution will be posted. */
static final boolean DEBUG_PREDICATECOUNTING = false;
1.6 +1 -1 xml-xalan/java/src/org/apache/xpath/axes/RootWalker.java
Index: RootWalker.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/RootWalker.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RootWalker.java 2000/12/27 22:24:11 1.5
+++ RootWalker.java 2001/01/02 03:47:15 1.6
@@ -122,7 +122,7 @@
}
/** True if the root node has been processed. */
- boolean m_processedRoot = false;
+ transient boolean m_processedRoot = false;
/**
* Tell what's the maximum level this axes can descend to.
1.2 +1 -1 xml-xalan/java/src/org/apache/xpath/axes/RootWalkerMultiStep.java
Index: RootWalkerMultiStep.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/RootWalkerMultiStep.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RootWalkerMultiStep.java 2000/12/27 22:24:11 1.1
+++ RootWalkerMultiStep.java 2001/01/02 03:47:15 1.2
@@ -139,5 +139,5 @@
}
/** True if the root node has been processed. */
- boolean m_processedRoot = false;
+ transient boolean m_processedRoot = false;
}
1.5 +1 -1 xml-xalan/java/src/org/apache/xpath/axes/SelfWalker.java
Index: SelfWalker.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/SelfWalker.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SelfWalker.java 2000/12/17 17:40:01 1.4
+++ SelfWalker.java 2001/01/02 03:47:15 1.5
@@ -119,7 +119,7 @@
}
/** True if the self node has been processed. */
- boolean m_processedSelf;
+ transient boolean m_processedSelf;
/**
* Tell what's the maximum level this axes can descend to.
1.14 +15 -5 xml-xalan/java/src/org/apache/xpath/axes/UnionPathIterator.java
Index: UnionPathIterator.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/UnionPathIterator.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- UnionPathIterator.java 2000/12/18 20:59:51 1.13
+++ UnionPathIterator.java 2001/01/02 03:47:15 1.14
@@ -192,7 +192,7 @@
/** The index of the next node to be fetched. Useful if this
* is a cached iterator, and is being used as random access
* NodeList. */
- protected int m_next = 0;
+ transient protected int m_next = 0;
/**
* If setShouldCacheNodes(true) is called, then nodes will
@@ -256,7 +256,7 @@
* iterator backwards in the set.
* @return The previous <code>Node</code> in the set being iterated over,
* or<code>null</code> if there are no more members in that set.
- * @exception DOMException
+ * @throws DOMException
* INVALID_STATE_ERR: Raised if this method is called after the
* <code>detach</code> method was invoked.
*/
@@ -516,7 +516,7 @@
* to nextNode() returns the first node in the set.
* @return The next <code>Node</code> in the set being iterated over, or
* <code>null</code> if there are no more members in that set.
- * @exception DOMException
+ * @throws DOMException
* INVALID_STATE_ERR: Raised if this method is called after the
* <code>detach</code> method was invoked.
*/
@@ -644,7 +644,7 @@
/**
* Tells if we've found the last node yet.
*/
- protected boolean m_foundLast = false;
+ transient protected boolean m_foundLast = false;
/**
* The execution context for the expression.
@@ -677,16 +677,26 @@
* The location path iterators, one for each
* <a href="http://www.w3.org/TR/xpath#NT-LocationPath">location
* path</a> contained in the union expression.
+ * @serial
*/
protected LocPathIterator[] m_iterators;
- private int m_last = 0;
+ /**
+ * The last index in the list.
+ */
+ transient private int m_last = 0;
+ /**
+ * Get the index of the last node in the itteration.
+ */
public int getLast()
{
return m_last;
}
+ /**
+ * Set the index of the last node in the itteration.
+ */
public void setLast(int last)
{
m_last = last;
1.2 +1 -4 xml-xalan/java/src/org/apache/xpath/axes/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 2000/07/06 02:28:20 1.1
+++ package.html 2001/01/02 03:47:15 1.2
@@ -3,10 +3,7 @@
<body>
<p>Implementation of XPath LocationPath support -- primary classes are
LocPathIterator and UnionPathIterator.<p>
- <dl>
- <dt><b>Version: </b></dt><dd>Alpha, 2.0.0, July 05, 2000</dd>
- <dt><b>Author: </b></dt><dd><a href="mailto:scott_boag@lotus.com">Scott Boag</a></dd>
- </dl>
</body>
+ </body>
</html>
1.8 +1 -1 xml-xalan/java/src/org/apache/xpath/compiler/OpMap.java
Index: OpMap.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/compiler/OpMap.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- OpMap.java 2000/12/17 05:20:09 1.7
+++ OpMap.java 2001/01/02 03:47:16 1.8
@@ -156,7 +156,7 @@
* I use an array instead of a full parse tree in order to cut down
* on the number of objects created.
*
- * @return
+ * @return An array of integers that is the opcode list that describes the XPath operations.
*/
public int[] getOpMap()
{
1.10 +9 -5 xml-xalan/java/src/org/apache/xpath/compiler/XPathParser.java
Index: XPathParser.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/compiler/XPathParser.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XPathParser.java 2000/12/17 05:20:09 1.9
+++ XPathParser.java 2001/01/02 03:47:16 1.10
@@ -85,23 +85,25 @@
/**
* The XPath to be processed.
+ * @serial
*/
private OpMap m_ops;
/**
* The next token in the pattern.
*/
- String m_token;
+ transient String m_token;
/**
* The first char in m_token, the theory being that this
* is an optimization because we won't have to do charAt(0) as
* often.
*/
- char m_tokenChar = 0;
+ transient char m_tokenChar = 0;
/**
* The position in the token queue is tracked by m_queueMark.
+ * @serial
*/
int m_queueMark = 0;
@@ -112,6 +114,7 @@
/**
* The prefix resolver to map prefixes to namespaces in the OpMap.
+ * @serial
*/
PrefixResolver m_namespaceContext;
@@ -220,7 +223,8 @@
m_ops.shrink();
}
- /** The error listener where syntax errors are to be sent. */
+ /** The error listener where syntax errors are to be sent.
+ * @serial */
private ErrorListener m_errorListener;
/**
@@ -1198,7 +1202,7 @@
* | FilterExpr '/' RelativeLocationPath
* | FilterExpr '//' RelativeLocationPath
*
- * @exception XSLProcessorException thrown if the active ProblemListener and XPathContext decide
+ * @throws XSLProcessorException thrown if the active ProblemListener and XPathContext decide
* the error condition is severe enough to halt processing.
*
* @throws javax.xml.transform.TransformerException
@@ -1233,7 +1237,7 @@
* FilterExpr ::= PrimaryExpr
* | FilterExpr Predicate
*
- * @exception XSLProcessorException thrown if the active ProblemListener and XPathContext decide
+ * @throws XSLProcessorException thrown if the active ProblemListener and XPathContext decide
* the error condition is severe enough to halt processing.
*
* @throws javax.xml.transform.TransformerException
1.2 +1 -4 xml-xalan/java/src/org/apache/xpath/compiler/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/compiler/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 2000/07/06 02:28:24 1.1
+++ package.html 2001/01/02 03:47:16 1.2
@@ -3,10 +3,7 @@
<body>
<p>Implements an XPath parser which produces an OpMap, and a so-called Compiler
which produces an expression tree for fast evaluation.<p>
- <dl>
- <dt><b>Version: </b></dt><dd>Alpha, 2.0.0, July 05, 2000</dd>
- <dt><b>Author: </b></dt><dd><a href="mailto:scott_boag@lotus.com">Scott Boag</a></dd>
- </dl>
</body>
+ </body>
</html>
1.7 +8 -4 xml-xalan/java/src/org/apache/xpath/functions/FuncExtFunction.java
Index: FuncExtFunction.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncExtFunction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FuncExtFunction.java 2000/12/16 20:01:53 1.6
+++ FuncExtFunction.java 2001/01/02 03:47:16 1.7
@@ -77,18 +77,22 @@
{
/** The namespace for the extension function, which should not normally
- * be null or empty. */
+ * be null or empty.
+ * @serial */
String m_namespace;
- /** The local name of the extension. */
+ /** The local name of the extension.
+ * @serial */
String m_extensionName;
/** Unique method key, which is passed to ExtensionsTable#extFunction in
- * order to allow caching of the method. */
+ * order to allow caching of the method.
+ * @serial */
Object m_methodKey;
/** Array of static expressions which represent the parameters to the
- * function. */
+ * function.
+ * @serial */
Vector m_argVec = new Vector();
/**
1.8 +4 -4 xml-xalan/java/src/org/apache/xpath/functions/FuncSystemProperty.java
Index: FuncSystemProperty.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncSystemProperty.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FuncSystemProperty.java 2000/12/16 20:01:54 1.7
+++ FuncSystemProperty.java 2001/01/02 03:47:16 1.8
@@ -83,10 +83,6 @@
public class FuncSystemProperty extends FunctionOneArg
{
- /** List of properties where the name of the property argument is
- * to be looked for. */
- Properties xsltInfo = new Properties();
-
/** The name of the property file where the name will be stored. */
static String XSLT_PROPERTIES = "/org/apache/xalan/res/XSLTInfo.properties";
@@ -105,6 +101,10 @@
int indexOfNSSep = fullName.indexOf(':');
String result;
String propName = "";
+
+ /* List of properties where the name of the property argument is
+ * to be looked for. */
+ Properties xsltInfo = new Properties();
loadPropertyFile(XSLT_PROPERTIES, xsltInfo);
1.5 +2 -1 xml-xalan/java/src/org/apache/xpath/functions/Function2Args.java
Index: Function2Args.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/functions/Function2Args.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Function2Args.java 2000/12/27 22:26:01 1.4
+++ Function2Args.java 2001/01/02 03:47:16 1.5
@@ -65,7 +65,8 @@
public class Function2Args extends FunctionOneArg
{
- /** The second argument passed to the function (at index 1). */
+ /** The second argument passed to the function (at index 1).
+ * @serial */
Expression m_arg1;
/**
1.6 +2 -1 xml-xalan/java/src/org/apache/xpath/functions/Function3Args.java
Index: Function3Args.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/functions/Function3Args.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Function3Args.java 2000/12/27 22:26:01 1.5
+++ Function3Args.java 2001/01/02 03:47:16 1.6
@@ -65,7 +65,8 @@
public class Function3Args extends Function2Args
{
- /** The third argument passed to the function (at index 2). */
+ /** The third argument passed to the function (at index 2).
+ * @serial */
Expression m_arg2;
/**
1.6 +2 -1 xml-xalan/java/src/org/apache/xpath/functions/FunctionMultiArgs.java
Index: FunctionMultiArgs.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FunctionMultiArgs.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FunctionMultiArgs.java 2000/12/27 22:26:01 1.5
+++ FunctionMultiArgs.java 2001/01/02 03:47:16 1.6
@@ -66,7 +66,8 @@
public class FunctionMultiArgs extends Function3Args
{
- /** Argument expressions that are at index 3 or greater. */
+ /** Argument expressions that are at index 3 or greater.
+ * @serial */
Expression[] m_args;
/**
1.5 +2 -1 xml-xalan/java/src/org/apache/xpath/functions/FunctionOneArg.java
Index: FunctionOneArg.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FunctionOneArg.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionOneArg.java 2000/12/27 22:26:01 1.4
+++ FunctionOneArg.java 2001/01/02 03:47:16 1.5
@@ -65,7 +65,8 @@
public class FunctionOneArg extends Function
{
- /** The first argument passed to the function (at index 0). */
+ /** The first argument passed to the function (at index 0).
+ * @serial */
Expression m_arg0;
/**
1.2 +1 -4 xml-xalan/java/src/org/apache/xpath/functions/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/functions/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 2000/07/06 02:28:25 1.1
+++ package.html 2001/01/02 03:47:16 1.2
@@ -5,10 +5,7 @@
FunctionOneArg, Function2Args, etc, with number-of-arguments checking being
applied mainly at compile time -- this package only implements XPath functions,
XSLT functions are found in the "templates" package.<p>
- <dl>
- <dt><b>Version: </b></dt><dd>Alpha, 2.0.0, July 05, 2000</dd>
- <dt><b>Author: </b></dt><dd><a href="mailto:scott_boag@lotus.com">Scott Boag</a></dd>
- </dl>
</body>
+ </body>
</html>
1.7 +2 -1 xml-xalan/java/src/org/apache/xpath/objects/XBoolean.java
Index: XBoolean.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XBoolean.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XBoolean.java 2000/12/14 21:18:01 1.6
+++ XBoolean.java 2001/01/02 03:47:17 1.7
@@ -78,7 +78,8 @@
*/
public static XBoolean S_FALSE = new XBooleanStatic(false);
- /** Value of the object */
+ /** Value of the object.
+ * @serial */
boolean m_val;
/**
1.5 +2 -1 xml-xalan/java/src/org/apache/xpath/objects/XBooleanStatic.java
Index: XBooleanStatic.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XBooleanStatic.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XBooleanStatic.java 2000/12/14 21:18:02 1.4
+++ XBooleanStatic.java 2001/01/02 03:47:17 1.5
@@ -69,7 +69,8 @@
public class XBooleanStatic extends XBoolean
{
- /** The value of the object */
+ /** The value of the object.
+ * @serial */
boolean m_val;
/**
1.8 +2 -1 xml-xalan/java/src/org/apache/xpath/objects/XNumber.java
Index: XNumber.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XNumber.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XNumber.java 2000/12/14 21:18:03 1.7
+++ XNumber.java 2001/01/02 03:47:17 1.8
@@ -66,7 +66,8 @@
public class XNumber extends XObject
{
- /** Value of the XNumber object */
+ /** Value of the XNumber object.
+ * @serial */
double m_val;
/**
1.8 +2 -1 xml-xalan/java/src/org/apache/xpath/objects/XObject.java
Index: XObject.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XObject.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XObject.java 2000/12/14 21:18:03 1.7
+++ XObject.java 2001/01/02 03:47:17 1.8
@@ -80,7 +80,8 @@
public class XObject extends Expression implements Serializable
{
- /** The java object which this object wraps. */
+ /** The java object which this object wraps.
+ * @serial */
protected Object m_obj; // This may be NULL!!!
/**
1.12 +2 -2 xml-xalan/java/src/org/apache/xpath/objects/XRTreeFrag.java
Index: XRTreeFrag.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XRTreeFrag.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XRTreeFrag.java 2000/12/14 21:18:04 1.11
+++ XRTreeFrag.java 2001/01/02 03:47:17 1.12
@@ -330,7 +330,7 @@
* to nextNode() returns the first node in the set.
* @return The next <code>Node</code> in the set being iterated over, or
* <code>null</code> if there are no more members in that set.
- * @exception DOMException
+ * @throws DOMException
* INVALID_STATE_ERR: Raised if this method is called after the
* <code>detach</code> method was invoked.
*/
@@ -352,7 +352,7 @@
* iterator backwards in the set.
* @return The previous <code>Node</code> in the set being iterated over,
* or<code>null</code> if there are no more members in that set.
- * @exception DOMException
+ * @throws DOMException
* INVALID_STATE_ERR: Raised if this method is called after the
* <code>detach</code> method was invoked.
*/
1.2 +1 -4 xml-xalan/java/src/org/apache/xpath/objects/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 2000/07/06 02:28:26 1.1
+++ package.html 2001/01/02 03:47:17 1.2
@@ -3,10 +3,7 @@
<body>
<p>Implementation of XPath polymorphic type objects -- this package will grow
as XPath objects are expanded to support XML Schema data types.<p>
- <dl>
- <dt><b>Version: </b></dt><dd>Alpha, 2.0.0, July 05, 2000</dd>
- <dt><b>Author: </b></dt><dd><a href="mailto:scott_boag@lotus.com">Scott Boag</a></dd>
- </dl>
</body>
+ </body>
</html>
1.5 +2 -2 xml-xalan/java/src/org/apache/xpath/operations/And.java
Index: And.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/operations/And.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- And.java 2000/12/17 05:21:14 1.4
+++ And.java 2001/01/02 03:47:18 1.5
@@ -76,8 +76,8 @@
*
* @param xctxt The runtime execution context.
*
- * @return {@link org.apache.xpath.objects.XBoolean.S_TRUE} or
- * {@link org.apache.xpath.objects.XBoolean.S_FALSE}.
+ * @return {@link org.apache.xpath.objects.XBoolean#S_TRUE} or
+ * {@link org.apache.xpath.objects.XBoolean#S_FALSE}.
*
* @throws javax.xml.transform.TransformerException
*/
1.6 +4 -2 xml-xalan/java/src/org/apache/xpath/operations/Operation.java
Index: Operation.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/operations/Operation.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Operation.java 2000/12/27 22:26:04 1.5
+++ Operation.java 2001/01/02 03:47:18 1.6
@@ -69,10 +69,12 @@
public class Operation extends Expression
{
- /** The left operand expression. */
+ /** The left operand expression.
+ * @serial */
protected Expression m_left;
- /** The right operand expression. */
+ /** The right operand expression.
+ * @serial */
protected Expression m_right;
/**
1.5 +2 -2 xml-xalan/java/src/org/apache/xpath/operations/Or.java
Index: Or.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/operations/Or.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Or.java 2000/12/17 05:21:17 1.4
+++ Or.java 2001/01/02 03:47:18 1.5
@@ -76,8 +76,8 @@
*
* @param xctxt The runtime execution context.
*
- * @return {@link org.apache.xpath.objects.XBoolean.S_TRUE} or
- * {@link org.apache.xpath.objects.XBoolean.S_FALSE}.
+ * @return {@link org.apache.xpath.objects.XBoolean#S_TRUE} or
+ * {@link org.apache.xpath.objects.XBoolean#S_FALSE}.
*
* @throws javax.xml.transform.TransformerException
*/
1.6 +2 -1 xml-xalan/java/src/org/apache/xpath/operations/UnaryOperation.java
Index: UnaryOperation.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/operations/UnaryOperation.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UnaryOperation.java 2000/12/27 22:26:04 1.5
+++ UnaryOperation.java 2001/01/02 03:47:18 1.6
@@ -69,7 +69,8 @@
public abstract class UnaryOperation extends Expression
{
- /** The operand for the operation. */
+ /** The operand for the operation.
+ * @serial */
protected Expression m_right;
/**
1.9 +2 -1 xml-xalan/java/src/org/apache/xpath/operations/Variable.java
Index: Variable.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/operations/Variable.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Variable.java 2000/12/21 15:58:51 1.8
+++ Variable.java 2001/01/02 03:47:18 1.9
@@ -73,7 +73,8 @@
public class Variable extends Expression
{
- /** The qualified name of the variable. */
+ /** The qualified name of the variable.
+ * @serial */
protected QName m_qname;
/**
1.2 +1 -4 xml-xalan/java/src/org/apache/xpath/operations/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/operations/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 2000/07/06 02:28:28 1.1
+++ package.html 2001/01/02 03:47:18 1.2
@@ -2,10 +2,7 @@
<title>Xalan XPath operations.</title>
<body>
<p>Support for XPath operations, such as +, -, string(), etc.<p>
- <dl>
- <dt><b>Version: </b></dt><dd>Alpha, 2.0.0, July 05, 2000</dd>
- <dt><b>Author: </b></dt><dd><a href="mailto:scott_boag@lotus.com">Scott Boag</a></dd>
- </dl>
</body>
+ </body>
</html>
1.9 +12 -12 xml-xalan/java/src/org/apache/xpath/patterns/AncestorStepPattern.java
Index: AncestorStepPattern.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/patterns/AncestorStepPattern.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AncestorStepPattern.java 2000/12/17 19:31:25 1.8
+++ AncestorStepPattern.java 2001/01/02 03:47:18 1.9
@@ -76,7 +76,7 @@
* Construct an AncestorStepPattern that tests for namespaces and node names.
*
*
- * @param whatToShow Bit set defined mainly by {@link org.w3c.dom.NodeFilter}.
+ * @param whatToShow Bit set defined mainly by {@link org.w3c.dom.traversal.NodeFilter}.
* @param namespace The namespace to be tested.
* @param name The local name to be tested.
*/
@@ -89,7 +89,7 @@
* Construct an AncestorStepPattern that doesn't test for node names.
*
*
- * @param whatToShow Bit set defined mainly by {@link org.w3c.dom.NodeFilter}.
+ * @param whatToShow Bit set defined mainly by {@link org.w3c.dom.traversal.NodeFilter}.
*/
public AncestorStepPattern(int whatToShow)
{
@@ -114,11 +114,11 @@
*
* @param xctxt XPath runtime context.
*
- * @return {@link org.apache.xpath.patterns.NodeTest.SCORE_NODETEST},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_NONE},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_NSWILD},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_QNAME}, or
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_OTHER}.
+ * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
*
* @throws javax.xml.transform.TransformerException
*/
@@ -148,11 +148,11 @@
*
* @param xctxt The XPath runtime context.
*
- * @return {@link org.apache.xpath.patterns.NodeTest.SCORE_NODETEST},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_NONE},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_NSWILD},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_QNAME}, or
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_OTHER}.
+ * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
*
* @throws javax.xml.transform.TransformerException
*/
1.7 +7 -6 xml-xalan/java/src/org/apache/xpath/patterns/FunctionPattern.java
Index: FunctionPattern.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/patterns/FunctionPattern.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionPattern.java 2000/12/17 19:31:25 1.6
+++ FunctionPattern.java 2001/01/02 03:47:18 1.7
@@ -100,7 +100,8 @@
calcTargetString();
}
- /** Should be a {@link org.apache.xpath.functions.Function expression}. */
+ /** Should be a {@link org.apache.xpath.functions.Function expression}.
+ * @serial */
Expression m_functionExpr;
/**
@@ -108,11 +109,11 @@
*
* @param xctxt XPath runtime context.
*
- * @return {@link org.apache.xpath.patterns.NodeTest.SCORE_NODETEST},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_NONE},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_NSWILD},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_QNAME}, or
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_OTHER}.
+ * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
*
* @throws javax.xml.transform.TransformerException
*/
1.16 +36 -36 xml-xalan/java/src/org/apache/xpath/patterns/NodeTest.java
Index: NodeTest.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/patterns/NodeTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- NodeTest.java 2000/12/18 08:53:28 1.15
+++ NodeTest.java 2001/01/02 03:47:18 1.16
@@ -83,32 +83,34 @@
/**
* This attribute determines which node types are accepted.
+ * @serial
*/
protected int m_whatToShow;
/** This bit specifies a namespace, and extends the SHOW_XXX stuff
- * in {@link org.w3c.dom.NodeFilter}. */
+ * in {@link org.w3c.dom.traversal.NodeFilter}. */
public static final int SHOW_NAMESPACE = 0x00001000;
/**
* Special bitmap for match patterns starting with a function.
- * Make sure this does not conflict with {@link org.w3c.dom.NodeFilter}.
+ * Make sure this does not conflict with {@link org.w3c.dom.traversal.NodeFilter}.
*/
public static final int SHOW_BYFUNCTION = 0x00010000;
/**
* This attribute determines which node types are accepted.
- * These constants are defined in the {@link org.w3c.dom.NodeFilter}
+ * These constants are defined in the {@link org.w3c.dom.traversal.NodeFilter}
* interface.
*
- * @return bitset mainly defined in {@link org.w3c.dom.NodeFilter}.
+ * @return bitset mainly defined in {@link org.w3c.dom.traversal.NodeFilter}.
*/
public int getWhatToShow()
{
return m_whatToShow;
}
- /** The namespace to be tested for, which may be null. */
+ /** The namespace to be tested for, which may be null.
+ * @serial */
String m_namespace;
/**
@@ -121,7 +123,8 @@
return m_namespace;
}
- /** The local name to be tested for. */
+ /** The local name to be tested for.
+ * @serial */
String m_name;
/**
@@ -140,40 +143,36 @@
* {@link #SCORE_NSWILD},
* {@link #SCORE_QNAME}, or
* {@link #SCORE_OTHER}.
+ * @serial
*/
XNumber m_score;
/**
* The match score if the pattern consists of just a NodeTest.
- * @see XSLT Specification -
- * <a href="http://www.w3.org/TR/xslt#conflict">5.5 Conflict Resolution for Template Rules</a> */
- static final XNumber SCORE_NODETEST =
+ * @see <a href="http://www.w3.org/TR/xslt#conflict">XSLT Specification - 5.5 Conflict Resolution for Template Rules</a> */
+ public static final XNumber SCORE_NODETEST =
new XNumber(XPath.MATCH_SCORE_NODETEST);
/**
* The match score if the pattern pattern has the form NCName:*.
- * @see XSLT Specification -
- * <a href="http://www.w3.org/TR/xslt#conflict">5.5 Conflict Resolution for Template Rules</a> */
- static final XNumber SCORE_NSWILD = new XNumber(XPath.MATCH_SCORE_NSWILD);
+ * @see <a href="http://www.w3.org/TR/xslt#conflict">XSLT Specification - 5.5 Conflict Resolution for Template Rules</a> */
+ public static final XNumber SCORE_NSWILD = new XNumber(XPath.MATCH_SCORE_NSWILD);
/**
* The match score if the pattern has the form
* of a QName optionally preceded by an @ character.
- * @see XSLT Specification -
- * <a href="http://www.w3.org/TR/xslt#conflict">5.5 Conflict Resolution for Template Rules</a> */
- static final XNumber SCORE_QNAME = new XNumber(XPath.MATCH_SCORE_QNAME);
+ * @see <a href="http://www.w3.org/TR/xslt#conflict">XSLT Specification - 5.5 Conflict Resolution for Template Rules</a> */
+ public static final XNumber SCORE_QNAME = new XNumber(XPath.MATCH_SCORE_QNAME);
/**
* The match score if the pattern consists of something
* other than just a NodeTest or just a qname.
- * @see XSLT Specification -
- * <a href="http://www.w3.org/TR/xslt#conflict">5.5 Conflict Resolution for Template Rules</a> */
- static final XNumber SCORE_OTHER = new XNumber(XPath.MATCH_SCORE_OTHER);
+ * @see <a href="http://www.w3.org/TR/xslt#conflict">XSLT Specification - 5.5 Conflict Resolution for Template Rules</a> */
+ public static final XNumber SCORE_OTHER = new XNumber(XPath.MATCH_SCORE_OTHER);
/**
* The match score if no match is made.
- * @see XSLT Specification -
- * <a href="http://www.w3.org/TR/xslt#conflict">5.5 Conflict Resolution for Template Rules</a> */
+ * @see <a href="http://www.w3.org/TR/xslt#conflict">XSLT Specification - 5.5 Conflict Resolution for Template Rules</a> */
public static final XNumber SCORE_NONE =
new XNumber(XPath.MATCH_SCORE_NONE);
@@ -181,7 +180,7 @@
* Construct an NodeTest that tests for namespaces and node names.
*
*
- * @param whatToShow Bit set defined mainly by {@link org.w3c.dom.NodeFilter}.
+ * @param whatToShow Bit set defined mainly by {@link org.w3c.dom.traversal.NodeFilter}.
* @param namespace The namespace to be tested.
* @param name The local name to be tested.
*/
@@ -194,7 +193,7 @@
* Construct an NodeTest that doesn't test for node names.
*
*
- * @param whatToShow Bit set defined mainly by {@link org.w3c.dom.NodeFilter}.
+ * @param whatToShow Bit set defined mainly by {@link org.w3c.dom.traversal.NodeFilter}.
*/
public NodeTest(int whatToShow)
{
@@ -211,7 +210,7 @@
* calculating the score that this test will return if a test succeeds.
*
*
- * @param whatToShow Bit set defined mainly by {@link org.w3c.dom.NodeFilter}.
+ * @param whatToShow Bit set defined mainly by {@link org.w3c.dom.traversal.NodeFilter}.
*/
public void initNodeTest(int whatToShow)
{
@@ -227,7 +226,7 @@
* calculating the score that this test will return if a test succeeds.
*
*
- * @param whatToShow Bit set defined mainly by {@link org.w3c.dom.NodeFilter}.
+ * @param whatToShow Bit set defined mainly by {@link org.w3c.dom.traversal.NodeFilter}.
* @param namespace The namespace to be tested.
* @param name The local name to be tested.
*/
@@ -241,7 +240,8 @@
calcScore();
}
- /** True if this test has a null namespace and a local name of {@link #WILD}. */
+ /** True if this test has a null namespace and a local name of {@link #WILD}.
+ * @serial */
private boolean m_isTotallyWild;
/**
@@ -278,7 +278,7 @@
* Do a diagnostics dump of a whatToShow bit set.
*
*
- * @param whatToShow Bit set defined mainly by {@link org.w3c.dom.NodeFilter}.
+ * @param whatToShow Bit set defined mainly by {@link org.w3c.dom.traversal.NodeFilter}.
*/
public static void debugWhatToShow(int whatToShow)
{
@@ -362,11 +362,11 @@
* @param xctxt XPath runtime context.
* @param context The node being tested.
*
- * @return {@link org.apache.xpath.patterns.NodeTest.SCORE_NODETEST},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_NONE},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_NSWILD},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_QNAME}, or
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_OTHER}.
+ * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
*
* @throws javax.xml.transform.TransformerException
*/
@@ -450,11 +450,11 @@
*
* @param xctxt XPath runtime context.
*
- * @return {@link org.apache.xpath.patterns.NodeTest.SCORE_NODETEST},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_NONE},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_NSWILD},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_QNAME}, or
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_OTHER}.
+ * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
*
* @throws javax.xml.transform.TransformerException
*/
1.18 +30 -26 xml-xalan/java/src/org/apache/xpath/patterns/StepPattern.java
Index: StepPattern.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/patterns/StepPattern.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- StepPattern.java 2000/12/27 22:26:06 1.17
+++ StepPattern.java 2001/01/02 03:47:18 1.18
@@ -78,12 +78,13 @@
* Construct a StepPattern that tests for namespaces and node names.
*
*
- * @param whatToShow Bit set defined mainly by {@link org.w3c.dom.NodeFilter}.
+ * @param whatToShow Bit set defined mainly by {@link org.w3c.dom.traversal.NodeFilter}.
* @param namespace The namespace to be tested.
* @param name The local name to be tested.
*/
public StepPattern(int whatToShow, String namespace, String name)
{
+
super(whatToShow, namespace, name);
}
@@ -91,21 +92,22 @@
* Construct a StepPattern that doesn't test for node names.
*
*
- * @param whatToShow Bit set defined mainly by {@link org.w3c.dom.NodeFilter}.
+ * @param whatToShow Bit set defined mainly by {@link org.w3c.dom.traversal.NodeFilter}.
*/
public StepPattern(int whatToShow)
{
super(whatToShow);
}
- /** The target local name or psuedo name, for hash table lookup optimization. */
+ /** The target local name or psuedo name, for hash table lookup optimization.
+ * @serial */
String m_targetString; // only calculate on head
/**
* Calculate the local name or psuedo name of the node that this pattern will test,
* for hash table lookup optimization.
*
- * @see {@link org.apache.xpath.compiler.PsuedoNames}.
+ * @see org.apache.xpath.compiler.PsuedoNames
*/
public void calcTargetString()
{
@@ -145,7 +147,7 @@
*
*
* @return local name or psuedo name of the node.
- * @see {@link org.apache.xpath.compiler.PsuedoNames}.
+ * @see org.apache.xpath.compiler.PsuedoNames
*/
public String getTargetString()
{
@@ -155,6 +157,7 @@
/**
* Reference to nodetest and predicate for
* parent or ancestor.
+ * @serial
*/
StepPattern m_relativePathPattern;
@@ -173,7 +176,8 @@
calcScore();
}
- /** The list of predicate expressions for this pattern step. */
+ /** The list of predicate expressions for this pattern step.
+ * @serial */
Expression[] m_predicates;
/**
@@ -257,11 +261,11 @@
*
* @param xctxt XPath runtime context.
*
- * @return {@link org.apache.xpath.patterns.NodeTest.SCORE_NODETEST},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_NONE},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_NSWILD},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_QNAME}, or
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_OTHER}.
+ * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
*
* @throws javax.xml.transform.TransformerException
*/
@@ -450,11 +454,11 @@
*
* @param xctxt The XPath runtime context.
*
- * @return {@link org.apache.xpath.patterns.NodeTest.SCORE_NODETEST},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_NONE},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_NSWILD},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_QNAME}, or
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_OTHER}.
+ * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
*
* @throws javax.xml.transform.TransformerException
*/
@@ -495,11 +499,11 @@
*
* @param xctxt XPath runtime context.
*
- * @return {@link org.apache.xpath.patterns.NodeTest.SCORE_NODETEST},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_NONE},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_NSWILD},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_QNAME}, or
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_OTHER}.
+ * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
*
* @throws javax.xml.transform.TransformerException
*/
@@ -528,11 +532,11 @@
* @param xctxt The XPath runtime context.
* @param context The node to be tested.
*
- * @return {@link org.apache.xpath.patterns.NodeTest.SCORE_NODETEST},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_NONE},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_NSWILD},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_QNAME}, or
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_OTHER}.
+ * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
*
* @throws javax.xml.transform.TransformerException
*/
1.7 +7 -6 xml-xalan/java/src/org/apache/xpath/patterns/UnionPattern.java
Index: UnionPattern.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/patterns/UnionPattern.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UnionPattern.java 2000/12/27 22:26:06 1.6
+++ UnionPattern.java 2001/01/02 03:47:19 1.7
@@ -68,7 +68,8 @@
public class UnionPattern extends Expression
{
- /** Array of the contained step patterns to be tested. */
+ /** Array of the contained step patterns to be tested.
+ * @serial */
private StepPattern[] m_patterns;
/**
@@ -118,11 +119,11 @@
*
* @param xctxt XPath runtime context.
*
- * @return {@link org.apache.xpath.patterns.NodeTest.SCORE_NODETEST},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_NONE},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_NSWILD},
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_QNAME}, or
- * {@link org.apache.xpath.patterns.NodeTest.SCORE_OTHER}.
+ * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
*
* @throws javax.xml.transform.TransformerException
*/
1.2 +1 -4 xml-xalan/java/src/org/apache/xpath/patterns/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/patterns/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 2000/07/06 02:28:32 1.1
+++ package.html 2001/01/02 03:47:19 1.2
@@ -2,10 +2,7 @@
<title>XPath nodetest and XSLT pattern matching support.</title>
<body>
<p>Implementation of XPath nodeTest support, and XSLT pattern matching support.<p>
- <dl>
- <dt><b>Version: </b></dt><dd>Alpha, 2.0.0, July 05, 2000</dd>
- <dt><b>Author: </b></dt><dd><a href="mailto:scott_boag@lotus.com">Scott Boag</a></dd>
- </dl>
</body>
+ </body>
</html>
1.2 +1 -4 xml-xalan/java/src/org/apache/xpath/res/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/res/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 2000/07/06 02:28:35 1.1
+++ package.html 2001/01/02 03:47:19 1.2
@@ -2,10 +2,7 @@
<title>XPath resources.</title>
<body>
<p>Contains strings for XPath support that require internationalization.<p>
- <dl>
- <dt><b>Version: </b></dt><dd>Alpha, 2.0.0, July 05, 2000</dd>
- <dt><b>Author: </b></dt><dd><a href="mailto:scott_boag@lotus.com">Scott Boag</a></dd>
- </dl>
</body>
+ </body>
</html>