Browse Source

Move interfaces to a central location.

Depends-On: If624693f050e1aa9cf4cabcd5264518604eb8bcd
Change-Id: I862891efc407a64559788812ee039a9ec565a973
Reviewed-on: http://gerrit.dmdirc.com/2166
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
tags/0.7rc1
Greg Holmes 12 years ago
parent
commit
41c77ef7ed
84 changed files with 113 additions and 113 deletions
  1. 1
    1
      src/com/dmdirc/addons/contactlist/ContactListListener.java
  2. 1
    1
      src/com/dmdirc/addons/dcc/DCCPlugin.java
  3. 2
    2
      src/com/dmdirc/addons/dcc/actions/DCCActions.java
  4. 1
    1
      src/com/dmdirc/addons/dcc/actions/DCCEvents.java
  5. 1
    1
      src/com/dmdirc/addons/identd/IdentdPlugin.java
  6. 1
    1
      src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java
  7. 1
    1
      src/com/dmdirc/addons/logging/LoggingPlugin.java
  8. 1
    1
      src/com/dmdirc/addons/nickcolours/NickColourPlugin.java
  9. 1
    1
      src/com/dmdirc/addons/notifications/NotificationsPlugin.java
  10. 1
    1
      src/com/dmdirc/addons/nowplaying/NowPlayingPlugin.java
  11. 1
    1
      src/com/dmdirc/addons/parser_twitter/actions/TwitterActionComponents.java
  12. 1
    1
      src/com/dmdirc/addons/parserdebug/DebugPlugin.java
  13. 1
    1
      src/com/dmdirc/addons/relaybot/RelayBotPlugin.java
  14. 1
    1
      src/com/dmdirc/addons/scriptplugin/ScriptPlugin.java
  15. 1
    1
      src/com/dmdirc/addons/systray/SystrayPlugin.java
  16. 1
    1
      src/com/dmdirc/addons/time/TimeActionMetaType.java
  17. 2
    2
      src/com/dmdirc/addons/time/TimeActionType.java
  18. 2
    2
      src/com/dmdirc/addons/ui_dummy/DummyController.java
  19. 1
    1
      src/com/dmdirc/addons/ui_dummy/DummyInputField.java
  20. 1
    1
      src/com/dmdirc/addons/ui_dummy/DummyInputHandler.java
  21. 2
    2
      src/com/dmdirc/addons/ui_dummy/DummyInputWindow.java
  22. 2
    2
      src/com/dmdirc/addons/ui_dummy/DummyStatusBar.java
  23. 1
    1
      src/com/dmdirc/addons/ui_swing/Apple.java
  24. 3
    3
      src/com/dmdirc/addons/ui_swing/SwingController.java
  25. 2
    2
      src/com/dmdirc/addons/ui_swing/SwingWindowFactory.java
  26. 1
    1
      src/com/dmdirc/addons/ui_swing/actions/CommandAction.java
  27. 1
    1
      src/com/dmdirc/addons/ui_swing/commands/Input.java
  28. 2
    2
      src/com/dmdirc/addons/ui_swing/components/SwingSearchBar.java
  29. 1
    1
      src/com/dmdirc/addons/ui_swing/components/addonpanel/PluginPanel.java
  30. 2
    2
      src/com/dmdirc/addons/ui_swing/components/frames/ChannelFrame.java
  31. 1
    1
      src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java
  32. 2
    2
      src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java
  33. 2
    2
      src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputField.java
  34. 1
    1
      src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputHandler.java
  35. 1
    1
      src/com/dmdirc/addons/ui_swing/components/inputfields/TextAreaInputField.java
  36. 1
    1
      src/com/dmdirc/addons/ui_swing/components/inputfields/TextFieldInputField.java
  37. 1
    1
      src/com/dmdirc/addons/ui_swing/components/inputfields/TextPaneInputField.java
  38. 1
    1
      src/com/dmdirc/addons/ui_swing/components/inputfields/ValidatingTextFieldInputField.java
  39. 3
    3
      src/com/dmdirc/addons/ui_swing/components/renderers/ActionCellRenderer.java
  40. 1
    1
      src/com/dmdirc/addons/ui_swing/components/renderers/ActionComparisonCellRenderer.java
  41. 1
    1
      src/com/dmdirc/addons/ui_swing/components/renderers/ActionTypeRenderer.java
  42. 1
    1
      src/com/dmdirc/addons/ui_swing/components/renderers/ActionTypeTableCellRenderer.java
  43. 1
    1
      src/com/dmdirc/addons/ui_swing/components/statusbar/FeedbackNag.java
  44. 2
    2
      src/com/dmdirc/addons/ui_swing/components/statusbar/InviteLabel.java
  45. 1
    1
      src/com/dmdirc/addons/ui_swing/components/statusbar/MessageLabel.java
  46. 1
    1
      src/com/dmdirc/addons/ui_swing/components/statusbar/StatusbarPanel.java
  47. 2
    2
      src/com/dmdirc/addons/ui_swing/components/statusbar/SwingStatusBar.java
  48. 1
    1
      src/com/dmdirc/addons/ui_swing/components/statusbar/UpdaterLabel.java
  49. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionDisplayPanel.java
  50. 3
    3
      src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionEditorPanel.java
  51. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionsListPanel.java
  52. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionsPanel.java
  53. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionSubstitutionsPanel.java
  54. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggerRemovalListener.java
  55. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggersListPanel.java
  56. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggersPanel.java
  57. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTypeModel.java
  58. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionTableModel.java
  59. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsManagerDialog.java
  60. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasSubstitutionsPanel.java
  61. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java
  62. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java
  63. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicPane.java
  64. 1
    1
      src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonBar.java
  65. 1
    1
      src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/FrameToggleButton.java
  66. 1
    1
      src/com/dmdirc/addons/ui_swing/framemanager/ctrltab/CtrlTabWindowManager.java
  67. 1
    1
      src/com/dmdirc/addons/ui_swing/textpane/TextPane.java
  68. 2
    2
      src/com/dmdirc/addons/ui_swing/wizard/firstrun/SwingFirstRunWizard.java
  69. 1
    1
      src/com/dmdirc/addons/ui_web/Client.java
  70. 1
    1
      src/com/dmdirc/addons/ui_web/WebInterfacePlugin.java
  71. 2
    2
      src/com/dmdirc/addons/ui_web/WebInterfaceUI.java
  72. 2
    2
      src/com/dmdirc/addons/ui_web/WebWindowManager.java
  73. 1
    1
      src/com/dmdirc/addons/ui_web/uicomponents/WebInputField.java
  74. 1
    1
      src/com/dmdirc/addons/ui_web/uicomponents/WebInputHandler.java
  75. 1
    1
      src/com/dmdirc/addons/ui_web/uicomponents/WebInputWindow.java
  76. 2
    2
      src/com/dmdirc/addons/ui_web/uicomponents/WebStatusBar.java
  77. 2
    2
      src/com/dmdirc/addons/ui_web/uicomponents/WebWindow.java
  78. 1
    1
      src/com/dmdirc/addons/urlcatcher/UrlCatcherPlugin.java
  79. 1
    1
      src/com/dmdirc/addons/userlevel/AccessLevelComponent.java
  80. 1
    1
      src/com/dmdirc/addons/userlevel/ChannelAccessLevelComponent.java
  81. 2
    2
      src/com/dmdirc/addons/userlevel/UserLevelPlugin.java
  82. 1
    1
      src/com/dmdirc/addons/windowstatus/WindowStatusPanel.java
  83. 1
    1
      test/com/dmdirc/addons/redirect/RedirectCommandTest.java
  84. 6
    6
      test/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsGroupPanelTest.java

