Remove LoginPanel singleton to separate class to allow other implementations

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

Author: mgaffigan

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

@@ -0,0 +1,17 @@
+package com.mirth.connect.client.ui;
+
+/**
+ * Public interface for the login panel so alternative implementations can be provided.
+ */
+public abstract class AbstractLoginPanel extends javax.swing.JFrame {
+
+    /**
+     * Initialize and show the login UI.
+     */
+    public abstract void initialize(String mirthServer, String version, String user, String pass);
+
+    /**
+     * Update the status text shown on the login UI.
+     */
+    public abstract void setStatus(String status);
+}

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

@@ -543,7 +543,7 @@ public void eventDispatched(AWTEvent e)
      */
     public void setupFrame(Client mirthClient) throws ClientException {
 
-        LoginPanel login = LoginPanel.getInstance();
+        AbstractLoginPanel login = LoginPanelFactory.getInstance();
 
         // Initialize the send message dialog
         editMessageDialog = new EditMessageDialog();
@@ -1524,7 +1524,7 @@ public void alertThrowable(Component parentComponent, Throwable t, String custom
                     }
                     mirthClient.close();
                     this.dispose();
-                    LoginPanel.getInstance().initialize(PlatformUI.SERVER_URL, PlatformUI.CLIENT_VERSION, "", "");
+                    LoginPanelFactory.getInstance().initialize(PlatformUI.SERVER_URL, PlatformUI.CLIENT_VERSION, "", "");
                     return;
                 } else if (t.getCause() != null && t.getCause() instanceof HttpHostConnectException && (StringUtils.contains(t.getCause().getMessage(), "Connection refused") || StringUtils.contains(t.getCause().getMessage(), "Host is down"))) {
                     connectionError = true;
@@ -1542,7 +1542,7 @@ public void alertThrowable(Component parentComponent, Throwable t, String custom
                     }
                     mirthClient.close();
                     this.dispose();
-                    LoginPanel.getInstance().initialize(PlatformUI.SERVER_URL, PlatformUI.CLIENT_VERSION, "", "");
+                    LoginPanelFactory.getInstance().initialize(PlatformUI.SERVER_URL, PlatformUI.CLIENT_VERSION, "", "");
                     return;
                 }
             }
@@ -2292,7 +2292,7 @@ public boolean logout(boolean quit, boolean confirmFirst) {
         this.dispose();
 
         if (!quit) {
-            LoginPanel.getInstance().initialize(PlatformUI.SERVER_URL, PlatformUI.CLIENT_VERSION, "", "");
+            LoginPanelFactory.getInstance().initialize(PlatformUI.SERVER_URL, PlatformUI.CLIENT_VERSION, "", "");
         }
 
         return true;

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

@@ -31,12 +31,11 @@
 import com.mirth.connect.model.LoginStatus;
 import com.mirth.connect.plugins.MultiFactorAuthenticationClientPlugin;
 
-public class LoginPanel extends javax.swing.JFrame {
+public class LoginPanel extends AbstractLoginPanel {
 
     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;
 
-    private LoginPanel() {
+    public LoginPanel() {
         initComponents();
         DisplayUtil.setResizable(this, false);
         jLabel2.setForeground(UIConstants.HEADER_TITLE_TEXT_COLOR);
@@ -74,15 +73,7 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
         errorTextArea.setDisabledTextColor(Color.RED);
     }
 
-    public static LoginPanel getInstance() {
-        synchronized (LoginPanel.class) {
-            if (instance == null) {
-                instance = new LoginPanel();
-            }
-            return instance;
-        }
-    }
-
+    @Override
     public void initialize(String mirthServer, String version, String user, String pass) {
         synchronized (this) {
             // Do not initialize another login window if one is already visible
@@ -501,6 +492,7 @@ private void closeButtonActionPerformed(java.awt.event.ActionEvent evt)// GEN-FI
         System.exit(0);
     }// GEN-LAST:event_closeButtonActionPerformed
 
+    @Override
     public void setStatus(String status) {
         this.status.setText("Please wait: " + status);
     }

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

@@ -0,0 +1,23 @@
+package com.mirth.connect.client.ui;
+
+/**
+ * Factory for obtaining the application's LoginPanel implementation.
+ */
+public class LoginPanelFactory {
+
+    private static AbstractLoginPanel provider = null;
+
+    public static synchronized AbstractLoginPanel getInstance() {
+        if (provider == null) {
+            provider = new LoginPanel();
+        }
+        return provider;
+    }
+
+    /**
+     * Replace the current provider. This is used to switch between login implementations at runtime.
+     */
+    public static synchronized void setProvider(AbstractLoginPanel newProvider) {
+        provider = newProvider;
+    }
+}

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

@@ -75,7 +75,7 @@ public Mirth(Client mirthClient) throws ClientException {
         UIManager.put("Tree.closedIcon", UIConstants.CLOSED_ICON);
 
         userPreferences = Preferences.userNodeForPackage(Mirth.class);
-        LoginPanel.getInstance().setStatus("Loading components...");
+        LoginPanelFactory.getInstance().setStatus("Loading components...");
         PlatformUI.MIRTH_FRAME.setupFrame(mirthClient);
 
         boolean maximized;
@@ -135,7 +135,7 @@ public static void aboutMac() {
      * @return quit
      */
     public static boolean quitMac() {
-        return (LoginPanel.getInstance().isVisible() || (PlatformUI.MIRTH_FRAME != null && PlatformUI.MIRTH_FRAME.logout(true)));
+        return PlatformUI.MIRTH_FRAME == null || PlatformUI.MIRTH_FRAME.logout(true);
     }
 
     /**
@@ -297,7 +297,7 @@ private static void start(final String server, final String version, final Strin
             public void run() {
                 initUIManager();
                 PlatformUI.BACKGROUND_IMAGE = new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/header_nologo.png"));
-                LoginPanel.getInstance().initialize(server, version, username, password);
+                LoginPanelFactory.getInstance().initialize(server, version, username, password);
             }
         });
     }