Added WrappableCommand (implemented by /query and /msg), and support to the InputHandler.

Fixes issue 907.

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

src/com/dmdirc/commandparser/commands/WrappableCommand.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.commandparser.commands;
+
+import com.dmdirc.ui.interfaces.InputWindow;
+
+import java.util.List;
+
+/**
+ * Wrapping commands are commands whose aruments may be wrapped into multiple
+ * lines when sending.
+ * 
+ * @author chris
+ */
+public interface WrappableCommand {
+    
+    /**
+     * Determines the number of lines that the specified arguments will be
+     * wrapped as.
+     * 
+     * @param origin The window the command is being executed in
+     * @param arguments The arguments that the user has entered (so far)
+     * @return The number of lines that the arguments will result in
+     */
+    int getLineCount(InputWindow origin, List<String> arguments);
+
+}

src/com/dmdirc/commandparser/commands/server/Message.java

@@ -26,6 +26,7 @@ import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.ServerCommand;
+import com.dmdirc.commandparser.commands.WrappableCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -36,7 +37,8 @@ import java.util.List;
  * Allows the user to send privmsgs.
  * @author chris
  */
-public final class Message extends ServerCommand implements IntelligentCommand {
+public final class Message extends ServerCommand implements IntelligentCommand,
+        WrappableCommand {
     
     /**
      * Creates a new instance of Message.
@@ -92,6 +94,18 @@ public final class Message extends ServerCommand implements IntelligentCommand {
         }
         
         return res;
-    } 
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getLineCount(final InputWindow origin, final List<String> arguments) {
+        if (arguments.size() >= 2) {
+            final String target = arguments.get(0);
+            return origin.getContainer().getServer().getNumLines("PRIVMSG "
+                    + target + " :" + implodeArgs(1, arguments.toArray(new String[0])));
+        } else {
+            return 1;
+        }
+    }
     
 }

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

@@ -26,17 +26,20 @@ import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.ServerCommand;
+import com.dmdirc.commandparser.commands.WrappableCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.Styliser;
+
 import java.util.List;
 
 /**
  * Allows the user to open a query dialog with another user.
  * @author chris
  */
-public final class OpenQuery extends ServerCommand implements IntelligentCommand {
+public final class OpenQuery extends ServerCommand implements
+        IntelligentCommand, WrappableCommand {
     
     /**
      * Creates a new instance of Query.
@@ -57,9 +60,9 @@ public final class OpenQuery extends ServerCommand implements IntelligentCommand
         }
             
         if (server.getParser().isValidChannelName(args[0])) {
-            sendLine(origin, isSilent, FORMAT_ERROR, "You can't open a query " +
-                    "with a channel; maybe you meant " + Styliser.CODE_FIXED +
-                    Styliser.CODE_BOLD + CommandManager.getCommandChar()
+            sendLine(origin, isSilent, FORMAT_ERROR, "You can't open a query "
+                    + "with a channel; maybe you meant " + Styliser.CODE_FIXED
+                    + Styliser.CODE_BOLD + CommandManager.getCommandChar()
                     + (args.length > 1 ? "msg" : "join") + " " + implodeArgs(args)
                     + Styliser.CODE_BOLD + Styliser.CODE_FIXED + "?");
             return;
@@ -107,6 +110,18 @@ public final class OpenQuery extends ServerCommand implements IntelligentCommand
         }
         
         return targets;
-    }    
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public int getLineCount(final InputWindow origin, final List<String> arguments) {
+        if (arguments.size() >= 2) {
+            final String target = arguments.get(0);
+            return origin.getContainer().getServer().getNumLines("PRIVMSG "
+                    + target + " :" + implodeArgs(1, arguments.toArray(new String[0])));
+        } else {
+            return 1;
+        }
+    }
     
 }

src/com/dmdirc/ui/input/InputHandler.java

@@ -27,6 +27,7 @@ import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.ValidatingCommand;
+import com.dmdirc.commandparser.commands.WrappableCommand;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.prefs.validator.ValidationResponse;
 import com.dmdirc.interfaces.ConfigChangeListener;
@@ -233,7 +234,13 @@ public abstract class InputHandler implements ConfigChangeListener {
                 }
             }
             
-            // TODO: Wrapping commands
+            if (command instanceof WrappableCommand) {
+                final int count = ((WrappableCommand) command).getLineCount(parentWindow, args);
+                
+                if (count > 1) {
+                    fireLineWrap(count);
+                }
+            }
         } else {
             final int lines = parentWindow.getContainer().getNumLines(text);
             if (lines > 1) {

src/com/dmdirc/ui/swing/components/ColourPickerPanel.java

@@ -113,7 +113,8 @@ public final class ColourPickerPanel extends JPanel implements MouseListener, Mo
         this.showIrc = newShowIrc;
         this.showHex = newShowHex;
         
-        final int height = 65 + (showIrc ? 30 : 0) + (showHex ? 145 : 0)  + (showHex & showIrc ? 10 : 0);
+        final int height = 65 + (showIrc ? 30 : 0) + (showHex ? 145 : 0) 
+                + (showHex & showIrc ? 10 : 0);
         
         setPreferredSize(new Dimension(160, height));