From: Leif Åstrand Date: Tue, 7 Feb 2012 11:22:09 +0000 (+0200) Subject: Fix broken newlines from previous commit X-Git-Tag: 7.0.0.alpha2~458 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6a5e17fb82e443e742d075642fb55b4b8c614eb5;p=vaadin-framework.git Fix broken newlines from previous commit --- diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidgetContainer.java b/src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidgetContainer.java index 87bf245217..e69de29bb2 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidgetContainer.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidgetContainer.java @@ -1,51 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.ui; - -import java.util.ArrayList; -import java.util.Collection; - -import com.google.gwt.user.client.ui.HasWidgets; -import com.google.gwt.user.client.ui.Widget; -import com.vaadin.terminal.gwt.client.VPaintableMap; -import com.vaadin.terminal.gwt.client.VPaintableWidget; -import com.vaadin.terminal.gwt.client.VPaintableWidgetContainer; - -public abstract class VAbstractPaintableWidgetContainer extends - VAbstractPaintableWidget implements VPaintableWidgetContainer { - - /** - * Default constructor - */ - public VAbstractPaintableWidgetContainer() { - } - - public Collection getChildren() { - Collection children = new ArrayList(); - - addDescendantPaintables(getWidgetForPaintable(), children, - VPaintableMap.get(getConnection())); - - return children; - } - - private static void addDescendantPaintables(Widget widget, - Collection paintables, VPaintableMap paintableMap) { - // FIXME: Store hierarchy instead of doing lookup every time - - if (widget instanceof HasWidgets) { - for (Widget child : (HasWidgets) widget) { - VPaintableWidget paintable = paintableMap.getPaintable(child); - if (paintable != null) { - // If child is a paintable, add it to the collection - paintables.add(paintable); - } else { - // Else keep looking for paintables inside the child widget - addDescendantPaintables(child, paintables, paintableMap); - } - } - } - } - -}