From 1cf30d5375a472ccf41ac56ebbd44ef69a1473d6 Mon Sep 17 00:00:00 2001 From: George Farrell Date: Sun, 20 May 2018 18:45:43 +0100 Subject: [PATCH 1/4] [BUGFIX] Java check version --- src/main/java/org/parabot/Landing.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/org/parabot/Landing.java b/src/main/java/org/parabot/Landing.java index 51c6a67..64bac34 100644 --- a/src/main/java/org/parabot/Landing.java +++ b/src/main/java/org/parabot/Landing.java @@ -24,9 +24,22 @@ import java.io.IOException; public final class Landing { private static String username; private static String password; + private static double JAVA_VERSION = getVersion (); + + static double getVersion () { + String version = System.getProperty("java.version"); + int pos = version.indexOf('.'); + pos = version.indexOf('.', pos+1); + return Double.parseDouble (version.substring (0, pos)); + } + public static void main(String... args) throws IOException { + if (JAVA_VERSION >= 9){ + UILog.log("Parabot", "Please downgrade to Java 8 in order to use Parabot"); + System.exit(0); + } parseArgs(args); Directories.validate(); From 01a12a50b560f7167967f9429c2a3bddeba7d3b8 Mon Sep 17 00:00:00 2001 From: George Farrell Date: Sun, 20 May 2018 23:36:10 +0100 Subject: [PATCH 2/4] Update Landing.java --- src/main/java/org/parabot/Landing.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/parabot/Landing.java b/src/main/java/org/parabot/Landing.java index 64bac34..bf79736 100644 --- a/src/main/java/org/parabot/Landing.java +++ b/src/main/java/org/parabot/Landing.java @@ -1,6 +1,7 @@ package org.parabot; import org.parabot.api.translations.TranslationHelper; +import org.parabot.core.Context; import org.parabot.core.Core; import org.parabot.core.Directories; import org.parabot.core.forum.AccountManager; @@ -9,6 +10,7 @@ import org.parabot.core.network.proxy.ProxySocket; import org.parabot.core.network.proxy.ProxyType; import org.parabot.core.ui.BotUI; import org.parabot.core.ui.ServerSelector; +import org.parabot.core.ui.utils.UILog; import javax.swing.*; import java.io.File; @@ -24,22 +26,15 @@ import java.io.IOException; public final class Landing { private static String username; private static String password; - private static double JAVA_VERSION = getVersion (); - - static double getVersion () { - String version = System.getProperty("java.version"); - int pos = version.indexOf('.'); - pos = version.indexOf('.', pos+1); - return Double.parseDouble (version.substring (0, pos)); - } public static void main(String... args) throws IOException { - if (JAVA_VERSION >= 9){ + if (Context.getJavaVersion() >= 9){ UILog.log("Parabot", "Please downgrade to Java 8 in order to use Parabot"); System.exit(0); } + parseArgs(args); Directories.validate(); From c754cd2ef06a8f111bcf32d905a54c3cff674e04 Mon Sep 17 00:00:00 2001 From: George Farrell Date: Sun, 20 May 2018 23:36:53 +0100 Subject: [PATCH 3/4] Update Context.java --- src/main/java/org/parabot/core/Context.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/org/parabot/core/Context.java b/src/main/java/org/parabot/core/Context.java index 943d051..981eb8f 100644 --- a/src/main/java/org/parabot/core/Context.java +++ b/src/main/java/org/parabot/core/Context.java @@ -72,6 +72,13 @@ public class Context { this.defaultErr = System.err; } + public static double getJavaVersion() { + String version = System.getProperty("java.version"); + int pos = version.indexOf('.'); + pos = version.indexOf('.', pos+1); + return Double.parseDouble (version.substring (0, pos)); + } + public static Context getInstance(ServerProvider serverProvider) { return instance == null ? instance = new Context(serverProvider) : instance; } From a284417b5a37c981f6c58b51848b8c9f11e6f348 Mon Sep 17 00:00:00 2001 From: Jak Date: Sun, 11 Nov 2018 09:26:16 +0000 Subject: [PATCH 4/4] Update Landing.java --- src/main/java/org/parabot/Landing.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/parabot/Landing.java b/src/main/java/org/parabot/Landing.java index 0507987..15b02e0 100644 --- a/src/main/java/org/parabot/Landing.java +++ b/src/main/java/org/parabot/Landing.java @@ -31,7 +31,7 @@ public final class Landing { public static void main(String... args) throws IOException { if (Context.getJavaVersion() >= 9){ - UILog.log("Parabot", "Please downgrade to Java 8 in order to use Parabot"); + UILog.log("Parabot", "Parabot doesn't support Java 9+ currently. Please downgrade to Java 8 to ensure Parabot is working correctly."); System.exit(0); }