Add some more events

Change-Id: Ib227c72d5077d09487a771ffd9125d2fae021ac1
Reviewed-on: http://gerrit.dmdirc.com/3268
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/actions/CoreActionType.java

@@ -71,8 +71,10 @@ public enum CoreActionType implements ActionType {
     @Deprecated
     CLIENT_LINE_ADDED(ClientEvents.WINDOW_EVENT_WITH_MESSAGE, "Line added to a window"),
     /** Popup generated. */
+    @Deprecated
     CLIENT_POPUP_GENERATED(ClientEvents.POPUP_EVENT, "Popup menu generated"),
     /** Prefs dialog opened. */
+    @Deprecated
     CLIENT_PREFS_OPENED(ClientEvents.CLIENT_EVENT_WITH_PREFS, "Preferences dialog opened"),
     /** Context-specific prefs requested. */
     CLIENT_PREFS_REQUESTED(ClientEvents.CLIENT_EVENT_WITH_PREFS_CAT, "Preferences requested"),

src/com/dmdirc/commandparser/PopupManager.java

@@ -22,11 +22,12 @@
 
 package com.dmdirc.commandparser;
 
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.events.ClientPopupGeneratedEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
+import com.google.common.eventbus.EventBus;
+
 import javax.inject.Inject;
 
 /**
@@ -36,15 +37,19 @@ public class PopupManager {
 
     /** The command controller to use for items. */
     private final CommandController commandController;
+    /** The bus to despatch events on. */
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of PopupManager.
      *
      * @param commandController The controller to use for commands.
+     * @param eventBus          The bus to despatch events on.
      */
     @Inject
-    public PopupManager(final CommandController commandController) {
+    public PopupManager(final CommandController commandController, final EventBus eventBus) {
         this.commandController = commandController;
+        this.eventBus = eventBus;
     }
 
     /**
@@ -59,9 +64,7 @@ public class PopupManager {
     public PopupMenu getMenu(final PopupType menuType, final AggregateConfigProvider configManager) {
         final PopupMenu menu = getMenu(menuType.toString(), menuType, configManager);
 
-        ActionManager.getActionManager().triggerEvent(
-                CoreActionType.CLIENT_POPUP_GENERATED, null, menuType, menu,
-                configManager);
+        eventBus.post(new ClientPopupGeneratedEvent(menuType, menu, configManager));
 
         return menu;
     }
@@ -119,7 +122,7 @@ public class PopupManager {
             if (command.length() > 0 && command.charAt(0) == '<') {
                 res = new PopupMenuItem(commandController,
                         name, getMenu(command.substring(1),
-                        type, configManager));
+                                type, configManager));
             } else {
                 res = new PopupMenuItem(commandController,
                         name, type.getArity(), command);

src/com/dmdirc/events/ClientPopupGeneratedEvent.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2006-2014 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.events;
+
+import com.dmdirc.commandparser.PopupMenu;
+import com.dmdirc.commandparser.PopupType;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
+
+/**
+ * Raised when a popup is being generated.
+ */
+public class ClientPopupGeneratedEvent extends DMDircEvent {
+
+    private final PopupType type;
+    private final PopupMenu menu;
+    private final AggregateConfigProvider config;
+
+    public ClientPopupGeneratedEvent(
+            final PopupType type,
+            final PopupMenu menu,
+            final AggregateConfigProvider config) {
+        this.type = type;
+        this.menu = menu;
+        this.config = config;
+    }
+
+    public PopupType getType() {
+        return type;
+    }
+
+    public PopupMenu getMenu() {
+        return menu;
+    }
+
+    public AggregateConfigProvider getConfig() {
+        return config;
+    }
+
+}

src/com/dmdirc/events/ClientPrefsOpenedEvent.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2006-2014 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.events;
+
+import com.dmdirc.config.prefs.PreferencesDialogModel;
+
+/**
+ * Raised when the preferences dialog is opened.
+ */
+public class ClientPrefsOpenedEvent extends DMDircEvent {
+
+    private final PreferencesDialogModel model;
+
+    public ClientPrefsOpenedEvent(final PreferencesDialogModel model) {
+        this.model = model;
+    }
+
+    public PreferencesDialogModel getModel() {
+        return model;
+    }
+
+}