Initial work on moving UI to a plugin

src/com/dmdirc/Main.java

@@ -32,9 +32,9 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.themes.ThemeManager;
-import com.dmdirc.ui.dummy.DummyController;
+import com.dmdirc.addons.ui_dummy.DummyController;
 import com.dmdirc.ui.interfaces.UIController;
-import com.dmdirc.ui.swing.SwingController;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.updater.UpdateChannel;
 import com.dmdirc.updater.UpdateChecker;
 

src/com/dmdirc/addons/addonbrowser/AddonInfoListCellRenderer.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.addonbrowser;
 
-import com.dmdirc.ui.swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.TextLabel;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Font;

src/com/dmdirc/addons/addonbrowser/BrowserPlugin.java

@@ -24,7 +24,7 @@ package com.dmdirc.addons.addonbrowser;
 
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.plugins.Plugin;
-import com.dmdirc.ui.swing.components.pluginpanel.PluginPanel;
+import com.dmdirc.addons.ui_swing.components.pluginpanel.PluginPanel;
 
 import java.awt.Component;
 import java.awt.event.ActionEvent;

src/com/dmdirc/addons/addonbrowser/BrowserWindow.java

@@ -24,8 +24,8 @@ package com.dmdirc.addons.addonbrowser;
 
 import com.dmdirc.Main;
 import com.dmdirc.addons.addonbrowser.AddonInfo.AddonType;
-import com.dmdirc.ui.swing.SwingController;
-import com.dmdirc.ui.swing.components.LoggingSwingWorker;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.util.ConfigFile;
 import com.dmdirc.util.InvalidConfigFileException;
 

src/com/dmdirc/addons/dcc/DCCFrame.java

@@ -33,8 +33,8 @@ import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.interfaces.InputWindow;
-import com.dmdirc.ui.swing.components.InputTextFrame;
-import com.dmdirc.ui.swing.components.TextFrame;
+import com.dmdirc.addons.ui_swing.components.InputTextFrame;
+import com.dmdirc.addons.ui_swing.components.TextFrame;
 
 import java.awt.Container;
 

src/com/dmdirc/addons/dcc/DCCPlugin.java

@@ -41,12 +41,12 @@ import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.swing.components.TextFrame;
+import com.dmdirc.addons.ui_swing.components.TextFrame;
 
 import com.dmdirc.addons.dcc.kde.KFileChooser;
 import com.dmdirc.addons.dcc.actions.DCCActions;
 
-import com.dmdirc.ui.swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.TextLabel;
 import java.io.File;
 import java.io.IOException;
 

src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java

@@ -37,7 +37,7 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.interfaces.Window;
-import com.dmdirc.ui.swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 
 import java.awt.Color;
 import java.awt.Component;

src/com/dmdirc/addons/lagdisplay/ServerInfoDialog.java

@@ -26,9 +26,9 @@ import com.dmdirc.Server;
 import com.dmdirc.Main;
 import com.dmdirc.ServerManager;
 import com.dmdirc.ServerState;
-import com.dmdirc.ui.swing.MainFrame;
-import com.dmdirc.ui.swing.SwingController;
-import com.dmdirc.ui.swing.components.StandardDialog;
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.components.StandardDialog;
 
 import java.awt.Component;
 import java.awt.Graphics;

src/com/dmdirc/addons/mediasource_vlc/InstructionsPanel.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.mediasource_vlc;
 
 import com.dmdirc.config.prefs.PreferencesInterface;
-import com.dmdirc.ui.swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.TextLabel;
 
 import javax.swing.JPanel;
 

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

@@ -23,9 +23,9 @@
 package com.dmdirc.addons.nickcolours;
 
 import com.dmdirc.Main;
-import com.dmdirc.ui.swing.MainFrame;
-import com.dmdirc.ui.swing.components.StandardDialog;
-import com.dmdirc.ui.swing.components.ColourChooser;
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.components.StandardDialog;
+import com.dmdirc.addons.ui_swing.components.ColourChooser;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

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

@@ -24,10 +24,10 @@ package com.dmdirc.addons.nowplaying;
 
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PreferencesInterface;
-import com.dmdirc.ui.swing.components.TextLabel;
-import com.dmdirc.ui.swing.components.reorderablelist.ReorderableJList;
+import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.reorderablelist.ReorderableJList;
 
-import com.dmdirc.ui.swing.components.substitutions.SubstitutionsPanel;
+import com.dmdirc.addons.ui_swing.components.substitutions.SubstitutionsPanel;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.util.ArrayList;

src/com/dmdirc/addons/nowplaying/NowPlayingSubsitutionPanel.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.nowplaying;
 
-import com.dmdirc.ui.swing.components.substitutions.Substitution;
-import com.dmdirc.ui.swing.components.substitutions.SubstitutionLabel;
-import com.dmdirc.ui.swing.components.substitutions.SubstitutionsPanel;
+import com.dmdirc.addons.ui_swing.components.substitutions.Substitution;
+import com.dmdirc.addons.ui_swing.components.substitutions.SubstitutionLabel;
+import com.dmdirc.addons.ui_swing.components.substitutions.SubstitutionsPanel;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -25,7 +25,7 @@ package com.dmdirc.addons.osd;
 import com.dmdirc.Main;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.messages.ColourManager;
-import com.dmdirc.ui.swing.MainFrame;
+import com.dmdirc.addons.ui_swing.MainFrame;
 
 import java.awt.Color;
 import java.awt.Point;

src/com/dmdirc/addons/systray/SystrayPlugin.java

@@ -35,7 +35,7 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.config.prefs.validator.ValidationResponse;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.messages.Styliser;
-import com.dmdirc.ui.swing.MainFrame;
+import com.dmdirc.addons.ui_swing.MainFrame;
 
 import java.awt.AWTException;
 import java.awt.Frame;

src/com/dmdirc/ui/dummy/DummyChannelWindow.java → src/com/dmdirc/addons/ui_dummy/DummyChannelWindow.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dummy;
+package com.dmdirc.addons.ui_dummy;
 
 import com.dmdirc.Channel;
 import com.dmdirc.commandparser.parsers.ChannelCommandParser;

src/com/dmdirc/ui/dummy/DummyController.java → src/com/dmdirc/addons/ui_dummy/DummyController.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dummy;
+package com.dmdirc.addons.ui_dummy;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;

src/com/dmdirc/ui/dummy/DummyFrameManager.java → src/com/dmdirc/addons/ui_dummy/DummyFrameManager.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dummy;
+package com.dmdirc.addons.ui_dummy;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;

src/com/dmdirc/ui/dummy/DummyInputField.java → src/com/dmdirc/addons/ui_dummy/DummyInputField.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dummy;
+package com.dmdirc.addons.ui_dummy;
 
 import com.dmdirc.ui.interfaces.InputField;
 

src/com/dmdirc/ui/dummy/DummyInputHandler.java → src/com/dmdirc/addons/ui_dummy/DummyInputHandler.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dummy;
+package com.dmdirc.addons.ui_dummy;
 
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.ui.input.InputHandler;

src/com/dmdirc/ui/dummy/DummyInputWindow.java → src/com/dmdirc/addons/ui_dummy/DummyInputWindow.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dummy;
+package com.dmdirc.addons.ui_dummy;
 
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;

src/com/dmdirc/ui/dummy/DummyMainWindow.java → src/com/dmdirc/addons/ui_dummy/DummyMainWindow.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dummy;
+package com.dmdirc.addons.ui_dummy;
 
 import com.dmdirc.ui.interfaces.MainWindow;
 import com.dmdirc.ui.interfaces.Window;

src/com/dmdirc/ui/dummy/DummyQueryWindow.java → src/com/dmdirc/addons/ui_dummy/DummyQueryWindow.java

@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.dmdirc.ui.dummy;
+package com.dmdirc.addons.ui_dummy;
 
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.ui.interfaces.QueryWindow;

src/com/dmdirc/ui/dummy/DummyServerWindow.java → src/com/dmdirc/addons/ui_dummy/DummyServerWindow.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dummy;
+package com.dmdirc.addons.ui_dummy;
 
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.parsers.ServerCommandParser;

src/com/dmdirc/ui/dummy/DummyStatusBar.java → src/com/dmdirc/addons/ui_dummy/DummyStatusBar.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.dummy;
+package com.dmdirc.addons.ui_dummy;
 
 import com.dmdirc.ui.interfaces.StatusBar;
 import com.dmdirc.ui.interfaces.StatusMessageNotifier;

src/com/dmdirc/ui/dummy/package-info.java → src/com/dmdirc/addons/ui_dummy/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Dummy user interface, used for testing.
  */
-package com.dmdirc.ui.dummy;
+package com.dmdirc.addons.ui_dummy;

src/com/dmdirc/ui/swing/Apple.java → src/com/dmdirc/addons/ui_swing/Apple.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing;
+package com.dmdirc.addons.ui_swing;
 
-import com.dmdirc.ui.swing.components.MenuBar;
+import com.dmdirc.addons.ui_swing.components.MenuBar;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing;
+package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.Channel;
 import com.dmdirc.ServerState;
@@ -29,12 +29,12 @@ import com.dmdirc.commandparser.parsers.ChannelCommandParser;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
 import com.dmdirc.ui.interfaces.ChannelWindow;
-import com.dmdirc.ui.swing.components.InputTextFrame;
-import com.dmdirc.ui.swing.components.SnappingJSplitPane;
-import com.dmdirc.ui.swing.components.SwingInputHandler;
-import com.dmdirc.ui.swing.components.renderers.NicklistRenderer;
-import com.dmdirc.ui.swing.dialogs.channelsetting.ChannelSettingsDialog;
-import com.dmdirc.ui.swing.textpane.TextPane.ClickType;
+import com.dmdirc.addons.ui_swing.components.InputTextFrame;
+import com.dmdirc.addons.ui_swing.components.SnappingJSplitPane;
+import com.dmdirc.addons.ui_swing.components.SwingInputHandler;
+import com.dmdirc.addons.ui_swing.components.renderers.NicklistRenderer;
+import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
+import com.dmdirc.addons.ui_swing.textpane.TextPane.ClickType;
 
 import java.awt.Color;
 import java.awt.Dimension;

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing;
+package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.PopupType;
 
-import com.dmdirc.ui.swing.components.TextFrame;
+import com.dmdirc.addons.ui_swing.components.TextFrame;
 import javax.swing.JPopupMenu;
 
 import net.miginfocom.swing.MigLayout;

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

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing;
+package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.ui.swing.components.InputTextFrame;
-import com.dmdirc.ui.swing.components.SwingInputHandler;
+import com.dmdirc.addons.ui_swing.components.InputTextFrame;
+import com.dmdirc.addons.ui_swing.components.SwingInputHandler;
 
 import javax.swing.JPopupMenu;
 

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

@@ -19,13 +19,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.dmdirc.ui.swing;
+package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.ui.swing.actions.CopyAction;
-import com.dmdirc.ui.swing.actions.CutAction;
-import com.dmdirc.ui.swing.actions.PasteAction;
+import com.dmdirc.addons.ui_swing.actions.CopyAction;
+import com.dmdirc.addons.ui_swing.actions.CutAction;
+import com.dmdirc.addons.ui_swing.actions.PasteAction;
 
 import java.awt.AWTEvent;
 import java.awt.Component;

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

@@ -19,9 +19,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.dmdirc.ui.swing;
+package com.dmdirc.addons.ui_swing;
 
-import com.dmdirc.ui.swing.components.desktopPane.DMDircDesktopPane;
+import com.dmdirc.addons.ui_swing.components.desktopPane.DMDircDesktopPane;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 import com.dmdirc.ServerManager;
@@ -37,10 +37,10 @@ import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.ui.interfaces.FramemanagerPosition;
 import com.dmdirc.ui.interfaces.MainWindow;
 import com.dmdirc.ui.interfaces.Window;
-import com.dmdirc.ui.swing.components.InputTextFrame;
-import com.dmdirc.ui.swing.components.MenuBar;
-import com.dmdirc.ui.swing.components.SnappingJSplitPane;
-import com.dmdirc.ui.swing.framemanager.tree.TreeFrameManager;
+import com.dmdirc.addons.ui_swing.components.InputTextFrame;
+import com.dmdirc.addons.ui_swing.components.MenuBar;
+import com.dmdirc.addons.ui_swing.components.SnappingJSplitPane;
+import com.dmdirc.addons.ui_swing.framemanager.tree.TreeFrameManager;
 
 import java.awt.Dimension;
 import java.awt.event.WindowEvent;

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

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

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing;
+package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;

src/com/dmdirc/ui/swing/PrefsComponentFactory.java → src/com/dmdirc/addons/ui_swing/PrefsComponentFactory.java

@@ -20,16 +20,16 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing;
+package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.validator.NumericalValidator;
-import com.dmdirc.ui.swing.components.ColourChooser;
-import com.dmdirc.ui.swing.components.OptionalColourChooser;
-import com.dmdirc.ui.swing.components.durationeditor.DurationDisplay;
-import com.dmdirc.ui.swing.components.durationeditor.DurationListener;
-import com.dmdirc.ui.swing.components.renderers.MapEntryRenderer;
-import com.dmdirc.ui.swing.components.validating.ValidatingJTextField;
+import com.dmdirc.addons.ui_swing.components.ColourChooser;
+import com.dmdirc.addons.ui_swing.components.OptionalColourChooser;
+import com.dmdirc.addons.ui_swing.components.durationeditor.DurationDisplay;
+import com.dmdirc.addons.ui_swing.components.durationeditor.DurationListener;
+import com.dmdirc.addons.ui_swing.components.renderers.MapEntryRenderer;
+import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;

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

@@ -20,15 +20,15 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing;
+package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.Query;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.QueryCommandParser;
 import com.dmdirc.ui.interfaces.QueryWindow;
-import com.dmdirc.ui.swing.components.InputTextFrame;
-import com.dmdirc.ui.swing.components.SwingInputHandler;
+import com.dmdirc.addons.ui_swing.components.InputTextFrame;
+import com.dmdirc.addons.ui_swing.components.SwingInputHandler;
 
 import javax.swing.JPopupMenu;
 

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing;
+package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
@@ -28,9 +28,9 @@ import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.ServerCommandParser;
 import com.dmdirc.ui.interfaces.ServerWindow;
-import com.dmdirc.ui.swing.components.InputTextFrame;
-import com.dmdirc.ui.swing.components.SwingInputHandler;
-import com.dmdirc.ui.swing.dialogs.serversetting.ServerSettingsDialog;
+import com.dmdirc.addons.ui_swing.components.InputTextFrame;
+import com.dmdirc.addons.ui_swing.components.SwingInputHandler;
+import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing;
+package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
@@ -40,16 +40,16 @@ import com.dmdirc.ui.interfaces.ServerWindow;
 import com.dmdirc.ui.interfaces.StatusBar;
 import com.dmdirc.ui.interfaces.UIController;
 import com.dmdirc.ui.interfaces.Window;
-import com.dmdirc.ui.swing.components.FeedbackNag;
-import com.dmdirc.ui.swing.components.SwingStatusBar;
-import com.dmdirc.ui.swing.dialogs.updater.SwingUpdaterDialog;
-import com.dmdirc.ui.swing.dialogs.url.URLDialog;
-import com.dmdirc.ui.swing.dialogs.channelsetting.ChannelSettingsDialog;
-import com.dmdirc.ui.swing.dialogs.error.ErrorListDialog;
-import com.dmdirc.ui.swing.dialogs.wizard.firstrun.SwingFirstRunWizard;
-import com.dmdirc.ui.swing.dialogs.serversetting.ServerSettingsDialog;
-import com.dmdirc.ui.swing.dialogs.sslcertificate.SSLCertificateDialog;
-import com.dmdirc.ui.swing.dialogs.wizard.WizardListener;
+import com.dmdirc.addons.ui_swing.components.FeedbackNag;
+import com.dmdirc.addons.ui_swing.components.SwingStatusBar;
+import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
+import com.dmdirc.addons.ui_swing.dialogs.url.URLDialog;
+import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
+import com.dmdirc.addons.ui_swing.dialogs.error.ErrorListDialog;
+import com.dmdirc.addons.ui_swing.dialogs.wizard.firstrun.SwingFirstRunWizard;
+import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
+import com.dmdirc.addons.ui_swing.dialogs.sslcertificate.SSLCertificateDialog;
+import com.dmdirc.addons.ui_swing.dialogs.wizard.WizardListener;
 import com.dmdirc.updater.Update;
 import com.dmdirc.util.ReturnableThread;
 

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

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing;
+package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.swing.actions.RedoAction;
-import com.dmdirc.ui.swing.actions.UndoAction;
-import com.dmdirc.ui.swing.components.DMDircUndoableEditListener;
-import com.dmdirc.ui.swing.components.NullBorder;
+import com.dmdirc.addons.ui_swing.actions.RedoAction;
+import com.dmdirc.addons.ui_swing.actions.UndoAction;
+import com.dmdirc.addons.ui_swing.components.DMDircUndoableEditListener;
+import com.dmdirc.addons.ui_swing.components.NullBorder;
 import com.dmdirc.util.ReturnableThread;
 
 import java.awt.Dimension;

src/com/dmdirc/ui/swing/actions/ChannelCopyAction.java → src/com/dmdirc/addons/ui_swing/actions/ChannelCopyAction.java

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

src/com/dmdirc/ui/swing/actions/CloseFrameContainerAction.java → src/com/dmdirc/addons/ui_swing/actions/CloseFrameContainerAction.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.actions;
+package com.dmdirc.addons.ui_swing.actions;
 
 import com.dmdirc.FrameContainer;
 

src/com/dmdirc/ui/swing/actions/CommandAction.java → src/com/dmdirc/addons/ui_swing/actions/CommandAction.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.actions;
+package com.dmdirc.addons.ui_swing.actions;
 
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.ui.interfaces.InputWindow;

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

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

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

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

src/com/dmdirc/ui/swing/actions/HyperlinkCopyAction.java → src/com/dmdirc/addons/ui_swing/actions/HyperlinkCopyAction.java

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

src/com/dmdirc/ui/swing/actions/InputTextFramePasteAction.java → src/com/dmdirc/addons/ui_swing/actions/InputTextFramePasteAction.java

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

src/com/dmdirc/ui/swing/actions/NicknameCopyAction.java → src/com/dmdirc/addons/ui_swing/actions/NicknameCopyAction.java

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

src/com/dmdirc/ui/swing/actions/NoNewlinesPasteAction.java → src/com/dmdirc/addons/ui_swing/actions/NoNewlinesPasteAction.java

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

src/com/dmdirc/ui/swing/actions/NoSpacesPasteAction.java → src/com/dmdirc/addons/ui_swing/actions/NoSpacesPasteAction.java

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

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

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

src/com/dmdirc/ui/swing/actions/RedoAction.java → src/com/dmdirc/addons/ui_swing/actions/RedoAction.java

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

src/com/dmdirc/ui/swing/actions/SanitisedFilenamePasteAction.java → src/com/dmdirc/addons/ui_swing/actions/SanitisedFilenamePasteAction.java

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

src/com/dmdirc/ui/swing/actions/SearchAction.java → src/com/dmdirc/addons/ui_swing/actions/SearchAction.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.actions;
+package com.dmdirc.addons.ui_swing.actions;
 
-import com.dmdirc.ui.swing.components.SwingSearchBar;
+import com.dmdirc.addons.ui_swing.components.SwingSearchBar;
 
 import java.awt.event.ActionEvent;
 

src/com/dmdirc/ui/swing/actions/TextPaneCopyAction.java → src/com/dmdirc/addons/ui_swing/actions/TextPaneCopyAction.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.actions;
+package com.dmdirc.addons.ui_swing.actions;
 
-import com.dmdirc.ui.swing.textpane.TextPane;
+import com.dmdirc.addons.ui_swing.textpane.TextPane;
 
 import java.awt.event.ActionEvent;
 

src/com/dmdirc/ui/swing/actions/UndoAction.java → src/com/dmdirc/addons/ui_swing/actions/UndoAction.java

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

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

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

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

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

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

@@ -20,10 +20,10 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.Main;
-import com.dmdirc.ui.swing.MainFrame;
+import com.dmdirc.addons.ui_swing.MainFrame;
 
 import java.awt.Window;
 import java.awt.event.ActionListener;

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

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

src/com/dmdirc/ui/swing/components/ContainerToggleButton.java → src/com/dmdirc/addons/ui_swing/components/ContainerToggleButton.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import javax.swing.Icon;
 import javax.swing.JToggleButton;

src/com/dmdirc/ui/swing/components/DMDircUndoableEditListener.java → src/com/dmdirc/addons/ui_swing/components/DMDircUndoableEditListener.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import javax.swing.event.UndoableEditEvent;
 import javax.swing.event.UndoableEditListener;

src/com/dmdirc/ui/swing/components/EtchedLineBorder.java → src/com/dmdirc/addons/ui_swing/components/EtchedLineBorder.java

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

src/com/dmdirc/ui/swing/components/ExecutableFileFilter.java → src/com/dmdirc/addons/ui_swing/components/ExecutableFileFilter.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import java.io.File;
 import javax.swing.filechooser.FileFilter;

src/com/dmdirc/ui/swing/components/FeedbackNag.java → src/com/dmdirc/addons/ui_swing/components/FeedbackNag.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.Main;
-import com.dmdirc.ui.swing.SwingController;
-import com.dmdirc.ui.swing.dialogs.FeedbackDialog;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

src/com/dmdirc/ui/swing/components/HTMLLabel.java → src/com/dmdirc/addons/ui_swing/components/HTMLLabel.java

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

src/com/dmdirc/ui/swing/components/ImageButton.java → src/com/dmdirc/addons/ui_swing/components/ImageButton.java

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

src/com/dmdirc/ui/swing/components/ImageToggleButton.java → src/com/dmdirc/addons/ui_swing/components/ImageToggleButton.java

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

src/com/dmdirc/ui/swing/components/InputTextFrame.java → src/com/dmdirc/addons/ui_swing/components/InputTextFrame.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.PopupManager;
@@ -33,12 +33,12 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.InputWindow;
-import com.dmdirc.ui.swing.UIUtilities;
-import com.dmdirc.ui.swing.actions.CopyAction;
-import com.dmdirc.ui.swing.actions.CutAction;
-import com.dmdirc.ui.swing.actions.InputTextFramePasteAction;
-import com.dmdirc.ui.swing.dialogs.paste.PasteDialog;
-import com.dmdirc.ui.swing.actions.CommandAction;
+import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.actions.CopyAction;
+import com.dmdirc.addons.ui_swing.actions.CutAction;
+import com.dmdirc.addons.ui_swing.actions.InputTextFramePasteAction;
+import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialog;
+import com.dmdirc.addons.ui_swing.actions.CommandAction;
 
 import java.awt.BorderLayout;
 import java.awt.Color;

src/com/dmdirc/ui/swing/components/InviteLabel.java → src/com/dmdirc/addons/ui_swing/components/InviteLabel.java

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

src/com/dmdirc/ui/swing/components/ListScroller.java → src/com/dmdirc/addons/ui_swing/components/ListScroller.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;

src/com/dmdirc/ui/swing/components/LoggingSwingWorker.java → src/com/dmdirc/addons/ui_swing/components/LoggingSwingWorker.java

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

src/com/dmdirc/ui/swing/components/MDIBar.java → src/com/dmdirc/addons/ui_swing/components/MDIBar.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.config.ConfigManager;
@@ -31,8 +31,8 @@ import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.ui.interfaces.Window;
-import com.dmdirc.ui.swing.MainFrame;
-import com.dmdirc.ui.swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

src/com/dmdirc/ui/swing/components/MenuBar.java → src/com/dmdirc/addons/ui_swing/components/MenuBar.java

@@ -20,24 +20,24 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 
 import com.dmdirc.Main;
 import com.dmdirc.ServerManager;
 import com.dmdirc.ui.interfaces.Window;
-import com.dmdirc.ui.swing.Apple;
-import com.dmdirc.ui.swing.ChannelFrame;
-import com.dmdirc.ui.swing.MainFrame;
-import com.dmdirc.ui.swing.SwingController;
-import com.dmdirc.ui.swing.dialogs.FeedbackDialog;
-import com.dmdirc.ui.swing.dialogs.NewServerDialog;
-import com.dmdirc.ui.swing.dialogs.about.AboutDialog;
-import com.dmdirc.ui.swing.dialogs.actionsmanager.ActionsManagerDialog;
-import com.dmdirc.ui.swing.dialogs.aliases.AliasManagerDialog;
-import com.dmdirc.ui.swing.dialogs.prefs.SwingPreferencesDialog;
-import com.dmdirc.ui.swing.dialogs.profiles.ProfileManagerDialog;
-import com.dmdirc.ui.swing.framemanager.windowmenu.WindowMenuFrameManager;
+import com.dmdirc.addons.ui_swing.Apple;
+import com.dmdirc.addons.ui_swing.ChannelFrame;
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
+import com.dmdirc.addons.ui_swing.dialogs.NewServerDialog;
+import com.dmdirc.addons.ui_swing.dialogs.about.AboutDialog;
+import com.dmdirc.addons.ui_swing.dialogs.actionsmanager.ActionsManagerDialog;
+import com.dmdirc.addons.ui_swing.dialogs.aliases.AliasManagerDialog;
+import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
+import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
+import com.dmdirc.addons.ui_swing.framemanager.windowmenu.WindowMenuFrameManager;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

src/com/dmdirc/ui/swing/components/NoFocusButton.java → src/com/dmdirc/addons/ui_swing/components/NoFocusButton.java

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

src/com/dmdirc/ui/swing/components/NullBorder.java → src/com/dmdirc/addons/ui_swing/components/NullBorder.java

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

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

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.util.ListenerList;
-import com.dmdirc.ui.swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 
 import java.awt.Color;
 import java.awt.Dimension;

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

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

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.config.ConfigManager;
 
@@ -31,9 +31,9 @@ import java.awt.event.ActionListener;
 
 import javax.swing.JCheckBox;
 import javax.swing.JPanel;
