Improve error code constants

IbcAlpha · Jul 14, 2023 · bd764c6 · bd764c6
1 parent 0376ff9
commit bd764c6
Show file tree

Hide file tree

Showing 16 changed files with 41 additions and 41 deletions.
diff --git a/src/ibcalpha/ibc/AbstractLoginHandler.java b/src/ibcalpha/ibc/AbstractLoginHandler.java
@@ -79,7 +79,7 @@ void initiateLogin(Window window) {
             Utils.logToConsole("Login attempt: " + ++loginAttemptNumber);
             doLogin(window);
         } catch (IbcException e) {
-            Utils.exitWithError(ErrorCodes.ERROR_CODE_CANT_FIND_CONTROL, "could not login: could not find control: " + e.getMessage());
+            Utils.exitWithError(ErrorCodes.CANT_FIND_CONTROL, "could not login: could not find control: " + e.getMessage());
         }
     }
 

diff --git a/src/ibcalpha/ibc/ComponentIterator.java b/src/ibcalpha/ibc/ComponentIterator.java
@@ -32,7 +32,7 @@ class ComponentIterator implements Iterator<Component> {
     Component mCurrent;
 
     ComponentIterator(Container container) {
-        if (container == null) Utils.exitWithException(ErrorCodes.ERROR_CODE_UNHANDLED_EXCEPTION,new NullPointerException());
+        if (container == null) Utils.exitWithException(ErrorCodes.UNHANDLED_EXCEPTION,new NullPointerException());
         mStack.push(new NodeState(container));
     }
 

diff --git a/src/ibcalpha/ibc/DefaultLoginManager.java b/src/ibcalpha/ibc/DefaultLoginManager.java
@@ -190,7 +190,7 @@ private boolean getTWSUserNameAndPasswordFromArguments(String[] args) {
         for (int i = 0; i < args.length; i++) {
             Utils.logRawToConsole("arg[" + i + "]=" + args[i]);
         }
-        Utils.exitWithError(ErrorCodes.ERROR_CODE_INCORRECT_NUMBER_OF_ARGUMENTS);
+        Utils.exitWithError(ErrorCodes.INCORRECT_NUMBER_OF_ARGS);
         return false;
     }
 

diff --git a/src/ibcalpha/ibc/DefaultSettings.java b/src/ibcalpha/ibc/DefaultSettings.java
@@ -103,7 +103,7 @@ static String getSettingsPath(String [] args) {
         }
         File finiPath = new File(iniPath);
         if (!finiPath.isFile() || !finiPath.exists()) {
-            Utils.exitWithError(ErrorCodes.ERROR_CODE_INI_FILE_NOT_EXIST,  "ini file \"" + iniPath +
+            Utils.exitWithError(ErrorCodes.INI_FILE_DOES_NOT_EXIST,  "ini file \"" + iniPath +
                                "\" either does not exist, or is a directory.  quitting...");
         }
         return iniPath;

diff --git a/src/ibcalpha/ibc/DefaultTradingModeManager.java b/src/ibcalpha/ibc/DefaultTradingModeManager.java
@@ -60,7 +60,7 @@ public DefaultTradingModeManager(String[] args) {
 
     private void setTradingMode(String value) {
         if (!(value.equalsIgnoreCase(TRADING_MODE_LIVE) || value.equalsIgnoreCase(TRADING_MODE_PAPER))) {
-                Utils.exitWithError(ErrorCodes.ERROR_CODE_INVALID_TRADING_MODE, "Invalid Trading Mode argument or .ini file setting: " + tradingMode);
+                Utils.exitWithError(ErrorCodes.INVALID_TRADING_MODE, "Invalid Trading Mode argument or .ini file setting: " + tradingMode);
         }
         tradingMode = value;
     }

diff --git a/src/ibcalpha/ibc/ErrorCodes.java b/src/ibcalpha/ibc/ErrorCodes.java
@@ -20,17 +20,17 @@
 
 public final class ErrorCodes {
 
-    public static final int ERROR_CODE_UNHANDLED_EXCEPTION = 1100;
-    public static final int ERROR_CODE_CANT_FIND_CONTROL = 1101;
-    public static final int ERROR_CODE_INCORRECT_NUMBER_OF_ARGUMENTS = 1102;
-    public static final int ERROR_CODE_INI_FILE_NOT_EXIST = 1103;
-    public static final int ERROR_CODE_INVALID_TRADING_MODE = 1104;
-    public static final int ERROR_CODE_INVALID_CLOSEDOWN_AT_SETTING = 1105;
-    public static final int ERROR_CODE_CANT_CREATE_TWS_SETTINGS_DIRECTORY = 1106;
-    public static final int ERROR_CODE_CANT_FIND_ENTRYPOINT = 1107;
-    public static final int ERROR_CODE_INVALID_JTSINI_PATH = 1108;
-    public static final int ERROR_CODE_IO_EXCEPTION_ON_JTSINI = 1109;
-    public static final int ERROR_CODE_INVALID_STATE = 1110;
-    public static final int ERROR_CODE_2FA_LOGIN_TIMED_OUT = 1111;
-    public static final int ERROR_CODE_LOGIN_DIALOG_DISPLAY_TIMEOUT = 1112;
+    public static final int UNHANDLED_EXCEPTION = 1100;
+    public static final int CANT_FIND_CONTROL = 1101;
+    public static final int INCORRECT_NUMBER_OF_ARGS = 1102;
+    public static final int INI_FILE_DOES_NOT_EXIST = 1103;
+    public static final int INVALID_TRADING_MODE = 1104;
+    public static final int INVALID_SETTING_VALUE = 1105;
+    public static final int CANT_CREATE_TWS_SETTINGS_DIR = 1106;
+    public static final int CANT_FIND_ENTRYPOINT = 1107;
+    public static final int INVALID_JTSINI_PATH = 1108;
+    public static final int IO_EXCEPTION_ON_JTSINI = 1109;
+    public static final int INVALID_STATE = 1110;
+    public static final int SECOND_FACTOR_AUTH_LOGIN_TIMED_OUT = 1111;
+    public static final int LOGIN_DIALOG_DISPLAY_TIMED_OUT = 1112;
 }
diff --git a/src/ibcalpha/ibc/IbcTws.java b/src/ibcalpha/ibc/IbcTws.java
@@ -258,7 +258,7 @@ static void checkArguments(String[] args) {
             for (String arg : args) {
                 Utils.logRawToConsole(arg);
             }
-            Utils.exitWithError(ErrorCodes.ERROR_CODE_INCORRECT_NUMBER_OF_ARGUMENTS);
+            Utils.exitWithError(ErrorCodes.INCORRECT_NUMBER_OF_ARGS);
         }
     }
 
@@ -385,7 +385,7 @@ private static Date getShutdownTime() {
                     }
                 }
             } catch (ParseException e) {
-                Utils.exitWithError(ErrorCodes.ERROR_CODE_INVALID_CLOSEDOWN_AT_SETTING, 
+                Utils.exitWithError(ErrorCodes.INVALID_SETTING_VALUE, 
                                     "Invalid ClosedownAt setting: '" + shutdownTimeSetting + "'; format should be: <[day ]hh:mm>   eg 22:00 or Friday 22:00");
             }
             return cal.getTime();
@@ -401,10 +401,10 @@ private static String getTWSSettingsDirectory() {
         try {
             Files.createDirectories(Paths.get(path));
         } catch (FileAlreadyExistsException ex) {
-            Utils.exitWithError(ErrorCodes.ERROR_CODE_CANT_CREATE_TWS_SETTINGS_DIRECTORY, 
+            Utils.exitWithError(ErrorCodes.CANT_CREATE_TWS_SETTINGS_DIR, 
                                 "Failed to create TWS settings directory at: " + path + "; a file of that name already exists");
         } catch (IOException ex) {
-            Utils.exitWithException(ErrorCodes.ERROR_CODE_CANT_CREATE_TWS_SETTINGS_DIRECTORY, ex);
+            Utils.exitWithException(ErrorCodes.CANT_CREATE_TWS_SETTINGS_DIR, ex);
         }
         return path;
     }
@@ -439,7 +439,7 @@ private static void startGateway() {
         } catch (Throwable t) {
             Utils.logError("Exception occurred at Gateway entry point: ibgateway.GWClient.main");
             t.printStackTrace(Utils.getErrStream());
-            Utils.exitWithError(ErrorCodes.ERROR_CODE_CANT_FIND_ENTRYPOINT);
+            Utils.exitWithError(ErrorCodes.CANT_FIND_ENTRYPOINT);
         }
     }
 
@@ -472,7 +472,7 @@ private static void startTws() {
         } catch (Throwable t) {
             Utils.logError("Exception occurred at TWS entry point: jclient.LoginFrame.main");
             t.printStackTrace(Utils.getErrStream());
-            Utils.exitWithError(ErrorCodes.ERROR_CODE_CANT_FIND_ENTRYPOINT);
+            Utils.exitWithError(ErrorCodes.CANT_FIND_ENTRYPOINT);
         }
     }
 

