From 11ddb11cbc72b0ee233e503058d4e104030e4aa3 Mon Sep 17 00:00:00 2001 From: Ahmed Ashour Date: Thu, 21 Sep 2017 14:25:46 +0200 Subject: Update modifier order to follow Java Specification suggestions (#10050) Also includes some other minor cleanup. --- .../v7/client/renderers/ClickableRenderer.java | 2 +- .../java/com/vaadin/v7/client/ui/VCalendar.java | 2 +- .../com/vaadin/v7/client/ui/VCalendarPanel.java | 36 +++++----------------- .../java/com/vaadin/v7/client/ui/dd/VIsOverId.java | 2 +- .../java/com/vaadin/v7/client/ui/dd/VItemIdIs.java | 2 +- .../vaadin/v7/client/ui/tree/VTargetInSubtree.java | 2 +- .../client/widget/escalator/ScrollbarBundle.java | 4 +-- .../escalator/events/RowHeightChangedEvent.java | 2 +- .../widget/grid/events/ColumnReorderEvent.java | 2 +- .../widget/grid/events/ColumnResizeEvent.java | 2 +- .../grid/events/ColumnVisibilityChangeEvent.java | 2 +- .../client/widget/grid/events/SelectAllEvent.java | 2 +- .../com/vaadin/v7/client/widgets/Escalator.java | 6 ++-- .../java/com/vaadin/v7/client/widgets/Grid.java | 12 ++++---- 14 files changed, 29 insertions(+), 49 deletions(-) (limited to 'compatibility-client') diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/renderers/ClickableRenderer.java b/compatibility-client/src/main/java/com/vaadin/v7/client/renderers/ClickableRenderer.java index e76c3e4934..204ec064b6 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/renderers/ClickableRenderer.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/renderers/ClickableRenderer.java @@ -160,7 +160,7 @@ public abstract class ClickableRenderer return cellReference; } - private native static Escalator getEscalator(Grid grid) + private static native Escalator getEscalator(Grid grid) /*-{ return grid.@com.vaadin.v7.client.widgets.Grid::escalator; }-*/; diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendar.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendar.java index 77e5cbeab1..864b48595d 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendar.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendar.java @@ -247,7 +247,7 @@ public class VCalendar extends Composite implements VHasDropHandler { void contextMenu(ContextMenuEvent event, Widget widget); } - private static abstract class AbstractEventComparator + private abstract static class AbstractEventComparator implements Comparator { @Override diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendarPanel.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendarPanel.java index 8780c980ab..afc0a7340e 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendarPanel.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendarPanel.java @@ -1183,38 +1183,27 @@ public class VCalendarPanel extends FocusableFlexTable implements // Ctrl and Shift selection not supported if (ctrl || shift) { return false; - } - - else if (keycode == getPreviousKey()) { + } else if (keycode == getPreviousKey()) { focusNextYear(10); // Add 10 years return true; - } - - else if (keycode == getForwardKey()) { + } else if (keycode == getForwardKey()) { focusNextYear(1); // Add 1 year return true; - } - - else if (keycode == getNextKey()) { + } else if (keycode == getNextKey()) { focusPreviousYear(10); // Subtract 10 years return true; - } - - else if (keycode == getBackwardKey()) { + } else if (keycode == getBackwardKey()) { focusPreviousYear(1); // Subtract 1 year return true; - } else if (keycode == getSelectKey()) { value = (Date) focusedDate.clone(); onSubmit(); return true; - } else if (keycode == getResetKey()) { // Restore showing value the selected value focusedDate.setTime(value.getTime()); renderCalendar(); return true; - } else if (keycode == getCloseKey()) { // TODO fire listener, on users responsibility?? @@ -1402,24 +1391,15 @@ public class VCalendarPanel extends FocusableFlexTable implements boolean shift) { if (!isEnabled() || isReadonly()) { return false; - } - - else if (resolution == Resolution.YEAR) { + } else if (resolution == Resolution.YEAR) { return handleNavigationYearMode(keycode, ctrl, shift); - } - - else if (resolution == Resolution.MONTH) { + } else if (resolution == Resolution.MONTH) { return handleNavigationMonthMode(keycode, ctrl, shift); - } - - else if (resolution == Resolution.DAY) { + } else if (resolution == Resolution.DAY) { return handleNavigationDayMode(keycode, ctrl, shift); - } - - else { + } else { return handleNavigationDayMode(keycode, ctrl, shift); } - } /** diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/dd/VIsOverId.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/dd/VIsOverId.java index 6a3e389c0a..f2fec93627 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/dd/VIsOverId.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/dd/VIsOverId.java @@ -25,7 +25,7 @@ import com.vaadin.shared.ui.dd.AcceptCriterion; import com.vaadin.v7.ui.AbstractSelect; @AcceptCriterion(AbstractSelect.TargetItemIs.class) -final public class VIsOverId extends VAcceptCriterion { +public final class VIsOverId extends VAcceptCriterion { @Override protected boolean accept(VDragEvent drag, UIDL configuration) { diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/dd/VItemIdIs.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/dd/VItemIdIs.java index 1536f720cd..dfb643fc14 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/dd/VItemIdIs.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/dd/VItemIdIs.java @@ -23,7 +23,7 @@ import com.vaadin.shared.ui.dd.AcceptCriterion; import com.vaadin.v7.ui.AbstractSelect; @AcceptCriterion(AbstractSelect.AcceptItem.class) -final public class VItemIdIs extends VAcceptCriterion { +public final class VItemIdIs extends VAcceptCriterion { @Override protected boolean accept(VDragEvent drag, UIDL configuration) { diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/tree/VTargetInSubtree.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/tree/VTargetInSubtree.java index 75c9385877..24514714a9 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/tree/VTargetInSubtree.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/tree/VTargetInSubtree.java @@ -26,7 +26,7 @@ import com.vaadin.v7.client.ui.VTree.TreeNode; import com.vaadin.v7.ui.Tree; @AcceptCriterion(Tree.TargetInSubtree.class) -final public class VTargetInSubtree extends VAcceptCriterion { +public final class VTargetInSubtree extends VAcceptCriterion { @Override protected boolean accept(VDragEvent drag, UIDL configuration) { diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/ScrollbarBundle.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/ScrollbarBundle.java index 8e6d9a5243..3bfae76005 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/ScrollbarBundle.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/ScrollbarBundle.java @@ -205,7 +205,7 @@ public abstract class ScrollbarBundle implements DeferredWorker { * * @see VerticalScrollbarBundle#getElement() */ - public final static class VerticalScrollbarBundle extends ScrollbarBundle { + public static final class VerticalScrollbarBundle extends ScrollbarBundle { @Override public void setStylePrimaryName(String primaryStyleName) { @@ -275,7 +275,7 @@ public abstract class ScrollbarBundle implements DeferredWorker { * * @see HorizontalScrollbarBundle#getElement() */ - public final static class HorizontalScrollbarBundle + public static final class HorizontalScrollbarBundle extends ScrollbarBundle { @Override diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/events/RowHeightChangedEvent.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/events/RowHeightChangedEvent.java index c883a26716..99b26bb9de 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/events/RowHeightChangedEvent.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/events/RowHeightChangedEvent.java @@ -29,7 +29,7 @@ public class RowHeightChangedEvent extends GwtEvent { /** * Handler type. */ - public final static Type TYPE = new Type(); + public static final Type TYPE = new Type(); public static final Type getType() { return TYPE; diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/events/ColumnReorderEvent.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/events/ColumnReorderEvent.java index 399ed128a2..4c8dbc16af 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/events/ColumnReorderEvent.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/events/ColumnReorderEvent.java @@ -31,7 +31,7 @@ public class ColumnReorderEvent extends GwtEvent> { /** * Handler type. */ - private final static Type> TYPE = new Type>(); + private static final Type> TYPE = new Type>(); public static final Type> getType() { return TYPE; diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/events/ColumnResizeEvent.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/events/ColumnResizeEvent.java index ba50893411..04b067cf63 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/events/ColumnResizeEvent.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/events/ColumnResizeEvent.java @@ -32,7 +32,7 @@ public class ColumnResizeEvent extends GwtEvent> { /** * Handler type. */ - private final static Type> TYPE = new Type>(); + private static final Type> TYPE = new Type>(); private Column column; diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/events/ColumnVisibilityChangeEvent.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/events/ColumnVisibilityChangeEvent.java index e58b678e3d..8937308dd8 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/events/ColumnVisibilityChangeEvent.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/events/ColumnVisibilityChangeEvent.java @@ -31,7 +31,7 @@ import com.vaadin.v7.client.widgets.Grid.Column; public class ColumnVisibilityChangeEvent extends GwtEvent> { - private final static Type> TYPE = new Type>(); + private static final Type> TYPE = new Type>(); public static final Type> getType() { return TYPE; diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/events/SelectAllEvent.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/events/SelectAllEvent.java index c46a192292..ae9ca4c3da 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/events/SelectAllEvent.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/events/SelectAllEvent.java @@ -30,7 +30,7 @@ public class SelectAllEvent extends GwtEvent> { /** * Handler type. */ - private final static Type> TYPE = new Type>();; + private static final Type> TYPE = new Type>();; private SelectionModel.Multi selectionModel; diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Escalator.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Escalator.java index 4eea41c0ff..8b71ccc52a 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Escalator.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Escalator.java @@ -323,7 +323,7 @@ public class Escalator extends Widget * {@link com.google.gwt.dom.client.NativeEvent NativeEvent} isn't * properly populated with the correct values. */ - private final static class CustomTouchEvent + private static final class CustomTouchEvent extends JavaScriptObject { protected CustomTouchEvent() { } @@ -1481,7 +1481,7 @@ public class Escalator extends Widget return elem; } - abstract protected void recalculateSectionHeight(); + protected abstract void recalculateSectionHeight(); /** * Returns the height of all rows in the row container. @@ -1731,7 +1731,7 @@ public class Escalator extends Widget * @return true iff this the given element, or any of its * descendants, can be frozen */ - abstract protected boolean rowCanBeFrozen(TableRowElement tr); + protected abstract boolean rowCanBeFrozen(TableRowElement tr); /** * Iterates through all the cells in a column and returns the width of 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 a59e61d9dc..eb88bb895f 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 @@ -2295,7 +2295,7 @@ public class Grid extends ResizeComposite implements HasSelectionHandlers, } } - public static abstract class AbstractGridKeyEvent + public abstract static class AbstractGridKeyEvent extends KeyEvent { /** @@ -2360,7 +2360,7 @@ public class Grid extends ResizeComposite implements HasSelectionHandlers, protected abstract void doDispatch(HANDLER handler, Section section); } - public static abstract class AbstractGridMouseEvent + public abstract static class AbstractGridMouseEvent extends MouseEvent { /** @@ -4702,7 +4702,7 @@ public class Grid extends ResizeComposite implements HasSelectionHandlers, * @param * the row type */ - public static abstract class Column { + public abstract static class Column { /** * Default renderer for GridColumns. Renders everything into text @@ -8955,17 +8955,17 @@ public class Grid extends ResizeComposite implements HasSelectionHandlers, * @param parent * The parent to set */ - private static native final void setParent(Widget widget, Grid parent) + private static final native void setParent(Widget widget, Grid parent) /*-{ widget.@com.google.gwt.user.client.ui.Widget::setParent(Lcom/google/gwt/user/client/ui/Widget;)(parent); }-*/; - private static native final void onAttach(Widget widget) + private static final native void onAttach(Widget widget) /*-{ widget.@Widget::onAttach()(); }-*/; - private static native final void onDetach(Widget widget) + private static final native void onDetach(Widget widget) /*-{ widget.@Widget::onDetach()(); }-*/; -- cgit v1.2.3