Browse Source

Unbind in channelframe.

pull/175/head
Greg Holmes 9 years ago
parent
commit
85f2daf073

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

35
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
35
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
36
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
36
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
37
 import com.dmdirc.commandparser.PopupType;
37
 import com.dmdirc.commandparser.PopupType;
38
+import com.dmdirc.config.ConfigBinder;
38
 import com.dmdirc.config.ConfigBinding;
39
 import com.dmdirc.config.ConfigBinding;
39
 import com.dmdirc.events.ClientClosingEvent;
40
 import com.dmdirc.events.ClientClosingEvent;
40
 import com.dmdirc.events.FrameClosingEvent;
41
 import com.dmdirc.events.FrameClosingEvent;
84
     private final KeyedDialogProvider<Channel, ChannelSettingsDialog> dialogProvider;
85
     private final KeyedDialogProvider<Channel, ChannelSettingsDialog> dialogProvider;
85
     /** Channel instance. */
86
     /** Channel instance. */
86
     private final Channel channel;
87
     private final Channel channel;
88
+    /** Config binder. */
89
+    private final ConfigBinder binder;
87
 
90
 
88
     /**
91
     /**
89
      * Creates a new instance of ChannelFrame. Sets up callbacks and handlers, and default options
92
      * Creates a new instance of ChannelFrame. Sets up callbacks and handlers, and default options
114
         this.channel = owner;
117
         this.channel = owner;
115
 
118
 
116
         initComponents(topicBarFactory, deps.colourManagerFactory);
119
         initComponents(topicBarFactory, deps.colourManagerFactory);
120
+        binder = getContainer().getConfigManager().getBinder().withDefaultDomain(domain);
121
+        binder.bind(this, ChannelFrame.class);
117
 
122
 
118
         eventBus.subscribe(this);
123
         eventBus.subscribe(this);
119
 
124
 
146
         add(getSearchBar(), "growx");
151
         add(getSearchBar(), "growx");
147
         add(inputPanel, "growx");
152
         add(inputPanel, "growx");
148
 
153
 
149
-        getContainer().getConfigManager()
150
-                .getBinder().withDefaultDomain(domain).bind(this, ChannelFrame.class);
151
         splitPane.setLeftComponent(getTextPane());
154
         splitPane.setLeftComponent(getTextPane());
152
         splitPane.setResizeWeight(1);
155
         splitPane.setResizeWeight(1);
153
         splitPane.setDividerLocation(-1);
156
         splitPane.setDividerLocation(-1);
237
     @Override
240
     @Override
238
     public void dispose() {
241
     public void dispose() {
239
         eventBus.unsubscribe(this);
242
         eventBus.unsubscribe(this);
240
-        globalConfig.removeListener(this);
243
+        binder.unbind(this);
241
         super.dispose();
244
         super.dispose();
242
     }
245
     }
243
 
246
 

Loading…
Cancel
Save