Merge pull request #197 from greboid/tidying2

Switch events to User.

logging/src/com/dmdirc/addons/logging/LogFileLocator.java

@@ -27,6 +27,7 @@ import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.UserErrorEvent;
+import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.parser.interfaces.ChannelInfo;
@@ -130,6 +131,21 @@ public class LogFileLocator {
         return getPath(directory, file, client.getNickname());
     }
 
+    /**
+     * Get the name of the log file for a specific object.
+     *
+     * @param user Client to get the name for
+     *
+     * @return the name of the log file to use for this object.
+     */
+    public String getLogFile(final User user) {
+        final StringBuffer directory = getLogDirectory();
+        final StringBuffer file = new StringBuffer();
+        addNetworkDir(directory, file, user.getConnection().getNetwork());
+        file.append(sanitise(user.getNickname().toLowerCase()));
+        return getPath(directory, file, user.getNickname());
+    }
+
     /**
      * Get the name of the log file for a specific object.
      *

logging/src/com/dmdirc/addons/logging/LoggingManager.java

@@ -46,6 +46,7 @@ import com.dmdirc.events.QueryClosedEvent;
 import com.dmdirc.events.QueryOpenedEvent;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.PrivateChat;
+import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
@@ -245,16 +246,16 @@ public class LoggingManager implements ConfigChangeListener {
 
     @Handler
     public void handleQueryActions(final BaseQueryActionEvent event) {
-        final ClientInfo client = event.getClient();
-        final String filename = locator.getLogFile(client);
-        appendLine(filename, "* %s %s", client.getNickname(), event.getMessage());
+        final User user = event.getUser();
+        final String filename = locator.getLogFile(user);
+        appendLine(filename, "* %s %s", user.getNickname(), event.getMessage());
     }
 
     @Handler
     public void handleQueryMessages(final BaseQueryMessageEvent event) {
-        final ClientInfo client = event.getClient();
-        final String filename = locator.getLogFile(client);
-        appendLine(filename, "<%s> %s", client.getNickname(), event.getMessage());
+        final User user = event.getUser();
+        final String filename = locator.getLogFile(user);
+        appendLine(filename, "<%s> %s", user.getNickname(), event.getMessage());
     }
 
     @Handler

ui_swing/src/com/dmdirc/addons/ui_swing/components/AwayLabel.java

@@ -63,6 +63,7 @@ public class AwayLabel extends JLabel {
         container.getConfigManager().getBinder().bind(this, AwayLabel.class);
         container.getEventBus().subscribe(this);
 
+        setVisible(false);
         container.getConnection().ifPresent(c -> {
             setVisible(c.isAway());
         });

ui_swing/src/com/dmdirc/addons/ui_swing/components/statusbar/InviteLabel.java

@@ -33,6 +33,7 @@ import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
 import com.dmdirc.events.ServerConnectErrorEvent;
 import com.dmdirc.events.ServerConnectedEvent;
 import com.dmdirc.events.ServerDisconnectedEvent;
+import com.dmdirc.events.ServerInviteReceivedEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.InviteListener;
@@ -158,6 +159,11 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements InviteLi
         update();
     }
 
+    @Handler(invocation = EdtHandlerInvocation.class)
+    public void handleInviteReceived(final ServerInviteReceivedEvent event) {
+
+    }
+
     @Handler
     public void handleServerConnected(final ServerConnectedEvent event) {
         event.getConnection().addInviteListener(this);