Merge branch 'master' into layoutgraph

7 files changed, 49 insertions, 61 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
index fabaeddc78..170e949116 100644
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
@@ -16,11 +16,9 @@ import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.core.client.JsArrayString;
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.core.client.Scheduler.ScheduledCommand;
-import com.google.gwt.event.shared.UmbrellaException;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.Timer;
 import com.vaadin.terminal.gwt.client.ui.UnknownComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.VNotification;
 
 public class ApplicationConfiguration implements EntryPoint {
 
@@ -574,19 +572,6 @@ public class ApplicationConfiguration implements EntryPoint {
                  * especially end user. It does not work tells just as much.
                  */
                 VConsole.getImplementation().error(e);
-
-                if (!GWT.isProdMode()) {
-                    e.printStackTrace();
-                }
-
-                try {
-                    VNotification.createNotification(
-                            VNotification.DELAY_FOREVER).show(
-                            getExceptionText(e), VNotification.CENTERED,
-                            "error");
-                } catch (Exception e2) {
-                    // Just swallow this exception
-                }
             }
         });
 
@@ -594,24 +579,6 @@ public class ApplicationConfiguration implements EntryPoint {
         deferredWidgetLoader = new DeferredWidgetLoader();
     }
 
-    private static final String getExceptionText(Throwable e) {
-        if (e instanceof UmbrellaException) {
-            UmbrellaException ue = (UmbrellaException) e;
-            String text = "";
-            for (Throwable t : ue.getCauses()) {
-                text += getExceptionText(t) + "<br />";
-            }
-            return text;
-        } else {
-            String text = e.getClass().getName();
-            String message = e.getMessage();
-            if (message != null) {
-                text += ": " + message;
-            }
-            return text;
-        }
-    }
-
     /**
      * Registers that callback that the bootstrap javascript uses to start
      * applications once the widgetset is loaded and all required information is
diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index 6a8856eaee..f693e8c203 100644
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -122,6 +122,8 @@ public class ApplicationConnection {
      */
     public static final String UIDL_REFRESH_TOKEN = "Vaadin-Refresh";
 
+    private final boolean debugLogging = false;
+
     // will hold the UIDL security key (for XSS protection) once received
     private String uidlSecurityKey = "init";
 
