Browse Source

fixed some boxlayout imports

tags/7.0.0.beta1
Jouni Koivuviita 11 years ago
parent
commit
afb01d3d1c

+ 6
- 4
src/com/vaadin/terminal/gwt/client/ui/AbstractBoxLayoutConnector.java View File

@@ -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());


+ 2
- 1
src/com/vaadin/terminal/gwt/client/ui/HorizontalBoxLayoutConnector.java View File

@@ -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)

+ 2
- 0
src/com/vaadin/terminal/gwt/client/ui/VBoxLayout.java View File

@@ -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;


+ 2
- 1
src/com/vaadin/terminal/gwt/client/ui/VerticalBoxLayoutConnector.java View File

@@ -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)

+ 1
- 1
tests/testbench/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java View File

@@ -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;

Loading…
Cancel
Save