Tidy WindowStatusManager.

windowstatus/src/com/dmdirc/addons/windowstatus/WindowStatusManager.java

@@ -22,26 +22,25 @@
 
 package com.dmdirc.addons.windowstatus;
 
-import com.dmdirc.Channel;
+import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Query;
+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.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
+import com.dmdirc.config.ConfigBinder;
+import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.StatusBarComponentAddedEvent;
 import com.dmdirc.events.StatusBarComponentRemovedEvent;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
-import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.PrivateChat;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 
-import java.util.Optional;
-
 import javax.inject.Inject;
 
 import net.engio.mbassy.listener.Handler;
@@ -49,14 +48,12 @@ import net.engio.mbassy.listener.Handler;
 /**
  * Displays information related to the current window in the status bar.
  */
-public class WindowStatusManager implements ConfigChangeListener {
+public class WindowStatusManager {
 
     /** Active frame manager. */
     private final ActiveFrameManager activeFrameManager;
-    /** Identity controller to read settings from. */
-    private final IdentityController identityController;
-    /** Plugin settings domain. */
-    private final String domain;
+    /** Config to read settings from. */
+    private final ConfigBinder configBinder;
     /** The event bus to post events to. */
     private final DMDircMBassador eventBus;
     /** The swing event bus to register for events on. */
@@ -72,13 +69,12 @@ public class WindowStatusManager implements ConfigChangeListener {
 
     @Inject
     public WindowStatusManager(final ActiveFrameManager activeFrameManager,
-            final IdentityController identityController,
+            @GlobalConfig final AggregateConfigProvider config,
             @PluginDomain(WindowStatusPlugin.class) final String domain,
             final DMDircMBassador eventBus,
             final SwingEventBus swingEventBus) {
-        this.domain = domain;
         this.activeFrameManager = activeFrameManager;
-        this.identityController = identityController;
+        this.configBinder = config.getBinder().withDefaultDomain(domain);
         this.eventBus = eventBus;
         this.swingEventBus = swingEventBus;
     }
@@ -90,8 +86,8 @@ public class WindowStatusManager implements ConfigChangeListener {
         panel = UIUtilities.invokeAndWait(WindowStatusPanel::new);
         eventBus.publishAsync(new StatusBarComponentAddedEvent(panel));
         swingEventBus.subscribe(this);
-        identityController.getGlobalConfiguration().addChangeListener(domain, this);
-        updateCache();
+        configBinder.bind(this, WindowStatusManager.class);
+        UIUtilities.invokeLater(this::updateStatus);
     }
 
     /**
@@ -100,25 +96,13 @@ public class WindowStatusManager implements ConfigChangeListener {
     public void onUnload() {
         swingEventBus.unsubscribe(this);
         eventBus.publishAsync(new StatusBarComponentRemovedEvent(panel));
+        configBinder.unbind(this);
         panel = null;
     }
 
     @Handler(invocation = EdtHandlerInvocation.class)
     public void selectionChanged(final SwingWindowSelectedEvent event) {
-        if (event.getWindow().isPresent()) {
-            updateStatus(event.getWindow().get().getContainer());
-        }
-    }
-
-    /** Updates the cached config settings. */
-    private void updateCache() {
-        showname = identityController.getGlobalConfiguration()
-                .getOptionBool(domain, "client.showname");
-        shownone = identityController.getGlobalConfiguration()
-                .getOptionBool(domain, "channel.shownone");
-        nonePrefix = identityController.getGlobalConfiguration()
-                .getOption(domain, "channel.noneprefix");
-        updateStatus();
+        event.getWindow().ifPresent(w -> updateStatus(event.getWindow().get().getContainer()));
     }
 
     /** Update the window status using the current active window. */
@@ -135,42 +119,43 @@ public class WindowStatusManager implements ConfigChangeListener {
         if (current == null) {
             return;
         }
+        if (panel == null) {
+            return;
+        }
         final String textString;
 
         if (current instanceof Connection) {
             textString = updateStatusConnection((Connection) current);
-        } else if (current instanceof Channel) {
-            textString = updateStatusChannel((Channel) current);
-        } else if (current instanceof Query) {
-            textString = updateStatusQuery((Query) current);
+        } else if (current instanceof GroupChat) {
+            textString = updateStatusChannel((GroupChat) current);
+        } else if (current instanceof PrivateChat) {
+            textString = updateStatusQuery((PrivateChat) current);
         } else {
             textString = "???";
         }
-        if (panel != null) {
-            panel.setText(textString);
-        }
+        panel.setText(textString);
     }
 
     private String updateStatusConnection(final Connection connection) {
         return connection.getAddress();
     }
 
-    private String updateStatusChannel(final Channel frame) {
+    private String updateStatusChannel(final GroupChat frame) {
         final StringBuilder textString = new StringBuilder();
-        final ChannelInfo chan = frame.getChannelInfo();
 
-        textString.append(chan.getName());
+        textString.append(frame.getName());
         textString.append(" - Nicks: ");
-        textString.append(chan.getChannelClientCount());
+        textString.append(frame.getUsers().size());
         textString.append(" (");
 
-        final String channelUserModes = ' ' + chan.getParser().getChannelUserModes();
+        final String channelUserModes = ' ' + frame.getConnection()
+                .map(Connection::getUserModes).orElse("");
         final int[] usersWithMode = new int[channelUserModes.length()];
-        for (ChannelClientInfo client : chan.getChannelClients()) {
-            final String mode = client.getImportantModePrefix();
+        frame.getUsers().forEach(user -> {
+            final String mode = user.getImportantMode();
             final int index = channelUserModes.indexOf(mode);
             usersWithMode[index]++;
-        }
+        });
 
         boolean isFirst = true;
         for (int i = channelUserModes.length() - 1; i >= 0; i--) {
@@ -190,21 +175,32 @@ public class WindowStatusManager implements ConfigChangeListener {
         return textString.toString();
     }
 
-    private String updateStatusQuery(final Query frame) {
+    private String updateStatusQuery(final PrivateChat frame) {
         final StringBuilder textString = new StringBuilder();
         textString.append(frame.getHost());
-        final Optional<Connection> connection = frame.getConnection();
-        if (showname && connection.isPresent()) {
-            frame.getUser().getRealname().ifPresent(s -> {
-                textString.append(" - ").append(s);
-            });
-        }
+        frame.getConnection().ifPresent(c -> {
+            if (showname) {
+                frame.getUser().getRealname().ifPresent(s -> textString.append(" - ").append(s));
+            }
+        });
         return textString.toString();
     }
 
-    @Override
-    public void configChanged(final String domain, final String key) {
-        updateCache();
+    @ConfigBinding(key = "client.showname", invocation = EDTInvocation.class)
+    public void handleShowName(final String value) {
+        showname = Boolean.valueOf(value);
+        updateStatus();
+    }
+
+    @ConfigBinding(key = "client.shownone", invocation = EDTInvocation.class)
+    public void handleShowNone(final String value) {
+        shownone = Boolean.valueOf(value);
+        updateStatus();
     }
 
+    @ConfigBinding(key = "client.noneprefix", invocation = EDTInvocation.class)
+    public void handleShowPrefix(final String value) {
+        nonePrefix = value;
+        updateStatus();
+    }
 }