Merged fixes for #4204 #4205

svn changeset:11392/svn branch:6.2

diff --git a/src/com/vaadin/terminal/gwt/client/ClientExceptionHandler.java b/src/com/vaadin/terminal/gwt/client/ClientExceptionHandler.java
index 724bd24a69073896047d8b93401f69faebf47d3f..f1b01509d44641950ec99501f98b9507044c1ee3 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ClientExceptionHandler.java
+++ b/src/com/vaadin/terminal/gwt/client/ClientExceptionHandler.java
@@ -3,7 +3,7 @@ package com.vaadin.terminal.gwt.client;
 public class ClientExceptionHandler {\r
 \r
     public static void displayError(Throwable e) {\r
-        displayError(e.getMessage());\r
+        displayError(e.getClass().getName() + ": " + e.getMessage());\r
         e.printStackTrace();\r
     }\r
 \r

diff --git a/src/com/vaadin/terminal/gwt/client/VDebugConsole.java b/src/com/vaadin/terminal/gwt/client/VDebugConsole.java
index 45b8c9353b465b16f56035e7dcfa465ac5ca82e2..172e4df6278c29c6f7c86a24ac670f71ab003587 100755 (executable)
--- a/src/com/vaadin/terminal/gwt/client/VDebugConsole.java
+++ b/src/com/vaadin/terminal/gwt/client/VDebugConsole.java
@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Set;
 
 import com.google.gwt.core.client.JsArray;
+import com.google.gwt.dom.client.Style.FontWeight;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.DOM;
@@ -304,6 +305,10 @@ public final class VDebugConsole extends VOverlay implements Console {
      * @see com.vaadin.terminal.gwt.client.Console#log(java.lang.String)
      */
     public void log(String msg) {
+        if (msg == null) {
+            msg = "null";
+        }
+
         panel.add(new HTML(msg));
         System.out.println(msg);
         consoleLog(msg);
@@ -315,7 +320,14 @@ public final class VDebugConsole extends VOverlay implements Console {
      * @see com.vaadin.terminal.gwt.client.Console#error(java.lang.String)
      */
     public void error(String msg) {
-        panel.add((new HTML(msg)));
+        if (msg == null) {
+            msg = "null";
+        }
+
+        HTML html = new HTML(msg);
+        html.getElement().getStyle().setColor("#f00");
+        html.getElement().getStyle().setFontWeight(FontWeight.BOLD);
+        panel.add(html);
         System.err.println(msg);
         consoleErr(msg);
     }
@@ -327,7 +339,13 @@ public final class VDebugConsole extends VOverlay implements Console {
      * Object)
      */
     public void printObject(Object msg) {
-        panel.add((new Label(msg.toString())));
+        String str;
+        if (msg == null) {
+            str = "null";
+        } else {
+            str = msg.toString();
+        }
+        panel.add((new Label(str)));
         consoleLog(msg.toString());
     }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java
index bf13530d7f6566bf9d491ecca12a4783d3c92754..90cf102cb9434179ba6a644ffbf9f407359656cb 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java
@@ -184,10 +184,11 @@ public class VCssLayout extends SimplePanel implements Paintable, Container {
 
             // loop oldWidgetWrappers that where not re-attached and unregister
             // them
-            for (final Iterator<Widget> it = oldWidgets.iterator(); it
-                    .hasNext();) {
-                final Paintable w = (Paintable) it.next();
-                client.unregisterPaintable(w);
+            for (Widget w : oldWidgets) {
+                if (w instanceof Paintable) {
+                    final Paintable p = (Paintable) w;
+                    client.unregisterPaintable(p);
+                }
                 widgetToCaption.remove(w);
             }
         }