review fixes

Author: garbbraf

com.googlecode.cppcheclipse.core.tests/src/com/googlecode/cppcheclipse/core/command/TestVersion.java

@@ -204,6 +204,14 @@ public void testIsGreaterThanDifferentMinorVersions2() {
 		assertFalse(version1.isGreaterThan(version2));
 	}
 
+	@Test
+	public void testIsGreaterThanDifferentMinorVersions3() {
+		Version version1 = new Version("cppcheck 24.4.0");
+		Version version2 = new Version("cppcheck 24.10.1");
+		assertTrue(version2.isGreaterThan(version1));
+		assertFalse(version1.isGreaterThan(version2));
+	}
+
 	@Test
 	public void testIsGreaterThanPremiumDifferentMinorVersions2() {
 		Version version1 = new Version("cppcheck premium 1.2.6");

com.googlecode.cppcheclipse.core/src/com/googlecode/cppcheclipse/core/command/Version.java

@@ -33,7 +33,7 @@ private Version(int majorVersion, int minorVersion, int revision, int patch, Ver
 	}
 
 	/** version string must have the format
-	 * "cppcheck <majorVersion>.<minorVersion>[.<revision>]"
+	 * "cppcheck [premium] <majorVersion>.<minorVersion>[.<revision>][.patch][s]"
 	 *
 	 * @param version
 	 */
@@ -101,15 +101,16 @@ public boolean isGreaterThan(Version version) {
 		if (version.versionType != VersionType.ANY && versionType != version.versionType) {
 			throw new IllegalArgumentException("Cannot compare versions of different types");
 		}
-		if (majorVersion > version.majorVersion)
-			return true;
-		if (majorVersion == version.majorVersion && minorVersion > version.minorVersion)
-			return true;
-		if (majorVersion == version.majorVersion && minorVersion == version.minorVersion && revision > version.revision)
-			return true;
-		return majorVersion == version.majorVersion && minorVersion == version.minorVersion && revision == version.revision && patch > version.patch;
+		if (majorVersion != version.majorVersion)
+			return majorVersion > version.majorVersion;
+		if (minorVersion != version.minorVersion)
+			return minorVersion > version.minorVersion;
+		if (revision != version.revision)
+			return revision > version.revision;
+		return patch > version.patch;
 	}
 
+
 	public boolean isGreaterOrEqual(Version version) {
 		return isGreaterThan(version) || equals(version);
 	}