Centralised interfaces packages.

Depends-On: I862891efc407a64559788812ee039a9ec565a973
Change-Id: If624693f050e1aa9cf4cabcd5264518604eb8bcd
Reviewed-on: http://gerrit.dmdirc.com/2167
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

src/com/dmdirc/Main.java

@@ -38,7 +38,7 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
 import com.dmdirc.plugins.ServiceProvider;
 import com.dmdirc.ui.WarningDialog;
-import com.dmdirc.ui.interfaces.UIController;
+import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.Version;

src/com/dmdirc/WritableFrameContainer.java

@@ -23,7 +23,7 @@
 package com.dmdirc;
 
 import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.messages.MessageSinkManager;

src/com/dmdirc/actions/Action.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.actions;
 
-import com.dmdirc.actions.interfaces.ActionComparison;
-import com.dmdirc.actions.interfaces.ActionComponent;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionComparison;
+import com.dmdirc.interfaces.actions.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;

src/com/dmdirc/actions/ActionComponentChain.java

@@ -23,7 +23,7 @@
 package com.dmdirc.actions;
 
 import com.dmdirc.Precondition;
-import com.dmdirc.actions.interfaces.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionComponent;
 import com.dmdirc.logger.Logger;
 
 import java.util.ArrayList;

src/com/dmdirc/actions/ActionCondition.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.actions;
 
