From d236c21b18cf226bf7664661a80ccad9fe604bcf Mon Sep 17 00:00:00 2001 From: Clisprail Date: Wed, 19 Feb 2014 23:41:19 +0100 Subject: [PATCH] Proper code style environment package --- parabotv2/src/org/parabot/Landing.java | 4 ++-- parabotv2/src/org/parabot/environment/api/utils/Timer.java | 1 - parabotv2/src/org/parabot/environment/input/Keyboard.java | 2 +- parabotv2/src/org/parabot/environment/input/Mouse.java | 6 +++--- .../src/org/parabot/environment/scripts/Frameworks.java | 2 +- .../parabot/environment/scripts/LocalScriptExecuter.java | 2 +- .../org/parabot/environment/scripts/SDNScriptExecuter.java | 5 +++-- .../environment/scripts/framework/AbstractFramework.java | 4 ++++ .../environment/scripts/loader/JavaScriptLoader.java | 2 +- .../parabot/environment/servers/LocalServerExecuter.java | 4 ++-- .../parabot/environment/servers/PublicServerExecuter.java | 4 ++-- .../parabot/environment/servers/loader/ServerLoader.java | 2 +- 12 files changed, 21 insertions(+), 17 deletions(-) diff --git a/parabotv2/src/org/parabot/Landing.java b/parabotv2/src/org/parabot/Landing.java index aebb6cf..c291bfc 100644 --- a/parabotv2/src/org/parabot/Landing.java +++ b/parabotv2/src/org/parabot/Landing.java @@ -21,8 +21,8 @@ import org.parabot.core.ui.utils.UILog; */ public final class Landing { // forum account - private static String username = null; - private static String password = null; + private static String username; + private static String password; public static void main(String... args) throws IOException { parseArgs(args); diff --git a/parabotv2/src/org/parabot/environment/api/utils/Timer.java b/parabotv2/src/org/parabot/environment/api/utils/Timer.java index 3aa2ced..775475d 100644 --- a/parabotv2/src/org/parabot/environment/api/utils/Timer.java +++ b/parabotv2/src/org/parabot/environment/api/utils/Timer.java @@ -8,7 +8,6 @@ package org.parabot.environment.api.utils; * */ public class Timer { - private long start; private long end; diff --git a/parabotv2/src/org/parabot/environment/input/Keyboard.java b/parabotv2/src/org/parabot/environment/input/Keyboard.java index 72f9a45..1e3d5d6 100644 --- a/parabotv2/src/org/parabot/environment/input/Keyboard.java +++ b/parabotv2/src/org/parabot/environment/input/Keyboard.java @@ -16,8 +16,8 @@ import org.parabot.core.Context; * */ public class Keyboard implements KeyListener { - private Component component = null; private static HashMap specialChars; + private Component component; private long pressTime; public Keyboard(Component component) { diff --git a/parabotv2/src/org/parabot/environment/input/Mouse.java b/parabotv2/src/org/parabot/environment/input/Mouse.java index a69fd16..fc2e7bc 100644 --- a/parabotv2/src/org/parabot/environment/input/Mouse.java +++ b/parabotv2/src/org/parabot/environment/input/Mouse.java @@ -17,9 +17,9 @@ import org.parabot.environment.api.utils.Time; * */ public class Mouse implements MouseListener, MouseMotionListener { - private Component component = null; - private int x = 0; - private int y = 0; + private Component component; + private int x; + private int y; public Mouse(Component component) { this.component = component; diff --git a/parabotv2/src/org/parabot/environment/scripts/Frameworks.java b/parabotv2/src/org/parabot/environment/scripts/Frameworks.java index 0afaedd..0f66eea 100644 --- a/parabotv2/src/org/parabot/environment/scripts/Frameworks.java +++ b/parabotv2/src/org/parabot/environment/scripts/Frameworks.java @@ -47,7 +47,7 @@ class Looper extends AbstractFramework { } class StrategyWorker extends AbstractFramework { - private Collection strategies = null; + private Collection strategies; public StrategyWorker(Collection strategies) { this.strategies = strategies; diff --git a/parabotv2/src/org/parabot/environment/scripts/LocalScriptExecuter.java b/parabotv2/src/org/parabot/environment/scripts/LocalScriptExecuter.java index bfb0823..dc03ef5 100644 --- a/parabotv2/src/org/parabot/environment/scripts/LocalScriptExecuter.java +++ b/parabotv2/src/org/parabot/environment/scripts/LocalScriptExecuter.java @@ -8,7 +8,7 @@ package org.parabot.environment.scripts; * */ public class LocalScriptExecuter extends ScriptExecuter { - private Script script = null; + private Script script; public LocalScriptExecuter(final Script script) { this.script = script; diff --git a/parabotv2/src/org/parabot/environment/scripts/SDNScriptExecuter.java b/parabotv2/src/org/parabot/environment/scripts/SDNScriptExecuter.java index ea37123..8eb3fe1 100644 --- a/parabotv2/src/org/parabot/environment/scripts/SDNScriptExecuter.java +++ b/parabotv2/src/org/parabot/environment/scripts/SDNScriptExecuter.java @@ -22,9 +22,8 @@ import org.parabot.environment.scripts.loader.JavaScriptLoader; * */ public class SDNScriptExecuter extends ScriptExecuter { - private int id = -1; - private static AccountManager manager = null; + private static AccountManager manager; public static final AccountManagerAccess MANAGER_FETCHER = new AccountManagerAccess() { @@ -35,6 +34,8 @@ public class SDNScriptExecuter extends ScriptExecuter { }; + private int id = -1; + public SDNScriptExecuter(final int id) { this.id = id; } diff --git a/parabotv2/src/org/parabot/environment/scripts/framework/AbstractFramework.java b/parabotv2/src/org/parabot/environment/scripts/framework/AbstractFramework.java index 16d8bd0..867e306 100644 --- a/parabotv2/src/org/parabot/environment/scripts/framework/AbstractFramework.java +++ b/parabotv2/src/org/parabot/environment/scripts/framework/AbstractFramework.java @@ -9,6 +9,10 @@ package org.parabot.environment.scripts.framework; */ public abstract class AbstractFramework { + /** + * Executes this frame + * @return true if it should keep executing this framework, otherwise false. + */ public abstract boolean execute(); } diff --git a/parabotv2/src/org/parabot/environment/scripts/loader/JavaScriptLoader.java b/parabotv2/src/org/parabot/environment/scripts/loader/JavaScriptLoader.java index 212f580..664266e 100644 --- a/parabotv2/src/org/parabot/environment/scripts/loader/JavaScriptLoader.java +++ b/parabotv2/src/org/parabot/environment/scripts/loader/JavaScriptLoader.java @@ -17,7 +17,7 @@ import org.parabot.environment.scripts.Script; * */ public class JavaScriptLoader extends ASMClassLoader { - private ClassPath classPath = null; + private ClassPath classPath; public JavaScriptLoader(ClassPath classPath) { super(classPath); diff --git a/parabotv2/src/org/parabot/environment/servers/LocalServerExecuter.java b/parabotv2/src/org/parabot/environment/servers/LocalServerExecuter.java index 3f613b8..1dad3a3 100644 --- a/parabotv2/src/org/parabot/environment/servers/LocalServerExecuter.java +++ b/parabotv2/src/org/parabot/environment/servers/LocalServerExecuter.java @@ -16,8 +16,8 @@ import org.parabot.core.classpath.ClassPath; */ public class LocalServerExecuter extends ServerExecuter { private final ServerProvider serverProvider; - private ClassPath classPath = null; - private String serverName = null; + private ClassPath classPath; + private String serverName; public LocalServerExecuter(ServerProvider serverProvider, ClassPath classPath, final String serverName) { diff --git a/parabotv2/src/org/parabot/environment/servers/PublicServerExecuter.java b/parabotv2/src/org/parabot/environment/servers/PublicServerExecuter.java index 5ccb1a9..fe689eb 100644 --- a/parabotv2/src/org/parabot/environment/servers/PublicServerExecuter.java +++ b/parabotv2/src/org/parabot/environment/servers/PublicServerExecuter.java @@ -23,8 +23,8 @@ import java.net.URL; * */ public class PublicServerExecuter extends ServerExecuter { - private String serverName = null; - private String serverID = null; + private String serverName; + private String serverID; public PublicServerExecuter(final String serverName, final String serverID) { this.serverName = serverName; diff --git a/parabotv2/src/org/parabot/environment/servers/loader/ServerLoader.java b/parabotv2/src/org/parabot/environment/servers/loader/ServerLoader.java index 66653ad..f76cb42 100644 --- a/parabotv2/src/org/parabot/environment/servers/loader/ServerLoader.java +++ b/parabotv2/src/org/parabot/environment/servers/loader/ServerLoader.java @@ -17,7 +17,7 @@ import org.parabot.environment.servers.ServerProvider; * */ public class ServerLoader extends ASMClassLoader { - private ClassPath classPath = null; + private ClassPath classPath; public ServerLoader(ClassPath classPath) { super(classPath);