cweb-cvs

[Bryan T. <tho...@us...>]

Update of /cvsroot/cweb/generic-native/src/java/org/CognitiveWeb/generic/core/ndx
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29240/src/java/org/CognitiveWeb/generic/core/ndx

Modified Files:
	CharacterComparator.java SuccessorUtil.java 
	ShortComparator.java IntegerComparator.java 
	ByteComparator.java 
Log Message:
Work on the bigdata-GOM integration.

Index: ShortComparator.java
===================================================================
RCS file: /cvsroot/cweb/generic-native/src/java/org/CognitiveWeb/generic/core/ndx/ShortComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ShortComparator.java	22 May 2006 14:40:24 -0000	1.1
--- ShortComparator.java	30 Nov 2007 21:54:05 -0000	1.2
***************
*** 72,77 ****
  
      public int compare(Object obj1, Object obj2) {
!         short v1 = ((Short) obj1).shortValue();
!         short v2 = ((Short) obj2).shortValue();
  
          return v1 - v2;
--- 72,79 ----
  
      public int compare(Object obj1, Object obj2) {
!         
!         // note: promote to int to avoid overflow.
!         int v1 = ((Short) obj1).shortValue();
!         int v2 = ((Short) obj2).shortValue();
  
          return v1 - v2;

Index: CharacterComparator.java
===================================================================
RCS file: /cvsroot/cweb/generic-native/src/java/org/CognitiveWeb/generic/core/ndx/CharacterComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CharacterComparator.java	22 May 2006 14:40:23 -0000	1.1
--- CharacterComparator.java	30 Nov 2007 21:54:05 -0000	1.2
***************
*** 69,74 ****
  
      public int compare(Object obj1, Object obj2) {
!         char v1 = ((Character) obj1).charValue();
!         char v2 = ((Character) obj2).charValue();
  
          return v1 - v2;
--- 69,76 ----
  
      public int compare(Object obj1, Object obj2) {
!         
!         // Note: convert to int to avoid overflow problems.
!         int v1 = ((Character) obj1).charValue();
!         int v2 = ((Character) obj2).charValue();
  
          return v1 - v2;

Index: SuccessorUtil.java
===================================================================
RCS file: /cvsroot/cweb/generic-native/src/java/org/CognitiveWeb/generic/core/ndx/SuccessorUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SuccessorUtil.java	11 Jun 2006 10:05:00 -0000	1.3
--- SuccessorUtil.java	30 Nov 2007 21:54:05 -0000	1.4
***************
*** 48,52 ****
  package org.CognitiveWeb.generic.core.ndx;
  
- 
  /**
   * Utility methods for calculating the sucessor for various data types.
--- 48,51 ----
***************
*** 363,367 ****
  
          if (s == null)
!             return "\0";
  
          return s + "\0";
--- 362,367 ----
  
          if (s == null)
! //            return "\0";
!             return "";
  
          return s + "\0";

Index: IntegerComparator.java
===================================================================
RCS file: /cvsroot/cweb/generic-native/src/java/org/CognitiveWeb/generic/core/ndx/IntegerComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IntegerComparator.java	22 May 2006 14:40:23 -0000	1.1
--- IntegerComparator.java	30 Nov 2007 21:54:05 -0000	1.2
***************
*** 75,82 ****
      public int compare( Object obj1, Object obj2 )
      {
!         int v1 = ( (Integer) obj1 ).intValue();
!         int v2 = ( (Integer) obj2 ).intValue();
  
!         return v1 - v2;
  
      }
--- 75,85 ----
      public int compare( Object obj1, Object obj2 )
      {
!         final int v1 = ( (Integer) obj1 ).intValue();
!         final int v2 = ( (Integer) obj2 ).intValue();
  
!         // Note: avoids possible overflow problems. 
!         if(v1<v2) return -1;
!         if(v2>v1) return 1;
!         return 0;
  
      }

Index: ByteComparator.java
===================================================================
RCS file: /cvsroot/cweb/generic-native/src/java/org/CognitiveWeb/generic/core/ndx/ByteComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ByteComparator.java	22 May 2006 14:40:23 -0000	1.1
--- ByteComparator.java	30 Nov 2007 21:54:05 -0000	1.2
***************
*** 71,76 ****
  
      public int compare(Object obj1, Object obj2) {
!         byte v1 = ((Byte) obj1).byteValue();
!         byte v2 = ((Byte) obj2).byteValue();
  
          return v1 - v2;
--- 71,78 ----
  
      public int compare(Object obj1, Object obj2) {
!         
!         // convert to int to avoid overflow problems.
!         int v1 = ((Byte) obj1).byteValue();
!         int v2 = ((Byte) obj2).byteValue();
  
          return v1 - v2;