Add config + identity to {GroupChat,Connection}PrefsRequestedEvent

src/com/dmdirc/config/prefs/PreferencesManager.java

@@ -123,7 +123,7 @@ public class PreferencesManager {
                 "Reconnect message", "Default quit message to use when reconnecting",
                 manager, identity));
 
-        eventBus.publish(new ConnectionPrefsRequestedEvent(category));
+        eventBus.publish(new ConnectionPrefsRequestedEvent(category, manager, identity));
 
         return category;
     }
@@ -226,7 +226,7 @@ public class PreferencesManager {
                 "Number of items of input history to keep",
                 manager, identity));
 
-        eventBus.publish(new GroupChatPrefsRequestedEvent(category));
+        eventBus.publish(new GroupChatPrefsRequestedEvent(category, manager, identity));
 
         return category;
     }

src/com/dmdirc/events/ConnectionPrefsRequestedEvent.java

@@ -23,6 +23,8 @@
 package com.dmdirc.events;
 
 import com.dmdirc.config.prefs.PreferencesCategory;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.interfaces.config.ConfigProvider;
 
 /**
  * Raised when the connection preferences are requested.
@@ -30,13 +32,26 @@ import com.dmdirc.config.prefs.PreferencesCategory;
 public class ConnectionPrefsRequestedEvent extends PreferencesEvent {
 
     private final PreferencesCategory category;
+    private final AggregateConfigProvider config;
+    private final ConfigProvider identity;
 
-    public ConnectionPrefsRequestedEvent(final PreferencesCategory category) {
+    public ConnectionPrefsRequestedEvent(final PreferencesCategory category,
+            final AggregateConfigProvider config, final ConfigProvider identity) {
         this.category = category;
+        this.config = config;
+        this.identity = identity;
     }
 
     public PreferencesCategory getCategory() {
         return category;
     }
 
+    public ConfigProvider getIdentity() {
+        return identity;
+    }
+
+    public AggregateConfigProvider getConfig() {
+        return config;
+    }
+
 }

src/com/dmdirc/events/GroupChatPrefsRequestedEvent.java

@@ -23,6 +23,8 @@
 package com.dmdirc.events;
 
 import com.dmdirc.config.prefs.PreferencesCategory;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.interfaces.config.ConfigProvider;
 
 /**
  * Raised when the group chat preferences are requested.
@@ -30,13 +32,25 @@ import com.dmdirc.config.prefs.PreferencesCategory;
 public class GroupChatPrefsRequestedEvent extends PreferencesEvent {
 
     private final PreferencesCategory category;
+    private final AggregateConfigProvider config;
+    private final ConfigProvider identity;
 
-    public GroupChatPrefsRequestedEvent(final PreferencesCategory category) {
+    public GroupChatPrefsRequestedEvent(final PreferencesCategory category,
+            final AggregateConfigProvider config, final ConfigProvider identity) {
         this.category = category;
+        this.config = config;
+        this.identity = identity;
     }
 
     public PreferencesCategory getCategory() {
         return category;
     }
 
+    public ConfigProvider getIdentity() {
+        return identity;
+    }
+
+    public AggregateConfigProvider getConfig() {
+        return config;
+    }
 }