Moved the ui into com.dmdirc.ui.swing

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

src/com/dmdirc/Main.java

@@ -27,8 +27,7 @@ import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.DMDircExceptionHandler;
 import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.ui.SwingController;
-import com.dmdirc.ui.dialogs.firstrunwizard.SwingFirstRunWizard;
+import com.dmdirc.ui.swing.SwingController;
 import com.dmdirc.ui.interfaces.UIController;
 import com.dmdirc.updater.UpdateChannel;
 import com.dmdirc.updater.UpdateChecker;

src/com/dmdirc/addons/nickcolours/NickColourPanel.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.nickcolours;
 
-import com.dmdirc.ui.UIUtilities;
+import com.dmdirc.ui.swing.UIUtilities;
 
 import java.awt.BorderLayout;
 import java.awt.Color;

src/com/dmdirc/addons/nowplaying/plugin/ConfigPanel.java

@@ -23,8 +23,8 @@
 package com.dmdirc.addons.nowplaying.plugin;
 
 import com.dmdirc.addons.nowplaying.MediaSource;
-import com.dmdirc.ui.components.reorderablelist.ReorderableJList;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import com.dmdirc.ui.swing.components.reorderablelist.ReorderableJList;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;
 import java.util.Enumeration;

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

@@ -24,7 +24,7 @@ package com.dmdirc.addons.osdplugin;
 
 import com.dmdirc.Config;
 import com.dmdirc.Main;
-import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
 
 import java.awt.BorderLayout;
 import java.awt.Color;

src/com/dmdirc/commandparser/commands/channel/ChannelSettings.java

@@ -23,10 +23,10 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
+import com.dmdirc.Main;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.ui.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
@@ -52,7 +52,7 @@ public final class ChannelSettings extends ChannelCommand {
      */
     public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
-        ChannelSettingsDialog.getChannelSettingDialog(channel).setVisible(true);
+        Main.getUI().showChannelSettingsDialog(channel);
     }
     
     /** {@inheritDoc}. */

src/com/dmdirc/commandparser/commands/channel/SetNickColour.java

@@ -29,7 +29,7 @@ import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.ui.ChannelFrame;
+import com.dmdirc.ui.swing.ChannelFrame;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.ColourManager;
 

src/com/dmdirc/commandparser/commands/global/Help.java

@@ -26,9 +26,9 @@ import com.dmdirc.Server;
 import com.dmdirc.commandparser.Command;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
-import com.dmdirc.ui.ChannelFrame;
-import com.dmdirc.ui.QueryFrame;
-import com.dmdirc.ui.ServerFrame;
+import com.dmdirc.ui.swing.ChannelFrame;
+import com.dmdirc.ui.swing.QueryFrame;
+import com.dmdirc.ui.swing.ServerFrame;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.Collections;

src/com/dmdirc/ui/input/InputHandler.java

@@ -29,7 +29,7 @@ import com.dmdirc.commandparser.Command;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandParser;
 import com.dmdirc.commandparser.IntelligentCommand;
-import com.dmdirc.ui.components.ColourPickerDialog;
+import com.dmdirc.ui.swing.components.ColourPickerDialog;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.Styliser;
 

src/com/dmdirc/ui/interfaces/UIController.java

@@ -27,7 +27,7 @@ import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandParser;
-import com.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.swing.MainFrame;
 import com.dmdirc.updater.Update;
 import java.util.List;
 
