Added nogui parameter

svn changeset:11701/svn branch:6.3

diff --git a/src/com/vaadin/launcher/DevelopmentServerLauncher.java b/src/com/vaadin/launcher/DevelopmentServerLauncher.java
index 68470937b35b5d5c7a99e847df50162368b3574d..03dfe1a64b7b452151dc4756498826b4b704b0cc 100644 (file)
--- a/src/com/vaadin/launcher/DevelopmentServerLauncher.java
+++ b/src/com/vaadin/launcher/DevelopmentServerLauncher.java
@@ -12,6 +12,8 @@ import org.mortbay.jetty.Server;
 import org.mortbay.jetty.nio.SelectChannelConnector;\r
 import org.mortbay.jetty.webapp.WebAppContext;\r
 \r
+import com.vaadin.launcher.util.BrowserLauncher;\r
+\r
 /**\r
  * Class for running Jetty servlet container within Eclipse project.\r
  * \r
@@ -31,7 +33,7 @@ public class DevelopmentServerLauncher {
     public static void main(String[] args) {\r
 \r
         // Pass-through of arguments for Jetty\r
-        final Map serverArgs = parseArguments(args);\r
+        final Map<String, String> serverArgs = parseArguments(args);\r
 \r
         // Start Jetty\r
         System.out.println("Starting Jetty servlet container.");\r
@@ -39,8 +41,10 @@ public class DevelopmentServerLauncher {
 \r
         // Start Browser\r
         System.out.println("Starting Web Browser.");\r
-        if (url != null) {\r
-            // BrowserLauncher.openBrowser(url);\r
+        if (!serverArgs.containsKey("nogui") && url != null) {\r
+\r
+            // Open browser into application URL\r
+            BrowserLauncher.openBrowser(url);\r
         }\r
 \r
     }\r
@@ -51,7 +55,8 @@ public class DevelopmentServerLauncher {
      * @param serverArgs\r
      * @return\r
      */\r
-    protected static String runServer(Map serverArgs, String mode) {\r
+    protected static String runServer(Map<String, String> serverArgs,\r
+            String mode) {\r
 \r
         // Add help for System.out\r
         System.out\r
@@ -77,8 +82,8 @@ public class DevelopmentServerLauncher {
             server.setConnectors(new Connector[] { connector });\r
 \r
             final WebAppContext webappcontext = new WebAppContext();\r
-            webappcontext.setContextPath(serverArgs.get("context").toString());\r
-            webappcontext.setWar(serverArgs.get("webroot").toString());\r
+            webappcontext.setContextPath(serverArgs.get("context"));\r
+            webappcontext.setWar(serverArgs.get("webroot"));\r
 \r
             server.setHandler(webappcontext);\r
 \r
@@ -99,7 +104,8 @@ public class DevelopmentServerLauncher {
      * @param key\r
      * @param value\r
      */\r
-    private static void assignDefault(Map map, String key, String value) {\r
+    private static void assignDefault(Map<String, String> map, String key,\r
+            String value) {\r
         if (!map.containsKey(key)) {\r
             map.put(key, value);\r
         }\r
@@ -113,8 +119,8 @@ public class DevelopmentServerLauncher {
      * @param args\r
      * @return map of arguments key value pairs.\r
      */\r
-    protected static Map parseArguments(String[] args) {\r
-        final Map map = new HashMap();\r
+    protected static Map<String, String> parseArguments(String[] args) {\r
+        final Map<String, String> map = new HashMap<String, String>();\r
         for (int i = 0; i < args.length; i++) {\r
             final int d = args[i].indexOf("=");\r
             if (d > 0 && d < args[i].length() && args[i].startsWith("--")) {\r