From b39b875986acacdaebcbec27688e4c7cc5df23f1 Mon Sep 17 00:00:00 2001 From: Olli Tietäväinen Date: Tue, 13 Nov 2018 16:11:14 +0200 Subject: formatting changes --- .../src/main/java/com/vaadin/v7/client/widgets/Grid.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) 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 2d0774f3ec..055fcaef20 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 @@ -1770,10 +1770,10 @@ public class Grid extends ResizeComposite implements HasSelectionHandlers, * if the editor handler is not set */ public void setEnabled(boolean enabled) { - if (enabled == false && state != State.INACTIVE) { + if (!enabled && state != State.INACTIVE) { throw new IllegalStateException( "Cannot disable: editor is in edit mode"); - } else if (enabled == true && getHandler() == null) { + } else if (enabled && getHandler() == null) { throw new IllegalStateException( "Cannot enable: EditorHandler not set"); } @@ -4491,8 +4491,8 @@ public class Grid extends ResizeComposite implements HasSelectionHandlers, reordered.addAll(columns.subList( draggedColumnIndex + colspan, columns.size())); } - reordered.remove(selectionColumn); // since setColumnOrder will - // add it anyway! + // since setColumnOrder will // add it anyway! + reordered.remove(selectionColumn); // capture focused cell column before reorder Cell focusedCell = cellFocusHandler.getFocusedCell(); @@ -4646,9 +4646,8 @@ public class Grid extends ResizeComposite implements HasSelectionHandlers, rightBound = cellColumnRightIndex; } cellColumnIndex = cellColumnRightIndex - 1; - } - - else { // can't drop inside a spanned cell, or this is the + } else { + // can't drop inside a spanned cell, or this is the // dragged cell while (colspan > 1) { cellColumnIndex++; -- cgit v1.2.3