issue 1274: Code tidying (all layouts are now done using miglayout)

git-svn-id: http://svn.dmdirc.com/trunk@4199 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/addons/osdplugin/OsdWindow.java

@@ -26,11 +26,8 @@ import com.dmdirc.Main;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.swing.MainFrame;
-import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
 
-import java.awt.BorderLayout;
 import java.awt.Color;
-import java.awt.Dimension;
 import java.awt.Point;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
@@ -47,6 +44,8 @@ import javax.swing.SwingConstants;
 import javax.swing.WindowConstants;
 import javax.swing.border.LineBorder;
 
+import net.miginfocom.swing.MigLayout;
+
 /**
  * The OSD Window is an always-on-top window designed to convey information
  * about events to the user.
@@ -153,9 +152,6 @@ public final class OsdWindow extends JDialog implements MouseListener,
         
         setFocusableWindowState(false);
         setAlwaysOnTop(true);
-        setSize(new Dimension(500, 
-                IdentityManager.getGlobalConfig().getOptionInt("plugin-OSD", "fontSize", 20)
-                + LARGE_BORDER));
         setResizable(false);
         setUndecorated(true);
         
@@ -169,7 +165,7 @@ public final class OsdWindow extends JDialog implements MouseListener,
                 "bgcolour", Color.decode("#2222aa")));
         
         setContentPane(panel);
-        setLayout(new BorderLayout());
+        setLayout(new MigLayout("pack, wmin 500, ins rel"));
         
         label = new JLabel(text);
         label.setForeground(IdentityManager.getGlobalConfig().getOptionColour("plugin-OSD",
@@ -178,7 +174,7 @@ public final class OsdWindow extends JDialog implements MouseListener,
                 (float) IdentityManager.getGlobalConfig().getOptionInt("plugin-OSD",
                 "fontSize", 20)));
         label.setHorizontalAlignment(SwingConstants.CENTER);
-        add(label);
+        add(label, "grow");
         
         setVisible(true);
         
@@ -246,7 +242,6 @@ public final class OsdWindow extends JDialog implements MouseListener,
      */
     public void setFontSize(final int size) {
         label.setFont(label.getFont().deriveFont((float) size));
-        setSize(new Dimension(500, size + LARGE_BORDER));
     }
 
     /**

src/com/dmdirc/installer/Main.java

@@ -70,6 +70,7 @@ public final class Main implements WizardListener {
 		setWizardFrame(new WizardFrame(releaseName + " Installer", new ArrayList<Step>(), this));
 		wizardDialog.setIconImage(IconManager.getIconManager().getImage("icon"));
 		wizardDialog.setPreferredSize(new Dimension(400, 350));
+		wizardDialog.setMaximumSize(new Dimension(400, 350));
 		wizardDialog.addWizardListener(this);
 
 		final String osName = System.getProperty("os.name");

src/com/dmdirc/installer/StepConfirm.java

@@ -27,12 +27,8 @@ import com.dmdirc.ui.swing.components.TextLabel;
 import com.dmdirc.ui.swing.dialogs.wizard.Step;
 import com.dmdirc.ui.swing.dialogs.wizard.StepListener;
 import com.dmdirc.ui.swing.dialogs.wizard.WizardFrame;
-import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
-import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
-import java.awt.BorderLayout;
-
-import javax.swing.BorderFactory;
+import net.miginfocom.swing.MigLayout;
 
 /**
  * This confirms the settings chosen in the previous step
@@ -55,13 +51,11 @@ public final class StepConfirm extends Step implements StepListener {
 	public StepConfirm(final WizardFrame dialog) {
 		super();
 		dialog.addStepListener(this);
-		setLayout(new BorderLayout());
-		setBorder(BorderFactory.createEmptyBorder(LARGE_BORDER, LARGE_BORDER, SMALL_BORDER, LARGE_BORDER));
+		setLayout(new MigLayout());
 
 		infoLabel.setOpaque(false);
-		infoLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, SMALL_BORDER, 0));
 
-		add(infoLabel, BorderLayout.CENTER);
+		add(infoLabel, "grow");
 	}
 
 	/** {@inheritDoc} */

src/com/dmdirc/installer/StepError.java

@@ -24,12 +24,8 @@ package com.dmdirc.installer;
 
 import com.dmdirc.ui.swing.dialogs.wizard.Step;
 import com.dmdirc.ui.swing.components.TextLabel;
-import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
-import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
-import java.awt.BorderLayout;
-
-import javax.swing.BorderFactory;
+import net.miginfocom.swing.MigLayout;
 
 /**
  * This step shows an unable to install error
@@ -56,14 +52,12 @@ public final class StepError extends Step {
 	 */
 	public StepError(final String message) {
 		super();
-		setLayout(new BorderLayout());
-		setBorder(BorderFactory.createEmptyBorder(LARGE_BORDER, LARGE_BORDER, SMALL_BORDER, LARGE_BORDER));
+		setLayout(new MigLayout());
 		
 		TextLabel infoLabel;
 		infoLabel = new TextLabel(message);
 		infoLabel.setOpaque(false);
-		infoLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, SMALL_BORDER, 0));
 			
