fixing all the horrible bugs introduced removing singletones, fixes issue 2429

src/com/dmdirc/Main.java

@@ -108,8 +108,6 @@ public final class Main {
 
         loadUI(pm, IdentityManager.getGlobalConfig());
 
-        getUI().initUISettings();
-
         doFirstRun();
 
         ActionManager.init();

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

@@ -526,6 +526,7 @@ public final class SwingController extends Plugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
+                UIUtilities.initUISettings();
                 me = new MainFrame(SwingController.this);
                 statusBar = me.getStatusBar();
                 ErrorListDialog.getErrorListDialog(me, me.getStatusBar());

src/com/dmdirc/addons/ui_swing/components/MDIBar.java

@@ -35,6 +35,7 @@ import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 
+import com.dmdirc.interfaces.SelectionListener;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
@@ -49,7 +50,7 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Provides an MDI style bar for restore/minimise/close.
  */
-public class MDIBar extends JPanel implements FrameManager,
+public class MDIBar extends JPanel implements FrameManager, SelectionListener,
         PropertyChangeListener, ActionListener, ConfigChangeListener {
 
     private static final long serialVersionUID = -8028057596226636245L;
@@ -60,6 +61,8 @@ public class MDIBar extends JPanel implements FrameManager,
     private MainFrame mainFrame;
     private ConfigManager config;
     private String visibility;
+    /** Active frame. */
+    private Window activeFrame;
 
     /**
      * Instantiates a new MDI bar.
@@ -86,6 +89,7 @@ public class MDIBar extends JPanel implements FrameManager,
 
 
         WindowManager.addFrameManager(this);
+        WindowManager.addSelectionListener(this);
         closeButton.addActionListener(this);
         minimiseButton.addActionListener(this);
         restoreButton.addActionListener(this);
@@ -108,7 +112,10 @@ public class MDIBar extends JPanel implements FrameManager,
             @Override
             public void run() {
                 boolean show = true;
-                if ("alwaysShow".equalsIgnoreCase(visibility)) {
+                if (mainFrame == null) {
+                    show = false;
+                    return;
+                } else if ("alwaysShow".equalsIgnoreCase(visibility)) {
                     show = mainFrame.getDesktopPane().getAllFrames().length > 0;
                 } else if ("neverShow".equalsIgnoreCase(visibility)) {
                     show = false;
@@ -193,7 +200,6 @@ public class MDIBar extends JPanel implements FrameManager,
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        final Window activeFrame = mainFrame.getActiveFrame();
         if (activeFrame == null) {
             return;
         }
@@ -212,4 +218,9 @@ public class MDIBar extends JPanel implements FrameManager,
         visibility = config.getOption("ui", "mdiBarVisibility");
         check();
     }
+
+    @Override
+    public void selectionChanged(Window window) {
+        activeFrame = window;
+    }
 }

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

@@ -31,18 +31,18 @@ import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.InviteListener;
 import com.dmdirc.ui.interfaces.StatusBarComponent;
 import com.dmdirc.util.MapList;
 
-import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseEvent;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
@@ -74,17 +74,19 @@ public class InviteLabel extends StatusbarPopupPanel implements StatusBarCompone
     /** Accept invites menu item. */
     private final JMenuItem accept;
     /** Parent window. */
-    private Window parentWindow;
+    private MainFrame mainFrame;
+    /** Active frame. */
+    private FrameContainer activeFrame;
 
     /**
      * Instantiates a new invite label.
      * 
-     * @param parentWindow Parent window
+     * @param mainFrame Parent window
      */
-    public InviteLabel(final Window parentWindow) {
+    public InviteLabel(final MainFrame mainFrame) {
         super(new JLabel());
         
-        this.parentWindow = parentWindow;
+        this.mainFrame = mainFrame;
 
         setBorder(BorderFactory.createEtchedBorder());
         label.setIcon(IconManager.getIconManager().getIcon("invite"));
@@ -134,7 +136,7 @@ public class InviteLabel extends StatusbarPopupPanel implements StatusBarCompone
     /** {@inheritDoc} */
     @Override
     protected StatusbarPopupWindow getWindow() {
-        return new InvitePopup(this, activeServer, parentWindow);
+        return new InvitePopup(this, activeServer, mainFrame);
     }
 
     /**
@@ -156,19 +158,14 @@ public class InviteLabel extends StatusbarPopupPanel implements StatusBarCompone
      * Updates the invite label for the currently active server.
      */
     private void update() {
-        update(Main.getUI().getActiveServer());
-    }
-
-    /**
-     * Updates the invite label for the server.
-     *
-     * @param server Server to update
-     */
-    private void update(final Server server) {
-        activeServer = server;
-        if (server != null && !inviteList.containsKey(server)) {
-            inviteList.add(server, server.getInvites());
-            server.addInviteListener(this);
+        if (activeFrame == null) {
+            activeServer = null;
+        } else {
+            activeServer = activeFrame.getServer();
+        }
+        if (activeServer != null && !inviteList.containsKey(activeServer)) {
+            inviteList.add(activeServer, activeServer.getInvites());
+            activeServer.addInviteListener(this);
         }
 
         if (activeServer == null || inviteList.get(activeServer).isEmpty()) {
@@ -206,11 +203,7 @@ public class InviteLabel extends StatusbarPopupPanel implements StatusBarCompone
     @Override
     public void processEvent(final ActionType type, final StringBuffer format,
             final Object... arguments) {
-        if (arguments[0] == null) {
-            update((Server) null);
-        } else {
-            update(((FrameContainer) arguments[0]).getServer());
-        }
+        update();
     }
 
     /**

src/com/dmdirc/addons/ui_swing/dialogs/serversetting/IgnoreListPanel.java

@@ -117,7 +117,7 @@ public final class IgnoreListPanel extends JPanel implements ActionListener,
         viewToggle.setEnabled(cachedIgnoreList.canConvert());
 
         setLayout(new MigLayout("fill, wrap 1"));
-        add(scrollPane, "growx, growy");
+        add(scrollPane, "grow, push");
         add(sizeLabel, "split 2, pushx, growx");
         add(viewToggle, "alignx center");
         add(addButton, "split 2, width 50%");

src/com/dmdirc/addons/ui_swing/dialogs/serversetting/PerformPanel.java

@@ -108,7 +108,7 @@ public final class PerformPanel extends JPanel implements ActionListener {
         textarea = new JTextArea();
         textarea.setColumns(40);
         
-        add(new JScrollPane(textarea), "grow");
+        add(new JScrollPane(textarea), "grow, push");
     }
     
     /** Adds listeners to the components. */

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/WindowMenuFrameManager.java

@@ -69,6 +69,8 @@ public final class WindowMenuFrameManager extends JMenu implements FrameManager,
     private final JMenuItem toggleStateMenuItem,  closeMenuItem,  minimiseMenuItem;
     /** Seperator. */
     private final JSeparator separator;
+    /** Active window. */
+    private Window activeWindow;
 
     /** 
      * Creates a new instance of WindowMenuFrameManager.
@@ -239,20 +241,20 @@ public final class WindowMenuFrameManager extends JMenu implements FrameManager,
     @Override
     public void actionPerformed(final ActionEvent e) {
         if ("ToggleState".equals(e.getActionCommand())) {
-            final Window window = Main.getUI().getActiveWindow();
-            if (window != null) {
-                window.toggleMaximise();
+            if (activeWindow != null) {
+                activeWindow.toggleMaximise();
             }
         } else if (e.getActionCommand().equals("Minimise")) {
-            ((TextFrame) Main.getUI().getActiveWindow()).minimise();
+            activeWindow.minimise();
         } else if (e.getActionCommand().equals("Close")) {
-            ((TextFrame) Main.getUI().getActiveWindow()).close();
+            activeWindow.close();
         }
     }
 
     /** {@inheritDoc} */
     @Override
     public void selectionChanged(final Window window) {
+        activeWindow = window;
         final Map<FrameContainer, FrameContainerMenuItem> newMap =
                 new TreeMap<FrameContainer, FrameContainerMenuItem>(
                 comparator);
@@ -269,7 +271,7 @@ public final class WindowMenuFrameManager extends JMenu implements FrameManager,
      * Checks and sets the state of the toggle menu item.
      */
     private void checkToggleState() {
-        if (Main.getUI().getActiveWindow() == null) {
+        if (activeWindow == null) {
             toggleStateMenuItem.setEnabled(false);
             closeMenuItem.setEnabled(false);
             minimiseMenuItem.setEnabled(false);
@@ -278,7 +280,7 @@ public final class WindowMenuFrameManager extends JMenu implements FrameManager,
             closeMenuItem.setEnabled(true);
             minimiseMenuItem.setEnabled(true);
 
-            if (Main.getUI().getActiveWindow().isMaximum()) {
+            if (activeWindow.isMaximum()) {
                 toggleStateMenuItem.setText("Restore");
                 toggleStateMenuItem.setIcon(IconManager.getIconManager().getIcon(
                         "restore"));