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 2002/11/11 20:51:18 UTC
cvs commit: xml-xalan/java/src/org/apache/xpath/seqctor ExprSequenceIter.java FLWRIter.java RangeIter.java
jkesselm 2002/11/11 11:51:18
Modified: java/samples/extensions/sql Tag: xslt20 Xalan SQL
Extension.doc
java/src/org/apache/xalan/templates Tag: xslt20
ElemForEach.java FuncKey.java
java/src/org/apache/xml/dtm Tag: xslt20 DTMIterator.java
java/src/org/apache/xml/dtm/dom2dtm2 Tag: xslt20
DOM2DTM2Base.java NodeDTMIDResolver_xerces.java
java/src/org/apache/xml/dtm/ref Tag: xslt20
DTMDefaultBaseTraversers.java
DTMManagerDefault.java DTMNodeList.java
DTMNodeProxy.java ExpandedNameTable.java
java/src/org/apache/xpath Tag: xslt20 NodeSetDTM.java
java/src/org/apache/xpath/axes Tag: xslt20
ExceptPathIterator.java
FilterExprIteratorSimple.java LocPathIterator.java
java/src/org/apache/xpath/objects Tag: xslt20
NodeSequence.java XDTMSequence.java
XNodeSequenceSingleton.java XNodeSet.java
XSequence.java XSequenceCachedBase.java
XSequenceEmpty.java XSequenceImpl.java
XSequenceSingleton.java
java/src/org/apache/xpath/seqctor Tag: xslt20
ExprSequenceIter.java FLWRIter.java RangeIter.java
Log:
Merging DTM changes from main branch.
Revision Changes Path
No revision
No revision
No revision
No revision
No revision
No revision
No revision
1.29.2.1.2.1 +2 -2 xml-xalan/java/src/org/apache/xalan/templates/ElemForEach.java
Index: ElemForEach.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemForEach.java,v
retrieving revision 1.29.2.1
retrieving revision 1.29.2.1.2.1
diff -u -r1.29.2.1 -r1.29.2.1.2.1
--- ElemForEach.java 14 Aug 2002 19:21:28 -0000 1.29.2.1
+++ ElemForEach.java 11 Nov 2002 19:51:16 -0000 1.29.2.1.2.1
@@ -339,7 +339,7 @@
{
NodeSorter sorter = new NodeSorter(xctxt);
- sourceNodes.setShouldCache(true);
+ sourceNodes.setShouldCacheNodes(true);
sourceNodes.runTo(-1);
xctxt.pushContextNodeList(sourceNodes);
@@ -374,7 +374,7 @@
{
ItemSorter sorter = new ItemSorter(xctxt);
- sequence.setShouldCache(true);
+ sequence.setShouldCacheNodes(true);
sequence.getLength(); // force cache to fill up.
xctxt.pushContextSequence(sequence);
1.14.4.1.2.1 +1 -1 xml-xalan/java/src/org/apache/xalan/templates/FuncKey.java
Index: FuncKey.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/FuncKey.java,v
retrieving revision 1.14.4.1
retrieving revision 1.14.4.1.2.1
diff -u -r1.14.4.1 -r1.14.4.1.2.1
--- FuncKey.java 14 Aug 2002 19:21:28 -0000 1.14.4.1
+++ FuncKey.java 11 Nov 2002 19:51:16 -0000 1.14.4.1.2.1
@@ -127,7 +127,7 @@
if(argIsNodeSetDTM)
{
XSequence ns = arg.xseq();
- ns.setShouldCache(true);
+ ns.setShouldCacheNodes(true);
int len = ns.getLength();
if(len <= 1)
argIsNodeSetDTM = false;
No revision
No revision
1.4.14.1.2.1 +2 -2 xml-xalan/java/src/org/apache/xml/dtm/DTMIterator.java
Index: DTMIterator.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/DTMIterator.java,v
retrieving revision 1.4.14.1
retrieving revision 1.4.14.1.2.1
diff -u -r1.4.14.1 -r1.4.14.1.2.1
--- DTMIterator.java 14 Aug 2002 19:45:33 -0000 1.4.14.1
+++ DTMIterator.java 11 Nov 2002 19:51:16 -0000 1.4.14.1.2.1
@@ -267,7 +267,7 @@
*
* @param b true if the nodes should be cached.
*/
- public void setShouldCache(boolean b);
+ public void setShouldCacheNodes(boolean b);
/**
* Tells if this iterator can have nodes added to it or set via
@@ -378,5 +378,5 @@
* types.
*/
public int getAxis();
-
+
}
No revision
No revision
1.1.2.3 +1 -1 xml-xalan/java/src/org/apache/xml/dtm/dom2dtm2/Attic/DOM2DTM2Base.java
Index: DOM2DTM2Base.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/dom2dtm2/Attic/DOM2DTM2Base.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- DOM2DTM2Base.java 11 Oct 2002 17:53:14 -0000 1.1.2.2
+++ DOM2DTM2Base.java 11 Nov 2002 19:51:16 -0000 1.1.2.3
@@ -113,7 +113,7 @@
protected Node m_root;
/** Tool for mapping DOM to node identities */
- protected NodeDTMIDResolver m_resolver;
+ protected org.apache.xml.dtm.dom2dtm2.NodeDTMIDResolver m_resolver;
/** Base URI for document */
protected String m_documentBaseURI;
1.1.2.4 +0 -4 xml-xalan/java/src/org/apache/xml/dtm/dom2dtm2/Attic/NodeDTMIDResolver_xerces.java
Index: NodeDTMIDResolver_xerces.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/dom2dtm2/Attic/NodeDTMIDResolver_xerces.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- NodeDTMIDResolver_xerces.java 22 Oct 2002 20:00:47 -0000 1.1.2.3
+++ NodeDTMIDResolver_xerces.java 11 Nov 2002 19:51:16 -0000 1.1.2.4
@@ -535,10 +535,6 @@
return ORDER_UNDEFINED;
if(n1==n2)
return true;
-
- /* DEBUGGING HOOK, REMEMBER TO REMOVE -- GONK! */
- String DBG_N1=n1.getNodeName()+"="+n1.getNodeValue();
- String DBG_N2=n2==null ? null : n2.getNodeName()+"="+n2.getNodeValue();
// Problem: Our synthetic namespace nodes for xml: can't
// (of course) be tested by Xerces and require a few
No revision
No revision
1.11.2.1.2.2 +1 -2 xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java
Index: DTMDefaultBaseTraversers.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java,v
retrieving revision 1.11.2.1.2.1
retrieving revision 1.11.2.1.2.2
diff -u -r1.11.2.1.2.1 -r1.11.2.1.2.2
--- DTMDefaultBaseTraversers.java 30 Sep 2002 15:33:22 -0000 1.11.2.1.2.1
+++ DTMDefaultBaseTraversers.java 11 Nov 2002 19:51:17 -0000 1.11.2.1.2.2
@@ -195,8 +195,7 @@
}
if (null == traverser)
- throw new DTMException("Axis traverser not supported: "
- + Axis.names[axis]);
+ throw new DTMException(XSLMessages.createMessage(XSLTErrorResources.ER_AXIS_TRAVERSER_NOT_SUPPORTED, new Object[]{Axis.names[axis]})); //"Axis traverser not supported: " + Axis.names[axis]);
m_traversers[axis] = traverser;
1.41.6.1.2.5 +1 -1 xml-xalan/java/src/org/apache/xml/dtm/ref/DTMManagerDefault.java
Index: DTMManagerDefault.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMManagerDefault.java,v
retrieving revision 1.41.6.1.2.4
retrieving revision 1.41.6.1.2.5
diff -u -r1.41.6.1.2.4 -r1.41.6.1.2.5
--- DTMManagerDefault.java 30 Sep 2002 16:53:57 -0000 1.41.6.1.2.4
+++ DTMManagerDefault.java 11 Nov 2002 19:51:17 -0000 1.41.6.1.2.5
@@ -126,7 +126,7 @@
// Set true to attempt loading DOMs via our experimental
// DOM2DTM2 wrapper. If false, or if that fails, we fall
// back on standard DOM2DTM.
- private static final boolean ATTEMPT_DOM2DTM2=false;
+ private static final boolean ATTEMPT_DOM2DTM2=false;//true;
/** Set this to true if you want a dump of the DTM after creation. */
1.5.14.1.2.1 +1 -1 xml-xalan/java/src/org/apache/xml/dtm/ref/DTMNodeList.java
Index: DTMNodeList.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMNodeList.java,v
retrieving revision 1.5.14.1
retrieving revision 1.5.14.1.2.1
diff -u -r1.5.14.1 -r1.5.14.1.2.1
--- DTMNodeList.java 14 Aug 2002 19:45:34 -0000 1.5.14.1
+++ DTMNodeList.java 11 Nov 2002 19:51:17 -0000 1.5.14.1.2.1
@@ -112,7 +112,7 @@
dtm_iter=(DTMIterator)dtmIterator.cloneWithReset();
}
catch(CloneNotSupportedException cnse) {}
- dtm_iter.setShouldCache(true);
+ dtm_iter.setShouldCacheNodes(true);
dtm_iter.runTo(-1);
dtm_iter.setCurrentPos(pos);
}
1.13.12.1 +10 -0 xml-xalan/java/src/org/apache/xml/dtm/ref/DTMNodeProxy.java
Index: DTMNodeProxy.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMNodeProxy.java,v
retrieving revision 1.13
retrieving revision 1.13.12.1
diff -u -r1.13 -r1.13.12.1
--- DTMNodeProxy.java 8 Feb 2002 23:33:50 -0000 1.13
+++ DTMNodeProxy.java 11 Nov 2002 19:51:17 -0000 1.13.12.1
@@ -306,6 +306,16 @@
}
/**
+ * @return The string value of the node
+ *
+ * @throws DOMException
+ */
+ public final String getStringValue() throws DOMException
+ {
+ return dtm.getStringValue(node).toString();
+ }
+
+ /**
*
* @param nodeValue
*
1.6.2.1.2.1 +55 -40 xml-xalan/java/src/org/apache/xml/dtm/ref/ExpandedNameTable.java
Index: ExpandedNameTable.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/ExpandedNameTable.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.1.2.1
diff -u -r1.6.2.1 -r1.6.2.1.2.1
--- ExpandedNameTable.java 14 Aug 2002 19:45:34 -0000 1.6.2.1
+++ ExpandedNameTable.java 11 Nov 2002 19:51:17 -0000 1.6.2.1.2.1
@@ -84,10 +84,10 @@
static final Object UNKNOWN_SCHEMA_TYPE=Boolean.FALSE;
/** Probably a reference to static pool. */
- private DTMStringPool m_locNamesPool;
+ //private DTMStringPool m_locNamesPool;
/** Probably a reference to static pool. */
- private DTMStringPool m_namespaceNames;
+ //private DTMStringPool m_namespaceNames;
/** Vector of extended types for this document */
private /*static*/ Vector m_extendedTypes;
@@ -112,18 +112,37 @@
Hashtable m_hashtable = new Hashtable();
- /** Workspace for lookup. NOT THREAD SAFE!
- * */
- ExtendedType hashET=new ExtendedType(-1,"","");
+ /** Workspace for lookup. NOT THREAD SAFE!
+ * */
+ ExtendedType hashET=new ExtendedType(-1,"","");
+ private static Hashtable m_defaultHashtable;
+ private static Vector m_defaultExtendedTypes;
+
+ /**
+ * Init default vales
+ */
+ static {
+ // use bigger values than default, to avoid reallocation in the future
+ m_defaultExtendedTypes = new Vector(23);
+ m_defaultHashtable = new Hashtable(23, 0.75f);
+
+ for (int i = 0; i < DTM.NTYPES; i++)
+ {
+ ExtendedType newET = new ExtendedType(i, "", "");
+ m_defaultExtendedTypes.addElement(newET);
+ m_defaultHashtable.put(newET, new Integer(i));
+ }
+ }
+
/**
* Create an expanded name table that uses private string pool lookup.
*/
public ExpandedNameTable()
{
- m_locNamesPool = new DTMSafeStringPool();
- m_namespaceNames = new DTMSafeStringPool();
+ //m_locNamesPool = new DTMSafeStringPool();
+ //m_namespaceNames = new DTMSafeStringPool();
initExtendedTypes();
}
@@ -136,8 +155,8 @@
public ExpandedNameTable(DTMStringPool locNamesPool,
DTMStringPool namespaceNames)
{
- m_locNamesPool = locNamesPool;
- m_namespaceNames = namespaceNames;
+ //m_locNamesPool = locNamesPool;
+ //m_namespaceNames = namespaceNames;
initExtendedTypes();
}
@@ -147,14 +166,10 @@
*/
private void initExtendedTypes()
{
- m_extendedTypes = new Vector();
- int i;
- for (i = 0; i < DTM.NTYPES; i++)
- {
- ExtendedType newET = new ExtendedType(i, "", "");
- m_extendedTypes.addElement(newET);
- m_hashtable.put(newET, new Integer(i));
- }
+ // Since objects in the Vector a m_extendedTypes and m_hashtable are never changed
+ // it should be safe to copy default tables
+ m_extendedTypes = (Vector)m_defaultExtendedTypes.clone();
+ m_hashtable = (Hashtable)m_defaultHashtable.clone();
m_nextType = m_extendedTypes.size();
}
@@ -322,7 +337,7 @@
/**
* Private class representing an extended type object
*/
- private class ExtendedType
+ private static class ExtendedType
{
protected Object schemaType=UNKNOWN_SCHEMA_TYPE;
@@ -360,27 +375,27 @@
/* Override super method
* */
- public boolean equals(Object other)
- {
- //Usually an optimization, but
- // won't arise in our usage:
- //if(other==this) return true;
- try
- {
- ExtendedType et=(ExtendedType)other;
- return et.nodetype==this.nodetype &&
- et.localName.equals(this.localName) &&
- et.namespace.equals(this.namespace);
- }
- catch(ClassCastException e)
- {
- return false;
- }
- catch(NullPointerException e)
- {
- return false;
- }
- }
+ public boolean equals(Object other)
+ {
+ //Usually an optimization, but
+ // won't arise in our usage:
+ //if(other==this) return true;
+ try
+ {
+ ExtendedType et=(ExtendedType)other;
+ return et.nodetype==this.nodetype &&
+ et.localName.equals(this.localName) &&
+ et.namespace.equals(this.namespace);
+ }
+ catch(ClassCastException e)
+ {
+ return false;
+ }
+ catch(NullPointerException e)
+ {
+ return false;
+ }
+ }
}
-
+
}
No revision
No revision
1.10.2.1.2.1 +1 -1 xml-xalan/java/src/org/apache/xpath/NodeSetDTM.java
Index: NodeSetDTM.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/NodeSetDTM.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.1.2.1
diff -u -r1.10.2.1 -r1.10.2.1.2.1
--- NodeSetDTM.java 14 Aug 2002 20:06:57 -0000 1.10.2.1
+++ NodeSetDTM.java 11 Nov 2002 19:51:17 -0000 1.10.2.1.2.1
@@ -1235,7 +1235,7 @@
* request caching after we've already begun stepping through the
* nodes in this set.
*/
- public void setShouldCache(boolean b)
+ public void setShouldCacheNodes(boolean b)
{
if (!isFresh())
No revision
No revision
1.1.2.4 +1 -1 xml-xalan/java/src/org/apache/xpath/axes/Attic/ExceptPathIterator.java
Index: ExceptPathIterator.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/Attic/ExceptPathIterator.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ExceptPathIterator.java 7 Oct 2002 18:49:17 -0000 1.1.2.3
+++ ExceptPathIterator.java 11 Nov 2002 19:51:17 -0000 1.1.2.4
@@ -108,7 +108,7 @@
{
DTMIterator iter = m_exprs[i].asIterator(m_execContext, context);
newIters[i] = iter;
- iter.setShouldCache(true);
+ iter.setShouldCacheNodes(true);
iter.nextNode();
}
m_iterators = newIters;
1.2.4.1.2.2 +1 -1 xml-xalan/java/src/org/apache/xpath/axes/FilterExprIteratorSimple.java
Index: FilterExprIteratorSimple.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/FilterExprIteratorSimple.java,v
retrieving revision 1.2.4.1.2.1
retrieving revision 1.2.4.1.2.2
diff -u -r1.2.4.1.2.1 -r1.2.4.1.2.2
--- FilterExprIteratorSimple.java 6 Sep 2002 15:06:06 -0000 1.2.4.1.2.1
+++ FilterExprIteratorSimple.java 11 Nov 2002 19:51:17 -0000 1.2.4.1.2.2
@@ -106,7 +106,7 @@
vars.setStackFrame(stackFrame);
result = (XSequence) expr.execute(xctxt);
- result.setShouldCache(true);
+ result.setShouldCacheNodes(true);
// These two statements need to be combined into one operation.
vars.setStackFrame(savedStart);
1.35.2.1.2.1 +1 -1 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.35.2.1
retrieving revision 1.35.2.1.2.1
diff -u -r1.35.2.1 -r1.35.2.1.2.1
--- LocPathIterator.java 14 Aug 2002 20:06:57 -0000 1.35.2.1
+++ LocPathIterator.java 11 Nov 2002 19:51:17 -0000 1.35.2.1.2.1
@@ -428,7 +428,7 @@
*
* @param b True if this iterator should cache nodes.
*/
- public void setShouldCache(boolean b)
+ public void setShouldCacheNodes(boolean b)
{
assertion(false, "setShouldCache not supported by this iterater!");
No revision
No revision
1.1.2.1.2.1 +4 -4 xml-xalan/java/src/org/apache/xpath/objects/Attic/NodeSequence.java
Index: NodeSequence.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/Attic/NodeSequence.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -r1.1.2.1 -r1.1.2.1.2.1
--- NodeSequence.java 14 Aug 2002 20:07:03 -0000 1.1.2.1
+++ NodeSequence.java 11 Nov 2002 19:51:17 -0000 1.1.2.1.2.1
@@ -169,7 +169,7 @@
m_dtmMgr = xctxt.getDTMManager();
setIter(iter);
setRoot(context, xctxt);
- setShouldCache(shouldCacheNodes);
+ setShouldCacheNodes(shouldCacheNodes);
}
/**
@@ -284,7 +284,7 @@
if(!m_iter.isDocOrdered())
{
if(!hasCache())
- setShouldCache(true);
+ setShouldCacheNodes(true);
runTo(-1);
m_next=0;
}
@@ -419,7 +419,7 @@
{
if((false == allowRelease) && !hasCache())
{
- setShouldCache(true);
+ setShouldCacheNodes(true);
}
if(null != m_iter)
@@ -461,7 +461,7 @@
/**
* @see DTMIterator#setShouldCache(boolean)
*/
- public void setShouldCache(boolean b)
+ public void setShouldCacheNodes(boolean b)
{
if (b)
{
1.1.2.1.2.2 +1 -1 xml-xalan/java/src/org/apache/xpath/objects/Attic/XDTMSequence.java
Index: XDTMSequence.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/Attic/XDTMSequence.java,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- XDTMSequence.java 29 Oct 2002 20:38:00 -0000 1.1.2.1.2.1
+++ XDTMSequence.java 11 Nov 2002 19:51:17 -0000 1.1.2.1.2.2
@@ -304,7 +304,7 @@
* This method performs no actions.
* @see org.apache.xml.dtm.XSequence#setShouldCache(boolean)
*/
- public void setShouldCache(boolean b)
+ public void setShouldCacheNodes(boolean b)
{
// Ignore. We always cache.
}
1.1.2.1.2.1 +1 -1 xml-xalan/java/src/org/apache/xpath/objects/Attic/XNodeSequenceSingleton.java
Index: XNodeSequenceSingleton.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/Attic/XNodeSequenceSingleton.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -r1.1.2.1 -r1.1.2.1.2.1
--- XNodeSequenceSingleton.java 14 Aug 2002 20:07:03 -0000 1.1.2.1
+++ XNodeSequenceSingleton.java 11 Nov 2002 19:51:17 -0000 1.1.2.1.2.1
@@ -245,7 +245,7 @@
/**
* @see org.apache.xpath.objects.XSequence#setShouldCache(boolean)
*/
- public void setShouldCache(boolean b)
+ public void setShouldCacheNodes(boolean b)
{
}
1.21.6.1.2.2 +1 -1 xml-xalan/java/src/org/apache/xpath/objects/XNodeSet.java
Index: XNodeSet.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XNodeSet.java,v
retrieving revision 1.21.6.1.2.1
retrieving revision 1.21.6.1.2.2
diff -u -r1.21.6.1.2.1 -r1.21.6.1.2.2
--- XNodeSet.java 11 Oct 2002 21:23:20 -0000 1.21.6.1.2.1
+++ XNodeSet.java 11 Nov 2002 19:51:17 -0000 1.21.6.1.2.2
@@ -112,7 +112,7 @@
m_dtmMgr = xns.m_dtmMgr;
m_last = xns.m_last;
if(!xns.hasCache())
- xns.setShouldCache(true);
+ xns.setShouldCacheNodes(true);
m_obj = xns.m_obj;
}
else
1.1.2.1.2.1 +1 -1 xml-xalan/java/src/org/apache/xpath/objects/Attic/XSequence.java
Index: XSequence.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/Attic/XSequence.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -r1.1.2.1 -r1.1.2.1.2.1
--- XSequence.java 14 Aug 2002 20:07:03 -0000 1.1.2.1
+++ XSequence.java 11 Nov 2002 19:51:17 -0000 1.1.2.1.2.1
@@ -198,7 +198,7 @@
* @param b true if the items should be cached.
* @throws exception if XSequence can't cache.
*/
- public void setShouldCache(boolean b);
+ public void setShouldCacheNodes(boolean b);
/**
* Tell if the random access methods (i.e. those methods
1.1.2.1.2.1 +2 -2 xml-xalan/java/src/org/apache/xpath/objects/Attic/XSequenceCachedBase.java
Index: XSequenceCachedBase.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/Attic/XSequenceCachedBase.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -r1.1.2.1 -r1.1.2.1.2.1
--- XSequenceCachedBase.java 14 Aug 2002 20:07:03 -0000 1.1.2.1
+++ XSequenceCachedBase.java 11 Nov 2002 19:51:17 -0000 1.1.2.1.2.1
@@ -232,7 +232,7 @@
/**
* @see org.apache.xpath.objects.XSequence#setShouldCache(boolean)
*/
- public void setShouldCache(boolean b)
+ public void setShouldCacheNodes(boolean b)
{
if(!isFresh())
throw new RuntimeException(this.getClass().getName()+" cache can not be changed after it has started!");
@@ -304,7 +304,7 @@
public int getLength()
{
if(isFresh())
- setShouldCache(true);
+ setShouldCacheNodes(true);
else if(!getIsRandomAccess())
throw new RuntimeException("This "+this.getClass().getName()+" is not set for random access!");
1.1.2.1.2.1 +1 -1 xml-xalan/java/src/org/apache/xpath/objects/Attic/XSequenceEmpty.java
Index: XSequenceEmpty.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/Attic/XSequenceEmpty.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -r1.1.2.1 -r1.1.2.1.2.1
--- XSequenceEmpty.java 14 Aug 2002 20:07:03 -0000 1.1.2.1
+++ XSequenceEmpty.java 11 Nov 2002 19:51:17 -0000 1.1.2.1.2.1
@@ -230,7 +230,7 @@
* Calling this method doesn't do anything.
* @see org.apache.xml.dtm.XSequence#setShouldCache(boolean)
*/
- public void setShouldCache(boolean b)
+ public void setShouldCacheNodes(boolean b)
{
}
1.1.2.1.2.1 +1 -1 xml-xalan/java/src/org/apache/xpath/objects/Attic/XSequenceImpl.java
Index: XSequenceImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/Attic/XSequenceImpl.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -r1.1.2.1 -r1.1.2.1.2.1
--- XSequenceImpl.java 14 Aug 2002 20:07:03 -0000 1.1.2.1
+++ XSequenceImpl.java 11 Nov 2002 19:51:17 -0000 1.1.2.1.2.1
@@ -480,7 +480,7 @@
* This method performs no actions.
* @see org.apache.xml.dtm.XSequence#setShouldCache(boolean)
*/
- public void setShouldCache(boolean b)
+ public void setShouldCacheNodes(boolean b)
{
// Ignore. We always cache.
}
1.1.2.1.2.1 +1 -1 xml-xalan/java/src/org/apache/xpath/objects/Attic/XSequenceSingleton.java
Index: XSequenceSingleton.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/Attic/XSequenceSingleton.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -r1.1.2.1 -r1.1.2.1.2.1
--- XSequenceSingleton.java 14 Aug 2002 20:07:03 -0000 1.1.2.1
+++ XSequenceSingleton.java 11 Nov 2002 19:51:17 -0000 1.1.2.1.2.1
@@ -198,7 +198,7 @@
/**
* @see org.apache.xml.dtm.XSequence#setShouldCache(boolean)
*/
- public void setShouldCache(boolean b)
+ public void setShouldCacheNodes(boolean b)
{
}
No revision
No revision
1.1.2.1.2.1 +1 -1 xml-xalan/java/src/org/apache/xpath/seqctor/Attic/ExprSequenceIter.java
Index: ExprSequenceIter.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/seqctor/Attic/ExprSequenceIter.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -r1.1.2.1 -r1.1.2.1.2.1
--- ExprSequenceIter.java 14 Aug 2002 20:07:10 -0000 1.1.2.1
+++ ExprSequenceIter.java 11 Nov 2002 19:51:18 -0000 1.1.2.1.2.1
@@ -87,7 +87,7 @@
public ExprSequenceIter(Vector exprs, XPathContext xctxt)
{
super(xctxt);
- this.setShouldCache(true); // for now!
+ this.setShouldCacheNodes(true); // for now!
m_exprs = exprs;
m_contextItem = xctxt.getCurrentItem();
}
1.1.2.1.2.1 +1 -1 xml-xalan/java/src/org/apache/xpath/seqctor/Attic/FLWRIter.java
Index: FLWRIter.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/seqctor/Attic/FLWRIter.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -r1.1.2.1 -r1.1.2.1.2.1
--- FLWRIter.java 14 Aug 2002 20:07:10 -0000 1.1.2.1
+++ FLWRIter.java 11 Nov 2002 19:51:18 -0000 1.1.2.1.2.1
@@ -95,7 +95,7 @@
public FLWRIter(Binding[] bindings, Expression returnExpr, XPathContext xctxt)
{
super(xctxt);
- setShouldCache(true);
+ setShouldCacheNodes(true);
m_xctxt = xctxt;
m_returnExpr = returnExpr;
m_bindings = bindings;
1.1.2.1.2.1 +1 -1 xml-xalan/java/src/org/apache/xpath/seqctor/Attic/RangeIter.java
Index: RangeIter.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/seqctor/Attic/RangeIter.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -r1.1.2.1 -r1.1.2.1.2.1
--- RangeIter.java 14 Aug 2002 20:07:10 -0000 1.1.2.1
+++ RangeIter.java 11 Nov 2002 19:51:18 -0000 1.1.2.1.2.1
@@ -194,7 +194,7 @@
/**
* @see org.apache.xpath.objects.XSequence#setShouldCache(boolean)
*/
- public void setShouldCache(boolean b)
+ public void setShouldCacheNodes(boolean b)
{
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org