Changeset 15964

Timestamp:

2008-06-12T12:36:23+12:00 (15 years ago)

Author:

ak19

Message:

Removed use of Patter.quote() which requires Java 1.5 or higher and also checked for the case so that the first occurrence of a higher digit in the running version vs the minimum Java version required will stop the check.

File:

• gli/trunk/CheckJavaVersion.java (modified) (2 diffs)

gli/trunk/CheckJavaVersion.java

@@ -43 +43 @@
         // that the two characters are separate tokens by using |, so 
         // that the regex becomes: ".|_" -> \Q.\E|\Q_\E.
-        String period = Pattern.quote(".");
-        String underscore = Pattern.quote("_");
+        String period = "\\Q.\\E";
+        String underscore = "\\Q_\\E";
+             // Can't use Pattern.quote() since it is not there in Java 1.4.*
+             //String period = Pattern.quote(".");
+             //String underscore = Pattern.quote("_");
         
         String[] minVersionNums = minimumVersion.split(period+"|"+underscore);
@@ -56 +59 @@
             int min = Integer.parseInt(minVersionNums[i]);
             int run = Integer.parseInt(runningVersionNums[i]);
-            if(run < min) { 
+            if(run > min) { 
+                    // certain success: one of the higher positional numbers 
+                    // of the running version is greater than the corresponding
+                    // number of the minimum version, meaning we've finished.
+                break;
+            } else if(run < min) { 
                 // fail: running version number is lower than corresponding 
                 // minimum version number
                 acceptable = false;
                 break;
-            }
+            } 
         }