[Exist-commits] eXist-1.0/src/org/exist/dom ExtArrayNodeSet.java,1.13,1.14 NodeProxy.java,1.25,1.26 VirtualNodeSet.java,1.32,1.33

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/dom
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20167/src/org/exist/dom

Modified Files:
	ExtArrayNodeSet.java NodeProxy.java VirtualNodeSet.java 
Log Message:
Improved page organization in dom.dbx to fix known XUpdate issues.

Index: NodeProxy.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/NodeProxy.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** NodeProxy.java	25 Feb 2004 15:31:58 -0000	1.25
--- NodeProxy.java	14 Apr 2004 12:17:22 -0000	1.26
***************
*** 85,88 ****
--- 85,89 ----
  
  	private ContextItem context = null;
+ 	
  	private long internalAddress = -1;
  
***************
*** 290,294 ****
  	public static class NodeProxyComparator implements Comparator {
  
! 		public static NodeProxyComparator instance = new NodeProxyComparator();
  
  		public int compare(Object obj1, Object obj2) {
--- 291,295 ----
  	public static class NodeProxyComparator implements Comparator {
  
! 		public final static NodeProxyComparator instance = new NodeProxyComparator();
  
  		public int compare(Object obj1, Object obj2) {

Index: VirtualNodeSet.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/VirtualNodeSet.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** VirtualNodeSet.java	29 Jan 2004 15:06:46 -0000	1.32
--- VirtualNodeSet.java	14 Apr 2004 12:17:22 -0000	1.33
***************
*** 57,63 ****
  	protected boolean useSelfAsContext = false;
  
- 	private int lastDocAdded = -1;
- 	private int sizeHint = -1;
- 
  	public VirtualNodeSet(int axis, NodeTest test, NodeSet context) {
  		this.axis = axis;
--- 57,60 ----

Index: ExtArrayNodeSet.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/ExtArrayNodeSet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ExtArrayNodeSet.java	25 Mar 2004 12:50:49 -0000	1.13
--- ExtArrayNodeSet.java	14 Apr 2004 12:17:22 -0000	1.14
***************
*** 139,143 ****
  	public Iterator iterator() {
  		sort();
! 		return new ExtArrayIterator();
  	}
  
--- 139,143 ----
  	public Iterator iterator() {
  		sort();
! 		return new ExtArrayIterator(map);
  	}
  
***************
*** 149,153 ****
  	public SequenceIterator iterate() {
  		sortInDocumentOrder();
! 		return new ExtArrayIterator();
  	}
  
--- 149,153 ----
  	public SequenceIterator iterate() {
  		sortInDocumentOrder();
! 		return new ExtArrayIterator(map);
  	}
  
***************
*** 159,163 ****
  	public SequenceIterator unorderedIterator() {
  		sort();
! 		return new ExtArrayIterator();
  	}
  
--- 159,163 ----
  	public SequenceIterator unorderedIterator() {
  		sort();
! 		return new ExtArrayIterator(map);
  	}
  
***************
*** 618,622 ****
  		}
  	}
! 	private class ExtArrayIterator implements Iterator, SequenceIterator {
  
  		Iterator docsIterator;
--- 618,622 ----
  		}
  	}
! 	private static class ExtArrayIterator implements Iterator, SequenceIterator {
  
  		Iterator docsIterator;
***************
*** 625,629 ****
  		NodeProxy next = null;
  
! 		ExtArrayIterator() {
  			docsIterator = map.valueIterator();
  			if (docsIterator.hasNext())
--- 625,629 ----
  		NodeProxy next = null;
  
! 		ExtArrayIterator(Int2ObjectHashMap map) {
  			docsIterator = map.valueIterator();
  			if (docsIterator.hasNext())