svn commit: r880825 - /incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/CalendarDateSpinnerData.java

[tv...@apache.org]

Author: tvolkert
Date: Mon Nov 16 16:06:27 2009
New Revision: 880825

URL: http://svn.apache.org/viewvc?rev=880825&view=rev
Log:
Fixed corner-case bug in CalendarDateSpinnerData

Modified:
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/CalendarDateSpinnerData.java

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/CalendarDateSpinnerData.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/CalendarDateSpinnerData.java?rev=880825&r1=880824&r2=880825&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/CalendarDateSpinnerData.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/CalendarDateSpinnerData.java Mon Nov 16 16:06:27 2009
@@ -103,8 +103,8 @@
             throw new IllegalArgumentException("upperBound is null.");
         }
 
-        if (lowerBound.compareTo(upperBound) >= 0) {
-            throw new IllegalArgumentException("lowerBound must be before upperBound.");
+        if (lowerBound.compareTo(upperBound) > 0) {
+            throw new IllegalArgumentException("lowerBound is after upperBound.");
         }
 
         calendar = new GregorianCalendar(lowerBound.year, lowerBound.month,
@@ -120,7 +120,7 @@
         long lowerBoundMilliseconds = calendar.getTimeInMillis();
         long upperBoundMilliseconds = upperBoundCalendar.getTimeInMillis();
         long indexDiff = (upperBoundMilliseconds - lowerBoundMilliseconds) /
-            (1000 * 60 * 60 * 24);
+            (1000l * 60 * 60 * 24);
         length = (int)indexDiff + 1;
     }
 
@@ -196,7 +196,7 @@
         tmpCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
         long itemMilliseconds = tmpCalendar.getTimeInMillis();
 
-        long indexDiff = (itemMilliseconds - currentMilliseconds) / (1000 * 60 * 60 * 24);
+        long indexDiff = (itemMilliseconds - currentMilliseconds) / (1000l * 60 * 60 * 24);
         int index = calendarIndex + (int)indexDiff;
 
         return (index < 0 || index >= length) ? -1 : index;