You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by mk...@apache.org on 2022/02/18 14:48:59 UTC

[netbeans] 03/17: Use the blessed modifier order in projects located in webcommon projects

This is an automated email from the ASF dual-hosted git repository.

mklaehn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit 7df85fea5e10e4dcb058b954e85e3ff64d49d018
Author: Martin Klähn <mk...@apache.org>
AuthorDate: Fri Feb 18 11:08:23 2022 +0100

    Use the blessed modifier order in projects located in webcommon projects
---
 .../modules/cordova/platforms/android/AndroidPlatform.java        | 2 +-
 .../netbeans/modules/cordova/platforms/EnhancedBrowserImpl.java   | 2 +-
 .../modules/cordova/platforms/RefreshOnSaveListenerImpl.java      | 4 ++--
 .../src/org/netbeans/modules/cordova/updatetask/XMLFile.java      | 2 +-
 .../cordova/src/org/netbeans/modules/cordova/CordovaPlatform.java | 2 +-
 .../netbeans/modules/cordova/project/MobileConfigurationImpl.java | 2 +-
 .../src/org/netbeans/modules/cordova/wizard/CordovaTemplate.java  | 2 +-
 .../modules/extbrowser/plugins/ExtensionManagerAccessor.java      | 2 +-
 .../modules/extbrowser/plugins/chrome/ChromeManagerAccessor.java  | 2 +-
 .../modules/html/angular/editor/AngularJsCompletionItem.java      | 2 +-
 .../modules/html/angular/model/AngularConfigInterceptor.java      | 2 +-
 .../modules/html/angular/model/AngularModuleInterceptor.java      | 4 ++--
 .../modules/html/angular/model/AngularWhenInterceptor.java        | 8 ++++----
 .../src/org/netbeans/modules/html/angular/TestProjectSupport.java | 2 +-
 .../html/angular/editor/AngularJsDeclarationFinder2Test.java      | 2 +-
 .../modules/javascript/bower/ui/libraries/DependenciesPanel.java  | 8 ++++----
 .../src/org/netbeans/modules/javascript/cdnjs/Library.java        | 2 +-
 .../org/netbeans/modules/javascript/cdnjs/ui/SelectionPanel.java  | 6 +++---
 .../modules/javascript/nodejs/ui/libraries/DependenciesPanel.java | 8 ++++----
 .../javascript/v8debug/ui/eval/EvaluationResultsModel.java        | 2 +-
 .../src/org/netbeans/modules/javascript2/editor/FileUtils.java    | 2 +-
 .../src/org/netbeans/modules/javascript2/editor/JsKeywords.java   | 4 ++--
 .../netbeans/modules/javascript2/editor/JsStructureScanner.java   | 8 ++++----
 .../modules/javascript2/editor/JsTypedTextInterceptor.java        | 4 ++--
 .../netbeans/modules/javascript2/editor/formatter/CodeStyle.java  | 2 +-
 .../modules/javascript2/editor/parser/JsErrorManager.java         | 2 +-
 .../modules/javascript2/editor/parser/SanitizingParser.java       | 4 ++--
 .../netbeans/modules/javascript2/extjs/ExtJsCodeCompletion.java   | 2 +-
 .../modules/javascript2/jade/editor/JadeCodeCompletion.java       | 4 ++--
 .../modules/javascript2/jade/editor/JadeCompletionItem.java       | 6 +++---
 .../modules/javascript2/jquery/editor/JQueryCodeCompletion.java   | 2 +-
 .../modules/javascript2/jquery/model/JQueryExtendInterceptor.java | 2 +-
 .../modules/javascript2/jquery/model/JQueryWidgetInterceptor.java | 2 +-
 .../modules/javascript2/jsdoc/model/JsDocElementType.java         | 2 +-
 .../org/netbeans/modules/javascript2/model/CatchBlockImpl.java    | 2 +-
 .../org/netbeans/modules/javascript2/model/JsFunctionImpl.java    | 6 +++---
 .../src/org/netbeans/modules/javascript2/model/JsObjectImpl.java  | 8 ++++----
 .../src/org/netbeans/modules/javascript2/model/ModelVisitor.java  | 2 +-
 .../netbeans/modules/javascript2/model/api/IndexedElement.java    | 6 +++---
 .../netbeans/modules/javascript2/nodejs/TestProjectSupport.java   | 2 +-
 .../javascript2/nodejs/editor/NodeJSCodeCompletionTest.java       | 2 +-
 .../nodejs/editor/NodeJsCodeCompletionWithJsRunTimeTest.java      | 2 +-
 .../modules/javascript2/prototypejs/model/CreateInterceptor.java  | 6 +++---
 .../modules/javascript2/requirejs/RequireJsDataProvider.java      | 2 +-
 .../modules/javascript2/requirejs/editor/FSCompletionUtils.java   | 2 +-
 .../modules/javascript2/requirejs/editor/SimpleHandle.java        | 2 +-
 .../javascript2/requirejs/editor/model/ConfigInterceptor.java     | 2 +-
 .../modules/javascript2/requirejs/TestProjectSupport.java         | 2 +-
 .../javascript2/requirejs/editor/RequireJSCodeCompletionTest.java | 2 +-
 .../src/org/netbeans/lib/v8debug/client/cmdline/V8Debug.java      | 2 +-
 .../modules/web/clientproject/build/ui/VerticalGridLayout.java    | 2 +-
 .../modules/web/clientproject/browser/BrowserActionProvider.java  | 2 +-
 .../clientproject/browser/ClientProjectEnhancedBrowserImpl.java   | 4 ++--
 .../web/clientproject/browser/RefreshOnSaveListenerImpl.java      | 4 ++--
 .../modules/web/inspect/webkit/knockout/KnockoutNode.java         | 2 +-
 .../web/javascript/debugger/eval/ui/EvaluationResultsModel.java   | 2 +-
 56 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/webcommon/cordova.platforms.android/src/org/netbeans/modules/cordova/platforms/android/AndroidPlatform.java b/webcommon/cordova.platforms.android/src/org/netbeans/modules/cordova/platforms/android/AndroidPlatform.java
