2006-Scape/Parabot
1
0
Fork 0
mirror of https://github.com/2006-Scape/Parabot.git synced 2026-07-07 08:39:12 +00:00
Code Issues 2 Packages Projects Releases 3 Wiki Activity

isDevMode -> InDebugMode

Browse Source 
+ Random indention changes.
This commit is contained in:
Dane
2013-06-21 12:11:51 -04:00
parent 3607799354
commit a48c7fbb28
5 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parabotv2/src/org/parabot/Landing.java
+1 -1
View File
@@ -22,7 +22,7 @@ public final class Landing {
t.printStackTrace(); t.printStackTrace();
} }
Directories.validate(); Directories.validate();
Core.enableDevMode(); Core.setDebug(true);
ServerSelector.getInstance().setVisible(true); ServerSelector.getInstance().setVisible(true);
} }
parabotv2/src/org/parabot/core/Core.java
+7 -11
View File
@@ -6,22 +6,18 @@ package org.parabot.core;
* *
*/ */
public class Core { public class Core {
private static boolean devMode = false;
/** private static boolean debug = false;
* Enables the developers mode
*/ public static void setDebug(boolean debug) {
public static void enableDevMode() { Core.debug = debug;
devMode = true;
} }
/** /**
* Determines if bot is in developers mode * @return if the botclient is in debug mode.
* @return <b>true</b> if bot is in developers mode
*/ */
public static boolean isDevMode() { public static boolean inDebugMode() {
return devMode; return debug;
} }
} }
parabotv2/src/org/parabot/core/parsers/ServerManifestParser.java
+2 -1
View File
@@ -27,10 +27,11 @@ public class ServerManifestParser {
/** /**
* Gets server descriptions * Gets server descriptions
*
* @return list of descriptions * @return list of descriptions
*/ */
public ServerDescription[] getDescriptions() { public ServerDescription[] getDescriptions() {
if(Core.isDevMode()) { if (Core.inDebugMode()) {
return localDesc(); return localDesc();
} }
return publicDesc(); return publicDesc();
parabotv2/src/org/parabot/core/ui/components/LogArea.java
+1
View File
@@ -16,6 +16,7 @@ import org.parabot.core.logging.SystemConsoleHandler;
import org.parabot.core.logging.TextAreaLogHandler; import org.parabot.core.logging.TextAreaLogHandler;
public class LogArea extends JScrollPane { public class LogArea extends JScrollPane {
private static final long serialVersionUID = 6571141103751675714L; private static final long serialVersionUID = 6571141103751675714L;
private static LogArea instance = null; private static LogArea instance = null;
private static LogTextArea logArea = new LogTextArea(); private static LogTextArea logArea = new LogTextArea();
parabotv2/src/org/parabot/environment/Environment.java
+7 -5
View File
@@ -1,6 +1,7 @@
package org.parabot.environment; package org.parabot.environment;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import org.parabot.core.Context; import org.parabot.core.Context;
import org.parabot.core.Core; import org.parabot.core.Core;
import org.parabot.core.classpath.ClassPath; import org.parabot.core.classpath.ClassPath;
@@ -22,6 +23,7 @@ public class Environment {
/** /**
* Loads a new environment * Loads a new environment
*
* @param url * @param url
*/ */
public static void load(final ServerDescription desc, final String serverName) { public static void load(final ServerDescription desc, final String serverName) {
@@ -30,12 +32,12 @@ public class Environment {
BotUI.getInstance().setVisible(true); BotUI.getInstance().setVisible(true);
} }
final ClassPath classPath = Core.isDevMode() ? null : new ClassPath(); final ClassPath classPath = Core.inDebugMode() ? null : new ClassPath();
final ServerCache cache = Core.isDevMode() ? ServerManifestParser.cache.get(desc) : null; final ServerCache cache = Core.inDebugMode() ? ServerManifestParser.cache.get(desc) : null;
final ServerLoader serverLoader = Core.isDevMode() ? cache.getLoader() : new ServerLoader(classPath); final ServerLoader serverLoader = Core.inDebugMode() ? cache.getLoader() : new ServerLoader(classPath);
String[] serverProviders = null; String[] serverProviders = null;
if(!Core.isDevMode()) { if (!Core.inDebugMode()) {
serverProviders = serverLoader.getServerClassNames(); serverProviders = serverLoader.getServerClassNames();
if (serverProviders == null) { if (serverProviders == null) {
throw new RuntimeException("No server provided."); throw new RuntimeException("No server provided.");
@@ -47,7 +49,7 @@ public class Environment {
@Override @Override
public void run() { public void run() {
try { try {
final ServerProvider server = !Core.isDevMode() ? fetchServerProvider(serverLoader) : cache.getProviders()[desc.providerIndex]; final ServerProvider server = !Core.inDebugMode() ? fetchServerProvider(serverLoader) : cache.getProviders()[desc.providerIndex];
final Context context = new Context(server); final Context context = new Context(server);
context.setEnvironment(serverLoader); context.setEnvironment(serverLoader);
BotToolbar.getInstance().addTab(context, serverName); BotToolbar.getInstance().addTab(context, serverName);