@@ -1002,11 +1004,13 @@ public class ApplicationConnection {
             public void execute() {
                 MultiStepDuration updateDuration = new MultiStepDuration();
 
-                VConsole.log(" * Dumping UIDL to the console");
-                VConsole.dirUIDL(json, configuration);
+                if (debugLogging) {
+                    VConsole.log(" * Dumping UIDL to the console");
+                    VConsole.dirUIDL(json, configuration);
 
-                updateDuration.logDuration(
-                        " * Dumping UIDL to the console completed", 10);
+                    updateDuration.logDuration(
+                            " * Dumping UIDL to the console completed", 10);
+                }
 
                 if (json.containsKey("locales")) {
                     VConsole.log(" * Handling locales");
diff --git a/src/com/vaadin/terminal/gwt/client/VDebugConsole.java b/src/com/vaadin/terminal/gwt/client/VDebugConsole.java
index fea777ff72..c457044ea9 100644
--- a/src/com/vaadin/terminal/gwt/client/VDebugConsole.java
+++ b/src/com/vaadin/terminal/gwt/client/VDebugConsole.java
@@ -54,6 +54,7 @@ import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ui.RootConnector;
 import com.vaadin.terminal.gwt.client.ui.VLazyExecutor;
+import com.vaadin.terminal.gwt.client.ui.VNotification;
 import com.vaadin.terminal.gwt.client.ui.VOverlay;
 import com.vaadin.terminal.gwt.client.ui.VWindow;
 
@@ -632,12 +633,23 @@ public class VDebugConsole extends VOverlay implements Console {
             }
             return;
         }
-        error(Util.getSimpleName(e) + ": " + e.getMessage());
+        String exceptionText = Util.getSimpleName(e);
+        String message = e.getMessage();
+        if (message != null && message.length() != 0) {
+            exceptionText += ": " + e.getMessage();
+        }
+        error(exceptionText);
         GWT.log(e.getMessage(), e);
         if (!GWT.isProdMode()) {
             e.printStackTrace();
         }
-
+        try {
+            VNotification.createNotification(VNotification.DELAY_FOREVER).show(
+                    "<h1>Uncaught client side exception</h1><br />"
+                            + exceptionText, VNotification.CENTERED, "error");
+        } catch (Exception e2) {
+            // Just swallow this exception
+        }
     }
 
     public void init() {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentContainerConnector.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentContainerConnector.java
index 2e26a06d1e..acf525bffb 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentContainerConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentContainerConnector.java
@@ -37,6 +37,8 @@ public abstract class AbstractComponentContainerConnector extends
 
     List<ComponentConnector> children;
 
+    private final boolean debugLogging = false;
+
     /**
      * Default constructor
      */
@@ -77,19 +79,21 @@ public abstract class AbstractComponentContainerConnector extends
      * (com.vaadin.terminal.gwt.client.ConnectorHierarchyChangedEvent)
      */
     public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) {
-        // TODO Remove debug info
-        VConsole.log("Hierarchy changed for " + Util.getConnectorString(this));
-        String oldChildren = "* Old children: ";
-        for (ComponentConnector child : event.getOldChildren()) {
-            oldChildren += Util.getConnectorString(child) + " ";
-        }
-        VConsole.log(oldChildren);
+        if (debugLogging) {
+            VConsole.log("Hierarchy changed for "
+                    + Util.getConnectorString(this));
+            String oldChildren = "* Old children: ";
+            for (ComponentConnector child : event.getOldChildren()) {
+                oldChildren += Util.getConnectorString(child) + " ";
+            }
+            VConsole.log(oldChildren);
 
-        String newChildren = "* New children: ";
-        for (ComponentConnector child : getChildren()) {
-            newChildren += Util.getConnectorString(child) + " ";
+            String newChildren = "* New children: ";
+            for (ComponentConnector child : getChildren()) {
+                newChildren += Util.getConnectorString(child) + " ";
+            }
+            VConsole.log(newChildren);
         }
-        VConsole.log(newChildren);
     }
 
     public HandlerRegistration addConnectorHierarchyChangeHandler(
diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractConnector.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractConnector.java
index c89a5d0854..12e19b2a70 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/AbstractConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractConnector.java
@@ -36,6 +36,7 @@ public abstract class AbstractConnector implements ServerConnector,
 
     private HandlerManager handlerManager;
     private Map<String, Collection<ClientRpc>> rpcImplementations;
+    private final boolean debugLogging = false;
 
     /*
      * (non-Javadoc)
@@ -163,9 +164,11 @@ public abstract class AbstractConnector implements ServerConnector,
     }
 
     public void onStateChanged(StateChangeEvent stateChangeEvent) {
-        VConsole.log("State change event for "
-                + Util.getConnectorString(stateChangeEvent.getConnector())
-                + " received by " + Util.getConnectorString(this));
+        if (debugLogging) {
+            VConsole.log("State change event for "
+                    + Util.getConnectorString(stateChangeEvent.getConnector())
+                    + " received by " + Util.getConnectorString(this));
+        }
     }
 
     /*
@@ -174,7 +177,10 @@ public abstract class AbstractConnector implements ServerConnector,
      * @see com.vaadin.terminal.gwt.client.ServerConnector#onUnregister()
      */
     public void onUnregister() {
-        VConsole.log("Unregistered connector " + Util.getConnectorString(this));
+        if (debugLogging) {
+            VConsole.log("Unregistered connector "
+                    + Util.getConnectorString(this));
+        }
 
     }
 }
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VPanel.java
index f46e694604..26eb5cb798 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VPanel.java
@@ -14,7 +14,6 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.Focusable;
-import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
 
 public class VPanel extends SimplePanel implements ShortcutActionHandlerOwner,
@@ -40,8 +39,6 @@ public class VPanel extends SimplePanel implements ShortcutActionHandlerOwner,
 
     ShortcutActionHandler shortcutHandler;
 
-    private String width = "";
-
     int scrollTop;
 
     int scrollLeft;
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index 9f1691112b..c295e05ed7 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -35,8 +35,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import sun.net.www.protocol.file.FileURLConnection;
-
 import com.vaadin.Application;
 import com.vaadin.Application.ApplicationStartEvent;
 import com.vaadin.Application.SystemMessages;
@@ -1146,7 +1144,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
                     "Failed to find out last modified timestamp. Continuing without it.",
                     e);
         } finally {
-            if (connection instanceof FileURLConnection) {
+            if (connection instanceof URLConnection) {
                 try {
                     // Explicitly close the input stream to prevent it
                     // from remaining hanging
@@ -1157,7 +1155,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
                     }
                 } catch (IOException e) {
                     logger.log(Level.INFO,
-                            "Error closing FileURLConnection input stream", e);
+                            "Error closing URLConnection input stream", e);
                 }
             }
         }