diff --git a/src/ibcalpha/ibc/JtsIniManager.java b/src/ibcalpha/ibc/JtsIniManager.java
@@ -150,7 +150,7 @@ static void reload() {
     private static void loadIniFile() {
         jtsIniFile = new File(jtsIniFilePath);
         if (jtsIniFile.isDirectory()) {
-            Utils.exitWithError(ErrorCodes.ERROR_CODE_INVALID_JTSINI_PATH, 
+            Utils.exitWithError(ErrorCodes.INVALID_JTSINI_PATH, 
                                 jtsIniFilePath + " already exists but is a directory");
         }
         if (jtsIniFile.isFile()) {
@@ -248,7 +248,7 @@ private static List<String> getFileLines(File jtsIniFile) {
         try {
             linesList = Files.readAllLines(jtsIniFile.toPath());
         } catch (IOException e) {
-            Utils.exitWithError(ErrorCodes.ERROR_CODE_IO_EXCEPTION_ON_JTSINI, 
+            Utils.exitWithError(ErrorCodes.IO_EXCEPTION_ON_JTSINI, 
                                 "Unexpected IOException on " + jtsIniFile + ": " + e.getMessage());
         }
         return linesList;
@@ -266,7 +266,7 @@ private static void createMinimalFile() {
             writeIniFileLine(IBGATEWAY_SECTION_HEADER, w);
             writeIniFileLine(APIONLY_SETTING_TRUE, w);
         } catch (IOException e) {
-            Utils.exitWithError(ErrorCodes.ERROR_CODE_IO_EXCEPTION_ON_JTSINI, 
+            Utils.exitWithError(ErrorCodes.IO_EXCEPTION_ON_JTSINI, 
                                 "Problem creating " + jtsIniFilePath + ": " + e.getMessage());
         }
     }
@@ -278,7 +278,7 @@ private static void rewriteExistingFile(List<JtsIniSectionSetting> missingSettin
             updateExistingSections(missingSettings, w);
             updateUnprocessedSettings(getUnprocessedSettings(missingSettings), w);
         } catch (IOException e){
-            Utils.exitWithError(ErrorCodes.ERROR_CODE_IO_EXCEPTION_ON_JTSINI, 
+            Utils.exitWithError(ErrorCodes.IO_EXCEPTION_ON_JTSINI, 
                                 "Problem writing to " + jtsIniFilePath + ": " + e.getMessage());
         }
     }

diff --git a/src/ibcalpha/ibc/LoginManager.java b/src/ibcalpha/ibc/LoginManager.java
@@ -174,7 +174,7 @@ void restartAfterTime(final int secondsTillShutdown, final String message) {
                         Utils.logToConsole("Login has already completed - no need for IBC to exit");
                         return;
                     }
-                    Utils.exitWithError(ErrorCodes.ERROR_CODE_2FA_LOGIN_TIMED_OUT, message);
+                    Utils.exitWithError(ErrorCodes.SECOND_FACTOR_AUTH_LOGIN_TIMED_OUT, message);
                 });
             }, secondsTillShutdown, TimeUnit.SECONDS);
         } catch (Throwable e) {

diff --git a/src/ibcalpha/ibc/RestartTask.java b/src/ibcalpha/ibc/RestartTask.java
@@ -59,7 +59,7 @@ public void run() {
             restart();
         } catch (Exception ex) {
             writeNack(ex.getMessage());
-            Utils.exitWithException(ErrorCodes.ERROR_CODE_UNHANDLED_EXCEPTION, ex);
+            Utils.exitWithException(ErrorCodes.UNHANDLED_EXCEPTION, ex);
         }
     }
 

diff --git a/src/ibcalpha/ibc/SecondFactorAuthenticationDialogHandler.java b/src/ibcalpha/ibc/SecondFactorAuthenticationDialogHandler.java
@@ -92,7 +92,7 @@ private boolean secondFactorDeviceSelectionRequired(Window window) {
     private void selectSecondFactorDevice(Window window) {
         JList<?> deviceList = SwingUtils.findList(window, 0);
         if (deviceList == null) {
-            Utils.exitWithError(ErrorCodes.ERROR_CODE_CANT_FIND_CONTROL, "could not find second factor device list.");
+            Utils.exitWithError(ErrorCodes.CANT_FIND_CONTROL, "could not find second factor device list.");
             return;
         }
 

diff --git a/src/ibcalpha/ibc/SessionManager.java b/src/ibcalpha/ibc/SessionManager.java
@@ -37,13 +37,13 @@ public static boolean isGateway() {
 
     private static boolean _isFIX = false;
     public static boolean isFIX() {
-        if (!_isSessionStarted) Utils.exitWithError(ErrorCodes.ERROR_CODE_INVALID_STATE, "isFix() called before session has started");
+        if (!_isSessionStarted) Utils.exitWithError(ErrorCodes.INVALID_STATE, "isFix() called before session has started");
         return _isFIX;
     }
 
     private static boolean _isRestart;
     static boolean isRestart() {
-        if (!_isSessionStarted) Utils.exitWithError(ErrorCodes.ERROR_CODE_INVALID_STATE, "isRestart() called before session has started");
+        if (!_isSessionStarted) Utils.exitWithError(ErrorCodes.INVALID_STATE, "isRestart() called before session has started");
         return _isRestart;
     }
 
@@ -67,7 +67,7 @@ static void startSession() {
                         // Login diaog has been shown - no need for IBC to exit
                         return;
                     }
-                    Utils.exitWithError(ErrorCodes.ERROR_CODE_LOGIN_DIALOG_DISPLAY_TIMEOUT, "IBC closing after TWS/Gateway failed to display login dialog");
+                    Utils.exitWithError(ErrorCodes.LOGIN_DIALOG_DISPLAY_TIMED_OUT, "IBC closing after TWS/Gateway failed to display login dialog");
                 });
             }, loginDialogDisplayTimeout, TimeUnit.SECONDS);
         }

