WidgetSet.createWidget() now returns Paintable, to indicate that that's required...

svn changeset:5223/svn branch:trunk

diff --git a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ColorPickerWidgetSet.java b/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ColorPickerWidgetSet.java
index 77409e56861223c2646895e5f52f36e2558fb3bc..f095a5425bdf6c8ff880516f20deb8cbbe671c12 100644 (file)
--- a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ColorPickerWidgetSet.java
+++ b/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ColorPickerWidgetSet.java
@@ -4,14 +4,14 @@
 \r
 package com.itmill.toolkit.demo.colorpicker.gwt.client;\r
 \r
-import com.google.gwt.user.client.ui.Widget;\r
 import com.itmill.toolkit.demo.colorpicker.gwt.client.ui.IColorPicker;\r
 import com.itmill.toolkit.terminal.gwt.client.DefaultWidgetSet;\r
+import com.itmill.toolkit.terminal.gwt.client.Paintable;\r
 import com.itmill.toolkit.terminal.gwt.client.UIDL;\r
 \r
 public class ColorPickerWidgetSet extends DefaultWidgetSet {\r
     /** Creates a widget according to its class name. */\r
-    public Widget createWidget(UIDL uidl) {\r
+    public Paintable createWidget(UIDL uidl) {\r
         final String className = resolveWidgetTypeName(uidl);\r
         if ("com.itmill.toolkit.demo.colorpicker.gwt.client.ui.IColorPicker"\r
                 .equals(className)) {\r

diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/client/ReservationWidgetSet.java b/src/com/itmill/toolkit/demo/reservation/gwt/client/ReservationWidgetSet.java
index 8171a0df232b095947be98bdffba5a5936f24eb4..6805be52315904896f21c076dfa7a15f11a3dfeb 100644 (file)
--- a/src/com/itmill/toolkit/demo/reservation/gwt/client/ReservationWidgetSet.java
+++ b/src/com/itmill/toolkit/demo/reservation/gwt/client/ReservationWidgetSet.java
@@ -9,10 +9,11 @@ import com.google.gwt.user.client.ui.Widget;
 import com.itmill.toolkit.demo.reservation.gwt.client.ui.ICalendarField;\r
 import com.itmill.toolkit.demo.reservation.gwt.client.ui.IGoogleMap;\r
 import com.itmill.toolkit.terminal.gwt.client.DefaultWidgetSet;\r
+import com.itmill.toolkit.terminal.gwt.client.Paintable;\r
 import com.itmill.toolkit.terminal.gwt.client.UIDL;\r
 \r
 public class ReservationWidgetSet extends DefaultWidgetSet {\r
-    public Widget createWidget(UIDL uidl) {\r
+    public Paintable createWidget(UIDL uidl) {\r
         final String className = resolveWidgetTypeName(uidl);\r
         if ("com.itmill.toolkit.terminal.gwt.client.ui.IGoogleMap"\r
                 .equals(className)) {\r

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
index 212bbbf875fc112ad32d44834e3feca501dd597d..192e934a274955ef59b02fa39d45b8232f366c59 100755 (executable)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
@@ -745,7 +745,7 @@ public class ApplicationConnection {
         if (!widgetSet.isCorrectImplementation(component, uidl)) {
             final Container parent = Util.getParentLayout(component);
             if (parent != null) {
-                final Widget w = widgetSet.createWidget(uidl);
+                final Widget w = (Widget) widgetSet.createWidget(uidl);
                 parent.replaceChildComponent(component, w);
                 registerPaintable(uidl.getId(), (Paintable) w);
                 ((Paintable) w).updateFromUIDL(uidl, this);
@@ -866,7 +866,7 @@ public class ApplicationConnection {
         if (w != null) {
             return w;
         }
-        w = (Paintable) widgetSet.createWidget(uidl);
+        w = widgetSet.createWidget(uidl);
         registerPaintable(id, w);
         return w;
     }

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetSet.java b/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetSet.java
index b98cdec668da53655838acbd077f278c4299c0c1..0cd7348c5eba8c0217825441bda22df297422df7 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetSet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetSet.java
@@ -66,7 +66,7 @@ public class DefaultWidgetSet implements WidgetSet {
         }
     }
 
-    public Widget createWidget(UIDL uidl) {
+    public Paintable createWidget(UIDL uidl) {
 
         final String className = resolveWidgetTypeName(uidl);
         if ("com.itmill.toolkit.terminal.gwt.client.ui.ICheckBox"

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/WidgetSet.java b/src/com/itmill/toolkit/terminal/gwt/client/WidgetSet.java
index e55da2c33df87adda060896a5551d9704c7c852e..8583e34cf4d41362711bba9291ae0fc17396676b 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/WidgetSet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/WidgetSet.java
@@ -10,14 +10,15 @@ import com.google.gwt.user.client.ui.Widget;
 public interface WidgetSet extends EntryPoint {
 
     /**
-     * Create an uninitialized component that best matches given UIDL.
+     * Create an uninitialized component that best matches given UIDL. The
+     * component must be a {@link Widget} that implements {@link Paintable}.
      * 
      * @param uidl
      *                UIDL to be painted with returned component.
      * @return New uninitialized and unregistered component that can paint given
      *         UIDL.
      */
-    public Widget createWidget(UIDL uidl);
+    public Paintable createWidget(UIDL uidl);
 
     /**
      * Test if the given component implementation conforms to UIDL.