Revision: 7004 Author: [email protected] Date: Wed Nov 18 14:04:15 2009 Log: tr...@7001 was merged into this branch Revert "Renamed the portHosted option to codeServerPort and associated types." svn merge --ignore-ancestry -c 7001 https://google-web-toolkit.googlecode.com/svn/trunk .
http://code.google.com/p/google-web-toolkit/source/detail?r=7004 Modified: /releases/2.0/branch-info.txt /releases/2.0/dev/core/src/com/google/gwt/dev/DevModeBase.java /releases/2.0/user/src/com/google/gwt/junit/JUnitShell.java ======================================= --- /releases/2.0/branch-info.txt Wed Nov 18 12:55:34 2009 +++ /releases/2.0/branch-info.txt Wed Nov 18 14:04:15 2009 @@ -785,3 +785,8 @@ tr...@6998 was merged into this branch Revert "Fix XHR memory leak one more time by re-using a static null function." svn merge --ignore-ancestry -c 6998 https://google-web-toolkit.googlecode.com/svn/trunk . + +tr...@7001 was merged into this branch + Revert "Renamed the portHosted option to codeServerPort and associated types." + svn merge --ignore-ancestry -c 7001 https://google-web-toolkit.googlecode.com/svn/trunk . + ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/DevModeBase.java Wed Nov 18 08:54:38 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/DevModeBase.java Wed Nov 18 14:04:15 2009 @@ -255,27 +255,31 @@ /** * Handles the -portHosted command line flag. */ - protected static class ArgHandlerPortHosted extends ArgHandlerString { - - private final OptionPortHosted options; - - public ArgHandlerPortHosted(OptionPortHosted options) { + protected static class ArgHandlerCodeServerPort extends ArgHandlerString { + + private static final String CODE_SERVER_PORT_TAG = "-codeServerPort"; + private static final String DEFAULT_PORT = "9997"; + + private final OptionCodeServerPort options; + + public ArgHandlerCodeServerPort(OptionCodeServerPort options) { this.options = options; } @Override public String[] getDefaultArgs() { - return new String[] {"-portHosted", "9997"}; + return new String[] {CODE_SERVER_PORT_TAG, DEFAULT_PORT}; } @Override public String getPurpose() { - return "Listens on the specified port for hosted mode connections"; + return "Specifies the TCP port for the code server (defaults to " + + DEFAULT_PORT + ")"; } @Override public String getTag() { - return "-portHosted"; + return CODE_SERVER_PORT_TAG; } @Override @@ -286,10 +290,10 @@ @Override public boolean setString(String value) { if (value.equals("auto")) { - options.setPortHosted(getFreeSocketPort()); + options.setCodeServerPort(getFreeSocketPort()); } else { try { - options.setPortHosted(Integer.parseInt(value)); + options.setCodeServerPort(Integer.parseInt(value)); } catch (NumberFormatException e) { System.err.println("A port must be an integer or \"auto\""); return false; @@ -381,7 +385,7 @@ protected interface HostedModeBaseOptions extends JJSOptions, OptionLogDir, OptionLogLevel, OptionGenDir, OptionNoServer, OptionPort, - OptionPortHosted, OptionStartupURLs, OptionRemoteUI { + OptionCodeServerPort, OptionStartupURLs, OptionRemoteUI { /** * The base shell work directory. @@ -435,7 +439,7 @@ return port; } - public int getPortHosted() { + public int getCodeServerPort() { return portHosted; } @@ -475,7 +479,7 @@ this.port = port; } - public void setPortHosted(int port) { + public void setCodeServerPort(int port) { portHosted = port; } @@ -526,10 +530,10 @@ void setPort(int port); } - protected interface OptionPortHosted { - int getPortHosted(); - - void setPortHosted(int portHosted); + protected interface OptionCodeServerPort { + int getCodeServerPort(); + + void setCodeServerPort(int codeServerPort); } /** @@ -571,7 +575,7 @@ registerHandler(new ArgHandlerLogDir(options)); registerHandler(new ArgHandlerLogLevel(options)); registerHandler(new ArgHandlerGenDir(options)); - registerHandler(new ArgHandlerPortHosted(options)); + registerHandler(new ArgHandlerCodeServerPort(options)); registerHandler(new ArgHandlerRemoteUI(options)); } } @@ -827,7 +831,7 @@ protected void ensureCodeServerListener() { if (listener == null) { - codeServerPort = options.getPortHosted(); + codeServerPort = options.getCodeServerPort(); listener = new BrowserListener(getTopLogger(), codeServerPort, new OophmSessionHandler(browserHost)); listener.start(); @@ -1005,7 +1009,7 @@ if (options.useRemoteUI()) { return new RemoteUI(options.getRemoteUIHost(), options.getRemoteUIHostPort(), options.getClientId(), - options.getPort(), options.getPortHosted()); + options.getPort(), options.getCodeServerPort()); } } ======================================= --- /releases/2.0/user/src/com/google/gwt/junit/JUnitShell.java Mon Nov 16 19:22:20 2009 +++ /releases/2.0/user/src/com/google/gwt/junit/JUnitShell.java Wed Nov 18 14:04:15 2009 @@ -130,10 +130,10 @@ }); // Override port to set auto by default. - registerHandler(new ArgHandlerPortHosted(options) { + registerHandler(new ArgHandlerCodeServerPort(options) { @Override public String[] getDefaultArgs() { - return new String[] {"-portHosted", "auto"}; + return new String[] {this.getTag(), "auto"}; } }); -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
