Undo changeset 19049 (several files committed by accident) except for the mergeinfo update

svn changeset:19050/svn branch:6.6

2 files changed, 4 insertions, 2 deletions

diff --git a/src/com/vaadin/launcher/DevelopmentServerLauncher.java b/src/com/vaadin/launcher/DevelopmentServerLauncher.java
index 38222324d3..256712c963 100644
--- a/src/com/vaadin/launcher/DevelopmentServerLauncher.java
+++ b/src/com/vaadin/launcher/DevelopmentServerLauncher.java
@@ -14,6 +14,8 @@ import org.mortbay.jetty.nio.SelectChannelConnector;
 import org.mortbay.jetty.security.SslSocketConnector;

 import org.mortbay.jetty.webapp.WebAppContext;

 

+import com.vaadin.launcher.util.BrowserLauncher;

+

 /**

  * Class for running Jetty servlet container within Eclipse project.

  * 

@@ -47,7 +49,7 @@ public class DevelopmentServerLauncher {
                 System.out.println("Starting Web Browser.");

 

                 // Open browser into application URL

-                // BrowserLauncher.openBrowser(url);

+                BrowserLauncher.openBrowser(url);

             }

         } catch (Exception e) {

             // NOP exception already on console by jetty

diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index 5f596ca398..738f9c53c5 100644
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -985,7 +985,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Gets the icon Resource for the specified column.
      * 
      * @param propertyId
-     *            the propertyId identifying the column.
+     *            the propertyId indentifying the column.
      * @return the icon for the specified column; null if the column has no icon
      *         set, or if the column is not visible.
      */