diff options
author | Sun Zhe <31067185+ZheSun88@users.noreply.github.com> | 2018-11-06 14:52:28 +0200 |
---|---|---|
committer | Ilia Motornyi <elijah.mot@gmail.com> | 2018-11-06 14:52:28 +0200 |
commit | b20a9a83184c6ef37173e2d9df1206eea5ceacf9 (patch) | |
tree | 0d57d1ce45021d37943e911e060fd0c64fc8958b /client | |
parent | 023ec7f48c5ca59d3a995d360500dda6ce9ef32f (diff) | |
download | vaadin-framework-b20a9a83184c6ef37173e2d9df1206eea5ceacf9.tar.gz vaadin-framework-b20a9a83184c6ef37173e2d9df1206eea5ceacf9.zip |
Code formatting (#11278)
Diffstat (limited to 'client')
-rw-r--r-- | client/src/main/java/com/vaadin/client/connectors/grid/ComponentRendererConnector.java | 34 | ||||
-rwxr-xr-x | client/src/main/java/com/vaadin/client/widgets/Grid.java | 1 |
2 files changed, 19 insertions, 16 deletions
diff --git a/client/src/main/java/com/vaadin/client/connectors/grid/ComponentRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/grid/ComponentRendererConnector.java index 21e663356d..71cd6ce9e3 100644 --- a/client/src/main/java/com/vaadin/client/connectors/grid/ComponentRendererConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/grid/ComponentRendererConnector.java @@ -61,12 +61,12 @@ public class ComponentRendererConnector @Override public void render(RendererCellReference cell, String connectorId, - SimplePanel widget) { + SimplePanel widget) { createConnectorHierarchyChangeHandler(); Widget connectorWidget = null; if (connectorId != null) { ComponentConnector connector = (ComponentConnector) ConnectorMap - .get(getConnection()).getConnector(connectorId); + .get(getConnection()).getConnector(connectorId); if (connector != null) { connectorWidget = connector.getWidget(); knownConnectors.add(connectorId); @@ -95,22 +95,26 @@ public class ComponentRendererConnector /** * Adds a listener for grid hierarchy changes to find detached connectors - * previously handled by this renderer in order to detach from DOM their widgets - * before {@link AbstractComponentConnector#onUnregister()} is invoked - * otherwise an error message is logged. + * previously handled by this renderer in order to detach from DOM their + * widgets before {@link AbstractComponentConnector#onUnregister()} is + * invoked otherwise an error message is logged. */ private void createConnectorHierarchyChangeHandler() { if (handlerRegistration == null) { - handlerRegistration = getGridConnector().addConnectorHierarchyChangeHandler(event -> { - Iterator<String> iterator = knownConnectors.iterator(); - while (iterator.hasNext()) { - ComponentConnector connector = (ComponentConnector) ConnectorMap.get(getConnection()).getConnector(iterator.next()); - if (connector != null && connector.getParent() == null) { - connector.getWidget().removeFromParent(); - iterator.remove(); - } - } - }); + handlerRegistration = getGridConnector() + .addConnectorHierarchyChangeHandler(event -> { + Iterator<String> iterator = knownConnectors.iterator(); + while (iterator.hasNext()) { + ComponentConnector connector = (ComponentConnector) ConnectorMap + .get(getConnection()) + .getConnector(iterator.next()); + if (connector != null + && connector.getParent() == null) { + connector.getWidget().removeFromParent(); + iterator.remove(); + } + } + }); } } diff --git a/client/src/main/java/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java index f42312c1d6..7add1fd654 100755 --- a/client/src/main/java/com/vaadin/client/widgets/Grid.java +++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java @@ -9147,7 +9147,6 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, recalculateColumnWidths(); } - if (getEscalatorInnerHeight() != autoColumnWidthsRecalculator.lastCalculatedInnerHeight) { Scheduler.get().scheduleFinally(() -> { // Trigger re-calculation of all row positions. |