Merge pull request #550 from csmith/master

Make QueryCommandParsers use PrivateChat.

src/com/dmdirc/commandparser/commands/context/QueryCommandContext.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.commandparser.commands.context;
 
-import com.dmdirc.Query;
 import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.WindowModel;
 
 /**
@@ -34,7 +34,7 @@ import com.dmdirc.interfaces.WindowModel;
 public class QueryCommandContext extends ChatCommandContext {
 
     /** The query the command was executed for. */
-    private final Query query;
+    private final PrivateChat query;
 
     /**
      * Creates a new query command context.
@@ -44,7 +44,7 @@ public class QueryCommandContext extends ChatCommandContext {
      * @param query       The query associated with the command
      */
     public QueryCommandContext(final WindowModel source,
-            final CommandInfo commandInfo, final Query query) {
+            final CommandInfo commandInfo, final PrivateChat query) {
         super(source, commandInfo, query);
         this.query = query;
     }
@@ -54,7 +54,7 @@ public class QueryCommandContext extends ChatCommandContext {
      *
      * @return This context's query
      */
-    public Query getQuery() {
+    public PrivateChat getQuery() {
         return query;
     }
 

src/com/dmdirc/commandparser/parsers/QueryCommandParser.java

@@ -31,6 +31,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.QueryCommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
@@ -46,7 +47,7 @@ public class QueryCommandParser extends ChatCommandParser {
     /**
      * The query instance that this parser is attached to.
      */
-    private final Query query;
+    private final PrivateChat query;
 
     /**
      * Creates a new instance of QueryCommandParser.
@@ -56,7 +57,7 @@ public class QueryCommandParser extends ChatCommandParser {
      * @param eventBus          Event bus to post events on
      */
     public QueryCommandParser(final WindowModel owner, final CommandController commandController,
-            final DMDircMBassador eventBus, final Query query) {
+            final DMDircMBassador eventBus, final PrivateChat query) {
         super(owner, commandController, eventBus, query);
         this.query = query;
     }