-		add(infoLabel, BorderLayout.CENTER);
+		add(infoLabel, "grow");
 	}
 }

src/com/dmdirc/installer/StepInstall.java

@@ -27,16 +27,14 @@ import com.dmdirc.installer.Installer.ShortcutType;
 import com.dmdirc.ui.swing.dialogs.wizard.Step;
 import com.dmdirc.ui.swing.dialogs.wizard.StepListener;
 import com.dmdirc.ui.swing.dialogs.wizard.WizardFrame;
-import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
-import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
-import java.awt.BorderLayout;
 import javax.swing.UIManager;
 
-import javax.swing.BorderFactory;
 import javax.swing.JTextArea;
 import javax.swing.JScrollPane;
 
+import net.miginfocom.swing.MigLayout;
+
 /**
  * This confirms the settings chosen in the previous step
  */
@@ -61,21 +59,19 @@ public final class StepInstall extends Step implements StepListener {
 	public StepInstall(final WizardFrame dialog) {
 		super();
 		dialog.addStepListener(this);
-		setLayout(new BorderLayout());
-		setBorder(BorderFactory.createEmptyBorder(LARGE_BORDER, LARGE_BORDER, SMALL_BORDER, LARGE_BORDER));
+		setLayout(new MigLayout("fill"));
 
 		infoLabel.setFont(UIManager.getFont("Label.font"));
 		infoLabel.setEditable(false);
 		infoLabel.setWrapStyleWord(true);
 		infoLabel.setLineWrap(true);
-		infoLabel.setHighlighter(null);
+		//infoLabel.setHighlighter(null);
 		infoLabel.setOpaque(false);
 		infoLabel.setFont(UIManager.getFont("TextField.font"));
 //		infoLabel.setBackground(getBackground());
-		infoLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, SMALL_BORDER, 0));
 
 		scrollPane = new JScrollPane(infoLabel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-		add(scrollPane, BorderLayout.CENTER);
+		add(scrollPane, "grow");
 	}
 
 	/**

src/com/dmdirc/installer/StepSettings.java

@@ -26,19 +26,13 @@ import com.dmdirc.installer.cliparser.CLIParser;
 import com.dmdirc.installer.Installer.ShortcutType;
 import com.dmdirc.ui.swing.dialogs.wizard.Step;
 import com.dmdirc.ui.swing.components.TextLabel;
-import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
-import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-
-import javax.swing.BorderFactory;
-import javax.swing.Box;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JTextField;
 
+import net.miginfocom.swing.MigLayout;
+
 /**
  * Queries the user for where to install dmdirc, and if they want to setup shortcuts
  */
