Bläddra i källkod

Add version comparison to LauncherUtils

Remove convoluted return procedure.

Change-Id: If66a88c14cfbe0e17d47571f37030c16f9e36bb5
Reviewed-on: http://gerrit.dmdirc.com/3420
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>
pull/1/head
Greg Holmes 10 år sedan
förälder
incheckning
512fa1ca0e
1 ändrade filer med 19 tillägg och 4 borttagningar
  1. 19
    4
      src/com/dmdirc/LauncherUtils.java

+ 19
- 4
src/com/dmdirc/LauncherUtils.java Visa fil

24
 
24
 
25
 import com.dmdirc.commandline.BaseDirectoryLocator;
25
 import com.dmdirc.commandline.BaseDirectoryLocator;
26
 import com.dmdirc.commandline.CommandLineParser;
26
 import com.dmdirc.commandline.CommandLineParser;
27
+import com.dmdirc.updater.Version;
27
 
28
 
28
 /**
29
 /**
29
  * Utility class to help launcher interface with client.
30
  * Utility class to help launcher interface with client.
30
  */
31
  */
31
 public class LauncherUtils {
32
 public class LauncherUtils {
32
 
33
 
33
-    public native static void setDirectory(final String directory);
34
-
35
     /**
34
     /**
36
      * Retrieves the config directory from the CLI arguments.
35
      * Retrieves the config directory from the CLI arguments.
37
      *
36
      *
38
      * @param args CLI arguments
37
      * @param args CLI arguments
38
+     *
39
+     * @return Returns the config directory to use
39
      */
40
      */
40
-    public static void getDirectory(final String... args) {
41
+    public static String getDirectory(final String... args) {
41
         final CommandLineParser cliParser = new CommandLineParser(null, null, null);
42
         final CommandLineParser cliParser = new CommandLineParser(null, null, null);
42
         final BaseDirectoryLocator locator = new BaseDirectoryLocator();
43
         final BaseDirectoryLocator locator = new BaseDirectoryLocator();
43
         cliParser.parse(args);
44
         cliParser.parse(args);
44
         final String configDirectory = cliParser.getConfigDirectory();
45
         final String configDirectory = cliParser.getConfigDirectory();
45
-        setDirectory(configDirectory == null ? locator.getDefaultBaseDirectory() : configDirectory);
46
+        return (configDirectory == null ? locator.getDefaultBaseDirectory() : configDirectory);
47
+    }
48
+
49
+    /**
50
+     * Compares the first version to the second version to check which is newer.
51
+     *
52
+     * @param version1 First version to compare
53
+     * @param version2 Second version to compare
54
+     *
55
+     * @return negative if older, 0 is equal, positive if newer.
56
+     */
57
+    public static int getIsNewer(final String version1, final String version2) {
58
+        final Version versionOne = new Version(version1);
59
+        final Version versionTwo = new Version(version2);
60
+        return versionOne.compareTo(versionTwo);
46
     }
61
     }
47
 
62
 
48
 }
63
 }

Laddar…
Avbryt
Spara