[Exist-commits] eXist-1.0/src/org/exist/util LongLinkedList.java,1.6,1.7 OrderedLongLinkedList.java,1.3,1.4 OrderedLinkedList.java,1.4,1.5

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

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

Modified Files:
	LongLinkedList.java OrderedLongLinkedList.java 
	OrderedLinkedList.java 
Log Message:
Code to track term frequency counts in NativeTextEngine had to be rewritten as it slowed down the 
indexing.

Index: OrderedLongLinkedList.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/util/OrderedLongLinkedList.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OrderedLongLinkedList.java	18 Dec 2003 15:47:45 -0000	1.3
--- OrderedLongLinkedList.java	21 Jul 2004 08:53:55 -0000	1.4
***************
*** 8,12 ****
   * @author Wolfgang Meier
   */
! public final class OrderedLongLinkedList extends LongLinkedList {
  
      
--- 8,12 ----
   * @author Wolfgang Meier
   */
! public class OrderedLongLinkedList extends LongLinkedList {
  
      
***************
*** 23,31 ****
  	public void add(long l) {
  		if (first == null) {
! 			first = new ListItem(l);
  			last = first;
              count = 1;
  		} else {
! 			ListItem newItem = new ListItem(l);
  			ListItem prev = last;
  			while (prev != null) {
--- 23,31 ----
  	public void add(long l) {
  		if (first == null) {
! 			first = createListItem(l);
  			last = first;
              count = 1;
  		} else {
! 			ListItem newItem = createListItem(l);
  			ListItem prev = last;
  			while (prev != null) {

Index: OrderedLinkedList.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/util/OrderedLinkedList.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** OrderedLinkedList.java	16 Jul 2004 17:39:41 -0000	1.4
--- OrderedLinkedList.java	21 Jul 2004 08:53:55 -0000	1.5
***************
*** 23,28 ****
--- 23,32 ----
  import java.util.Iterator;
  
+ import org.apache.log4j.Logger;
+ 
  public class OrderedLinkedList {
  
+ 	private final static Logger LOG = Logger.getLogger(OrderedLinkedList.class);
+ 	
  	public abstract static class Node {
  		Node next = null;

Index: LongLinkedList.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/util/LongLinkedList.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LongLinkedList.java	17 Nov 2003 09:27:31 -0000	1.6
--- LongLinkedList.java	21 Jul 2004 08:53:55 -0000	1.7
***************
*** 5,13 ****
  public class LongLinkedList {
  
! 	public final static class ListItem implements Comparable {
  		
  		public long l;
! 		ListItem next = null;
! 		ListItem prev = null;
          
  		public ListItem( long l ) {
--- 5,14 ----
  public class LongLinkedList {
  
! 	public static class ListItem implements Comparable {
  		
  		public long l;
! 		
! 		public ListItem next = null;
! 		public ListItem prev = null;
          
  		public ListItem( long l ) {
***************
*** 47,54 ****
  	public void add( long l ) {
  		if(first == null) {
! 			first = new ListItem( l );
  			last = first;
  		} else {
! 			ListItem next = new ListItem( l );
  			last.next = next;
              next.prev = last;
--- 48,55 ----
  	public void add( long l ) {
  		if(first == null) {
! 			first = createListItem( l );
  			last = first;
  		} else {
! 			ListItem next = createListItem( l );
  			last.next = next;
              next.prev = last;
***************
*** 106,109 ****
--- 107,114 ----
      }
      
+     protected ListItem createListItem(long l) {
+     	return new ListItem(l);
+     }
+     
      private final class LongLinkedListIterator implements Iterator {