Merge pull request #704 from csmith/master

Replace Query with PrivateChat in Connection.

src/main/java/com/dmdirc/Server.java

@@ -33,6 +33,7 @@ import com.dmdirc.events.ServerUnknownProtocolEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChatManager;
 import com.dmdirc.interfaces.InviteManager;
+import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
@@ -441,12 +442,12 @@ public class Server implements Connection {
     }
 
     @Override
-    public Query getQuery(final String host) {
+    public PrivateChat getQuery(final String host) {
         return getQuery(host, false);
     }
 
     @Override
-    public Query getQuery(final String host, final boolean focus) {
+    public PrivateChat getQuery(final String host, final boolean focus) {
         synchronized (myStateLock) {
             if (myState.getState() == ServerState.CLOSING) {
                 // Can't open queries while the server is closing
@@ -490,12 +491,12 @@ public class Server implements Connection {
     }
 
     @Override
-    public Collection<Query> getQueries() {
+    public Collection<PrivateChat> getQueries() {
         return Collections.unmodifiableCollection(queries.values());
     }
 
     @Override
-    public void delQuery(final Query query) {
+    public void delQuery(final PrivateChat query) {
         windowModel.getInputModel().get().getTabCompleter().removeEntry(
                 TabCompletionType.QUERY_NICK, query.getNickname());
         queries.remove(converter.toLowerCase(query.getNickname()));

src/main/java/com/dmdirc/ServerEventHandler.java

@@ -142,14 +142,14 @@ public class ServerEventHandler extends EventHandler {
     @Handler
     public void onPrivateMessage(final PrivateMessageEvent event) {
         if (!owner.hasQuery(event.getHost())) {
-            owner.getQuery(event.getHost()).onPrivateMessage(event);
+            ((Query) owner.getQuery(event.getHost())).onPrivateMessage(event);
         }
     }
 
     @Handler
     public void onPrivateAction(final PrivateActionEvent event) {
         if (!owner.hasQuery(event.getHost())) {
-            owner.getQuery(event.getHost()).onPrivateAction(event);
+            ((Query) owner.getQuery(event.getHost())).onPrivateAction(event);
         }
     }
 
@@ -341,7 +341,9 @@ public class ServerEventHandler extends EventHandler {
         if (event.getParser().getLocalClient().equals(event.getParser().getClient(event.getHost()))) {
             // Local client
             eventBus.publishAsync(
-                    new QuerySelfMessageEvent(owner.getQuery(event.getTarget()), owner.getLocalUser().get(),
+                    new QuerySelfMessageEvent(
+                            (Query) owner.getQuery(event.getTarget()),
+                            owner.getLocalUser().get(),
                             event.getMessage()));
         } else {
             eventBus.publishAsync(new ServerUnknownMessageEvent(
@@ -354,7 +356,9 @@ public class ServerEventHandler extends EventHandler {
         if (event.getParser().getLocalClient().equals(event.getParser().getClient(event.getHost()))) {
             // Local client
             eventBus.publishAsync(
-                    new QuerySelfActionEvent(owner.getQuery(event.getTarget()), owner.getLocalUser().get(),
+                    new QuerySelfActionEvent(
+                            (Query) owner.getQuery(event.getTarget()),
+                            owner.getLocalUser().get(),
                             event.getMessage()));
         } else {
             eventBus.publishAsync(new ServerUnknownActionEvent(

src/main/java/com/dmdirc/commandparser/CommandManager.java

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser;
 
 import com.dmdirc.GlobalWindow;
-import com.dmdirc.Query;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.ConfigBinding;
@@ -31,6 +30,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -197,10 +197,12 @@ public class CommandManager implements CommandController {
 
             if (command.getType() == CommandType.TYPE_QUERY
                     || command.getType() == CommandType.TYPE_CHAT) {
-                for (Query query : server.getQueries()) {
-                    registerCommandName(query.getInputModel().get().getTabCompleter(),
+                for (PrivateChat query : server.getQueries()) {
+                    registerCommandName(
+                            query.getWindowModel().getInputModel().get().getTabCompleter(),
                             plainCommandName, register);
-                    registerCommandName(query.getInputModel().get().getTabCompleter(),
+                    registerCommandName(
+                            query.getWindowModel().getInputModel().get().getTabCompleter(),
                             silencedCommandName, register);
                 }
             }

src/main/java/com/dmdirc/commandparser/commands/server/OpenQuery.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.server;
 
-import com.dmdirc.Query;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -35,6 +34,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -85,7 +85,7 @@ public class OpenQuery extends Command implements IntelligentCommand,
             return;
         }
 
-        final Query query = connection.getQuery(args.getArguments()[0], !args.isSilent());
+        final PrivateChat query = connection.getQuery(args.getArguments()[0], !args.isSilent());
 
         if (args.getArguments().length > 1) {
             query.sendLine(args.getArgumentsAsString(1), args.getArguments()[0]);

src/main/java/com/dmdirc/interfaces/Connection.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.interfaces;
 
-import com.dmdirc.Query;
 import com.dmdirc.ServerState;
 import com.dmdirc.ServerStatus;
 import com.dmdirc.config.profiles.Profile;
@@ -75,7 +74,7 @@ public interface Connection {
      *
      * @param query The query that should be removed.
      */
-    void delQuery(final Query query);
+    void delQuery(final PrivateChat query);
 
     /**
      * Disconnects from the server with the default quit message.
@@ -167,7 +166,7 @@ public interface Connection {
      *
      * @return list of queries belonging to this server
      */
-    Collection<Query> getQueries();
+    Collection<PrivateChat> getQueries();
 
     /**
      * Retrieves the specified query belonging to this server. If the query does not yet exist, it
@@ -177,7 +176,7 @@ public interface Connection {
      *
      * @return The appropriate query object
      */
-    Query getQuery(final String host);
+    PrivateChat getQuery(final String host);
 
     /**
      * Retrieves the specified query belonging to this server. If the query does not yet exist, it
@@ -188,7 +187,7 @@ public interface Connection {
      *
      * @return The appropriate query object
      */
-    Query getQuery(final String host, final boolean focus);
+    PrivateChat getQuery(final String host, final boolean focus);
 
     /**
      * Retrieves the identity for this server.