zongaro 2002/11/13 09:03:23
Modified: java/src/org/apache/xalan/xsltc/compiler Tag: XSLTC_DTM
Constants.java Key.java KeyCall.java
java/src/org/apache/xalan/xsltc/dom Tag: XSLTC_DTM
DOMAdapter.java MultiDOM.java
java/src/org/apache/xalan/xsltc Tag: XSLTC_DTM DOM.java
Log:
Renamed getNodeValue method in XSLTC's DOM to getStringValueX - meaning "get
the string value of a node according to XPath's definition." The old
getNodeValue overrode DTM's getNodeValue with slightly different semantics and
a slightly higher cost in terms of performance.
Revision Changes Path
No revision
No revision
1.19.2.8 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Constants.java,v
retrieving revision 1.19.2.7
retrieving revision 1.19.2.8
diff -u -r1.19.2.7 -r1.19.2.8
--- Constants.java 5 Nov 2002 10:41:37 -0000 1.19.2.7
+++ Constants.java 13 Nov 2002 17:03:13 -0000 1.19.2.8
@@ -340,7 +340,7 @@
public static final String GET_NODE_TYPE
= "getNodeType";
public static final String GET_NODE_VALUE
- = "getNodeValue";
+ = "getStringValueX";
public static final String GET_ELEMENT_VALUE
= "getElementValue";
public static final String GET_ATTRIBUTE_VALUE
1.10.6.5 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Key.java
Index: Key.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Key.java,v
retrieving revision 1.10.6.4
retrieving revision 1.10.6.5
diff -u -r1.10.6.4 -r1.10.6.5
--- Key.java 5 Nov 2002 10:41:37 -0000 1.10.6.4
+++ Key.java 13 Nov 2002 17:03:16 -0000 1.10.6.5
@@ -156,9 +156,9 @@
final ConstantPoolGen cpg = classGen.getConstantPool();
final InstructionList il = methodGen.getInstructionList();
- // DOM.getNodeValue(nodeIndex) => String
+ // DOM.getStringValueX(nodeIndex) => String
final int getNodeValue = cpg.addInterfaceMethodref(DOM_INTF,
- "getNodeValue",
+ GET_NODE_VALUE,
"(I)"+STRING_SIG);
final int getNodeIdent = cpg.addInterfaceMethodref(DOM_INTF,
1.7.6.5 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/KeyCall.java
Index: KeyCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/KeyCall.java,v
retrieving revision 1.7.6.4
retrieving revision 1.7.6.5
diff -u -r1.7.6.4 -r1.7.6.5
--- KeyCall.java 5 Nov 2002 10:41:37 -0000 1.7.6.4
+++ KeyCall.java 13 Nov 2002 17:03:16 -0000 1.7.6.5
@@ -209,7 +209,7 @@
// Returns the string value for a node in the DOM
final int getNodeValue = cpg.addInterfaceMethodref(DOM_INTF,
- "getNodeValue",
+ GET_NODE_VALUE,
"(I)"+STRING_SIG);
// Returns the KeyIndex object of a given name
No revision
No revision
1.11.10.8 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMAdapter.java
Index: DOMAdapter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMAdapter.java,v
retrieving revision 1.11.10.7
retrieving revision 1.11.10.8
diff -u -r1.11.10.7 -r1.11.10.8
--- DOMAdapter.java 5 Nov 2002 10:41:44 -0000 1.11.10.7
+++ DOMAdapter.java 13 Nov 2002 17:03:22 -0000 1.11.10.8
@@ -317,11 +317,11 @@
return _dom.getNamespaceName(node);
}
- public String getNodeValue(final int node)
+ public String getStringValueX(final int node)
{
if (node == DTM.NULL)
return "";
- return _dom.getNodeValue(node);
+ return _dom.getStringValueX(node);
}
public void copy(final int node, TransletOutputHandler handler)
1.16.10.8 +4 -4
xml-xalan/java/src/org/apache/xalan/xsltc/dom/MultiDOM.java
Index: MultiDOM.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/MultiDOM.java,v
retrieving revision 1.16.10.7
retrieving revision 1.16.10.8
diff -u -r1.16.10.7 -r1.16.10.8
--- MultiDOM.java 5 Nov 2002 10:41:45 -0000 1.16.10.7
+++ MultiDOM.java 13 Nov 2002 17:03:22 -0000 1.16.10.8
@@ -234,7 +234,7 @@
int node;
while ((node = _source.next()) != END) {
- String val = getNodeValue(node);
+ String val = getStringValueX(node);
if (_value.equals(val) == _op) {
if (_returnType == RETURN_CURRENT)
return returnNode(node);
@@ -453,11 +453,11 @@
return _adapters[getDTMId(node)].getNamespaceName(node & CLR);
}
- public String getNodeValue(final int node) {
+ public String getStringValueX(final int node) {
if (node == DTM.NULL) {
return "";
}
- return _adapters[getDTMId(node)].getNodeValue(node & CLR);
+ return _adapters[getDTMId(node)].getStringValueX(node & CLR);
}
public void copy(final int node, TransletOutputHandler handler)
No revision
No revision
1.9.10.7 +2 -2 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.9.10.6
retrieving revision 1.9.10.7
diff -u -r1.9.10.6 -r1.9.10.7
--- DOM.java 5 Nov 2002 10:41:35 -0000 1.9.10.6
+++ DOM.java 13 Nov 2002 17:03:22 -0000 1.9.10.7
@@ -103,7 +103,7 @@
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 String getStringValueX(final int node);
public void copy(final int node, TransletOutputHandler handler)
throws TransletException;
public void copy(DTMAxisIterator nodes, TransletOutputHandler handler)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
