From 5150b00f842a723a5a03dc382afa59d5d2985efa Mon Sep 17 00:00:00 2001
From: PBParadox <jeroenketelaar@me.com>
Date: Thu, 13 Feb 2014 22:34:19 +0100
Subject: [PATCH] Added loadLocal

---
 parabotv2/src/org/parabot/Landing.java        |  3 +++
 parabotv2/src/org/parabot/core/Core.java      | 19 ++++++++++++++++++-
 .../core/parsers/scripts/ScriptParser.java    | 18 ++++++++++++------
 .../core/parsers/servers/ServerParser.java    | 15 +++++++++------
 4 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/parabotv2/src/org/parabot/Landing.java b/parabotv2/src/org/parabot/Landing.java
index 680e335..91a128d 100644
--- a/parabotv2/src/org/parabot/Landing.java
+++ b/parabotv2/src/org/parabot/Landing.java
@@ -87,6 +87,9 @@ public final class Landing {
 			case "-proxy":
 				Ip.spoofIP(args[++i], args[++i]);
 				break;
+            case "-loadlocal":
+                Core.setLoadLocal(true);
+                break;
 			}
 
 		}
diff --git a/parabotv2/src/org/parabot/core/Core.java b/parabotv2/src/org/parabot/core/Core.java
index 94aad65..4440b62 100644
--- a/parabotv2/src/org/parabot/core/Core.java
+++ b/parabotv2/src/org/parabot/core/Core.java
@@ -16,8 +16,25 @@ public class Core {
 
 	private static boolean debug = false;
 	private static boolean verbose = false;
+    private static boolean loadLocal = false; //Loads both local and public scripts/servers
 
-	/**
+    /**
+     * Enabled loadLocal mode
+     *
+     * @param loadLocal
+     */
+    public static void setLoadLocal(final boolean loadLocal) {
+        Core.loadLocal = loadLocal;
+    }
+
+    /**
+     * @return if the client is in loadLocal mode.
+     */
+    public static boolean inLoadLocal() {
+        return loadLocal;
+    }
+
+    /**
 	 * Enabled debug mode
 	 * 
 	 * @param debug
diff --git a/parabotv2/src/org/parabot/core/parsers/scripts/ScriptParser.java b/parabotv2/src/org/parabot/core/parsers/scripts/ScriptParser.java
index ea0ad5b..b44b004 100644
--- a/parabotv2/src/org/parabot/core/parsers/scripts/ScriptParser.java
+++ b/parabotv2/src/org/parabot/core/parsers/scripts/ScriptParser.java
@@ -1,14 +1,14 @@
 package org.parabot.core.parsers.scripts;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
 import org.parabot.core.Core;
 import org.parabot.core.desc.ScriptDescription;
 import org.parabot.core.jython.Jython;
 import org.parabot.environment.scripts.ScriptExecuter;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 
  * Abstract class for parsing scripts
@@ -25,12 +25,18 @@ public abstract class ScriptParser {
 	public static ScriptDescription[] getDescriptions() {
 		SCRIPT_CACHE.clear();
 		final ArrayList<ScriptParser> parsers = new ArrayList<ScriptParser>();
-		if(Core.inDebugMode()) {
+		if(Core.inLoadLocal()) {
 			parsers.add(new LocalJavaScripts());
 			if(Jython.isValid()) {
 				parsers.add(new LocalPythonScripts());
 			}
-		} else {
+            parsers.add(new SDNScripts());
+		}else if (Core.inDebugMode()){
+            parsers.add(new LocalJavaScripts());
+            if(Jython.isValid()) {
+                parsers.add(new LocalPythonScripts());
+            }
+        }else{
 			parsers.add(new SDNScripts());
 		}
 		
diff --git a/parabotv2/src/org/parabot/core/parsers/servers/ServerParser.java b/parabotv2/src/org/parabot/core/parsers/servers/ServerParser.java
index 5a08510..8c2103b 100644
--- a/parabotv2/src/org/parabot/core/parsers/servers/ServerParser.java
+++ b/parabotv2/src/org/parabot/core/parsers/servers/ServerParser.java
@@ -1,13 +1,13 @@
 package org.parabot.core.parsers.servers;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
 import org.parabot.core.Core;
 import org.parabot.core.desc.ServerDescription;
 import org.parabot.environment.servers.ServerExecuter;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 
  * Abstract class for parsing server providers
@@ -23,9 +23,12 @@ public abstract class ServerParser {
 	public static final ServerDescription[] getDescriptions() {
 		SERVER_CACHE.clear();
 		final ArrayList<ServerParser> parsers = new ArrayList<ServerParser>();
-		if(Core.inDebugMode()) {
+		if(Core.inLoadLocal()) {
 			parsers.add(new LocalServers());
-		} else {
+            parsers.add(new PublicServers());
+		} else if (Core.inDebugMode()){
+            parsers.add(new LocalServers());
+        }else{
 			parsers.add(new PublicServers());
 		}