diff options
| author | Ahmed Ashour <asashour@yahoo.com> | 2017-10-31 17:41:14 +0100 |
|---|---|---|
| committer | Pekka Maanpää <pekkamaa@vaadin.com> | 2017-10-31 18:41:14 +0200 |
| commit | d44a5e217d1fc2852adb84cc6ce1c0146ac603f2 (patch) | |
| tree | 8a497e1b77f4f2f29bc218dc802f11bd3e370d69 /client | |
| parent | 3564d4b4ba7c9ff718879d7544aa2e309489c531 (diff) | |
| download | vaadin-framework-d44a5e217d1fc2852adb84cc6ce1c0146ac603f2.tar.gz vaadin-framework-d44a5e217d1fc2852adb84cc6ce1c0146ac603f2.zip | |
Fix end of line comments, which were made by automatic formatter (#10234)
Diffstat (limited to 'client')
4 files changed, 13 insertions, 17 deletions
diff --git a/client/src/main/java/com/vaadin/client/connectors/grid/GridDropTargetConnector.java b/client/src/main/java/com/vaadin/client/connectors/grid/GridDropTargetConnector.java index 44a60b9fd5..3d8164b63f 100644 --- a/client/src/main/java/com/vaadin/client/connectors/grid/GridDropTargetConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/grid/GridDropTargetConnector.java @@ -302,10 +302,10 @@ public class GridDropTargetConnector extends DropTargetExtensionConnector { if (visibleRowRange.isEmpty() || getState().dropMode == DropMode.ON_TOP) { return tableWrapper; - } else { // if dragged under the last row to empty space, drop target - // needs to be below the last row - return gridBody.getRowElement(visibleRowRange.getEnd() - 1); } + // if dragged under the last row to empty space, drop target + // needs to be below the last row + return gridBody.getRowElement(visibleRowRange.getEnd() - 1); } @Override diff --git a/client/src/main/java/com/vaadin/client/ui/VGridLayout.java b/client/src/main/java/com/vaadin/client/ui/VGridLayout.java index 35caea48a2..b7adf70c2c 100644 --- a/client/src/main/java/com/vaadin/client/ui/VGridLayout.java +++ b/client/src/main/java/com/vaadin/client/ui/VGridLayout.java @@ -363,9 +363,10 @@ public class VGridLayout extends ComplexPanel { int y = paddingTop; for (int column = 0; column < cells.length; column++) { - y = paddingTop + 1 - 1; // Ensure IE10 does not optimize this out by - // adding something to evaluate on the RHS - // #11303 + // Ensure IE10 does not optimize this out by + // adding something to evaluate on the RHS + // #11303 + y = paddingTop + 1 - 1; for (int row = 0; row < cells[column].length; row++) { Cell cell = cells[column][row]; diff --git a/client/src/main/java/com/vaadin/client/ui/window/WindowConnector.java b/client/src/main/java/com/vaadin/client/ui/window/WindowConnector.java index 4159ef1078..fb1bba4182 100644 --- a/client/src/main/java/com/vaadin/client/ui/window/WindowConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/window/WindowConnector.java @@ -308,8 +308,9 @@ public class WindowConnector extends AbstractSingleComponentContainerConnector || "video".equalsIgnoreCase(old.getTagName())) { if (!old.hasAttribute("controls") && "audio".equalsIgnoreCase(old.getTagName())) { - return null; // nothing to animate, so we won't add this to - // the clone + // nothing to animate, so we won't add this to + // the clone + return null; } Element newEl = DOM.createElement(old.getTagName()); if (old.hasAttribute("controls")) { 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 34b58d569f..3dee1c0eba 100755 --- a/client/src/main/java/com/vaadin/client/widgets/Grid.java +++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java @@ -4458,12 +4458,8 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, 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(); @@ -4477,9 +4473,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, .toArray(new Column[reordered.size()]); setColumnOrder(true, array); transferCellFocusOnDrop(); - } // else - // no - // reordering + } // else no reordering } private void transferCellFocusOnDrop() { |