8264087: Use the blessed modifier order in jdk.jconsole

Reviewed-by: alanb, amenkov, redestad

Author: alblue

src/jdk.jconsole/share/classes/sun/tools/jconsole/Formatter.java

@@ -30,17 +30,17 @@
 
 
 class Formatter {
-    final static long SECOND = 1000;
-    final static long MINUTE = 60 * SECOND;
-    final static long HOUR   = 60 * MINUTE;
-    final static long DAY    = 24 * HOUR;
+    static final long SECOND = 1000;
+    static final long MINUTE = 60 * SECOND;
+    static final long HOUR   = 60 * MINUTE;
+    static final long DAY    = 24 * HOUR;
 
-    final static String cr = System.getProperty("line.separator");
+    static final String cr = System.getProperty("line.separator");
 
-    final static DateFormat timeDF            = new SimpleDateFormat("HH:mm");
-    private final static DateFormat timeWithSecondsDF = new SimpleDateFormat("HH:mm:ss");
-    private final static DateFormat dateDF            = new SimpleDateFormat("yyyy-MM-dd");
-    private final static String decimalZero =
+    static final DateFormat timeDF            = new SimpleDateFormat("HH:mm");
+    private static final DateFormat timeWithSecondsDF = new SimpleDateFormat("HH:mm:ss");
+    private static final DateFormat dateDF            = new SimpleDateFormat("yyyy-MM-dd");
+    private static final String decimalZero =
                                 new DecimalFormatSymbols().getDecimalSeparator() + "0";
 
     static String formatTime(long t) {

src/jdk.jconsole/share/classes/sun/tools/jconsole/JConsole.java

@@ -82,9 +82,9 @@ static void updateLafValues() {
     }
 
 
-    private final static String title =
+    private static final String title =
         Messages.JAVA_MONITORING___MANAGEMENT_CONSOLE;
-    public final static String ROOT_URL =
+    public static final String ROOT_URL =
         "service:jmx:";
 
     private static int updateInterval = 4000;

src/jdk.jconsole/share/classes/sun/tools/jconsole/Messages.java

@@ -29,7 +29,7 @@
  * Class that contains localized messages.
  *
  */
-final public class Messages {
+public final class Messages {
     private static final String BUNDLE_NAME = "sun.tools.jconsole.resources.messages";
 
     static {

src/jdk.jconsole/share/classes/sun/tools/jconsole/Plotter.java

@@ -91,15 +91,15 @@ public static enum Unit {
     };
 
 
-    final static long SECOND = 1000;
-    final static long MINUTE = 60 * SECOND;
-    final static long HOUR   = 60 * MINUTE;
-    final static long DAY    = 24 * HOUR;
+    static final long SECOND = 1000;
+    static final long MINUTE = 60 * SECOND;
+    static final long HOUR   = 60 * MINUTE;
+    static final long DAY    = 24 * HOUR;
 
-    final static Color bgColor = new Color(250, 250, 250);
-    final static Color defaultColor = Color.blue.darker();
+    static final Color bgColor = new Color(250, 250, 250);
+    static final Color defaultColor = Color.blue.darker();
 
-    final static int ARRAY_SIZE_INCREMENT = 4000;
+    static final int ARRAY_SIZE_INCREMENT = 4000;
 
     private static Stroke dashedStroke;
 

src/jdk.jconsole/share/classes/sun/tools/jconsole/ProxyClient.java

@@ -87,8 +87,8 @@ public class ProxyClient implements JConsoleContext {
     private boolean vmConnector = false;
     private boolean sslRegistry = false;
     private boolean sslStub = false;
-    final private String connectionName;
-    final private String displayName;
+    private final String connectionName;
+    private final String displayName;
 
     private ClassLoadingMXBean    classLoadingMBean = null;
     private CompilationMXBean     compilationMBean = null;
@@ -103,7 +103,7 @@ public class ProxyClient implements JConsoleContext {
     private List<MemoryPoolProxy>           memoryPoolProxies = null;
     private List<GarbageCollectorMXBean>    garbageCollectorMBeans = null;
 
-    final static private String HOTSPOT_DIAGNOSTIC_MXBEAN_NAME =
+    private static final String HOTSPOT_DIAGNOSTIC_MXBEAN_NAME =
         "com.sun.management:type=HotSpotDiagnostic";
 
     private ProxyClient(String hostName, int port,

src/jdk.jconsole/share/classes/sun/tools/jconsole/Resources.java

@@ -74,7 +74,7 @@ public static int getMnemonicInt(String message) {
     }
 
     /**
-     * Initializes all non-final public static fields in the given class with
+     * Initializes all public static non-final fields in the given class with
      * messages from a {@link ResourceBundle}.
      *
      * @param clazz the class containing the fields

src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanAttributes.java

@@ -83,7 +83,7 @@ public class XMBeanAttributes extends XTable {
     final Logger LOGGER =
             System.getLogger(XMBeanAttributes.class.getPackage().getName());
 
-    private final static String[] columnNames =
+    private static final String[] columnNames =
     {Messages.NAME,
      Messages.VALUE};
 

src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanNotifications.java

@@ -50,7 +50,7 @@
 @SuppressWarnings("serial")
 public class XMBeanNotifications extends JTable implements NotificationListener {
 
-    private final static String[] columnNames = {
+    private static final String[] columnNames = {
         Messages.TIME_STAMP,
         Messages.TYPE,
         Messages.USER_DATA,
@@ -63,7 +63,7 @@ public class XMBeanNotifications extends JTable implements NotificationListener
             new HashMap<ObjectName, XMBeanNotificationsListener>();
     private volatile boolean subscribed;
     private XMBeanNotificationsListener currentListener;
-    public final static String NOTIFICATION_RECEIVED_EVENT =
+    public static final String NOTIFICATION_RECEIVED_EVENT =
             "jconsole.xnotification.received";
     private List<NotificationListener> notificationListenersList;
     private volatile boolean enabled;

src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XObject.java

@@ -37,7 +37,7 @@
 public class XObject extends JLabel {
     private Object object;
     private static boolean useHashCodeRepresentation = true;
-    public final static XObject NULL_OBJECT = new XObject("null");
+    public static final XObject NULL_OBJECT = new XObject("null");
     public XObject (Object object, Icon icon) {
         this(object);
         setIcon(icon);

src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XOperations.java

@@ -42,7 +42,7 @@
 @SuppressWarnings("serial") // JDK implementation class
 public abstract class XOperations extends JPanel implements ActionListener {
 
-    public final static String OPERATION_INVOCATION_EVENT =
+    public static final String OPERATION_INVOCATION_EVENT =
             "jam.xoperations.invoke.result";
     private java.util.List<NotificationListener> notificationListenersList;
     private Hashtable<JButton, OperationEntry> operationEntryTable;