Revision: 7011 Author: [email protected] Date: Wed Nov 18 15:09:17 2009 Log: tr...@7009 was merged into this branch: Sorts set/getCodeServerPort properly
http://code.google.com/p/google-web-toolkit/source/detail?r=7011 Modified: /releases/2.0/branch-info.txt /releases/2.0/dev/core/src/com/google/gwt/dev/DevModeBase.java ======================================= --- /releases/2.0/branch-info.txt Wed Nov 18 14:09:08 2009 +++ /releases/2.0/branch-info.txt Wed Nov 18 15:09:17 2009 @@ -794,3 +794,6 @@ Revert "Tweak log levels and don't launchURLs if we are using the RemoteUI." svn merge --ignore-ancestry -c 7003 https://google-web-toolkit.googlecode.com/svn/trunk . +tr...@7009 was merged into this branch + Sorts set/getCodeServerPort properly + svn merge --ignore-ancestry -c7009 https://google-web-toolkit.googlecode.com/svn/trunk . ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/DevModeBase.java Wed Nov 18 14:09:08 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/DevModeBase.java Wed Nov 18 15:09:17 2009 @@ -145,6 +145,57 @@ return BrowserWidgetHostChecker.blacklistRegexes(blacklistStr); } } + + /** + * Handles the -portHosted command line flag. + */ + 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[] {CODE_SERVER_PORT_TAG, DEFAULT_PORT}; + } + + @Override + public String getPurpose() { + return "Specifies the TCP port for the code server (defaults to " + + DEFAULT_PORT + ")"; + } + + @Override + public String getTag() { + return CODE_SERVER_PORT_TAG; + } + + @Override + public String[] getTagArgs() { + return new String[] {"port-number | \"auto\""}; + } + + @Override + public boolean setString(String value) { + if (value.equals("auto")) { + options.setCodeServerPort(getFreeSocketPort()); + } else { + try { + options.setCodeServerPort(Integer.parseInt(value)); + } catch (NumberFormatException e) { + System.err.println("A port must be an integer or \"auto\""); + return false; + } + } + return true; + } + } /** * Handles the -logdir command line option. @@ -251,57 +302,6 @@ return true; } } - - /** - * Handles the -portHosted command line flag. - */ - 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[] {CODE_SERVER_PORT_TAG, DEFAULT_PORT}; - } - - @Override - public String getPurpose() { - return "Specifies the TCP port for the code server (defaults to " + - DEFAULT_PORT + ")"; - } - - @Override - public String getTag() { - return CODE_SERVER_PORT_TAG; - } - - @Override - public String[] getTagArgs() { - return new String[] {"port-number | \"auto\""}; - } - - @Override - public boolean setString(String value) { - if (value.equals("auto")) { - options.setCodeServerPort(getFreeSocketPort()); - } else { - try { - options.setCodeServerPort(Integer.parseInt(value)); - } catch (NumberFormatException e) { - System.err.println("A port must be an integer or \"auto\""); - return false; - } - } - return true; - } - } protected static class ArgHandlerRemoteUI extends ArgHandlerString { @@ -382,7 +382,7 @@ return BrowserWidgetHostChecker.whitelistRegexes(whitelistStr); } } - + protected interface HostedModeBaseOptions extends JJSOptions, OptionLogDir, OptionLogLevel, OptionGenDir, OptionNoServer, OptionPort, OptionCodeServerPort, OptionStartupURLs, OptionRemoteUI { @@ -423,6 +423,10 @@ public String getClientId() { return remoteUIClientId; } + + public int getCodeServerPort() { + return portHosted; + } public File getLogDir() { return logDir; @@ -438,10 +442,6 @@ public int getPort() { return port; } - - public int getCodeServerPort() { - return portHosted; - } public String getRemoteUIHost() { return remoteUIHost; @@ -466,6 +466,10 @@ public void setClientId(String clientId) { this.remoteUIClientId = clientId; } + + public void setCodeServerPort(int port) { + portHosted = port; + } public void setLogFile(String filename) { logDir = new File(filename); @@ -478,10 +482,6 @@ public void setPort(int port) { this.port = port; } - - public void setCodeServerPort(int port) { - portHosted = port; - } public void setRemoteUIHost(String remoteUIHost) { this.remoteUIHost = remoteUIHost; @@ -495,6 +495,12 @@ return remoteUIHost != null; } } + + protected interface OptionCodeServerPort { + int getCodeServerPort(); + + void setCodeServerPort(int codeServerPort); + } /** * Controls whether and where to log data to file. @@ -529,12 +535,6 @@ void setPort(int port); } - - protected interface OptionCodeServerPort { - int getCodeServerPort(); - - void setCodeServerPort(int codeServerPort); - } /** * Controls the UI that should be used to display the dev mode server's data. @@ -579,6 +579,8 @@ registerHandler(new ArgHandlerRemoteUI(options)); } } + + protected static final Map<String, ModuleDef> startupModules = new HashMap<String, ModuleDef>(); private static final Random RNG = new Random(); -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
