Fix factory.

src/com/dmdirc/Query.java

@@ -35,6 +35,7 @@ import com.dmdirc.events.QuerySelfMessageEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.PrivateChat;
+import com.dmdirc.interfaces.User;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.parser.common.CallbackManager;
 import com.dmdirc.parser.common.CallbackNotFoundException;
@@ -46,9 +47,9 @@ import com.dmdirc.parser.interfaces.callbacks.NickChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.PrivateActionListener;
 import com.dmdirc.parser.interfaces.callbacks.PrivateMessageListener;
 import com.dmdirc.parser.interfaces.callbacks.QuitListener;
-import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.EventUtils;
 import com.dmdirc.util.URLBuilder;
@@ -70,6 +71,8 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
     /** The Server this Query is on. */
     private final Server server;
+    /** The user associated with this query. */
+    private final User user;
     /** The full host of the client associated with this query. */
     private String host;
     /** The nickname of the client associated with this query. */
@@ -111,6 +114,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
         this.server = newServer;
         this.host = newHost;
         this.nickname = server.parseHostmask(host)[0];
+        user = server.getUser(host).get();
         updateTitle();
     }
 
@@ -317,4 +321,9 @@ public class Query extends MessageTarget implements PrivateActionListener,
         server.getParser().get().setCompositionState(host, state);
     }
 
+    @Override
+    public User getUser() {
+        return user;
+    }
+
 }

src/com/dmdirc/QueryFactory.java

@@ -42,24 +42,21 @@ public class QueryFactory {
     private final MessageSinkManager messageSinkManager;
     private final URLBuilder urlBuilder;
     private final BackBufferFactory backBufferFactory;
-    private final UserFactory userFactory;
 
     @Inject
     public QueryFactory(final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController, final MessageSinkManager messageSinkManager,
-            final URLBuilder urlBuilder, final BackBufferFactory backBufferFactory,
-            final UserFactory userFactory) {
+            final URLBuilder urlBuilder, final BackBufferFactory backBufferFactory) {
         this.tabCompleterFactory = tabCompleterFactory;
         this.commandController = commandController;
         this.messageSinkManager = messageSinkManager;
         this.urlBuilder = urlBuilder;
         this.backBufferFactory = backBufferFactory;
-        this.userFactory = userFactory;
     }
 
     public Query getQuery(final Server server, final String host) {
         return new Query(server, host, tabCompleterFactory, commandController,
-                messageSinkManager, urlBuilder, backBufferFactory, userFactory);
+                messageSinkManager, urlBuilder, backBufferFactory);
     }
 
 }

src/com/dmdirc/interfaces/PrivateChat.java

@@ -54,4 +54,11 @@ public interface PrivateChat extends Chat {
      */
     void sendLine(final String line, final String target);
 
+    /**
+     * Returns the {@link User} associated with this query.
+     *
+     * @return User for this query
+     */
+    User getUser();
+
 }