@@ -117,6 +117,20 @@ public interface UIController {
      */
     void showFirstRunWizard();
     
+    /**
+     * Shows a channel settigns dialog for specified channel.
+     *
+     * @param channel Channel to show the dialog for
+     */
+    void showChannelSettingsDialog(Channel channel);
+    
+    /**
+     * Shows a server settigns dialog for specified server.
+     *
+     * @param server Server to show the dialog for
+     */
+    void showServerSettingsDialog(Server server);
+    
     /**
      * Initialises any settings required by this UI (this is always called
      * before any aspect of the UI is instansiated).

src/com/dmdirc/ui/ChannelFrame.java → src/com/dmdirc/ui/swing/ChannelFrame.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui;
+package com.dmdirc.ui.swing;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Main;
@@ -31,11 +31,11 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandParser;
 import com.dmdirc.commandparser.ServerCommand;
 import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.ui.components.InputFrame;
-import com.dmdirc.ui.dialogs.channelsetting.ChannelSettingsDialog;
+import com.dmdirc.ui.swing.components.InputFrame;
+import com.dmdirc.ui.swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.ChannelWindow;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;
 import java.awt.Color;

src/com/dmdirc/ui/CustomFrame.java → src/com/dmdirc/ui/swing/CustomFrame.java

@@ -20,10 +20,10 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui;
+package com.dmdirc.ui.swing;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.ui.components.Frame;
+import com.dmdirc.ui.swing.components.Frame;
 
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;

src/com/dmdirc/ui/CustomInputFrame.java → src/com/dmdirc/ui/swing/CustomInputFrame.java

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui;
+package com.dmdirc.ui.swing;
 
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandParser;
-import com.dmdirc.ui.components.InputFrame;
+import com.dmdirc.ui.swing.components.InputFrame;
 import com.dmdirc.ui.input.InputHandler;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;

src/com/dmdirc/ui/DMDircEventQueue.java → src/com/dmdirc/ui/swing/DMDircEventQueue.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui;
+package com.dmdirc.ui.swing;
 
-import com.dmdirc.ui.actions.CopyAction;
-import com.dmdirc.ui.actions.CutAction;
-import com.dmdirc.ui.actions.PasteAction;
+import com.dmdirc.ui.swing.actions.CopyAction;
+import com.dmdirc.ui.swing.actions.CutAction;
+import com.dmdirc.ui.swing.actions.PasteAction;
 
 import java.awt.AWTEvent;
 import java.awt.Component;

src/com/dmdirc/ui/MainFrame.java → src/com/dmdirc/ui/swing/MainFrame.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui;
+package com.dmdirc.ui.swing;
 
 import com.dmdirc.Config;
 import com.dmdirc.FrameContainer;
@@ -31,20 +31,20 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.components.Frame;
-import com.dmdirc.ui.components.SwingStatusBar;
-import com.dmdirc.ui.dialogs.ActionsManagerDialog;
-import com.dmdirc.ui.dialogs.NewServerDialog;
-import com.dmdirc.ui.dialogs.PluginDialog;
-import com.dmdirc.ui.dialogs.PreferencesDialog;
-import com.dmdirc.ui.dialogs.ProfileEditorDialog;
-import com.dmdirc.ui.dialogs.about.AboutDialog;
+import com.dmdirc.ui.swing.components.Frame;
+import com.dmdirc.ui.swing.components.SwingStatusBar;
+import com.dmdirc.ui.swing.dialogs.ActionsManagerDialog;
+import com.dmdirc.ui.swing.dialogs.NewServerDialog;
+import com.dmdirc.ui.swing.dialogs.PluginDialog;
+import com.dmdirc.ui.swing.dialogs.PreferencesDialog;
+import com.dmdirc.ui.swing.dialogs.ProfileEditorDialog;
+import com.dmdirc.ui.swing.dialogs.about.AboutDialog;
 import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.ui.interfaces.FramemanagerPosition;
-import com.dmdirc.ui.framemanager.MainFrameManager;
-import com.dmdirc.ui.framemanager.windowmenu.WindowMenuFrameManager;
+import com.dmdirc.ui.swing.framemanager.MainFrameManager;
+import com.dmdirc.ui.swing.framemanager.windowmenu.WindowMenuFrameManager;
 import com.dmdirc.ui.interfaces.Window;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 import com.dmdirc.ui.interfaces.StatusBar;
 
 import java.awt.BorderLayout;

src/com/dmdirc/ui/NicklistComparator.java → src/com/dmdirc/ui/swing/NicklistComparator.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui;
+package com.dmdirc.ui.swing;
 
 import com.dmdirc.parser.ChannelClientInfo;
 

src/com/dmdirc/ui/NicklistListModel.java → src/com/dmdirc/ui/swing/NicklistListModel.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui;
+package com.dmdirc.ui.swing;
 
 import com.dmdirc.Config;
 import com.dmdirc.parser.ChannelClientInfo;

src/com/dmdirc/ui/NicklistRenderer.java → src/com/dmdirc/ui/swing/NicklistRenderer.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui;
+package com.dmdirc.ui.swing;
 
 import com.dmdirc.ChannelClientProperty;
 import com.dmdirc.config.ConfigManager;

src/com/dmdirc/ui/QueryFrame.java → src/com/dmdirc/ui/swing/QueryFrame.java

@@ -20,15 +20,15 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui;
+package com.dmdirc.ui.swing;
 
 import com.dmdirc.Query;
 import com.dmdirc.commandparser.CommandParser;
 import com.dmdirc.commandparser.QueryCommandParser;
-import com.dmdirc.ui.components.InputFrame;
+import com.dmdirc.ui.swing.components.InputFrame;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.QueryWindow;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;

src/com/dmdirc/ui/ServerFrame.java → src/com/dmdirc/ui/swing/ServerFrame.java

@@ -20,18 +20,18 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui;
+package com.dmdirc.ui.swing;
 
 
 import com.dmdirc.Config;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandParser;
 import com.dmdirc.commandparser.ServerCommandParser;
-import com.dmdirc.ui.components.InputFrame;
-import com.dmdirc.ui.dialogs.serversetting.ServerSettingsDialog;
+import com.dmdirc.ui.swing.components.InputFrame;
+import com.dmdirc.ui.swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.ServerWindow;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;
 import java.awt.GridBagConstraints;

src/com/dmdirc/ui/SwingController.java → src/com/dmdirc/ui/swing/SwingController.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui;
+package com.dmdirc.ui.swing;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Config;
@@ -31,9 +31,10 @@ import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandParser;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.components.SwingPreferencesPanel;
-import com.dmdirc.ui.dialogs.SwingUpdaterDialog;
-import com.dmdirc.ui.dialogs.firstrunwizard.SwingFirstRunWizard;
+import com.dmdirc.ui.swing.components.SwingPreferencesPanel;
+import com.dmdirc.ui.swing.dialogs.SwingUpdaterDialog;
+import com.dmdirc.ui.swing.dialogs.channelsetting.ChannelSettingsDialog;
+import com.dmdirc.ui.swing.dialogs.firstrunwizard.SwingFirstRunWizard;
 import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.ui.interfaces.ChannelWindow;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -44,6 +45,7 @@ import com.dmdirc.ui.interfaces.ServerWindow;
 import com.dmdirc.ui.interfaces.StatusBar;
 import com.dmdirc.ui.interfaces.UIController;
 import com.dmdirc.ui.interfaces.UpdaterDialog;
+import com.dmdirc.ui.swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.updater.Update;
 
 import java.awt.Color;
@@ -124,6 +126,16 @@ public class SwingController implements UIController {
         new SwingFirstRunWizard().display();
     }
     
+    /** {@inheritDoc} */
+    public void showChannelSettingsDialog(final Channel channel) {
+        ChannelSettingsDialog.getChannelSettingDialog(channel).setVisible(true);
+    }
+
+    /** {@inheritDoc} */
+    public void showServerSettingsDialog(final Server server) {
+        new ServerSettingsDialog(server).setVisible(true);
+    }
+    
     /** {@inheritDoc} */
     public void initUISettings() {
         // For this to work it *HAS* to be before anything else UI related.

src/com/dmdirc/ui/UIUtilities.java → src/com/dmdirc/ui/swing/UIUtilities.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui;
+package com.dmdirc.ui.swing;
 
 import java.awt.Component;
 import java.awt.Container;

src/com/dmdirc/ui/actions/CopyAction.java → src/com/dmdirc/ui/swing/actions/CopyAction.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.actions;
+package com.dmdirc.ui.swing.actions;
 
 import java.awt.event.ActionEvent;
 

src/com/dmdirc/ui/actions/CutAction.java → src/com/dmdirc/ui/swing/actions/CutAction.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.actions;
+package com.dmdirc.ui.swing.actions;
 
 import java.awt.event.ActionEvent;
 

src/com/dmdirc/ui/actions/InputFramePasteAction.java → src/com/dmdirc/ui/swing/actions/InputFramePasteAction.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.actions;
+package com.dmdirc.ui.swing.actions;
 
-import com.dmdirc.ui.components.InputFrame;
+import com.dmdirc.ui.swing.components.InputFrame;
 
 import java.awt.Toolkit;
 import java.awt.datatransfer.DataFlavor;

src/com/dmdirc/ui/actions/PasteAction.java → src/com/dmdirc/ui/swing/actions/PasteAction.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.actions;
+package com.dmdirc.ui.swing.actions;
 
 import java.awt.Toolkit;
 import java.awt.datatransfer.DataFlavor;

src/com/dmdirc/ui/actions/package-info.java → src/com/dmdirc/ui/swing/actions/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Actions for the UI.
  */
-package com.dmdirc.ui.actions;
+package com.dmdirc.ui.swing.actions;

src/com/dmdirc/ui/components/ActionsGroupPanel.java → src/com/dmdirc/ui/swing/components/ActionsGroupPanel.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components;
+package com.dmdirc.ui.swing.components;
 
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionType;
-import com.dmdirc.ui.dialogs.ActionsManagerDialog;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import com.dmdirc.ui.swing.dialogs.ActionsManagerDialog;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;
 import java.util.List;

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

@@ -20,10 +20,10 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components;
+package com.dmdirc.ui.swing.components;
 
 import com.dmdirc.ui.messages.ColourManager;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;
 import java.awt.Color;

src/com/dmdirc/ui/components/ColourPickerDialog.java → src/com/dmdirc/ui/swing/components/ColourPickerDialog.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components;
+package com.dmdirc.ui.swing.components;
 
 import com.dmdirc.Main;
 

src/com/dmdirc/ui/components/ColourPickerPanel.java → src/com/dmdirc/ui/swing/components/ColourPickerPanel.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components;
+package com.dmdirc.ui.swing.components;
 
 import com.dmdirc.ui.messages.ColourManager;
 

src/com/dmdirc/ui/components/Frame.java → src/com/dmdirc/ui/swing/components/Frame.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components;
+package com.dmdirc.ui.swing.components;
 
 import com.dmdirc.BrowserLauncher;
 import com.dmdirc.Config;

src/com/dmdirc/ui/components/FrameContainerComparator.java → src/com/dmdirc/ui/swing/components/FrameContainerComparator.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components;
+package com.dmdirc.ui.swing.components;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;

src/com/dmdirc/ui/components/InputFrame.java → src/com/dmdirc/ui/swing/components/InputFrame.java

@@ -20,20 +20,20 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components;
+package com.dmdirc.ui.swing.components;
 
 import com.dmdirc.Config;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.actions.InputFramePasteAction;
-import com.dmdirc.ui.actions.CopyAction;
-import com.dmdirc.ui.actions.CutAction;
-import com.dmdirc.ui.dialogs.PasteDialog;
+import com.dmdirc.ui.swing.actions.InputFramePasteAction;
+import com.dmdirc.ui.swing.actions.CopyAction;
+import com.dmdirc.ui.swing.actions.CutAction;
+import com.dmdirc.ui.swing.dialogs.PasteDialog;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.InputWindow;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.AWTException;
 import java.awt.BorderLayout;

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

@@ -20,10 +20,10 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components;
+package com.dmdirc.ui.swing.components;
 
 import com.dmdirc.ui.messages.ColourManager;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;
 import java.awt.Color;

src/com/dmdirc/ui/components/PackingTable.java → src/com/dmdirc/ui/swing/components/PackingTable.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components;
+package com.dmdirc.ui.swing.components;
 
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.Graphics;
 

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

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components;
+package com.dmdirc.ui.swing.components;
 
 import com.dmdirc.config.ConfigManager;
-import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

src/com/dmdirc/ui/components/PluginCellRenderer.java → src/com/dmdirc/ui/swing/components/PluginCellRenderer.java

@@ -20,10 +20,10 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components;
+package com.dmdirc.ui.swing.components;
 
 import com.dmdirc.plugins.Plugin;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;
 import java.awt.Color;

src/com/dmdirc/ui/components/SearchBar.java → src/com/dmdirc/ui/swing/components/SearchBar.java

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components;
+package com.dmdirc.ui.swing.components;
 
 import com.dmdirc.IconManager;
 import com.dmdirc.Main;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.textpane.TextPane;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
-import static com.dmdirc.ui.UIUtilities.layoutGrid;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.layoutGrid;
 
 import java.awt.Dimension;
 import java.awt.Insets;

src/com/dmdirc/ui/components/StandardDialog.java → src/com/dmdirc/ui/swing/components/StandardDialog.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components;
+package com.dmdirc.ui.swing.components;
 
 import java.awt.Dimension;
 import java.awt.Frame;

src/com/dmdirc/ui/components/SwingPreferencesPanel.java → src/com/dmdirc/ui/swing/components/SwingPreferencesPanel.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components;
+package com.dmdirc.ui.swing.components;
 
 import com.dmdirc.Config;
 import com.dmdirc.Main;
@@ -29,9 +29,9 @@ import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.interfaces.PreferencesInterface;
 import com.dmdirc.ui.interfaces.PreferencesPanel;
 import com.dmdirc.ui.interfaces.PreferencesPanel.OptionType;
-import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
-import static com.dmdirc.ui.UIUtilities.layoutGrid;
+import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.layoutGrid;
 
 import java.awt.BorderLayout;
 import java.awt.CardLayout;

src/com/dmdirc/ui/components/SwingStatusBar.java → src/com/dmdirc/ui/swing/components/SwingStatusBar.java

@@ -20,17 +20,17 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components;
+package com.dmdirc.ui.swing.components;
 
 import com.dmdirc.Config;
 import com.dmdirc.IconManager;
 import com.dmdirc.logger.ErrorListener;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.ProgramError;
-import com.dmdirc.ui.dialogs.error.ErrorListDialog;
+import com.dmdirc.ui.swing.dialogs.error.ErrorListDialog;
 import com.dmdirc.ui.interfaces.StatusErrorNotifier;
 import com.dmdirc.ui.interfaces.StatusMessageNotifier;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 import com.dmdirc.ui.interfaces.StatusBar;
 
 import java.awt.Component;

src/com/dmdirc/ui/components/expandingsettings/AddOptionPanel.java → src/com/dmdirc/ui/swing/components/expandingsettings/AddOptionPanel.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components.expandingsettings;
+package com.dmdirc.ui.swing.components.expandingsettings;
 
-import com.dmdirc.ui.components.ColourChooser;
-import com.dmdirc.ui.components.expandingsettings.SettingsPanel.OptionType;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
-import static com.dmdirc.ui.UIUtilities.layoutGrid;
+import com.dmdirc.ui.swing.components.ColourChooser;
+import com.dmdirc.ui.swing.components.expandingsettings.SettingsPanel.OptionType;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.layoutGrid;
 
 import java.awt.Component;
 import java.awt.Dimension;

src/com/dmdirc/ui/components/expandingsettings/CurrentOptionsPanel.java → src/com/dmdirc/ui/swing/components/expandingsettings/CurrentOptionsPanel.java

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components.expandingsettings;
+package com.dmdirc.ui.swing.components.expandingsettings;
 
 import com.dmdirc.IconManager;
-import com.dmdirc.ui.components.ColourChooser;
-import com.dmdirc.ui.components.expandingsettings.SettingsPanel.OptionType;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
-import static com.dmdirc.ui.UIUtilities.layoutGrid;
+import com.dmdirc.ui.swing.components.ColourChooser;
+import com.dmdirc.ui.swing.components.expandingsettings.SettingsPanel.OptionType;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.layoutGrid;
 
 import java.awt.Dimension;
 import java.awt.Insets;

src/com/dmdirc/ui/components/expandingsettings/SettingsPanel.java → src/com/dmdirc/ui/swing/components/expandingsettings/SettingsPanel.java

@@ -20,10 +20,10 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components.expandingsettings;
+package com.dmdirc.ui.swing.components.expandingsettings;
 
 import com.dmdirc.config.Identity;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;

src/com/dmdirc/ui/components/expandingsettings/package-info.java → src/com/dmdirc/ui/swing/components/expandingsettings/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Expanding settings panel.
  */
-package com.dmdirc.ui.components.expandingsettings;
+package com.dmdirc.ui.swing.components.expandingsettings;

src/com/dmdirc/ui/components/package-info.java → src/com/dmdirc/ui/swing/components/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Custom UI components.
  */
-package com.dmdirc.ui.components;
+package com.dmdirc.ui.swing.components;

src/com/dmdirc/ui/components/reorderablelist/ArrayListTransferHandler.java → src/com/dmdirc/ui/swing/components/reorderablelist/ArrayListTransferHandler.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components.reorderablelist;
+package com.dmdirc.ui.swing.components.reorderablelist;
 
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;

src/com/dmdirc/ui/components/reorderablelist/ArrayListTransferable.java → src/com/dmdirc/ui/swing/components/reorderablelist/ArrayListTransferable.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components.reorderablelist;
+package com.dmdirc.ui.swing.components.reorderablelist;
 
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;

src/com/dmdirc/ui/components/reorderablelist/ReorderableJList.java → src/com/dmdirc/ui/swing/components/reorderablelist/ReorderableJList.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components.reorderablelist;
+package com.dmdirc.ui.swing.components.reorderablelist;
 
 
 import com.dmdirc.logger.ErrorLevel;

src/com/dmdirc/ui/components/reorderablelist/ReorderableJListCellRenderer.java → src/com/dmdirc/ui/swing/components/reorderablelist/ReorderableJListCellRenderer.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.components.reorderablelist;
+package com.dmdirc.ui.swing.components.reorderablelist;
 
 import java.awt.BorderLayout;
 import java.awt.Component;

src/com/dmdirc/ui/components/reorderablelist/package-info.java → src/com/dmdirc/ui/swing/components/reorderablelist/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Reorderable list.
  */
-package com.dmdirc.ui.components.reorderablelist;
+package com.dmdirc.ui.swing.components.reorderablelist;

src/com/dmdirc/ui/dialogs/ActionsManagerDialog.java → src/com/dmdirc/ui/swing/dialogs/ActionsManagerDialog.java

@@ -20,16 +20,16 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs;
+package com.dmdirc.ui.swing.dialogs;
 
 import com.dmdirc.Main;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionManager;
-import com.dmdirc.ui.components.ActionsGroupPanel;
-import com.dmdirc.ui.components.StandardDialog;
-import com.dmdirc.ui.dialogs.actionseditor.ActionsEditorDialog;
-import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import com.dmdirc.ui.swing.components.ActionsGroupPanel;
+import com.dmdirc.ui.swing.components.StandardDialog;
+import com.dmdirc.ui.swing.dialogs.actionseditor.ActionsEditorDialog;
+import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;

src/com/dmdirc/ui/dialogs/NewServerDialog.java → src/com/dmdirc/ui/swing/dialogs/NewServerDialog.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs;
+package com.dmdirc.ui.swing.dialogs;
 
 import com.dmdirc.Config;
 import com.dmdirc.Main;
@@ -28,11 +28,11 @@ import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.MainFrame;
-import com.dmdirc.ui.components.StandardDialog;
+import com.dmdirc.ui.swing.MainFrame;
+import com.dmdirc.ui.swing.components.StandardDialog;
 import com.dmdirc.ui.interfaces.Window;
-import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+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;

src/com/dmdirc/ui/dialogs/PasteDialog.java → src/com/dmdirc/ui/swing/dialogs/PasteDialog.java

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs;
+package com.dmdirc.ui.swing.dialogs;
 
 import com.dmdirc.Main;
-import com.dmdirc.ui.MainFrame;
-import com.dmdirc.ui.components.InputFrame;
-import com.dmdirc.ui.components.StandardDialog;
-import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
+import com.dmdirc.ui.swing.MainFrame;
+import com.dmdirc.ui.swing.components.InputFrame;
+import com.dmdirc.ui.swing.components.StandardDialog;
+import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
 
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;

src/com/dmdirc/ui/dialogs/PluginDialog.java → src/com/dmdirc/ui/swing/dialogs/PluginDialog.java

@@ -20,16 +20,16 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs;
+package com.dmdirc.ui.swing.dialogs;
 
 import com.dmdirc.BrowserLauncher;
 import com.dmdirc.Main;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.ui.components.PluginCellRenderer;
-import com.dmdirc.ui.components.StandardDialog;
-import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import com.dmdirc.ui.swing.components.PluginCellRenderer;
+import com.dmdirc.ui.swing.components.StandardDialog;
+import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;

src/com/dmdirc/ui/dialogs/PreferencesDialog.java → src/com/dmdirc/ui/swing/dialogs/PreferencesDialog.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs;
+package com.dmdirc.ui.swing.dialogs;
 
 import com.dmdirc.Config;
 import com.dmdirc.ui.interfaces.PreferencesInterface;
-import com.dmdirc.ui.components.SwingPreferencesPanel;
+import com.dmdirc.ui.swing.components.SwingPreferencesPanel;
 
 import java.util.Map;
 import java.util.Properties;

src/com/dmdirc/ui/dialogs/ProfileEditorDialog.java → src/com/dmdirc/ui/swing/dialogs/ProfileEditorDialog.java

@@ -20,15 +20,15 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs;
+package com.dmdirc.ui.swing.dialogs;
 
 import com.dmdirc.Main;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.components.StandardDialog;
-import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
-import static com.dmdirc.ui.UIUtilities.layoutGrid;
+import com.dmdirc.ui.swing.components.StandardDialog;
+import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.layoutGrid;
 
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;

src/com/dmdirc/ui/dialogs/SwingUpdaterDialog.java → src/com/dmdirc/ui/swing/dialogs/SwingUpdaterDialog.java

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs;
+package com.dmdirc.ui.swing.dialogs;
 
 import com.dmdirc.Main;
-import com.dmdirc.ui.components.StandardDialog;
+import com.dmdirc.ui.swing.components.StandardDialog;
 import com.dmdirc.updater.Update;
-import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 import com.dmdirc.ui.interfaces.UpdaterDialog;
 
 import java.awt.BorderLayout;

src/com/dmdirc/ui/dialogs/about/AboutDialog.java → src/com/dmdirc/ui/swing/dialogs/about/AboutDialog.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.about;
+package com.dmdirc.ui.swing.dialogs.about;
 
 import com.dmdirc.Main;
-import com.dmdirc.ui.components.StandardDialog;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import com.dmdirc.ui.swing.components.StandardDialog;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;

src/com/dmdirc/ui/dialogs/about/AboutPanel.java → src/com/dmdirc/ui/swing/dialogs/about/AboutPanel.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.about;
+package com.dmdirc.ui.swing.dialogs.about;
 
 import com.dmdirc.BrowserLauncher;
 import com.dmdirc.Main;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;
 

src/com/dmdirc/ui/dialogs/about/CreditsPanel.java → src/com/dmdirc/ui/swing/dialogs/about/CreditsPanel.java

@@ -20,10 +20,10 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.about;
+package com.dmdirc.ui.swing.dialogs.about;
 
 import com.dmdirc.BrowserLauncher;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;
 

src/com/dmdirc/ui/dialogs/about/LicensePanel.java → src/com/dmdirc/ui/swing/dialogs/about/LicensePanel.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.about;
+package com.dmdirc.ui.swing.dialogs.about;
 
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;
 import java.awt.Insets;

src/com/dmdirc/ui/dialogs/about/package-info.java → src/com/dmdirc/ui/swing/dialogs/about/package-info.java

@@ -23,4 +23,4 @@
 /**
  * About dialog.
  */
-package com.dmdirc.ui.dialogs.about;
+package com.dmdirc.ui.swing.dialogs.about;

src/com/dmdirc/ui/dialogs/actionseditor/ActionCellRenderer.java → src/com/dmdirc/ui/swing/dialogs/actionseditor/ActionCellRenderer.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.actionseditor;
+package com.dmdirc.ui.swing.dialogs.actionseditor;
 
 import com.dmdirc.actions.ActionComparison;
 import com.dmdirc.actions.ActionComponent;

src/com/dmdirc/ui/dialogs/actionseditor/ActionsEditorDialog.java → src/com/dmdirc/ui/swing/dialogs/actionseditor/ActionsEditorDialog.java

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.actionseditor;
+package com.dmdirc.ui.swing.dialogs.actionseditor;
 
 import com.dmdirc.Main;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionType;
-import com.dmdirc.ui.components.StandardDialog;
-import com.dmdirc.ui.dialogs.ActionsManagerDialog;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import com.dmdirc.ui.swing.components.StandardDialog;
+import com.dmdirc.ui.swing.dialogs.ActionsManagerDialog;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;

src/com/dmdirc/ui/dialogs/actionseditor/ConditionEditorDialog.java → src/com/dmdirc/ui/swing/dialogs/actionseditor/ConditionEditorDialog.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.actionseditor;
+package com.dmdirc.ui.swing.dialogs.actionseditor;
 
 import com.dmdirc.Main;
 import com.dmdirc.actions.ActionComparison;
@@ -28,9 +28,9 @@ import com.dmdirc.actions.ActionComponent;
 import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.ActionType;
-import com.dmdirc.ui.components.StandardDialog;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
-import static com.dmdirc.ui.UIUtilities.layoutGrid;
+import com.dmdirc.ui.swing.components.StandardDialog;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.layoutGrid;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;

src/com/dmdirc/ui/dialogs/actionseditor/ConditionsTabPanel.java → src/com/dmdirc/ui/swing/dialogs/actionseditor/ConditionsTabPanel.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.actionseditor;
+package com.dmdirc.ui.swing.dialogs.actionseditor;
 
 import com.dmdirc.IconManager;
 import com.dmdirc.actions.ActionCondition;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
-import static com.dmdirc.ui.UIUtilities.layoutGrid;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.layoutGrid;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;

src/com/dmdirc/ui/dialogs/actionseditor/GeneralTabPanel.java → src/com/dmdirc/ui/swing/dialogs/actionseditor/GeneralTabPanel.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.actionseditor;
+package com.dmdirc.ui.swing.dialogs.actionseditor;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.ActionType;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
-import static com.dmdirc.ui.UIUtilities.layoutGrid;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.layoutGrid;
 
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;

src/com/dmdirc/ui/dialogs/actionseditor/ResponseTabPanel.java → src/com/dmdirc/ui/swing/dialogs/actionseditor/ResponseTabPanel.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.actionseditor;
+package com.dmdirc.ui.swing.dialogs.actionseditor;
 
 import com.dmdirc.ui.messages.Formatter;
-import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;

src/com/dmdirc/ui/dialogs/actionseditor/package-info.java → src/com/dmdirc/ui/swing/dialogs/actionseditor/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Actions editor dialog.
  */
-package com.dmdirc.ui.dialogs.actionseditor;
+package com.dmdirc.ui.swing.dialogs.actionseditor;

src/com/dmdirc/ui/dialogs/channelsetting/ChannelListModesPane.java → src/com/dmdirc/ui/swing/dialogs/channelsetting/ChannelListModesPane.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.channelsetting;
+package com.dmdirc.ui.swing.dialogs.channelsetting;
 
 import com.dmdirc.Channel;
 import com.dmdirc.parser.ChannelListModeItem;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;
 import java.awt.GridBagConstraints;

src/com/dmdirc/ui/dialogs/channelsetting/ChannelModesPane.java → src/com/dmdirc/ui/swing/dialogs/channelsetting/ChannelModesPane.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.channelsetting;
+package com.dmdirc.ui.swing.dialogs.channelsetting;
 
 import com.dmdirc.Channel;
 import com.dmdirc.parser.IRCParser;
-import com.dmdirc.ui.components.ParamModePanel;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import com.dmdirc.ui.swing.components.ParamModePanel;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;

src/com/dmdirc/ui/dialogs/channelsetting/ChannelSettingsDialog.java → src/com/dmdirc/ui/swing/dialogs/channelsetting/ChannelSettingsDialog.java

@@ -20,16 +20,16 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.channelsetting;
+package com.dmdirc.ui.swing.dialogs.channelsetting;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Main;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.components.StandardDialog;
-import com.dmdirc.ui.components.expandingsettings.SettingsPanel;
-import com.dmdirc.ui.components.expandingsettings.SettingsPanel.OptionType;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+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.GridBagConstraints;
 import java.awt.GridBagLayout;

src/com/dmdirc/ui/dialogs/channelsetting/TopicModesPane.java → src/com/dmdirc/ui/swing/dialogs/channelsetting/TopicModesPane.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.channelsetting;
+package com.dmdirc.ui.swing.dialogs.channelsetting;
 
 import com.dmdirc.Channel;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;

src/com/dmdirc/ui/dialogs/channelsetting/package-info.java → src/com/dmdirc/ui/swing/dialogs/channelsetting/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Channel settings dialog.
  */
-package com.dmdirc.ui.dialogs.channelsetting;
+package com.dmdirc.ui.swing.dialogs.channelsetting;

src/com/dmdirc/ui/dialogs/error/ErrorDetailPanel.java → src/com/dmdirc/ui/swing/dialogs/error/ErrorDetailPanel.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.error;
+package com.dmdirc.ui.swing.dialogs.error;
 
 import com.dmdirc.logger.ProgramError;
 import com.dmdirc.ui.textpane.TextPane;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
-import static com.dmdirc.ui.UIUtilities.layoutGrid;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.layoutGrid;
 
 import java.text.AttributedString;
 

src/com/dmdirc/ui/dialogs/error/ErrorListDialog.java → src/com/dmdirc/ui/swing/dialogs/error/ErrorListDialog.java

@@ -20,17 +20,17 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.error;
+package com.dmdirc.ui.swing.dialogs.error;
 
 import com.dmdirc.Main;
 import com.dmdirc.logger.ErrorListener;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.ErrorStatus;
 import com.dmdirc.logger.ProgramError;
-import com.dmdirc.ui.components.PackingTable;
-import com.dmdirc.ui.components.StandardDialog;
-import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import com.dmdirc.ui.swing.components.PackingTable;
+import com.dmdirc.ui.swing.components.StandardDialog;
+import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;

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

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.error;
+package com.dmdirc.ui.swing.dialogs.error;
 
 import com.dmdirc.IconManager;
 import com.dmdirc.Main;
 import com.dmdirc.logger.ErrorStatus;
 import com.dmdirc.logger.ProgramError;
-import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;

src/com/dmdirc/ui/dialogs/error/package-info.java → src/com/dmdirc/ui/swing/dialogs/error/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Error dialogs.
  */
-package com.dmdirc.ui.dialogs.error;
+package com.dmdirc.ui.swing.dialogs.error;

src/com/dmdirc/ui/dialogs/firstrunwizard/StepOne.java → src/com/dmdirc/ui/swing/dialogs/firstrunwizard/StepOne.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.firstrunwizard;
+package com.dmdirc.ui.swing.dialogs.firstrunwizard;
 
-import com.dmdirc.ui.dialogs.wizard.Step;
-import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import com.dmdirc.ui.swing.dialogs.wizard.Step;
+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;

src/com/dmdirc/ui/dialogs/firstrunwizard/StepTwo.java → src/com/dmdirc/ui/swing/dialogs/firstrunwizard/StepTwo.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.firstrunwizard;
+package com.dmdirc.ui.swing.dialogs.firstrunwizard;
 
-import com.dmdirc.ui.dialogs.wizard.Step;
-import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import com.dmdirc.ui.swing.dialogs.wizard.Step;
+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;

src/com/dmdirc/ui/dialogs/firstrunwizard/SwingFirstRunWizard.java → src/com/dmdirc/ui/swing/dialogs/firstrunwizard/SwingFirstRunWizard.java

@@ -20,16 +20,16 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.firstrunwizard;
+package com.dmdirc.ui.swing.dialogs.firstrunwizard;
 
 import com.dmdirc.Config;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.resourcemanager.ResourceManager;
-import com.dmdirc.ui.dialogs.ProfileEditorDialog;
-import com.dmdirc.ui.dialogs.wizard.Step;
-import com.dmdirc.ui.dialogs.wizard.Wizard;
-import com.dmdirc.ui.dialogs.wizard.WizardDialog;
+import com.dmdirc.ui.swing.dialogs.ProfileEditorDialog;
+import com.dmdirc.ui.swing.dialogs.wizard.Step;
+import com.dmdirc.ui.swing.dialogs.wizard.Wizard;
+import com.dmdirc.ui.swing.dialogs.wizard.WizardDialog;
 import com.dmdirc.ui.interfaces.FirstRunWizard;
 
 import java.awt.Dimension;

src/com/dmdirc/ui/dialogs/firstrunwizard/package-info.java → src/com/dmdirc/ui/swing/dialogs/firstrunwizard/package-info.java

@@ -23,4 +23,4 @@
 /**
  * First run wizard.
  */
-package com.dmdirc.ui.dialogs.firstrunwizard;
+package com.dmdirc.ui.swing.dialogs.firstrunwizard;

src/com/dmdirc/ui/dialogs/package-info.java → src/com/dmdirc/ui/swing/dialogs/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Dialogs for the client.
  */
-package com.dmdirc.ui.dialogs;
+package com.dmdirc.ui.swing.dialogs;

src/com/dmdirc/ui/dialogs/serversetting/IgnoreListPanel.java → src/com/dmdirc/ui/swing/dialogs/serversetting/IgnoreListPanel.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.serversetting;
+package com.dmdirc.ui.swing.dialogs.serversetting;
 
 import com.dmdirc.Config;
 import com.dmdirc.Server;
 import com.dmdirc.config.ConfigManager;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;

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

@@ -20,15 +20,15 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.serversetting;
+package com.dmdirc.ui.swing.dialogs.serversetting;
 
 import com.dmdirc.Main;
 import com.dmdirc.Server;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.components.StandardDialog;
-import com.dmdirc.ui.components.expandingsettings.SettingsPanel;
-import com.dmdirc.ui.components.expandingsettings.SettingsPanel.OptionType;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+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.Dimension;

src/com/dmdirc/ui/dialogs/serversetting/package-info.java → src/com/dmdirc/ui/swing/dialogs/serversetting/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Server settings dialog.
  */
-package com.dmdirc.ui.dialogs.serversetting;
+package com.dmdirc.ui.swing.dialogs.serversetting;

src/com/dmdirc/ui/dialogs/wizard/Step.java → src/com/dmdirc/ui/swing/dialogs/wizard/Step.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.wizard;
+package com.dmdirc.ui.swing.dialogs.wizard;
 
 import javax.swing.JPanel;
 

src/com/dmdirc/ui/dialogs/wizard/Wizard.java → src/com/dmdirc/ui/swing/dialogs/wizard/Wizard.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.wizard;
+package com.dmdirc.ui.swing.dialogs.wizard;
 
 /**
  * Wizard interface, notifications on change of step and closing.

src/com/dmdirc/ui/dialogs/wizard/WizardDialog.java → src/com/dmdirc/ui/swing/dialogs/wizard/WizardDialog.java

@@ -20,10 +20,10 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dialogs.wizard;
+package com.dmdirc.ui.swing.dialogs.wizard;
 
 import com.dmdirc.Main;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;
 import java.awt.Color;

src/com/dmdirc/ui/dialogs/wizard/package-info.java → src/com/dmdirc/ui/swing/dialogs/wizard/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Wizard thingy.
  */
-package com.dmdirc.ui.dialogs.wizard;
+package com.dmdirc.ui.swing.dialogs.wizard;

src/com/dmdirc/ui/framemanager/DummyFrameManager.java → src/com/dmdirc/ui/swing/framemanager/DummyFrameManager.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.framemanager;
+package com.dmdirc.ui.swing.framemanager;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;

src/com/dmdirc/ui/framemanager/MainFrameManager.java → src/com/dmdirc/ui/swing/framemanager/MainFrameManager.java

@@ -20,16 +20,16 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.framemanager;
+package com.dmdirc.ui.swing.framemanager;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Config;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
-import com.dmdirc.ui.framemanager.buttonbar.ButtonBar;
-import com.dmdirc.ui.framemanager.tree.TreeFrameManager;
-import com.dmdirc.ui.framemanager.windowmenu.WindowMenuFrameManager;
+import com.dmdirc.ui.swing.framemanager.buttonbar.ButtonBar;
+import com.dmdirc.ui.swing.framemanager.tree.TreeFrameManager;
+import com.dmdirc.ui.swing.framemanager.windowmenu.WindowMenuFrameManager;
 import com.dmdirc.ui.interfaces.FrameManager;
 
 import java.awt.Color;

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.framemanager.buttonbar;
+package com.dmdirc.ui.swing.framemanager.buttonbar;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Config;
@@ -28,7 +28,7 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
-import com.dmdirc.ui.UIUtilities;
+import com.dmdirc.ui.swing.UIUtilities;
 import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.ui.interfaces.FramemanagerPosition;
 import com.dmdirc.ui.interfaces.Window;

src/com/dmdirc/ui/framemanager/buttonbar/ButtonComparator.java → src/com/dmdirc/ui/swing/framemanager/buttonbar/ButtonComparator.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.framemanager.buttonbar;
+package com.dmdirc.ui.swing.framemanager.buttonbar;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;

src/com/dmdirc/ui/framemanager/buttonbar/package-info.java → src/com/dmdirc/ui/swing/framemanager/buttonbar/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Button bar frame manager
  */
-package com.dmdirc.ui.framemanager.buttonbar;
+package com.dmdirc.ui.swing.framemanager.buttonbar;

src/com/dmdirc/ui/framemanager/package-info.java → src/com/dmdirc/ui/swing/framemanager/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Frame manager interface and dummy manager.
  */
-package com.dmdirc.ui.framemanager;
+package com.dmdirc.ui.swing.framemanager;

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.framemanager.tree;
+package com.dmdirc.ui.swing.framemanager.tree;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Config;
@@ -30,7 +30,7 @@ import com.dmdirc.Server;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.interfaces.FrameManager;
-import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;
 import java.awt.Color;

src/com/dmdirc/ui/framemanager/tree/TreeViewModel.java → src/com/dmdirc/ui/swing/framemanager/tree/TreeViewModel.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.framemanager.tree;
+package com.dmdirc.ui.swing.framemanager.tree;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Config;