From 0ae571811f79d05d599281bd1def73b9a39d11d6 Mon Sep 17 00:00:00 2001 From: Olli Tietäväinen Date: Wed, 14 Nov 2018 13:48:43 +0200 Subject: formatting changes --- .../src/main/java/com/vaadin/v7/client/widgets/Grid.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'compatibility-client/src') diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java index 3ef3adcc21..631f3bdb65 100755 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java @@ -4046,7 +4046,7 @@ public class Grid extends ResizeComposite implements HasSelectionHandlers, private final class ColumnHider { /** Map from columns to their hiding toggles, component might change */ - private HashMap, MenuItem> columnToHidingToggleMap = new HashMap, MenuItem>(); + private Map, MenuItem> columnToHidingToggleMap = new HashMap, MenuItem>(); /** * When column is being hidden with a toggle, do not refresh toggles for @@ -4491,7 +4491,7 @@ public class Grid extends ResizeComposite implements HasSelectionHandlers, reordered.addAll(columns.subList( draggedColumnIndex + colspan, columns.size())); } - // since setColumnOrder will // add it anyway! + // since setColumnOrder will add it anyway! reordered.remove(selectionColumn); // capture focused cell column before reorder @@ -6649,7 +6649,7 @@ public class Grid extends ResizeComposite implements HasSelectionHandlers, * @return A unmodifiable list of the currently visible columns in the grid */ public List> getVisibleColumns() { - ArrayList> visible = new ArrayList>(); + List> visible = new ArrayList>(); for (Column c : columns) { if (!c.isHidden()) { visible.add(c); @@ -9179,9 +9179,7 @@ public class Grid extends ResizeComposite implements HasSelectionHandlers, if (visible && !isVisible) { escalator.getBody().setSpacer(rowIndex, DETAILS_ROW_INITIAL_HEIGHT); visibleDetails.add(rowIndexInteger); - } - - else if (!visible && isVisible) { + } else if (!visible && isVisible) { escalator.getBody().setSpacer(rowIndex, -1); visibleDetails.remove(rowIndexInteger); } -- cgit v1.2.3