@@ -66,9 +60,7 @@ public final class StepSettings extends Step {
 	 */
 	public StepSettings() {
 		super();
-		final GridBagConstraints constraints = new GridBagConstraints();
-		setLayout(new GridBagLayout());
-		setBorder(BorderFactory.createEmptyBorder(LARGE_BORDER, LARGE_BORDER, SMALL_BORDER, LARGE_BORDER));
+		setLayout(new MigLayout("wrap 1"));
 
 		TextLabel infoLabel;
 		infoLabel = new TextLabel("Here you can choose options for the install.\n");
@@ -78,58 +70,31 @@ public final class StepSettings extends Step {
 //		infoLabel.setHighlighter(null);
 		infoLabel.setOpaque(false);
 //		infoLabel.setBackground(getBackground());
-		infoLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, SMALL_BORDER, 0));
 
 		shortcutMenu.setSelected((CLIParser.getCLIParser().getParamNumber("-no-shortcut-menu") == 0));
 		shortcutDesktop.setSelected((CLIParser.getCLIParser().getParamNumber("-no-shortcut-desktop") == 0));
 		shortcutQuick.setSelected((CLIParser.getCLIParser().getParamNumber("-no-shortcut-quicklaunch") == 0));
 		shortcutProtocol.setSelected((CLIParser.getCLIParser().getParamNumber("-no-shortcut-protocol") == 0));
 
-		constraints.weightx = 1.0;
-		constraints.fill = constraints.BOTH;
-		constraints.gridx = 0;
-		constraints.gridy = 0;
-		constraints.gridwidth = 2;
-		add(infoLabel, constraints);
-
-		constraints.weightx = 0.0;
-		constraints.gridwidth = 1;
-		constraints.gridy = 1;
-		constraints.fill = constraints.NONE;
-		constraints.insets = new Insets(LARGE_BORDER, 0, 0, 0);
-		add(new JLabel("Install Location: "), constraints);
-		constraints.fill = constraints.HORIZONTAL;
-		constraints.gridx = 1;
-		add(location, constraints);
-
-		constraints.gridwidth = 2;
-		constraints.gridx = 0;
-		constraints.insets = new Insets(SMALL_BORDER, 0, 0, 0);
+		add(infoLabel);
+		add(new JLabel("Install Location: "));
+		add(location, "growx, pushx");
 
 		if (Main.getInstaller().supportsShortcut(ShortcutType.MENU)) {
-			constraints.gridy = (constraints.gridy + 1);
-			add(shortcutMenu, constraints);
+			add(shortcutMenu, "");
 		}
 
 		if (Main.getInstaller().supportsShortcut(ShortcutType.DESKTOP)) {
-			constraints.gridy = (constraints.gridy + 1);
-			add(shortcutDesktop, constraints);
+			add(shortcutDesktop, "");
 		}
 
 		if (Main.getInstaller().supportsShortcut(ShortcutType.QUICKLAUNCH)) {
-			constraints.gridy = (constraints.gridy + 1);
-			add(shortcutQuick, constraints);
+			add(shortcutQuick, "");
 		}
 
 		if (Main.getInstaller().supportsShortcut(ShortcutType.PROTOCOL)) {
-			constraints.gridy = (constraints.gridy + 1);
-			add(shortcutProtocol, constraints);
+			add(shortcutProtocol, "");
 		}
-
-		constraints.gridy = (constraints.gridy + 1);
-		constraints.weighty = 1.0;
-		constraints.fill = constraints.BOTH;
-		add(Box.createVerticalGlue(), constraints);
 	}
 
 	/**

src/com/dmdirc/installer/StepWelcome.java

@@ -24,12 +24,8 @@ package com.dmdirc.installer;
 
 import com.dmdirc.ui.swing.dialogs.wizard.Step;
 import com.dmdirc.ui.swing.components.TextLabel;
-import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
-import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
-import java.awt.BorderLayout;
-
-import javax.swing.BorderFactory;
+import net.miginfocom.swing.MigLayout;
 
 /**
  * Tells the user what this application does
@@ -47,8 +43,7 @@ public final class StepWelcome extends Step {
 	 */
 	public StepWelcome(final String releaseName) {
 		super();
-		setLayout(new BorderLayout());
-		setBorder(BorderFactory.createEmptyBorder(LARGE_BORDER, LARGE_BORDER, SMALL_BORDER, LARGE_BORDER));
+		setLayout(new MigLayout());
 		
 		TextLabel infoLabel;
 		infoLabel = new TextLabel("Welcome to the "+releaseName+" installer. This program will install DMDirc on this computer.\n\n"
@@ -56,14 +51,8 @@ public final class StepWelcome extends Step {
 		                        + "Gregory Holmes. DMDirc is released for free under the MIT license; for more information, "
 		                        + "please visit www.DMDirc.com.\n\n"
 		                        + "Click \"Next\" to continue, or close this program to cancel the installation.");
-//		infoLabel.setEditable(false);
-//		infoLabel.setWrapStyleWord(true);
-//		infoLabel.setLineWrap(true);
-//		infoLabel.setHighlighter(null);
 		infoLabel.setOpaque(false);
-//		infoLabel.setBackground(getBackground());
-		infoLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, SMALL_BORDER, 0));
 			
-		add(infoLabel, BorderLayout.CENTER);
+		add(infoLabel, "grow");
 	}
 }

src/com/dmdirc/ui/swing/components/ColourChooser.java

@@ -24,7 +24,6 @@ package com.dmdirc.ui.swing.components;
 
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.swing.UIUtilities;
-import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -38,6 +37,8 @@ import javax.swing.JButton;
 import javax.swing.JPanel;
 import javax.swing.event.EventListenerList;
 
+import net.miginfocom.swing.MigLayout;
+
 /**
  * Colour chooser widget.
  */
@@ -108,10 +109,10 @@ public final class ColourChooser extends JPanel implements ActionListener {
         previewPanel.setPreferredSize(new Dimension(40, 10));
         previewPanel.setBorder(BorderFactory.createLineBorder(Color.DARK_GRAY));
         
-        setLayout(new BorderLayout(SMALL_BORDER, SMALL_BORDER));
+        setLayout(new MigLayout("ins 0, fill"));
         
-        add(editButton, BorderLayout.LINE_END);
-        add(previewPanel, BorderLayout.CENTER);
+        add(previewPanel, "growx, pushx, sgy all");
+        add(editButton, "sgy all");
         
         updateColour(initialColour);
     }

src/com/dmdirc/ui/swing/components/OptionalColourChooser.java

@@ -25,7 +25,6 @@ package com.dmdirc.ui.swing.components;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.util.ListenerList;
 import com.dmdirc.ui.swing.UIUtilities;
-import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -39,6 +38,8 @@ import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JPanel;
 
+import net.miginfocom.swing.MigLayout;
+
 /**
  * Colour chooser widget.
  */
