pass more objects directly

src/com/dmdirc/addons/ui_swing/MainFrame.java

@@ -361,7 +361,7 @@ public final class MainFrame extends JFrame implements WindowListener,
      * Initialises the components for this frame.
      */
     private void initComponents() {
-        statusBar = new SwingStatusBar(controller);
+        statusBar = new SwingStatusBar(controller, this);
         frameManagerPanel = new JPanel();
         desktopPane = new DMDircDesktopPane(this);
 

src/com/dmdirc/addons/ui_swing/SwingController.java

@@ -88,11 +88,9 @@ public final class SwingController extends Plugin implements UIController {
     private MainFrame me;
     /** Status bar. */
     private SwingStatusBar statusBar;
-    /** Semaphore used for controlling access to statusBar. */
-    private static final Semaphore STATUSBAR_SEMAPHORE = new Semaphore(1);
     /** Top level window list. */
     private final List<java.awt.Window> windows;
-    
+
     /** Instantiates a new SwingController. */
     public SwingController() {
         windows = new ArrayList<java.awt.Window>();
@@ -119,29 +117,7 @@ public final class SwingController extends Plugin implements UIController {
      * @return This UI's main window
      */
     public MainFrame getMainFrame() {
-        synchronized (SwingController.this) {
-            if (me == null) {
-                UIUtilities.invokeAndWait(new Runnable() {
-
-                    /** {@inheritDoc} */
-                    @Override
-                    public void run() {
-                        me = new MainFrame(SwingController.this);
-                        statusBar = me.getStatusBar();
-                    }
-                });
-                UIUtilities.invokeLater(new Runnable() {
-
-                    /** {@inheritDoc} */
-                    @Override
-                    public void run() {
-                        ErrorListDialog.getErrorListDialog(SwingController.this);
-                    }
-                });
-            }
-
-            return me;
-        }
+        return me;
     }
 
     /** {@inheritDoc} */
@@ -156,11 +132,6 @@ public final class SwingController extends Plugin implements UIController {
      * @return This UI's status bar
      */
     public SwingStatusBar getSwingStatusBar() {
-        STATUSBAR_SEMAPHORE.acquireUninterruptibly();
-        if (statusBar == null) {
-            getMainFrame();
-        }
-        STATUSBAR_SEMAPHORE.release();
         return statusBar;
     }
 
@@ -238,8 +209,7 @@ public final class SwingController extends Plugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                setObject(SwingUpdaterDialog.getSwingUpdaterDialog(updates,
-                        SwingController.this));
+                setObject(SwingUpdaterDialog.getSwingUpdaterDialog(updates, me));
             }
         });
     }
@@ -299,7 +269,7 @@ public final class SwingController extends Plugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                ChannelSettingsDialog.showChannelSettingsDialog(channel, getMainFrame());
+                ChannelSettingsDialog.showChannelSettingsDialog(channel, me);
             }
         });
     }
@@ -312,7 +282,7 @@ public final class SwingController extends Plugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                ServerSettingsDialog.showServerSettingsDialog(server, getMainFrame());
+                ServerSettingsDialog.showServerSettingsDialog(server, me);
             }
         });
     }
@@ -328,7 +298,7 @@ public final class SwingController extends Plugin implements UIController {
                 /** {@inheritDoc} */
                 @Override
                 public void run() {
-                    setObject(getMainFrame().getExtendedState());
+                    setObject(me.getExtendedState());
                 }
             });
             for (final java.awt.Window window : getTopLevelWindows()) {
@@ -338,7 +308,7 @@ public final class SwingController extends Plugin implements UIController {
                     @Override
                     public void run() {
                         SwingUtilities.updateComponentTreeUI(window);
-                        if (window != getMainFrame()) {
+                        if (window != me) {
                             window.pack();
                         }
                     }
@@ -349,7 +319,7 @@ public final class SwingController extends Plugin implements UIController {
                 /** {@inheritDoc} */
                 @Override
                 public void run() {
-                    getMainFrame().setExtendedState(state);
+                    me.setExtendedState(state);
                 }
             });
         } catch (ClassNotFoundException ex) {
@@ -460,7 +430,7 @@ public final class SwingController extends Plugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                URLDialog.showURLDialog(url, getMainFrame());
+                URLDialog.showURLDialog(url, me);
 
             }
         });
