Move EDTHandlerInvocationi back.

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

@@ -26,7 +26,7 @@ import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
-import com.dmdirc.addons.ui_swing.injection.EdtHandlerInvocation;
+import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;

ui_swing/src/com/dmdirc/addons/ui_swing/injection/EdtHandlerInvocation.java → ui_swing/src/com/dmdirc/addons/ui_swing/EdtHandlerInvocation.java

@@ -20,9 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.injection;
-
-import com.dmdirc.addons.ui_swing.UIUtilities;
+package com.dmdirc.addons.ui_swing;
 
 import java.lang.reflect.Method;
 

ui_swing/src/com/dmdirc/addons/ui_swing/MainFrame.java

@@ -36,7 +36,6 @@ import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
 import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
 import com.dmdirc.addons.ui_swing.framemanager.FramemanagerPosition;
 import com.dmdirc.addons.ui_swing.framemanager.ctrltab.CtrlTabWindowManager;
-import com.dmdirc.addons.ui_swing.injection.EdtHandlerInvocation;
 import com.dmdirc.events.ClientMinimisedEvent;
 import com.dmdirc.events.ClientUnminimisedEvent;
 import com.dmdirc.events.FrameTitleChangedEvent;

ui_swing/src/com/dmdirc/addons/ui_swing/components/MDIBar.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.addons.ui_swing.injection.EdtHandlerInvocation;
+import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowAddedEvent;

ui_swing/src/com/dmdirc/addons/ui_swing/components/TypingLabel.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.addons.ui_swing.injection.EdtHandlerInvocation;
+import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.events.FrameComponentAddedEvent;
 import com.dmdirc.events.FrameComponentRemovedEvent;

ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/ChannelFrame.java

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.components.frames;
 import com.dmdirc.Channel;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.ServerState;
-import com.dmdirc.addons.ui_swing.injection.EdtHandlerInvocation;
+import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.NickList;
 import com.dmdirc.addons.ui_swing.components.SplitPane;

ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/DesktopWindowFrame.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.addons.ui_swing.injection.EdtHandlerInvocation;
+import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.events.FrameIconChangedEvent;
 import com.dmdirc.events.FrameTitleChangedEvent;
 

ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/ServerFrame.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.ServerState;
-import com.dmdirc.addons.ui_swing.injection.EdtHandlerInvocation;
+import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.sslcertificate.SSLCertificateDialog;

ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.components.frames;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.addons.ui_swing.injection.EdtHandlerInvocation;
+import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.InputFieldCopyAction;

ui_swing/src/com/dmdirc/addons/ui_swing/components/statusbar/InviteLabel.java

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.components.statusbar;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Invite;
-import com.dmdirc.addons.ui_swing.injection.EdtHandlerInvocation;
+import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.events.SwingEventBus;

ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/ctrltab/CtrlTabWindowManager.java

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.framemanager.ctrltab;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.addons.ui_swing.injection.EdtHandlerInvocation;
+import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.NextFrameAction;

ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.framemanager.tree;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.addons.ui_swing.injection.EdtHandlerInvocation;
+import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;

windowstatus/src/com/dmdirc/addons/windowstatus/WindowStatusManager.java

@@ -26,7 +26,7 @@ import com.dmdirc.Channel;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
-import com.dmdirc.addons.ui_swing.injection.EdtHandlerInvocation;
+import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;