svn commit: r1833933 - /pivot/trunk/core/src/org/apache/pivot/util/Version.java

[rw...@apache.org]

Author: rwhitcomb
Date: Wed Jun 20 18:44:26 2018
New Revision: 1833933

URL: http://svn.apache.org/viewvc?rev=1833933&view=rev
Log:
PIVOT-1035: For the new "YYYYDDDHHmm" build number, the Version class
has to be updated to allow a long value for the "updateRevision".

Modified:
    pivot/trunk/core/src/org/apache/pivot/util/Version.java

Modified: pivot/trunk/core/src/org/apache/pivot/util/Version.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/util/Version.java?rev=1833933&r1=1833932&r2=1833933&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/Version.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/util/Version.java Wed Jun 20 18:44:26 2018
@@ -29,24 +29,23 @@ public class Version implements Comparab
     private short majorRevision = 0;
     private short minorRevision = 0;
     private short maintenanceRevision = 0;
-    private short updateRevision = 0;
+    private long updateRevision = 0;
     private String build = null;
 
-    public Version(int majorRevision, int minorRevision, int maintenanceRevision, int updateRevision) {
+    public Version(int majorRevision, int minorRevision, int maintenanceRevision, long updateRevision) {
         this(majorRevision, minorRevision, maintenanceRevision, updateRevision, null);
     }
 
     public Version(int majorRevision, int minorRevision, int maintenanceRevision,
-        int updateRevision, String build) {
+        long updateRevision, String build) {
         Utils.checkInRangeOfShort(majorRevision, "majorRevision");
         Utils.checkInRangeOfShort(minorRevision, "minorRevision");
         Utils.checkInRangeOfShort(maintenanceRevision, "maintenanceRevision");
-        Utils.checkInRangeOfShort(updateRevision, "updateRevision");
 
         this.majorRevision = (short)majorRevision;
         this.minorRevision = (short)minorRevision;
         this.maintenanceRevision = (short)maintenanceRevision;
-        this.updateRevision = (short)updateRevision;
+        this.updateRevision = updateRevision;
         this.build = build;
     }
 
@@ -62,15 +61,15 @@ public class Version implements Comparab
         return maintenanceRevision;
     }
 
-    public short getUpdateRevision() {
+    public long getUpdateRevision() {
         return updateRevision;
     }
 
     public long getNumber() {
-        long number = (long)((majorRevision) & 0xffff) << (16 * 3)
+        long number = ((long)((majorRevision) & 0xffff) << (16 * 3)
             | (long)((minorRevision) & 0xffff) << (16 * 2)
-            | (long)((maintenanceRevision) & 0xffff) << (16 * 1)
-            | (long)((updateRevision) & 0xffff) << (16 * 0);
+            | (long)((maintenanceRevision) & 0xffff) << (16 * 1))
+            + updateRevision;
 
         return number;
     }
@@ -110,7 +109,7 @@ public class Version implements Comparab
         short majorRevision = 0;
         short minorRevision = 0;
         short maintenanceRevision = 0;
-        short updateRevision = 0;
+        long updateRevision = 0;
         String build = null;
 
         String revision;
@@ -140,7 +139,7 @@ public class Version implements Comparab
                         maintenanceRevision = Short.parseShort(maintenanceRevisionNumbers[0]);
 
                         if (maintenanceRevisionNumbers.length > 1) {
-                            updateRevision = Short.parseShort(maintenanceRevisionNumbers[1]);
+                            updateRevision = Long.parseLong(maintenanceRevisionNumbers[1]);
                         }
                     }
                 }