@@ -116,11 +117,11 @@ public final class OptionalColourChooser extends JPanel implements ActionListene
         enabled.setSelected(initialState);
         enabled.addActionListener(this);
         
-        this.setLayout(new BorderLayout(SMALL_BORDER, SMALL_BORDER));
+        setLayout(new MigLayout("fill, ins 0"));
         
-        this.add(enabled, BorderLayout.LINE_START);
-        this.add(previewPanel, BorderLayout.CENTER);
-        this.add(editButton, BorderLayout.LINE_END);
+        add(enabled, "sgy all");
+        add(previewPanel, "growx, pushx, sgy all");
+        add(editButton, "sgy all");
         
         updateColour(initialColour);
     }

src/com/dmdirc/ui/swing/components/ParamModePanel.java

@@ -33,9 +33,10 @@ import javax.swing.JCheckBox;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
-import javax.swing.SpringLayout;
 import com.dmdirc.ui.swing.UIUtilities;
 
+import net.miginfocom.swing.MigLayout;
+
 /**
  * A component to encapsulate one parameter-requiring channel mode, displaying
  * the user a checkbox, the mode's name, and a text field.
@@ -78,8 +79,7 @@ public final class ParamModePanel extends JPanel implements ActionListener {
                 tooltip = "Mode " + mode + ": Unknown";
             }
         
-        final SpringLayout layout = new SpringLayout();
-        setLayout(layout);
+        setLayout(new MigLayout("fill"));
         
         text = "Mode " + mode + ": ";
         
@@ -95,7 +95,7 @@ public final class ParamModePanel extends JPanel implements ActionListener {
         
         textField = new JTextField(value);
         textField.setInputVerifier(new ModeParameterVerifier());
-        add(textField);
+        add(textField, "growx, pushx");
         
         if (!state) {
             textField.setEnabled(false);

src/com/dmdirc/ui/swing/components/renderers/ReorderableJListCellRenderer.java

@@ -24,7 +24,6 @@ package com.dmdirc.ui.swing.components.renderers;
 
 import com.dmdirc.ui.swing.components.reorderablelist.ReorderableJList;
 
-import java.awt.BorderLayout;
 import java.awt.Component;
 
 import javax.swing.JLabel;
@@ -34,6 +33,8 @@ import javax.swing.JSeparator;
 import javax.swing.ListCellRenderer;
 import javax.swing.UIManager;
 
+import net.miginfocom.swing.MigLayout;
+
 /**
  * Renderer for the reorderable JList, procides visual clues to DnD.
  */
