|
@@ -24,25 +24,40 @@ package com.dmdirc;
|
24
|
24
|
|
25
|
25
|
import com.dmdirc.commandline.BaseDirectoryLocator;
|
26
|
26
|
import com.dmdirc.commandline.CommandLineParser;
|
|
27
|
+import com.dmdirc.updater.Version;
|
27
|
28
|
|
28
|
29
|
/**
|
29
|
30
|
* Utility class to help launcher interface with client.
|
30
|
31
|
*/
|
31
|
32
|
public class LauncherUtils {
|
32
|
33
|
|
33
|
|
- public native static void setDirectory(final String directory);
|
34
|
|
-
|
35
|
34
|
/**
|
36
|
35
|
* Retrieves the config directory from the CLI arguments.
|
37
|
36
|
*
|
38
|
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
|
42
|
final CommandLineParser cliParser = new CommandLineParser(null, null, null);
|
42
|
43
|
final BaseDirectoryLocator locator = new BaseDirectoryLocator();
|
43
|
44
|
cliParser.parse(args);
|
44
|
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
|
}
|