svn commit: r929388 - /ofbiz/trunk/framework/base/src/org/ofbiz/base/lang/ComparableRange.java

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r929388 - /ofbiz/trunk/framework/base/src/org/ofbiz/base/lang/ComparableRange.java

doogie-3
Author: doogie
Date: Wed Mar 31 05:55:37 2010
New Revision: 929388

URL: http://svn.apache.org/viewvc?rev=929388&view=rev
Log:
Use accessor methods consistently.

Modified:
    ofbiz/trunk/framework/base/src/org/ofbiz/base/lang/ComparableRange.java

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/lang/ComparableRange.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/lang/ComparableRange.java?rev=929388&r1=929387&r2=929388&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/lang/ComparableRange.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/lang/ComparableRange.java Wed Mar 31 05:55:37 2010
@@ -72,7 +72,7 @@ public class ComparableRange<T extends C
         }
         try {
             ComparableRange that = (ComparableRange) obj;
-            return this.start.equals(that.start) && this.end.equals(that.end);
+            return this.start.equals(that.start()) && this.end.equals(that.end());
         } catch (ClassCastException e) {}
         return false;
     }
@@ -81,7 +81,7 @@ public class ComparableRange<T extends C
         if (this == range) {
             return 0;
         }
-        return this.start.equals(range.start) ? this.end.compareTo(range.end()) : this.start.compareTo(range.start());
+        return this.start.equals(range.start()) ? this.end.compareTo(range.end()) : this.start.compareTo(range.start());
     }
 
     @Override
@@ -92,9 +92,9 @@ public class ComparableRange<T extends C
     @Override
     public boolean includes(T value) {
         if (this.isPoint) {
-            return value.equals(this.start);
+            return value.equals(this.start());
         }
-        return value.compareTo(this.start) >= 0 && value.compareTo(this.end) <= 0;
+        return value.compareTo(this.start()) >= 0 && value.compareTo(this.end()) <= 0;
     }
 
     @Override
@@ -104,7 +104,7 @@ public class ComparableRange<T extends C
 
     @Override
     public boolean overlaps(Range<T> range) {
-        return range.includes(this.start) || range.includes(this.end) || this.includes(range);
+        return range.includes(this.start()) || range.includes(this.end()) || this.includes(range);
     }
 
     @Override