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

Better coding format

Browse Source
This commit is contained in:
Jeroen Ketelaar
2014-02-14 03:40:50 +01:00
parent 570601c534
commit b97c022784
2 changed files with 66 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parabotv2/src/org/parabot/core/parsers/scripts/ScriptParser.java
+35 -37
View File
@@ -10,49 +10,47 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** /**
*
* Abstract class for parsing scripts * Abstract class for parsing scripts
*
* @author Everel
* *
* @author Everel
*/ */
public abstract class ScriptParser { public abstract class ScriptParser {
public static final Map<ScriptDescription, ScriptExecuter> SCRIPT_CACHE = new HashMap<ScriptDescription, ScriptExecuter>(); public static final Map<ScriptDescription, ScriptExecuter> SCRIPT_CACHE = new HashMap<ScriptDescription, ScriptExecuter>();
public abstract void execute(); public abstract void execute();
public static ScriptDescription[] getDescriptions() { public static ScriptDescription[] getDescriptions() {
SCRIPT_CACHE.clear(); SCRIPT_CACHE.clear();
final ArrayList<ScriptParser> parsers = new ArrayList<ScriptParser>(); final ArrayList<ScriptParser> parsers = new ArrayList<ScriptParser>();
if(Core.inLoadLocal()) { 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()); parsers.add(new LocalJavaScripts());
if(Jython.isValid()) { if (Jython.isValid()) {
parsers.add(new LocalPythonScripts()); parsers.add(new LocalPythonScripts());
} }
}else{ parsers.add(new SDNScripts());
parsers.add(new SDNScripts()); } else if (Core.inDebugMode()) {
} parsers.add(new LocalJavaScripts());
if (Jython.isValid()) {
Core.verbose("Parsing scripts..."); parsers.add(new LocalPythonScripts());
for(final ScriptParser parser : parsers) { }
parser.execute(); } else {
} parsers.add(new SDNScripts());
}
if(Core.inVerboseMode()) {
for(final ScriptDescription desc : SCRIPT_CACHE.keySet()) { Core.verbose("Parsing scripts...");
Core.verbose(desc.toString()); for (final ScriptParser parser : parsers) {
} parser.execute();
Core.verbose("Scripts parsed."); }
}
if (Core.inVerboseMode()) {
return SCRIPT_CACHE.keySet().toArray(new ScriptDescription[SCRIPT_CACHE.size()]); for (final ScriptDescription desc : SCRIPT_CACHE.keySet()) {
} Core.verbose(desc.toString());
}
Core.verbose("Scripts parsed.");
}
return SCRIPT_CACHE.keySet().toArray(new ScriptDescription[SCRIPT_CACHE.size()]);
}
} }
parabotv2/src/org/parabot/core/parsers/servers/ServerParser.java
+31 -33
View File
@@ -9,43 +9,41 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** /**
*
* Abstract class for parsing server providers * Abstract class for parsing server providers
*
* @author Everel
* *
* @author Everel
*/ */
public abstract class ServerParser { public abstract class ServerParser {
public static final Map<ServerDescription, ServerExecuter> SERVER_CACHE = new HashMap<ServerDescription, ServerExecuter>(); public static final Map<ServerDescription, ServerExecuter> SERVER_CACHE = new HashMap<ServerDescription, ServerExecuter>();
public abstract void execute(); public abstract void execute();
public static final ServerDescription[] getDescriptions() { public static final ServerDescription[] getDescriptions() {
SERVER_CACHE.clear(); SERVER_CACHE.clear();
final ArrayList<ServerParser> parsers = new ArrayList<ServerParser>(); final ArrayList<ServerParser> parsers = new ArrayList<ServerParser>();
if(Core.inLoadLocal()) { if (Core.inLoadLocal()) {
parsers.add(new LocalServers());
parsers.add(new PublicServers());
} else if (Core.inDebugMode()){
parsers.add(new LocalServers()); parsers.add(new LocalServers());
}else{ parsers.add(new PublicServers());
parsers.add(new PublicServers()); } else if (Core.inDebugMode()) {
} parsers.add(new LocalServers());
} else {
Core.verbose("Parsing server providers..."); parsers.add(new PublicServers());
for(final ServerParser parser : parsers) { }
parser.execute();
} Core.verbose("Parsing server providers...");
for (final ServerParser parser : parsers) {
if(Core.inVerboseMode()) { parser.execute();
for(final ServerDescription desc : SERVER_CACHE.keySet()) { }
Core.verbose(desc.toString());
} if (Core.inVerboseMode()) {
Core.verbose("Server providers parsed."); for (final ServerDescription desc : SERVER_CACHE.keySet()) {
} Core.verbose(desc.toString());
}
Core.verbose("Server providers parsed.");
return SERVER_CACHE.keySet().toArray(new ServerDescription[SERVER_CACHE.size()]); }
}
return SERVER_CACHE.keySet().toArray(new ServerDescription[SERVER_CACHE.size()]);
}
} }