From 7284a509ca4ecf857ed420d3cd0284d8f7280601 Mon Sep 17 00:00:00 2001 From: Clisprail Date: Fri, 18 Apr 2014 11:53:58 +0200 Subject: [PATCH] Revert loadlocal redo Breaks server providers --- parabotv2/src/org/parabot/Landing.java | 19 ++++---- parabotv2/src/org/parabot/core/Core.java | 45 +++++++------------ .../core/parsers/scripts/ScriptParser.java | 5 ++- .../core/parsers/servers/ServerParser.java | 5 ++- 4 files changed, 33 insertions(+), 41 deletions(-) diff --git a/parabotv2/src/org/parabot/Landing.java b/parabotv2/src/org/parabot/Landing.java index c812d26..4bd0e99 100644 --- a/parabotv2/src/org/parabot/Landing.java +++ b/parabotv2/src/org/parabot/Landing.java @@ -8,6 +8,7 @@ import org.parabot.core.ui.ServerSelector; import org.parabot.core.ui.utils.UILog; import javax.swing.*; + import java.io.File; import java.io.IOException; @@ -85,21 +86,21 @@ public final class Landing { password = args[++i]; break; case "-loadlocal": - Core.setLocalMode(args[++i]); + Core.setLoadLocal(true); break; case "-dump": - Core.setDump(true); - break; + Core.setDump(true); + break; case "-scriptsbin": - Directories.setScriptCompiledDirectory(new File(args[++i])); - break; + Directories.setScriptCompiledDirectory(new File(args[++i])); + break; case "-serversbin": - Directories.setServerCompiledDirectory(new File(args[++i])); - break; + Directories.setServerCompiledDirectory(new File(args[++i])); + break; } } } + - -} +} \ No newline at end of file diff --git a/parabotv2/src/org/parabot/core/Core.java b/parabotv2/src/org/parabot/core/Core.java index 09a1870..6bed9d8 100644 --- a/parabotv2/src/org/parabot/core/Core.java +++ b/parabotv2/src/org/parabot/core/Core.java @@ -14,35 +14,22 @@ public class Core { private static boolean debug; private static boolean verbose; private static boolean dump; - private static boolean loadLocalScripts; //Loads both local and public scripts - private static boolean loadLocalServers; //Loads both local and public scripts + private static boolean loadLocal; //Loads both local and public scripts/servers /** + * Enabled loadLocal mode * - * @return if the client is in loadLocalScripts mode. + * @param loadLocal */ - public static boolean inLoadLocalScripts(){ - return loadLocalScripts; + public static void setLoadLocal(final boolean loadLocal) { + Core.loadLocal = loadLocal; } /** - * - * @return if the client is in loadLocalServers mode + * @return if the client is in loadLocal mode. */ - public static boolean inLoadLocalServers(){ - return loadLocalServers; - } - - /** - * - * @param mode - */ - public static void setLocalMode(String mode){ - if (mode.toLowerCase().equals("scripts")){ - loadLocalScripts = true; - }else{ - loadLocalServers = true; - } + public static boolean inLoadLocal() { + return loadLocal; } /** @@ -53,14 +40,14 @@ public class Core { public static void setDebug(final boolean debug) { Core.debug = debug; } - + /** * Enables dump mode - * + * * @param dump */ public static void setDump(final boolean dump) { - Core.dump = dump; + Core.dump = dump; } /** @@ -76,12 +63,12 @@ public class Core { public static boolean inVerboseMode() { return verbose; } - + /** * @return if parabot should dump injected jar */ public static boolean shouldDump() { - return dump; + return dump; } /** @@ -113,7 +100,9 @@ public class Core { Core.verbose("No updates available."); return true; } - } catch (NumberFormatException | IOException e) { + } catch (NumberFormatException e) { + e.printStackTrace(); + } catch (IOException e) { e.printStackTrace(); } finally { try { @@ -125,4 +114,4 @@ public class Core { Core.verbose("Updates available..."); return false; } -} +} \ No newline at end of file diff --git a/parabotv2/src/org/parabot/core/parsers/scripts/ScriptParser.java b/parabotv2/src/org/parabot/core/parsers/scripts/ScriptParser.java index 647754a..1a75f65 100644 --- a/parabotv2/src/org/parabot/core/parsers/scripts/ScriptParser.java +++ b/parabotv2/src/org/parabot/core/parsers/scripts/ScriptParser.java @@ -23,11 +23,12 @@ public abstract class ScriptParser { public static ScriptDescription[] getDescriptions() { SCRIPT_CACHE.clear(); final ArrayList parsers = new ArrayList(); - if (Core.inLoadLocalScripts()) { + if (Core.inLoadLocal()) { parsers.add(new LocalJavaScripts()); if (Jython.isValid()) { parsers.add(new LocalPythonScripts()); } + parsers.add(new SDNScripts()); } else if (Core.inDebugMode()) { parsers.add(new LocalJavaScripts()); if (Jython.isValid()) { @@ -52,4 +53,4 @@ public abstract class ScriptParser { return SCRIPT_CACHE.keySet().toArray(new ScriptDescription[SCRIPT_CACHE.size()]); } -} +} \ No newline at end of file diff --git a/parabotv2/src/org/parabot/core/parsers/servers/ServerParser.java b/parabotv2/src/org/parabot/core/parsers/servers/ServerParser.java index 60ffe48..74e97b6 100644 --- a/parabotv2/src/org/parabot/core/parsers/servers/ServerParser.java +++ b/parabotv2/src/org/parabot/core/parsers/servers/ServerParser.java @@ -21,8 +21,9 @@ public abstract class ServerParser { public static final ServerDescription[] getDescriptions() { SERVER_CACHE.clear(); final ArrayList parsers = new ArrayList(); - if (Core.inLoadLocalServers()) { + if (Core.inLoadLocal()) { parsers.add(new LocalServers()); + parsers.add(new PublicServers()); } else if (Core.inDebugMode()) { parsers.add(new LocalServers()); } else { @@ -45,4 +46,4 @@ public abstract class ServerParser { return SERVER_CACHE.keySet().toArray(new ServerDescription[SERVER_CACHE.size()]); } -} +} \ No newline at end of file