diff options
| -rw-r--r-- | client/src/main/java/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java | 13 | ||||
| -rw-r--r-- | server/src/main/java/com/vaadin/ui/GridLayout.java | 20 |
2 files changed, 3 insertions, 30 deletions
diff --git a/client/src/main/java/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java index b450092d54..03beb3c1e0 100644 --- a/client/src/main/java/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java @@ -42,7 +42,7 @@ import com.vaadin.ui.GridLayout; @Connect(GridLayout.class) public class GridLayoutConnector extends AbstractComponentContainerConnector - implements Paintable, DirectionalManagedLayout { + implements DirectionalManagedLayout { private LayoutClickEventHandler clickEventHandler = new LayoutClickEventHandler( this) { @@ -95,16 +95,6 @@ public class GridLayoutConnector extends AbstractComponentContainerConnector getWidget().hideEmptyRowsAndColumns = getState().hideEmptyRowsAndColumns; - } - - @Override - public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { - VGridLayout layout = getWidget(); - - if (!isRealUpdate(uidl)) { - return; - } - initSize(); for (Entry<Connector, ChildComponentData> entry : getState().childData @@ -117,6 +107,7 @@ public class GridLayoutConnector extends AbstractComponentContainerConnector cell.updateCell(childComponentData); } + VGridLayout layout = getWidget(); layout.colExpandRatioArray = getState().colExpand; layout.rowExpandRatioArray = getState().rowExpand; diff --git a/server/src/main/java/com/vaadin/ui/GridLayout.java b/server/src/main/java/com/vaadin/ui/GridLayout.java index 214d0c567f..e0fe7c18b7 100644 --- a/server/src/main/java/com/vaadin/ui/GridLayout.java +++ b/server/src/main/java/com/vaadin/ui/GridLayout.java @@ -75,7 +75,7 @@ import com.vaadin.ui.declarative.DesignContext; @SuppressWarnings("serial") public class GridLayout extends AbstractLayout implements Layout.AlignmentHandler, Layout.SpacingHandler, Layout.MarginHandler, - LayoutClickNotifier, LegacyComponent { + LayoutClickNotifier { private GridLayoutServerRpc rpc = new GridLayoutServerRpc() { @@ -446,24 +446,6 @@ public class GridLayout extends AbstractLayout implements return components.size(); } - @Override - public void changeVariables(Object source, Map<String, Object> variables) { - // TODO Remove once LegacyComponent is no longer implemented - } - - /** - * Paints the contents of this component. - * - * @param target - * the Paint Event. - * @throws PaintException - * if the paint operation failed. - */ - @Override - public void paintContent(PaintTarget target) throws PaintException { - // TODO Remove once LegacyComponent is no longer implemented - } - public void beforeClientResponse(boolean initial) { super.beforeClientResponse(initial); |