refactored method signature

svn changeset:3210/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
index 0ca9967421d6794e9bfda7aae3e663a9ce4c45b7..81ee3d1eee40b7a49b4501903eb178b580f5614d 100755 (executable)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
@@ -534,24 +534,25 @@ public class ApplicationConnection {
     }
 
     /**
-     * Get either existing or new widget for given UIDL.
+     * Get either existing or new Paintable for given UIDL.
      * 
-     * If corresponding paintable has been previously painted, return it.
-     * Otherwise create and register a new widget from UIDL. Caller must update
-     * the returned widget from UIDL after it has been connected to parent.
+     * If corresponding Paintable has been previously painted, return it.
+     * Otherwise create and register a new Paintable from UIDL. Caller must
+     * update the returned Paintable from UIDL after it has been connected to
+     * parent.
      * 
      * @param uidl
-     *                UIDL to create widget from.
-     * @return Either existing or new widget corresponding to UIDL.
+     *                UIDL to create Paintable from.
+     * @return Either existing or new Paintable corresponding to UIDL.
      */
-    public Widget getWidget(UIDL uidl) {
+    public Paintable getPaintable(UIDL uidl) {
         final String id = uidl.getId();
-        Widget w = (Widget) getPaintable(id);
+        Paintable w = getPaintable(id);
         if (w != null) {
             return w;
         }
-        w = widgetSet.createWidget(uidl);
-        registerPaintable(id, (Paintable) w);
+        w = (Paintable) widgetSet.createWidget(uidl);
+        registerPaintable(id, w);
         return w;
     }
 

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomComponent.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomComponent.java
index ba79476fe3aeabb5ef94d1cbcb31920556732716..d3305c04a5d8822f46eba30076de60adece2bfc6 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomComponent.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomComponent.java
@@ -23,7 +23,7 @@ public class ICustomComponent extends SimplePanel implements Paintable {
 
         final UIDL child = uidl.getChildUIDL(0);
         if (child != null) {
-            final Paintable p = (Paintable) client.getWidget(child);
+            final Paintable p = (Paintable) client.getPaintable(child);
             if (p != getWidget()) {
                 if (getWidget() != null) {
                     client.unregisterPaintable((Paintable) getWidget());

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java
index 0bd60001f77d55dbd16eb19fd4a5a9486bec7ef6..c3aa2d45b97ce3444f90da5d5a6066098c608a4e 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java
@@ -143,12 +143,11 @@ public class ICustomLayout extends ComplexPanel implements Paintable,
             final UIDL uidlForChild = (UIDL) i.next();
             if (uidlForChild.getTag().equals("location")) {
                 final String location = uidlForChild.getStringAttribute("name");
-                final Widget child = client.getWidget(uidlForChild
+                final Paintable child = client.getPaintable(uidlForChild
                         .getChildUIDL(0));
                 try {
-                    setWidget(child, location);
-                    ((Paintable) child).updateFromUIDL(uidlForChild
-                            .getChildUIDL(0), client);
+                    setWidget((Widget) child, location);
+                    child.updateFromUIDL(uidlForChild.getChildUIDL(0), client);
                 } catch (final IllegalArgumentException e) {
                     // If no location is found, this component is not visible
                 }

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java
index fd8fa7a65e8d548b042c428fa6ee3058ebca24ca..d50c3cf351f6b568d5c74285eae1a1ac919bfe63 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java
@@ -582,10 +582,11 @@ public class IExpandLayout extends ComplexPanel implements
         final ArrayList uidlWidgets = new ArrayList();
         for (final Iterator it = uidl.getChildIterator(); it.hasNext();) {
             final UIDL cellUidl = (UIDL) it.next();
-            final Widget child = client.getWidget(cellUidl.getChildUIDL(0));
+            final Paintable child = client.getPaintable(cellUidl
+                    .getChildUIDL(0));
             uidlWidgets.add(child);
             if (cellUidl.hasAttribute("expanded")) {
-                expandedWidget = child;
+                expandedWidget = (Widget) child;
                 expandedWidgetUidl = cellUidl.getChildUIDL(0);
             }
         }

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IForm.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IForm.java
index 1ae36d5cc82860f96ce70b0c49faeb4130eaa255..82b7291257e6811b421c310c73e45e6a900225bd 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IForm.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IForm.java
@@ -33,7 +33,7 @@ public class IForm extends SimplePanel implements Paintable {
 \r
         final UIDL layoutUidl = uidl.getChildUIDL(0);\r
         if (lo == null) {\r
-            lo = (Container) client.getWidget(layoutUidl);\r
+            lo = (Container) client.getPaintable(layoutUidl);\r
             setWidget((Widget) lo);\r
         }\r
         lo.updateFromUIDL(layoutUidl, client);\r

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java
index fd273174e35c10fba21aa8cc067f83a66e8687ad..f9c8b7bdab93ff88af6f1681724247ee73966393 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java
@@ -34,7 +34,7 @@ public class IFormLayout extends FlexTable implements Container {
         for (final Iterator it = uidl.getChildIterator(); it.hasNext(); i++) {
             prepareCell(i, 1);
             final UIDL childUidl = (UIDL) it.next();
-            final Paintable p = (Paintable) client.getWidget(childUidl);
+            final Paintable p = (Paintable) client.getPaintable(childUidl);
             Caption c = (Caption) componentToCaption.get(p);
             if (c == null) {
                 c = new Caption(p, client);

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java
index 074917c2f0edacc1bb8f6d1858e2d81fabf424b9..659fa68215771def8a4bf098108c7ae5c8b746a1 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java
@@ -82,22 +82,21 @@ public class IGridLayout extends FlexTable implements Paintable, Container {
 
                         final UIDL u = c.getChildUIDL(0);
                         if (u != null) {
-                            final Widget child = client.getWidget(u);
+                            final Paintable child = client.getPaintable(u);
                             CaptionWrapper wr;
                             if (widgetToCaptionWrapper.containsKey(child)) {
                                 wr = (CaptionWrapper) widgetToCaptionWrapper
                                         .get(child);
                                 oldWidgetWrappers.remove(wr);
                             } else {
-                                wr = new CaptionWrapper((Paintable) child,
-                                        client);
+                                wr = new CaptionWrapper(child, client);
                                 widgetToCaptionWrapper.put(child, wr);
                             }
 
                             setWidget(row, column, wr);
 
                             if (!u.getBooleanAttribute("cached")) {
-                                ((Paintable) child).updateFromUIDL(u, client);
+                                child.updateFromUIDL(u, client);
                             }
                         }
                         column += w;

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
index 275a121fec8da9b8614fc26b61b27e972bbfc2ba..ec2763fedb8053d169df0bcbe1d341f24c1c1cf0 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
@@ -114,7 +114,7 @@ public abstract class IOrderedLayout extends ComplexPanel implements Container {
         final ArrayList uidlWidgets = new ArrayList();
         for (final Iterator it = uidl.getChildIterator(); it.hasNext();) {
             final UIDL uidlForChild = (UIDL) it.next();
-            final Widget child = client.getWidget(uidlForChild);
+            final Paintable child = client.getPaintable(uidlForChild);
             uidlWidgets.add(child);
         }
 

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java
index 6d5520ec0612bdfaa5160298e25ce247516153bb..b90153a563af319a169c42c4bd0bb4b1681f4aab 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java
@@ -41,7 +41,7 @@ public class IPanel extends SimplePanel implements Paintable,
 
     private String height;
 
-    private Widget layout;
+    private Paintable layout;
 
     public IPanel() {
         super();
@@ -138,15 +138,15 @@ public class IPanel extends SimplePanel implements Paintable,
 
         // Render content
         final UIDL layoutUidl = uidl.getChildUIDL(0);
-        final Widget newLayout = client.getWidget(layoutUidl);
+        final Paintable newLayout = client.getPaintable(layoutUidl);
         if (newLayout != layout) {
             if (layout != null) {
-                client.unregisterPaintable((Paintable) layout);
+                client.unregisterPaintable(layout);
             }
-            setWidget(newLayout);
+            setWidget((Widget) newLayout);
             layout = newLayout;
         }
-        ((Paintable) layout).updateFromUIDL(layoutUidl, client);
+        (layout).updateFromUIDL(layoutUidl, client);
 
     }
 

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
index ab5cdc1e18504b177fb5f7b903a9be71e84af3a5..6dd5a74ba1efc921478d80a1f47e0adbbc06c850 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
@@ -1814,11 +1814,10 @@ public class IScrollTable extends Composite implements Table, ScrollListener,
                     if (cell instanceof String) {
                         addCell(cell.toString(), aligns[col++]);
                     } else {
-                        final Widget cellContent = client
-                                .getWidget((UIDL) cell);
-                        ((Paintable) cellContent).updateFromUIDL((UIDL) cell,
-                                client);
-                        addCell(cellContent, aligns[col++]);
+                        final Paintable cellContent = client
+                                .getPaintable((UIDL) cell);
+                        (cellContent).updateFromUIDL((UIDL) cell, client);
+                        addCell((Widget) cellContent, aligns[col++]);
                     }
                 }
                 if (uidl.hasAttribute("selected") && !isSelected()) {

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java
index 7a067488db350ee1edceab0eb0ff84c65b0a7c8d..ddad482c674687f634b6e208f3c3bc3b2e5bf212 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java
@@ -120,9 +120,9 @@ public class ISplitPanel extends ComplexPanel implements Paintable,
 
         setSplitPosition(uidl.getStringAttribute("position"));
 
-        final Paintable newFirstChild = (Paintable) client.getWidget(uidl
+        final Paintable newFirstChild = (Paintable) client.getPaintable(uidl
                 .getChildUIDL(0));
-        final Paintable newSecondChild = (Paintable) client.getWidget(uidl
+        final Paintable newSecondChild = (Paintable) client.getPaintable(uidl
                 .getChildUIDL(1));
         if (firstChild != newFirstChild) {
             if (firstChild != null) {

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java
index 1798f52783de6f9fd556b83f2589c1d9e14af832..4dffae63c70138cd4fb205b9175a3b006bff6926 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java
@@ -202,9 +202,10 @@ public class ITablePaging extends Composite implements Table, Paintable,
                     tBody.setWidget(curRowIndex, colIndex, new BodyCell(row,
                             (String) cell));
                 } else {
-                    final Widget cellContent = client.getWidget((UIDL) cell);
+                    final Paintable cellContent = client
+                            .getPaintable((UIDL) cell);
                     final BodyCell bodyCell = new BodyCell(row);
-                    bodyCell.setWidget(cellContent);
+                    bodyCell.setWidget((Widget) cellContent);
                     tBody.setWidget(curRowIndex, colIndex, bodyCell);
                 }
                 colIndex++;

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
index e3a8404aa125abab81c2d26ac2bc51fe3df4bd6f..771082a15c04ae495d8e053aac4cdf1a702e74f9 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
@@ -198,11 +198,11 @@ public class ITabsheet extends FlowPanel implements Paintable,
     private void renderContent(final UIDL contentUIDL) {
         DeferredCommand.addCommand(new Command() {
             public void execute() {
-                final Widget content = client.getWidget(contentUIDL);
+                final Paintable content = client.getPaintable(contentUIDL);
                 tp.remove(activeTabIndex);
-                tp.insert(content, activeTabIndex);
+                tp.insert((Widget) content, activeTabIndex);
                 tp.showWidget(activeTabIndex);
-                ((Paintable) content).updateFromUIDL(contentUIDL, client);
+                (content).updateFromUIDL(contentUIDL, client);
                 ITabsheet.this.removeStyleDependentName("loading");
                 ITabsheet.this.iLayout();
             }

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IView.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IView.java
index bf7910870e20bc308c95269b2bb2f287117bdaf1..7d85558982aca183186b4341b2f3b334bf392a05 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IView.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IView.java
@@ -81,7 +81,7 @@ public class IView extends SimplePanel implements Paintable,
 
         // Draw this application level window
         UIDL childUidl = uidl.getChildUIDL(childIndex);
-        final Paintable lo = (Paintable) client.getWidget(childUidl);
+        final Paintable lo = client.getPaintable(childUidl);
 
         if (layout != null) {
             if (layout != lo) {
@@ -103,13 +103,13 @@ public class IView extends SimplePanel implements Paintable,
         // Open new windows
         while ((childUidl = uidl.getChildUIDL(childIndex++)) != null) {
             if ("window".equals(childUidl.getTag())) {
-                final Widget w = client.getWidget(childUidl);
+                final Paintable w = client.getPaintable(childUidl);
                 if (subWindows.contains(w)) {
                     removedSubWindows.remove(w);
                 } else {
                     subWindows.add(w);
                 }
-                ((Paintable) w).updateFromUIDL(childUidl, client);
+                w.updateFromUIDL(childUidl, client);
             } else if ("actions".equals(childUidl.getTag())) {
                 if (actionHandler == null) {
                     actionHandler = new ShortcutActionHandler(id, client);
@@ -150,7 +150,7 @@ public class IView extends SimplePanel implements Paintable,
             RootPanel.get().remove(w);
         }
 
-        if (Util.isIE()) {
+        if (true) {
             // IE somehow fails some layout on first run, force layout
             // functions
             Util.runDescendentsLayout(this);

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java
index f32b3a2f3bd4a76a9cbbe8ab5b22afa88a8e4a5d..bbb61685713856e1a008eb6707e5268adbc93cf0 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java
@@ -249,7 +249,7 @@ public class IWindow extends PopupPanel implements Paintable, ScrollListener {
                 Window.open(parsedUri, target, "");
             }
         } else {
-            final Paintable lo = (Paintable) client.getWidget(childUidl);
+            final Paintable lo = (Paintable) client.getPaintable(childUidl);
             if (layout != null) {
                 if (layout != lo) {
                     // remove old