-import com.dmdirc.ui.swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 
-import com.dmdirc.ui.swing.components.validating.ValidatingJTextField;
+import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import net.miginfocom.swing.MigLayout;
 
 /**

src/com/dmdirc/ui/swing/components/SanitisedFilenameFilter.java → src/com/dmdirc/addons/ui_swing/components/SanitisedFilenameFilter.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;

src/com/dmdirc/ui/swing/components/SnappingJSplitPane.java → src/com/dmdirc/addons/ui_swing/components/SnappingJSplitPane.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
-import com.dmdirc.ui.swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import java.awt.Component;
 
 import javax.swing.JSplitPane;

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

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

src/com/dmdirc/ui/swing/components/StandardInputDialog.java → src/com/dmdirc/addons/ui_swing/components/StandardInputDialog.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.config.prefs.validator.ValidationResponse;
-import com.dmdirc.ui.swing.components.validating.ValidatingJTextField;
+import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.config.prefs.validator.Validator;
-import com.dmdirc.ui.swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 
 import java.awt.Component;
 import java.awt.Frame;

src/com/dmdirc/ui/swing/components/SwingInputField.java → src/com/dmdirc/addons/ui_swing/components/SwingInputField.java

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.interfaces.InputField;
 import com.dmdirc.ui.interfaces.InputValidationListener;
-import com.dmdirc.ui.swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.util.ListenerList;
 
 import com.dmdirc.util.ReturnableThread;

src/com/dmdirc/ui/swing/components/SwingInputHandler.java → src/com/dmdirc/addons/ui_swing/components/SwingInputHandler.java

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.InputField;
 import com.dmdirc.ui.interfaces.InputWindow;
-import com.dmdirc.ui.swing.Apple;
-import com.dmdirc.ui.swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.Apple;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;

src/com/dmdirc/ui/swing/components/SwingSearchBar.java → src/com/dmdirc/addons/ui_swing/components/SwingSearchBar.java

@@ -20,19 +20,19 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.Main;
 import com.dmdirc.ui.interfaces.SearchBar;
 import com.dmdirc.ui.messages.ColourManager;
-import com.dmdirc.ui.swing.MainFrame;
-import com.dmdirc.ui.swing.UIUtilities;
-import com.dmdirc.ui.swing.actions.SearchAction;
-import com.dmdirc.ui.swing.textpane.IRCDocument;
-import com.dmdirc.ui.swing.textpane.IRCDocumentSearcher;
-import com.dmdirc.ui.swing.textpane.LinePosition;
-import com.dmdirc.ui.swing.textpane.TextPane;
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.actions.SearchAction;
+import com.dmdirc.addons.ui_swing.textpane.IRCDocument;
+import com.dmdirc.addons.ui_swing.textpane.IRCDocumentSearcher;
+import com.dmdirc.addons.ui_swing.textpane.LinePosition;
+import com.dmdirc.addons.ui_swing.textpane.TextPane;
 
 import com.dmdirc.util.ListenerList;
 import java.awt.event.ActionEvent;

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.config.IdentityManager;
@@ -31,8 +31,8 @@ import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.ProgramError;
 import com.dmdirc.ui.interfaces.StatusBar;
 import com.dmdirc.ui.interfaces.StatusMessageNotifier;
-import com.dmdirc.ui.swing.dialogs.updater.SwingUpdaterDialog;
-import com.dmdirc.ui.swing.dialogs.error.ErrorListDialog;
+import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
+import com.dmdirc.addons.ui_swing.dialogs.error.ErrorListDialog;
 import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.UpdateChecker.STATE;
 

src/com/dmdirc/ui/swing/components/TextAreaInputField.java → src/com/dmdirc/addons/ui_swing/components/TextAreaInputField.java

@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.interfaces.InputField;

src/com/dmdirc/ui/swing/components/TextFrame.java → src/com/dmdirc/addons/ui_swing/components/TextFrame.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
@@ -42,19 +42,19 @@ import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.ui.messages.Styliser;
-import com.dmdirc.ui.swing.MainFrame;
-import com.dmdirc.ui.swing.actions.ChannelCopyAction;
-import com.dmdirc.ui.swing.actions.CommandAction;
-import com.dmdirc.ui.swing.actions.HyperlinkCopyAction;
-import com.dmdirc.ui.swing.actions.NicknameCopyAction;
-import com.dmdirc.ui.swing.actions.SearchAction;
-import com.dmdirc.ui.swing.actions.TextPaneCopyAction;
-import com.dmdirc.ui.swing.textpane.LineInfo;
-import com.dmdirc.ui.swing.textpane.TextPane;
-import com.dmdirc.ui.swing.textpane.TextPane.ClickType;
-import com.dmdirc.ui.swing.textpane.TextPanePageUpAction;
-import com.dmdirc.ui.swing.textpane.TextPanePageDownAction;
-import com.dmdirc.ui.swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.actions.ChannelCopyAction;
+import com.dmdirc.addons.ui_swing.actions.CommandAction;
+import com.dmdirc.addons.ui_swing.actions.HyperlinkCopyAction;
+import com.dmdirc.addons.ui_swing.actions.NicknameCopyAction;
+import com.dmdirc.addons.ui_swing.actions.SearchAction;
+import com.dmdirc.addons.ui_swing.actions.TextPaneCopyAction;
+import com.dmdirc.addons.ui_swing.textpane.LineInfo;
+import com.dmdirc.addons.ui_swing.textpane.TextPane;
+import com.dmdirc.addons.ui_swing.textpane.TextPane.ClickType;
+import com.dmdirc.addons.ui_swing.textpane.TextPanePageUpAction;
+import com.dmdirc.addons.ui_swing.textpane.TextPanePageDownAction;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 
 import com.dmdirc.util.URLHandler;
 import java.awt.Color;

src/com/dmdirc/ui/swing/components/TextLabel.java → src/com/dmdirc/addons/ui_swing/components/TextLabel.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import java.awt.Font;
 import java.awt.Insets;

src/com/dmdirc/ui/swing/components/TreeScroller.java → src/com/dmdirc/addons/ui_swing/components/TreeScroller.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;

src/com/dmdirc/ui/swing/components/URLProtocolPanel.java → src/com/dmdirc/addons/ui_swing/components/URLProtocolPanel.java

@@ -20,10 +20,10 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.swing.dialogs.url.URLSubsitutionsPanel;
+import com.dmdirc.addons.ui_swing.dialogs.url.URLSubsitutionsPanel;
 import com.dmdirc.util.URLHandler;
 
 import java.awt.event.ActionEvent;

src/com/dmdirc/ui/swing/components/desktopPane/DMDircDesktopPane.java → src/com/dmdirc/addons/ui_swing/components/desktopPane/DMDircDesktopPane.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components.desktopPane;
+package com.dmdirc.addons.ui_swing.components.desktopPane;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.SelectionListener;
@@ -29,10 +29,10 @@ import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.ui.interfaces.Window;
-import com.dmdirc.ui.swing.UIUtilities;
-import com.dmdirc.ui.swing.components.TreeScroller;
-import com.dmdirc.ui.swing.framemanager.tree.TreeViewModel;
-import com.dmdirc.ui.swing.framemanager.tree.TreeViewNode;
+import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.TreeScroller;
+import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewModel;
+import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewNode;
 
 import java.awt.Color;
 import java.util.HashMap;

src/com/dmdirc/ui/swing/components/desktopPane/ProxyDesktopPaneUI.java → src/com/dmdirc/addons/ui_swing/components/desktopPane/ProxyDesktopPaneUI.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components.desktopPane;
+package com.dmdirc.addons.ui_swing.components.desktopPane;
 
 import java.awt.event.ActionEvent;
 

src/com/dmdirc/ui/swing/components/durationeditor/DurationDisplay.java → src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationDisplay.java

@@ -20,10 +20,10 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components.durationeditor;
+package com.dmdirc.addons.ui_swing.components.durationeditor;
 
 import com.dmdirc.ui.messages.Formatter;
-import com.dmdirc.ui.swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.util.ListenerList;
 
 import java.awt.Insets;

src/com/dmdirc/ui/swing/components/durationeditor/DurationEditor.java → src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationEditor.java

@@ -20,10 +20,10 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components.durationeditor;
+package com.dmdirc.addons.ui_swing.components.durationeditor;
 
-import com.dmdirc.ui.swing.SwingController;
-import com.dmdirc.ui.swing.components.StandardDialog;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.components.StandardDialog;
 import com.dmdirc.util.ListenerList;
 
 import java.awt.Window;

src/com/dmdirc/ui/swing/components/durationeditor/DurationListener.java → src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationListener.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components.durationeditor;
+package com.dmdirc.addons.ui_swing.components.durationeditor;
 
 /**
  * Duration editor listener interface.

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components.expandingsettings;
+package com.dmdirc.addons.ui_swing.components.expandingsettings;
 
-import com.dmdirc.ui.swing.components.renderers.AddOptionCellRenderer;
-import com.dmdirc.ui.swing.components.ColourChooser;
-import com.dmdirc.ui.swing.components.expandingsettings.SettingsPanel.OptionType;
-import com.dmdirc.ui.swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.renderers.AddOptionCellRenderer;
+import com.dmdirc.addons.ui_swing.components.ColourChooser;
+import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel.OptionType;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 
 import java.awt.Component;
 import java.awt.event.ActionEvent;

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

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components.expandingsettings;
+package com.dmdirc.addons.ui_swing.components.expandingsettings;
 
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.swing.components.ColourChooser;
-import com.dmdirc.ui.swing.components.ImageButton;
-import com.dmdirc.ui.swing.components.expandingsettings.SettingsPanel.OptionType;
-import com.dmdirc.ui.swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.ColourChooser;
+import com.dmdirc.addons.ui_swing.components.ImageButton;
+import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel.OptionType;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

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

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components.expandingsettings;
+package com.dmdirc.addons.ui_swing.components.expandingsettings;
 
 import com.dmdirc.config.Identity;
-import com.dmdirc.ui.swing.components.TextLabel;
-import com.dmdirc.ui.swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

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

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