@@ -66,12 +67,12 @@ public class ReorderableJListCellRenderer implements ListCellRenderer {
             final Object value, final int index, final boolean isSelected,
             final boolean cellHasFocus) {
         final JPanel panel = new JPanel();
-        panel.setLayout(new BorderLayout());
+        panel.setLayout(new MigLayout("fill, ins 0"));
         final boolean isTargetCell = value == parent.getTargetCell();
         
         final boolean showSelected = isSelected & (parent.getTargetCell() == null);
         
-        panel.add(new JLabel(value.toString()), BorderLayout.CENTER);
+        panel.add(new JLabel(value.toString()), "dock center");
         
         if (showSelected) {
             panel.setForeground(UIManager.getColor("List.selectionForeground"));
@@ -89,9 +90,9 @@ public class ReorderableJListCellRenderer implements ListCellRenderer {
         
         if (isTargetCell) {
             if (parent.getBelowTarget()) {
-                panel.add(new JSeparator(), BorderLayout.PAGE_END);
+                panel.add(new JSeparator(), "dock south");
             } else {
-                panel.add(new JSeparator(), BorderLayout.PAGE_START);
+                panel.add(new JSeparator(), "dock north");
             }
         }
         

src/com/dmdirc/ui/swing/dialogs/error/FatalErrorDialog.java

@@ -26,14 +26,8 @@ import com.dmdirc.ui.IconManager;
 import com.dmdirc.Main;
 import com.dmdirc.logger.ErrorReportStatus;
 import com.dmdirc.logger.ProgramError;
-import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
-import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 import com.dmdirc.ui.swing.components.TextLabel;
 
-import java.awt.Dimension;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowEvent;
@@ -41,7 +35,7 @@ import java.awt.event.WindowListener;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import javax.swing.Box;
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
@@ -49,39 +43,36 @@ import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.WindowConstants;
 
+import net.miginfocom.swing.MigLayout;
+
 /**
  * The fatal error dialog is used to inform the user that a fatal error has
  * occured.
- * @author chris
  */
 public final class FatalErrorDialog extends JDialog implements ActionListener,
         WindowListener {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
-    private static final long serialVersionUID = 2;
-    
+    private static final long serialVersionUID = 3;
     /** error. */
     private final ProgramError error;
-    
     /** button. */
     private JButton okButton;
-    
     /** label. */
-    private JLabel infoLabel;
-    
+    private TextLabel infoLabel;
+    /** Icon. */
+    private ImageIcon icon;
     /** label. */
     private TextLabel messageLabel;
-    
     /** label. */
     private JButton showMore;
-    
     /** stack trace scroll pane. */
     private JScrollPane scrollPane;
-    
+
     /**
      * Creates a new fatal error dialog.
      *
@@ -89,48 +80,47 @@ public final class FatalErrorDialog extends JDialog implements ActionListener,
      */
     public FatalErrorDialog(final ProgramError error) {
         super();
-        
+
         setModal(true);
-        
+
         this.error = error;
-        
+
         initComponents();
         layoutComponents();
-        
+
         setLocationRelativeTo(getParent());
+        setResizable(false);
         setVisible(true);
     }
-    
+
     /**
      * Initialises the components for this dialog.
      */
     private void initComponents() {
         final JTextArea stacktraceField = new JTextArea();
-        
+
         messageLabel = new TextLabel();
-        infoLabel = new JLabel();
+        infoLabel = new TextLabel();
         showMore = new JButton();
         scrollPane = new JScrollPane();
         okButton = new JButton();
-        
+
         setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
-        
         setTitle("DMDirc: Error");
-        
-        infoLabel.setText("DMDirc has encountered a fatal error, and is "
-                + "not able to recover. The application will now terminate.");
-        
-        infoLabel.setIcon(IconManager.getIconManager().getIcon("error"));
-        
+        setIconImage(IconManager.getIconManager().getImage("icon"));
+
+        infoLabel.setText("DMDirc has encountered a fatal error, and is " +
+                "not able to recover. The application will now terminate.");
+
+        icon = new ImageIcon(IconManager.getIconManager().getImage("error"));
+
         messageLabel.setText("Description: \n" + error.getMessage());
-        
+
         showMore.setText("Show details");
         showMore.addActionListener(this);
-        
-        stacktraceField.setColumns(20);
+
         stacktraceField.setEditable(false);
-        stacktraceField.setRows(5);
-        
+
         final String[] trace = error.getTrace();
         if (trace.length > 0) {
             for (String line : trace) {
@@ -138,148 +128,138 @@ public final class FatalErrorDialog extends JDialog implements ActionListener,
             }
             stacktraceField.setCaretPosition(0);
         }
-        
+
         scrollPane.setViewportView(stacktraceField);
-        scrollPane.setMinimumSize(new Dimension(600, 200));
-        scrollPane.setPreferredSize(new Dimension(600, 200));
         scrollPane.setVisible(false);
-        
+
         okButton.setText("OK");
-        okButton.setPreferredSize(new Dimension(100, 25));
-        
+
         okButton.addActionListener(this);
         addWindowListener(this);
     }
-    
+
     /**
      * lays the components out in the dialog.
      */
     private void layoutComponents() {
-        final GridBagConstraints constraints = new GridBagConstraints();
-        
-        getContentPane().setLayout(new GridBagLayout());
-        
-        constraints.gridx = 0;
-        constraints.gridy = 0;
-        constraints.gridwidth = 3;
-        constraints.weightx = 1.0;
-        constraints.weighty = 0.0;
-        constraints.fill = GridBagConstraints.HORIZONTAL;
-        constraints.insets = new Insets(LARGE_BORDER, LARGE_BORDER,
-                LARGE_BORDER, LARGE_BORDER);
-        getContentPane().add(infoLabel, constraints);
-        
-        constraints.insets = new Insets(0, LARGE_BORDER, SMALL_BORDER,
-                LARGE_BORDER);
-        constraints.gridy = 1;
-        getContentPane().add(messageLabel, constraints);
-        
-        constraints.insets = new Insets(0, LARGE_BORDER, SMALL_BORDER,
-                LARGE_BORDER);
-        constraints.gridx = 0;
-        constraints.gridy = 2;
-        constraints.gridwidth = 3;
-        getContentPane().add(showMore, constraints);
-        
-        constraints.insets = new Insets(0, LARGE_BORDER, 0, LARGE_BORDER);
-        constraints.gridx = 0;
-        constraints.gridwidth = 3;
-        constraints.weightx = 1.0;
-        constraints.weighty = 1.0;
-        constraints.gridy = 3;
-        constraints.fill = GridBagConstraints.BOTH;
-        getContentPane().add(scrollPane, constraints);
-        
-        constraints.insets = new Insets(0, LARGE_BORDER, SMALL_BORDER,
-                LARGE_BORDER);
-        constraints.weightx = 0.0;
-        constraints.weighty = 0.0;
-        constraints.gridx = 0;
-        constraints.gridy = 4;
-        constraints.gridwidth = 1;
-        constraints.fill = GridBagConstraints.HORIZONTAL;
-        getContentPane().add(Box.createHorizontalGlue(), constraints);
-        
-        constraints.insets.set(LARGE_BORDER, LARGE_BORDER, LARGE_BORDER,
-                LARGE_BORDER);
-        constraints.gridx = 2;
-        constraints.anchor = GridBagConstraints.EAST;
-        constraints.fill = GridBagConstraints.NONE;
-        getContentPane().add(okButton, constraints);
+        getContentPane().setLayout(new MigLayout("wrap 1, hidemode 3, wmin 600, wmax 600, pack"));
+        getContentPane().add(new JLabel(icon), "growx, split 2");
+        getContentPane().add(infoLabel, "growx");
+        getContentPane().add(messageLabel, "growx");
+        getContentPane().add(showMore, "growx");
+        getContentPane().add(scrollPane, "grow, hmin 200, hmax 200");
+        getContentPane().add(okButton, "right, tag ok");
         pack();
     }
-    
+
     /**
      * Exits the program. {@inheritDoc}
+     * 
+     * @param actionEvent Action event.
      */
+    @Override
     public void actionPerformed(final ActionEvent actionEvent) {
         if (actionEvent.getSource() == showMore) {
             if (showMore.getText().equals("Show details")) {
                 scrollPane.setVisible(true);
                 showMore.setText("Hide details");
-                pack();
-                setLocationRelativeTo(getParent());
             } else {
                 scrollPane.setVisible(false);
                 showMore.setText("Show details");
-                pack();
-                setLocationRelativeTo(getParent());
             }
         } else {
             closeDialog();
         }
     }
-    
+
     /** Closes the dialog, and the client. */
     public void closeDialog() {
         dispose();
         new Timer("Fatal Error Dialog Timer").schedule(new TimerTask() {
+
+            /** {@inheritDoc} */
+            @Override
             public void run() {
                 Main.getUI().getMainWindow().setVisible(false);
                 while (error.getReportStatus() != ErrorReportStatus.FINISHED) {
                     try {
                         Thread.sleep(1000);
                     } catch (InterruptedException ex) {
-                        //Ignore
+                    //Ignore
                     }
                 }
                 System.exit(-1);
             }
         }, 0);
     }
-    
-    /** {@inheritDoc} */
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param e Window event
+     */
+    @Override
     public void windowOpened(final WindowEvent e) {
-        //ignore
+    //ignore
     }
-    
-    /** {@inheritDoc} */
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param e Window event
+     */
+    @Override
     public void windowClosing(final WindowEvent e) {
         closeDialog();
     }
-    
-    /** {@inheritDoc} */
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param e Window event
+     */
+    @Override
     public void windowClosed(final WindowEvent e) {
-        //ignore
+    //ignore
     }
-    
-    /** {@inheritDoc} */
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param e Window event
+     */
+    @Override
     public void windowIconified(final WindowEvent e) {
-        //ignore
+    //ignore
     }
-    
-    /** {@inheritDoc} */
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param e Window event
+     */
+    @Override
     public void windowDeiconified(final WindowEvent e) {
-        //ignore
+    //ignore
     }
-    
-    /** {@inheritDoc} */
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param e Window event
+     */
+    @Override
     public void windowActivated(final WindowEvent e) {
-        //ignore
+    //ignore
     }
-    
-    /** {@inheritDoc} */
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param e Window event
+     */
+    @Override
     public void windowDeactivated(final WindowEvent e) {
-        //ignore
+    //ignore
     }
 }

src/com/dmdirc/ui/swing/dialogs/serversetting/PerformPanel.java

@@ -26,19 +26,18 @@ import com.dmdirc.Server;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.ui.swing.UIUtilities;
-import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
-import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import javax.swing.BorderFactory;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JComboBox;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 
+import net.miginfocom.swing.MigLayout;
+
 /**
  * Perform panel.
  */
@@ -92,9 +91,7 @@ public final class PerformPanel extends JPanel implements ActionListener {
     
     /** Initialises teh components. */
     private void initComponents() {
-        setBorder(BorderFactory.createEmptyBorder(SMALL_BORDER, SMALL_BORDER, 
-                SMALL_BORDER, SMALL_BORDER));
-        setLayout(new BorderLayout(SMALL_BORDER, SMALL_BORDER));
+        setLayout(new MigLayout("fill"));
         
         final DefaultComboBoxModel model = new DefaultComboBoxModel();
         target = new JComboBox(model);
@@ -106,12 +103,12 @@ public final class PerformPanel extends JPanel implements ActionListener {
             model.addElement("Server perform (" + server.getName() + ")");
         }
         
-        add(target, BorderLayout.NORTH);
+        add(target, "growx, pushx, wrap");
         
         textarea = new JTextArea();
         textarea.setColumns(40);
         
-        add(new JScrollPane(textarea));
+        add(new JScrollPane(textarea), "grow");
     }
     
     /** Adds listeners to the components. */

src/com/dmdirc/ui/swing/dialogs/serversetting/ServerSettingsDialog.java

@@ -29,7 +29,6 @@ import com.dmdirc.ui.swing.MainFrame;
 import com.dmdirc.ui.swing.components.StandardDialog;
 import com.dmdirc.ui.swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.ui.swing.components.expandingsettings.SettingsPanel.OptionType;
-import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
@@ -42,6 +41,8 @@ import javax.swing.JButton;
 import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
 
+import net.miginfocom.swing.MigLayout;
+
 /**
  * Allows the user to modify server settings and the ignore list.
  */
@@ -111,7 +112,7 @@ public final class ServerSettingsDialog extends StandardDialog implements Action
      */
     public static synchronized ServerSettingsDialog getServerSettingsDialog(final Server server) {
         if (me == null) {
-            me =    new ServerSettingsDialog(server);
+            me = new ServerSettingsDialog(server);
         }
 
         me.pack();
@@ -122,13 +123,9 @@ public final class ServerSettingsDialog extends StandardDialog implements Action
     /** Initialises the main UI components. */
     private void initComponents() {
         orderButtons(new JButton(), new JButton());
-        initButtonsPanel();
 
         tabbedPane = new JTabbedPane();
 
-        tabbedPane.setBorder(BorderFactory.createEmptyBorder(SMALL_BORDER,
-                SMALL_BORDER, 0, SMALL_BORDER));
-        
         modesPanel = new UserModesPane(server);
 
         ignoreList =
@@ -154,10 +151,11 @@ public final class ServerSettingsDialog extends StandardDialog implements Action
             tabbedPane.add("Settings", settingsPanel);
         }
 
-        setLayout(new BorderLayout());
+        setLayout(new MigLayout("fill, wrap 1"));
 
-        add(tabbedPane, BorderLayout.CENTER);
-        add(buttonsPanel, BorderLayout.PAGE_END);
+        add(tabbedPane, "grow");
+        add(getLeftButton(), "split 2, right");
+        add(getRightButton(), "right");
 
         tabbedPane.setSelectedIndex(server.getConfigManager().
                 getOptionInt("dialogstate", "serversettingsdialog", 0));
@@ -231,22 +229,6 @@ public final class ServerSettingsDialog extends StandardDialog implements Action
         settingsPanel.addOption("general.pingtimeout", "Ping timeout",
                 OptionType.SPINNER);
     }
-
-    /** Initialises the button panel. */
-    private void initButtonsPanel() {
-        buttonsPanel = new JPanel();
-
-        buttonsPanel.setBorder(BorderFactory.createEmptyBorder(SMALL_BORDER,
-                SMALL_BORDER, SMALL_BORDER, SMALL_BORDER));
-
-        buttonsPanel.setLayout(new BoxLayout(buttonsPanel,
-                BoxLayout.LINE_AXIS));
-        buttonsPanel.add(Box.createHorizontalGlue());
-        buttonsPanel.add(getLeftButton());
-        buttonsPanel.add(Box.createHorizontalStrut(SMALL_BORDER));
-        buttonsPanel.add(getRightButton());
-    }
-
     /** Initialises listeners for this dialog. */
     private void initListeners() {
         getOkButton().addActionListener(this);
@@ -265,7 +247,11 @@ public final class ServerSettingsDialog extends StandardDialog implements Action
                 String.valueOf(tabbedPane.getSelectedIndex()));
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     * 
+     * @param e Action event
+     */
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == getOkButton()) {
@@ -284,4 +270,4 @@ public final class ServerSettingsDialog extends StandardDialog implements Action
             me = null;
         }
     }
-}
+}

