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 /compatibility-client/src | |
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 'compatibility-client/src')
4 files changed, 29 insertions, 21 deletions
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VForm.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VForm.java index 374a41ed42..b92e101d3c 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VForm.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VForm.java @@ -82,9 +82,10 @@ public class VForm extends ComplexPanel implements KeyDownHandler { fieldSet.appendChild(legend); legend.appendChild(caption); - fieldSet.appendChild(desc); // Adding description for initial padding - // measurements, removed later if no - // description is set + // Adding description for initial padding + // measurements, removed later if no + // description is set + fieldSet.appendChild(desc); fieldSet.appendChild(fieldContainer); errorMessage.setVisible(false); diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java index 3fdd286ef0..85e80fd928 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java @@ -325,9 +325,11 @@ public class VScrollTable extends FlowPanel private static final int CHARCODE_SPACE = 32; private int firstRowInViewPort = 0; private int pageLength = 15; - private int lastRequestedFirstvisible = 0; // to detect "serverside scroll" - private int firstvisibleOnLastPage = -1; // To detect if the first visible - // is on the last page + // to detect "serverside scroll" + private int lastRequestedFirstvisible = 0; + // To detect if the first visible + // is on the last page + private int firstvisibleOnLastPage = -1; /** For internal use only. May be removed or replaced in the future. */ public boolean showRowHeaders = false; @@ -3180,8 +3182,9 @@ public class VScrollTable extends FlowPanel colIndex = getColIndexByKey(cid); DOM.setCapture(getElement()); headerX = tHead.getAbsoluteLeft(); - event.preventDefault(); // prevent selecting text && - // generated touch events + // prevent selecting text && + // generated touch events + event.preventDefault(); } break; case Event.ONMOUSEUP: @@ -3237,10 +3240,12 @@ public class VScrollTable extends FlowPanel rowRequestHandler .setReqRows((int) (2 * pageLength * cacheRate + pageLength)); - rowRequestHandler.deferRowFetch(); // some validation + - // defer 250ms - rowRequestHandler.cancel(); // instead of waiting - rowRequestHandler.run(); // run immediately + // some validation and defer 250ms + // instead of waiting + rowRequestHandler.deferRowFetch(); + rowRequestHandler.cancel(); + // run immediately + rowRequestHandler.run(); } fireHeaderClickedEvent(event); if (WidgetUtil.isTouchEvent(event)) { @@ -7867,8 +7872,9 @@ public class VScrollTable extends FlowPanel VScrollTableRow toBeFocusedRow = scrollBody .getRowByRowIndex(indexOfToBeFocused); - if (toBeFocusedRow != null) { // if the next focused row - // is rendered + if (toBeFocusedRow != null) { + // if the next focused row is rendered + setRowFocus(toBeFocusedRow); selectFocusedRow(ctrl, shift); // TODO needs scrollintoview ? diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/DateCell.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/DateCell.java index 69fcaa194c..ba3f51d8d9 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/DateCell.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/DateCell.java @@ -573,9 +573,9 @@ public class DateCell extends FocusableComplexPanel implements MouseDownHandler, boolean display = true; if (event.isTimeOnDifferentDays()) { display = true; - } else { // only in case of one-day event we are able not to display - // event - // which is placed in unpublished parts on calendar + } else { + // only in case of one-day event we are able not to display + // event which is placed in unpublished parts on calendar Date eventStart = event.getStartTime(); Date eventEnd = event.getEndTime(); 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 a18cd15b28..cd69d19caf 100644 --- 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 @@ -4452,8 +4452,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(); @@ -4608,8 +4608,9 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, rightBound = cellColumnRightIndex; } cellColumnIndex = cellColumnRightIndex - 1; - } else { // can't drop inside a spanned cell, or this is the - // dragged cell + } else { + // can't drop inside a spanned cell, or this is the + // dragged cell while (colspan > 1) { cellColumnIndex++; colspan--; |