Improvements to Version

Implement compareTo(),
Add isValid(),
Accept integers in the String ctor,
Added unit test

src/com/dmdirc/updater/Version.java

@@ -31,8 +31,8 @@ package com.dmdirc.updater;
  */
 public class Version implements Comparable<Version> {
 
-    private final int intVersion;
-    private final String strVersion;
+    protected final int intVersion;
+    protected final String strVersion;
 
     public Version(final int version) {
         this.intVersion = version;
@@ -40,16 +40,58 @@ public class Version implements Comparable<Version> {
     }
 
     public Version(final String version) {
-        this.intVersion = -1;
-        this.strVersion = version;
+        if (version.matches("^[0-9]+$")) {
+            this.intVersion = Integer.parseInt(version);
+            this.strVersion = null;
+        } else if (version.matches("^[0-9]+(\\.[0-9]+)*(\\-[0-9]+\\-g[a-z0-9]{7})?$")) {
+            this.intVersion = Integer.MIN_VALUE;
+            this.strVersion = version;
+        } else {
+            this.intVersion = Integer.MIN_VALUE;
+            this.strVersion = null;
+        }
     }
 
     /** {@inheritDoc} */
     @Override
     public int compareTo(final Version o) {
-        throw new UnsupportedOperationException("Not supported yet.");
+        if (o.intVersion > Integer.MIN_VALUE && this.intVersion > Integer.MIN_VALUE) {
+            return this.intVersion - o.intVersion;
+        } else if (o.strVersion == null || this.strVersion == null) {
+            return 0;
+        } else {
+            final String myParts[] = this.strVersion.split("-");
+            final String thParts[] = o.strVersion.split("-");
+
+            final String myFirstParts[] = myParts[0].split("\\.");
+            final String thFirstParts[] = thParts[0].split("\\.");
+
+            for (int i = 0; i < Math.max(myFirstParts.length, thFirstParts.length); i++) {
+                final int myInt = myFirstParts.length > i ? Integer.parseInt(myFirstParts[i]) : 0;
+                final int thInt = thFirstParts.length > i ? Integer.parseInt(thFirstParts[i]) : 0;
+
+                if (myInt != thInt) {
+                    return myInt - thInt;
+                }
+            }
+
+            final int myInt = myParts.length > 1 ? Integer.parseInt(myParts[1]) : 0;
+            final int thInt = thParts.length > 1 ? Integer.parseInt(thParts[1]) : 0;
+
+            return myInt - thInt;
+        }
+    }
+
+    /**
+     * Determines whether or not this represents a valid version.
+     *
+     * @return True if the version is valid, false otherwise
+     */
+    public boolean isValid() {
+        return intVersion > Integer.MIN_VALUE || strVersion != null;
     }
 
+    /** {@inheritDoc} */
     @Override
     public String toString() {
         return strVersion == null ? String.valueOf(intVersion) : strVersion;

test/com/dmdirc/updater/VersionTest.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.updater;
+
+import java.util.Arrays;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import static org.junit.Assert.*;
+
+@RunWith(Parameterized.class)
+public class VersionTest {
+
+    private final Version v1, v2;
+    private final int min, max;
+
+    public VersionTest(Version v1, Version v2, int max, int min) {
+        this.v1 = v1;
+        this.v2 = v2;
+        this.min = min;
+        this.max = max;
+    }
+
+    @Test
+    public void testData() {
+        assertTrue(max + " > " + v1 + ".compareTo(" + v2 + ")", max > v1.compareTo(v2));
+        assertTrue(min + " < " + v1 + ".compareTo(" + v2 + ")", min < v1.compareTo(v2));
+    }
+
+    @Parameterized.Parameters
+    public static List<Object[]> data() {
+        return Arrays.asList(new Object[][]{
+            {new Version(1), new Version(2), 0, Integer.MIN_VALUE},
+            {new Version(1), new Version(2000), 0, Integer.MIN_VALUE},
+            {new Version(2), new Version(1), Integer.MAX_VALUE, 0},
+            {new Version(1), new Version(1), 1, -1},
+            {new Version(0), new Version(0), 1, -1},
+            {new Version("0.6"), new Version(1), 1, -1},
+            {new Version("0.6"), new Version("0.6"), 1, -1},
+            {new Version("0.6"), new Version("0.6.3"), 0, Integer.MIN_VALUE},
+            {new Version("0.6-149-gaaaaaaa"), new Version("0.6.3"), 0, Integer.MIN_VALUE},
+            {new Version("0.6-149-gaaaaaaa"), new Version("0.6.3-149-gaaaaaaa"), 0, Integer.MIN_VALUE},
+            {new Version("0.6.3"), new Version("0.6.3-149-gaaaaaaa"), 0, Integer.MIN_VALUE},
+            {new Version("0.6.3-148-gaaaaaaa"), new Version("0.6.3-149-gaaaaaaa"), 0, Integer.MIN_VALUE},
+            {new Version("0.6.3-148-gaaaaaaa"), new Version("0.6.3-148-gaaaaaaa"), 1, -1},
+        });
+    }
+
+}