Change the way queries are stored, and made them update tab completers properly.

Fixes issue 611. Fixes issue 610.

git-svn-id: http://svn.dmdirc.com/trunk@3112 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/Query.java

@@ -287,6 +287,9 @@ public final class Query extends MessageTarget implements
             
             ActionManager.processEvent(CoreActionType.QUERY_NICKCHANGE, format, this, sOldNick);
             
+            server.getTabCompleter().removeEntry(sOldNick);
+            server.getTabCompleter().addEntry(cClient.getNickname());
+            
             addLine(format, sOldNick, cClient.getIdent(),
                     cClient.getHost(), cClient.getNickname());
             host = cClient.getNickname() + "!" + cClient.getIdent() + "@" + cClient.getHost();
@@ -333,7 +336,7 @@ public final class Query extends MessageTarget implements
      * @param shouldRemove Whether or not we should remove the window from the server.
      */
     public void close(final boolean shouldRemove) {
-        if (server.getParser() != null) {
+        if (server != null && server.getParser() != null) {
             server.getParser().getCallbackManager().delCallback("onPrivateAction", this);
             server.getParser().getCallbackManager().delCallback("onPrivateMessage", this);
             server.getParser().getCallbackManager().delCallback("onNickChanged", this);
@@ -342,15 +345,16 @@ public final class Query extends MessageTarget implements
         
         ActionManager.processEvent(CoreActionType.QUERY_CLOSED, null, this);
         
-        window.setVisible(false);
-        
-        if (shouldRemove) {
-            server.delQuery(host);
+        if (server != null && shouldRemove) {
+            server.delQuery(this);
         }
         
-        Main.getUI().getMainWindow().delChild(window);
-        WindowManager.removeWindow(window);
-        window.close();
+        if (window != null) {
+            Main.getUI().getMainWindow().delChild(window);
+            WindowManager.removeWindow(window);
+            window.close();
+            window.setVisible(false);
+        }
         
         window = null;
         server = null;
@@ -375,6 +379,15 @@ public final class Query extends MessageTarget implements
         return host;
     }
     
+    /**
+     * Returns the current nickname of the user that this query is with.
+     * 
+     * @return The nickname of this query's user
+     */
+    public String getNickname() {
+        return ClientInfo.parseHost(host);
+    }
+    
     /** {@inheritDoc} */
     @Override
     public void activateFrame() {

src/com/dmdirc/Server.java

@@ -81,7 +81,7 @@ public final class Server extends WritableFrameContainer implements Serializable
     /** Open channels that currently exist on the server. */
     private final Map<String, Channel> channels  = new Hashtable<String, Channel>();
     /** Open query windows on the server. */
-    private final Map<String, Query> queries = new Hashtable<String, Query>();
+    private final List<Query> queries = new ArrayList<Query>();
 
     /** The IRC Parser instance handling this server. */
     private transient IRCParser parser;
@@ -402,21 +402,33 @@ public final class Server extends WritableFrameContainer implements Serializable
     /**
      * Determines whether the server knows of the specified query.
      *
-     * @param query The query to be checked
+     * @param host The host of the query to look for
      * @return True iff the query is known, false otherwise
      */
-    public boolean hasQuery(final String query) {
-        return queries.containsKey(parser.toLowerCase(query));
+    public boolean hasQuery(final String host) {
+        for (Query query : queries) {
+            if (parser.equalsIgnoreCase(query.getHost(), host)) {
+                return true;
+            }
+        }
+        
+        return false;
     }
 
     /**
      * Retrieves the specified query belonging to this server.
      *
-     * @param query The query to be retrieved
+     * @param host The host of the query to look for
      * @return The appropriate query object
      */
-    public Query getQuery(final String query) {
-        return queries.get(parser.toLowerCase(query));
+    public Query getQuery(final String host) {
+        for (Query query : queries) {
+            if (parser.equalsIgnoreCase(query.getHost(), host)) {
+                return query;
+            }
+        }
+        
+        throw new IllegalArgumentException("No such query: " + host);
     }
 
     /**
@@ -424,14 +436,8 @@ public final class Server extends WritableFrameContainer implements Serializable
      *
      * @return list of queries belonging to this server
      */
-    public List<String> getQueries() {
-        final ArrayList<String> res = new ArrayList<String>();
-
-        for (String query : queries.keySet()) {
-            res.add(query);
-        }
-
-        return res;
+    public List<Query> getQueries() {
+        return new ArrayList<Query>(queries);
     }
 
     /**
@@ -500,22 +506,22 @@ public final class Server extends WritableFrameContainer implements Serializable
      * @param host host of the remote client being queried
      */
     public void addQuery(final String host) {
-        if (!queries.containsKey(parser.toLowerCase(ClientInfo.parseHost(host)))) {
+        if (!hasQuery(host)) {
             final Query newQuery = new Query(this, host);
 
             tabCompleter.addEntry(ClientInfo.parseHost(host));
-            queries.put(parser.toLowerCase(ClientInfo.parseHost(host)), newQuery);
+            queries.add(newQuery);
         }
     }
 
     /**
      * Deletes a query from this server.
      *
-     * @param host host of the remote client being queried
+     * @param query The query that should be removed.
      */
-    public void delQuery(final String host) {
-        tabCompleter.removeEntry(ClientInfo.parseHost(host));
-        queries.remove(parser.toLowerCase(ClientInfo.parseHost(host)));
+    public void delQuery(final Query query) {
+        tabCompleter.removeEntry(query.getNickname());
+        queries.remove(query);
     }
 
     /** {@inheritDoc} */
@@ -530,7 +536,7 @@ public final class Server extends WritableFrameContainer implements Serializable
             if (channel.ownsFrame(target)) { return true; }
         }
         // Check if it's a query frame
-        for (Query query : queries.values()) {
+        for (Query query : queries) {
             if (query.ownsFrame(target)) { return true; }
         }
         return false;
@@ -558,7 +564,7 @@ public final class Server extends WritableFrameContainer implements Serializable
         }
 
         res.addAll(channels.values());
-        res.addAll(queries.values());
+        res.addAll(queries);
 
         return res;
     }
@@ -609,7 +615,7 @@ public final class Server extends WritableFrameContainer implements Serializable
 
         eventHandler.registerCallbacks();
 
-        for (Query query : queries.values()) {
+        for (Query query : queries) {
             query.reregister();
         }
     }
@@ -864,7 +870,7 @@ public final class Server extends WritableFrameContainer implements Serializable
      * Closes all open query windows associated with this server.
      */
     private void closeQueries() {
-        for (Query query : new ArrayList<Query>(queries.values())) {
+        for (Query query : new ArrayList<Query>(queries)) {
             query.close(false);
         }
 
@@ -898,7 +904,7 @@ public final class Server extends WritableFrameContainer implements Serializable
             channel.getFrame().addLine(messageType, args);
         }
 
-        for (Query query : queries.values()) {
+        for (Query query : queries) {
             query.getFrame().addLine(messageType, args);
         }
 

src/com/dmdirc/commandparser/CommandManager.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser;
 
+import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.commandparser.commands.ChannelCommand;
@@ -203,8 +204,8 @@ public final class CommandManager {
             }
             
             if (command instanceof QueryCommand || command instanceof ChatCommand) {
-                for (String queryName : server.getQueries()) {
-                    registerCommandName(server.getQuery(queryName).getTabCompleter(),
+                for (Query query : server.getQueries()) {
+                    registerCommandName(query.getTabCompleter(),
                             commandName, register);
                 }
             }
@@ -281,7 +282,7 @@ public final class CommandManager {
         new Message();
         new Nick();
         new Notice();
-        new Query();
+        new OpenQuery();
         new Raw();
         new Reconnect();
         new Umode();

src/com/dmdirc/commandparser/commands/server/Query.java → src/com/dmdirc/commandparser/commands/server/OpenQuery.java

@@ -31,12 +31,12 @@ import com.dmdirc.ui.interfaces.InputWindow;
  * Allows the user to open a query dialog with another user.
  * @author chris
  */
-public final class Query extends ServerCommand {
+public final class OpenQuery extends ServerCommand {
     
     /**
      * Creates a new instance of Query.
      */
-    public Query() {
+    public OpenQuery() {
         super();
         
         CommandManager.registerCommand(this);
@@ -51,11 +51,11 @@ public final class Query extends ServerCommand {
             showUsage(origin, isSilent, "query", "<target> <message>");
         }
         if (args.length >= 1) {
-            if (server.getQuery(args[0]) == null) {
-                server.addQuery(args[0]);
-                server.getQuery(args[0]).show();
-            } else {
+            if (server.hasQuery(args[0])) {
                 server.getQuery(args[0]).activateFrame();
+            } else {
+                server.addQuery(args[0]);
+                server.getQuery(args[0]).show();                
             }
         }
         if (args.length > 1) {