From 4a69d49ed8c2374e99921ac82f0b2d71308806ea Mon Sep 17 00:00:00 2001 From: Matti Tahvonen Date: Mon, 10 Dec 2007 15:51:52 +0000 Subject: [PATCH] refactored method signature svn changeset:3210/svn branch:trunk --- .../gwt/client/ApplicationConnection.java | 21 ++++++++++--------- .../gwt/client/ui/ICustomComponent.java | 2 +- .../terminal/gwt/client/ui/ICustomLayout.java | 7 +++---- .../terminal/gwt/client/ui/IExpandLayout.java | 5 +++-- .../toolkit/terminal/gwt/client/ui/IForm.java | 2 +- .../terminal/gwt/client/ui/IFormLayout.java | 2 +- .../terminal/gwt/client/ui/IGridLayout.java | 7 +++---- .../gwt/client/ui/IOrderedLayout.java | 2 +- .../terminal/gwt/client/ui/IPanel.java | 10 ++++----- .../terminal/gwt/client/ui/IScrollTable.java | 9 ++++---- .../terminal/gwt/client/ui/ISplitPanel.java | 4 ++-- .../terminal/gwt/client/ui/ITablePaging.java | 5 +++-- .../terminal/gwt/client/ui/ITabsheet.java | 6 +++--- .../toolkit/terminal/gwt/client/ui/IView.java | 8 +++---- .../terminal/gwt/client/ui/IWindow.java | 2 +- 15 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java index 0ca9967421..81ee3d1eee 100755 --- 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 ba79476fe3..d3305c04a5 100644 --- 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 0bd60001f7..c3aa2d45b9 100644 --- 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 fd8fa7a65e..d50c3cf351 100644 --- 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 1ae36d5cc8..82b7291257 100644 --- 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 { final UIDL layoutUidl = uidl.getChildUIDL(0); if (lo == null) { - lo = (Container) client.getWidget(layoutUidl); + lo = (Container) client.getPaintable(layoutUidl); setWidget((Widget) lo); } lo.updateFromUIDL(layoutUidl, client); 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 fd273174e3..f9c8b7bdab 100644 --- 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 074917c2f0..659fa68215 100644 --- 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 275a121fec..ec2763fedb 100644 --- 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 6d5520ec06..b90153a563 100644 --- 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 ab5cdc1e18..6dd5a74ba1 100644 --- 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 7a067488db..ddad482c67 100644 --- 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 1798f52783..4dffae63c7 100644 --- 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 e3a8404aa1..771082a15c 100644 --- 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 bf7910870e..7d85558982 100644 --- 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 f32b3a2f3b..bbb6168571 100644 --- 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 -- 2.39.5