+ 1
- 1
src/com/dmdirc/addons/contactlist/ContactListListener.java View File

@@ -27,7 +27,7 @@ import com.dmdirc.FrameContainer;
27 27
 import com.dmdirc.Query;
28 28
 import com.dmdirc.actions.ActionManager;
29 29
 import com.dmdirc.actions.CoreActionType;
30
-import com.dmdirc.actions.interfaces.ActionType;
30
+import com.dmdirc.interfaces.actions.ActionType;
31 31
 import com.dmdirc.interfaces.ActionListener;
32 32
 import com.dmdirc.interfaces.FrameCloseListener;
33 33
 import com.dmdirc.interfaces.NicklistListener;

+ 1
- 1
src/com/dmdirc/addons/dcc/DCCPlugin.java View File

@@ -26,7 +26,7 @@ import com.dmdirc.Main;
26 26
 import com.dmdirc.Server;
27 27
 import com.dmdirc.actions.ActionManager;
28 28
 import com.dmdirc.actions.CoreActionType;
29
-import com.dmdirc.actions.interfaces.ActionType;
29
+import com.dmdirc.interfaces.actions.ActionType;
30 30
 import com.dmdirc.addons.dcc.actions.DCCActions;
31 31
 import com.dmdirc.addons.dcc.io.DCC;
32 32
 import com.dmdirc.addons.dcc.io.DCCChat;

+ 2
- 2
src/com/dmdirc/addons/dcc/actions/DCCActions.java View File

@@ -22,8 +22,8 @@
22 22
 
23 23
 package com.dmdirc.addons.dcc.actions;
24 24
 
25
-import com.dmdirc.actions.interfaces.ActionMetaType;
26
-import com.dmdirc.actions.interfaces.ActionType;
25
+import com.dmdirc.interfaces.actions.ActionMetaType;
26
+import com.dmdirc.interfaces.actions.ActionType;
27 27
 
