commit d7f5d8467ea6438cacc4ebbeb9d4cf79b06b4e2b
author mmendez@google.com <mmendez@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Wed Nov 18 21:24:48 2009 +0000
committer mmendez@google.com <mmendez@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Wed Nov 18 21:24:48 2009 +0000
tree 648aed6400548399b4d6febdab1577ffe3840a07
parent b8464deefefa7e02fe2441b5609b734a5026744d

Renamed the portHosted option to codeServerPort and associated types.

git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@7001 8db76d5a-ed1c-0410-87a9-c151d255dfc7

dev/core/src/com/google/gwt/dev/DevModeBase.java

diff --git a/dev/core/src/com/google/gwt/dev/DevModeBase.java b/dev/core/src/com/google/gwt/dev/DevModeBase.java
index c5782e7..c2b9e38 100644
--- a/dev/core/src/com/google/gwt/dev/DevModeBase.java
+++ b/dev/core/src/com/google/gwt/dev/DevModeBase.java
@@ -258,27 +258,31 @@
   /**
    * Handles the -portHosted command line flag.
    */
-  protected static class ArgHandlerPortHosted extends ArgHandlerString {
+  protected static class ArgHandlerCodeServerPort extends ArgHandlerString {
 
-    private final OptionPortHosted options;
+    private static final String CODE_SERVER_PORT_TAG = "-codeServerPort";
+    private static final String DEFAULT_PORT = "9997";
+    
+    private final OptionCodeServerPort options;
 
-    public ArgHandlerPortHosted(OptionPortHosted 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
@@ -289,10 +293,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;
@@ -386,7 +390,7 @@
 
   protected interface HostedModeBaseOptions extends JJSOptions, OptionLogDir,
       OptionLogLevel, OptionGenDir, OptionNoServer, OptionPort,
-      OptionPortHosted, OptionStartupURLs, OptionRemoteUI {
+      OptionCodeServerPort, OptionStartupURLs, OptionRemoteUI {
 
     /**
      * The base shell work directory.
@@ -440,7 +444,7 @@
       return port;
     }
 
-    public int getPortHosted() {
+    public int getCodeServerPort() {
       return portHosted;
     }
 
@@ -480,7 +484,7 @@
       this.port = port;
     }
 
-    public void setPortHosted(int port) {
+    public void setCodeServerPort(int port) {
       portHosted = port;
     }
 
@@ -531,10 +535,10 @@
     void setPort(int port);
   }
 
-  protected interface OptionPortHosted {
-    int getPortHosted();
+  protected interface OptionCodeServerPort {
+    int getCodeServerPort();
 
-    void setPortHosted(int portHosted);
+    void setCodeServerPort(int codeServerPort);
   }
 
   /**
@@ -576,7 +580,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));
     }
   }
@@ -832,7 +836,7 @@
 
   protected void ensureCodeServerListener() {
     if (listener == null) {
-      codeServerPort = options.getPortHosted();
+      codeServerPort = options.getCodeServerPort();
       listener = new BrowserListener(getTopLogger(), codeServerPort,
           new OophmSessionHandler(browserHost));
       listener.start();
@@ -1010,7 +1014,7 @@
       if (options.useRemoteUI()) {
         return new RemoteUI(options.getRemoteUIHost(),
             options.getRemoteUIHostPort(), options.getClientId(),
-            options.getPort(), options.getPortHosted());
+            options.getPort(), options.getCodeServerPort());
       }
     }
 

user/src/com/google/gwt/junit/JUnitShell.java

diff --git a/user/src/com/google/gwt/junit/JUnitShell.java b/user/src/com/google/gwt/junit/JUnitShell.java
index d564ae5..85f16f9 100644
--- a/user/src/com/google/gwt/junit/JUnitShell.java
+++ b/user/src/com/google/gwt/junit/JUnitShell.java
@@ -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"};
         }
       });