-import com.dmdirc.actions.interfaces.ActionComparison;
-import com.dmdirc.actions.interfaces.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionComparison;
+import com.dmdirc.interfaces.actions.ActionComponent;
 
 /**
  * An action condition represents one condition within an action.

src/com/dmdirc/actions/ActionManager.java

@@ -25,9 +25,9 @@ package com.dmdirc.actions;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.Main;
 import com.dmdirc.Precondition;
-import com.dmdirc.actions.interfaces.ActionComparison;
-import com.dmdirc.actions.interfaces.ActionComponent;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionComparison;
+import com.dmdirc.interfaces.actions.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.actions.internal.WhoisNumericFormatter;
 import com.dmdirc.actions.wrappers.AliasWrapper;
 import com.dmdirc.actions.wrappers.PerformWrapper;

src/com/dmdirc/actions/ActionModel.java

@@ -25,7 +25,7 @@ package com.dmdirc.actions;
 import com.dmdirc.Precondition;
 import com.dmdirc.ServerManager;
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 

src/com/dmdirc/actions/ActionSubstitutor.java

@@ -26,12 +26,12 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Precondition;
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
-import com.dmdirc.actions.interfaces.ActionComponent;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.interfaces.ui.Window;
 
 import java.util.Arrays;
 import java.util.HashMap;

src/com/dmdirc/actions/ActionTypeComparator.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.actions;
 
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 
 import java.io.Serializable;
 import java.util.Comparator;

src/com/dmdirc/actions/CoreActionComparison.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.actions;
 
-import com.dmdirc.actions.interfaces.ActionComparison;
+import com.dmdirc.interfaces.actions.ActionComparison;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Color;

src/com/dmdirc/actions/CoreActionComponent.java

@@ -26,13 +26,13 @@ import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
-import com.dmdirc.actions.interfaces.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionComponent;
 import com.dmdirc.config.Identity;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.ui.messages.Styliser;
 
 import java.awt.Color;

src/com/dmdirc/actions/CoreActionType.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.actions;
 
-import com.dmdirc.actions.interfaces.ActionMetaType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionMetaType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.actions.metatypes.ActionEvents;
 import com.dmdirc.actions.metatypes.ChannelEvents;
 import com.dmdirc.actions.metatypes.ClientEvents;

src/com/dmdirc/actions/internal/WhoisNumericFormatter.java

@@ -25,7 +25,7 @@ package com.dmdirc.actions.internal;
 import com.dmdirc.Server;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.config.Identity;
 import com.dmdirc.interfaces.ActionListener;
 

src/com/dmdirc/actions/metatypes/ActionEvents.java

@@ -23,7 +23,7 @@
 package com.dmdirc.actions.metatypes;
 
 import com.dmdirc.actions.Action;
-import com.dmdirc.actions.interfaces.ActionMetaType;
+import com.dmdirc.interfaces.actions.ActionMetaType;
 
 /**
  * Defines action-related events.

src/com/dmdirc/actions/metatypes/ChannelEvents.java

@@ -24,7 +24,7 @@ package com.dmdirc.actions.metatypes;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Topic;
-import com.dmdirc.actions.interfaces.ActionMetaType;
+import com.dmdirc.interfaces.actions.ActionMetaType;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 
 /**

src/com/dmdirc/actions/metatypes/ClientEvents.java

@@ -23,7 +23,7 @@
 package com.dmdirc.actions.metatypes;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.actions.interfaces.ActionMetaType;
+import com.dmdirc.interfaces.actions.ActionMetaType;
 import com.dmdirc.commandparser.PopupMenu;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.config.ConfigManager;

src/com/dmdirc/actions/metatypes/LinkEvents.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.actions.metatypes;
 
-import com.dmdirc.actions.interfaces.ActionMetaType;
-import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.interfaces.actions.ActionMetaType;
+import com.dmdirc.interfaces.ui.Window;
 
 /**
  * Defines link-related events.

src/com/dmdirc/actions/metatypes/PluginEvents.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.actions.metatypes;
 
-import com.dmdirc.actions.interfaces.ActionMetaType;
+import com.dmdirc.interfaces.actions.ActionMetaType;
 import com.dmdirc.plugins.PluginInfo;
 
 /**

src/com/dmdirc/actions/metatypes/QueryEvents.java

@@ -23,7 +23,7 @@
 package com.dmdirc.actions.metatypes;
 
 import com.dmdirc.Query;
-import com.dmdirc.actions.interfaces.ActionMetaType;
+import com.dmdirc.interfaces.actions.ActionMetaType;
 import com.dmdirc.parser.interfaces.ClientInfo;
 
 /**

src/com/dmdirc/actions/metatypes/ServerEvents.java

@@ -23,7 +23,7 @@
 package com.dmdirc.actions.metatypes;
 
 import com.dmdirc.Server;
-import com.dmdirc.actions.interfaces.ActionMetaType;
+import com.dmdirc.interfaces.actions.ActionMetaType;
 import com.dmdirc.parser.interfaces.ClientInfo;
 
 /**

src/com/dmdirc/actions/wrappers/Alias.java

@@ -27,7 +27,7 @@ import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.CoreActionComparison;
 import com.dmdirc.actions.CoreActionComponent;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 
 import java.io.Serializable;
 import java.util.ArrayList;

src/com/dmdirc/actions/wrappers/PerformWrapper.java

@@ -30,8 +30,8 @@ import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.actions.CoreActionComparison;
 import com.dmdirc.actions.CoreActionComponent;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionComponent;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 

src/com/dmdirc/commandparser/commands/server/JoinChannelCommand.java

@@ -26,7 +26,7 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;

src/com/dmdirc/interfaces/ActionController.java

@@ -25,9 +25,9 @@ package com.dmdirc.interfaces;
 import com.dmdirc.Precondition;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionGroup;
-import com.dmdirc.actions.interfaces.ActionComparison;
-import com.dmdirc.actions.interfaces.ActionComponent;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionComparison;
+import com.dmdirc.interfaces.actions.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.util.MapList;
 
 import java.util.List;

src/com/dmdirc/interfaces/ActionListener.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.interfaces;
 
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 
 /**
  * Defines the method that has to be implemented by classes wanting to receive

src/com/dmdirc/actions/interfaces/ActionComparison.java → src/com/dmdirc/interfaces/actions/ActionComparison.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.actions.interfaces;
+package com.dmdirc.interfaces.actions;
 
 /**
  * Describes the methods that must be implemented by an action comparison.

src/com/dmdirc/actions/interfaces/ActionComponent.java → src/com/dmdirc/interfaces/actions/ActionComponent.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.actions.interfaces;
+package com.dmdirc.interfaces.actions;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/com/dmdirc/actions/interfaces/ActionMetaType.java → src/com/dmdirc/interfaces/actions/ActionMetaType.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.actions.interfaces;
+package com.dmdirc.interfaces.actions;
 
 /**
  * Encapsulates the methods that all action types are required to implement.

src/com/dmdirc/actions/interfaces/ActionType.java → src/com/dmdirc/interfaces/actions/ActionType.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.actions.interfaces;
+package com.dmdirc.interfaces.actions;
 
 /**
  * Encapsulates the methods that all actions are required to implement.

src/com/dmdirc/ui/interfaces/FirstRunWizard.java → src/com/dmdirc/interfaces/ui/FirstRunWizard.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.interfaces;
+package com.dmdirc.interfaces.ui;
 
 /** First run wizard interface. */
 public interface FirstRunWizard {

src/com/dmdirc/ui/interfaces/FrameListener.java → src/com/dmdirc/interfaces/ui/FrameListener.java

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

src/com/dmdirc/ui/interfaces/InputField.java → src/com/dmdirc/interfaces/ui/InputField.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.interfaces;
+package com.dmdirc.interfaces.ui;
 
 import java.awt.event.ActionListener;
 import java.awt.event.KeyListener;

src/com/dmdirc/ui/interfaces/InputValidationListener.java → src/com/dmdirc/interfaces/ui/InputValidationListener.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.interfaces;
+package com.dmdirc.interfaces.ui;
 
 /**
  * Defines methods that need to be implemented by validation listeners.

src/com/dmdirc/ui/interfaces/InputWindow.java → src/com/dmdirc/interfaces/ui/InputWindow.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.interfaces;
+package com.dmdirc.interfaces.ui;
 
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.ui.input.InputHandler;

src/com/dmdirc/ui/interfaces/SearchBar.java → src/com/dmdirc/interfaces/ui/SearchBar.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.interfaces;
+package com.dmdirc.interfaces.ui;
 
 /**
  * Search bar interface.

src/com/dmdirc/ui/interfaces/StatusBar.java → src/com/dmdirc/interfaces/ui/StatusBar.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.interfaces;
+package com.dmdirc.interfaces.ui;
 
 import com.dmdirc.ui.StatusMessage;
 

src/com/dmdirc/ui/interfaces/StatusBarComponent.java → src/com/dmdirc/interfaces/ui/StatusBarComponent.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.interfaces;
+package com.dmdirc.interfaces.ui;
 
 /**
  * Statusbar component interface

src/com/dmdirc/ui/interfaces/StatusMessageNotifier.java → src/com/dmdirc/interfaces/ui/StatusMessageNotifier.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.interfaces;
+package com.dmdirc.interfaces.ui;
 
 /**
  * Methods required to be implemented by classes wanting to respond to statusbar

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

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

src/com/dmdirc/ui/interfaces/Window.java → src/com/dmdirc/interfaces/ui/Window.java

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

src/com/dmdirc/ui/interfaces/package-info.java → src/com/dmdirc/interfaces/ui/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Interfaces associated with UI components.
  */
-package com.dmdirc.ui.interfaces;
+package com.dmdirc.interfaces.ui;

src/com/dmdirc/plugins/PluginManager.java

@@ -25,7 +25,7 @@ package com.dmdirc.plugins;
 import com.dmdirc.Main;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.interfaces.ActionListener;

src/com/dmdirc/ui/StatusMessage.java

@@ -23,7 +23,7 @@
 package com.dmdirc.ui;
 
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.ui.interfaces.StatusMessageNotifier;
+import com.dmdirc.interfaces.ui.StatusMessageNotifier;
 
 /**
  * Describes a status bar message to be presented to a user.

src/com/dmdirc/ui/WindowManager.java

@@ -27,7 +27,7 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Precondition;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.interfaces.FrameListener;
+import com.dmdirc.interfaces.ui.FrameListener;
 import com.dmdirc.util.ListenerList;
 
 import java.util.Collection;

src/com/dmdirc/ui/core/components/StatusBarManager.java

@@ -23,8 +23,8 @@
 package com.dmdirc.ui.core.components;
 
 import com.dmdirc.ui.StatusMessage;
-import com.dmdirc.ui.interfaces.StatusBar;
-import com.dmdirc.ui.interfaces.StatusBarComponent;
+import com.dmdirc.interfaces.ui.StatusBar;
+import com.dmdirc.interfaces.ui.StatusBarComponent;
 
 import java.util.Collection;
 import java.util.concurrent.CopyOnWriteArraySet;

src/com/dmdirc/ui/core/util/URLHandler.java

@@ -29,7 +29,7 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.ui.core.components.StatusBarManager;
-import com.dmdirc.ui.interfaces.UIController;
+import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.util.CommandUtils;
 
 import java.awt.Desktop;

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

@@ -37,8 +37,8 @@ import com.dmdirc.parser.common.CompositionState;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.tabstyles.TabCompletionResult;
 import com.dmdirc.ui.input.tabstyles.TabCompletionStyle;
-import com.dmdirc.ui.interfaces.InputField;
-import com.dmdirc.ui.interfaces.InputValidationListener;
+import com.dmdirc.interfaces.ui.InputField;
+import com.dmdirc.interfaces.ui.InputValidationListener;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.ListenerList;
 import com.dmdirc.util.RollingList;

test/com/dmdirc/WritableFrameContainerTest.java

@@ -25,7 +25,7 @@ package com.dmdirc;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.harness.TestWritableFrameContainer;
-import com.dmdirc.ui.interfaces.InputWindow;
+import com.dmdirc.interfaces.ui.InputWindow;
 
 import java.util.Arrays;
 import org.junit.BeforeClass;

test/com/dmdirc/actions/ActionComparisonNamesTest.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.actions;
 
-import com.dmdirc.actions.interfaces.ActionComparison;
+import com.dmdirc.interfaces.actions.ActionComparison;
 import java.util.LinkedList;
 import java.util.List;
 import org.junit.Test;
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
 
 @RunWith(Parameterized.class)
 public class ActionComparisonNamesTest {
-    
+
     private ActionComparison comparison;
 
     public ActionComparisonNamesTest(final ActionComparison comparison) {
@@ -49,11 +49,11 @@ public class ActionComparisonNamesTest {
     @Parameterized.Parameters
     public static List<Object[]> data() {
         final List<Object[]> res = new LinkedList<Object[]>();
-        
+
         for (ActionComparison comp : CoreActionComparison.values()) {
             res.add(new Object[]{comp});
         }
-        
+
         return res;
     }
 

test/com/dmdirc/actions/ActionManagerTest.java

@@ -21,7 +21,7 @@
  */
 package com.dmdirc.actions;
 
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.config.IdentityManager;
 import java.io.File;
 

test/com/dmdirc/actions/ActionModelTest.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.actions;
 
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 
@@ -149,7 +149,7 @@ public class ActionModelTest {
         assertFalse("test must fail if all conditions fail",
                 model.test(sub, null, null, "abeeef"));
     }
-    
+
     @Test
     public void testTestNoCondTree() {
         final ActionModel model = new ActionModel("group", "name",

test/com/dmdirc/actions/ActionTest.java

@@ -21,7 +21,7 @@
  */
 package com.dmdirc.actions;
 
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PreferencesSetting;

test/com/dmdirc/actions/metatypes/ActionEventsTest.java

@@ -21,7 +21,7 @@
  */
 package com.dmdirc.actions.metatypes;
 
-import com.dmdirc.actions.interfaces.ActionMetaType;
+import com.dmdirc.interfaces.actions.ActionMetaType;
 import org.junit.Test;
 import static org.junit.Assert.*;
 

test/com/dmdirc/actions/metatypes/LinkEventsTest.java

@@ -21,7 +21,7 @@
  */
 package com.dmdirc.actions.metatypes;
 
-import com.dmdirc.actions.interfaces.ActionMetaType;
+import com.dmdirc.interfaces.actions.ActionMetaType;
 import org.junit.Test;
 import static org.junit.Assert.*;
 

test/com/dmdirc/actions/wrappers/AliasWrapperTest.java

@@ -27,7 +27,7 @@ import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.CoreActionComparison;
 import com.dmdirc.actions.CoreActionComponent;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 

test/com/dmdirc/config/prefs/PreferencesManagerTest.java

@@ -28,7 +28,7 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ActionListener;
 
 import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.ui.interfaces.UIController;
+import com.dmdirc.interfaces.ui.UIController;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -28,7 +28,7 @@ import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.input.TabCompleter;
-import com.dmdirc.ui.interfaces.InputWindow;
+import com.dmdirc.interfaces.ui.InputWindow;
 import java.util.Collections;
 
 public class TestWritableFrameContainer extends WritableFrameContainer {

test/com/dmdirc/ui/WindowManagerTest.java

@@ -26,8 +26,8 @@ import com.dmdirc.harness.TestWritableFrameContainer;
 import com.dmdirc.addons.ui_dummy.DummyInputWindow;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
-import com.dmdirc.ui.interfaces.FrameListener;
-import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.interfaces.ui.FrameListener;
+import com.dmdirc.interfaces.ui.Window;
 
 import org.junit.BeforeClass;
 import org.junit.Test;