diff options
116 files changed, 213 insertions, 235 deletions
diff --git a/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java b/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java index 0ee4a4f708..41ce18e8ee 100644 --- a/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java +++ b/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java @@ -495,7 +495,7 @@ public class ApplicationConfiguration implements EntryPoint { * the id of the application to get configuration data for * @return a native javascript object containing the configuration data */ - private native static JsoConfiguration getJsoConfiguration(String appId) + private static native JsoConfiguration getJsoConfiguration(String appId) /*-{ return $wnd.vaadin.getApp(appId); }-*/; @@ -838,7 +838,7 @@ public class ApplicationConfiguration implements EntryPoint { * @param widgetsetName * the name of this widgetset */ - public native static void registerCallback(String widgetsetName) + public static native void registerCallback(String widgetsetName) /*-{ var callbackHandler = $entry(@com.vaadin.client.ApplicationConfiguration::startApplication(Ljava/lang/String;)); $wnd.vaadin.registerWidgetset(widgetsetName, callbackHandler); @@ -872,7 +872,7 @@ public class ApplicationConfiguration implements EntryPoint { return !isDebugAvailable(); } - private native static boolean isDebugAvailable() + private static native boolean isDebugAvailable() /*-{ if($wnd.vaadin.debug) { return true; diff --git a/client/src/main/java/com/vaadin/client/ApplicationConnection.java b/client/src/main/java/com/vaadin/client/ApplicationConnection.java index 5a67d41a54..58d5259f1b 100644 --- a/client/src/main/java/com/vaadin/client/ApplicationConnection.java +++ b/client/src/main/java/com/vaadin/client/ApplicationConnection.java @@ -195,7 +195,7 @@ public class ApplicationConnection implements HasHandlers { } } - public static abstract class ApplicationConnectionEvent + public abstract static class ApplicationConnectionEvent extends GwtEvent<CommunicationHandler> { private ApplicationConnection connection; diff --git a/client/src/main/java/com/vaadin/client/BrowserInfo.java b/client/src/main/java/com/vaadin/client/BrowserInfo.java index 6e0b858990..0197c4f3f8 100644 --- a/client/src/main/java/com/vaadin/client/BrowserInfo.java +++ b/client/src/main/java/com/vaadin/client/BrowserInfo.java @@ -351,7 +351,7 @@ public class BrowserInfo { return browserDetails.isOpera() && getBrowserMajorVersion() == 11; } - public native static String getBrowserString() + public static native String getBrowserString() /*-{ return $wnd.navigator.userAgent; }-*/; diff --git a/client/src/main/java/com/vaadin/client/ConnectorMap.java b/client/src/main/java/com/vaadin/client/ConnectorMap.java index f79aa0250f..fbd5b40e3f 100644 --- a/client/src/main/java/com/vaadin/client/ConnectorMap.java +++ b/client/src/main/java/com/vaadin/client/ConnectorMap.java @@ -139,7 +139,7 @@ public class ConnectorMap { * element of the connector whose id is desired * @return the id of the element's connector, if it's a connector */ - native static final String getConnectorId(Element el) + static final native String getConnectorId(Element el) /*-{ return el.tkPid; }-*/; diff --git a/client/src/main/java/com/vaadin/client/MeasuredSize.java b/client/src/main/java/com/vaadin/client/MeasuredSize.java index 0f02b46e5c..2029fd9e4d 100644 --- a/client/src/main/java/com/vaadin/client/MeasuredSize.java +++ b/client/src/main/java/com/vaadin/client/MeasuredSize.java @@ -21,7 +21,7 @@ import com.google.gwt.core.client.JsArrayString; import com.google.gwt.dom.client.Element; public class MeasuredSize { - private final static boolean debugSizeChanges = false; + private static final boolean debugSizeChanges = false; public static class MeasureResult { private final boolean widthChanged; diff --git a/client/src/main/java/com/vaadin/client/Profiler.java b/client/src/main/java/com/vaadin/client/Profiler.java index 3986bdddbb..bc07836b89 100644 --- a/client/src/main/java/com/vaadin/client/Profiler.java +++ b/client/src/main/java/com/vaadin/client/Profiler.java @@ -384,7 +384,7 @@ public class Profiler { return RELATIVE_TIME_SUPPLIER.getRelativeTime(); } - private static native final void logGwtEvent(String name, String type) + private static final native void logGwtEvent(String name, String type) /*-{ $wnd.__gwtStatsEvent({ evtGroup: @com.vaadin.client.Profiler::evtGroup, diff --git a/client/src/main/java/com/vaadin/client/SuperDevMode.java b/client/src/main/java/com/vaadin/client/SuperDevMode.java index e8eab082d1..fa565c4ce8 100644 --- a/client/src/main/java/com/vaadin/client/SuperDevMode.java +++ b/client/src/main/java/com/vaadin/client/SuperDevMode.java @@ -122,7 +122,7 @@ public class SuperDevMode { + ".nocache.js"; } - private native static String getRecompileParameters(String moduleName) + private static native String getRecompileParameters(String moduleName) /*-{ var prop_map = $wnd.__gwt_activeModules[moduleName].bindings(); @@ -217,7 +217,7 @@ public class SuperDevMode { return isSuperDevModeEnabledInModule(moduleName); } - protected native static boolean isSuperDevModeEnabledInModule( + protected static native boolean isSuperDevModeEnabledInModule( String moduleName) /*-{ if (!$wnd.__gwt_activeModules) diff --git a/client/src/main/java/com/vaadin/client/UIDL.java b/client/src/main/java/com/vaadin/client/UIDL.java index 165f0c6b05..05a2e5f5ef 100644 --- a/client/src/main/java/com/vaadin/client/UIDL.java +++ b/client/src/main/java/com/vaadin/client/UIDL.java @@ -476,7 +476,7 @@ public final class UIDL extends JavaScriptObject { * @deprecated should not be used anymore */ @Deprecated - public final static class XML extends JavaScriptObject { + public static final class XML extends JavaScriptObject { protected XML() { } diff --git a/client/src/main/java/com/vaadin/client/Util.java b/client/src/main/java/com/vaadin/client/Util.java index 553911b7b8..b849d0c0b3 100644 --- a/client/src/main/java/com/vaadin/client/Util.java +++ b/client/src/main/java/com/vaadin/client/Util.java @@ -1149,7 +1149,7 @@ public class Util { * a JavaScript object to be converted to a string * @return JSON in string representation */ - private native static String stringify(JavaScriptObject json) + private static native String stringify(JavaScriptObject json) /*-{ return JSON.stringify(json); }-*/; @@ -1162,7 +1162,7 @@ public class Util { * @param jsonAsString * @return a JavaScript object constructed from the parse */ - public native static <T extends JavaScriptObject> T parse( + public static native <T extends JavaScriptObject> T parse( String jsonAsString) /*-{ return JSON.parse(jsonAsString); diff --git a/client/src/main/java/com/vaadin/client/VCaption.java b/client/src/main/java/com/vaadin/client/VCaption.java index 8da36becfa..1bff175d7e 100644 --- a/client/src/main/java/com/vaadin/client/VCaption.java +++ b/client/src/main/java/com/vaadin/client/VCaption.java @@ -692,12 +692,12 @@ public class VCaption extends HTML { return getOwnerPid(e); } - private native static void setOwnerPid(Element el, String pid) + private static native void setOwnerPid(Element el, String pid) /*-{ el.vOwnerPid = pid; }-*/; - public native static String getOwnerPid(Element el) + public static native String getOwnerPid(Element el) /*-{ return el.vOwnerPid; }-*/; diff --git a/client/src/main/java/com/vaadin/client/WidgetUtil.java b/client/src/main/java/com/vaadin/client/WidgetUtil.java index d24a1d53a5..7fc027d55d 100644 --- a/client/src/main/java/com/vaadin/client/WidgetUtil.java +++ b/client/src/main/java/com/vaadin/client/WidgetUtil.java @@ -1167,7 +1167,7 @@ public class WidgetUtil { * * @return The active element or null if no active element could be found. */ - public native static Element getFocusedElement() + public static native Element getFocusedElement() /*-{ if ($wnd.document.activeElement) { return $wnd.document.activeElement; @@ -1315,7 +1315,7 @@ public class WidgetUtil { * * @since 7.3 */ - public native static void setSelectionRange(Element elem, int pos, + public static native void setSelectionRange(Element elem, int pos, int length, String direction) /*-{ try { @@ -1335,7 +1335,7 @@ public class WidgetUtil { * <code>true</code> if selection is enabled; <code>false</code> * if not */ - public native static void setTextSelectionEnabled(Element e, boolean enable) + public static native void setTextSelectionEnabled(Element e, boolean enable) /*-{ if (!enable) { e.ondrag = function () { return false; }; @@ -1353,7 +1353,7 @@ public class WidgetUtil { * * @since 7.6 */ - public native static void clearTextSelection() + public static native void clearTextSelection() /*-{ if ($wnd.getSelection) { $wnd.getSelection().removeAllRanges(); diff --git a/client/src/main/java/com/vaadin/client/communication/AtmospherePushConnection.java b/client/src/main/java/com/vaadin/client/communication/AtmospherePushConnection.java index 511a37b7e6..ee0aab7b2e 100644 --- a/client/src/main/java/com/vaadin/client/communication/AtmospherePushConnection.java +++ b/client/src/main/java/com/vaadin/client/communication/AtmospherePushConnection.java @@ -417,9 +417,8 @@ public class AtmospherePushConnection implements PushConnection { getConnectionStateHandler().pushReconnectPending(this); } - public static abstract class AbstractJSO extends JavaScriptObject { + public abstract static class AbstractJSO extends JavaScriptObject { protected AbstractJSO() { - } protected final native String getStringValue(String key) diff --git a/client/src/main/java/com/vaadin/client/communication/MessageHandler.java b/client/src/main/java/com/vaadin/client/communication/MessageHandler.java index 6e13eb07eb..90e822649b 100644 --- a/client/src/main/java/com/vaadin/client/communication/MessageHandler.java +++ b/client/src/main/java/com/vaadin/client/communication/MessageHandler.java @@ -1613,7 +1613,7 @@ public class MessageHandler { } } - private static native final int calculateBootstrapTime() + private static final native int calculateBootstrapTime() /*-{ if ($wnd.performance && $wnd.performance.timing) { return (new Date).getTime() - $wnd.performance.timing.responseStart; diff --git a/client/src/main/java/com/vaadin/client/communication/StateChangeEvent.java b/client/src/main/java/com/vaadin/client/communication/StateChangeEvent.java index 0012138ad9..80e5a32c8b 100644 --- a/client/src/main/java/com/vaadin/client/communication/StateChangeEvent.java +++ b/client/src/main/java/com/vaadin/client/communication/StateChangeEvent.java @@ -234,7 +234,7 @@ public class StateChangeEvent * the JavaScript object to check * @return true if the property is defined */ - private static native final boolean isInJson(String property, + private static final native boolean isInJson(String property, JavaScriptObject target) /*-{ var segments = property.split('.'); diff --git a/client/src/main/java/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java b/client/src/main/java/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java index dca4ad7b3a..76360eb40d 100644 --- a/client/src/main/java/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java +++ b/client/src/main/java/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java @@ -206,7 +206,7 @@ public class LegacyLocatorStrategy implements LocatorStrategy { * Path is of type "targetWidgetPath#componentPart" or * "targetWidgetPath". */ - String parts[] = path.split(LegacyLocatorStrategy.SUBPART_SEPARATOR, 2); + String[] parts = path.split(LegacyLocatorStrategy.SUBPART_SEPARATOR, 2); String widgetPath = parts[0]; // Note that this only works if baseElement can be mapped to a @@ -328,7 +328,7 @@ public class LegacyLocatorStrategy implements LocatorStrategy { * if the element could not be found. */ private Element getElementByDOMPath(Element baseElement, String path) { - String parts[] = path.split(PARENTCHILD_SEPARATOR); + String[] parts = path.split(PARENTCHILD_SEPARATOR); Element element = baseElement; for (int i = 0, l = parts.length; i < l; ++i) { @@ -501,7 +501,7 @@ public class LegacyLocatorStrategy implements LocatorStrategy { @SuppressWarnings("unchecked") private Widget getWidgetFromPath(String path, Widget baseWidget) { Widget w = baseWidget; - String parts[] = path.split(PARENTCHILD_SEPARATOR); + String[] parts = path.split(PARENTCHILD_SEPARATOR); for (int i = 0; i < parts.length; i++) { String part = parts[i]; diff --git a/client/src/main/java/com/vaadin/client/connectors/grid/ColumnConnector.java b/client/src/main/java/com/vaadin/client/connectors/grid/ColumnConnector.java index 7ac6c518ad..b9d14dc91c 100644 --- a/client/src/main/java/com/vaadin/client/connectors/grid/ColumnConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/grid/ColumnConnector.java @@ -37,7 +37,7 @@ import elemental.json.JsonValue; @Connect(com.vaadin.ui.Grid.Column.class) public class ColumnConnector extends AbstractExtensionConnector { - public static abstract class CustomColumn + public abstract static class CustomColumn extends Column<Object, JsonObject> { private final String connectorId; diff --git a/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java b/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java index c03d3b2936..ce1acef641 100644 --- a/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java +++ b/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java @@ -882,7 +882,7 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> { * @return a non-null object that uniquely and consistently represents the * row object */ - abstract public Object getRowKey(T row); + public abstract Object getRowKey(T row); @Override public int size() { diff --git a/client/src/main/java/com/vaadin/client/data/CacheStrategy.java b/client/src/main/java/com/vaadin/client/data/CacheStrategy.java index acfadcbcf7..15aaf531e6 100644 --- a/client/src/main/java/com/vaadin/client/data/CacheStrategy.java +++ b/client/src/main/java/com/vaadin/client/data/CacheStrategy.java @@ -33,7 +33,7 @@ public interface CacheStrategy { * This simple approach rules out more advanced heuristics that would take * the current scrolling direction or past scrolling behavior into account. */ - public static abstract class AbstractBasicSymmetricalCacheStrategy + public abstract static class AbstractBasicSymmetricalCacheStrategy implements CacheStrategy { @Override diff --git a/client/src/main/java/com/vaadin/client/event/PointerEvent.java b/client/src/main/java/com/vaadin/client/event/PointerEvent.java index 2007ad6624..49e2382a0e 100644 --- a/client/src/main/java/com/vaadin/client/event/PointerEvent.java +++ b/client/src/main/java/com/vaadin/client/event/PointerEvent.java @@ -126,37 +126,37 @@ public abstract class PointerEvent<H extends EventHandler> return isPrimary(getNativeEvent()); } - private static native final int getPointerId(NativeEvent e) + private static final native int getPointerId(NativeEvent e) /*-{ return e.pointerId; }-*/; - private static native final int getWidth(NativeEvent e) + private static final native int getWidth(NativeEvent e) /*-{ return e.width; }-*/; - private static native final int getHeight(NativeEvent e) + private static final native int getHeight(NativeEvent e) /*-{ return e.height; }-*/; - private static native final double getPressure(NativeEvent e) + private static final native double getPressure(NativeEvent e) /*-{ return e.pressure; }-*/; - private static native final double getTiltX(NativeEvent e) + private static final native double getTiltX(NativeEvent e) /*-{ return e.tiltX; }-*/; - private static native final double getTiltY(NativeEvent e) + private static final native double getTiltY(NativeEvent e) /*-{ return e.tiltY; }-*/; - private static native final String getPointerType(NativeEvent e) + private static final native String getPointerType(NativeEvent e) /*-{ var pointerType = e.pointerType; if (typeof pointerType === "number") { @@ -165,7 +165,7 @@ public abstract class PointerEvent<H extends EventHandler> return pointerType || ""; }-*/; - private static native final boolean isPrimary(NativeEvent e) + private static final native boolean isPrimary(NativeEvent e) /*-{ return e.isPrimary; }-*/; diff --git a/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java b/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java index 34a2df4f18..45f36561f4 100644 --- a/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java +++ b/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java @@ -160,7 +160,7 @@ public abstract class ClickableRenderer<T, W extends Widget> return cellReference; } - private native static Escalator getEscalator(Grid<?> grid) + private static native Escalator getEscalator(Grid<?> grid) /*-{ return grid.@com.vaadin.client.widgets.Grid::escalator; }-*/; diff --git a/client/src/main/java/com/vaadin/client/renderers/HierarchyRenderer.java b/client/src/main/java/com/vaadin/client/renderers/HierarchyRenderer.java index 03f6525c1c..9bedf65b70 100644 --- a/client/src/main/java/com/vaadin/client/renderers/HierarchyRenderer.java +++ b/client/src/main/java/com/vaadin/client/renderers/HierarchyRenderer.java @@ -71,12 +71,12 @@ public class HierarchyRenderer extends ClickableRenderer<Object, Widget> { return (TableCellElement) element; } - private native static RowReference<Object> getRowReference( + private static native RowReference<Object> getRowReference( RendererCellReference cell) /*-{ return cell.@com.vaadin.client.widget.grid.CellReference::getRowReference()(); }-*/; - private native static FlyweightCell getFlyweightCell( + private static native FlyweightCell getFlyweightCell( RendererCellReference cell) /*-{ return cell.@com.vaadin.client.widget.grid.RendererCellReference::cell; }-*/; diff --git a/client/src/main/java/com/vaadin/client/ui/VAbstractCalendarPanel.java b/client/src/main/java/com/vaadin/client/ui/VAbstractCalendarPanel.java index 6d6f396147..f0a23b5f43 100644 --- a/client/src/main/java/com/vaadin/client/ui/VAbstractCalendarPanel.java +++ b/client/src/main/java/com/vaadin/client/ui/VAbstractCalendarPanel.java @@ -2010,7 +2010,7 @@ public abstract class VAbstractCalendarPanel<R extends Enum<R>> private void setLabel() { if (getDateField() instanceof VAbstractPopupCalendar) { - ((VAbstractPopupCalendar) getDateField()).setFocusedDate(this); + ((VAbstractPopupCalendar<?, ?>) getDateField()).setFocusedDate(this); } } } diff --git a/client/src/main/java/com/vaadin/client/ui/VAbstractSplitPanel.java b/client/src/main/java/com/vaadin/client/ui/VAbstractSplitPanel.java index 5f75869ba4..b12adecc62 100644 --- a/client/src/main/java/com/vaadin/client/ui/VAbstractSplitPanel.java +++ b/client/src/main/java/com/vaadin/client/ui/VAbstractSplitPanel.java @@ -606,14 +606,14 @@ public abstract class VAbstractSplitPanel extends ComplexPanel { * * @since 7.5.1 */ - abstract protected void startResize(); + protected abstract void startResize(); /** * Called when stopping drag resize * * @since 7.5.1 */ - abstract protected void stopResize(); + protected abstract void stopResize(); /** * Gets the first container diff --git a/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapper.java b/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapper.java index 0595d65069..d12a233e73 100644 --- a/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapper.java +++ b/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapper.java @@ -170,11 +170,11 @@ public class VDragAndDropWrapper extends VCustomComponent return false; } - protected final static int NONE = 0; - protected final static int COMPONENT = 1; - protected final static int WRAPPER = 2; - protected final static int HTML5 = 3; - protected final static int COMPONENT_OTHER = 4; + protected static final int NONE = 0; + protected static final int COMPONENT = 1; + protected static final int WRAPPER = 2; + protected static final int HTML5 = 3; + protected static final int COMPONENT_OTHER = 4; /** For internal use only. May be removed or replaced in the future. */ public int dragStartMode; diff --git a/client/src/main/java/com/vaadin/client/ui/VFormLayout.java b/client/src/main/java/com/vaadin/client/ui/VFormLayout.java index 18d7d76d74..a8a43a2d8d 100644 --- a/client/src/main/java/com/vaadin/client/ui/VFormLayout.java +++ b/client/src/main/java/com/vaadin/client/ui/VFormLayout.java @@ -45,7 +45,7 @@ import com.vaadin.shared.ui.MarginInfo; */ public class VFormLayout extends SimplePanel { - private final static String CLASSNAME = "v-formlayout"; + private static final String CLASSNAME = "v-formlayout"; /** For internal use only. May be removed or replaced in the future. */ public VFormLayoutTable table; diff --git a/client/src/main/java/com/vaadin/client/ui/VPopupView.java b/client/src/main/java/com/vaadin/client/ui/VPopupView.java index 296cde28bc..43da119c5a 100644 --- a/client/src/main/java/com/vaadin/client/ui/VPopupView.java +++ b/client/src/main/java/com/vaadin/client/ui/VPopupView.java @@ -416,7 +416,7 @@ public class VPopupView extends HTML } return handler; } - }// class CustomPopup + } public HandlerRegistration addVisibilityChangeHandler( final VisibilityChangeHandler visibilityChangeHandler) { @@ -442,4 +442,4 @@ public class VPopupView extends HTML return popupShowInProgress; } -}// class VPopupView +} diff --git a/client/src/main/java/com/vaadin/client/ui/VUI.java b/client/src/main/java/com/vaadin/client/ui/VUI.java index 8a159a1f1e..a372b746b0 100644 --- a/client/src/main/java/com/vaadin/client/ui/VUI.java +++ b/client/src/main/java/com/vaadin/client/ui/VUI.java @@ -343,7 +343,7 @@ public class VUI extends SimplePanel implements ResizeHandler, connection.flushActiveConnector(); } - private native static void loadAppIdListFromDOM(List<String> list) + private static native void loadAppIdListFromDOM(List<String> list) /*-{ var j; for(j in $wnd.vaadin.vaadinConfigurations) { diff --git a/client/src/main/java/com/vaadin/client/ui/csslayout/CssLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/csslayout/CssLayoutConnector.java index 8b90fffeb6..89bd7923cd 100644 --- a/client/src/main/java/com/vaadin/client/ui/csslayout/CssLayoutConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/csslayout/CssLayoutConnector.java @@ -93,7 +93,7 @@ public class CssLayoutConnector extends AbstractLayoutConnector { // as it is added directly to the child component? String[] cssRules = css.split(";"); for (String cssRule : cssRules) { - String parts[] = cssRule.split(":", 2); + String[] parts = cssRule.split(":", 2); if (parts.length == 2) { style.setProperty(makeCamelCase(parts[0].trim()), parts[1].trim()); diff --git a/client/src/main/java/com/vaadin/client/ui/dd/VAbstractDropHandler.java b/client/src/main/java/com/vaadin/client/ui/dd/VAbstractDropHandler.java index 883b5e5164..c88a3079fb 100644 --- a/client/src/main/java/com/vaadin/client/ui/dd/VAbstractDropHandler.java +++ b/client/src/main/java/com/vaadin/client/ui/dd/VAbstractDropHandler.java @@ -113,7 +113,7 @@ public abstract class VAbstractDropHandler implements VDropHandler { * * @param drag */ - abstract protected void dragAccepted(VDragEvent drag); + protected abstract void dragAccepted(VDragEvent drag); protected void validate(final VAcceptCallback cb, final VDragEvent event) { Command checkCriteria = new Command() { diff --git a/client/src/main/java/com/vaadin/client/ui/dd/VAcceptAll.java b/client/src/main/java/com/vaadin/client/ui/dd/VAcceptAll.java index f7c7574476..aa904bf52f 100644 --- a/client/src/main/java/com/vaadin/client/ui/dd/VAcceptAll.java +++ b/client/src/main/java/com/vaadin/client/ui/dd/VAcceptAll.java @@ -31,7 +31,7 @@ import com.vaadin.ui.dnd.DropTargetExtension; */ @Deprecated @AcceptCriterion(AcceptAll.class) -final public class VAcceptAll extends VAcceptCriterion { +public final class VAcceptAll extends VAcceptCriterion { @Override protected boolean accept(VDragEvent drag, UIDL configuration) { diff --git a/client/src/main/java/com/vaadin/client/ui/dd/VAnd.java b/client/src/main/java/com/vaadin/client/ui/dd/VAnd.java index 1aebfa2e27..47deb06632 100644 --- a/client/src/main/java/com/vaadin/client/ui/dd/VAnd.java +++ b/client/src/main/java/com/vaadin/client/ui/dd/VAnd.java @@ -28,7 +28,7 @@ import com.vaadin.ui.dnd.DropTargetExtension; */ @Deprecated @AcceptCriterion(And.class) -final public class VAnd extends VAcceptCriterion implements VAcceptCallback { +public final class VAnd extends VAcceptCriterion implements VAcceptCallback { private boolean b1; static VAcceptCriterion getCriteria(VDragEvent drag, UIDL configuration, diff --git a/client/src/main/java/com/vaadin/client/ui/dd/VContainsDataFlavor.java b/client/src/main/java/com/vaadin/client/ui/dd/VContainsDataFlavor.java index 98565713b2..22c2570598 100644 --- a/client/src/main/java/com/vaadin/client/ui/dd/VContainsDataFlavor.java +++ b/client/src/main/java/com/vaadin/client/ui/dd/VContainsDataFlavor.java @@ -28,7 +28,7 @@ import com.vaadin.ui.dnd.DropTargetExtension; */ @Deprecated @AcceptCriterion(ContainsDataFlavor.class) -final public class VContainsDataFlavor extends VAcceptCriterion { +public final class VContainsDataFlavor extends VAcceptCriterion { @Override protected boolean accept(VDragEvent drag, UIDL configuration) { diff --git a/client/src/main/java/com/vaadin/client/ui/dd/VDragSourceIs.java b/client/src/main/java/com/vaadin/client/ui/dd/VDragSourceIs.java index 5c1c9b75a0..e5b4790cda 100644 --- a/client/src/main/java/com/vaadin/client/ui/dd/VDragSourceIs.java +++ b/client/src/main/java/com/vaadin/client/ui/dd/VDragSourceIs.java @@ -31,7 +31,7 @@ import com.vaadin.ui.dnd.DropTargetExtension; */ @Deprecated @AcceptCriterion(SourceIs.class) -final public class VDragSourceIs extends VAcceptCriterion { +public final class VDragSourceIs extends VAcceptCriterion { @Override protected boolean accept(VDragEvent drag, UIDL configuration) { diff --git a/client/src/main/java/com/vaadin/client/ui/dd/VHtml5File.java b/client/src/main/java/com/vaadin/client/ui/dd/VHtml5File.java index 5dcf0ce630..0698b95861 100644 --- a/client/src/main/java/com/vaadin/client/ui/dd/VHtml5File.java +++ b/client/src/main/java/com/vaadin/client/ui/dd/VHtml5File.java @@ -31,12 +31,12 @@ public class VHtml5File extends JavaScriptObject { protected VHtml5File() { } - public native final String getName() + public final native String getName() /*-{ return this.name; }-*/; - public native final String getType() + public final native String getType() /*-{ return this.type; }-*/; @@ -47,7 +47,7 @@ public class VHtml5File extends JavaScriptObject { * and then cast back to a long value. * www.gwtproject.org/doc/latest/DevGuideCodingBasicsJSNI.html#important */ - public native final double getSize() + public final native double getSize() /*-{ return this.size ? this.size : 0; }-*/; diff --git a/client/src/main/java/com/vaadin/client/ui/dd/VOverTreeNode.java b/client/src/main/java/com/vaadin/client/ui/dd/VOverTreeNode.java index e310fd479d..e9e646bf96 100644 --- a/client/src/main/java/com/vaadin/client/ui/dd/VOverTreeNode.java +++ b/client/src/main/java/com/vaadin/client/ui/dd/VOverTreeNode.java @@ -25,7 +25,7 @@ import com.vaadin.ui.dnd.DropTargetExtension; * and extending classes */ @Deprecated -final public class VOverTreeNode extends VAcceptCriterion { +public final class VOverTreeNode extends VAcceptCriterion { @Override protected boolean accept(VDragEvent drag, UIDL configuration) { diff --git a/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java b/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java index 79df33e9a7..72d0784c3e 100644 --- a/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java @@ -167,11 +167,10 @@ public class MenuBarConnector extends AbstractComponentConnector itr = iteratorStack.pop(); currentMenu = menuStack.pop(); } - } // while + } getLayoutManager().setNeedsHorizontalLayout(this); - - }// updateFromUIDL + } @Override public VMenuBar getWidget() { diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java b/client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java index b5aaa5d894..41bc1b5952 100644 --- a/client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java +++ b/client/src/main/java/com/vaadin/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/client/src/main/java/com/vaadin/client/widget/escalator/events/RowHeightChangedEvent.java b/client/src/main/java/com/vaadin/client/widget/escalator/events/RowHeightChangedEvent.java index 846b0ce723..5ede9bb90e 100644 --- a/client/src/main/java/com/vaadin/client/widget/escalator/events/RowHeightChangedEvent.java +++ b/client/src/main/java/com/vaadin/client/widget/escalator/events/RowHeightChangedEvent.java @@ -29,7 +29,7 @@ public class RowHeightChangedEvent extends GwtEvent<RowHeightChangedHandler> { /** * Handler type. */ - public final static Type<RowHeightChangedHandler> TYPE = new Type<>(); + public static final Type<RowHeightChangedHandler> TYPE = new Type<>(); public static final Type<RowHeightChangedHandler> getType() { return TYPE; diff --git a/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnReorderEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnReorderEvent.java index 0063c20b28..56c1207439 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnReorderEvent.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnReorderEvent.java @@ -34,7 +34,7 @@ public class ColumnReorderEvent<T> extends GwtEvent<ColumnReorderHandler<T>> { /** * Handler type. */ - private final static Type<ColumnReorderHandler<?>> TYPE = new Type<>(); + private static final Type<ColumnReorderHandler<?>> TYPE = new Type<>(); public static final Type<ColumnReorderHandler<?>> getType() { return TYPE; diff --git a/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnResizeEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnResizeEvent.java index abd369b175..3c049ea709 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnResizeEvent.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnResizeEvent.java @@ -32,7 +32,7 @@ public class ColumnResizeEvent<T> extends GwtEvent<ColumnResizeHandler<T>> { /** * Handler type. */ - private final static Type<ColumnResizeHandler<?>> TYPE = new Type<>(); + private static final Type<ColumnResizeHandler<?>> TYPE = new Type<>(); private Column<?, T> column; diff --git a/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeEvent.java index 5c7b88cc91..7e01e91e8d 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeEvent.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeEvent.java @@ -31,7 +31,7 @@ import com.vaadin.client.widgets.Grid.Column; public class ColumnVisibilityChangeEvent<T> extends GwtEvent<ColumnVisibilityChangeHandler<T>> { - private final static Type<ColumnVisibilityChangeHandler<?>> TYPE = new Type<>(); + private static final Type<ColumnVisibilityChangeHandler<?>> TYPE = new Type<>(); public static final Type<ColumnVisibilityChangeHandler<?>> getType() { return TYPE; diff --git a/client/src/main/java/com/vaadin/client/widgets/Escalator.java b/client/src/main/java/com/vaadin/client/widgets/Escalator.java index 178f3a4222..092253bbc5 100644 --- a/client/src/main/java/com/vaadin/client/widgets/Escalator.java +++ b/client/src/main/java/com/vaadin/client/widgets/Escalator.java @@ -324,7 +324,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() { } @@ -1496,7 +1496,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. @@ -1746,7 +1746,7 @@ public class Escalator extends Widget * @return <code>true</code> 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/client/src/main/java/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java index 578f260a1e..537d864836 100755 --- a/client/src/main/java/com/vaadin/client/widgets/Grid.java +++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java @@ -2292,7 +2292,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, } } - public static abstract class AbstractGridKeyEvent<HANDLER extends AbstractGridKeyEventHandler> + public abstract static class AbstractGridKeyEvent<HANDLER extends AbstractGridKeyEventHandler> extends KeyEvent<HANDLER> { /** @@ -2358,7 +2358,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, protected abstract void doDispatch(HANDLER handler, Section section); } - public static abstract class AbstractGridMouseEvent<HANDLER extends AbstractGridMouseEventHandler> + public abstract static class AbstractGridMouseEvent<HANDLER extends AbstractGridMouseEventHandler> extends MouseEvent<HANDLER> { /** @@ -8972,17 +8972,17 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, * @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()(); }-*/; diff --git a/client/src/main/java/com/vaadin/client/widgets/Overlay.java b/client/src/main/java/com/vaadin/client/widgets/Overlay.java index e6ce34b8a7..86758e3173 100644 --- a/client/src/main/java/com/vaadin/client/widgets/Overlay.java +++ b/client/src/main/java/com/vaadin/client/widgets/Overlay.java @@ -352,7 +352,7 @@ public class Overlay extends PopupPanel { return topFix; } - private native static int detectRelativeBodyFixes(String axis) + private static native int detectRelativeBodyFixes(String axis) /*-{ try { var b = $wnd.document.body; 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<T, W extends Widget> 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<CalendarEvent> { @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<RowHeightChangedHandler> { /** * Handler type. */ - public final static Type<RowHeightChangedHandler> TYPE = new Type<RowHeightChangedHandler>(); + public static final Type<RowHeightChangedHandler> TYPE = new Type<RowHeightChangedHandler>(); public static final Type<RowHeightChangedHandler> 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<T> extends GwtEvent<ColumnReorderHandler<T>> { /** * Handler type. */ - private final static Type<ColumnReorderHandler<?>> TYPE = new Type<ColumnReorderHandler<?>>(); + private static final Type<ColumnReorderHandler<?>> TYPE = new Type<ColumnReorderHandler<?>>(); public static final Type<ColumnReorderHandler<?>> 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<T> extends GwtEvent<ColumnResizeHandler<T>> { /** * Handler type. */ - private final static Type<ColumnResizeHandler<?>> TYPE = new Type<ColumnResizeHandler<?>>(); + private static final Type<ColumnResizeHandler<?>> TYPE = new Type<ColumnResizeHandler<?>>(); private Column<?, T> 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<T> extends GwtEvent<ColumnVisibilityChangeHandler<T>> { - private final static Type<ColumnVisibilityChangeHandler<?>> TYPE = new Type<ColumnVisibilityChangeHandler<?>>(); + private static final Type<ColumnVisibilityChangeHandler<?>> TYPE = new Type<ColumnVisibilityChangeHandler<?>>(); public static final Type<ColumnVisibilityChangeHandler<?>> 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<T> extends GwtEvent<SelectAllHandler<T>> { /** * Handler type. */ - private final static Type<SelectAllHandler<?>> TYPE = new Type<SelectAllHandler<?>>();; + private static final Type<SelectAllHandler<?>> TYPE = new Type<SelectAllHandler<?>>();; private SelectionModel.Multi<T> 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 <code>true</code> 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<T> extends ResizeComposite implements HasSelectionHandlers<T>, } } - public static abstract class AbstractGridKeyEvent<HANDLER extends AbstractGridKeyEventHandler> + public abstract static class AbstractGridKeyEvent<HANDLER extends AbstractGridKeyEventHandler> extends KeyEvent<HANDLER> { /** @@ -2360,7 +2360,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, protected abstract void doDispatch(HANDLER handler, Section section); } - public static abstract class AbstractGridMouseEvent<HANDLER extends AbstractGridMouseEventHandler> + public abstract static class AbstractGridMouseEvent<HANDLER extends AbstractGridMouseEventHandler> extends MouseEvent<HANDLER> { /** @@ -4702,7 +4702,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, * @param <T> * the row type */ - public static abstract class Column<C, T> { + public abstract static class Column<C, T> { /** * Default renderer for GridColumns. Renders everything into text @@ -8955,17 +8955,17 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, * @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()(); }-*/; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractInMemoryContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractInMemoryContainer.java index 100a8df49b..61d9d4f55f 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractInMemoryContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractInMemoryContainer.java @@ -151,7 +151,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE } } - private static abstract class BaseItemAddOrRemoveEvent extends EventObject + private abstract static class BaseItemAddOrRemoveEvent extends EventObject implements Serializable { protected Object itemId; protected int index; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java index 9c71af7c5c..dd1f28305d 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java @@ -75,13 +75,13 @@ public class FilesystemContainer implements Container.Hierarchical { */ public static Collection<String> FILE_PROPERTIES; - private final static Method FILEITEM_LASTMODIFIED; + private static final Method FILEITEM_LASTMODIFIED; - private final static Method FILEITEM_NAME; + private static final Method FILEITEM_NAME; - private final static Method FILEITEM_ICON; + private static final Method FILEITEM_ICON; - private final static Method FILEITEM_SIZE; + private static final Method FILEITEM_SIZE; static { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyFormatter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyFormatter.java index 7b26eccfc6..2e1ac13e9a 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyFormatter.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyFormatter.java @@ -182,7 +182,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String> * datasource. * @return */ - abstract public String format(T value); + public abstract String format(T value); /** * Parse string and convert it to format compatible with datasource. @@ -196,7 +196,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String> * Any type of exception can be thrown to indicate that the * conversion was not succesful. */ - abstract public T parse(String formattedValue) throws Exception; + public abstract T parse(String formattedValue) throws Exception; /** * Sets the Property's read-only mode to the specified status. diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/TextFileProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/TextFileProperty.java index b808357066..3dea636644 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/TextFileProperty.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/TextFileProperty.java @@ -99,7 +99,7 @@ public class TextFileProperty extends AbstractProperty<String> { : new InputStreamReader(fis, charset); BufferedReader r = new BufferedReader(isr); StringBuilder b = new StringBuilder(); - char buf[] = new char[8 * 1024]; + char[] buf = new char[8 * 1024]; int len; while ((len = r.read(buf)) != -1) { b.append(buf, 0, len); diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/DefaultConverterFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/DefaultConverterFactory.java index acfba8abfd..53eacc20e2 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/DefaultConverterFactory.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/DefaultConverterFactory.java @@ -39,7 +39,7 @@ import com.vaadin.server.VaadinSession; @Deprecated public class DefaultConverterFactory implements ConverterFactory { - private final static Logger log = Logger + private static final Logger log = Logger .getLogger(DefaultConverterFactory.class.getName()); @Override diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ColumnProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ColumnProperty.java index 45ef2cd57e..b1fc3738ed 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ColumnProperty.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ColumnProperty.java @@ -33,7 +33,7 @@ import com.vaadin.v7.data.util.converter.Converter.ConversionException; * @deprecated As of 8.0, no replacement available. */ @Deprecated -final public class ColumnProperty implements Property { +public final class ColumnProperty implements Property { private static final long serialVersionUID = -3694463129581802457L; private RowItem owner; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java index 5750de6b36..070b15fc5c 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java @@ -159,7 +159,7 @@ public class SQLContainer implements Container, Container.Filterable, @Override public Object addItem() throws UnsupportedOperationException { - Object emptyKey[] = new Object[queryDelegate.getPrimaryKeyColumns() + Object[] emptyKey = new Object[queryDelegate.getPrimaryKeyColumns() .size()]; RowId itemId = new TemporaryRowId(emptyKey); // Create new empty column properties for the row item. diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java index d1c884c360..b435757e8e 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java @@ -45,7 +45,7 @@ public class QueryBuilder implements Serializable { addFilterTranslator(new SimpleStringTranslator()); } - public synchronized static void addFilterTranslator( + public static synchronized void addFilterTranslator( FilterTranslator translator) { filterTranslators.add(translator); } @@ -79,7 +79,7 @@ public class QueryBuilder implements Serializable { * the statement helper to update with the value(s) of the filter * @return a string representing the filter. */ - public synchronized static String getWhereStringForFilter(Filter filter, + public static synchronized String getWhereStringForFilter(Filter filter, StatementHelper sh) { for (FilterTranslator ft : filterTranslators) { if (ft.translatesFilter(filter)) { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/event/FieldEvents.java b/compatibility-server/src/main/java/com/vaadin/v7/event/FieldEvents.java index dac491bc27..5c5b4d21ed 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/event/FieldEvents.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/event/FieldEvents.java @@ -124,7 +124,7 @@ public interface FieldEvents { * @since 6.5 */ @Deprecated - public static abstract class TextChangeEvent extends Component.Event { + public abstract static class TextChangeEvent extends Component.Event { public TextChangeEvent(Component source) { super(source); diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractColorPicker.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractColorPicker.java index 2b6e9b43bf..baa8f1b34e 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractColorPicker.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractColorPicker.java @@ -437,7 +437,7 @@ public abstract class AbstractColorPicker extends AbstractLegacyComponent * Sets the default styles of the component * */ - abstract protected void setDefaultStyles(); + protected abstract void setDefaultStyles(); /** * Shows a popup-window for color selection. diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java index e89c72fa4c..70fabdc9b3 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java @@ -2046,7 +2046,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * @since 6.3 * */ - private static abstract class AbstractItemSetCriterion + private abstract static class AbstractItemSetCriterion extends ClientSideCriterion { protected final Collection<Object> itemIds = new HashSet<Object>(); protected AbstractSelect select; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java index 4315990d3a..2b480437cf 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java @@ -327,7 +327,7 @@ public class Grid extends AbstractComponent * @since 7.6.1 */ @Deprecated - public final static class DetailComponentManager + public static final class DetailComponentManager extends AbstractGridExtension implements DataGenerator { /** @@ -982,7 +982,7 @@ public class Grid extends AbstractComponent * Base class for editor related events */ @Deprecated - public static abstract class EditorEvent extends Component.Event { + public abstract static class EditorEvent extends Component.Event { private Object itemID; @@ -1437,7 +1437,7 @@ public class Grid extends AbstractComponent * reusable. */ @Deprecated - public static abstract class AbstractSelectionModel extends + public abstract static class AbstractSelectionModel extends AbstractGridExtension implements SelectionModel, DataGenerator { protected final LinkedHashSet<Object> selection = new LinkedHashSet<Object>(); @@ -2646,7 +2646,7 @@ public class Grid extends AbstractComponent } } - abstract protected String getCellTagName(); + protected abstract String getCellTagName(); void detach() { for (CELLTYPE cell : cells.values()) { @@ -4314,7 +4314,7 @@ public class Grid extends AbstractComponent * the type this renderer knows how to present */ @Deprecated - public static abstract class AbstractRenderer<T> + public abstract static class AbstractRenderer<T> extends AbstractGridExtension implements Renderer<T> { private final Class<T> presentationType; @@ -4473,7 +4473,7 @@ public class Grid extends AbstractComponent * @since 7.5 */ @Deprecated - public static abstract class AbstractGridExtension + public abstract static class AbstractGridExtension extends AbstractExtension { /** diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java index 8fd401e393..65613d00cc 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java @@ -5232,7 +5232,7 @@ public class Table extends AbstractSelect implements Action.Container, * during that drag and drop operation. */ @Deprecated - public static abstract class TableDropCriterion + public abstract static class TableDropCriterion extends ServerSideCriterion { private Table table; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java index a5e272b604..a6e13f73c7 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java @@ -1636,7 +1636,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * during that drag and drop operation. */ @Deprecated - public static abstract class TreeDropCriterion extends ServerSideCriterion { + public abstract static class TreeDropCriterion extends ServerSideCriterion { private Tree tree; diff --git a/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemContainerGenerator.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemContainerGenerator.java index 2bc90c175c..f750651157 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemContainerGenerator.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemContainerGenerator.java @@ -6,9 +6,9 @@ import java.util.concurrent.atomic.AtomicLong; public class BeanItemContainerGenerator { public static class PortableRandom { - private final static long multiplier = 0x5DEECE66DL; - private final static long addend = 0xBL; - private final static long mask = (1L << 48) - 1; + private static final long multiplier = 0x5DEECE66DL; + private static final long addend = 0xBL; + private static final long mask = (1L << 48) - 1; private AtomicLong seed; public PortableRandom(long seed) { diff --git a/compatibility-server/src/test/java/com/vaadin/v7/data/util/PerformanceTestIndexedContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/PerformanceTestIndexedContainerTest.java index 516e4eb63d..a22b704b84 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/data/util/PerformanceTestIndexedContainerTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/PerformanceTestIndexedContainerTest.java @@ -12,7 +12,7 @@ import org.junit.Test; public class PerformanceTestIndexedContainerTest { private static final int REPEATS = 10; - private final static int ITEMS = 50000; + private static final int ITEMS = 50000; private static final long ADD_ITEM_FAIL_THRESHOLD = 200; // TODO should improve performance of these methods private static final long ADD_ITEM_AT_FAIL_THRESHOLD = 5000; diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/ContextClickListenerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/ContextClickListenerTest.java index df833b0cba..b84388ad9c 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/ContextClickListenerTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/ContextClickListenerTest.java @@ -41,11 +41,11 @@ import com.vaadin.v7.ui.Table.TableContextClickEvent; */ public class ContextClickListenerTest extends AbstractComponent { - private final static ContextClickEvent contextClickEvent = EasyMock + private static final ContextClickEvent contextClickEvent = EasyMock .createMock(ContextClickEvent.class); - private final static GridContextClickEvent gridContextClickEvent = EasyMock + private static final GridContextClickEvent gridContextClickEvent = EasyMock .createMock(GridContextClickEvent.class); - private final static TableContextClickEvent tableContextClickEvent = EasyMock + private static final TableContextClickEvent tableContextClickEvent = EasyMock .createMock(TableContextClickEvent.class); private final AssertListener contextListener = new AssertListener(); diff --git a/server/src/main/java/com/vaadin/data/provider/DataCommunicator.java b/server/src/main/java/com/vaadin/data/provider/DataCommunicator.java index 05fb776140..aba50226f7 100644 --- a/server/src/main/java/com/vaadin/data/provider/DataCommunicator.java +++ b/server/src/main/java/com/vaadin/data/provider/DataCommunicator.java @@ -595,7 +595,7 @@ public class DataCommunicator<T> extends AbstractExtension { * @since 8.1 * */ - protected DataKeyMapper<T> createKeyMapper(ValueProvider<T,Object> identifierGetter) { + protected DataKeyMapper<T> createKeyMapper(ValueProvider<T, Object> identifierGetter) { return new KeyMapper<T>(identifierGetter); } diff --git a/server/src/main/java/com/vaadin/event/FieldEvents.java b/server/src/main/java/com/vaadin/event/FieldEvents.java index 2b0a0f6286..c12d683f20 100644 --- a/server/src/main/java/com/vaadin/event/FieldEvents.java +++ b/server/src/main/java/com/vaadin/event/FieldEvents.java @@ -165,7 +165,7 @@ public interface FieldEvents { public void blur(BlurEvent event); } - public static abstract class FocusAndBlurServerRpcImpl + public abstract static class FocusAndBlurServerRpcImpl implements FocusAndBlurServerRpc { private final Component component; diff --git a/server/src/main/java/com/vaadin/event/ShortcutListener.java b/server/src/main/java/com/vaadin/event/ShortcutListener.java index 66e0110a4c..c8b70b649e 100644 --- a/server/src/main/java/com/vaadin/event/ShortcutListener.java +++ b/server/src/main/java/com/vaadin/event/ShortcutListener.java @@ -41,5 +41,5 @@ public abstract class ShortcutListener extends ShortcutAction } @Override - abstract public void handleAction(Object sender, Object target); + public abstract void handleAction(Object sender, Object target); } diff --git a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/Or.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/Or.java index b0dab24fe0..b0e13963bd 100644 --- a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/Or.java +++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/Or.java @@ -30,7 +30,7 @@ import com.vaadin.server.PaintTarget; */ public class Or extends ClientSideCriterion { private static final long serialVersionUID = 1L; - private final AcceptCriterion criteria[]; + private final AcceptCriterion[] criteria; /** * @param criteria diff --git a/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java b/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java index 9e1134efed..f65fc610c9 100644 --- a/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java +++ b/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java @@ -46,7 +46,7 @@ import com.vaadin.ui.Window; @SuppressWarnings({ "serial", "deprecation" }) public class ComponentSizeValidator implements Serializable { - private final static int LAYERS_SHOWN = 4; + private static final int LAYERS_SHOWN = 4; /** * Recursively checks given component and its subtree for invalid layout diff --git a/server/src/main/java/com/vaadin/server/JsonPaintTarget.java b/server/src/main/java/com/vaadin/server/JsonPaintTarget.java index a2df4203c8..3be04fc2c4 100644 --- a/server/src/main/java/com/vaadin/server/JsonPaintTarget.java +++ b/server/src/main/java/com/vaadin/server/JsonPaintTarget.java @@ -49,7 +49,7 @@ public class JsonPaintTarget implements PaintTarget { /* Document type declarations */ - private final static String UIDL_ARG_NAME = "name"; + private static final String UIDL_ARG_NAME = "name"; private final Deque<String> mOpenTags; @@ -206,7 +206,7 @@ public class JsonPaintTarget implements PaintTarget { * @return A new string instance where all occurrences of XML sensitive * characters are substituted with entities. */ - static public String escapeXML(String xml) { + public static String escapeXML(String xml) { if (xml == null || xml.length() <= 0) { return ""; } @@ -248,7 +248,7 @@ public class JsonPaintTarget implements PaintTarget { * The string to escape * @return Escaped version of the string */ - static public String escapeJSON(String s) { + public static String escapeJSON(String s) { // FIXME: Move this method to another class as other classes use it // also. if (s == null) { diff --git a/server/src/main/java/com/vaadin/server/VaadinPortlet.java b/server/src/main/java/com/vaadin/server/VaadinPortlet.java index 441580df84..d4a7d0e62d 100644 --- a/server/src/main/java/com/vaadin/server/VaadinPortlet.java +++ b/server/src/main/java/com/vaadin/server/VaadinPortlet.java @@ -63,7 +63,7 @@ public class VaadinPortlet extends GenericPortlet * Base class for portlet requests that need access to HTTP servlet * requests. */ - public static abstract class VaadinHttpAndPortletRequest + public abstract static class VaadinHttpAndPortletRequest extends VaadinPortletRequest { /** diff --git a/server/src/main/java/com/vaadin/server/VaadinServlet.java b/server/src/main/java/com/vaadin/server/VaadinServlet.java index 638eeb047f..edfbd1cc28 100644 --- a/server/src/main/java/com/vaadin/server/VaadinServlet.java +++ b/server/src/main/java/com/vaadin/server/VaadinServlet.java @@ -1019,7 +1019,7 @@ public class VaadinServlet extends HttpServlet implements Constants { private void streamContent(HttpServletResponse response, InputStream is) throws IOException { final OutputStream os = response.getOutputStream(); - final byte buffer[] = new byte[DEFAULT_BUFFER_SIZE]; + final byte[] buffer = new byte[DEFAULT_BUFFER_SIZE]; int bytes; while ((bytes = is.read(buffer)) >= 0) { os.write(buffer, 0, bytes); diff --git a/server/src/main/java/com/vaadin/server/communication/FileUploadHandler.java b/server/src/main/java/com/vaadin/server/communication/FileUploadHandler.java index 08bcffa442..fb02819c23 100644 --- a/server/src/main/java/com/vaadin/server/communication/FileUploadHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/FileUploadHandler.java @@ -308,7 +308,7 @@ public class FileUploadHandler implements RequestHandler { "The multipart stream ended unexpectedly"); } bout.write(readByte); - if(bout.size() > MULTIPART_BOUNDARY_LINE_LIMIT) { + if (bout.size() > MULTIPART_BOUNDARY_LINE_LIMIT) { throw new IOException( "The multipart stream does not contain boundary"); } @@ -564,7 +564,7 @@ public class FileUploadHandler implements RequestHandler { throw new NoInputStreamException(); } - final byte buffer[] = new byte[MAX_UPLOAD_BUFFER_SIZE]; + final byte[] buffer = new byte[MAX_UPLOAD_BUFFER_SIZE]; long lastStreamingEvent = 0; int bytesReadToBuffer = 0; do { diff --git a/server/src/main/java/com/vaadin/server/communication/PushHandler.java b/server/src/main/java/com/vaadin/server/communication/PushHandler.java index 6eeaa88520..f287b4334f 100644 --- a/server/src/main/java/com/vaadin/server/communication/PushHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/PushHandler.java @@ -308,7 +308,7 @@ public class PushHandler { // We don't want to use callWithUi here, as it assumes there's a client // request active and does requestStart and requestEnd among other // things. - if(event == null){ + if (event == null) { getLogger().log(Level.SEVERE, "Could not get event. This should never happen."); return; @@ -316,7 +316,7 @@ public class PushHandler { AtmosphereResource resource = event.getResource(); - if(resource == null){ + if (resource == null) { getLogger().log(Level.SEVERE, "Could not get resource. This should never happen."); return; diff --git a/server/src/main/java/com/vaadin/server/widgetsetutils/ClassPathExplorer.java b/server/src/main/java/com/vaadin/server/widgetsetutils/ClassPathExplorer.java index 50b23f80a3..f93803de99 100644 --- a/server/src/main/java/com/vaadin/server/widgetsetutils/ClassPathExplorer.java +++ b/server/src/main/java/com/vaadin/server/widgetsetutils/ClassPathExplorer.java @@ -58,7 +58,7 @@ public class ClassPathExplorer { /** * File filter that only accepts directories. */ - private final static FileFilter DIRECTORIES_ONLY = (File f) -> + private static final FileFilter DIRECTORIES_ONLY = (File f) -> f.exists() && f.isDirectory(); /** @@ -301,7 +301,7 @@ public class ClassPathExplorer { * * @return filtered list of class path entries */ - private final static List<String> getRawClasspathEntries() { + private static final List<String> getRawClasspathEntries() { // try to keep the order of the classpath List<String> locations = new ArrayList<>(); @@ -339,7 +339,7 @@ public class ClassPathExplorer { * string * @return map of classpath locations, see {@link #classpathLocations} */ - private final static Map<String, URL> getClasspathLocations( + private static final Map<String, URL> getClasspathLocations( List<String> rawClasspathEntries) { long start = System.currentTimeMillis(); // try to keep the order of the classpath @@ -428,7 +428,7 @@ public class ClassPathExplorer { * @param file * @param locations */ - private final static void include(String name, File file, + private static final void include(String name, File file, Map<String, URL> locations) { if (!file.exists()) { return; diff --git a/server/src/main/java/com/vaadin/ui/AbstractLocalDateField.java b/server/src/main/java/com/vaadin/ui/AbstractLocalDateField.java index 2fdf2bf382..2584eaf6ea 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractLocalDateField.java +++ b/server/src/main/java/com/vaadin/ui/AbstractLocalDateField.java @@ -144,7 +144,7 @@ public abstract class AbstractLocalDateField if (value == null) return ""; DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT); Locale locale = getLocale(); - if (locale != null){ + if (locale != null) { dateTimeFormatter = dateTimeFormatter.withLocale(locale); } return value.format(dateTimeFormatter); diff --git a/server/src/main/java/com/vaadin/ui/Composite.java b/server/src/main/java/com/vaadin/ui/Composite.java index 755b25b742..fcdbf4b04f 100644 --- a/server/src/main/java/com/vaadin/ui/Composite.java +++ b/server/src/main/java/com/vaadin/ui/Composite.java @@ -183,7 +183,7 @@ public class Composite extends AbstractComponent implements HasComponents { private Component getRootOrThrow() { Component root = getCompositionRoot(); - if(root == null) throw new IllegalStateException("Composition root has not been set"); + if (root == null) throw new IllegalStateException("Composition root has not been set"); return root; } @@ -202,7 +202,7 @@ public class Composite extends AbstractComponent implements HasComponents { private <T> T getRootAbstractComponentPropertyOrNull(SerializableFunction<AbstractComponent, T> getter) { Component root = getCompositionRoot(); - if(root instanceof AbstractComponent) { + if (root instanceof AbstractComponent) { return getter.apply((AbstractComponent) root); } return null; diff --git a/server/src/main/java/com/vaadin/ui/MenuBar.java b/server/src/main/java/com/vaadin/ui/MenuBar.java index 39d66bd0b0..35988bb84d 100644 --- a/server/src/main/java/com/vaadin/ui/MenuBar.java +++ b/server/src/main/java/com/vaadin/ui/MenuBar.java @@ -199,8 +199,8 @@ public class MenuBar extends AbstractComponent tmpItem.getCommand().menuSelected(tmpItem); } } - } // if - }// changeVariables + } + } /** * Constructs an empty, horizontal menu @@ -941,7 +941,7 @@ public class MenuBar extends AbstractComponent this.checked = checked; markAsDirty(); } - }// class MenuItem + } @Override public void writeDesign(Element design, DesignContext designContext) { @@ -1091,4 +1091,4 @@ public class MenuBar extends AbstractComponent result.add("html-content-allowed"); return result; } -}// class MenuBar +} diff --git a/server/src/main/java/com/vaadin/ui/Tree.java b/server/src/main/java/com/vaadin/ui/Tree.java index 3858975f06..e54d8e052a 100644 --- a/server/src/main/java/com/vaadin/ui/Tree.java +++ b/server/src/main/java/com/vaadin/ui/Tree.java @@ -235,7 +235,7 @@ public class Tree<T> extends Composite * * @since 8.1 */ - public final static class TreeMultiSelectionModel<T> + public static final class TreeMultiSelectionModel<T> extends MultiSelectionModelImpl<T> { @Override diff --git a/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java b/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java index 0fbfe9c6b5..cdf0c6aaee 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java +++ b/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java @@ -58,10 +58,10 @@ public class DesignAttributeHandler implements Serializable { return Logger.getLogger(DesignAttributeHandler.class.getName()); } - private final static Map<Class<?>, AttributeCacheEntry> cache = new ConcurrentHashMap<>(); + private static final Map<Class<?>, AttributeCacheEntry> cache = new ConcurrentHashMap<>(); // translates string <-> object - private final static DesignFormatter FORMATTER = new DesignFormatter(); + private static final DesignFormatter FORMATTER = new DesignFormatter(); /** * Returns the currently used formatter. All primitive types and all types diff --git a/server/src/main/java/com/vaadin/util/FileTypeResolver.java b/server/src/main/java/com/vaadin/util/FileTypeResolver.java index 4cbac69df5..500e8736e7 100644 --- a/server/src/main/java/com/vaadin/util/FileTypeResolver.java +++ b/server/src/main/java/com/vaadin/util/FileTypeResolver.java @@ -42,13 +42,13 @@ public class FileTypeResolver implements Serializable { /** * Default icon given if no icon is specified for a mime-type. */ - static public Resource DEFAULT_ICON = new ThemeResource( + public static Resource DEFAULT_ICON = new ThemeResource( "../runo/icons/16/document.png"); /** * Default mime-type. */ - static public String DEFAULT_MIME_TYPE = "application/octet-stream"; + public static String DEFAULT_MIME_TYPE = "application/octet-stream"; /** * Initial file extension to mime-type mapping. diff --git a/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java b/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java index d2d25b4777..085c0ec348 100644 --- a/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java +++ b/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java @@ -271,7 +271,7 @@ public class ClassesSerializableTest { * * @return List of class path segment strings */ - private final static List<String> getRawClasspathEntries() { + private static final List<String> getRawClasspathEntries() { // try to keep the order of the classpath List<String> locations = new ArrayList<>(); @@ -382,7 +382,7 @@ public class ClassesSerializableTest { * File representing the directory to scan * @return collection of fully qualified class names in the directory */ - private final static Collection<String> findClassesInDirectory( + private static final Collection<String> findClassesInDirectory( String parentPackage, File parent) { if (parent.isHidden() || parent.getPath().contains(File.separator + ".")) { diff --git a/server/src/test/java/com/vaadin/tests/server/ClasspathHelper.java b/server/src/test/java/com/vaadin/tests/server/ClasspathHelper.java index 0a7ae5fe75..946a51a9f1 100644 --- a/server/src/test/java/com/vaadin/tests/server/ClasspathHelper.java +++ b/server/src/test/java/com/vaadin/tests/server/ClasspathHelper.java @@ -112,7 +112,7 @@ public class ClasspathHelper { } } - private final static List<String> getRawClasspathEntries() { + private static final List<String> getRawClasspathEntries() { List<String> locations = new ArrayList<>(); String pathSep = System.getProperty("path.separator"); diff --git a/uitest/src/main/java/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/main/java/com/vaadin/launcher/ApplicationRunnerServlet.java index 59de2695bc..6835b5fb0b 100644 --- a/uitest/src/main/java/com/vaadin/launcher/ApplicationRunnerServlet.java +++ b/uitest/src/main/java/com/vaadin/launcher/ApplicationRunnerServlet.java @@ -232,7 +232,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { return getApplicationRunnerURIs(request).applicationClassname; } - private final static class ProxyDeploymentConfiguration + private static final class ProxyDeploymentConfiguration implements InvocationHandler, Serializable { private final DeploymentConfiguration originalConfiguration; diff --git a/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java b/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java index 006bcd8fba..93ddea656f 100644 --- a/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java +++ b/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java @@ -61,7 +61,7 @@ import com.vaadin.launcher.util.BrowserLauncher; public class DevelopmentServerLauncher { private static final String KEYSTORE = "src/main/resources/com/vaadin/launcher/keystore"; - private final static int serverPort = 8888; + private static final int serverPort = 8888; /** * Main function for running Jetty. diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java index 10959a73b1..c438c7b40c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java +++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java @@ -39,7 +39,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> private List<T> testComponents = new ArrayList<>(); - abstract protected Class<T> getTestClass(); + protected abstract Class<T> getTestClass(); protected static ThemeResource uncacheableThemeResource( String resourceLocation) { @@ -51,7 +51,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> return new ThemeResource(resourceLocation); } - abstract protected void initializeComponents(); + protected abstract void initializeComponents(); @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonClick.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonClick.java index 1b716e5ebb..667c0e80ce 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonClick.java +++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonClick.java @@ -26,8 +26,8 @@ import com.vaadin.ui.VerticalLayout; public class ButtonClick extends AbstractReindeerTestUI { - public final static String SUCCESS_TEXT = "Click received succesfully!"; - public final static String WRONG_BUTTON_TEXT = "Wrong button clicked."; + public static final String SUCCESS_TEXT = "Click received succesfully!"; + public static final String WRONG_BUTTON_TEXT = "Wrong button clicked."; @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java index 70016c9fb8..bace18dbb5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java +++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java @@ -41,16 +41,16 @@ public class MenuBarsWithNesting extends AbstractReindeerTestUI { private final Label label = new Label("Initial content"); // The captions and icons used in the second MenuBar. - public final static String[] itemNames = { "Icon item", "Arrow down", + public static final String[] itemNames = { "Icon item", "Arrow down", "Arrow up", "Warning" }; - private final static Resource[] itemIcons = { + private static final Resource[] itemIcons = { new ThemeResource("window/img/restore.png"), VaadinIcons.ARROW_DOWN, VaadinIcons.ARROW_UP, VaadinIcons.WARNING }; // The last menu item is nested with the following submenu items. - public final static String[] nestedItemnames = { "No icon", "Font icon", + public static final String[] nestedItemnames = { "No icon", "Font icon", "Image icon" }; - private final static Resource[] nestedItemIcons = { null, VaadinIcons.LINK, + private static final Resource[] nestedItemIcons = { null, VaadinIcons.LINK, new ThemeResource("window/img/restore.png") }; private MenuBar.Command selectionCommand; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableNavigationPageDown.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableNavigationPageDown.java index db69f8c007..b5c4197e7d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableNavigationPageDown.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableNavigationPageDown.java @@ -21,7 +21,7 @@ import com.vaadin.v7.ui.Table; public class TableNavigationPageDown extends AbstractReindeerTestUI { - private final static int ROW_NUMBER = 50; + private static final int ROW_NUMBER = 50; @Override protected void setup(VaadinRequest req) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java index 5147f996d8..63530fac1c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java @@ -92,9 +92,9 @@ public class TabKeyboardNavigation extends AbstractReindeerTestUI { return 5100; } - public final static String LABEL_ID = "sheetLabel"; + public static final String LABEL_ID = "sheetLabel"; - public final static String labelID(int index) { + public static final String labelID(int index) { return LABEL_ID + index; } diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java index 73e709d79d..07640bc7f6 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java @@ -279,9 +279,9 @@ public class DDTest2 extends TestBase { } - private final static ThemeResource FOLDER = new ThemeResource( + private static final ThemeResource FOLDER = new ThemeResource( "../runo/icons/16/folder.png"); - private final static ThemeResource DOC = new ThemeResource( + private static final ThemeResource DOC = new ThemeResource( "../runo/icons/16/document.png"); private void popuplateTrees() { diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java index 502b476f3c..e132712e9e 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java @@ -175,9 +175,9 @@ public class DDTest6 extends TestBase { } - private final static ThemeResource FOLDER = new ThemeResource( + private static final ThemeResource FOLDER = new ThemeResource( "../runo/icons/64/folder.png"); - private final static ThemeResource DOC = new ThemeResource( + private static final ThemeResource DOC = new ThemeResource( "../runo/icons/64/document.png"); public static class File { diff --git a/uitest/src/main/java/com/vaadin/tests/elements/notification/NotificationGetTypeAndDescription.java b/uitest/src/main/java/com/vaadin/tests/elements/notification/NotificationGetTypeAndDescription.java index f57d8418ec..d179f9c9ec 100644 --- a/uitest/src/main/java/com/vaadin/tests/elements/notification/NotificationGetTypeAndDescription.java +++ b/uitest/src/main/java/com/vaadin/tests/elements/notification/NotificationGetTypeAndDescription.java @@ -10,14 +10,14 @@ import com.vaadin.ui.Notification.Type; public class NotificationGetTypeAndDescription extends AbstractTestUI { - private final static Type[] types = { Type.WARNING_MESSAGE, + private static final Type[] types = { Type.WARNING_MESSAGE, Type.ERROR_MESSAGE, Type.HUMANIZED_MESSAGE, Type.TRAY_NOTIFICATION }; - public final static String[] type_names = { "warning", "error", "humanized", + public static final String[] type_names = { "warning", "error", "humanized", "tray_notification" }; - public final static String[] captions = { "warningC", "errorC", + public static final String[] captions = { "warningC", "errorC", "humanizedC", "tray_notificationC" }; - public final static String[] descriptions = { "warning", "error", + public static final String[] descriptions = { "warning", "error", "humanized", "tray_notification" }; @Override diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAlignment.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAlignment.java index c950a5cdaf..0f5baef024 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAlignment.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAlignment.java @@ -23,7 +23,7 @@ import com.vaadin.ui.AbstractOrderedLayout; * @since * @author Vaadin Ltd */ -abstract public class BaseAlignment extends BaseLayoutTestUI { +public abstract class BaseAlignment extends BaseLayoutTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/util/PortableRandom.java b/uitest/src/main/java/com/vaadin/tests/util/PortableRandom.java index 44c3201cf4..dd5649c6dd 100644 --- a/uitest/src/main/java/com/vaadin/tests/util/PortableRandom.java +++ b/uitest/src/main/java/com/vaadin/tests/util/PortableRandom.java @@ -3,9 +3,9 @@ package com.vaadin.tests.util; import java.util.concurrent.atomic.AtomicLong; public class PortableRandom { - private final static long multiplier = 0x5DEECE66DL; - private final static long addend = 0xBL; - private final static long mask = (1L << 48) - 1; + private static final long multiplier = 0x5DEECE66DL; + private static final long addend = 0xBL; + private static final long mask = (1L << 48) - 1; private AtomicLong seed; public PortableRandom(long seed) { diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/TestWidgetConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/TestWidgetConnector.java index 8498218e88..0f5b55a612 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/TestWidgetConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/TestWidgetConnector.java @@ -71,7 +71,7 @@ public class TestWidgetConnector extends AbstractComponentConnector { private final TestWidgetRegistry registry = GWT .create(TestWidgetRegistry.class); - public static abstract class TestWidgetRegistry { + public abstract static class TestWidgetRegistry { private Map<String, Invoker> creators = new HashMap<>(); // Called by generated sub class diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/csrf/CsrfButtonConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/csrf/CsrfButtonConnector.java index af3e45df26..bb3b09aedf 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/csrf/CsrfButtonConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/csrf/CsrfButtonConnector.java @@ -52,7 +52,7 @@ public class CsrfButtonConnector extends AbstractComponentConnector { return GWT.create(VButton.class); } - public final static String ID = "CsrfButton"; + public static final String ID = "CsrfButton"; @Override public void init() { diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/v7/grid/GridBasicClientFeaturesWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/v7/grid/GridBasicClientFeaturesWidget.java index 9014ed68b3..e70c7c87f6 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/v7/grid/GridBasicClientFeaturesWidget.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/v7/grid/GridBasicClientFeaturesWidget.java @@ -211,7 +211,7 @@ public class GridBasicClientFeaturesWidget /** * Our basic data object */ - public final static class Data { + public static final class Data { Object value; } diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpc.java index f2a109c1cd..78491a30cf 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpc.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpc.java @@ -32,7 +32,7 @@ public class GwtRpc extends AbstractReindeerTestUI { /** * Id of the button triggering the test case. */ - public final static String BUTTON_ID = "gwtRpcButton"; + public static final String BUTTON_ID = "gwtRpcButton"; @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColumnFreezingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColumnFreezingTest.java index 452f61ee1b..22bfbfffdf 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColumnFreezingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColumnFreezingTest.java @@ -30,7 +30,7 @@ import com.vaadin.tests.components.grid.basicfeatures.EscalatorBasicClientFeatur public class EscalatorColumnFreezingTest extends EscalatorBasicClientFeaturesTest { - private final static Pattern TRANSFORM_PATTERN = Pattern.compile(// @formatter:off + private static final Pattern TRANSFORM_PATTERN = Pattern.compile(// @formatter:off // any start of the string ".*" @@ -48,7 +48,7 @@ public class EscalatorColumnFreezingTest // @formatter:on - private final static Pattern LEFT_PATTERN = Pattern + private static final Pattern LEFT_PATTERN = Pattern .compile(".*left: (\\d+)px.*", Pattern.CASE_INSENSITIVE); private static final int NO_FREEZE = -1; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java index f3c97cfeea..449a952872 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java @@ -48,7 +48,7 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest { // translate3d(0px, 40px, 123px); // translate3d(24px, 15.251px, 0); // translate(0, 40px); - private final static String TRANSLATE_VALUE_REGEX = + private static final String TRANSLATE_VALUE_REGEX = "translate(?:3d|)" // "translate" or "translate3d" + "\\(" // literal "(" + "(" // start capturing the x argument @@ -74,7 +74,7 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest { // 40px; // 12.34px - private final static String PIXEL_VALUE_REGEX = + private static final String PIXEL_VALUE_REGEX = "(" // capture the pixel value + "[0-9]+" // the pixel argument + "(?:" // start of the subpixel part of the value @@ -87,16 +87,16 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest { //@formatter:on // also matches "-webkit-transform"; - private final static Pattern TRANSFORM_CSS_PATTERN = Pattern + private static final Pattern TRANSFORM_CSS_PATTERN = Pattern .compile("transform: (.*?);"); - private final static Pattern TOP_CSS_PATTERN = Pattern.compile( + private static final Pattern TOP_CSS_PATTERN = Pattern.compile( "top: ([0-9]+(?:\\.[0-9]+)?(?:px)?);?", Pattern.CASE_INSENSITIVE); - private final static Pattern LEFT_CSS_PATTERN = Pattern.compile( + private static final Pattern LEFT_CSS_PATTERN = Pattern.compile( "left: ([0-9]+(?:\\.[0-9]+)?(?:px)?);?", Pattern.CASE_INSENSITIVE); - private final static Pattern TRANSLATE_VALUE_PATTERN = Pattern + private static final Pattern TRANSLATE_VALUE_PATTERN = Pattern .compile(TRANSLATE_VALUE_REGEX); - private final static Pattern PIXEL_VALUE_PATTERN = Pattern + private static final Pattern PIXEL_VALUE_PATTERN = Pattern .compile(PIXEL_VALUE_REGEX, Pattern.CASE_INSENSITIVE); @Before diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationTest.java index 52b806dcd7..98604c2a6f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationTest.java @@ -156,7 +156,7 @@ public class TabKeyboardNavigationTest extends MultiBrowserTest { /* * Delay for PhantomJS. */ - private final static int DELAY = 10; + private static final int DELAY = 10; private void assertSheet(int index) { String labelCaption = "Tab " + index; diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServerTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServerTest.java index 66eb956404..a36faf0c27 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServerTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServerTest.java @@ -91,7 +91,7 @@ public class TabSelectionRevertedByServerTest extends MultiBrowserTest { /* * Delay for PhantomJS. */ - private final static int DELAY = 10; + private static final int DELAY = 10; /* * Provide the tab at specified index. diff --git a/uitest/src/test/java/com/vaadin/tests/elements/abstracttextfield/AbstractTextElementSetValueTest.java b/uitest/src/test/java/com/vaadin/tests/elements/abstracttextfield/AbstractTextElementSetValueTest.java index 5e6ab39c6b..587836fa6a 100644 --- a/uitest/src/test/java/com/vaadin/tests/elements/abstracttextfield/AbstractTextElementSetValueTest.java +++ b/uitest/src/test/java/com/vaadin/tests/elements/abstracttextfield/AbstractTextElementSetValueTest.java @@ -33,7 +33,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest; * @author Vaadin Ltd */ public class AbstractTextElementSetValueTest extends MultiBrowserTest { - private final static String TYPED_STRING = "this is typed string"; + private static final String TYPED_STRING = "this is typed string"; @Before public void init() { diff --git a/uitest/src/test/java/com/vaadin/tests/elements/abstracttextfield/CompatibilityAbstractTextElementSetValueTest.java b/uitest/src/test/java/com/vaadin/tests/elements/abstracttextfield/CompatibilityAbstractTextElementSetValueTest.java index c7f4b8d11e..d96f5df84a 100644 --- a/uitest/src/test/java/com/vaadin/tests/elements/abstracttextfield/CompatibilityAbstractTextElementSetValueTest.java +++ b/uitest/src/test/java/com/vaadin/tests/elements/abstracttextfield/CompatibilityAbstractTextElementSetValueTest.java @@ -29,7 +29,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest; public class CompatibilityAbstractTextElementSetValueTest extends MultiBrowserTest { - private final static String TYPED_STRING = "this is typed string"; + private static final String TYPED_STRING = "this is typed string"; @Before public void init() { |