From 896240b6fef4a68b70ffe7bdd22e6c2d864ae968 Mon Sep 17 00:00:00 2001 From: Shadowrs Date: Mon, 3 Sep 2018 04:27:41 +0100 Subject: [PATCH 1/4] Implements new internal api methods --- .../org/parabot/core/io/NoProgressListener.java | 15 +++++++++++++++ .../core/ui/components/VerboseLoader.java | 16 ++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/src/main/java/org/parabot/core/io/NoProgressListener.java b/src/main/java/org/parabot/core/io/NoProgressListener.java index 247bf39..2669b9b 100644 --- a/src/main/java/org/parabot/core/io/NoProgressListener.java +++ b/src/main/java/org/parabot/core/io/NoProgressListener.java @@ -13,4 +13,19 @@ public class NoProgressListener implements ProgressListener { public void updateDownloadSpeed(double mbPerSecond) { } + + @Override + public void updateMessage(String message) { + + } + + @Override + public void updateMessageAndProgress(String message, double progress) { + + } + + @Override + public double getCurrentProgress() { + return 0; + } } diff --git a/src/main/java/org/parabot/core/ui/components/VerboseLoader.java b/src/main/java/org/parabot/core/ui/components/VerboseLoader.java index 929bdb8..9039f5f 100755 --- a/src/main/java/org/parabot/core/ui/components/VerboseLoader.java +++ b/src/main/java/org/parabot/core/ui/components/VerboseLoader.java @@ -275,4 +275,20 @@ public class VerboseLoader extends JPanel implements ProgressListener { public void updateDownloadSpeed(double mbPerSecond) { progressBar.setText(String.format("(%.2fMB/s)", mbPerSecond)); } + + @Override + public void updateMessage(String message) { + VerboseLoader.setState(message); + } + + @Override + public void updateMessageAndProgress(String message, double progress) { + VerboseLoader.setState(message); + onProgressUpdate(progress); + } + + @Override + public double getCurrentProgress() { + return progressBar.getValue(); + } } \ No newline at end of file From 47747f374dff3e9bc35caff351bf22341266d6d6 Mon Sep 17 00:00:00 2001 From: Jeroen Ketelaar Date: Tue, 18 Sep 2018 20:56:19 -0500 Subject: [PATCH 2/4] [CLEANUP] Added comments to Context class --- src/main/java/org/parabot/core/Context.java | 51 +++++++++++++++++---- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/parabot/core/Context.java b/src/main/java/org/parabot/core/Context.java index e709ff9..b4dfed0 100644 --- a/src/main/java/org/parabot/core/Context.java +++ b/src/main/java/org/parabot/core/Context.java @@ -32,11 +32,11 @@ import java.util.TimerTask; * @author Everel, JKetelaar, Matt */ public class Context { - public static final HashMap threadGroups = new HashMap(); - private static ArrayList paintables = new ArrayList(); + public static final HashMap threadGroups = new HashMap<>(); - private static Context instance; - private static String username; + private static ArrayList paintables = new ArrayList<>(); + private static Context instance; + private static String username; private ASMClassLoader classLoader; private ClassPath classPath; @@ -52,38 +52,58 @@ public class Context { private PBKeyListener pbKeyListener; private ServerProviderInfo providerInfo; private JSONParser jsonParser; - - private PrintStream defaultOut; - private PrintStream defaultErr = System.err; + private PrintStream defaultOut; + private PrintStream defaultErr; private Context(final ServerProvider serverProvider) { threadGroups.put(Thread.currentThread().getThreadGroup(), this); System.setProperty("sun.java.command", ""); + this.serverProvider = serverProvider; this.paintDebugger = new PaintDebugger(); this.classPath = new ClassPath(); this.classLoader = new ASMClassLoader(classPath); this.randomHandler = new RandomHandler(); - this.jsonParser = new JSONParser(); - this.defaultOut = System.out; this.defaultErr = System.err; } + /** + * Returns the instance of this class, based ona given ServerProvider + * + * @param serverProvider + * + * @return + */ public static Context getInstance(ServerProvider serverProvider) { return instance == null ? instance = new Context(serverProvider) : instance; } + /** + * Returns the instance of this class + * + * @return + */ public static Context getInstance() { return getInstance(null); } + /** + * Returns the username of the current logged in user to Parabot + * + * @return + */ public static String getUsername() { return username; } + /** + * Sets the username for the logged in user to Parabot + * + * @param username + */ public static void setUsername(String username) { Context.username = username; } @@ -234,7 +254,8 @@ public class Context { Core.verbose(TranslationHelper.translate("DONE")); } Applet applet = serverProvider.fetchApplet(); - // if applet is null the server provider will call setApplet itself + + // If applet is null the server provider will call setApplet itself if (applet != null) { setApplet(applet); } @@ -367,10 +388,20 @@ public class Context { return this.randomHandler; } + /** + * Returns the JSON Parser instance + * + * @return + */ public JSONParser getJsonParser() { return jsonParser; } + /** + * Returns the PBKeyListener instance + * + * @return + */ public PBKeyListener getPbKeyListener() { return pbKeyListener; } From ddfaa91bfb50212381dfc7739a19f8fc4c585690 Mon Sep 17 00:00:00 2001 From: Jeroen Ketelaar Date: Tue, 16 Oct 2018 18:28:54 -0500 Subject: [PATCH 3/4] [CLEANUP] Fixed typo --- src/main/java/org/parabot/core/Context.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/parabot/core/Context.java b/src/main/java/org/parabot/core/Context.java index b4dfed0..0b2f0fa 100644 --- a/src/main/java/org/parabot/core/Context.java +++ b/src/main/java/org/parabot/core/Context.java @@ -71,7 +71,7 @@ public class Context { } /** - * Returns the instance of this class, based ona given ServerProvider + * Returns the instance of this class, based on a given ServerProvider * * @param serverProvider * From ff8ad1a3022985b59472a6fe1a9dc71652a0f4c5 Mon Sep 17 00:00:00 2001 From: Shadowrs Date: Wed, 17 Oct 2018 23:55:21 +0100 Subject: [PATCH 4/4] [TASK] Bump internal-api dep version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fc2e9eb..04ea80a 100755 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ org.parabot internal-api - 1.51.1 + 1.52.1