diff --git a/src/ibcalpha/ibc/StopTask.java b/src/ibcalpha/ibc/StopTask.java
@@ -45,7 +45,7 @@ public void run() {
             stop();
         } catch (Exception ex) {
             writeNack(ex.getMessage());
-            Utils.exitWithException(ErrorCodes.ERROR_CODE_UNHANDLED_EXCEPTION, ex);
+            Utils.exitWithException(ErrorCodes.UNHANDLED_EXCEPTION, ex);
         }
     }
 
@@ -69,7 +69,7 @@ private void stop() {
             }
 
         } catch (IllegalStateException e) {
-            Utils.exitWithException(ErrorCodes.ERROR_CODE_UNHANDLED_EXCEPTION, e);
+            Utils.exitWithException(ErrorCodes.UNHANDLED_EXCEPTION, e);
         }
     }
 

diff --git a/src/ibcalpha/ibc/TradingLoginHandoffDialogHandler.java b/src/ibcalpha/ibc/TradingLoginHandoffDialogHandler.java
@@ -71,9 +71,9 @@ public void handleWindow(Window window, int eventID) {
                 Utils.logError(String.format(COULD_NOT_HANDLE_MESSAGE, "the 'Disconnect Other Session' button wasn't found."));
             }
         } else if (setting.equalsIgnoreCase("primaryoverride")) {
-            Utils.exitWithError(ErrorCodes.ERROR_CODE_INVALID_STATE, String.format(ERROR_MESSAGE, "ExistingSessionDetectedAction=primaryoverride"));
+            Utils.exitWithError(ErrorCodes.INVALID_STATE, String.format(ERROR_MESSAGE, "ExistingSessionDetectedAction=primaryoverride"));
         } else if (setting.equalsIgnoreCase("secondary")) {
-            Utils.exitWithError(ErrorCodes.ERROR_CODE_INVALID_STATE, String.format(ERROR_MESSAGE, "ExistingSessionDetectedAction=secondary"));
+            Utils.exitWithError(ErrorCodes.INVALID_STATE, String.format(ERROR_MESSAGE, "ExistingSessionDetectedAction=secondary"));
         } else if (setting.equalsIgnoreCase("manual")) {
             Utils.logToConsole(String.format(INFO_MESSAGE, "user must choose whether to continue with this session"));
             // nothing to do

diff --git a/src/ibcalpha/ibc/TwsListener.java b/src/ibcalpha/ibc/TwsListener.java
@@ -61,11 +61,11 @@ public void eventDispatched(AWTEvent event) {
 
                     logWindowStructure(window, eventID, false);
                 } catch (Throwable e) {
-                    Utils.exitWithException(ErrorCodes.ERROR_CODE_UNHANDLED_EXCEPTION, e);
+                    Utils.exitWithException(ErrorCodes.UNHANDLED_EXCEPTION, e);
                 }
             });
         } catch (Throwable e) {
-            Utils.exitWithException(ErrorCodes.ERROR_CODE_UNHANDLED_EXCEPTION, e);
+            Utils.exitWithException(ErrorCodes.UNHANDLED_EXCEPTION, e);
         }
     }
 

diff --git a/src/ibcalpha/ibc/UncaughtExceptionHandler.java b/src/ibcalpha/ibc/UncaughtExceptionHandler.java
@@ -22,7 +22,7 @@ public final class UncaughtExceptionHandler implements Thread.UncaughtExceptionH
 
     @Override
     public void uncaughtException(Thread thread, Throwable t) {
-        Utils.exitWithException(ErrorCodes.ERROR_CODE_UNHANDLED_EXCEPTION, t);
+        Utils.exitWithException(ErrorCodes.UNHANDLED_EXCEPTION, t);
     }
 
 }