28 28
 /**
29 29
  * DCC actions.

+ 1
- 1
src/com/dmdirc/addons/dcc/actions/DCCEvents.java View File

@@ -23,7 +23,7 @@
23 23
 package com.dmdirc.addons.dcc.actions;
24 24
 
25 25
 import com.dmdirc.Server;
26
-import com.dmdirc.actions.interfaces.ActionMetaType;
26
+import com.dmdirc.interfaces.actions.ActionMetaType;
27 27
 
28 28
 import com.dmdirc.addons.dcc.ChatContainer;
29 29
 import com.dmdirc.addons.dcc.TransferContainer;

+ 1
- 1
src/com/dmdirc/addons/identd/IdentdPlugin.java View File

@@ -24,7 +24,7 @@ package com.dmdirc.addons.identd;
24 24
 
25 25
 import com.dmdirc.Server;
26 26
 import com.dmdirc.actions.CoreActionType;
27
-import com.dmdirc.actions.interfaces.ActionType;
27
+import com.dmdirc.interfaces.actions.ActionType;
28 28
 import com.dmdirc.config.IdentityManager;
29 29
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
30 30
 import com.dmdirc.config.prefs.PreferencesCategory;

+ 1
- 1
src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java View File

@@ -27,7 +27,7 @@ import com.dmdirc.Server;
27 27
 import com.dmdirc.ServerState;
28 28
 import com.dmdirc.actions.ActionManager;
29 29
 import com.dmdirc.actions.CoreActionType;
30
-import com.dmdirc.actions.interfaces.ActionType;
30
+import com.dmdirc.interfaces.actions.ActionType;
31 31
 import com.dmdirc.addons.ui_swing.SelectionListener;
32 32
 import com.dmdirc.addons.ui_swing.SwingController;
33 33
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;

+ 1
- 1
src/com/dmdirc/addons/logging/LoggingPlugin.java View File

@@ -28,7 +28,7 @@ import com.dmdirc.Main;
28 28
 import com.dmdirc.Query;
29 29
 import com.dmdirc.Server;
30 30
 import com.dmdirc.actions.CoreActionType;
31
-import com.dmdirc.actions.interfaces.ActionType;
31
+import com.dmdirc.interfaces.actions.ActionType;
32 32
 import com.dmdirc.config.IdentityManager;
33 33
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
34 34
 import com.dmdirc.config.prefs.PreferencesCategory;

+ 1
- 1
src/com/dmdirc/addons/nickcolours/NickColourPlugin.java View File

@@ -26,7 +26,7 @@ import com.dmdirc.Channel;
26 26
 import com.dmdirc.ChannelClientProperty;
27 27
 import com.dmdirc.actions.ActionManager;
28 28
 import com.dmdirc.actions.CoreActionType;
29
-import com.dmdirc.actions.interfaces.ActionType;
29
+import com.dmdirc.interfaces.actions.ActionType;
30 30
 import com.dmdirc.addons.ui_swing.SwingController;
31 31
 import com.dmdirc.addons.ui_swing.UIUtilities;
32 32
 import com.dmdirc.config.IdentityManager;

+ 1
- 1
src/com/dmdirc/addons/notifications/NotificationsPlugin.java View File

@@ -23,7 +23,7 @@ package com.dmdirc.addons.notifications;
23 23
 
24 24
 import com.dmdirc.actions.ActionManager;
25 25
 import com.dmdirc.actions.CoreActionType;
26
-import com.dmdirc.actions.interfaces.ActionType;
26
+import com.dmdirc.interfaces.actions.ActionType;
27 27
 import com.dmdirc.addons.ui_swing.UIUtilities;
28 28
 import com.dmdirc.config.IdentityManager;
29 29
 import com.dmdirc.config.prefs.PluginPreferencesCategory;

+ 1
- 1
src/com/dmdirc/addons/nowplaying/NowPlayingPlugin.java View File

@@ -23,7 +23,7 @@
23 23
 package com.dmdirc.addons.nowplaying;
24 24
 
25 25
 import com.dmdirc.actions.CoreActionType;
26
-import com.dmdirc.actions.interfaces.ActionType;
26
+import com.dmdirc.interfaces.actions.ActionType;
27 27
 import com.dmdirc.addons.ui_swing.UIUtilities;
28 28
 import com.dmdirc.config.IdentityManager;
29 29
 import com.dmdirc.config.prefs.PluginPreferencesCategory;

+ 1
- 1
src/com/dmdirc/addons/parser_twitter/actions/TwitterActionComponents.java View File

@@ -24,7 +24,7 @@ package com.dmdirc.addons.parser_twitter.actions;
24 24
 
25 25
 import com.dmdirc.Server;
26 26
 import com.dmdirc.ServerManager;
27
-import com.dmdirc.actions.interfaces.ActionComponent;
27
+import com.dmdirc.interfaces.actions.ActionComponent;
28 28
 import com.dmdirc.addons.parser_twitter.Twitter;
29 29
 import com.dmdirc.addons.parser_twitter.api.TwitterStatus;
30 30
 import com.dmdirc.addons.parser_twitter.api.TwitterUser;

+ 1
- 1
src/com/dmdirc/addons/parserdebug/DebugPlugin.java View File

@@ -24,9 +24,9 @@ package com.dmdirc.addons.parserdebug;
24 24
 
25 25
 import com.dmdirc.Server;
26 26
 import com.dmdirc.actions.CoreActionType;
27
-import com.dmdirc.actions.interfaces.ActionType;
28 27
 import com.dmdirc.interfaces.ActionController;
29 28
 import com.dmdirc.interfaces.ActionListener;
29
+import com.dmdirc.interfaces.actions.ActionType;
30 30
 import com.dmdirc.parser.interfaces.Parser;
31 31
 import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
32 32
 import com.dmdirc.plugins.BasePlugin;

+ 1
- 1
src/com/dmdirc/addons/relaybot/RelayBotPlugin.java View File

@@ -27,7 +27,7 @@ import com.dmdirc.Server;
27 27
 import com.dmdirc.ServerManager;
28 28
 import com.dmdirc.actions.ActionManager;
29 29
 import com.dmdirc.actions.CoreActionType;
30
-import com.dmdirc.actions.interfaces.ActionType;
30
+import com.dmdirc.interfaces.actions.ActionType;
31 31
 import com.dmdirc.addons.ui_swing.UIUtilities;
32 32
 import com.dmdirc.config.IdentityManager;
33 33
 import com.dmdirc.config.prefs.PluginPreferencesCategory;

+ 1
- 1
src/com/dmdirc/addons/scriptplugin/ScriptPlugin.java View File

@@ -24,9 +24,9 @@ package com.dmdirc.addons.scriptplugin;
24 24
 
25 25
 import com.dmdirc.Main;
26 26
 import com.dmdirc.actions.CoreActionType;
27
-import com.dmdirc.actions.interfaces.ActionType;
28 27
 import com.dmdirc.interfaces.ActionController;
29 28
 import com.dmdirc.interfaces.ActionListener;
29
+import com.dmdirc.interfaces.actions.ActionType;
30 30
 import com.dmdirc.logger.ErrorLevel;
31 31
 import com.dmdirc.logger.Logger;
32 32
 import com.dmdirc.plugins.BasePlugin;

+ 1
- 1
src/com/dmdirc/addons/systray/SystrayPlugin.java View File

@@ -23,7 +23,7 @@
23 23
 package com.dmdirc.addons.systray;
24 24
 
25 25
 import com.dmdirc.actions.CoreActionType;
26
-import com.dmdirc.actions.interfaces.ActionType;
26
+import com.dmdirc.interfaces.actions.ActionType;
27 27
 import com.dmdirc.addons.ui_swing.MainFrame;
28 28
 import com.dmdirc.addons.ui_swing.SwingController;
29 29
 import com.dmdirc.config.IdentityManager;

+ 1
- 1
src/com/dmdirc/addons/time/TimeActionMetaType.java View File

@@ -22,7 +22,7 @@
22 22
 
23 23
 package com.dmdirc.addons.time;
24 24
 
25
-import com.dmdirc.actions.interfaces.ActionMetaType;
25
+import com.dmdirc.interfaces.actions.ActionMetaType;
26 26
 
27 27
 import java.util.Calendar;
28 28
 

+ 2
- 2
src/com/dmdirc/addons/time/TimeActionType.java View File

@@ -22,8 +22,8 @@
22 22
 
23 23
 package com.dmdirc.addons.time;
24 24
 
25
-import com.dmdirc.actions.interfaces.ActionMetaType;
26
-import com.dmdirc.actions.interfaces.ActionType;
25
+import com.dmdirc.interfaces.actions.ActionMetaType;
26
+import com.dmdirc.interfaces.actions.ActionType;
27 27
 
28 28
 /**
29 29
  * Lists the actions that the time plugin will raise.

+ 2
- 2
src/com/dmdirc/addons/ui_dummy/DummyController.java View File

@@ -27,8 +27,8 @@ import com.dmdirc.FrameContainer;
27 27
 import com.dmdirc.Server;
28 28
 import com.dmdirc.plugins.BasePlugin;
29 29
 import com.dmdirc.ui.core.components.StatusBarManager;
30
-import com.dmdirc.ui.interfaces.UIController;
31
-import com.dmdirc.ui.interfaces.Window;
30
+import com.dmdirc.interfaces.ui.UIController;
31
+import com.dmdirc.interfaces.ui.Window;
32 32
 
33 33
 import java.net.URI;
34 34
 

+ 1
- 1
src/com/dmdirc/addons/ui_dummy/DummyInputField.java View File

@@ -22,7 +22,7 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_dummy;
24 24
 
25
-import com.dmdirc.ui.interfaces.InputField;
25
+import com.dmdirc.interfaces.ui.InputField;
26 26
 
27 27
 import java.awt.event.ActionListener;
28 28
 import java.awt.event.KeyListener;

+ 1
- 1
src/com/dmdirc/addons/ui_dummy/DummyInputHandler.java View File

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_dummy;
25 25
 import com.dmdirc.WritableFrameContainer;
26 26
 import com.dmdirc.commandparser.parsers.CommandParser;
27 27
 import com.dmdirc.ui.input.InputHandler;
28
-import com.dmdirc.ui.interfaces.InputField;
28
+import com.dmdirc.interfaces.ui.InputField;
29 29
 
30 30
 /**
31 31
  * Dummy input handler.

+ 2
- 2
src/com/dmdirc/addons/ui_dummy/DummyInputWindow.java View File

@@ -24,8 +24,8 @@ package com.dmdirc.addons.ui_dummy;
24 24
 
25 25
 import com.dmdirc.WritableFrameContainer;
26 26
 import com.dmdirc.ui.input.InputHandler;
27
-import com.dmdirc.ui.interfaces.InputWindow;
28
-import com.dmdirc.ui.interfaces.UIController;
27
+import com.dmdirc.interfaces.ui.InputWindow;
28
+import com.dmdirc.interfaces.ui.UIController;
29 29
 
30 30
 /**
31 31
  * Dummy input window, used for testing.

+ 2
- 2
src/com/dmdirc/addons/ui_dummy/DummyStatusBar.java View File

@@ -23,8 +23,8 @@
23 23
 package com.dmdirc.addons.ui_dummy;
24 24
 
25 25
 import com.dmdirc.ui.StatusMessage;
26
-import com.dmdirc.ui.interfaces.StatusBar;
27
-import com.dmdirc.ui.interfaces.StatusBarComponent;
26
+import com.dmdirc.interfaces.ui.StatusBar;
27
+import com.dmdirc.interfaces.ui.StatusBarComponent;
28 28
 
29 29
 /**
30 30
  * Dummy status bar, used for testing.

+ 1
- 1
src/com/dmdirc/addons/ui_swing/Apple.java View File

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing;
25 25
 import com.dmdirc.ServerManager;
26 26
 import com.dmdirc.actions.ActionManager;
27 27
 import com.dmdirc.actions.CoreActionType;
28
-import com.dmdirc.actions.interfaces.ActionType;
28
+import com.dmdirc.interfaces.actions.ActionType;
29 29
 import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
30 30
 import com.dmdirc.commandparser.commands.global.NewServer;
31 31
 import com.dmdirc.config.IdentityManager;

+ 3
- 3
src/com/dmdirc/addons/ui_swing/SwingController.java View File

@@ -52,9 +52,9 @@ import com.dmdirc.plugins.PluginInfo;
52 52
 import com.dmdirc.ui.WindowManager;
53 53
 import com.dmdirc.ui.core.components.StatusBarManager;
54 54
 import com.dmdirc.ui.core.util.URLHandler;
55
-import com.dmdirc.ui.interfaces.InputWindow;
56
-import com.dmdirc.ui.interfaces.UIController;
57
-import com.dmdirc.ui.interfaces.Window;
55
+import com.dmdirc.interfaces.ui.InputWindow;
56
+import com.dmdirc.interfaces.ui.UIController;
57
+import com.dmdirc.interfaces.ui.Window;
58 58
 import com.dmdirc.updater.Version;
59 59
 import com.dmdirc.util.ReturnableThread;
60 60
 import com.dmdirc.util.validators.NumericalValidator;

+ 2
- 2
src/com/dmdirc/addons/ui_swing/SwingWindowFactory.java View File

@@ -31,8 +31,8 @@ import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
31 31
 import com.dmdirc.logger.ErrorLevel;
32 32
 import com.dmdirc.logger.Logger;
33 33
 import com.dmdirc.ui.core.components.WindowComponent;
34
-import com.dmdirc.ui.interfaces.FrameListener;
35
-import com.dmdirc.ui.interfaces.Window;
34
+import com.dmdirc.interfaces.ui.FrameListener;
35
+import com.dmdirc.interfaces.ui.Window;
36 36
 import com.dmdirc.util.ListenerList;
37 37
 
38 38
 import java.util.Arrays;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/actions/CommandAction.java View File

@@ -23,7 +23,7 @@
23 23
 package com.dmdirc.addons.ui_swing.actions;
24 24
 
25 25
 import com.dmdirc.commandparser.parsers.CommandParser;
26
-import com.dmdirc.ui.interfaces.Window;
26
+import com.dmdirc.interfaces.ui.Window;
27 27
 
28 28
 import java.awt.event.ActionEvent;
29 29
 

+ 1
- 1
src/com/dmdirc/addons/ui_swing/commands/Input.java View File

@@ -32,7 +32,7 @@ import com.dmdirc.commandparser.commands.Command;
32 32
 import com.dmdirc.commandparser.commands.IntelligentCommand;
33 33
 import com.dmdirc.commandparser.commands.context.CommandContext;
34 34
 import com.dmdirc.ui.input.AdditionalTabTargets;
35
-import com.dmdirc.ui.interfaces.InputWindow;
35
+import com.dmdirc.interfaces.ui.InputWindow;
36 36
 
37 37
 /**
38 38
  * The input command allows you to manipulate text in a windows inputField.

+ 2
- 2
src/com/dmdirc/addons/ui_swing/components/SwingSearchBar.java View File

@@ -30,8 +30,8 @@ import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
30 30
 import com.dmdirc.addons.ui_swing.textpane.TextPane;
31 31
 import com.dmdirc.config.IdentityManager;
32 32
 import com.dmdirc.interfaces.ConfigChangeListener;
33
-import com.dmdirc.ui.interfaces.SearchBar;
34
-import com.dmdirc.ui.interfaces.SearchBar.Direction;
33
+import com.dmdirc.interfaces.ui.SearchBar;
34
+import com.dmdirc.interfaces.ui.SearchBar.Direction;
35 35
 import com.dmdirc.ui.messages.IRCDocument;
36 36
 import com.dmdirc.ui.messages.IRCDocumentSearcher;
37 37
 import com.dmdirc.ui.messages.LinePosition;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/addonpanel/PluginPanel.java View File

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.components.addonpanel;
24 24
 
25 25
 import com.dmdirc.actions.ActionManager;
26 26
 import com.dmdirc.actions.CoreActionType;
27
-import com.dmdirc.actions.interfaces.ActionType;
27
+import com.dmdirc.interfaces.actions.ActionType;
28 28
 import com.dmdirc.addons.ui_swing.SwingController;
29 29
 import com.dmdirc.addons.ui_swing.UIUtilities;
30 30
 import com.dmdirc.interfaces.ActionListener;

+ 2
- 2
src/com/dmdirc/addons/ui_swing/components/frames/ChannelFrame.java View File

@@ -27,7 +27,7 @@ import com.dmdirc.FrameContainer;
27 27
 import com.dmdirc.ServerState;
28 28
 import com.dmdirc.actions.ActionManager;
29 29
 import com.dmdirc.actions.CoreActionType;
30
-import com.dmdirc.actions.interfaces.ActionType;
30
+import com.dmdirc.interfaces.actions.ActionType;
31 31
 import com.dmdirc.addons.ui_swing.SwingController;
32 32
 import com.dmdirc.addons.ui_swing.UIUtilities;
33 33
 import com.dmdirc.addons.ui_swing.components.NickList;
@@ -37,7 +37,7 @@ import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
37 37
 import com.dmdirc.commandparser.PopupType;
38 38
 import com.dmdirc.config.Identity;
39 39
 import com.dmdirc.config.IdentityManager;
40
-import com.dmdirc.ui.interfaces.InputWindow;
40
+import com.dmdirc.interfaces.ui.InputWindow;
41 41
 
42 42
 import java.awt.Dimension;
43 43
 import java.awt.event.ActionEvent;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java View File

@@ -38,7 +38,7 @@ import com.dmdirc.config.ConfigManager;
38 38
 import com.dmdirc.logger.ErrorLevel;
39 39
 import com.dmdirc.logger.Logger;
40 40
 import com.dmdirc.ui.input.InputHandler;
41
-import com.dmdirc.ui.interfaces.InputWindow;
41
+import com.dmdirc.interfaces.ui.InputWindow;
42 42
 
43 43
 import java.awt.BorderLayout;
44 44
 import java.awt.Point;

+ 2
- 2
src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java View File

@@ -55,8 +55,8 @@ import com.dmdirc.interfaces.ConfigChangeListener;
55 55
 import com.dmdirc.interfaces.FrameCloseListener;
56 56
 import com.dmdirc.parser.common.ChannelJoinRequest;
57 57
 import com.dmdirc.ui.IconManager;
58
-import com.dmdirc.ui.interfaces.InputWindow;
59
-import com.dmdirc.ui.interfaces.Window;
58
+import com.dmdirc.interfaces.ui.InputWindow;
59
+import com.dmdirc.interfaces.ui.Window;
60 60
 
61 61
 import java.awt.Point;
62 62
 import java.awt.event.KeyEvent;

+ 2
- 2
src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputField.java View File

@@ -26,8 +26,8 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
26 26
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
27 27
 import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
28 28
 import com.dmdirc.config.IdentityManager;
29
-import com.dmdirc.ui.interfaces.InputField;
30
-import com.dmdirc.ui.interfaces.InputValidationListener;
29
+import com.dmdirc.interfaces.ui.InputField;
30
+import com.dmdirc.interfaces.ui.InputValidationListener;
31 31
 import com.dmdirc.util.ListenerList;
32 32
 import com.dmdirc.util.ReturnableThread;
33 33
 

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputHandler.java View File

@@ -30,7 +30,7 @@ import com.dmdirc.commandparser.parsers.CommandParser;
30 30
 import com.dmdirc.logger.ErrorLevel;
31 31
 import com.dmdirc.logger.Logger;
32 32
 import com.dmdirc.ui.input.InputHandler;
33
-import com.dmdirc.ui.interfaces.InputField;
33
+import com.dmdirc.interfaces.ui.InputField;
34 34
 
35 35
 import java.awt.event.ActionEvent;
36 36
 import java.awt.event.KeyEvent;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/inputfields/TextAreaInputField.java View File

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.components.inputfields;
24 24
 
25 25
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
26 26
 import com.dmdirc.config.IdentityManager;
27
-import com.dmdirc.ui.interfaces.InputField;
27
+import com.dmdirc.interfaces.ui.InputField;
28 28
 
29 29
 import java.awt.KeyboardFocusManager;
30 30
 import java.awt.event.ActionEvent;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/inputfields/TextFieldInputField.java View File

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.components.inputfields;
24 24
 
25 25
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
26 26
 import com.dmdirc.config.IdentityManager;
27
-import com.dmdirc.ui.interfaces.InputField;
27
+import com.dmdirc.interfaces.ui.InputField;
28 28
 
29 29
 import java.awt.KeyboardFocusManager;
30 30
 import java.awt.event.ActionEvent;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/inputfields/TextPaneInputField.java View File

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.components.inputfields;
24 24
 
25 25
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
26 26
 import com.dmdirc.config.IdentityManager;
27
-import com.dmdirc.ui.interfaces.InputField;
27
+import com.dmdirc.interfaces.ui.InputField;
28 28
 
29 29
 import java.awt.KeyboardFocusManager;
30 30
 import java.awt.Window;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/inputfields/ValidatingTextFieldInputField.java View File

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.components.inputfields;
25 25
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
26 26
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
27 27
 import com.dmdirc.config.IdentityManager;
28
-import com.dmdirc.ui.interfaces.InputField;
28
+import com.dmdirc.interfaces.ui.InputField;
29 29
 import com.dmdirc.util.validators.Validator;
30 30
 
31 31
 import java.awt.event.ActionEvent;

+ 3
- 3
src/com/dmdirc/addons/ui_swing/components/renderers/ActionCellRenderer.java View File

@@ -22,9 +22,9 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_swing.components.renderers;
24 24
 
25
-import com.dmdirc.actions.interfaces.ActionComparison;
26
-import com.dmdirc.actions.interfaces.ActionComponent;
27
-import com.dmdirc.actions.interfaces.ActionType;
25
+import com.dmdirc.interfaces.actions.ActionComparison;
26
+import com.dmdirc.interfaces.actions.ActionComponent;
27
+import com.dmdirc.interfaces.actions.ActionType;
28 28
 
29 29
 import java.awt.Component;
30 30
 

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/renderers/ActionComparisonCellRenderer.java View File

@@ -22,7 +22,7 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_swing.components.renderers;
24 24
 
25
-import com.dmdirc.actions.interfaces.ActionComparison;
25
+import com.dmdirc.interfaces.actions.ActionComparison;
26 26
 
27 27
 import java.awt.Component;
28 28
 

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/renderers/ActionTypeRenderer.java View File

@@ -22,7 +22,7 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_swing.components.renderers;
24 24
 
25
-import com.dmdirc.actions.interfaces.ActionType;
25
+import com.dmdirc.interfaces.actions.ActionType;
26 26
 
27 27
 import java.awt.Component;
28 28
 

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/renderers/ActionTypeTableCellRenderer.java View File

@@ -22,7 +22,7 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_swing.components.renderers;
24 24
 
25
-import com.dmdirc.actions.interfaces.ActionType;
25
+import com.dmdirc.interfaces.actions.ActionType;
26 26
 
27 27
 import java.awt.Color;
28 28
 import java.awt.Font;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/statusbar/FeedbackNag.java View File

@@ -26,7 +26,7 @@ import com.dmdirc.addons.ui_swing.SwingController;
26 26
 import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
27 27
 import com.dmdirc.config.IdentityManager;
28 28
 import com.dmdirc.ui.IconManager;
29
-import com.dmdirc.ui.interfaces.StatusBarComponent;
29
+import com.dmdirc.interfaces.ui.StatusBarComponent;
30 30
 
31 31
 import java.awt.event.ActionEvent;
32 32
 import java.awt.event.ActionListener;

+ 2
- 2
src/com/dmdirc/addons/ui_swing/components/statusbar/InviteLabel.java View File

@@ -27,7 +27,7 @@ import com.dmdirc.Server;
27 27
 import com.dmdirc.ServerManager;
28 28
 import com.dmdirc.actions.ActionManager;
29 29
 import com.dmdirc.actions.CoreActionType;
30
-import com.dmdirc.actions.interfaces.ActionType;
30
+import com.dmdirc.interfaces.actions.ActionType;
31 31
 import com.dmdirc.addons.ui_swing.MainFrame;
32 32
 import com.dmdirc.addons.ui_swing.SelectionListener;
33 33
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -36,7 +36,7 @@ import com.dmdirc.config.IdentityManager;
36 36
 import com.dmdirc.interfaces.ActionListener;
37 37
 import com.dmdirc.interfaces.InviteListener;
38 38
 import com.dmdirc.ui.IconManager;
39
-import com.dmdirc.ui.interfaces.StatusBarComponent;
39
+import com.dmdirc.interfaces.ui.StatusBarComponent;
40 40
 
41 41
 import java.awt.event.ActionEvent;
42 42
 import java.awt.event.MouseEvent;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/statusbar/MessageLabel.java View File

@@ -26,7 +26,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
26 26
 import com.dmdirc.config.IdentityManager;
27 27
 import com.dmdirc.ui.IconManager;
28 28
 import com.dmdirc.ui.StatusMessage;
29
-import com.dmdirc.ui.interfaces.StatusBarComponent;
29
+import com.dmdirc.interfaces.ui.StatusBarComponent;
30 30
 
31 31
 import java.awt.Window;
32 32
 import java.awt.event.MouseEvent;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/statusbar/StatusbarPanel.java View File

@@ -23,7 +23,7 @@
23 23
 package com.dmdirc.addons.ui_swing.components.statusbar;
24 24
 
25 25
 import com.dmdirc.addons.ui_swing.UIUtilities;
26
-import com.dmdirc.ui.interfaces.StatusBarComponent;
26
+import com.dmdirc.interfaces.ui.StatusBarComponent;
27 27
 
28 28
 import java.awt.Color;
29 29
 import java.awt.event.MouseListener;

+ 2
- 2
src/com/dmdirc/addons/ui_swing/components/statusbar/SwingStatusBar.java View File

@@ -27,8 +27,8 @@ import com.dmdirc.addons.ui_swing.SwingController;
27 27
 import com.dmdirc.logger.ErrorLevel;
28 28
 import com.dmdirc.logger.Logger;
29 29
 import com.dmdirc.ui.StatusMessage;
30
-import com.dmdirc.ui.interfaces.StatusBar;
31
-import com.dmdirc.ui.interfaces.StatusBarComponent;
30
+import com.dmdirc.interfaces.ui.StatusBar;
31
+import com.dmdirc.interfaces.ui.StatusBarComponent;
32 32
 
33 33
 import java.awt.Component;
34 34
 import java.util.Arrays;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/statusbar/UpdaterLabel.java View File

@@ -27,7 +27,7 @@ import com.dmdirc.addons.ui_swing.dialogs.updater.SwingRestartDialog;
27 27
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
28 28
 import com.dmdirc.config.IdentityManager;
29 29
 import com.dmdirc.ui.IconManager;
30
-import com.dmdirc.ui.interfaces.StatusBarComponent;
30
+import com.dmdirc.interfaces.ui.StatusBarComponent;
31 31
 import com.dmdirc.updater.UpdateChecker;
32 32
 import com.dmdirc.updater.UpdateChecker.STATE;
33 33
 import com.dmdirc.updater.UpdateCheckerListener;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionDisplayPanel.java View File

@@ -23,7 +23,7 @@
23 23
 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
24 24
 
25 25
 import com.dmdirc.actions.ActionCondition;
26
-import com.dmdirc.actions.interfaces.ActionType;
26
+import com.dmdirc.interfaces.actions.ActionType;
27 27
 import com.dmdirc.addons.ui_swing.components.ImageButton;
28 28
 import com.dmdirc.addons.ui_swing.components.ImageToggleButton;
29 29
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;

+ 3
- 3
src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionEditorPanel.java View File

@@ -24,9 +24,9 @@ package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
24 24
 
25 25
 import com.dmdirc.actions.ActionCondition;
26 26
 import com.dmdirc.actions.ActionManager;
27
-import com.dmdirc.actions.interfaces.ActionComparison;
28
-import com.dmdirc.actions.interfaces.ActionComponent;
29
-import com.dmdirc.actions.interfaces.ActionType;
27
+import com.dmdirc.interfaces.actions.ActionComparison;
28
+import com.dmdirc.interfaces.actions.ActionComponent;
29
+import com.dmdirc.interfaces.actions.ActionType;
30 30
 import com.dmdirc.addons.ui_swing.UIUtilities;
31 31
 import com.dmdirc.addons.ui_swing.components.renderers.ActionCellRenderer;
32 32
 

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionsListPanel.java View File

@@ -23,7 +23,7 @@
23 23
 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
24 24
 
25 25
 import com.dmdirc.actions.ActionCondition;
26
-import com.dmdirc.actions.interfaces.ActionType;
26
+import com.dmdirc.interfaces.actions.ActionType;
27 27
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
28 28
 
29 29
 import java.beans.PropertyChangeEvent;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionsPanel.java View File

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
25 25
 import com.dmdirc.actions.ActionCondition;
26 26
 import com.dmdirc.actions.ConditionTree;
27 27
 import com.dmdirc.actions.ConditionTreeFactory.ConditionTreeFactoryType;
28
-import com.dmdirc.actions.interfaces.ActionType;
28
+import com.dmdirc.interfaces.actions.ActionType;
29 29
 
30 30
 import java.awt.event.ActionEvent;
31 31
 import java.awt.event.ActionListener;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionSubstitutionsPanel.java View File

@@ -23,7 +23,7 @@
23 23
 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
24 24
 
25 25
 import com.dmdirc.actions.ActionSubstitutor;
26
-import com.dmdirc.actions.interfaces.ActionType;
26
+import com.dmdirc.interfaces.actions.ActionType;
27 27
 import com.dmdirc.addons.ui_swing.components.substitutions.Substitution;
28 28
 import com.dmdirc.addons.ui_swing.components.substitutions.SubstitutionLabel;
29 29
 import com.dmdirc.addons.ui_swing.components.substitutions.SubstitutionsPanel;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggerRemovalListener.java View File

@@ -22,7 +22,7 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
24 24
 
25
-import com.dmdirc.actions.interfaces.ActionType;
25
+import com.dmdirc.interfaces.actions.ActionType;
26 26
 
27 27
 /**
28 28
  * Action trigger removal listener.

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggersListPanel.java View File

@@ -22,7 +22,7 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
24 24
 
25
-import com.dmdirc.actions.interfaces.ActionType;
25
+import com.dmdirc.interfaces.actions.ActionType;
26 26
 import com.dmdirc.addons.ui_swing.components.ImageButton;
27 27
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
28 28
 import com.dmdirc.config.IdentityManager;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggersPanel.java View File

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
24 24
 
25 25
 import com.dmdirc.actions.ActionManager;
26 26
 import com.dmdirc.actions.ActionTypeComparator;
27
-import com.dmdirc.actions.interfaces.ActionType;
27
+import com.dmdirc.interfaces.actions.ActionType;
28 28
 import com.dmdirc.addons.ui_swing.ComboBoxWidthModifier;
29 29
 import com.dmdirc.addons.ui_swing.components.renderers.ActionTypeRenderer;
30 30
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTypeModel.java View File

@@ -23,7 +23,7 @@
23 23
 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
24 24
 
25 25
 import com.dmdirc.actions.ActionTypeComparator;
26
-import com.dmdirc.actions.interfaces.ActionType;
26
+import com.dmdirc.interfaces.actions.ActionType;
27 27
 import com.dmdirc.util.MapList;
28 28
 
29 29
 import java.awt.FontMetrics;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionTableModel.java View File

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.actionsmanager;
24 24
 
25 25
 import com.dmdirc.actions.Action;
26 26
 import com.dmdirc.actions.ActionGroup;
27
-import com.dmdirc.actions.interfaces.ActionType;
27
+import com.dmdirc.interfaces.actions.ActionType;
28 28
 
29 29
 import java.util.ArrayList;
30 30
 import java.util.List;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsManagerDialog.java View File

@@ -26,7 +26,7 @@ import com.dmdirc.actions.Action;
26 26
 import com.dmdirc.actions.ActionGroup;
27 27
 import com.dmdirc.actions.ActionManager;
28 28
 import com.dmdirc.actions.CoreActionType;
29
-import com.dmdirc.actions.interfaces.ActionType;
29
+import com.dmdirc.interfaces.actions.ActionType;
30 30
 import com.dmdirc.addons.ui_swing.Apple;
31 31
 import com.dmdirc.addons.ui_swing.MainFrame;
32 32
 import com.dmdirc.addons.ui_swing.SwingController;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasSubstitutionsPanel.java View File

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.aliases;
24 24
 
25 25
 import com.dmdirc.actions.ActionSubstitutor;
26 26
 import com.dmdirc.actions.CoreActionType;
27
-import com.dmdirc.actions.interfaces.ActionType;
27
+import com.dmdirc.interfaces.actions.ActionType;
28 28
 import com.dmdirc.addons.ui_swing.components.substitutions.Substitution;
29 29
 import com.dmdirc.addons.ui_swing.components.substitutions.SubstitutionLabel;
30 30
 import com.dmdirc.addons.ui_swing.components.substitutions.SubstitutionsPanel;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java View File

@@ -30,7 +30,7 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
30 30
 import com.dmdirc.config.Identity;
31 31
 import com.dmdirc.config.IdentityManager;
32 32
 import com.dmdirc.config.prefs.PreferencesManager;
33
-import com.dmdirc.ui.interfaces.InputWindow;
33
+import com.dmdirc.interfaces.ui.InputWindow;
34 34
 
35 35
 import java.awt.Window;
36 36
 import java.awt.event.ActionEvent;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java View File

@@ -30,7 +30,7 @@ import com.dmdirc.addons.ui_swing.actions.TopicEnterAction;
30 30
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
31 31
 import com.dmdirc.addons.ui_swing.components.inputfields.TextAreaInputField;
32 32
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
33
-import com.dmdirc.ui.interfaces.InputWindow;
33
+import com.dmdirc.interfaces.ui.InputWindow;
34 34
 
35 35
 import java.awt.Color;
36 36
 import java.awt.event.KeyEvent;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicPane.java View File

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
24 24
 
25 25
 import com.dmdirc.Channel;
26 26
 import com.dmdirc.addons.ui_swing.UIUtilities;
27
-import com.dmdirc.ui.interfaces.InputWindow;
27
+import com.dmdirc.interfaces.ui.InputWindow;
28 28
 
29 29
 import java.awt.event.ActionEvent;
30 30
 import java.awt.event.ActionListener;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonBar.java View File

@@ -36,7 +36,7 @@ import com.dmdirc.interfaces.ConfigChangeListener;
36 36
 import com.dmdirc.interfaces.FrameInfoListener;
37 37
 import com.dmdirc.interfaces.NotificationListener;
38 38
 import com.dmdirc.ui.WindowManager;
39
-import com.dmdirc.ui.interfaces.Window;
39
+import com.dmdirc.interfaces.ui.Window;
40 40
 
41 41
 import java.awt.Color;
42 42
 import java.awt.Dimension;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/FrameToggleButton.java View File

@@ -22,7 +22,7 @@
22 22
 package com.dmdirc.addons.ui_swing.framemanager.buttonbar;
23 23
 
24 24
 import com.dmdirc.FrameContainer;
25
-import com.dmdirc.ui.interfaces.Window;
25
+import com.dmdirc.interfaces.ui.Window;
26 26
 import javax.swing.Icon;
27 27
 import javax.swing.JToggleButton;
28 28
 

+ 1
- 1
src/com/dmdirc/addons/ui_swing/framemanager/ctrltab/CtrlTabWindowManager.java View File

@@ -36,7 +36,7 @@ import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewModel;
36 36
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewNode;
37 37
 import com.dmdirc.logger.ErrorLevel;
38 38
 import com.dmdirc.logger.Logger;
39
-import com.dmdirc.ui.interfaces.Window;
39
+import com.dmdirc.interfaces.ui.Window;
40 40
 
41 41
 import java.awt.event.KeyEvent;
42 42
 import java.util.HashMap;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/textpane/TextPane.java View File

@@ -26,7 +26,7 @@ import com.dmdirc.addons.ui_swing.SwingController;
26 26
 import com.dmdirc.addons.ui_swing.UIUtilities;
27 27
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
28 28
 import com.dmdirc.interfaces.ConfigChangeListener;
29
-import com.dmdirc.ui.interfaces.Window;
29
+import com.dmdirc.interfaces.ui.Window;
30 30
 import com.dmdirc.ui.messages.IRCDocument;
31 31
 import com.dmdirc.ui.messages.IRCDocumentListener;
32 32
 import com.dmdirc.ui.messages.LinePosition;

+ 2
- 2
src/com/dmdirc/addons/ui_swing/wizard/firstrun/SwingFirstRunWizard.java View File

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.wizard.firstrun;
25 25
 import com.dmdirc.Main;
26 26
 import com.dmdirc.actions.ActionManager;
27 27
 import com.dmdirc.actions.CoreActionType;
28
-import com.dmdirc.actions.interfaces.ActionType;
28
+import com.dmdirc.interfaces.actions.ActionType;
29 29
 import com.dmdirc.addons.ui_swing.Apple;
30 30
 import com.dmdirc.addons.ui_swing.SwingController;
31 31
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
@@ -37,7 +37,7 @@ import com.dmdirc.interfaces.ActionListener;
37 37
 import com.dmdirc.logger.ErrorLevel;
38 38
 import com.dmdirc.logger.Logger;
39 39
 import com.dmdirc.ui.IconManager;
40
-import com.dmdirc.ui.interfaces.FirstRunWizard;
40
+import com.dmdirc.interfaces.ui.FirstRunWizard;
41 41
 import com.dmdirc.util.resourcemanager.ResourceManager;
42 42
 
43 43
 import java.awt.Dimension;

+ 1
- 1
src/com/dmdirc/addons/ui_web/Client.java View File

@@ -22,7 +22,7 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_web;
24 24
 
25
-import com.dmdirc.ui.interfaces.Window;
25
+import com.dmdirc.interfaces.ui.Window;
26 26
 
27 27
 import java.util.LinkedList;
28 28
 import java.util.List;

+ 1
- 1
src/com/dmdirc/addons/ui_web/WebInterfacePlugin.java View File

@@ -23,7 +23,7 @@
23 23
 package com.dmdirc.addons.ui_web;
24 24
 
25 25
 import com.dmdirc.plugins.BasePlugin;
26
-import com.dmdirc.ui.interfaces.UIController;
26
+import com.dmdirc.interfaces.ui.UIController;
27 27
 
28 28
 import org.mortbay.jetty.Handler;
29 29
 

+ 2
- 2
src/com/dmdirc/addons/ui_web/WebInterfaceUI.java View File

@@ -27,8 +27,8 @@ import com.dmdirc.FrameContainer;
27 27
 import com.dmdirc.Server;
28 28
 import com.dmdirc.addons.ui_web.uicomponents.WebStatusBar;
29 29
 import com.dmdirc.ui.core.components.StatusBarManager;
30
-import com.dmdirc.ui.interfaces.UIController;
31
-import com.dmdirc.ui.interfaces.Window;
30
+import com.dmdirc.interfaces.ui.UIController;
31
+import com.dmdirc.interfaces.ui.Window;
32 32
 
33 33
 import java.net.URI;
34 34
 

+ 2
- 2
src/com/dmdirc/addons/ui_web/WebWindowManager.java View File

@@ -29,8 +29,8 @@ import com.dmdirc.logger.ErrorLevel;
29 29
 import com.dmdirc.logger.Logger;
30 30
 import com.dmdirc.ui.WindowManager;
31 31
 import com.dmdirc.ui.core.components.WindowComponent;
32
-import com.dmdirc.ui.interfaces.FrameListener;
33
-import com.dmdirc.ui.interfaces.Window;
32
+import com.dmdirc.interfaces.ui.FrameListener;
33
+import com.dmdirc.interfaces.ui.Window;
34 34
 
35 35
 import java.util.Arrays;
36 36
 import java.util.Collection;

+ 1
- 1
src/com/dmdirc/addons/ui_web/uicomponents/WebInputField.java View File

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_web.uicomponents;
24 24
 
25 25
 import com.dmdirc.addons.ui_web.Client;
26 26
 import com.dmdirc.addons.ui_web.Event;
27
-import com.dmdirc.ui.interfaces.InputField;
27
+import com.dmdirc.interfaces.ui.InputField;
28 28
 
29 29
 import java.awt.event.ActionListener;
30 30
 import java.awt.event.KeyListener;

+ 1
- 1
src/com/dmdirc/addons/ui_web/uicomponents/WebInputHandler.java View File

@@ -26,7 +26,7 @@ import com.dmdirc.WritableFrameContainer;
26 26
 import com.dmdirc.commandparser.parsers.CommandParser;
27 27
 import com.dmdirc.ui.input.InputHandler;
28 28
 import com.dmdirc.ui.input.TabCompleter;
29
-import com.dmdirc.ui.interfaces.InputField;
29
+import com.dmdirc.interfaces.ui.InputField;
30 30
 
31 31
 /**
32 32
  * An input handler for the web ui.

+ 1
- 1
src/com/dmdirc/addons/ui_web/uicomponents/WebInputWindow.java View File

@@ -27,7 +27,7 @@ import com.dmdirc.addons.ui_web.Client;
27 27
 import com.dmdirc.addons.ui_web.WebInterfaceUI;
28 28
 import com.dmdirc.commandparser.parsers.CommandParser;
29 29
 import com.dmdirc.ui.input.InputHandler;
30
-import com.dmdirc.ui.interfaces.InputWindow;
30
+import com.dmdirc.interfaces.ui.InputWindow;
31 31
 
32 32
 import java.util.HashMap;
33 33
 import java.util.Map;

+ 2
- 2
src/com/dmdirc/addons/ui_web/uicomponents/WebStatusBar.java View File

@@ -25,8 +25,8 @@ package com.dmdirc.addons.ui_web.uicomponents;
25 25
 import com.dmdirc.addons.ui_web.DynamicRequestHandler;
26 26
 import com.dmdirc.addons.ui_web.Event;
27 27
 import com.dmdirc.ui.StatusMessage;
28
-import com.dmdirc.ui.interfaces.StatusBar;
29
-import com.dmdirc.ui.interfaces.StatusBarComponent;
28
+import com.dmdirc.interfaces.ui.StatusBar;
29
+import com.dmdirc.interfaces.ui.StatusBarComponent;
30 30
 
31 31
 /**
32 32
  * A status bar handler for the web UI.

+ 2
- 2
src/com/dmdirc/addons/ui_web/uicomponents/WebWindow.java View File

@@ -29,8 +29,8 @@ import com.dmdirc.addons.ui_web.Message;
29 29
 import com.dmdirc.addons.ui_web.WebInterfaceUI;
30 30
 import com.dmdirc.interfaces.FrameCloseListener;
31 31
 import com.dmdirc.interfaces.FrameInfoListener;
32
-import com.dmdirc.ui.interfaces.UIController;
33
-import com.dmdirc.ui.interfaces.Window;
32
+import com.dmdirc.interfaces.ui.UIController;
33
+import com.dmdirc.interfaces.ui.Window;
34 34
 import com.dmdirc.ui.messages.IRCDocumentListener;
35 35
 import com.dmdirc.ui.messages.IRCTextAttribute;
36 36
 import com.dmdirc.ui.messages.Styliser;

+ 1
- 1
src/com/dmdirc/addons/urlcatcher/UrlCatcherPlugin.java View File

@@ -26,7 +26,7 @@ import com.dmdirc.FrameContainer;
26 26
 import com.dmdirc.Raw;
27 27
 import com.dmdirc.actions.ActionManager;
28 28
 import com.dmdirc.actions.CoreActionType;
29
-import com.dmdirc.actions.interfaces.ActionType;
29
+import com.dmdirc.interfaces.actions.ActionType;
30 30
 import com.dmdirc.config.IdentityManager;
31 31
 import com.dmdirc.interfaces.ActionListener;
32 32
 import com.dmdirc.interfaces.ConfigChangeListener;

+ 1
- 1
src/com/dmdirc/addons/userlevel/AccessLevelComponent.java View File

@@ -22,7 +22,7 @@
22 22
 
23 23
 package com.dmdirc.addons.userlevel;
24 24
 
25
-import com.dmdirc.actions.interfaces.ActionComponent;
25
+import com.dmdirc.interfaces.actions.ActionComponent;
26 26
 import com.dmdirc.parser.interfaces.ClientInfo;
27 27
 
28 28
 /**

+ 1
- 1
src/com/dmdirc/addons/userlevel/ChannelAccessLevelComponent.java View File

@@ -22,7 +22,7 @@
22 22
 
23 23
 package com.dmdirc.addons.userlevel;
24 24
 
25
-import com.dmdirc.actions.interfaces.ActionComponent;
25
+import com.dmdirc.interfaces.actions.ActionComponent;
26 26
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
27 27
 
28 28
 /**

+ 2
- 2
src/com/dmdirc/addons/userlevel/UserLevelPlugin.java View File

@@ -24,8 +24,8 @@ package com.dmdirc.addons.userlevel;
24 24
 
25 25
 import com.dmdirc.actions.ActionManager;
26 26
 import com.dmdirc.actions.CoreActionType;
27
-import com.dmdirc.actions.interfaces.ActionComponent;
28
-import com.dmdirc.actions.interfaces.ActionType;
27
+import com.dmdirc.interfaces.actions.ActionComponent;
28
+import com.dmdirc.interfaces.actions.ActionType;
29 29
 import com.dmdirc.config.IdentityManager;
30 30
 import com.dmdirc.interfaces.ActionListener;
31 31
 import com.dmdirc.interfaces.ConfigChangeListener;

+ 1
- 1
src/com/dmdirc/addons/windowstatus/WindowStatusPanel.java View File

@@ -23,7 +23,7 @@
23 23
 package com.dmdirc.addons.windowstatus;
24 24
 
25 25
 import com.dmdirc.addons.ui_swing.UIUtilities;
26
-import com.dmdirc.ui.interfaces.StatusBarComponent;
26
+import com.dmdirc.interfaces.ui.StatusBarComponent;
27 27
 import com.dmdirc.ui.messages.Styliser;
28 28
 
29 29
 import javax.swing.BorderFactory;

+ 1
- 1
test/com/dmdirc/addons/redirect/RedirectCommandTest.java View File

@@ -28,7 +28,7 @@ import com.dmdirc.commandparser.CommandManager;
28 28
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
29 29
 import com.dmdirc.config.IdentityManager;
30 30
 import com.dmdirc.config.InvalidIdentityFileException;
31
-import com.dmdirc.ui.interfaces.InputWindow;
31
+import com.dmdirc.interfaces.ui.InputWindow;
32 32
 import org.junit.BeforeClass;
33 33
 import org.junit.Ignore;
34 34
 import org.junit.Test;

+ 6
- 6
test/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsGroupPanelTest.java View File

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.dialogs.actionsmanager;
25 25
 import com.dmdirc.actions.Action;
26 26
 import com.dmdirc.actions.ActionGroup;
27 27
 import com.dmdirc.actions.CoreActionType;
28
-import com.dmdirc.actions.interfaces.ActionType;
28
+import com.dmdirc.interfaces.actions.ActionType;
29 29
 import com.dmdirc.harness.ui.WindowButtonHandler;
30 30
 import java.util.ArrayList;
31 31
 import java.util.Arrays;
@@ -43,26 +43,26 @@ public class ActionsGroupPanelTest extends UISpecTestCase {
43 43
     private ActionGroup group;
44 44
     private Panel panel;
45 45
     private Table table;
46
-    
46
+
47 47
     @Before
48 48
     @Override
49 49
     public void setUp() throws Exception {
50 50
         super.setUp();
51
-        
51
+
52 52
         action1 = mock(Action.class);
53 53
         when(action1.getName()).thenReturn("name 1");
54 54
         when(action1.getTriggers()).thenReturn(new ActionType[] {
55 55
             CoreActionType.ACTION_CREATED, CoreActionType.ACTION_DELETED,
56 56
         });
57 57
         when(action1.getResponse()).thenReturn(new String[] { "A" });
58
-                
58
+
59 59
         action2 = mock(Action.class);
60 60
         when(action2.getName()).thenReturn("name 2");
61 61
         when(action2.getTriggers()).thenReturn(new ActionType[] {
62 62
             CoreActionType.ACTION_CREATED
63 63
         });
64 64
         when(action2.getResponse()).thenReturn(new String[0]);
65
-        
65
+
66 66
         action3 = mock(Action.class);
67 67
         when(action3.getName()).thenReturn("name 3");
68 68
         when(action3.getTriggers()).thenReturn(new ActionType[] {
@@ -73,7 +73,7 @@ public class ActionsGroupPanelTest extends UISpecTestCase {
73 73
             "Response line 2",
74 74
             "Response line 3",
75 75
         });
76
-        
76
+
77 77
         action4 = mock(Action.class);
78 78
         when(action4.getName()).thenReturn("name 4");
79 79
         when(action4.getTriggers()).thenReturn(new ActionType[] {

Loading…
Cancel
Save