Extract LoginPanel interface with SPI discovery

- Create LoginPanel interface with LoginSuccessHandler callback,
  5-parameter initialize, setStatus, setVisible, isVisible, and
  showLoginNotification methods
- Update DefaultLoginPanel: extends JFrame implements LoginPanel,
  package-private constructor, store onSuccess callback, add
  showLoginNotification with proper EDT marshalling via invokeAndWait
- Rewrite LoginPanelFactory with ServiceLoader (SPI) discovery and
  getLoginPanel() API, falling back to DefaultLoginPanel
- Add Mirth.showLogin() as single entry point for login initiation,
  passing Mirth::handleLoginSuccess as the callback
- Make Mirth.handleLoginSuccess private, replace CustomBannerPanelDialog
  with loginPanel.showLoginNotification() delegation
- Decouple Frame from login panel: setupFrame accepts Consumer<String>
  statusCallback, re-login sites use Mirth.showLogin()
- Delete AbstractLoginPanel.java

Author: tonygermano

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

@@ -6,16 +6,20 @@
 
 import java.awt.Color;
 import java.awt.Cursor;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.swing.ImageIcon;
+import javax.swing.SwingUtilities;
 import javax.swing.SwingWorker;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.mirth.connect.client.core.Client;
 import com.mirth.connect.client.core.ClientException;
@@ -26,11 +30,14 @@
 import com.mirth.connect.model.LoginStatus;
 import com.mirth.connect.plugins.MultiFactorAuthenticationClientPlugin;
 
