Added support for line wrap notifications (only for non-commands)

InputWindows now have to return WritableFrameContainers not just FrameContainers
Issue 907

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

src/com/dmdirc/addons/redirectplugin/FakeInputWindow.java

@@ -22,20 +22,18 @@
 
 package com.dmdirc.addons.redirectplugin;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
-import com.dmdirc.util.StringTranscoder;
+import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.Formatter;
+import com.dmdirc.util.StringTranscoder;
 
 import java.beans.PropertyVetoException;
 import java.nio.charset.Charset;
 
-import javax.swing.Icon;
-
 /**
  * Implements a fake input window, which sends echoed text to the specified
  * chat window instead.
@@ -44,6 +42,7 @@ import javax.swing.Icon;
  */
 public class FakeInputWindow implements InputWindow {
     
+    /** The target for this window. */
     private final MessageTarget target;
 
     /**
@@ -105,7 +104,7 @@ public class FakeInputWindow implements InputWindow {
 
     /** {@inheritDoc} */
     @Override
-    public FrameContainer getContainer() {
+    public WritableFrameContainer getContainer() {
         return target;
     }
 

src/com/dmdirc/ui/dummy/DummyChannelWindow.java

@@ -23,22 +23,20 @@
 package com.dmdirc.ui.dummy;
 
 import com.dmdirc.Channel;
-import com.dmdirc.FrameContainer;
-import com.dmdirc.util.StringTranscoder;
+import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.ChannelCommandParser;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.parser.ChannelClientInfo;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.ChannelWindow;
+import com.dmdirc.util.StringTranscoder;
 
 import java.beans.PropertyVetoException;
 import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.List;
 
-import javax.swing.Icon;
-
 /**
  * Dummy channel window, used for testing.
  */
@@ -135,7 +133,7 @@ public final class DummyChannelWindow implements ChannelWindow {
 
     /** {@inheritDoc} */
     @Override
-    public FrameContainer getContainer() {
+    public WritableFrameContainer getContainer() {
         return parent;
     }
 

src/com/dmdirc/ui/dummy/DummyInputWindow.java

@@ -22,21 +22,18 @@
 
 package com.dmdirc.ui.dummy;
 
-import com.dmdirc.FrameContainer;
-import com.dmdirc.util.StringTranscoder;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.InputWindow;
+import com.dmdirc.util.StringTranscoder;
 
 import java.beans.PropertyVetoException;
 import java.nio.charset.Charset;
 import java.util.Arrays;
 
-import javax.swing.Icon;
-
 /**
  * Dummy input window, used for testing.
  */
@@ -49,7 +46,7 @@ public class DummyInputWindow implements InputWindow {
     /** are we maximised? */
     private boolean maximised;
     /** Our container. */
-    private final FrameContainer container;
+    private final WritableFrameContainer container;
     
     /** 
      * Instantiates a new DummyInputWindow.
@@ -112,7 +109,7 @@ public class DummyInputWindow implements InputWindow {
     
     /** {@inheritDoc} */
     @Override
-    public FrameContainer getContainer() {
+    public WritableFrameContainer getContainer() {
         return container;
     }
     

src/com/dmdirc/ui/dummy/DummyServerWindow.java

@@ -22,21 +22,19 @@
 
 package com.dmdirc.ui.dummy;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
-import com.dmdirc.util.StringTranscoder;
+import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.ServerCommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.ServerWindow;
+import com.dmdirc.util.StringTranscoder;
 
 import java.beans.PropertyVetoException;
 import java.nio.charset.Charset;
 import java.util.Arrays;
 
-import javax.swing.Icon;
-
 /**
  * Dummy server window, used for testing.
  */
@@ -113,7 +111,7 @@ public final class DummyServerWindow implements ServerWindow {
     
     /** {@inheritDoc} */
     @Override
-    public FrameContainer getContainer() {
+    public WritableFrameContainer getContainer() {
         return parent;
     }
     

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

@@ -235,7 +235,10 @@ public abstract class InputHandler implements ConfigChangeListener {
             
             // TODO: Wrapping commands
         } else {
-            // TODO: Wrapping text
+            final int lines = parentWindow.getContainer().getNumLines(text);
+            if (lines > 1) {
+                fireLineWrap(lines);
+            }
         }
     }
     
@@ -250,6 +253,17 @@ public abstract class InputHandler implements ConfigChangeListener {
         }
     }
     
+    /**
+     * Fires the "wrappedText" method of all validation listeners.
+     * 
+     * @param lines The number of lines that the text will wrap to
+     */
+    private void fireLineWrap(final int lines) {
+        for (InputValidationListener listener : listeners.get(InputValidationListener.class)) {
+            listener.wrappedText(lines);
+        }        
+    }
+    
     /**
      * Adds an InputValidationListener to this input handler.
      * 

src/com/dmdirc/ui/interfaces/InputWindow.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.ui.interfaces;
 
+import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.ui.input.InputHandler;
 
@@ -55,4 +56,12 @@ public interface InputWindow extends Window {
      */
     void setAwayIndicator(boolean isAway);
     
+    /**
+     * Retrieves the container that owns this command window.
+     *
+     * @return The container that owns this command window.
+     */
+    @Override
+    WritableFrameContainer getContainer();    
+    
 }