@@ -474,7 +444,7 @@ public final class SwingController extends Plugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                new SSLCertificateDialog(getMainFrame(), model).setVisible(true);
+                new SSLCertificateDialog(me, model).setVisible(true);
             }
         });
     }
@@ -527,7 +497,7 @@ public final class SwingController extends Plugin implements UIController {
     /** {@inheritDoc} */
     @Override
     public PreferencesInterface getUrlHandlersPrefsPanel() {
-        return new URLConfigPanel(getMainFrame());
+        return new URLConfigPanel(me);
     }
 
     /** {@inheritDoc} */
@@ -551,6 +521,16 @@ public final class SwingController extends Plugin implements UIController {
         if (GraphicsEnvironment.isHeadless()) {
             throw new IllegalStateException("Swing UI can't be run in a headless environment");
         }
+        UIUtilities.invokeAndWait(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                me = new MainFrame(SwingController.this);
+                statusBar = me.getStatusBar();
+                ErrorListDialog.getErrorListDialog(me, me.getStatusBar());
+            }
+        });
 
         Main.setUI(this);
     }

src/com/dmdirc/addons/ui_swing/components/statusbar/ErrorPanel.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.dialogs.error.ErrorListDialog;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.ErrorListener;
@@ -63,7 +63,9 @@ public class ErrorPanel extends StatusbarPopupPanel implements ErrorListener, Ac
     /** Currently showing error level. */
     private ErrorLevel errorLevel;
     /** Status controller. */
-    private final SwingController controller;
+    private final MainFrame mainFrame;
+    /** Swing status bar. */
+    private SwingStatusBar statusBar;
     /** Error manager. */
     private final ErrorManager errorManager = ErrorManager.getErrorManager();
     /** Dismiss menu. */
@@ -76,12 +78,15 @@ public class ErrorPanel extends StatusbarPopupPanel implements ErrorListener, Ac
     /**
      * Creates a new ErrorPanel for the speicified status bar.
      *
-     * @param controller Swing controller
+     * @param mainFrame Main frame
+     * @param statusBar Status bar  
      */
