+ new client option isPrintPromptOnInput
authorindvdum
Tue, 17 May 2011 18:50:45 +0400
changeset 427bd1032a5c6
parent 3 3eab4f9f42a9
child 5 01a04ffaf85f
+ new client option isPrintPromptOnInput
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/TextConsoleConfig.java
src/main/java/org/vaadin/console/client/ui/VTextConsole.java
     1.1 --- a/src/main/java/org/vaadin/console/Console.java	Tue May 17 03:27:01 2011 +0400
     1.2 +++ b/src/main/java/org/vaadin/console/Console.java	Tue May 17 18:50:45 2011 +0400
     1.3 @@ -42,6 +42,7 @@
     1.4      private static final int DEFAULT_COLS = -1;
     1.5      private static final int DEFAULT_ROWS = -1;
     1.6      private static final boolean DEFAULT_WRAP = true;
     1.7 +    private static final boolean DEFAULT_PRINT_PROMPT_ON_INPUT= true;
     1.8      private static final int MAX_COLS = 500;
     1.9      private static final int MAX_ROWS = 200;
    1.10  
    1.11 @@ -53,6 +54,15 @@
    1.12          config.wrap = wrap;
    1.13          client.call("setWrap", wrap);
    1.14      }
    1.15 +    
    1.16 +    public boolean isPrintPromptOnInput(){
    1.17 +    	return config.isPrintPromptOnInput;
    1.18 +    }
    1.19 +    
    1.20 +    public void setPrintPromptOnInput(final boolean isPrintPromptOnInput){
    1.21 +    	config.isPrintPromptOnInput = isPrintPromptOnInput;
    1.22 +    	client.call("setPrintPromptOnInput", isPrintPromptOnInput);
    1.23 +    }
    1.24  
    1.25      private final ServerSideProxy client = new ServerSideProxy(
    1.26              new ClientCallback());
    1.27 @@ -71,7 +81,7 @@
    1.28  
    1.29          public Object[] initRequestFromClient() {
    1.30              return new Object[] { config.cols, config.rows,
    1.31 -                    config.maxBufferSize, config.wrap, config.greeting,
    1.32 +                    config.maxBufferSize, config.wrap, config.isPrintPromptOnInput, config.greeting,
    1.33                      config.ps };
    1.34          }
    1.35  
    1.36 @@ -105,6 +115,7 @@
    1.37          int cols = DEFAULT_COLS;
    1.38          int rows = DEFAULT_ROWS;
    1.39          boolean wrap = DEFAULT_WRAP;
    1.40 +        boolean isPrintPromptOnInput = DEFAULT_PRINT_PROMPT_ON_INPUT;
    1.41          String ps = DEFAULT_PS;
    1.42          String greeting = DEFAULT_GREETING;
    1.43  
     2.1 --- a/src/main/java/org/vaadin/console/client/ui/TextConsole.java	Tue May 17 03:27:01 2011 +0400
     2.2 +++ b/src/main/java/org/vaadin/console/client/ui/TextConsole.java	Tue May 17 18:50:45 2011 +0400
     2.3 @@ -268,8 +268,10 @@
     2.4              newLine();
     2.5              reducePrompt(-1);
     2.6          }
     2.7 -        print(getCurrentPromptContent());
     2.8 -        newLine();
     2.9 +		if (config.isPrintPromptOnInput()) {
    2.10 +			print(getCurrentPromptContent());
    2.11 +			newLine();
    2.12 +		}
    2.13          if (promptRows > 1) {
    2.14              reducePrompt(-1);
    2.15          }
     3.1 --- a/src/main/java/org/vaadin/console/client/ui/TextConsoleConfig.java	Tue May 17 03:27:01 2011 +0400
     3.2 +++ b/src/main/java/org/vaadin/console/client/ui/TextConsoleConfig.java	Tue May 17 18:50:45 2011 +0400
     3.3 @@ -42,6 +42,14 @@
     3.4      public final native boolean isWrap() /*-{
     3.5                                            return this.wrap;
     3.6                                            }-*/;
     3.7 +    
     3.8 +    public final native void setPrintPromptOnInput(boolean p) /*-{
     3.9 +                                                this.PrintPromptOnInput = p;
    3.10 +                                                }-*/;
    3.11 +    
    3.12 +    public final native boolean isPrintPromptOnInput() /*-{
    3.13 +                                          return this.PrintPromptOnInput;
    3.14 +                                          }-*/;
    3.15  
    3.16      public final native void setPs(String ps) /*-{
    3.17                                                this.ps = ps;
     4.1 --- a/src/main/java/org/vaadin/console/client/ui/VTextConsole.java	Tue May 17 03:27:01 2011 +0400
     4.2 +++ b/src/main/java/org/vaadin/console/client/ui/VTextConsole.java	Tue May 17 18:50:45 2011 +0400
     4.3 @@ -146,6 +146,11 @@
     4.4                  clearCommandHistory();
     4.5              }
     4.6          });
     4.7 +        comm.register("setPrintPromptOnInput", new Method() {
     4.8 +            public void invoke(final String methodName, final Object[] data) {
     4.9 +                getConfig().setPrintPromptOnInput((Boolean) data[0]);
    4.10 +            }
    4.11 +        });
    4.12      }
    4.13  
    4.14      /**
    4.15 @@ -245,6 +250,7 @@
    4.16          cfg.setRows((Integer) params[i++]);
    4.17          cfg.setMaxBufferSize((Integer) params[i++]);
    4.18          cfg.setWrap((Boolean) params[i++]);
    4.19 +        cfg.setPrintPromptOnInput((Boolean) params[i++]);
    4.20          cfg.setGreeting((String) params[i++]);
    4.21          cfg.setPs((String) params[i++]);
    4.22          comm.d("init: '" + cfg.getGreeting() + "';" + cfg.getCols() + "x"