Removed duplicated error handling logic to separate method, avoid relying on global state

Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>

Author: mgaffigan

client/src/com/mirth/connect/client/ui/LoginPanel.java

@@ -28,7 +28,6 @@
 
 public class LoginPanel extends javax.swing.JFrame {
 
-    private Client client;
     private static final String ERROR_MESSAGE = "There was an error connecting to the server at the specified address. Please verify that the server is up and running.";
     private static LoginPanel instance = null;
 
@@ -402,6 +401,7 @@ private void passwordActionPerformed(java.awt.event.ActionEvent evt)// GEN-FIRST
     private void loginButtonActionPerformed(java.awt.event.ActionEvent evt)// GEN-FIRST:event_loginButtonActionPerformed
     {// GEN-HEADEREND:event_loginButtonActionPerformed
         errorPane.setVisible(false);
+        LoginPanel loginPanel = this;
 
         SwingWorker<Void, Void> worker = new SwingWorker<Void, Void>() {
 
@@ -410,7 +410,7 @@ public Void doInBackground() {
 
                 try {
                     String server = serverName.getText();
-                    client = new Client(server, PlatformUI.HTTPS_PROTOCOLS, PlatformUI.HTTPS_CIPHER_SUITES);
+                    Client client = new Client(server, PlatformUI.HTTPS_PROTOCOLS, PlatformUI.HTTPS_CIPHER_SUITES);
                     PlatformUI.SERVER_URL = server;
 
                     // Attempt to login
@@ -435,8 +435,8 @@ public Void doInBackground() {
                     // If SUCCESS or SUCCESS_GRACE_PERIOD
                     if (loginStatus != null && loginStatus.isSuccess()) {
                         if (!Mirth.handleLoginSuccess(client, loginStatus, username.getText())) {
-                            LoginPanel.getInstance().setVisible(false);
-                            LoginPanel.getInstance().initialize(PlatformUI.SERVER_URL, PlatformUI.CLIENT_VERSION, "", "");
+                            loginPanel.setVisible(false);
+                            loginPanel.initialize(PlatformUI.SERVER_URL, PlatformUI.CLIENT_VERSION, "", "");
                         }
                     } else {
                         // Assume failure unless overridden by a plugin
@@ -454,8 +454,8 @@ public Void doInBackground() {
                                 if (loginStatus != null && loginStatus.isSuccess()) {
                                     errorOccurred = false;
                                     if (!Mirth.handleLoginSuccess(client, loginStatus, username.getText())) {
-                                        LoginPanel.getInstance().setVisible(false);
-                                        LoginPanel.getInstance().initialize(PlatformUI.SERVER_URL, PlatformUI.CLIENT_VERSION, "", "");
+                                        loginPanel.setVisible(false);
+                                        loginPanel.initialize(PlatformUI.SERVER_URL, PlatformUI.CLIENT_VERSION, "", "");
                                     }
                                 }
                             }
@@ -464,25 +464,16 @@ public Void doInBackground() {
 
                     if (errorOccurred) {
                         if (loginStatus != null) {
-                            errorTextArea.setText(loginStatus.getMessage());
+                            setError(loginStatus.getMessage());
                         } else {
-                            errorTextArea.setText(ERROR_MESSAGE);
+                            setError(ERROR_MESSAGE);
                         }
                     }
                 } catch (Throwable t) {
-                    errorOccurred = true;
-                    errorTextArea.setText(ERROR_MESSAGE);
+                    setError(ERROR_MESSAGE);
                     t.printStackTrace();
                 }
 
-                if (errorOccurred) {
-                    errorPane.setVisible(true);
-                    loggingIn.setVisible(false);
-                    loginMain.setVisible(true);
-                    loginProgress.setIndeterminate(false);
-                    password.grabFocus();
-                }
-
                 return null;
             }
 
@@ -509,6 +500,15 @@ public void setStatus(String status) {
         this.status.setText("Please wait: " + status);
     }
 
+    public void setError(String status) {
+        errorTextArea.setText(status);
+        errorPane.setVisible(true);
+        loggingIn.setVisible(false);
+        loginMain.setVisible(true);
+        loginProgress.setIndeterminate(false);
+        password.grabFocus();
+    }
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton closeButton;
     private javax.swing.JScrollPane errorPane;