diff options
| author | Henri Sara <hesara@vaadin.com> | 2012-01-31 16:42:09 +0200 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2012-01-31 16:42:09 +0200 |
| commit | dc0268c218c9de44df30f816d541de279e529ef4 (patch) | |
| tree | 606d37feaf88e33c65c7b667b175ecff745c1061 /src/com/vaadin/terminal/gwt/client/Util.java | |
| parent | c763891bc1535f62e524b4d4ba5837ab53817dd9 (diff) | |
| parent | 1d01f9204bd760789592238be039acef57616109 (diff) | |
| download | vaadin-framework-dc0268c218c9de44df30f816d541de279e529ef4.tar.gz vaadin-framework-dc0268c218c9de44df30f816d541de279e529ef4.zip | |
Merge branch 'master' into rpc
Conflicts:
build/build.xml
src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
src/com/vaadin/terminal/gwt/client/Container.java
src/com/vaadin/terminal/gwt/client/VPaintableWidget.java
src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidget.java
src/com/vaadin/terminal/gwt/client/ui/VButton.java
src/com/vaadin/terminal/gwt/client/ui/VButtonPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
src/com/vaadin/terminal/gwt/client/ui/VNativeButtonPaintable.java
src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
src/com/vaadin/terminal/gwt/client/ui/VSlider.java
src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java
src/com/vaadin/terminal/gwt/client/ui/VUpload.java
src/com/vaadin/terminal/gwt/client/ui/VWindow.java
src/com/vaadin/ui/Button.java
tests/server-side/com/vaadin/tests/VaadinClasses.java
Diffstat (limited to 'src/com/vaadin/terminal/gwt/client/Util.java')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/Util.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/Util.java b/src/com/vaadin/terminal/gwt/client/Util.java index 4487341bd7..a3b1074fc4 100644 --- a/src/com/vaadin/terminal/gwt/client/Util.java +++ b/src/com/vaadin/terminal/gwt/client/Util.java @@ -155,7 +155,7 @@ public class Util { Set<Widget> parentChanges = new HashSet<Widget>(); for (Container parent : childWidgets.keySet()) { if (!parent.requestLayout(childWidgets.get(parent))) { - parentChanges.add(parent.getWidgetForPaintable()); + parentChanges.add((Widget) parent); } } @@ -740,7 +740,7 @@ public class Util { */ public static VPaintableWidget getChildPaintableForElement( ApplicationConnection client, Container parent, Element element) { - Element rootElement = parent.getWidgetForPaintable().getElement(); + Element rootElement = ((Widget) parent).getElement(); while (element != null && element != rootElement) { VPaintableWidget paintable = VPaintableMap.get(client) .getPaintable(element); |