Use new ConfigBinder Invocation.

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

@@ -0,0 +1,44 @@
+/*
+ * 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.addons.ui_swing;
+
+import com.dmdirc.config.BasicInvocation;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+/**
+ * ConfigBinder Invocation that invokes on the EDT.
+ */
+public class EDTInvocation extends BasicInvocation {
+
+    @Override
+    public void invoke(final Field field, final Object instance, final Object value) {
+        UIUtilities.invokeAndWait(() -> super.invoke(field, instance, value));
+    }
+
+    @Override
+    public void invoke(final Method method, final Object instance, final Object value) {
+        UIUtilities.invokeAndWait(() -> super.invoke(method, instance, value));
+    }
+}

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

@@ -25,8 +25,8 @@ 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.EDTInvocation;
 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;
 import com.dmdirc.addons.ui_swing.components.TopicBar;
@@ -159,23 +159,23 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
         }
     }
 
-    @ConfigBinding(domain = "ui", key = "channelSplitPanePosition")
+    @ConfigBinding(domain = "ui", key = "channelSplitPanePosition",
+            invocation = EDTInvocation.class)
     public void handleSplitPanePosition(final int value) {
-        UIUtilities.invokeLater(() -> {
-            nicklist.setPreferredSize(new Dimension(value, 0));
-            splitPane.setDividerLocation(splitPane.getWidth() - splitPane.getDividerSize() - value);
-        });
+        checkOnEDT();
+        nicklist.setPreferredSize(new Dimension(value, 0));
+        splitPane.setDividerLocation(splitPane.getWidth() - splitPane.getDividerSize() - value);
     }
 
-    @ConfigBinding(key = "shownicklist")
+    @ConfigBinding(key = "shownicklist",
+            invocation = EDTInvocation.class)
     public void handleShowNickList(final boolean value) {
-        UIUtilities.invokeLater(() -> {
-            if (value) {
-                splitPane.setRightComponent(nicklist);
-            } else {
-                splitPane.setRightComponent(null);
-            }
-        });
+        checkOnEDT();
+        if (value) {
+            splitPane.setRightComponent(nicklist);
+        } else {
+            splitPane.setRightComponent(null);
+        }
     }
 
     @Handler(invocation = EdtHandlerInvocation.class)