-    public ErrorPanel(final SwingController controller) {
+    public ErrorPanel(final MainFrame mainFrame, final SwingStatusBar statusBar) {
         super(new JLabel());
 
-        this.controller = controller;
+        this.mainFrame = mainFrame;
+        this.statusBar = statusBar;
+        
         menu = new JPopupMenu();
         dismiss = new JMenuItem("Clear All");
         show = new JMenuItem("Open");
@@ -98,7 +103,7 @@ public class ErrorPanel extends StatusbarPopupPanel implements ErrorListener, Ac
     /** {@inheritDoc} */
     @Override
     protected StatusbarPopupWindow getWindow() {
-        return new ErrorPopup(this, controller.getMainFrame());
+        return new ErrorPopup(this, mainFrame);
     }
 
     /** Clears the error. */
@@ -154,7 +159,7 @@ public class ErrorPanel extends StatusbarPopupPanel implements ErrorListener, Ac
     /** {@inheritDoc} */
     @Override
     public boolean isReady() {
-        return controller.getMainFrame().getStatusBar().isValid();
+        return statusBar.isValid();
     }
 
     /**
@@ -210,7 +215,7 @@ public class ErrorPanel extends StatusbarPopupPanel implements ErrorListener, Ac
     public void mouseClicked(final MouseEvent mouseEvent) {
         super.mouseClicked(mouseEvent);
         if (mouseEvent.getButton() == MouseEvent.BUTTON1) {
-            ErrorListDialog.showErrorListDialog(controller);
+            ErrorListDialog.showErrorListDialog(mainFrame, statusBar);
         }
         checkMouseEvent(mouseEvent);
     }
@@ -234,7 +239,7 @@ public class ErrorPanel extends StatusbarPopupPanel implements ErrorListener, Ac
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == show) {
-            ErrorListDialog.showErrorListDialog(controller);
+            ErrorListDialog.showErrorListDialog(mainFrame, statusBar);
         } else {
             final Collection<ProgramError> errors =
                     ErrorManager.getErrorManager().getErrors();

src/com/dmdirc/addons/ui_swing/components/statusbar/SwingStatusBar.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -56,21 +57,25 @@ public final class SwingStatusBar extends JPanel implements StatusBar {
     private final InviteLabel inviteLabel;
     /** Swing controller. */
     private SwingController controller;
+    /** Main frame. */
+    private MainFrame mainFrame;
 
     /**
      * Creates a new instance of SwingStatusBar.
      * 
      * @param controller Swing controller
+     * @param mainFrame Main frame
      */
-    public SwingStatusBar(final SwingController controller) {
+    public SwingStatusBar(final SwingController controller, final MainFrame mainFrame) {
         super();
         
         this.controller = controller;
+        this.mainFrame = mainFrame;
 
         messageLabel = new MessageLabel();
-        errorPanel = new ErrorPanel(controller);
-        updateLabel = new UpdaterLabel(controller);
-        inviteLabel = new InviteLabel(controller.getMainFrame());
+        errorPanel = new ErrorPanel(mainFrame, this);
+        updateLabel = new UpdaterLabel(mainFrame);
+        inviteLabel = new InviteLabel(mainFrame);
 
         setLayout(new MigLayout("fill, ins 0, hidemode 3"));
 

src/com/dmdirc/addons/ui_swing/components/statusbar/UpdaterLabel.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingRestartDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
 import com.dmdirc.interfaces.UpdateCheckerListener;
@@ -52,17 +52,17 @@ public class UpdaterLabel extends JLabel implements StatusBarComponent,
      */
     private static final long serialVersionUID = 1;
     /** Swing controller. */
-    private SwingController controller;
+    private MainFrame mainFrame;
 
     /**
      * Instantiates a new updater label, handles showing updates on the status bar.
      * 
-     * @param controller Swing controller
+     * @param mainFrame Main frame
      */
-    public UpdaterLabel(final SwingController controller) {
+    public UpdaterLabel(final MainFrame mainFrame) {
         super();
         
-        this.controller = controller;
+        this.mainFrame = mainFrame;
         setBorder(BorderFactory.createEtchedBorder());
         addMouseListener(this);
         UpdateChecker.addListener(this);
@@ -123,7 +123,7 @@ public class UpdaterLabel extends JLabel implements StatusBarComponent,
                 restartDialog.setVisible(true);
             } else if (!UpdateChecker.getStatus().equals(UpdateChecker.STATE.CHECKING)) {
                 SwingUpdaterDialog.showSwingUpdaterDialog(
-                        UpdateChecker.getAvailableUpdates(), controller);
+                        UpdateChecker.getAvailableUpdates(), mainFrame);
             }
         }
     }

src/com/dmdirc/addons/ui_swing/dialogs/error/ErrorListDialog.java

@@ -22,11 +22,12 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.error;
 
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.renderers.ErrorLevelIconCellRenderer;
 import com.dmdirc.addons.ui_swing.components.renderers.DateCellRenderer;
+import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
 import com.dmdirc.logger.ErrorListener;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.ErrorReportStatus;
@@ -82,16 +83,22 @@ public final class ErrorListDialog extends StandardDialog implements
     /** Delete all button. */
     private JButton deleteAllButton;
     /** Swing Controller. */
-    private SwingController controller;
+    private MainFrame mainFrame;
+    /** Status bar. */
+    private SwingStatusBar statusBar;
 
     /** 
      * Creates a new instance of ErrorListDialog. 
      * 
      * @param controller Swing controller
      */
-    private ErrorListDialog(final SwingController controller) {
-        super(controller.getMainFrame(), ModalityType.MODELESS);
-        this.controller = controller;
+    private ErrorListDialog(final MainFrame mainFrame, final SwingStatusBar statusBar) {
+        super(mainFrame, ModalityType.MODELESS);
+        if (statusBar == null) {
+            new Exception().printStackTrace();
+        }
+        this.mainFrame = mainFrame;
+        this.statusBar = statusBar;
 
         setTitle("DMDirc: Error list");
 
@@ -107,10 +114,12 @@ public final class ErrorListDialog extends StandardDialog implements
     /** 
      * Returns the instance of ErrorListDialog.
      * 
-     * @param controller Swing controller
+     * @param mainFrame Main frame
+     * @param statusBar Status bar
      */
-    public static void showErrorListDialog(final SwingController controller) {
-        me = getErrorListDialog(controller);
+    public static void showErrorListDialog(final MainFrame mainFrame, 
+            final SwingStatusBar statusBar) {
+        me = getErrorListDialog(mainFrame, statusBar);
 
         me.setLocationRelativeTo(me.getParent());
         me.setVisible(true);
@@ -120,14 +129,16 @@ public final class ErrorListDialog extends StandardDialog implements
     /**
      * Returns the current instance of the ErrorListDialog.
      * 
-     * @param controller Swing controller
+     * @param mainFrame Main frame
+     * @param statusBar Status bar
      *
      * @return The current PluginDErrorListDialogialog instance
      */
-    public static ErrorListDialog getErrorListDialog(final SwingController controller) {
+    public static ErrorListDialog getErrorListDialog(final MainFrame mainFrame, 
+            final SwingStatusBar statusBar) {
         synchronized (ErrorListDialog.class) {
             if (me == null) {
-                me = new ErrorListDialog(controller);
+                me = new ErrorListDialog(mainFrame, statusBar);
             } else if (me.tableModel.getRowCount() !=
                     me.errorManager.getErrorCount()) {
                 me.tableModel = new ErrorTableModel(me.errorManager.getErrors());
@@ -382,10 +393,7 @@ public final class ErrorListDialog extends StandardDialog implements
     /** {@inheritDoc} */
     @Override
     public boolean isReady() {
-        if (controller == null) {
-            return false;
-        }
-        return controller.getSwingStatusBar().isVisible();
+        return statusBar.isVisible();
     }
     
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/dialogs/updater/SwingUpdaterDialog.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.updater;
 
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.interfaces.UpdateCheckerListener;
 import com.dmdirc.ui.interfaces.UpdaterDialog;
 import com.dmdirc.addons.ui_swing.components.TextLabel;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.renderers.UpdateComponentTableCellRenderer;
@@ -74,18 +74,18 @@ public final class SwingUpdaterDialog extends StandardDialog implements
     /** Update.Status renderer. */
     private UpdateStatusTableCellRenderer updateStatusRenderer;
     /** Swing controller. */
-    private SwingController controller;
+    private MainFrame mainFrame;
 
     /**
      * Creates a new instance of the updater dialog.
      * 
      * @param updates A list of updates that are available.
-     * @param controller Swing controller
+     * @param mainFrame Main frame
      */
-    private SwingUpdaterDialog(final List<Update> updates, final SwingController controller) {
-        super(controller.getMainFrame(), false);
+    private SwingUpdaterDialog(final List<Update> updates, final MainFrame mainFrame) {
+        super(mainFrame, ModalityType.MODELESS);
         
-        this.controller = controller;
+        this.mainFrame = mainFrame;
 
         initComponents(updates);
         layoutComponents();
@@ -103,11 +103,11 @@ public final class SwingUpdaterDialog extends StandardDialog implements
      * Creates the dialog if one doesn't exist, and displays it.
      * 
      * @param updates The updates that are available
-     * @param controller Swing controller
+     * @param mainFrame Main frame
      */
     public static void showSwingUpdaterDialog(
-            final List<Update> updates, final SwingController controller) {
-        me = getSwingUpdaterDialog(updates, controller);
+            final List<Update> updates, final MainFrame mainFrame) {
+        me = getSwingUpdaterDialog(updates, mainFrame);
         me.display();
     }
 
@@ -115,15 +115,14 @@ public final class SwingUpdaterDialog extends StandardDialog implements
      * Gets the dialog if one doesn't exist.
      * 
      * @param updates The updates that are available
-     * @param controller Swing controller
-     * 
+     * @param mainFrame Main frame
      * @return SwingUpdaterDialog instance
      */
     public static SwingUpdaterDialog getSwingUpdaterDialog(
-            final List<Update> updates, final SwingController controller) {
+            final List<Update> updates, final MainFrame mainFrame) {
         synchronized (SwingUpdaterDialog.class) {
             if (me == null) {
-                me = new SwingUpdaterDialog(updates, controller);
+                me = new SwingUpdaterDialog(updates, mainFrame);
             } else {
                 ((UpdateTableModel) me.table.getModel()).setUpdates(updates);
             }
@@ -194,7 +193,7 @@ public final class SwingUpdaterDialog extends StandardDialog implements
     /** {@inheritDoc} */
     @Override
     public void display() {
-        setLocationRelativeTo(controller.getMainFrame());
+        setLocationRelativeTo(mainFrame);
         setVisible(true);
         requestFocusInWindow();
     }