-public class DefaultLoginPanel extends AbstractLoginPanel {
+class DefaultLoginPanel extends javax.swing.JFrame implements LoginPanel {
 
+    private static final Logger logger = LogManager.getLogger(DefaultLoginPanel.class);
     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.";
 
-    public DefaultLoginPanel() {
+    private LoginSuccessHandler onSuccess;
+
+    DefaultLoginPanel() {
         initComponents();
         DisplayUtil.setResizable(this, false);
         jLabel2.setForeground(UIConstants.HEADER_TITLE_TEXT_COLOR);
@@ -69,12 +76,21 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
     }
 
     @Override
-    public void initialize(String mirthServer, String version, String user, String pass) {
+    public void initialize(String mirthServer, String version, String user, String pass, LoginSuccessHandler onSuccess) {
+        if (SwingUtilities.isEventDispatchThread()) {
+            doInitialize(mirthServer, version, user, pass, onSuccess);
+        } else {
+            SwingUtilities.invokeLater(() -> doInitialize(mirthServer, version, user, pass, onSuccess));
+        }
+    }
+
+    private void doInitialize(String mirthServer, String version, String user, String pass, LoginSuccessHandler onSuccess) {
         synchronized (this) {
             // Do not initialize another login window if one is already visible
             if (isVisible()) {
                 return;
             }
+            this.onSuccess = onSuccess;
 
             setTitle(String.format("%s %s - Login", BrandingConstants.PRODUCT_NAME, version));
             setIconImage(BrandingConstants.FAVICON.getImage());
@@ -392,7 +408,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;
+        DefaultLoginPanel loginPanel = this;
 
         SwingWorker<Void, Void> worker = new SwingWorker<Void, Void>() {
 
@@ -425,9 +441,9 @@ public Void doInBackground() {
 
                     // If SUCCESS or SUCCESS_GRACE_PERIOD
                     if (loginStatus != null && loginStatus.isSuccess()) {
-                        if (!Mirth.handleLoginSuccess(client, loginStatus, username.getText())) {
+                        if (!onSuccess.handle(client, loginStatus, username.getText())) {
                             loginPanel.setVisible(false);
-                            loginPanel.initialize(PlatformUI.SERVER_URL, PlatformUI.CLIENT_VERSION, "", "");
+                            loginPanel.initialize(PlatformUI.SERVER_URL, PlatformUI.CLIENT_VERSION, "", "", onSuccess);
                         }
                     } else {
                         // Assume failure unless overridden by a plugin
@@ -444,9 +460,9 @@ public Void doInBackground() {
 
                                 if (loginStatus != null && loginStatus.isSuccess()) {
                                     errorOccurred = false;
-                                    if (!Mirth.handleLoginSuccess(client, loginStatus, username.getText())) {
+                                    if (!onSuccess.handle(client, loginStatus, username.getText())) {
                                         loginPanel.setVisible(false);
-                                        loginPanel.initialize(PlatformUI.SERVER_URL, PlatformUI.CLIENT_VERSION, "", "");
+                                        loginPanel.initialize(PlatformUI.SERVER_URL, PlatformUI.CLIENT_VERSION, "", "", onSuccess);
                                     }
                                 }
                             }
@@ -487,18 +503,48 @@ private void closeButtonActionPerformed(java.awt.event.ActionEvent evt)// GEN-FI
         System.exit(0);
     }// GEN-LAST:event_closeButtonActionPerformed
 
+    @Override
+    public void setVisible(boolean visible) {
+        if (SwingUtilities.isEventDispatchThread()) {
+            super.setVisible(visible);
+        } else {
+            SwingUtilities.invokeLater(() -> super.setVisible(visible));
+        }
+    }
+
     @Override
     public void setStatus(String status) {
-        this.status.setText("Please wait: " + status);
+        SwingUtilities.invokeLater(() -> 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();
+    private void setError(String status) {
+        SwingUtilities.invokeLater(() -> {
+            errorTextArea.setText(status);
+            errorPane.setVisible(true);
+            loggingIn.setVisible(false);
+            loginMain.setVisible(true);
+            loginProgress.setIndeterminate(false);
+            password.grabFocus();
+        });
+    }
+
+    @Override
+    public boolean showLoginNotification(String title, String message) {
+        // Called from a background thread (SwingWorker.doInBackground via handleLoginSuccess).
+        // Swing dialogs must be created and shown on the EDT to avoid deadlocks.
+        final AtomicBoolean accepted = new AtomicBoolean(false);
+        try {
+            SwingUtilities.invokeAndWait(() -> {
+                CustomBannerPanelDialog dialog = new CustomBannerPanelDialog(this, title, message);
+                accepted.set(dialog.isAccepted());
+            });
+        } catch (InterruptedException e) {
+            logger.warn("Login notification dialog interrupted; treating as declined");
+            Thread.currentThread().interrupt();
+        } catch (InvocationTargetException e) {
+            throw new RuntimeException(e.getCause());
+        }
+        return accepted.get();
     }
 
     // Variables declaration - do not modify//GEN-BEGIN:variables

…/mirth/connect/client/ui/LoginPanel.form …connect/client/ui/DefaultLoginPanel.formclient/src/com/mirth/connect/client/ui/LoginPanel.form renamed to client/src/com/mirth/connect/client/ui/DefaultLoginPanel.form client/src/com/mirth/connect/client/ui/LoginPanel.form renamed to client/src/com/mirth/connect/client/ui/DefaultLoginPanel.form

@@ -1,11 +1,6 @@
-/*
- * Copyright (c) Mirth Corporation. All rights reserved.
- * 
- * http://www.mirthcorp.com
- * 
- * The software in this package is published under the terms of the MPL license a copy of which has
- * been included with this distribution in the LICENSE.txt file.
- */
+// SPDX-License-Identifier: MPL-2.0
+// SPDX-FileCopyrightText: Mirth Corporation
+// SPDX-FileCopyrightText: 2025-2026 Open Integration Engine Contributors
 
 package com.mirth.connect.client.ui;
 
@@ -57,6 +52,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.function.Consumer;
 import java.util.prefs.Preferences;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -541,15 +537,13 @@ public void eventDispatched(AWTEvent e)
     /**
      * Called to set up this main window frame.
      */
-    public void setupFrame(Client mirthClient) throws ClientException {
-
-        AbstractLoginPanel login = LoginPanelFactory.getInstance();
+    public void setupFrame(Client mirthClient, Consumer<String> statusCallback) throws ClientException {
 
         // Initialize the send message dialog
         editMessageDialog = new EditMessageDialog();
 
         this.mirthClient = mirthClient;
-        login.setStatus("Loading extensions...");
+        statusCallback.accept("Loading extensions...");
         try {
             loadExtensionMetaData();
         } catch (ClientException e) {
@@ -589,10 +583,10 @@ public void setupFrame(Client mirthClient) throws ClientException {
         }
 
         setInitialVisibleTasks();
-        login.setStatus("Loading preferences...");
+        statusCallback.accept("Loading preferences...");
         userPreferences = Preferences.userNodeForPackage(Mirth.class);
         userPreferences.put("defaultServer", PlatformUI.SERVER_URL);
-        login.setStatus("Loading GUI components...");
+        statusCallback.accept("Loading GUI components...");
         splitPane.setDividerSize(0);
         splitPane.setBorder(BorderFactory.createEmptyBorder());
 
@@ -661,15 +655,15 @@ public void setupFrame(Client mirthClient) throws ClientException {
         }
 
         setCurrentTaskPaneContainer(taskPaneContainer);
-        login.setStatus("Loading dashboard...");
+        statusCallback.accept("Loading dashboard...");
         doShowDashboard();
-        login.setStatus("Loading channel editor...");
+        statusCallback.accept("Loading channel editor...");
         channelEditPanel = new ChannelSetup();
-        login.setStatus("Loading alert editor...");
+        statusCallback.accept("Loading alert editor...");
         if (alertEditPanel == null) {
             alertEditPanel = new DefaultAlertEditPanel();
         }
-        login.setStatus("Loading message browser...");
+        statusCallback.accept("Loading message browser...");
         messageBrowser = new MessageBrowser();
 
         // Refresh code templates after extensions have been loaded
@@ -1524,7 +1518,7 @@ public void alertThrowable(Component parentComponent, Throwable t, String custom
                     }
                     mirthClient.close();
                     this.dispose();
-                    LoginPanelFactory.getInstance().initialize(PlatformUI.SERVER_URL, PlatformUI.CLIENT_VERSION, "", "");
+                    Mirth.showLogin();
                     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 +1536,7 @@ public void alertThrowable(Component parentComponent, Throwable t, String custom
                     }
                     mirthClient.close();
                     this.dispose();
-                    LoginPanelFactory.getInstance().initialize(PlatformUI.SERVER_URL, PlatformUI.CLIENT_VERSION, "", "");
+                    Mirth.showLogin();
                     return;
                 }
             }
@@ -2292,7 +2286,7 @@ public boolean logout(boolean quit, boolean confirmFirst) {
         this.dispose();
 
         if (!quit) {
-            LoginPanelFactory.getInstance().initialize(PlatformUI.SERVER_URL, PlatformUI.CLIENT_VERSION, "", "");
+            Mirth.showLogin();
         }
 
         return true;