Refactor total utils and Helpers

Wolfsblvt · Aug 11, 2016 · ce80426 · ce80426
1 parent f5178c3
commit ce80426
Show file tree

Hide file tree

Showing 24 changed files with 407 additions and 366 deletions.
diff --git a/src/me/corriekay/pokegoutil/BlossomsPoGoManager.java b/src/me/corriekay/pokegoutil/BlossomsPoGoManager.java
@@ -9,8 +9,8 @@
 import javafx.stage.StageStyle;
 import me.corriekay.pokegoutil.controllers.AccountController;
 import me.corriekay.pokegoutil.utils.Config;
-import me.corriekay.pokegoutil.utils.Console;
+import me.corriekay.pokegoutil.utils.ui.Console;
-import me.corriekay.pokegoutil.utils.Utilities;
+import me.corriekay.pokegoutil.utils.helpers.UIHelper;
 
 import javax.swing.*;
 import java.io.IOException;
@@ -40,7 +40,7 @@ private void openOldGui() {
 
             @Override
             public void run() {
-                Utilities.setNativeLookAndFeel();
+                UIHelper.setNativeLookAndFeel();
                 console = new Console("Console", 0, 0, true);
                 console.setVisible(false);
                 AccountController.initialize(console);

diff --git a/src/me/corriekay/pokegoutil/GUI/controller/ChooseGuiWindowController.java b/src/me/corriekay/pokegoutil/GUI/controller/ChooseGuiWindowController.java
@@ -11,8 +11,8 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import me.corriekay.pokegoutil.controllers.AccountController;
-import me.corriekay.pokegoutil.utils.Console;
+import me.corriekay.pokegoutil.utils.ui.Console;
-import me.corriekay.pokegoutil.utils.Utilities;
+import me.corriekay.pokegoutil.utils.helpers.UIHelper;
 
 import javax.swing.*;
 import java.io.IOException;
@@ -82,7 +82,7 @@ void onOldGuiBtnClicked(ActionEvent event) {
 
             @Override
             public void run() {
-                Utilities.setNativeLookAndFeel();
+                UIHelper.setNativeLookAndFeel();
                 console = new Console("Console", 0, 0, true);
                 console.setVisible(false);
                 AccountController.initialize(console);

diff --git a/src/me/corriekay/pokegoutil/controllers/AccountController.java b/src/me/corriekay/pokegoutil/controllers/AccountController.java
@@ -7,9 +7,9 @@
 import com.pokegoapi.auth.PtcCredentialProvider;
 import com.pokegoapi.exceptions.LoginFailedException;
 import com.pokegoapi.exceptions.RemoteServerException;
-import me.corriekay.pokegoutil.utils.Browser;
+import me.corriekay.pokegoutil.utils.helpers.Browser;
 import me.corriekay.pokegoutil.utils.Config;
-import me.corriekay.pokegoutil.utils.Console;
+import me.corriekay.pokegoutil.utils.ui.Console;
 import me.corriekay.pokegoutil.windows.PokemonGoMainWindow;
 import okhttp3.OkHttpClient;
 

diff --git a/src/me/corriekay/pokegoutil/controllers/AccountControllerNew.java b/src/me/corriekay/pokegoutil/controllers/AccountControllerNew.java
@@ -5,12 +5,8 @@
 import com.pokegoapi.auth.CredentialProvider;
 import com.pokegoapi.auth.GoogleUserCredentialProvider;
 import com.pokegoapi.auth.PtcCredentialProvider;
-import com.pokegoapi.exceptions.LoginFailedException;
+import me.corriekay.pokegoutil.utils.helpers.Browser;
-import com.pokegoapi.exceptions.RemoteServerException;
-import me.corriekay.pokegoutil.utils.Browser;
 import me.corriekay.pokegoutil.utils.Config;
-import me.corriekay.pokegoutil.utils.Console;
-import me.corriekay.pokegoutil.windows.PokemonGoMainWindow;
 import okhttp3.OkHttpClient;
 
 import javax.swing.*;

diff --git a/src/me/corriekay/pokegoutil/utils/Config.java b/src/me/corriekay/pokegoutil/utils/Config.java
@@ -1,5 +1,6 @@
 package me.corriekay.pokegoutil.utils;
 
+import me.corriekay.pokegoutil.utils.helpers.FileHelper;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -29,7 +30,7 @@ private Config() {
             json = new JSONObject();
             saveConfig();
         } else {
-            json = new JSONObject(Utilities.readFile(file));
+            json = new JSONObject(FileHelper.readFile(file));
         }
     }
 
@@ -178,7 +179,7 @@ public void delete(String path) {
     }
 
     public void saveConfig() {
-        Utilities.saveFile(file, json.toString(4));
+        FileHelper.saveFile(file, json.toString(4));
     }
 
     private class FindResult {

diff --git a/src/me/corriekay/pokegoutil/utils/DateHelper.java b/src/me/corriekay/pokegoutil/utils/DateHelper.java
diff --git a/src/me/corriekay/pokegoutil/utils/LDocumentListener.java b/src/me/corriekay/pokegoutil/utils/LDocumentListener.java