Update modifier order to follow Java Specification suggestions (#10050)

Also includes some other minor cleanup.

22 files changed, 42 insertions, 42 deletions

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() {