Merge branch 'master' of https://github.com/DMDirc/Plugins into dev3

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

@@ -30,7 +30,7 @@ import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
-import com.dmdirc.events.ClientMinimisedEvent;
+import com.dmdirc.addons.ui_swing.events.ClientMinimisedEvent;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;

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

@@ -26,7 +26,7 @@ import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.actions.CopyAction;
 import com.dmdirc.addons.ui_swing.actions.CutAction;
 import com.dmdirc.addons.ui_swing.events.SwingWindowEvent;
-import com.dmdirc.events.ClientKeyPressedEvent;
+import com.dmdirc.addons.ui_swing.events.ClientKeyPressedEvent;
 
 import java.awt.AWTEvent;
 import java.awt.Component;

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

@@ -23,8 +23,8 @@
 package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.events.ClientFocusGainedEvent;
-import com.dmdirc.events.ClientFocusLostEvent;
+import com.dmdirc.addons.ui_swing.events.ClientFocusGainedEvent;
+import com.dmdirc.addons.ui_swing.events.ClientFocusLostEvent;
 
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowFocusListener;

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

@@ -36,8 +36,8 @@ 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.events.ClientMinimisedEvent;
-import com.dmdirc.events.ClientUnminimisedEvent;
+import com.dmdirc.addons.ui_swing.events.ClientMinimisedEvent;
+import com.dmdirc.addons.ui_swing.events.ClientUnminimisedEvent;
 import com.dmdirc.events.FrameTitleChangedEvent;
 import com.dmdirc.events.UnreadStatusChangedEvent;
 import com.dmdirc.interfaces.LifecycleController;

ui_swing/src/com/dmdirc/addons/ui_swing/events/ClientFocusGainedEvent.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.events;
+
+import com.dmdirc.events.DMDircEvent;
+
+/**
+ * Fired when the the client is bought into focus.
+ */
+public class ClientFocusGainedEvent extends DMDircEvent {
+
+}

ui_swing/src/com/dmdirc/addons/ui_swing/events/ClientFocusLostEvent.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.events;
+
+import com.dmdirc.events.DMDircEvent;
+
+/**
+ * Fired when the the client loses focus.
+ */
+public class ClientFocusLostEvent extends DMDircEvent {
+
+}

ui_swing/src/com/dmdirc/addons/ui_swing/events/ClientKeyPressedEvent.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.events;
+
+import com.dmdirc.events.DMDircEvent;
+
+import javax.swing.KeyStroke;
+
+/**
+ * Event describing a function key press.
+ */
+public class ClientKeyPressedEvent extends DMDircEvent {
+
+    private final KeyStroke keyStroke;
+
+    public ClientKeyPressedEvent(final KeyStroke keyStroke) {
+        this.keyStroke = keyStroke;
+    }
+
+    public KeyStroke getKeyStroke() {
+        return keyStroke;
+    }
+
+}

ui_swing/src/com/dmdirc/addons/ui_swing/events/ClientMinimisedEvent.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.events;
+
+import com.dmdirc.events.DMDircEvent;
+
+/**
+ * Fired when the the client is minimised.
+ */
+public class ClientMinimisedEvent extends DMDircEvent {
+
+}

ui_swing/src/com/dmdirc/addons/ui_swing/events/ClientUnminimisedEvent.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.events;
+
+import com.dmdirc.events.DMDircEvent;
+
+/**
+ * Fired when the the client is unminimised.
+ */
+public class ClientUnminimisedEvent extends DMDircEvent {
+
+}

ui_swing/test/com/dmdirc/addons/ui_swing/EventTriggeringFocusListenerTest.java

@@ -23,8 +23,8 @@
 package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.events.ClientFocusGainedEvent;
-import com.dmdirc.events.ClientFocusLostEvent;
+import com.dmdirc.addons.ui_swing.events.ClientFocusGainedEvent;
+import com.dmdirc.addons.ui_swing.events.ClientFocusLostEvent;
 
 import java.awt.event.WindowEvent;
 

windowflashing/src/com/dmdirc/addons/windowflashing/WindowFlashingManager.java

@@ -32,7 +32,7 @@ import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
-import com.dmdirc.events.ClientFocusGainedEvent;
+import com.dmdirc.addons.ui_swing.events.ClientFocusGainedEvent;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;