+ new client method newLineIfNotEndsWithNewLine()
authorindvdum
Wed, 18 May 2011 15:04:22 +0400
changeset 68a7e51bd3ddb
parent 5 01a04ffaf85f
child 7 a778386e297f
+ new client method newLineIfNotEndsWithNewLine()
src/main/java/org/vaadin/console/Console.java
src/main/java/org/vaadin/console/client/ui/TextConsole.java
src/main/java/org/vaadin/console/client/ui/VTextConsole.java
     1.1 --- a/src/main/java/org/vaadin/console/Console.java	Wed May 18 00:43:34 2011 +0400
     1.2 +++ b/src/main/java/org/vaadin/console/Console.java	Wed May 18 15:04:22 2011 +0400
     1.3 @@ -569,6 +569,10 @@
     1.4          client.call("newLine");
     1.5      }
     1.6  
     1.7 +	public void newLineIfNotEndsWithNewLine() {
     1.8 +		client.call("newLineIfNotEndsWithNewLine");
     1.9 +	}
    1.10 +
    1.11      public void reset() {
    1.12          client.call("reset");
    1.13      }
     2.1 --- a/src/main/java/org/vaadin/console/client/ui/TextConsole.java	Wed May 18 00:43:34 2011 +0400
     2.2 +++ b/src/main/java/org/vaadin/console/client/ui/TextConsole.java	Wed May 18 15:04:22 2011 +0400
     2.3 @@ -451,6 +451,15 @@
     2.4          reducePrompt(1);
     2.5      }
     2.6  
     2.7 +	public void newLineIfNotEndsWithNewLine() {
     2.8 +		if (!bufferIsEmpty() && !bufferEndsWithNewLine()) {
     2.9 +			// _log("newline");
    2.10 +			buffer.appendChild(createBr());
    2.11 +			checkBufferLimit();
    2.12 +			reducePrompt(1);
    2.13 +		}
    2.14 +	}
    2.15 +
    2.16      protected void setPs(final String string) {
    2.17          cleanPs = Util.escapeHTML(string);
    2.18          cleanPs = cleanPs.replaceAll(" ", " ");
     3.1 --- a/src/main/java/org/vaadin/console/client/ui/VTextConsole.java	Wed May 18 00:43:34 2011 +0400
     3.2 +++ b/src/main/java/org/vaadin/console/client/ui/VTextConsole.java	Wed May 18 15:04:22 2011 +0400
     3.3 @@ -120,6 +120,11 @@
     3.4                  newLine();
     3.5              }
     3.6          });
     3.7 +		comm.register("newLineIfNotEndsWithNewLine", new Method() {
     3.8 +			public void invoke(final String methodName, final Object[] data) {
     3.9 +				newLineIfNotEndsWithNewLine();
    3.10 +			}
    3.11 +		});
    3.12          comm.register("scrollToEnd", new Method() {
    3.13              public void invoke(final String methodName, final Object[] data) {
    3.14                  scrollToEnd();