From afb01d3d1c23980ba5148edf12377e4c9ad95dde Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Wed, 8 Aug 2012 22:02:50 +0300 Subject: [PATCH] fixed some boxlayout imports --- .../gwt/client/ui/AbstractBoxLayoutConnector.java | 10 ++++++---- .../gwt/client/ui/HorizontalBoxLayoutConnector.java | 3 ++- src/com/vaadin/terminal/gwt/client/ui/VBoxLayout.java | 2 ++ .../gwt/client/ui/VerticalBoxLayoutConnector.java | 3 ++- .../tests/components/orderedlayout/BoxLayoutTest.java | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractBoxLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractBoxLayoutConnector.java index 413c605a88..230be7460b 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/AbstractBoxLayoutConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractBoxLayoutConnector.java @@ -9,7 +9,12 @@ import java.util.List; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.user.client.Element; -import com.vaadin.terminal.gwt.client.AbstractFieldState; +import com.vaadin.shared.AbstractFieldState; +import com.vaadin.shared.ui.AlignmentInfo; +import com.vaadin.shared.ui.LayoutClickRpc; +import com.vaadin.shared.ui.VMarginInfo; +import com.vaadin.shared.ui.orderedlayout.AbstractOrderedLayoutServerRpc; +import com.vaadin.shared.ui.orderedlayout.AbstractOrderedLayoutState; import com.vaadin.terminal.gwt.client.ComponentConnector; import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent; import com.vaadin.terminal.gwt.client.Util; @@ -20,8 +25,6 @@ import com.vaadin.terminal.gwt.client.ui.VBoxLayout.CaptionPosition; import com.vaadin.terminal.gwt.client.ui.VBoxLayout.Slot; import com.vaadin.terminal.gwt.client.ui.layout.ElementResizeEvent; import com.vaadin.terminal.gwt.client.ui.layout.ElementResizeListener; -import com.vaadin.terminal.gwt.client.ui.orderedlayout.AbstractOrderedLayoutServerRpc; -import com.vaadin.terminal.gwt.client.ui.orderedlayout.AbstractOrderedLayoutState; public abstract class AbstractBoxLayoutConnector extends AbstractLayoutConnector /* implements PostLayoutListener */{ @@ -199,7 +202,6 @@ public abstract class AbstractBoxLayoutConnector extends super.onStateChanged(stateChangeEvent); clickEventHandler.handleEventHandlerRegistration(); - getWidget().setMargin(new VMarginInfo(getState().getMarginsBitmask())); getWidget().setSpacing(getState().isSpacing()); diff --git a/src/com/vaadin/terminal/gwt/client/ui/HorizontalBoxLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/HorizontalBoxLayoutConnector.java index 53477571ed..44767dd125 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/HorizontalBoxLayoutConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/HorizontalBoxLayoutConnector.java @@ -3,7 +3,8 @@ */ package com.vaadin.terminal.gwt.client.ui; -import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle; +import com.vaadin.shared.ui.Connect; +import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.ui.HorizontalLayout; @Connect(value = HorizontalLayout.class, loadStyle = LoadStyle.EAGER) diff --git a/src/com/vaadin/terminal/gwt/client/ui/VBoxLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VBoxLayout.java index c49587c29b..ef25498832 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VBoxLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VBoxLayout.java @@ -19,6 +19,8 @@ import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.UIObject; import com.google.gwt.user.client.ui.Widget; +import com.vaadin.shared.ui.AlignmentInfo; +import com.vaadin.shared.ui.VMarginInfo; import com.vaadin.terminal.gwt.client.ComponentConnector; import com.vaadin.terminal.gwt.client.LayoutManager; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VerticalBoxLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/VerticalBoxLayoutConnector.java index 9953b02b2d..4235bcd869 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VerticalBoxLayoutConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VerticalBoxLayoutConnector.java @@ -3,7 +3,8 @@ */ package com.vaadin.terminal.gwt.client.ui; -import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle; +import com.vaadin.shared.ui.Connect; +import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.ui.VerticalLayout; @Connect(value = VerticalLayout.class, loadStyle = LoadStyle.EAGER) diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java index 8b96ae6f27..fb9a5ab751 100644 --- a/tests/testbench/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java +++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java @@ -8,10 +8,10 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.event.LayoutEvents.LayoutClickEvent; import com.vaadin.event.LayoutEvents.LayoutClickListener; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.ThemeResource; import com.vaadin.terminal.UserError; import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestRoot; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractField; -- 2.39.5