src/com/dmdirc/ui/swing/framemanager/buttonbar/ButtonBar.java

@@ -35,11 +35,8 @@ import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.ui.swing.UIUtilities;
 import com.dmdirc.util.MapList;
 
-import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -51,13 +48,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.swing.BorderFactory;
 import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JToggleButton;
 import javax.swing.SwingConstants;
 
+import net.miginfocom.swing.MigLayout;
+
 /**
  * The button bar manager is a grid of buttons that presents a manager similar
  * to that used by mIRC.
@@ -109,7 +107,11 @@ public final class ButtonBar implements FrameManager, ActionListener,
         position = FramemanagerPosition.getPosition(
                 IdentityManager.getGlobalConfig().getOption("ui", "framemanagerPosition"));
         
-        panel = new JPanel(new GridBagLayout());
+        if (position.isHorizontal()) {
+            panel = new JPanel(new MigLayout("ins 0, fill, flowx"));
+        } else {
+             panel = new JPanel(new MigLayout("ins 0, fill, flowy"));
+        }
     }
     
     /** {@inheritDoc} */
@@ -117,11 +119,8 @@ public final class ButtonBar implements FrameManager, ActionListener,
     public void setParent(final JComponent parent) {
         this.parent = parent;
         
-        parent.setLayout(new BorderLayout());
-        parent.setBorder(BorderFactory.createEmptyBorder(
-                UIUtilities.SMALL_BORDER, UIUtilities.SMALL_BORDER,
-                UIUtilities.SMALL_BORDER, UIUtilities.SMALL_BORDER));
-        parent.add(panel, BorderLayout.NORTH);
+        parent.setLayout(new MigLayout());
+        parent.add(panel);
         
         buttonWidth = position.isHorizontal() ? 150 : (parent.getWidth() 
                 - UIUtilities.SMALL_BORDER * 3) / cells;
@@ -139,52 +138,22 @@ public final class ButtonBar implements FrameManager, ActionListener,
     private void relayout() {
         panel.removeAll();
         
-        final GridBagConstraints constraints = new GridBagConstraints();
-        constraints.gridx = 0;
-        constraints.gridy = 0;
-        constraints.insets.set(UIUtilities.SMALL_BORDER,
-                UIUtilities.SMALL_BORDER, 0, 0);
-        
         for (Map.Entry<FrameContainer, List<FrameContainer>> entry : windows.entrySet()) {
             buttons.get(entry.getKey()).setPreferredSize(new Dimension(buttonWidth, 25));
             buttons.get(entry.getKey()).setMinimumSize(new Dimension(buttonWidth, 25));
-            panel.add(buttons.get(entry.getKey()), constraints);
-            increment(constraints);
+            panel.add(buttons.get(entry.getKey()));
             
             Collections.sort(entry.getValue(), new FrameContainerComparator());
             
             for (FrameContainer child : entry.getValue()) {
                 buttons.get(child).setPreferredSize(new Dimension(buttonWidth, 25));
                 buttons.get(child).setMinimumSize(new Dimension(buttonWidth, 25));
-                panel.add(buttons.get(child), constraints);
-                increment(constraints);
+                panel.add(buttons.get(child));
             }
         }
         panel.validate();
     }
     
-    /**
-     * Increments the x and y offsets (where appropriate) of the gridbag
-     * constraints.
-     *
-     * @param constraints The constraints to modify
-     */
-    public void increment(final GridBagConstraints constraints) {
-        if (position.isHorizontal()) {
-            constraints.gridx++;
-            if (constraints.gridx > maxButtons) {
-                constraints.gridy++;
-                constraints.gridx = 0;
-            }
-        } else {
-            constraints.gridy++;
-            if (constraints.gridy > maxButtons) {
-                constraints.gridx++;
-                constraints.gridy = 0;
-            }
-        }
-    }
-    
     /**
      * Adds a button to the button array with the details from the specified
      * container.

src/com/dmdirc/ui/swing/framemanager/tree/TreeFrameManager.java

@@ -36,7 +36,6 @@ import com.dmdirc.ui.swing.actions.CloseFrameContainerAction;
 import com.dmdirc.ui.swing.components.TextFrame;
 import com.dmdirc.ui.swing.components.TreeScroller;
 
-import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Rectangle;
 import java.awt.event.AdjustmentEvent;
@@ -66,6 +65,7 @@ import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
 import net.miginfocom.layout.PlatformDefaults;
+import net.miginfocom.swing.MigLayout;
 
 /**
  * Manages open windows in the application in a tree style view.
@@ -170,8 +170,8 @@ public final class TreeFrameManager implements FrameManager, MouseListener,
                 scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
                 scrollPane.getHorizontalScrollBar().addAdjustmentListener(TreeFrameManager.this);
 
-                parent.setLayout(new BorderLayout());
-                parent.add(scrollPane);
+                parent.setLayout(new MigLayout("ins 0, fill"));
+                parent.add(scrollPane, "grow");
                 parent.setFocusable(false);
 
                 setColours();

src/com/dmdirc/ui/swing/textpane/TextPane.java

@@ -56,6 +56,7 @@ import javax.swing.text.StyleConstants.CharacterConstants;
 import javax.swing.text.StyleConstants.ColorConstants;
 import javax.swing.text.StyleConstants.FontConstants;
 import javax.swing.text.StyledDocument;
+import net.miginfocom.swing.MigLayout;
 
 /**
  * Styled, scrollable text pane.
@@ -105,17 +106,17 @@ public final class TextPane extends JComponent implements AdjustmentListener,
 
         setMinimumSize(new Dimension(0, 0));
 
-        setLayout(new BorderLayout());
+        setLayout(new MigLayout("fill"));
 
         canvas = new TextPaneCanvas(this, document);
 
         setBorder(UIManager.getBorder("TextField.border"));
 
-        add(canvas, BorderLayout.CENTER);
+        add(canvas, "dock center");
 
 
         scrollBar = new JScrollBar(JScrollBar.VERTICAL);
-        add(scrollBar, BorderLayout.LINE_END);
+        add(scrollBar, "dock east");
 
         setAutoscrolls(true);