Merge pull request #203 from greboid/tidying2

Use Query.getQuery in logging plugin.

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

@@ -31,7 +31,6 @@ import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.plugins.PluginDomain;
 
 import java.io.File;
@@ -114,23 +113,6 @@ public class LogFileLocator {
         return getPath(directory, file, channel.getName());
     }
 
-    /**
-     * Get the name of the log file for a specific object.
-     *
-     * @param client Client to get the name for
-     *
-     * @return the name of the log file to use for this object.
-     */
-    public String getLogFile(final ClientInfo client) {
-        final StringBuffer directory = getLogDirectory();
-        final StringBuffer file = new StringBuffer();
-        if (client.getParser() != null) {
-            addNetworkDir(directory, file, client.getParser().getNetworkName());
-        }
-        file.append(sanitise(client.getNickname().toLowerCase()));
-        return getPath(directory, file, client.getNickname());
-    }
-
     /**
      * Get the name of the log file for a specific object.
      *

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

@@ -214,9 +214,7 @@ public class LoggingManager implements ConfigChangeListener {
 
     @Handler
     public void handleQueryOpened(final QueryOpenedEvent event) {
-        final Parser parser = event.getQuery().getConnection().get().getParser().get();
-        final ClientInfo client = parser.getClient(event.getQuery().getHost());
-        final String filename = locator.getLogFile(client);
+        final String filename = locator.getLogFile(event.getQuery().getUser());
         if (autobackbuffer) {
             showBackBuffer(event.getQuery(), filename);
         }
@@ -230,9 +228,7 @@ public class LoggingManager implements ConfigChangeListener {
 
     @Handler
     public void handleQueryClosed(final QueryClosedEvent event) {
-        final Parser parser = event.getQuery().getConnection().get().getParser().get();
-        final ClientInfo client = parser.getClient(event.getQuery().getHost());
-        final String filename = locator.getLogFile(client);
+        final String filename = locator.getLogFile(event.getQuery().getUser());
 
         synchronized (FORMAT_LOCK) {
             appendLine(filename, "*** Query closed at: %s", OPENED_AT_FORMAT.format(new Date()));