index cb5345c..ad46a42 100644
--- a/webcommon/cordova.platforms.android/src/org/netbeans/modules/cordova/platforms/android/AndroidPlatform.java
+++ b/webcommon/cordova.platforms.android/src/org/netbeans/modules/cordova/platforms/android/AndroidPlatform.java
@@ -63,7 +63,7 @@ public class AndroidPlatform implements MobilePlatform {
     
     public static int DEFAULT_TIMEOUT = 30000;
 
-    private transient final java.beans.PropertyChangeSupport propertyChangeSupport = new java.beans.PropertyChangeSupport(this);
+    private final transient java.beans.PropertyChangeSupport propertyChangeSupport = new java.beans.PropertyChangeSupport(this);
     
     public AndroidPlatform() {
     }
diff --git a/webcommon/cordova.platforms/src/org/netbeans/modules/cordova/platforms/EnhancedBrowserImpl.java b/webcommon/cordova.platforms/src/org/netbeans/modules/cordova/platforms/EnhancedBrowserImpl.java
index 485546c..03044ca 100644
--- a/webcommon/cordova.platforms/src/org/netbeans/modules/cordova/platforms/EnhancedBrowserImpl.java
+++ b/webcommon/cordova.platforms/src/org/netbeans/modules/cordova/platforms/EnhancedBrowserImpl.java
@@ -35,7 +35,7 @@ import org.netbeans.spi.project.ActionProvider;
  */
 public final class EnhancedBrowserImpl implements ClientProjectEnhancedBrowserImplementation {
 
-    final private Project project;
+    private final Project project;
     private final WebBrowser browser;
     protected BrowserSupport browserSupport;
     private static final Logger LOGGER = Logger.getLogger(EnhancedBrowserImpl.class.getName());
diff --git a/webcommon/cordova.platforms/src/org/netbeans/modules/cordova/platforms/RefreshOnSaveListenerImpl.java b/webcommon/cordova.platforms/src/org/netbeans/modules/cordova/platforms/RefreshOnSaveListenerImpl.java
index cb59345..ab724d2 100644
--- a/webcommon/cordova.platforms/src/org/netbeans/modules/cordova/platforms/RefreshOnSaveListenerImpl.java
+++ b/webcommon/cordova.platforms/src/org/netbeans/modules/cordova/platforms/RefreshOnSaveListenerImpl.java
@@ -28,8 +28,8 @@ import org.openide.filesystems.FileObject;
 
 public class RefreshOnSaveListenerImpl implements RefreshOnSaveListener {
 
-    final private BrowserSupport support;
-    final private Project project;
+    private final BrowserSupport support;
+    private final Project project;
     private ClientProjectEnhancedBrowserImplementation cfg;
 
     public RefreshOnSaveListenerImpl(Project project, BrowserSupport support, ClientProjectEnhancedBrowserImplementation cfg) {
diff --git a/webcommon/cordova/cordovaprojectupdate/src/org/netbeans/modules/cordova/updatetask/XMLFile.java b/webcommon/cordova/cordovaprojectupdate/src/org/netbeans/modules/cordova/updatetask/XMLFile.java
index 5a9ccb9..83d0caa 100644
--- a/webcommon/cordova/cordovaprojectupdate/src/org/netbeans/modules/cordova/updatetask/XMLFile.java
+++ b/webcommon/cordova/cordovaprojectupdate/src/org/netbeans/modules/cordova/updatetask/XMLFile.java
@@ -51,7 +51,7 @@ import org.xml.sax.SAXException;
  */
 public class XMLFile {
     
-    final protected Document doc;
+    protected final Document doc;
     private File file;
     private final XPath xPath;
 
diff --git a/webcommon/cordova/src/org/netbeans/modules/cordova/CordovaPlatform.java b/webcommon/cordova/src/org/netbeans/modules/cordova/CordovaPlatform.java
index 4710381..d0b5771 100644
--- a/webcommon/cordova/src/org/netbeans/modules/cordova/CordovaPlatform.java
+++ b/webcommon/cordova/src/org/netbeans/modules/cordova/CordovaPlatform.java
@@ -43,7 +43,7 @@ public class CordovaPlatform {
     private final Map<String, Version> versions = Collections.synchronizedMap(new HashMap<>());
     private boolean isGitReady;
 
-    private transient final java.beans.PropertyChangeSupport propertyChangeSupport = new java.beans.PropertyChangeSupport(this);
+    private final transient java.beans.PropertyChangeSupport propertyChangeSupport = new java.beans.PropertyChangeSupport(this);
 
     private CordovaPlatform() {
     }
diff --git a/webcommon/cordova/src/org/netbeans/modules/cordova/project/MobileConfigurationImpl.java b/webcommon/cordova/src/org/netbeans/modules/cordova/project/MobileConfigurationImpl.java
index 181cc5b..cd3451a 100644
--- a/webcommon/cordova/src/org/netbeans/modules/cordova/project/MobileConfigurationImpl.java
+++ b/webcommon/cordova/src/org/netbeans/modules/cordova/project/MobileConfigurationImpl.java
@@ -43,7 +43,7 @@ import org.openide.util.Exceptions;
  */
 public class MobileConfigurationImpl implements ProjectConfiguration, PropertyProvider {
 
-    final private Project project;
+    private final Project project;
     //final private ClientProjectPlatformImpl platform;
     private final String name;
     private final String displayName;
diff --git a/webcommon/cordova/src/org/netbeans/modules/cordova/wizard/CordovaTemplate.java b/webcommon/cordova/src/org/netbeans/modules/cordova/wizard/CordovaTemplate.java
index 22ed1fe..b8c1fbb 100644
--- a/webcommon/cordova/src/org/netbeans/modules/cordova/wizard/CordovaTemplate.java
+++ b/webcommon/cordova/src/org/netbeans/modules/cordova/wizard/CordovaTemplate.java
@@ -193,7 +193,7 @@ public class CordovaTemplate implements SiteTemplateImplementation {
         }
 
         private CordovaPanel panel;
-        private transient final ChangeSupport changeSupport = new ChangeSupport(this);
+        private final transient ChangeSupport changeSupport = new ChangeSupport(this);
 
         @Override
         public void addChangeListener(ChangeListener listener) {
diff --git a/webcommon/extbrowser.chrome/src/org/netbeans/modules/extbrowser/plugins/ExtensionManagerAccessor.java b/webcommon/extbrowser.chrome/src/org/netbeans/modules/extbrowser/plugins/ExtensionManagerAccessor.java
index 1372b79..813c281 100644
--- a/webcommon/extbrowser.chrome/src/org/netbeans/modules/extbrowser/plugins/ExtensionManagerAccessor.java
+++ b/webcommon/extbrowser.chrome/src/org/netbeans/modules/extbrowser/plugins/ExtensionManagerAccessor.java
@@ -30,7 +30,7 @@ public interface ExtensionManagerAccessor {
 
     BrowserExtensionManager getManager();
     
-    public static abstract class AbstractBrowserExtensionManager 
+    public abstract static class AbstractBrowserExtensionManager 
         implements BrowserExtensionManager 
     {
         protected static final String PLUGIN_MODULE_NAME = 
diff --git a/webcommon/extbrowser.chrome/src/org/netbeans/modules/extbrowser/plugins/chrome/ChromeManagerAccessor.java b/webcommon/extbrowser.chrome/src/org/netbeans/modules/extbrowser/plugins/chrome/ChromeManagerAccessor.java
index 70ac34d..e361782 100644
--- a/webcommon/extbrowser.chrome/src/org/netbeans/modules/extbrowser/plugins/chrome/ChromeManagerAccessor.java
+++ b/webcommon/extbrowser.chrome/src/org/netbeans/modules/extbrowser/plugins/chrome/ChromeManagerAccessor.java
@@ -563,7 +563,7 @@ public class ChromeManagerAccessor implements ExtensionManagerAccessor {
             return result[0];
         }
 
-        static private class FileFinder implements FileFilter {
+        private static class FileFinder implements FileFilter {
             FileFinder(String name){
                 this( name, false );
             }
diff --git a/webcommon/html.angular/src/org/netbeans/modules/html/angular/editor/AngularJsCompletionItem.java b/webcommon/html.angular/src/org/netbeans/modules/html/angular/editor/AngularJsCompletionItem.java
index 8823934..576315e 100644
--- a/webcommon/html.angular/src/org/netbeans/modules/html/angular/editor/AngularJsCompletionItem.java
+++ b/webcommon/html.angular/src/org/netbeans/modules/html/angular/editor/AngularJsCompletionItem.java
@@ -34,7 +34,7 @@ import org.openide.util.ImageUtilities;
  */
 public class AngularJsCompletionItem implements CompletionProposal {
 
-    private final static String ANGULAR_NAME = "Angular Js";
+    private static final String ANGULAR_NAME = "Angular Js";
     private static ImageIcon angularIcon = null;
 
     private final int anchorOffset;
diff --git a/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularConfigInterceptor.java b/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularConfigInterceptor.java
index 4ac7246..cb24334 100644
--- a/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularConfigInterceptor.java
+++ b/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularConfigInterceptor.java
@@ -47,7 +47,7 @@ import org.openide.filesystems.FileObject;
 @FunctionInterceptor.Registration(priority = 17)
 public class AngularConfigInterceptor implements FunctionInterceptor {
 
-    private final static Pattern PATTERN = Pattern.compile("(.)*\\.config");  //NOI18N
+    private static final Pattern PATTERN = Pattern.compile("(.)*\\.config");  //NOI18N
     public static final String COMPONENT_PROP = "component"; //NOI18N
     public static final String COMPONENTS_PROP = "components"; //NOI18N
     public static final String CONTROLLER_SUFFIX = "Controller"; //NOI18N
diff --git a/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularModuleInterceptor.java b/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularModuleInterceptor.java
index 3750380..02211b0 100644
--- a/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularModuleInterceptor.java
+++ b/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularModuleInterceptor.java
@@ -49,8 +49,8 @@ import org.openide.filesystems.FileObject;
 public class AngularModuleInterceptor implements FunctionInterceptor{
 
     //private static Pattern PATTERN = Pattern.compile("angular\\.module(\\..*)*\\.controller");
-    private final static Pattern PATTERN = Pattern.compile("(.)*\\.controller");
-    private final static List<String> KNOWN_TYPES = Arrays.asList(
+    private static final Pattern PATTERN = Pattern.compile("(.)*\\.controller");
+    private static final List<String> KNOWN_TYPES = Arrays.asList(
             TypeUsage.ARRAY, TypeUsage.BOOLEAN, TypeUsage.FUNCTION, TypeUsage.NULL,
             TypeUsage.NUMBER, TypeUsage.OBJECT, TypeUsage.REGEXP, TypeUsage.STRING,
             TypeUsage.UNDEFINED, TypeUsage.UNRESOLVED);
diff --git a/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularWhenInterceptor.java b/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularWhenInterceptor.java
index 568f66d..13b0e45 100644
--- a/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularWhenInterceptor.java
+++ b/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularWhenInterceptor.java
@@ -42,10 +42,10 @@ import org.openide.filesystems.FileObject;
 @FunctionInterceptor.Registration(priority = 16)
 public class AngularWhenInterceptor implements FunctionInterceptor {
 
-    private final static Pattern PATTERN = Pattern.compile("(.)*\\.(when|state)");  //NOI18N
-    public final static String TEMPLATE_URL_PROP = "templateUrl";  //NOI18N
-    public final static String CONTROLLER_PROP = "controller";     //NOI18N
-    public final static String CONTROLLER_AS_PROP = "controllerAs"; //NOI18N
+    private static final Pattern PATTERN = Pattern.compile("(.)*\\.(when|state)");  //NOI18N
+    public static final String TEMPLATE_URL_PROP = "templateUrl";  //NOI18N
+    public static final String CONTROLLER_PROP = "controller";     //NOI18N
+    public static final String CONTROLLER_AS_PROP = "controllerAs"; //NOI18N
 
     @Override
     public Pattern getNamePattern() {
diff --git a/webcommon/html.angular/test/unit/src/org/netbeans/modules/html/angular/TestProjectSupport.java b/webcommon/html.angular/test/unit/src/org/netbeans/modules/html/angular/TestProjectSupport.java
index d48526d..7f1d449 100644
--- a/webcommon/html.angular/test/unit/src/org/netbeans/modules/html/angular/TestProjectSupport.java
+++ b/webcommon/html.angular/test/unit/src/org/netbeans/modules/html/angular/TestProjectSupport.java
@@ -70,7 +70,7 @@ public class TestProjectSupport {
         
     }
     
-    static public class FileOwnerQueryImpl implements FileOwnerQueryImplementation {
+    public static class FileOwnerQueryImpl implements FileOwnerQueryImplementation {
 
         private Project testProject1;
 
diff --git a/webcommon/html.angular/test/unit/src/org/netbeans/modules/html/angular/editor/AngularJsDeclarationFinder2Test.java b/webcommon/html.angular/test/unit/src/org/netbeans/modules/html/angular/editor/AngularJsDeclarationFinder2Test.java
index 125a51c..05c2b19 100644
--- a/webcommon/html.angular/test/unit/src/org/netbeans/modules/html/angular/editor/AngularJsDeclarationFinder2Test.java
+++ b/webcommon/html.angular/test/unit/src/org/netbeans/modules/html/angular/editor/AngularJsDeclarationFinder2Test.java
@@ -55,7 +55,7 @@ public class AngularJsDeclarationFinder2Test extends JsCodeCompletionBase {
         super(testName);
     }
 
-    static private boolean isSetup = false;
+    private static boolean isSetup = false;
     
     @Override
     protected void setUp() throws Exception {
diff --git a/webcommon/javascript.bower/src/org/netbeans/modules/javascript/bower/ui/libraries/DependenciesPanel.java b/webcommon/javascript.bower/src/org/netbeans/modules/javascript/bower/ui/libraries/DependenciesPanel.java
index f8cd154..902c589 100644
--- a/webcommon/javascript.bower/src/org/netbeans/modules/javascript/bower/ui/libraries/DependenciesPanel.java
+++ b/webcommon/javascript.bower/src/org/netbeans/modules/javascript/bower/ui/libraries/DependenciesPanel.java
@@ -684,10 +684,10 @@ public class DependenciesPanel extends javax.swing.JPanel {
      * Renderer of the version columns.
      */
     static class VersionColumnRenderer extends DefaultTableCellRenderer {
-        final static Object UP_TO_DATE = new Object();
-        final static Object CHECKING = new Object();
-        final static Object UNKNOWN = new Object();
-        final static Object NO_VERSION = new Object();
+        static final Object UP_TO_DATE = new Object();
+        static final Object CHECKING = new Object();
+        static final Object UNKNOWN = new Object();
+        static final Object NO_VERSION = new Object();
 
         @Override
         @NbBundle.Messages({
diff --git a/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/Library.java b/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/Library.java
index 668bd64..6f59f2e 100644
--- a/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/Library.java
+++ b/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/Library.java
@@ -119,7 +119,7 @@ public final class Library {
     /**
      * Library version.
      */
-    public final static class Version {
+    public static final class Version {
         /** Owning library. */
         private final Library library;
         /** Whether this version is already part of the project. */
diff --git a/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/ui/SelectionPanel.java b/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/ui/SelectionPanel.java
index ed56be3..85c2434 100644
--- a/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/ui/SelectionPanel.java
+++ b/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/ui/SelectionPanel.java
@@ -558,9 +558,9 @@ public class SelectionPanel extends JPanel implements HelpCtx.Provider {
      */
     static class VersionColumnRenderer extends DefaultTableCellRenderer {
 
-        final static Object UP_TO_DATE = new Object();
-        final static Object CHECKING = new Object();
-        final static Object UNKNOWN = new Object();
+        static final Object UP_TO_DATE = new Object();
+        static final Object CHECKING = new Object();
+        static final Object UNKNOWN = new Object();
 
         @StaticResource
         private static final String UP_TO_DATE_ICON = "org/netbeans/modules/javascript/cdnjs/ui/resources/uptodate.gif"; // NOI18N
diff --git a/webcommon/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/ui/libraries/DependenciesPanel.java b/webcommon/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/ui/libraries/DependenciesPanel.java
index 2fe2c0b..338e3a2 100644
--- a/webcommon/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/ui/libraries/DependenciesPanel.java
+++ b/webcommon/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/ui/libraries/DependenciesPanel.java
@@ -704,10 +704,10 @@ public class DependenciesPanel extends javax.swing.JPanel {
      * Renderer of the version columns.
      */
     static class VersionColumnRenderer extends DefaultTableCellRenderer {
-        final static Object UP_TO_DATE = new Object();
-        final static Object CHECKING = new Object();
-        final static Object UNKNOWN = new Object();
-        final static Object NO_VERSION = new Object();
+        static final Object UP_TO_DATE = new Object();
+        static final Object CHECKING = new Object();
+        static final Object UNKNOWN = new Object();
+        static final Object NO_VERSION = new Object();
 
         @Override
         @NbBundle.Messages({
diff --git a/webcommon/javascript.v8debug.ui/src/org/netbeans/modules/javascript/v8debug/ui/eval/EvaluationResultsModel.java b/webcommon/javascript.v8debug.ui/src/org/netbeans/modules/javascript/v8debug/ui/eval/EvaluationResultsModel.java
index 3349b0d..bac7f7f 100644
--- a/webcommon/javascript.v8debug.ui/src/org/netbeans/modules/javascript/v8debug/ui/eval/EvaluationResultsModel.java
+++ b/webcommon/javascript.v8debug.ui/src/org/netbeans/modules/javascript/v8debug/ui/eval/EvaluationResultsModel.java
@@ -63,7 +63,7 @@ public class EvaluationResultsModel extends VariablesModel {
     private static final String ICON_WRONG_PASS =
         "org/netbeans/modules/debugger/resources/wrong_pass.png"; // NOI18N
 
-    private final static RequestProcessor RP = new RequestProcessor(EvaluationResultsModel.class);
+    private static final RequestProcessor RP = new RequestProcessor(EvaluationResultsModel.class);
     private final org.netbeans.spi.debugger.ui.CodeEvaluator.Result result;
     private EvaluatorListener evalListener = new EvaluatorListener();
     
diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/FileUtils.java b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/FileUtils.java
index f834b98..eb20b2a 100644
--- a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/FileUtils.java
+++ b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/FileUtils.java
@@ -44,7 +44,7 @@ import org.openide.util.BaseUtilities;
  */
 public class FileUtils {
     
-    final static String GO_UP = "../"; //NOI18N
+    static final String GO_UP = "../"; //NOI18N
     private static final String SLASH = "/"; //NOI18N
     private static final String FILE = "file"; // URI scheme
     
diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsKeywords.java b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsKeywords.java
index 9a080b8..76411a8 100644
--- a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsKeywords.java
+++ b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsKeywords.java
@@ -40,8 +40,8 @@ public class JsKeywords {
         ENDS_WITH_DOT
     };
 
-    protected final static Map<String, CompletionDescription> KEYWORDS = new HashMap<>();
-    protected final static Map<String, CompletionDescription> SPECIAL_KEYWORDS_IMPORTEXPORT = new HashMap<>();
+    protected static final Map<String, CompletionDescription> KEYWORDS = new HashMap<>();
+    protected static final Map<String, CompletionDescription> SPECIAL_KEYWORDS_IMPORTEXPORT = new HashMap<>();
     
     static {
         KEYWORDS.put(JsTokenId.KEYWORD_BREAK.fixedText(), new CompletionDescription(CompletionType.ENDS_WITH_SEMICOLON));
diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsStructureScanner.java b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsStructureScanner.java
index cd3556f..074f133 100644
--- a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsStructureScanner.java
+++ b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsStructureScanner.java
@@ -403,10 +403,10 @@ public class JsStructureScanner implements StructureScanner {
 
         private JsObject modelElement;
         
-        final private List<? extends StructureItem> children;
-        final private String sortPrefix;
-        final protected ParserResult parserResult;
-        final private String fqn;
+        private final List<? extends StructureItem> children;
+        private final String sortPrefix;
+        protected final ParserResult parserResult;
+        private final String fqn;
         
         public JsStructureItem(JsObject elementHandle, List<? extends StructureItem> children, String sortPrefix, ParserResult parserResult) {
             this.modelElement = elementHandle;
diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsTypedTextInterceptor.java b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsTypedTextInterceptor.java
index c41194b..ff13808 100644
--- a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsTypedTextInterceptor.java
+++ b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsTypedTextInterceptor.java
@@ -52,10 +52,10 @@ public class JsTypedTextInterceptor implements TypedTextInterceptor {
     private static final TokenId[] REGEXP_TOKENS = { JsTokenId.REGEXP, JsTokenId.REGEXP_END };
 
     /** Tokens which indicate that we're within a literal string */
-    private final static TokenId[] STRING_TOKENS = { JsTokenId.STRING, JsTokenId.STRING_END };
+    private static final TokenId[] STRING_TOKENS = { JsTokenId.STRING, JsTokenId.STRING_END };
 
     /** Tokens which indicate that we're within a template string */
-    private final static TokenId[] TEMPLATE_TOKENS = { JsTokenId.TEMPLATE, JsTokenId.TEMPLATE_END };
+    private static final TokenId[] TEMPLATE_TOKENS = { JsTokenId.TEMPLATE, JsTokenId.TEMPLATE_END };
     
     private final Language<JsTokenId> language;
 
diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/formatter/CodeStyle.java b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/formatter/CodeStyle.java
index 70bf3f3..dae9c67 100644
--- a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/formatter/CodeStyle.java
+++ b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/formatter/CodeStyle.java
@@ -691,7 +691,7 @@ public final class CodeStyle {
         WRAP_NEVER
     }
 
-    final static class Holder {
+    static final class Holder {
 
         final boolean expandTabsToSpaces;
 
diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/parser/JsErrorManager.java b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/parser/JsErrorManager.java
index ef93f59..68ede4d 100644
--- a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/parser/JsErrorManager.java
+++ b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/parser/JsErrorManager.java
@@ -101,7 +101,7 @@ public class JsErrorManager extends ErrorManager implements ANTLRErrorListener {
 
     private List<JsParserError> convertedErrors;
 
-    private final static Map<String, JsTokenId> JS_TEXT_TOKENS = new HashMap<String, JsTokenId>();
+    private static final Map<String, JsTokenId> JS_TEXT_TOKENS = new HashMap<String, JsTokenId>();
 
     static {
         for (JsTokenId jsTokenId : JsTokenId.values()) {
diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/parser/SanitizingParser.java b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/parser/SanitizingParser.java
index 26f7d6d..2803146 100644
--- a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/parser/SanitizingParser.java
+++ b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/parser/SanitizingParser.java
@@ -546,7 +546,7 @@ public abstract class SanitizingParser<R extends BaseParserResult> extends Parse
     /**
      * Parsing context
      */
-    protected final static class Context {
+    protected static final class Context {
 
         private static final List<JsTokenId> IMPORT_EXPORT = new ArrayList<JsTokenId>(2);
 
@@ -776,7 +776,7 @@ public abstract class SanitizingParser<R extends BaseParserResult> extends Parse
         public abstract Sanitize next();
     }
 
-    private static abstract class TokenCondition {
+    private abstract static class TokenCondition {
 
         public abstract boolean found(JsTokenId id);
 
diff --git a/webcommon/javascript2.extjs/src/org/netbeans/modules/javascript2/extjs/ExtJsCodeCompletion.java b/webcommon/javascript2.extjs/src/org/netbeans/modules/javascript2/extjs/ExtJsCodeCompletion.java
index 39b813e..0a5ce00 100644
--- a/webcommon/javascript2.extjs/src/org/netbeans/modules/javascript2/extjs/ExtJsCodeCompletion.java
+++ b/webcommon/javascript2.extjs/src/org/netbeans/modules/javascript2/extjs/ExtJsCodeCompletion.java
@@ -59,7 +59,7 @@ public class ExtJsCodeCompletion implements CompletionProvider {
     
     private static HashMap<String, Collection<ExtJsDataItem>> ccData = null;
        
-    private synchronized static Map<String, Collection<ExtJsDataItem>> getData() {
+    private static synchronized Map<String, Collection<ExtJsDataItem>> getData() {
         return DataLoader.getData(getDataFile());
     }
     
diff --git a/webcommon/javascript2.jade/src/org/netbeans/modules/javascript2/jade/editor/JadeCodeCompletion.java b/webcommon/javascript2.jade/src/org/netbeans/modules/javascript2/jade/editor/JadeCodeCompletion.java
index 1c3fda9..1c08b2c 100644
--- a/webcommon/javascript2.jade/src/org/netbeans/modules/javascript2/jade/editor/JadeCodeCompletion.java
+++ b/webcommon/javascript2.jade/src/org/netbeans/modules/javascript2/jade/editor/JadeCodeCompletion.java
@@ -70,8 +70,8 @@ public class JadeCodeCompletion implements CodeCompletionHandler2 {
     
     private boolean caseSensitive;
     
-    protected final static String CSS_ID_PREFIX = "#";
-    protected final static String CSS_CLASS_PREFIX = ".";
+    protected static final String CSS_ID_PREFIX = "#";
+    protected static final String CSS_CLASS_PREFIX = ".";
     
     @Override
     @SuppressWarnings("fallthrough")
diff --git a/webcommon/javascript2.jade/src/org/netbeans/modules/javascript2/jade/editor/JadeCompletionItem.java b/webcommon/javascript2.jade/src/org/netbeans/modules/javascript2/jade/editor/JadeCompletionItem.java
index c34da4a..0a40106 100644
--- a/webcommon/javascript2.jade/src/org/netbeans/modules/javascript2/jade/editor/JadeCompletionItem.java
+++ b/webcommon/javascript2.jade/src/org/netbeans/modules/javascript2/jade/editor/JadeCompletionItem.java
@@ -133,9 +133,9 @@ public class JadeCompletionItem implements CompletionProposal {
     }
     
     protected static class CompletionRequest {
-        final public int anchor;
-        final public String prefix;
-        final public ParserResult parserResult;
+        public final int anchor;
+        public final String prefix;
+        public final ParserResult parserResult;
 
         public CompletionRequest(ParserResult parserResult, int anchor, String prefix) {
             this.anchor = anchor;
diff --git a/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/editor/JQueryCodeCompletion.java b/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/editor/JQueryCodeCompletion.java
index efd4e26..d8a56b0 100644
--- a/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/editor/JQueryCodeCompletion.java
+++ b/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/editor/JQueryCodeCompletion.java
@@ -251,7 +251,7 @@ public class JQueryCodeCompletion implements CompletionProvider {
         }
     }
 
-    private synchronized static Map<String, Collection<PropertyNameDataItem>> getPropertyNameData() {
+    private static synchronized Map<String, Collection<PropertyNameDataItem>> getPropertyNameData() {
         return PropertyNameDataLoader.getData(getPropertyNameDataFile());
     }
     
diff --git a/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/model/JQueryExtendInterceptor.java b/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/model/JQueryExtendInterceptor.java
index 1cd7598..46e4797 100644
--- a/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/model/JQueryExtendInterceptor.java
+++ b/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/model/JQueryExtendInterceptor.java
@@ -36,7 +36,7 @@ import org.netbeans.modules.parsing.api.Snapshot;
 @FunctionInterceptor.Registration(priority = 51)
 public class JQueryExtendInterceptor implements FunctionInterceptor {
 
-    private final static Pattern PATTERN = Pattern.compile("(\\$|jQuery)\\.extend");  //NOI18N
+    private static final Pattern PATTERN = Pattern.compile("(\\$|jQuery)\\.extend");  //NOI18N
 
     @Override
     public Pattern getNamePattern() {
diff --git a/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/model/JQueryWidgetInterceptor.java b/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/model/JQueryWidgetInterceptor.java
index e0b857a..20fc270 100644
--- a/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/model/JQueryWidgetInterceptor.java
+++ b/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/model/JQueryWidgetInterceptor.java
@@ -37,7 +37,7 @@ import org.netbeans.modules.parsing.api.Snapshot;
 @FunctionInterceptor.Registration(priority = 50)
 public class JQueryWidgetInterceptor implements FunctionInterceptor {
 
-    private final static Pattern PATTERN = Pattern.compile("(\\$|jQuery)\\.widget");  //NOI18N
+    private static final Pattern PATTERN = Pattern.compile("(\\$|jQuery)\\.widget");  //NOI18N
 
     @Override
     public Pattern getNamePattern() {
diff --git a/webcommon/javascript2.jsdoc/src/org/netbeans/modules/javascript2/jsdoc/model/JsDocElementType.java b/webcommon/javascript2.jsdoc/src/org/netbeans/modules/javascript2/jsdoc/model/JsDocElementType.java
index b56b21e..6793db6 100644
--- a/webcommon/javascript2.jsdoc/src/org/netbeans/modules/javascript2/jsdoc/model/JsDocElementType.java
+++ b/webcommon/javascript2.jsdoc/src/org/netbeans/modules/javascript2/jsdoc/model/JsDocElementType.java
@@ -99,7 +99,7 @@ public enum JsDocElementType {
      * @param value {@code String} value of the {@code Type}
      * @return {@code Type}
      */
-    public synchronized static JsDocElementType fromString(String value) {
+    public static synchronized JsDocElementType fromString(String value) {
         if (types == null) {
            types = new HashMap<String, JsDocElementType>();
            for (JsDocElementType type : JsDocElementType.values()) {
diff --git a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/CatchBlockImpl.java b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/CatchBlockImpl.java
index b5e9b3f..8ef7b94 100644
--- a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/CatchBlockImpl.java
+++ b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/CatchBlockImpl.java
@@ -35,7 +35,7 @@ import org.netbeans.modules.javascript2.types.api.TypeUsage;
  */
 public class CatchBlockImpl extends DeclarationScopeImpl implements JsFunction {
 
-    final private List<JsObject> parameters;
+    private final List<JsObject> parameters;
     
     public CatchBlockImpl(DeclarationScope inFunction, Identifier exception, OffsetRange range, String mimeType) {
         super(inFunction, (JsObject)inFunction, new Identifier(getBlockName((JsObject)inFunction), OffsetRange.NONE),
diff --git a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsFunctionImpl.java b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsFunctionImpl.java
index 57e0d0e..6930790 100644
--- a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsFunctionImpl.java
+++ b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsFunctionImpl.java
@@ -45,9 +45,9 @@ import org.openide.filesystems.FileObject;
  */
 public class JsFunctionImpl extends DeclarationScopeImpl implements JsFunction {
 
-    final private HashMap <String, JsObject> parametersByName;
-    final private List<JsObject> parameters;
-    final private Set<TypeUsage> returnTypes;
+    private final HashMap <String, JsObject> parametersByName;
+    private final List<JsObject> parameters;
+    private final Set<TypeUsage> returnTypes;
     private boolean isStrict;
 
     public JsFunctionImpl(DeclarationScope scope, JsObject parentObject, Identifier name,
diff --git a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsObjectImpl.java b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsObjectImpl.java
index b1a6259..08a4ca4 100644
--- a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsObjectImpl.java
+++ b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsObjectImpl.java
@@ -52,12 +52,12 @@ import org.netbeans.modules.javascript2.types.api.TypeUsage;
 public class JsObjectImpl extends JsElementImpl implements JsObject {
 
 //    final protected HashMap<String, JsObject> properties = new HashMap<String, JsObject>();
-    final protected LinkedHashMap<String, JsObject> properties = new LinkedHashMap<String, JsObject>();
+    protected final LinkedHashMap<String, JsObject> properties = new LinkedHashMap<String, JsObject>();
     private Identifier declarationName;
     private JsObject parent;
-    final private List<Occurrence> occurrences = new ArrayList<Occurrence>();
-    final private NavigableMap<Integer, Collection<TypeUsage>> assignments = new TreeMap<>();
-    final private Map<String, Integer>assignmentsReverse = new HashMap<>();
+    private final List<Occurrence> occurrences = new ArrayList<Occurrence>();
+    private final NavigableMap<Integer, Collection<TypeUsage>> assignments = new TreeMap<>();
+    private final Map<String, Integer>assignmentsReverse = new HashMap<>();
     private int countOfAssignments = 0;
     private boolean hasName;
     private Documentation documentation;
diff --git a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/ModelVisitor.java b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/ModelVisitor.java
index 669512b..50bfbaf 100644
--- a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/ModelVisitor.java
+++ b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/ModelVisitor.java
@@ -125,7 +125,7 @@ public class ModelVisitor extends PathNodeVisitor implements ModelResolver {
     private final String scriptName;
     private LexicalContext lc;
 
-    private final static String BLOCK_OBJECT_NAME_PREFIX = "block-"; //NOI18N
+    private static final String BLOCK_OBJECT_NAME_PREFIX = "block-"; //NOI18N
 
     public ModelVisitor(ParserResult parserResult, OccurrenceBuilder occurrenceBuilder) {
         super();
diff --git a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/api/IndexedElement.java b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/api/IndexedElement.java
index 38583cb..0530afc 100644
--- a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/api/IndexedElement.java
+++ b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/api/IndexedElement.java
@@ -41,9 +41,9 @@ public class IndexedElement implements JsElement {
     private final boolean isAnonymous;
     private final boolean isPlatform;
     private final Collection<TypeUsage> assignments;
-    public final static char ANONYMOUS_POSFIX = 'A';
-    public final static char OBJECT_POSFIX = 'O';
-    public final static char PARAMETER_POSTFIX = 'P';
+    public static final char ANONYMOUS_POSFIX = 'A';
+    public static final char OBJECT_POSFIX = 'O';
+    public static final char PARAMETER_POSTFIX = 'P';
     private final FileObject fileObject;
     private final String name;
     private final boolean isDeclared;
diff --git a/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/TestProjectSupport.java b/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/TestProjectSupport.java
index 8a46c08..4a9a356 100644
--- a/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/TestProjectSupport.java
+++ b/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/TestProjectSupport.java
@@ -70,7 +70,7 @@ public class TestProjectSupport {
         
     }
     
-    static public class FileOwnerQueryImpl implements FileOwnerQueryImplementation {
+    public static class FileOwnerQueryImpl implements FileOwnerQueryImplementation {
 
         private Project testProject1;
 
diff --git a/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/editor/NodeJSCodeCompletionTest.java b/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/editor/NodeJSCodeCompletionTest.java
index d03d405..fd85b40 100644
--- a/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/editor/NodeJSCodeCompletionTest.java
+++ b/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/editor/NodeJSCodeCompletionTest.java
@@ -46,7 +46,7 @@ public class NodeJSCodeCompletionTest extends JsCodeCompletionBase {
         super(testName);
     }
 
-    static private boolean isSetup = false;
+    private static boolean isSetup = false;
 
     @Override
     protected void setUp() throws Exception {
diff --git a/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/editor/NodeJsCodeCompletionWithJsRunTimeTest.java b/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/editor/NodeJsCodeCompletionWithJsRunTimeTest.java
index 38c99d7..6c18123 100644
--- a/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/editor/NodeJsCodeCompletionWithJsRunTimeTest.java
+++ b/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/editor/NodeJsCodeCompletionWithJsRunTimeTest.java
@@ -46,7 +46,7 @@ public class NodeJsCodeCompletionWithJsRunTimeTest extends JsCodeCompletionBase
         super(testName);
     }
 
-    static private boolean isSetup = false;
+    private static boolean isSetup = false;
 
     @Override
     protected void setUp() throws Exception {
diff --git a/webcommon/javascript2.prototypejs/src/org/netbeans/modules/javascript2/prototypejs/model/CreateInterceptor.java b/webcommon/javascript2.prototypejs/src/org/netbeans/modules/javascript2/prototypejs/model/CreateInterceptor.java
index 24ddf8d..708a6b1 100644
--- a/webcommon/javascript2.prototypejs/src/org/netbeans/modules/javascript2/prototypejs/model/CreateInterceptor.java
+++ b/webcommon/javascript2.prototypejs/src/org/netbeans/modules/javascript2/prototypejs/model/CreateInterceptor.java
@@ -49,9 +49,9 @@ import org.openide.filesystems.FileObject;
 @FunctionInterceptor.Registration(priority = 360)
 public class CreateInterceptor implements FunctionInterceptor {
 
-    private final static Pattern PATTERN = Pattern.compile("Class\\.create");  //NOI18N
-    private final static String CLASS = "Class";    //NOI18N
-    private final static String INITIALIZE_METHOD_NAME = "initialize"; //NOI18N
+    private static final Pattern PATTERN = Pattern.compile("Class\\.create");  //NOI18N
+    private static final String CLASS = "Class";    //NOI18N
+    private static final String INITIALIZE_METHOD_NAME = "initialize"; //NOI18N
 
     @Override
     public Pattern getNamePattern() {
diff --git a/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/RequireJsDataProvider.java b/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/RequireJsDataProvider.java
index 2a64b22..dcf5ce9 100644
--- a/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/RequireJsDataProvider.java
+++ b/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/RequireJsDataProvider.java
@@ -76,7 +76,7 @@ public class RequireJsDataProvider {
     /**
      * Translating names from documentation to the real option names
      */
-    private final static HashMap<String, String> TRANSLATE_NAME = new HashMap<>();
+    private static final HashMap<String, String> TRANSLATE_NAME = new HashMap<>();
 
     static {
         TRANSLATE_NAME.put("moduleconfig", "config");//NOI18N
diff --git a/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/FSCompletionUtils.java b/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/FSCompletionUtils.java
index 13041d1..8135acb 100644
--- a/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/FSCompletionUtils.java
+++ b/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/FSCompletionUtils.java
@@ -50,7 +50,7 @@ import org.openide.util.Utilities;
  */
 public class FSCompletionUtils {
 
-    final static String GO_UP = "../"; //NOI18N
+    static final String GO_UP = "../"; //NOI18N
     private static final String SLASH = "/"; //NOI18N
     private static final String FILE = "file"; // URI scheme
     
diff --git a/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/SimpleHandle.java b/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/SimpleHandle.java
index b0882b1..a664c0a 100644
--- a/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/SimpleHandle.java
+++ b/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/SimpleHandle.java
@@ -81,7 +81,7 @@ public class SimpleHandle implements ElementHandle {
         return OffsetRange.NONE;
     }
     
-    public static abstract class DocumentationHandle extends SimpleHandle {
+    public abstract static class DocumentationHandle extends SimpleHandle {
 
         public DocumentationHandle(String name, ElementKind kind) {
             super(name, kind);
diff --git a/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/model/ConfigInterceptor.java b/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/model/ConfigInterceptor.java
index a2e619b..c53cf24 100644
--- a/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/model/ConfigInterceptor.java
+++ b/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/model/ConfigInterceptor.java
@@ -52,7 +52,7 @@ import org.openide.filesystems.FileUtil;
 @FunctionInterceptor.Registration(priority = 351)
 public class ConfigInterceptor implements FunctionInterceptor {
 
-    private final static Pattern PATTERN = Pattern.compile("(require|requirejs)\\.config");  //NOI18N
+    private static final Pattern PATTERN = Pattern.compile("(require|requirejs)\\.config");  //NOI18N
     private static final String PROPERTY_NAME = "name"; //NOI18N
     private static final String PROPERTY_LOCATION = "location"; //NOI18N
 
diff --git a/webcommon/javascript2.requirejs/test/unit/src/org/netbeans/modules/javascript2/requirejs/TestProjectSupport.java b/webcommon/javascript2.requirejs/test/unit/src/org/netbeans/modules/javascript2/requirejs/TestProjectSupport.java
index e687336..a62bea5 100644
--- a/webcommon/javascript2.requirejs/test/unit/src/org/netbeans/modules/javascript2/requirejs/TestProjectSupport.java
+++ b/webcommon/javascript2.requirejs/test/unit/src/org/netbeans/modules/javascript2/requirejs/TestProjectSupport.java
@@ -70,7 +70,7 @@ public class TestProjectSupport {
         
     }
     
-    static public class FileOwnerQueryImpl implements FileOwnerQueryImplementation {
+    public static class FileOwnerQueryImpl implements FileOwnerQueryImplementation {
 
         private Project testProject1;
 
diff --git a/webcommon/javascript2.requirejs/test/unit/src/org/netbeans/modules/javascript2/requirejs/editor/RequireJSCodeCompletionTest.java b/webcommon/javascript2.requirejs/test/unit/src/org/netbeans/modules/javascript2/requirejs/editor/RequireJSCodeCompletionTest.java
index c94a034..74d19cc 100644
--- a/webcommon/javascript2.requirejs/test/unit/src/org/netbeans/modules/javascript2/requirejs/editor/RequireJSCodeCompletionTest.java
+++ b/webcommon/javascript2.requirejs/test/unit/src/org/netbeans/modules/javascript2/requirejs/editor/RequireJSCodeCompletionTest.java
@@ -48,7 +48,7 @@ public class RequireJSCodeCompletionTest extends JsCodeCompletionBase {
         super(testName);
     }
 
-    static private boolean isSetup = false;
+    private static boolean isSetup = false;
 
     @Override
     protected void setUp() throws Exception {
diff --git a/webcommon/lib.v8debug/src/org/netbeans/lib/v8debug/client/cmdline/V8Debug.java b/webcommon/lib.v8debug/src/org/netbeans/lib/v8debug/client/cmdline/V8Debug.java
index 631697e..76a0294 100644
--- a/webcommon/lib.v8debug/src/org/netbeans/lib/v8debug/client/cmdline/V8Debug.java
+++ b/webcommon/lib.v8debug/src/org/netbeans/lib/v8debug/client/cmdline/V8Debug.java
@@ -1051,7 +1051,7 @@ public class V8Debug {
         }
     }
     
-    final static class TestAccess {
+    static final class TestAccess {
         
         static V8Debug createV8Debug(String hostName, int port, Testeable testeable) throws IOException {
             final V8Debug v8dbg = new V8Debug(hostName, port);
diff --git a/webcommon/web.clientproject.api/src/org/netbeans/modules/web/clientproject/build/ui/VerticalGridLayout.java b/webcommon/web.clientproject.api/src/org/netbeans/modules/web/clientproject/build/ui/VerticalGridLayout.java
index 9e51c52..e6abb65 100644
--- a/webcommon/web.clientproject.api/src/org/netbeans/modules/web/clientproject/build/ui/VerticalGridLayout.java
+++ b/webcommon/web.clientproject.api/src/org/netbeans/modules/web/clientproject/build/ui/VerticalGridLayout.java
@@ -50,7 +50,7 @@ public class VerticalGridLayout implements LayoutManager2 {
 
     private final int screenHeight;
 
-    final private Set<Component> components = new LinkedHashSet<Component>();
+    private final Set<Component> components = new LinkedHashSet<Component>();
 
     @Override
     public void addLayoutComponent(Component comp, Object constraints) {
diff --git a/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/BrowserActionProvider.java b/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/BrowserActionProvider.java
index ce94e2b..560c100 100644
--- a/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/BrowserActionProvider.java
+++ b/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/BrowserActionProvider.java
@@ -42,7 +42,7 @@ import org.openide.util.Pair;
 
 public class BrowserActionProvider implements ActionProvider {
 
-    final private ClientSideProject project;
+    private final ClientSideProject project;
     private final BrowserSupport support;
     private ClientProjectEnhancedBrowserImpl cfg;
 
diff --git a/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/ClientProjectEnhancedBrowserImpl.java b/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/ClientProjectEnhancedBrowserImpl.java
index 9644635..f3240c2 100644
--- a/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/ClientProjectEnhancedBrowserImpl.java
+++ b/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/ClientProjectEnhancedBrowserImpl.java
@@ -37,8 +37,8 @@ import org.openide.util.EditableProperties;
 public class ClientProjectEnhancedBrowserImpl implements ClientProjectEnhancedBrowserImplementation {
 
     
-    final private ClientSideProject project;
-    final private WebBrowser browser;
+    private final ClientSideProject project;
+    private final WebBrowser browser;
     private BrowserSupport browserSupport;
     private ProjectConfigurationCustomizerImpl cust = null;
 
diff --git a/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/RefreshOnSaveListenerImpl.java b/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/RefreshOnSaveListenerImpl.java
index 51a5c0b..66a935f 100644
--- a/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/RefreshOnSaveListenerImpl.java
+++ b/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/RefreshOnSaveListenerImpl.java
@@ -27,8 +27,8 @@ import org.openide.filesystems.FileObject;
 
 public class RefreshOnSaveListenerImpl implements RefreshOnSaveListener {
 
-    final private BrowserSupport support;
-    final private Project project;
+    private final BrowserSupport support;
+    private final Project project;
     private ClientProjectEnhancedBrowserImpl cfg;
 
     public RefreshOnSaveListenerImpl(Project project, BrowserSupport support, ClientProjectEnhancedBrowserImpl cfg) {
diff --git a/webcommon/web.inspect/src/org/netbeans/modules/web/inspect/webkit/knockout/KnockoutNode.java b/webcommon/web.inspect/src/org/netbeans/modules/web/inspect/webkit/knockout/KnockoutNode.java
index e0d121b..22fe227 100644
--- a/webcommon/web.inspect/src/org/netbeans/modules/web/inspect/webkit/knockout/KnockoutNode.java
+++ b/webcommon/web.inspect/src/org/netbeans/modules/web/inspect/webkit/knockout/KnockoutNode.java
@@ -78,7 +78,7 @@ public class KnockoutNode extends AbstractNode {
      * @return {@code KnockoutChildFactory} (possibly {@code null})
      * for the given {@code RemoteObject}
      */
-    final static KnockoutChildFactory childFactoryFor(RemoteObject remoteObject) {
+    static final KnockoutChildFactory childFactoryFor(RemoteObject remoteObject) {
         boolean isLeaf = true;
         if (remoteObject != null) {
             RemoteObject.Type type = remoteObject.getType();
diff --git a/webcommon/web.javascript.debugger/src/org/netbeans/modules/web/javascript/debugger/eval/ui/EvaluationResultsModel.java b/webcommon/web.javascript.debugger/src/org/netbeans/modules/web/javascript/debugger/eval/ui/EvaluationResultsModel.java
index 06cf67f..31e3aea 100644
--- a/webcommon/web.javascript.debugger/src/org/netbeans/modules/web/javascript/debugger/eval/ui/EvaluationResultsModel.java
+++ b/webcommon/web.javascript.debugger/src/org/netbeans/modules/web/javascript/debugger/eval/ui/EvaluationResultsModel.java
@@ -51,7 +51,7 @@ public class EvaluationResultsModel extends VariablesModel {
     private static final String ICON_EVAL_RESULT =
         "org/netbeans/modules/debugger/resources/evaluator/evaluator_result_16.png"; // NOI18N
 
-    private final static RequestProcessor RP = new RequestProcessor(EvaluationResultsModel.class);
+    private static final RequestProcessor RP = new RequestProcessor(EvaluationResultsModel.class);
     private final CodeEvaluator.Result result;
     private EvaluatorListener evalListener = new EvaluatorListener();
     

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists