8136783: Run blessed-modifier-order script on java.desktop

Reviewed-by: martin, serb

jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppEventHandler.java

@@ -62,7 +62,7 @@ class _AppEventHandler {
     private static native void nativeReplyToAppShouldTerminate(final boolean shouldTerminate);
     private static native void nativeRegisterForNotification(final int notification);
 
-    final static _AppEventHandler instance = new _AppEventHandler();
+    static final _AppEventHandler instance = new _AppEventHandler();
     static _AppEventHandler getInstance() {
         return instance;
     }

jdk/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java

@@ -69,31 +69,31 @@ public class FileManager {
      * @since Java for Mac OS X 10.5 - 1.5
          * @since Java for Mac OS X 10.5 Update 1 - 1.6
      */
-    public final static short kOnAppropriateDisk = -32767;
+    public static final short kOnAppropriateDisk = -32767;
     /**
      * Read-only system hierarchy.
      * @since Java for Mac OS X 10.5 - 1.5
          * @since Java for Mac OS X 10.5 Update 1 - 1.6
      */
-    public final static short kSystemDomain = -32766;
+    public static final short kSystemDomain = -32766;
     /**
      * All users of a single machine have access to these resources.
      * @since Java for Mac OS X 10.5 - 1.5
          * @since Java for Mac OS X 10.5 Update 1 - 1.6
      */
-    public final static short kLocalDomain = -32765;
+    public static final short kLocalDomain = -32765;
     /**
      * All users configured to use a common network server has access to these resources.
      * @since Java for Mac OS X 10.5 - 1.5
          * @since Java for Mac OS X 10.5 Update 1 - 1.6
      */
-    public final static short kNetworkDomain = -32764;
+    public static final short kNetworkDomain = -32764;
     /**
      * Read/write. Resources that are private to the user.
      * @since Java for Mac OS X 10.5 - 1.5
          * @since Java for Mac OS X 10.5 Update 1 - 1.6
      */
-    public final static short kUserDomain = -32763;
+    public static final short kUserDomain = -32763;
 
 
         /**

jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonBorder.java

@@ -38,17 +38,17 @@ import com.apple.laf.AquaUtils.*;
 
 public abstract class AquaButtonBorder extends AquaBorder implements Border, UIResource {
     public static final RecyclableSingleton<Dynamic> fDynamic = new RecyclableSingletonFromDefaultConstructor<Dynamic>(Dynamic.class);
-    static public AquaButtonBorder getDynamicButtonBorder() {
+    public static AquaButtonBorder getDynamicButtonBorder() {
         return fDynamic.get();
     }
 
     private static final RecyclableSingleton<Toggle> fToggle = new RecyclableSingletonFromDefaultConstructor<Toggle>(Toggle.class);
-    static public AquaButtonBorder getToggleButtonBorder() {
+    public static AquaButtonBorder getToggleButtonBorder() {
         return fToggle.get();
     }
 
     public static final RecyclableSingleton<Toolbar> fToolBar = new RecyclableSingletonFromDefaultConstructor<Toolbar>(Toolbar.class);
-    static public Border getToolBarButtonBorder() {
+    public static Border getToolBarButtonBorder() {
         return fToolBar.get();
     }
 

jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java

@@ -63,7 +63,7 @@ public class AquaButtonExtendedTypes {
         return logicalPosition;
     }
 
-    static abstract class TypeSpecifier {
+    abstract static class TypeSpecifier {
         final String name;
         final boolean setIconFont;
 
@@ -138,7 +138,7 @@ public class AquaButtonExtendedTypes {
         return typeDefinitions.get().get(name);
     }
 
-    protected final static RecyclableSingleton<Map<String, TypeSpecifier>> typeDefinitions = new RecyclableSingleton<Map<String, TypeSpecifier>>() {
+    protected static final RecyclableSingleton<Map<String, TypeSpecifier>> typeDefinitions = new RecyclableSingleton<Map<String, TypeSpecifier>>() {
         protected Map<String, TypeSpecifier> getInstance() {
             return getAllTypes();
         }

jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java

@@ -221,7 +221,7 @@ public abstract class AquaButtonLabeledUI extends AquaButtonToggleUI implements
         return new Dimension(width, height);
     }
 
-    public static abstract class LabeledButtonBorder extends AquaButtonBorder {
+    public abstract static class LabeledButtonBorder extends AquaButtonBorder {
         public LabeledButtonBorder(final SizeDescriptor sizeDescriptor) {
             super(sizeDescriptor);
         }

jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java

@@ -462,7 +462,7 @@ public class AquaButtonUI extends BasicButtonUI implements Sizeable {
         return d;
     }
 
-    final static RecyclableSingleton<AquaHierarchyButtonListener> fHierListener = new RecyclableSingletonFromDefaultConstructor<AquaHierarchyButtonListener>(AquaHierarchyButtonListener.class);
+    static final RecyclableSingleton<AquaHierarchyButtonListener> fHierListener = new RecyclableSingletonFromDefaultConstructor<AquaHierarchyButtonListener>(AquaHierarchyButtonListener.class);
     static AquaHierarchyButtonListener getAquaHierarchyButtonListener() {
         return fHierListener.get();
     }

jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxButton.java

@@ -35,10 +35,10 @@ import apple.laf.JRSUIConstants.*;
 
 @SuppressWarnings("serial") // Superclass is not serializable across versions
 class AquaComboBoxButton extends JButton {
-    final protected JComboBox<Object> comboBox;
+    protected final JComboBox<Object> comboBox;
-    final protected JList<?> list;
+    protected final JList<?> list;
-    final protected CellRendererPane rendererPane;
+    protected final CellRendererPane rendererPane;
-    final protected AquaComboBoxUI ui;
+    protected final AquaComboBoxUI ui;
 
     protected final AquaPainter<JRSUIState> painter = AquaPainter.create(JRSUIState.getInstance());
     boolean isPopDown;

jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileSystemModel.java

@@ -57,8 +57,8 @@ class AquaFileSystemModel extends AbstractTableModel implements PropertyChangeLi
     // private boolean fSortAscending = true;
     private boolean fSortNames = true;
     private final String[] fColumnNames;
-    public final static String SORT_BY_CHANGED = "sortByChanged";
+    public static final String SORT_BY_CHANGED = "sortByChanged";
-    public final static String SORT_ASCENDING_CHANGED = "sortAscendingChanged";
+    public static final String SORT_ASCENDING_CHANGED = "sortAscendingChanged";
 
     public AquaFileSystemModel(final JFileChooser filechooser, final JTable filelist, final String[] colNames) {
         fileCacheLock = new Object();

jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaIcon.java

@@ -73,7 +73,7 @@ public class AquaIcon {
         public void initIconPainter(final AquaPainter<? extends JRSUIState> painter);
     }
 
-    static abstract class JRSUIIcon implements Icon, UIResource {
+    abstract static class JRSUIIcon implements Icon, UIResource {
         protected final AquaPainter<JRSUIState> painter = AquaPainter.create(JRSUIState.getInstance());
 
         public void paintIcon(final Component c, final Graphics g, final int x, final int y) {
@@ -81,7 +81,7 @@ public class AquaIcon {
         }
     }
 
-    static abstract class DynamicallySizingJRSUIIcon extends JRSUIIcon {
+    abstract static class DynamicallySizingJRSUIIcon extends JRSUIIcon {
         protected final SizeDescriptor sizeDescriptor;
         protected SizeVariant sizeVariant;
 
@@ -109,7 +109,7 @@ public class AquaIcon {
         }
     }
 
-    static abstract class CachingScalingIcon implements Icon, UIResource {
+    abstract static class CachingScalingIcon implements Icon, UIResource {
         int width;
         int height;
         Image image;
@@ -167,7 +167,7 @@ public class AquaIcon {
 
     }
 
-    static abstract class ScalingJRSUIIcon implements Icon, UIResource {
+    abstract static class ScalingJRSUIIcon implements Icon, UIResource {
         final int width;
         final int height;
 

jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameDockIconUI.java

@@ -229,9 +229,9 @@ public class AquaInternalFrameDockIconUI extends DesktopIconUI implements MouseL
 
     @SuppressWarnings("serial") // Superclass is not serializable across versions
     class DockLabel extends JLabel {
-        final static int NUB_HEIGHT = 7;
+        static final int NUB_HEIGHT = 7;
-        final static int ROUND_ADDITIONAL_HEIGHT = 8;
+        static final int ROUND_ADDITIONAL_HEIGHT = 8;
-        final static int ROUND_ADDITIONAL_WIDTH = 12;
+        static final int ROUND_ADDITIONAL_WIDTH = 12;
 
         DockLabel(final String text) {
             super(text);

jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java

@@ -529,7 +529,7 @@ public class AquaKeyBindings {
 
     // extracted and adapted from DefaultEditorKit in 1.6
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    static abstract class DeleteWordAction extends TextAction {
+    abstract static class DeleteWordAction extends TextAction {
         public DeleteWordAction(final String name) { super(name); }
 
         public void actionPerformed(final ActionEvent e) {

jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaRootPaneUI.java

@@ -48,7 +48,7 @@ import com.apple.laf.AquaUtils.RecyclableSingletonFromDefaultConstructor;
 public class AquaRootPaneUI extends BasicRootPaneUI implements AncestorListener, WindowListener, ContainerListener {
     private static final RecyclableSingleton<AquaRootPaneUI> sRootPaneUI = new RecyclableSingletonFromDefaultConstructor<AquaRootPaneUI>(AquaRootPaneUI.class);
 
-    final static int kDefaultButtonPaintDelayBetweenFrames = 50;
+    static final int kDefaultButtonPaintDelayBetweenFrames = 50;
     JButton fCurrentDefaultButton = null;
     Timer fTimer = null;
     static final boolean sUseScreenMenuBar = AquaMenuBarUI.getScreenMenuBarProperty();

jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java

@@ -2011,20 +2011,20 @@ public class AquaTabbedPaneCopyFromBasicUI extends TabbedPaneUI implements Swing
     }
 
     private static class Actions extends UIAction {
-        final static String NEXT = "navigateNext";
+        static final String NEXT = "navigateNext";
-        final static String PREVIOUS = "navigatePrevious";
+        static final String PREVIOUS = "navigatePrevious";
-        final static String RIGHT = "navigateRight";
+        static final String RIGHT = "navigateRight";
-        final static String LEFT = "navigateLeft";
+        static final String LEFT = "navigateLeft";
-        final static String UP = "navigateUp";
+        static final String UP = "navigateUp";
-        final static String DOWN = "navigateDown";
+        static final String DOWN = "navigateDown";
-        final static String PAGE_UP = "navigatePageUp";
+        static final String PAGE_UP = "navigatePageUp";
-        final static String PAGE_DOWN = "navigatePageDown";
+        static final String PAGE_DOWN = "navigatePageDown";
-        final static String REQUEST_FOCUS = "requestFocus";
+        static final String REQUEST_FOCUS = "requestFocus";
-        final static String REQUEST_FOCUS_FOR_VISIBLE = "requestFocusForVisibleComponent";
+        static final String REQUEST_FOCUS_FOR_VISIBLE = "requestFocusForVisibleComponent";
-        final static String SET_SELECTED = "setSelectedIndex";
+        static final String SET_SELECTED = "setSelectedIndex";
-        final static String SELECT_FOCUSED = "selectTabWithFocus";
+        static final String SELECT_FOCUSED = "selectTabWithFocus";
-        final static String SCROLL_FORWARD = "scrollTabsForwardAction";
+        static final String SCROLL_FORWARD = "scrollTabsForwardAction";
-        final static String SCROLL_BACKWARD = "scrollTabsBackwardAction";
+        static final String SCROLL_BACKWARD = "scrollTabsBackwardAction";
 
         Actions(final String key) {
             super(key);

jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderUI.java

@@ -67,7 +67,7 @@ public class AquaTableHeaderUI extends BasicTableHeaderUI {
         super.uninstallDefaults();
     }
 
-    final static RecyclableSingleton<ClientPropertyApplicator<JTableHeader, JTableHeader>> TABLE_HEADER_APPLICATORS = new RecyclableSingleton<ClientPropertyApplicator<JTableHeader, JTableHeader>>() {
+    static final RecyclableSingleton<ClientPropertyApplicator<JTableHeader, JTableHeader>> TABLE_HEADER_APPLICATORS = new RecyclableSingleton<ClientPropertyApplicator<JTableHeader, JTableHeader>>() {
         @Override
         @SuppressWarnings("unchecked")
         protected ClientPropertyApplicator<JTableHeader, JTableHeader> getInstance() {

jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java

@@ -40,8 +40,8 @@ import com.apple.laf.AquaUtils.RecyclableSingleton;
 import com.apple.laf.AquaUtils.RecyclableSingletonFromDefaultConstructor;
 
 public class AquaUtilControlSize {
-    protected final static String CLIENT_PROPERTY_KEY = "JComponent.sizeVariant";
+    protected static final String CLIENT_PROPERTY_KEY = "JComponent.sizeVariant";
-    protected final static String SYSTEM_PROPERTY_KEY = "swing.component.sizevariant";
+    protected static final String SYSTEM_PROPERTY_KEY = "swing.component.sizevariant";
 
     interface Sizeable {
         void applySizeFor(final JComponent c, final Size size);
@@ -76,7 +76,7 @@ public class AquaUtilControlSize {
         return JRSUIConstants.Size.REGULAR;
     }
 
-    protected final static JRSUIConstants.Size defaultSize = getDefaultSize();
+    protected static final JRSUIConstants.Size defaultSize = getDefaultSize();
     protected static JRSUIConstants.Size getUserSizeFrom(final JComponent c) {
         final Object sizeProp = c.getClientProperty(CLIENT_PROPERTY_KEY);
         if (sizeProp == null) return defaultSize;

jdk/src/java.desktop/macosx/classes/sun/java2d/CRenderer.java

@@ -36,7 +36,7 @@ import sun.java2d.pipe.*;
 import sun.lwawt.macosx.*;
 
 public class CRenderer implements PixelDrawPipe, PixelFillPipe, ShapeDrawPipe, DrawImagePipe {
-    native static void init();
+    static native void init();
 
     // cache of the runtime options
     static {

jdk/src/java.desktop/macosx/classes/sun/java2d/CompositeCRenderer.java

@@ -35,8 +35,8 @@ import sun.java2d.loops.*;
 import sun.java2d.pipe.*;
 
 public class CompositeCRenderer extends CRenderer implements PixelDrawPipe, PixelFillPipe, ShapeDrawPipe, DrawImagePipe, TextPipe {
-    final static int fPadding = 4;
+    static final int fPadding = 4;
-    final static int fPaddingHalf = fPadding / 2;
+    static final int fPaddingHalf = fPadding / 2;
 
     private static AffineTransform sIdentityMatrix = new AffineTransform();
 

jdk/src/java.desktop/macosx/classes/sun/java2d/OSXSurfaceData.java

@@ -43,8 +43,8 @@ import java.lang.annotation.Native;
  * This is the SurfaceData for a CGContextRef.
  */
 public abstract class OSXSurfaceData extends BufImgSurfaceData {
-    final static float UPPER_BND = Float.MAX_VALUE / 2.0f;
+    static final float UPPER_BND = Float.MAX_VALUE / 2.0f;
-    final static float LOWER_BND = -UPPER_BND;
+    static final float LOWER_BND = -UPPER_BND;
 
     protected static CRenderer sQuartzPipe = null;
     protected static CTextPipe sCocoaTextPipe = null;

jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java

@@ -365,7 +365,7 @@ public abstract class CGLSurfaceData extends OGLSurfaceData {
     // Mac OS X specific APIs for JOGL/Java2D bridge...
 
     // given a surface create and attach GL context, then return it
-    private native static long createCGLContextOnSurface(CGLSurfaceData sd,
+    private static native long createCGLContextOnSurface(CGLSurfaceData sd,
             long sharedContext);
 
     public static long createOGLContextOnSurface(Graphics g, long sharedContext) {
@@ -379,7 +379,7 @@ public abstract class CGLSurfaceData extends OGLSurfaceData {
     }
 
     // returns whether or not the makeCurrent operation succeeded
-    native static boolean makeCGLContextCurrentOnSurface(CGLSurfaceData sd,
+    static native boolean makeCGLContextCurrentOnSurface(CGLSurfaceData sd,
             long ctx);
 
     public static boolean makeOGLContextCurrentOnSurface(Graphics g, long ctx) {
@@ -393,7 +393,7 @@ public abstract class CGLSurfaceData extends OGLSurfaceData {
     }
 
     // additional cleanup
-    private native static void destroyCGLContext(long ctx);
+    private static native void destroyCGLContext(long ctx);
 
     public static void destroyOGLContext(long ctx) {
         if (ctx != 0L) {

jdk/src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java

@@ -43,12 +43,12 @@ import static sun.lwawt.LWWindowPeer.PeerType;
 
 public abstract class LWToolkit extends SunToolkit implements Runnable {
 
-    private final static int STATE_NONE = 0;
+    private static final int STATE_NONE = 0;
-    private final static int STATE_INIT = 1;
+    private static final int STATE_INIT = 1;
-    private final static int STATE_MESSAGELOOP = 2;
+    private static final int STATE_MESSAGELOOP = 2;
-    private final static int STATE_SHUTDOWN = 3;
+    private static final int STATE_SHUTDOWN = 3;
-    private final static int STATE_CLEANUP = 4;
+    private static final int STATE_CLEANUP = 4;
-    private final static int STATE_DONE = 5;
+    private static final int STATE_DONE = 5;
 
     private int runState = STATE_NONE;
 
@@ -454,14 +454,14 @@ public abstract class LWToolkit extends SunToolkit implements Runnable {
     /*
      * Expose non-public targetToPeer() method.
      */
-    public final static Object targetToPeer(Object target) {
+    public static final Object targetToPeer(Object target) {
         return SunToolkit.targetToPeer(target);
     }
 
     /*
      * Expose non-public targetDisposedPeer() method.
      */
-    public final static void targetDisposedPeer(Object target, Object peer) {
+    public static final void targetDisposedPeer(Object target, Object peer) {
         SunToolkit.targetDisposedPeer(target, peer);
     }
 

jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java

@@ -558,9 +558,9 @@ class CAccessibility implements PropertyChangeListener {
 
     // Duplicated from JavaComponentAccessibility
     // Note that values >=0 are indexes into the child array
-    final static int JAVA_AX_ALL_CHILDREN = -1;
+    static final int JAVA_AX_ALL_CHILDREN = -1;
-    final static int JAVA_AX_SELECTED_CHILDREN = -2;
+    static final int JAVA_AX_SELECTED_CHILDREN = -2;
-    final static int JAVA_AX_VISIBLE_CHILDREN = -3;
+    static final int JAVA_AX_VISIBLE_CHILDREN = -3;
 
     // Each child takes up two entries in the array: one for itself and one for its role
     public static Object[] getChildrenAndRoles(final Accessible a, final Component c, final int whichChildren, final boolean allowIgnored) {

jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java

@@ -171,7 +171,7 @@ public class CDataTransferer extends DataTransferer {
     }
 
     @Override
-    synchronized protected Long getFormatForNativeAsLong(String str) {
+    protected synchronized Long getFormatForNativeAsLong(String str) {
         Long format = predefinedClipboardNameMap.get(str);
 
         if (format == null) {

jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java

@@ -422,7 +422,7 @@ public class CInputMethod extends InputMethodAdapter {
      * Tell the component to commit all of the characters in the string to the current
      * text view. This effectively wipes out any text in progress.
      */
-    synchronized private void insertText(String aString) {
+    private synchronized void insertText(String aString) {
         AttributedString attribString = new AttributedString(aString);
 
         // Set locale information on the new string.
@@ -447,11 +447,11 @@ public class CInputMethod extends InputMethodAdapter {
         fCurrentTextLength = rawText.length();
     }
 
-    static private final int kCaretPosition = 0;
+    private static final int kCaretPosition = 0;
-    static private final int kRawText = 1;
+    private static final int kRawText = 1;
-    static private final int kSelectedRawText = 2;
+    private static final int kSelectedRawText = 2;
-    static private final int kConvertedText = 3;
+    private static final int kConvertedText = 3;
-    static private final int kSelectedConvertedText = 4;
+    private static final int kSelectedConvertedText = 4;
 
     /**
      * Convert Cocoa text highlight attributes into Java input method highlighting.
@@ -556,7 +556,7 @@ public class CInputMethod extends InputMethodAdapter {
     /**
      * Frequent callbacks from NSTextInput.  I think we're supposed to commit it here?
      */
-    synchronized private void unmarkText() {
+    private synchronized void unmarkText() {
         if (fCurrentText == null)
             return;
 
@@ -574,7 +574,7 @@ public class CInputMethod extends InputMethodAdapter {
         fCurrentTextLength = 0;
     }
 
-    synchronized private boolean hasMarkedText() {
+    private synchronized boolean hasMarkedText() {
         return fCurrentText != null;
     }
 
@@ -583,7 +583,7 @@ public class CInputMethod extends InputMethodAdapter {
      * Java does not.  So, we have to see where the request is and based on that return the right
      * substring.
      */
-    synchronized private String attributedSubstringFromRange(final int locationIn, final int lengthIn) {
+    private synchronized String attributedSubstringFromRange(final int locationIn, final int lengthIn) {
         final String[] retString = new String[1];
 
         try {
@@ -635,7 +635,7 @@ public class CInputMethod extends InputMethodAdapter {
      * for the fact that the insert point in Swing can come AFTER the selected text, making this
      * potentially incorrect.
      */
-    synchronized private int[] selectedRange() {
+    private synchronized int[] selectedRange() {
         final int[] returnValue = new int[2];
 
         try {
@@ -683,7 +683,7 @@ public class CInputMethod extends InputMethodAdapter {
      * inserted, so we can return that position, and the length of the text in progress.  If there is no marked text
      * return null.
      */
-    synchronized private int[] markedRange() {
+    private synchronized int[] markedRange() {
         if (fCurrentText == null)
             return null;
 
@@ -710,7 +710,7 @@ public class CInputMethod extends InputMethodAdapter {
      * which is always in front of the in-progress text, we get the offset into the composed text, and we get
      * that location from the input method context.
      */
-    synchronized private int[] firstRectForCharacterRange(final int absoluteTextOffset) {
+    private synchronized int[] firstRectForCharacterRange(final int absoluteTextOffset) {
         final int[] rect = new int[4];
 
         try {
@@ -753,7 +753,7 @@ public class CInputMethod extends InputMethodAdapter {
      * The coordinates are in Java screen coordinates.  If no character in the composed text was hit, we return -1, indicating
      * not found.
      */
-    synchronized private int characterIndexForPoint(final int screenX, final int screenY) {
+    private synchronized int characterIndexForPoint(final int screenX, final int screenY) {
         final TextHitInfo[] offsetInfo = new TextHitInfo[1];
         final int[] insertPositionOffset = new int[1];
 

jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CWarningWindow.java

@@ -45,8 +45,8 @@ public final class CWarningWindow extends CPlatformWindow
     private static class Lock {}
     private final Lock lock = new Lock();
 
-    private final static int SHOWING_DELAY = 300;
+    private static final int SHOWING_DELAY = 300;
-    private final static int HIDING_DELAY = 2000;
+    private static final int HIDING_DELAY = 2000;
 
     private Rectangle bounds = new Rectangle();
     private final WeakReference<LWWindowPeer> ownerPeer;
@@ -406,7 +406,7 @@ public final class CWarningWindow extends CPlatformWindow
     private final Lock taskLock = new Lock();
     private CancelableRunnable showHideTask;
 
-    private static abstract class CancelableRunnable implements Runnable {
+    private abstract static class CancelableRunnable implements Runnable {
         private volatile boolean perform = true;
 
         public final void cancel() {

jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CocoaConstants.java

@@ -30,35 +30,35 @@ public final class CocoaConstants {
     private CocoaConstants(){}
 
     //from the NSEvent class reference:
-    public final static int NSLeftMouseDown      = 1;
+    public static final int NSLeftMouseDown      = 1;
-    public final static int NSLeftMouseUp        = 2;
+    public static final int NSLeftMouseUp        = 2;
-    public final static int NSRightMouseDown     = 3;
+    public static final int NSRightMouseDown     = 3;
-    public final static int NSRightMouseUp       = 4;
+    public static final int NSRightMouseUp       = 4;
-    public final static int NSMouseMoved         = 5;
+    public static final int NSMouseMoved         = 5;
-    public final static int NSLeftMouseDragged   = 6;
+    public static final int NSLeftMouseDragged   = 6;
-    public final static int NSRightMouseDragged  = 7;
+    public static final int NSRightMouseDragged  = 7;
-    public final static int NSMouseEntered       = 8;
+    public static final int NSMouseEntered       = 8;
-    public final static int NSMouseExited        = 9;
+    public static final int NSMouseExited        = 9;
-    public final static int NSKeyDown            = 10;
+    public static final int NSKeyDown            = 10;
-    public final static int NSKeyUp              = 11;
+    public static final int NSKeyUp              = 11;
-    public final static int NSFlagsChanged       = 12;
+    public static final int NSFlagsChanged       = 12;
 
-    public final static int NSScrollWheel        = 22;
+    public static final int NSScrollWheel        = 22;
-    public final static int NSOtherMouseDown     = 25;
+    public static final int NSOtherMouseDown     = 25;
-    public final static int NSOtherMouseUp       = 26;
+    public static final int NSOtherMouseUp       = 26;
-    public final static int NSOtherMouseDragged  = 27;
+    public static final int NSOtherMouseDragged  = 27;
 
-    public final static int AllLeftMouseEventsMask =
+    public static final int AllLeftMouseEventsMask =
         1 << NSLeftMouseDown |
         1 << NSLeftMouseUp |
         1 << NSLeftMouseDragged;
 
-    public final static int AllRightMouseEventsMask =
+    public static final int AllRightMouseEventsMask =
         1 << NSRightMouseDown |
         1 << NSRightMouseUp |
         1 << NSRightMouseDragged;
 
-    public final static int AllOtherMouseEventsMask =
+    public static final int AllOtherMouseEventsMask =
         1 << NSOtherMouseDown |
         1 << NSOtherMouseUp |
         1 << NSOtherMouseDragged;
@@ -82,24 +82,24 @@ public final class CocoaConstants {
 
     // See http://developer.apple.com/library/mac/#documentation/Carbon/Reference/QuartzEventServicesRef/Reference/reference.html
 
-    public final static int kCGMouseButtonLeft   = 0;
+    public static final int kCGMouseButtonLeft   = 0;
-    public final static int kCGMouseButtonRight  = 1;
+    public static final int kCGMouseButtonRight  = 1;
-    public final static int kCGMouseButtonCenter = 2;
+    public static final int kCGMouseButtonCenter = 2;
 
     // See https://wiki.mozilla.org/NPAPI:CocoaEventModel
 
-    public final static int NPCocoaEventDrawRect           = 1;
+    public static final int NPCocoaEventDrawRect           = 1;
-    public final static int NPCocoaEventMouseDown          = 2;
+    public static final int NPCocoaEventMouseDown          = 2;
-    public final static int NPCocoaEventMouseUp            = 3;
+    public static final int NPCocoaEventMouseUp            = 3;
-    public final static int NPCocoaEventMouseMoved         = 4;
+    public static final int NPCocoaEventMouseMoved         = 4;
-    public final static int NPCocoaEventMouseEntered       = 5;
+    public static final int NPCocoaEventMouseEntered       = 5;
-    public final static int NPCocoaEventMouseExited        = 6;
+    public static final int NPCocoaEventMouseExited        = 6;
-    public final static int NPCocoaEventMouseDragged       = 7;
+    public static final int NPCocoaEventMouseDragged       = 7;
-    public final static int NPCocoaEventKeyDown            = 8;
+    public static final int NPCocoaEventKeyDown            = 8;
-    public final static int NPCocoaEventKeyUp              = 9;
+    public static final int NPCocoaEventKeyUp              = 9;
-    public final static int NPCocoaEventFlagsChanged       = 10;
+    public static final int NPCocoaEventFlagsChanged       = 10;
-    public final static int NPCocoaEventFocusChanged       = 11;
+    public static final int NPCocoaEventFocusChanged       = 11;
-    public final static int NPCocoaEventWindowFocusChanged = 12;
+    public static final int NPCocoaEventWindowFocusChanged = 12;
-    public final static int NPCocoaEventScrollWheel        = 13;
+    public static final int NPCocoaEventScrollWheel        = 13;
-    public final static int NPCocoaEventTextInput          = 14;
+    public static final int NPCocoaEventTextInput          = 14;
 }

jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java

@@ -127,10 +127,10 @@ public final class LWCToolkit extends LWToolkit {
     /*
      * System colors with default initial values, overwritten by toolkit if system values differ and are available.
      */
-    private final static int NUM_APPLE_COLORS = 3;
+    private static final int NUM_APPLE_COLORS = 3;
-    public final static int KEYBOARD_FOCUS_COLOR = 0;
+    public static final int KEYBOARD_FOCUS_COLOR = 0;
-    public final static int INACTIVE_SELECTION_BACKGROUND_COLOR = 1;
+    public static final int INACTIVE_SELECTION_BACKGROUND_COLOR = 1;
-    public final static int INACTIVE_SELECTION_FOREGROUND_COLOR = 2;
+    public static final int INACTIVE_SELECTION_FOREGROUND_COLOR = 2;
     private static int[] appleColors = {
         0xFF808080, // keyboardFocusColor = Color.gray;
         0xFFC0C0C0, // secondarySelectedControlColor
@@ -681,7 +681,7 @@ public final class LWCToolkit extends LWToolkit {
      * @param r a {@code Runnable} to execute
      * @param delay a delay in milliseconds
      */
-    native static void performOnMainThreadAfterDelay(Runnable r, long delay);
+    static native void performOnMainThreadAfterDelay(Runnable r, long delay);
 
 // DnD support
 

jdk/src/java.desktop/share/classes/com/sun/beans/editors/NumberEditor.java

@@ -32,7 +32,7 @@ package com.sun.beans.editors;
 
 import java.beans.*;
 
-abstract public class NumberEditor extends PropertyEditorSupport {
+public abstract class NumberEditor extends PropertyEditorSupport {
 
     public String getJavaInitializationString() {
         Object value = getValue();

jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/I18N.java

@@ -26,7 +26,7 @@
 package com.sun.imageio.plugins.common;
 
 public final class I18N extends I18NImpl {
-    private final static String resource_name = "iio-plugin.properties";
+    private static final String resource_name = "iio-plugin.properties";
     public static String getString(String key) {
         return getString("com.sun.imageio.plugins.common.I18N", resource_name, key);
     }

jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/LZWStringTable.java

@@ -37,16 +37,16 @@ import java.io.PrintStream;
  **/
 public class LZWStringTable {
     /** codesize + Reserved Codes */
-    private final static int RES_CODES = 2;
+    private static final int RES_CODES = 2;
 
-    private final static short HASH_FREE = (short)0xFFFF;
+    private static final short HASH_FREE = (short)0xFFFF;
-    private final static short NEXT_FIRST = (short)0xFFFF;
+    private static final short NEXT_FIRST = (short)0xFFFF;
 
-    private final static int MAXBITS = 12;
+    private static final int MAXBITS = 12;
-    private final static int MAXSTR = (1 << MAXBITS);
+    private static final int MAXSTR = (1 << MAXBITS);
 
-    private final static short HASHSIZE = 9973;
+    private static final short HASHSIZE = 9973;
-    private final static short HASHSTEP = 2039;
+    private static final short HASHSTEP = 2039;
 
     byte[]  strChr;  // after predecessor character
     short[] strNxt;  // predecessor string
@@ -142,7 +142,7 @@ public class LZWStringTable {
         }
     }
 
-    static public int hash(short index, byte lastbyte) {
+    public static int hash(short index, byte lastbyte) {
         return (((short)(lastbyte << 8) ^ index) & 0xFFFF) % HASHSIZE;
     }
 

jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java

@@ -1773,7 +1773,7 @@ class ImageTypeProducer {
     private static final ImageTypeProducer [] defaultTypes =
             new ImageTypeProducer [JPEG.NUM_JCS_CODES];
 
-    public synchronized static ImageTypeProducer getTypeProducer(int csCode) {
+    public static synchronized ImageTypeProducer getTypeProducer(int csCode) {
         if (csCode < 0 || csCode >= JPEG.NUM_JCS_CODES) {
             return null;
         }

jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java

@@ -56,7 +56,7 @@ import sun.swing.ImageCache;
  */
 class GTKEngine {
 
-    final static GTKEngine INSTANCE = new GTKEngine();
+    static final GTKEngine INSTANCE = new GTKEngine();
 
     /** Size of the image cache */
     private static final int CACHE_SIZE = 50;
@@ -523,7 +523,7 @@ class GTKEngine {
         native_paint_background(widget, state, x - x0, y - y0, w, h);
     }
 
-    private final static ColorModel[] COLOR_MODELS = {
+    private static final ColorModel[] COLOR_MODELS = {
         // Transparency.OPAQUE
         new DirectColorModel(24, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00000000),
         // Transparency.BITMASK
@@ -532,7 +532,7 @@ class GTKEngine {
         ColorModel.getRGBdefault(),
     };
 
-    private final static int[][] BAND_OFFSETS = {
+    private static final int[][] BAND_OFFSETS = {
         { 0x00ff0000, 0x0000ff00, 0x000000ff },             // OPAQUE
         { 0x00ff0000, 0x0000ff00, 0x000000ff, 0x01000000 }, // BITMASK
         { 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 }  // TRANSLUCENT

jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java

@@ -63,8 +63,8 @@ class GTKPainter extends SynthPainter {
         ShadowType.ETCHED_IN, ShadowType.OUT
     };
 
-    private final static GTKEngine ENGINE = GTKEngine.INSTANCE;
+    private static final GTKEngine ENGINE = GTKEngine.INSTANCE;
-    final static GTKPainter INSTANCE = new GTKPainter();
+    static final GTKPainter INSTANCE = new GTKPainter();
 
     private GTKPainter() {
     }

jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifBorders.java

@@ -263,7 +263,7 @@ public class MotifBorders {
         Color frameShadow;
 
         // The width of the border
-        public final static int BORDER_SIZE = 5;
+        public static final int BORDER_SIZE = 5;
 
         /** Constructs an FrameBorder for the JComponent <b>comp</b>.
         */
@@ -446,7 +446,7 @@ public class MotifBorders {
         JInternalFrame frame;
 
         // The size of the bounding box for Motif frame corners.
-        public final static int CORNER_SIZE = 24;
+        public static final int CORNER_SIZE = 24;
 
         /** Constructs an InternalFrameBorder for the InternalFrame
           * <b>aFrame</b>.
@@ -634,10 +634,10 @@ public class MotifBorders {
         protected Color  highlightColor;
 
         // Space between the border and text
-        static protected final int TEXT_SPACING = 2;
+        protected static final int TEXT_SPACING = 2;
 
         // Space for the separator under the title
-        static protected final int GROOVE_HEIGHT = 2;
+        protected static final int GROOVE_HEIGHT = 2;
 
         /**
          * Creates a MotifPopupMenuBorder instance

jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java

@@ -49,7 +49,7 @@ public class MotifCheckBoxUI extends MotifRadioButtonUI {
 
     private static final Object MOTIF_CHECK_BOX_UI_KEY = new Object();
 
-    private final static String propertyPrefix = "CheckBox" + ".";
+    private static final String propertyPrefix = "CheckBox" + ".";
 
     private boolean defaults_initialized = false;
 

jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java

@@ -59,10 +59,10 @@ public class MotifDesktopIconUI extends BasicDesktopIconUI
     JPopupMenu systemMenu;
     EventListener mml;
 
-    final static int LABEL_HEIGHT = 18;
+    static final int LABEL_HEIGHT = 18;
-    final static int LABEL_DIVIDER = 4;    // padding between icon and label
+    static final int LABEL_DIVIDER = 4;    // padding between icon and label
 
-    final static Font defaultTitleFont =
+    static final Font defaultTitleFont =
         new Font(Font.SANS_SERIF, Font.PLAIN, 12);
 
     public static ComponentUI createUI(JComponent c)    {

jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifIconFactory.java

@@ -93,7 +93,7 @@ public class MotifIconFactory implements Serializable
 
     @SuppressWarnings("serial") // Same-version serialization only
     private static class CheckBoxIcon implements Icon, UIResource, Serializable  {
-        final static int csize = 13;
+        static final int csize = 13;
 
         private Color control = UIManager.getColor("control");
         private Color foreground = UIManager.getColor("CheckBox.foreground");

jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java

@@ -56,7 +56,7 @@ public class MotifInternalFrameTitlePane
     Color shadow;
 
     // The width and height of a title pane button
-    public final static int BUTTON_SIZE = 19;  // 17 + 1 pixel border
+    public static final int BUTTON_SIZE = 19;  // 17 + 1 pixel border
 
 
     public MotifInternalFrameTitlePane(JInternalFrame frame) {

jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java

@@ -47,9 +47,9 @@ import java.beans.PropertyChangeListener;
  */
 public class MotifScrollPaneUI extends BasicScrollPaneUI
 {
-    private final static Border vsbMarginBorderR = new EmptyBorder(0, 4, 0, 0);
+    private static final Border vsbMarginBorderR = new EmptyBorder(0, 4, 0, 0);
-    private final static Border vsbMarginBorderL = new EmptyBorder(0, 0, 0, 4);
+    private static final Border vsbMarginBorderL = new EmptyBorder(0, 0, 0, 4);
-    private final static Border hsbMarginBorder = new EmptyBorder(4, 0, 0, 0);
+    private static final Border hsbMarginBorder = new EmptyBorder(4, 0, 0, 0);
 
     private CompoundBorder vsbBorder;
     private CompoundBorder hsbBorder;

jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java

@@ -69,11 +69,11 @@ import sun.awt.AppContext;
  */
 class AnimationController implements ActionListener, PropertyChangeListener {
 
-    private final static boolean VISTA_ANIMATION_DISABLED =
+    private static final boolean VISTA_ANIMATION_DISABLED =
         AccessController.doPrivileged(new GetBooleanAction("swing.disablevistaanimation"));
 
 
-    private final static Object ANIMATION_CONTROLLER_KEY =
+    private static final Object ANIMATION_CONTROLLER_KEY =
         new StringBuilder("ANIMATION_CONTROLLER_KEY");
 
     private final Map<JComponent, Map<Part, AnimationState>> animationStateMap =

jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java

@@ -53,7 +53,7 @@ public class WindowsCheckBoxUI extends WindowsRadioButtonUI
 
     private static final Object WINDOWS_CHECK_BOX_UI_KEY = new Object();
 
-    private final static String propertyPrefix = "CheckBox" + ".";
+    private static final String propertyPrefix = "CheckBox" + ".";
 
     private boolean defaults_initialized = false;
 

jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java

@@ -1017,7 +1017,7 @@ public class WindowsFileChooserUI extends BasicFileChooserUI {
         }
     }
 
-    final static int space = 10;
+    static final int space = 10;
     class IndentIcon implements Icon {
 
         Icon icon = null;

jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java

@@ -321,7 +321,7 @@ public class WindowsIconFactory implements Serializable
     @SuppressWarnings("serial") // Same-version serialization only
     private static class CheckBoxIcon implements Icon, Serializable
     {
-        final static int csize = 13;
+        static final int csize = 13;
         public void paintIcon(Component c, Graphics g, int x, int y) {
             JCheckBox cb = (JCheckBox) c;
             ButtonModel model = cb.getModel();

jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java

@@ -2271,7 +2271,7 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
         protected Object classicValue, xpValue;
 
         // A constant that lets you specify null when using XP styles.
-        private final static Object NULL_VALUE = new Object();
+        private static final Object NULL_VALUE = new Object();
 
         XPValue(Object xpValue, Object classicValue) {
             this.xpValue = xpValue;

jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java

@@ -70,7 +70,7 @@ import javax.swing.plaf.basic.ComboPopup;
  */
 public class WindowsRootPaneUI extends BasicRootPaneUI {
 
-    private final static WindowsRootPaneUI windowsRootPaneUI = new WindowsRootPaneUI();
+    private static final WindowsRootPaneUI windowsRootPaneUI = new WindowsRootPaneUI();
     static final AltProcessor altProcessor = new AltProcessor();
 
     public static ComponentUI createUI(JComponent c) {

jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java

@@ -106,8 +106,8 @@ public class WindowsTreeUI extends BasicTreeUI {
         }
     }
 
-    static protected final int HALF_SIZE = 4;
+    protected static final int HALF_SIZE = 4;
-    static protected final int SIZE = 9;
+    protected static final int SIZE = 9;
 
     /**
      * Returns the default cell renderer that is used to do the
@@ -130,7 +130,7 @@ public class WindowsTreeUI extends BasicTreeUI {
     @SuppressWarnings("serial") // Same-version serialization only
     public static class ExpandedIcon implements Icon, Serializable {
 
-        static public Icon createExpandedIcon() {
+        public static Icon createExpandedIcon() {
             return new ExpandedIcon();
         }
 
@@ -182,7 +182,7 @@ public class WindowsTreeUI extends BasicTreeUI {
      */
     @SuppressWarnings("serial") // Superclass is not serializable across versions
     public static class CollapsedIcon extends ExpandedIcon {
-        static public Icon createCollapsedIcon() {
+        public static Icon createCollapsedIcon() {
             return new CollapsedIcon();
         }
 

jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileWriter.java

@@ -52,7 +52,7 @@ import javax.sound.sampled.AudioSystem;
 public final class AuFileWriter extends SunFileWriter {
 
     //$$fb value for length field if length is not known
-    public final static int UNKNOWN_SIZE=-1;
+    public static final int UNKNOWN_SIZE=-1;
 
     /**
      * Constructs a new AuFileWriter object.

jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatConverter.java

@@ -53,11 +53,11 @@ public abstract class AudioFloatConverter {
 
         private final AudioFloatConverter converter;
 
-        final private int offset;
+        private final int offset;
 
-        final private int stepsize;
+        private final int stepsize;
 
-        final private byte mask;
+        private final byte mask;
 
         private byte[] mask_buffer;
 

jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSRegion.java

@@ -38,7 +38,7 @@ import java.util.List;
  */
 public final class DLSRegion {
 
-    public final static int OPTION_SELFNONEXCLUSIVE = 0x0001;
+    public static final int OPTION_SELFNONEXCLUSIVE = 0x0001;
     List<DLSModulator> modulators = new ArrayList<DLSModulator>();
     int keyfrom;
     int keyto;

jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSampleLoop.java

@@ -31,8 +31,8 @@ package com.sun.media.sound;
  */
 public final class DLSSampleLoop {
 
-    public final static int LOOP_TYPE_FORWARD = 0;
+    public static final int LOOP_TYPE_FORWARD = 0;
-    public final static int LOOP_TYPE_RELEASE = 1;
+    public static final int LOOP_TYPE_RELEASE = 1;
     long type;
     long start;
     long length;

jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbank.java

@@ -53,7 +53,7 @@ import javax.sound.sampled.AudioFormat.Encoding;
  */
 public final class DLSSoundbank implements Soundbank {
 
-    static private class DLSID {
+    private static class DLSID {
         long i1;
         int s1;
         int s2;

jdk/src/java.desktop/share/classes/com/sun/media/sound/EmergencySoundbank.java

@@ -37,7 +37,7 @@ import javax.sound.sampled.AudioFormat;
  */
 public final class EmergencySoundbank {
 
-    private final static String[] general_midi_instruments = {
+    private static final String[] general_midi_instruments = {
         "Acoustic Grand Piano",
         "Bright Acoustic Piano",
         "Electric Grand Piano",
@@ -2564,11 +2564,11 @@ public final class EmergencySoundbank {
         return ins;
     }
 
-    static public void ifft(double[] data) {
+    public static void ifft(double[] data) {
         new FFT(data.length / 2, 1).transform(data);
     }
 
-    static public void fft(double[] data) {
+    public static void fft(double[] data) {
         new FFT(data.length / 2, -1).transform(data);
     }
 
@@ -2580,7 +2580,7 @@ public final class EmergencySoundbank {
         }
     }
 
-    static public void randomPhase(double[] data) {
+    public static void randomPhase(double[] data) {
         for (int i = 0; i < data.length; i += 2) {
             double phase = Math.random() * 2 * Math.PI;
             double d = data[i];
@@ -2589,7 +2589,7 @@ public final class EmergencySoundbank {
         }
     }
 
-    static public void randomPhase(double[] data, Random random) {
+    public static void randomPhase(double[] data, Random random) {
         for (int i = 0; i < data.length; i += 2) {
             double phase = random.nextDouble() * 2 * Math.PI;
             double d = data[i];
@@ -2598,7 +2598,7 @@ public final class EmergencySoundbank {
         }
     }
 
-    static public void normalize(double[] data, double target) {
+    public static void normalize(double[] data, double target) {
         double maxvalue = 0;
         for (int i = 0; i < data.length; i++) {
             if (data[i] > maxvalue)
@@ -2613,7 +2613,7 @@ public final class EmergencySoundbank {
             data[i] *= gain;
     }
 
-    static public void normalize(float[] data, double target) {
+    public static void normalize(float[] data, double target) {
         double maxvalue = 0.5;
         for (int i = 0; i < data.length; i++) {
             if (data[i * 2] > maxvalue)
@@ -2626,7 +2626,7 @@ public final class EmergencySoundbank {
             data[i * 2] *= gain;
     }
 
-    static public double[] realPart(double[] in) {
+    public static double[] realPart(double[] in) {
         double[] out = new double[in.length / 2];
         for (int i = 0; i < out.length; i++) {
             out[i] = in[i * 2];
@@ -2634,7 +2634,7 @@ public final class EmergencySoundbank {
         return out;
     }
 
-    static public double[] imgPart(double[] in) {
+    public static double[] imgPart(double[] in) {
         double[] out = new double[in.length / 2];
         for (int i = 0; i < out.length; i++) {
             out[i] = in[i * 2];
@@ -2642,7 +2642,7 @@ public final class EmergencySoundbank {
         return out;
     }
 
-    static public float[] toFloat(double[] in) {
+    public static float[] toFloat(double[] in) {
         float[] out = new float[in.length];
         for (int i = 0; i < out.length; i++) {
             out[i] = (float) in[i];
@@ -2650,24 +2650,24 @@ public final class EmergencySoundbank {
         return out;
     }
 
-    static public byte[] toBytes(float[] in, AudioFormat format) {
+    public static byte[] toBytes(float[] in, AudioFormat format) {
         byte[] out = new byte[in.length * format.getFrameSize()];
         return AudioFloatConverter.getConverter(format).toByteArray(in, out);
     }
 
-    static public void fadeUp(double[] data, int samples) {
+    public static void fadeUp(double[] data, int samples) {
         double dsamples = samples;
         for (int i = 0; i < samples; i++)
             data[i] *= i / dsamples;
     }
 
-    static public void fadeUp(float[] data, int samples) {
+    public static void fadeUp(float[] data, int samples) {
         double dsamples = samples;
         for (int i = 0; i < samples; i++)
             data[i] *= i / dsamples;
     }
 
-    static public double[] loopExtend(double[] data, int newsize) {
+    public static double[] loopExtend(double[] data, int newsize) {
         double[] outdata = new double[newsize];
         int p_len = data.length;
         int p_ps = 0;
@@ -2680,7 +2680,7 @@ public final class EmergencySoundbank {
         return outdata;
     }
 
-    static public float[] loopExtend(float[] data, int newsize) {
+    public static float[] loopExtend(float[] data, int newsize) {
         float[] outdata = new float[newsize];
         int p_len = data.length;
         int p_ps = 0;

jdk/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java

@@ -88,9 +88,9 @@ public final class JavaSoundAudioClip implements AudioClip, MetaEventListener, L
      * with the number of samples in the stream.
      *
      */
-    private final static long CLIP_THRESHOLD = 1048576;
+    private static final long CLIP_THRESHOLD = 1048576;
     //private final static long CLIP_THRESHOLD = 1;
-    private final static int STREAM_BUFFER_SIZE = 1024;
+    private static final int STREAM_BUFFER_SIZE = 1024;
 
     public JavaSoundAudioClip(InputStream in) throws IOException {
         if (DEBUG || Printer.debug)Printer.debug("JavaSoundAudioClip.<init>");

jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java

@@ -42,7 +42,7 @@ public final class MidiOutDeviceProvider extends AbstractMidiDeviceProvider {
     /** Cache of open MIDI output devices on the system. */
     private static MidiDevice[] devices = null;
 
-    private final static boolean enabled;
+    private static final boolean enabled;
 
     // STATIC
 

jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiUtils.java

@@ -44,9 +44,9 @@ import javax.sound.midi.Track;
  */
 public final class MidiUtils {
 
-    public final static int DEFAULT_TEMPO_MPQ = 500000; // 120bpm
+    public static final int DEFAULT_TEMPO_MPQ = 500000; // 120bpm
-    public final static int META_END_OF_TRACK_TYPE = 0x2F;
+    public static final int META_END_OF_TRACK_TYPE = 0x2F;
-    public final static int META_TEMPO_TYPE = 0x51;
+    public static final int META_TEMPO_TYPE = 0x51;
 
     /**
      * Suppresses default constructor, ensuring non-instantiability.

jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelConnectionBlock.java

@@ -39,7 +39,7 @@ public final class ModelConnectionBlock {
     //
     //   source1 * source2 * scale -> destination
     //
-    private final static ModelSource[] no_sources = new ModelSource[0];
+    private static final ModelSource[] no_sources = new ModelSource[0];
     private ModelSource[] sources = no_sources;
     private double scale = 1;
     private ModelDestination destination;

jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelTransform.java

@@ -31,5 +31,5 @@ package com.sun.media.sound;
  */
 public interface ModelTransform {
 
-    abstract public double transform(double value);
+    public abstract double transform(double value);
 }

jdk/src/java.desktop/share/classes/com/sun/media/sound/Platform.java

@@ -169,9 +169,9 @@ final class Platform {
     }
 
     // the following native methods are implemented in Platform.c
-    private native static boolean nIsBigEndian();
+    private static native boolean nIsBigEndian();
-    private native static String nGetExtraLibraries();
+    private static native String nGetExtraLibraries();
-    private native static int nGetLibraryForFeature(int feature);
+    private static native int nGetLibraryForFeature(int feature);
 
     /**
      * Read the required system properties.

jdk/src/java.desktop/share/classes/com/sun/media/sound/PortMixer.java

@@ -422,7 +422,7 @@ final class PortMixer extends AbstractMixer {
         private boolean closed = false;
 
         // predefined float control types. See also Ports.h
-        private final static FloatControl.Type[] FLOAT_CONTROL_TYPES = {
+        private static final FloatControl.Type[] FLOAT_CONTROL_TYPES = {
             null,
             FloatControl.Type.BALANCE,
             FloatControl.Type.MASTER_GAIN,

jdk/src/java.desktop/share/classes/com/sun/media/sound/RealTimeSequencer.java

@@ -51,8 +51,8 @@ final class RealTimeSequencer extends AbstractMidiDevice
     // STATIC VARIABLES
 
     /** debugging flags */
-    private final static boolean DEBUG_PUMP = false;
+    private static final boolean DEBUG_PUMP = false;
-    private final static boolean DEBUG_PUMP_ALL = false;
+    private static final boolean DEBUG_PUMP_ALL = false;
 
     /**
      * Event Dispatcher thread. Should be using a shared event

jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Modulator.java

@@ -31,24 +31,24 @@ package com.sun.media.sound;
  */
 public final class SF2Modulator {
 
-    public final static int SOURCE_NONE = 0;
+    public static final int SOURCE_NONE = 0;
-    public final static int SOURCE_NOTE_ON_VELOCITY = 2;
+    public static final int SOURCE_NOTE_ON_VELOCITY = 2;
-    public final static int SOURCE_NOTE_ON_KEYNUMBER = 3;
+    public static final int SOURCE_NOTE_ON_KEYNUMBER = 3;
-    public final static int SOURCE_POLY_PRESSURE = 10;
+    public static final int SOURCE_POLY_PRESSURE = 10;
-    public final static int SOURCE_CHANNEL_PRESSURE = 13;
+    public static final int SOURCE_CHANNEL_PRESSURE = 13;
-    public final static int SOURCE_PITCH_WHEEL = 14;
+    public static final int SOURCE_PITCH_WHEEL = 14;
-    public final static int SOURCE_PITCH_SENSITIVITY = 16;
+    public static final int SOURCE_PITCH_SENSITIVITY = 16;
-    public final static int SOURCE_MIDI_CONTROL = 128 * 1;
+    public static final int SOURCE_MIDI_CONTROL = 128 * 1;
-    public final static int SOURCE_DIRECTION_MIN_MAX = 256 * 0;
+    public static final int SOURCE_DIRECTION_MIN_MAX = 256 * 0;
-    public final static int SOURCE_DIRECTION_MAX_MIN = 256 * 1;
+    public static final int SOURCE_DIRECTION_MAX_MIN = 256 * 1;
-    public final static int SOURCE_POLARITY_UNIPOLAR = 512 * 0;
+    public static final int SOURCE_POLARITY_UNIPOLAR = 512 * 0;
-    public final static int SOURCE_POLARITY_BIPOLAR = 512 * 1;
+    public static final int SOURCE_POLARITY_BIPOLAR = 512 * 1;
-    public final static int SOURCE_TYPE_LINEAR = 1024 * 0;
+    public static final int SOURCE_TYPE_LINEAR = 1024 * 0;
-    public final static int SOURCE_TYPE_CONCAVE = 1024 * 1;
+    public static final int SOURCE_TYPE_CONCAVE = 1024 * 1;
-    public final static int SOURCE_TYPE_CONVEX = 1024 * 2;
+    public static final int SOURCE_TYPE_CONVEX = 1024 * 2;
-    public final static int SOURCE_TYPE_SWITCH = 1024 * 3;
+    public static final int SOURCE_TYPE_SWITCH = 1024 * 3;
-    public final static int TRANSFORM_LINEAR = 0;
+    public static final int TRANSFORM_LINEAR = 0;
-    public final static int TRANSFORM_ABSOLUTE = 2;
+    public static final int TRANSFORM_ABSOLUTE = 2;
     int sourceOperator;
     int destinationOperator;
     short amount;

jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Region.java

@@ -36,67 +36,67 @@ import java.util.Map;
  */
 public class SF2Region {
 
-    public final static int GENERATOR_STARTADDRSOFFSET = 0;
+    public static final int GENERATOR_STARTADDRSOFFSET = 0;
-    public final static int GENERATOR_ENDADDRSOFFSET = 1;
+    public static final int GENERATOR_ENDADDRSOFFSET = 1;
-    public final static int GENERATOR_STARTLOOPADDRSOFFSET = 2;
+    public static final int GENERATOR_STARTLOOPADDRSOFFSET = 2;
-    public final static int GENERATOR_ENDLOOPADDRSOFFSET = 3;
+    public static final int GENERATOR_ENDLOOPADDRSOFFSET = 3;
-    public final static int GENERATOR_STARTADDRSCOARSEOFFSET = 4;
+    public static final int GENERATOR_STARTADDRSCOARSEOFFSET = 4;
-    public final static int GENERATOR_MODLFOTOPITCH = 5;
+    public static final int GENERATOR_MODLFOTOPITCH = 5;
-    public final static int GENERATOR_VIBLFOTOPITCH = 6;
+    public static final int GENERATOR_VIBLFOTOPITCH = 6;
-    public final static int GENERATOR_MODENVTOPITCH = 7;
+    public static final int GENERATOR_MODENVTOPITCH = 7;
-    public final static int GENERATOR_INITIALFILTERFC = 8;
+    public static final int GENERATOR_INITIALFILTERFC = 8;
-    public final static int GENERATOR_INITIALFILTERQ = 9;
+    public static final int GENERATOR_INITIALFILTERQ = 9;
-    public final static int GENERATOR_MODLFOTOFILTERFC = 10;
+    public static final int GENERATOR_MODLFOTOFILTERFC = 10;
-    public final static int GENERATOR_MODENVTOFILTERFC = 11;
+    public static final int GENERATOR_MODENVTOFILTERFC = 11;
-    public final static int GENERATOR_ENDADDRSCOARSEOFFSET = 12;
+    public static final int GENERATOR_ENDADDRSCOARSEOFFSET = 12;
-    public final static int GENERATOR_MODLFOTOVOLUME = 13;
+    public static final int GENERATOR_MODLFOTOVOLUME = 13;
-    public final static int GENERATOR_UNUSED1 = 14;
+    public static final int GENERATOR_UNUSED1 = 14;
-    public final static int GENERATOR_CHORUSEFFECTSSEND = 15;
+    public static final int GENERATOR_CHORUSEFFECTSSEND = 15;
-    public final static int GENERATOR_REVERBEFFECTSSEND = 16;
+    public static final int GENERATOR_REVERBEFFECTSSEND = 16;
-    public final static int GENERATOR_PAN = 17;
+    public static final int GENERATOR_PAN = 17;
-    public final static int GENERATOR_UNUSED2 = 18;
+    public static final int GENERATOR_UNUSED2 = 18;
-    public final static int GENERATOR_UNUSED3 = 19;
+    public static final int GENERATOR_UNUSED3 = 19;
-    public final static int GENERATOR_UNUSED4 = 20;
+    public static final int GENERATOR_UNUSED4 = 20;
-    public final static int GENERATOR_DELAYMODLFO = 21;
+    public static final int GENERATOR_DELAYMODLFO = 21;
-    public final static int GENERATOR_FREQMODLFO = 22;
+    public static final int GENERATOR_FREQMODLFO = 22;
-    public final static int GENERATOR_DELAYVIBLFO = 23;
+    public static final int GENERATOR_DELAYVIBLFO = 23;
-    public final static int GENERATOR_FREQVIBLFO = 24;
+    public static final int GENERATOR_FREQVIBLFO = 24;
-    public final static int GENERATOR_DELAYMODENV = 25;
+    public static final int GENERATOR_DELAYMODENV = 25;
-    public final static int GENERATOR_ATTACKMODENV = 26;
+    public static final int GENERATOR_ATTACKMODENV = 26;
-    public final static int GENERATOR_HOLDMODENV = 27;
+    public static final int GENERATOR_HOLDMODENV = 27;
-    public final static int GENERATOR_DECAYMODENV = 28;
+    public static final int GENERATOR_DECAYMODENV = 28;
-    public final static int GENERATOR_SUSTAINMODENV = 29;
+    public static final int GENERATOR_SUSTAINMODENV = 29;
-    public final static int GENERATOR_RELEASEMODENV = 30;
+    public static final int GENERATOR_RELEASEMODENV = 30;
-    public final static int GENERATOR_KEYNUMTOMODENVHOLD = 31;
+    public static final int GENERATOR_KEYNUMTOMODENVHOLD = 31;
-    public final static int GENERATOR_KEYNUMTOMODENVDECAY = 32;
+    public static final int GENERATOR_KEYNUMTOMODENVDECAY = 32;
-    public final static int GENERATOR_DELAYVOLENV = 33;
+    public static final int GENERATOR_DELAYVOLENV = 33;
-    public final static int GENERATOR_ATTACKVOLENV = 34;
+    public static final int GENERATOR_ATTACKVOLENV = 34;
-    public final static int GENERATOR_HOLDVOLENV = 35;
+    public static final int GENERATOR_HOLDVOLENV = 35;
-    public final static int GENERATOR_DECAYVOLENV = 36;
+    public static final int GENERATOR_DECAYVOLENV = 36;
-    public final static int GENERATOR_SUSTAINVOLENV = 37;
+    public static final int GENERATOR_SUSTAINVOLENV = 37;
-    public final static int GENERATOR_RELEASEVOLENV = 38;
+    public static final int GENERATOR_RELEASEVOLENV = 38;
-    public final static int GENERATOR_KEYNUMTOVOLENVHOLD = 39;
+    public static final int GENERATOR_KEYNUMTOVOLENVHOLD = 39;
-    public final static int GENERATOR_KEYNUMTOVOLENVDECAY = 40;
+    public static final int GENERATOR_KEYNUMTOVOLENVDECAY = 40;
-    public final static int GENERATOR_INSTRUMENT = 41;
+    public static final int GENERATOR_INSTRUMENT = 41;
-    public final static int GENERATOR_RESERVED1 = 42;
+    public static final int GENERATOR_RESERVED1 = 42;
-    public final static int GENERATOR_KEYRANGE = 43;
+    public static final int GENERATOR_KEYRANGE = 43;
-    public final static int GENERATOR_VELRANGE = 44;
+    public static final int GENERATOR_VELRANGE = 44;
-    public final static int GENERATOR_STARTLOOPADDRSCOARSEOFFSET = 45;
+    public static final int GENERATOR_STARTLOOPADDRSCOARSEOFFSET = 45;
-    public final static int GENERATOR_KEYNUM = 46;
+    public static final int GENERATOR_KEYNUM = 46;
-    public final static int GENERATOR_VELOCITY = 47;
+    public static final int GENERATOR_VELOCITY = 47;
-    public final static int GENERATOR_INITIALATTENUATION = 48;
+    public static final int GENERATOR_INITIALATTENUATION = 48;
-    public final static int GENERATOR_RESERVED2 = 49;
+    public static final int GENERATOR_RESERVED2 = 49;
-    public final static int GENERATOR_ENDLOOPADDRSCOARSEOFFSET = 50;
+    public static final int GENERATOR_ENDLOOPADDRSCOARSEOFFSET = 50;
-    public final static int GENERATOR_COARSETUNE = 51;
+    public static final int GENERATOR_COARSETUNE = 51;
-    public final static int GENERATOR_FINETUNE = 52;
+    public static final int GENERATOR_FINETUNE = 52;
-    public final static int GENERATOR_SAMPLEID = 53;
+    public static final int GENERATOR_SAMPLEID = 53;
-    public final static int GENERATOR_SAMPLEMODES = 54;
+    public static final int GENERATOR_SAMPLEMODES = 54;
-    public final static int GENERATOR_RESERVED3 = 55;
+    public static final int GENERATOR_RESERVED3 = 55;
-    public final static int GENERATOR_SCALETUNING = 56;
+    public static final int GENERATOR_SCALETUNING = 56;
-    public final static int GENERATOR_EXCLUSIVECLASS = 57;
+    public static final int GENERATOR_EXCLUSIVECLASS = 57;
-    public final static int GENERATOR_OVERRIDINGROOTKEY = 58;
+    public static final int GENERATOR_OVERRIDINGROOTKEY = 58;
-    public final static int GENERATOR_UNUSED5 = 59;
+    public static final int GENERATOR_UNUSED5 = 59;
-    public final static int GENERATOR_ENDOPR = 60;
+    public static final int GENERATOR_ENDOPR = 60;
     protected Map<Integer, Short> generators = new HashMap<Integer, Short>();
     protected List<SF2Modulator> modulators = new ArrayList<SF2Modulator>();
 
@@ -108,7 +108,7 @@ public class SF2Region {
         return generators.containsKey(generator);
     }
 
-    static public short getDefaultValue(int generator) {
+    public static short getDefaultValue(int generator) {
         if (generator == 8) return (short)13500;
         if (generator == 21) return (short)-12000;
         if (generator == 23) return (short)-12000;

jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java

@@ -31,15 +31,15 @@ package com.sun.media.sound;
  */
 public final class SoftEnvelopeGenerator implements SoftProcess {
 
-    public final static int EG_OFF = 0;
+    public static final int EG_OFF = 0;
-    public final static int EG_DELAY = 1;
+    public static final int EG_DELAY = 1;
-    public final static int EG_ATTACK = 2;
+    public static final int EG_ATTACK = 2;
-    public final static int EG_HOLD = 3;
+    public static final int EG_HOLD = 3;
-    public final static int EG_DECAY = 4;
+    public static final int EG_DECAY = 4;
-    public final static int EG_SUSTAIN = 5;
+    public static final int EG_SUSTAIN = 5;
-    public final static int EG_RELEASE = 6;
+    public static final int EG_RELEASE = 6;
-    public final static int EG_SHUTDOWN = 7;
+    public static final int EG_SHUTDOWN = 7;
-    public final static int EG_END = 8;
+    public static final int EG_END = 8;
     int max_count = 10;
     int used_count = 0;
     private final int[] stage = new int[max_count];

jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftFilter.java

@@ -35,13 +35,13 @@ package com.sun.media.sound;
  */
 public final class SoftFilter {
 
-    public final static int FILTERTYPE_LP6 = 0x00;
+    public static final int FILTERTYPE_LP6 = 0x00;
-    public final static int FILTERTYPE_LP12 = 0x01;
+    public static final int FILTERTYPE_LP12 = 0x01;
-    public final static int FILTERTYPE_HP12 = 0x11;
+    public static final int FILTERTYPE_HP12 = 0x11;
-    public final static int FILTERTYPE_BP12 = 0x21;
+    public static final int FILTERTYPE_BP12 = 0x21;
-    public final static int FILTERTYPE_NP12 = 0x31;
+    public static final int FILTERTYPE_NP12 = 0x31;
-    public final static int FILTERTYPE_LP24 = 0x03;
+    public static final int FILTERTYPE_LP24 = 0x03;
-    public final static int FILTERTYPE_HP24 = 0x13;
+    public static final int FILTERTYPE_HP24 = 0x13;
 
     //
     // 0x0 = 1st-order, 6 dB/oct

jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMainMixer.java

@@ -53,20 +53,20 @@ public final class SoftMainMixer {
         SoftAudioBuffer[] buffers;
     }
 
-    public final static int CHANNEL_LEFT = 0;
+    public static final int CHANNEL_LEFT = 0;
-    public final static int CHANNEL_RIGHT = 1;
+    public static final int CHANNEL_RIGHT = 1;
-    public final static int CHANNEL_MONO = 2;
+    public static final int CHANNEL_MONO = 2;
-    public final static int CHANNEL_DELAY_LEFT = 3;
+    public static final int CHANNEL_DELAY_LEFT = 3;
-    public final static int CHANNEL_DELAY_RIGHT = 4;
+    public static final int CHANNEL_DELAY_RIGHT = 4;
-    public final static int CHANNEL_DELAY_MONO = 5;
+    public static final int CHANNEL_DELAY_MONO = 5;
-    public final static int CHANNEL_EFFECT1 = 6;
+    public static final int CHANNEL_EFFECT1 = 6;
-    public final static int CHANNEL_EFFECT2 = 7;
+    public static final int CHANNEL_EFFECT2 = 7;
-    public final static int CHANNEL_DELAY_EFFECT1 = 8;
+    public static final int CHANNEL_DELAY_EFFECT1 = 8;
-    public final static int CHANNEL_DELAY_EFFECT2 = 9;
+    public static final int CHANNEL_DELAY_EFFECT2 = 9;
-    public final static int CHANNEL_LEFT_DRY = 10;
+    public static final int CHANNEL_LEFT_DRY = 10;
-    public final static int CHANNEL_RIGHT_DRY = 11;
+    public static final int CHANNEL_RIGHT_DRY = 11;
-    public final static int CHANNEL_SCRATCH1 = 12;
+    public static final int CHANNEL_SCRATCH1 = 12;
-    public final static int CHANNEL_SCRATCH2 = 13;
+    public static final int CHANNEL_SCRATCH2 = 13;
     boolean active_sensing_on = false;
     private long msec_last_activity = -1;
     private boolean pusher_silent = false;

jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMainMixer.java

@@ -39,29 +39,29 @@ import javax.sound.sampled.AudioSystem;
  */
 public final class SoftMixingMainMixer {
 
-    public final static int CHANNEL_LEFT = 0;
+    public static final int CHANNEL_LEFT = 0;
 
-    public final static int CHANNEL_RIGHT = 1;
+    public static final int CHANNEL_RIGHT = 1;
 
-    public final static int CHANNEL_EFFECT1 = 2;
+    public static final int CHANNEL_EFFECT1 = 2;
 
-    public final static int CHANNEL_EFFECT2 = 3;
+    public static final int CHANNEL_EFFECT2 = 3;
 
-    public final static int CHANNEL_EFFECT3 = 4;
+    public static final int CHANNEL_EFFECT3 = 4;
 
-    public final static int CHANNEL_EFFECT4 = 5;
+    public static final int CHANNEL_EFFECT4 = 5;
 
-    public final static int CHANNEL_LEFT_DRY = 10;
+    public static final int CHANNEL_LEFT_DRY = 10;
 
-    public final static int CHANNEL_RIGHT_DRY = 11;
+    public static final int CHANNEL_RIGHT_DRY = 11;
 
-    public final static int CHANNEL_SCRATCH1 = 12;
+    public static final int CHANNEL_SCRATCH1 = 12;
 
-    public final static int CHANNEL_SCRATCH2 = 13;
+    public static final int CHANNEL_SCRATCH2 = 13;
 
-    public final static int CHANNEL_CHANNELMIXER_LEFT = 14;
+    public static final int CHANNEL_CHANNELMIXER_LEFT = 14;
 
-    public final static int CHANNEL_CHANNELMIXER_RIGHT = 15;
+    public static final int CHANNEL_CHANNELMIXER_RIGHT = 15;
 
     private final SoftMixingMixer mixer;
 

jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftReverb.java

@@ -35,7 +35,7 @@ import java.util.Arrays;
  */
 public final class SoftReverb implements SoftAudioProcessor {
 
-    private final static class Delay {
+    private static final class Delay {
 
         private float[] delaybuffer;
         private int rovepos = 0;
@@ -70,7 +70,7 @@ public final class SoftReverb implements SoftAudioProcessor {
         }
     }
 
-    private final static class AllPass {
+    private static final class AllPass {
 
         private final float[] delaybuffer;
         private final int delaybuffersize;
@@ -117,7 +117,7 @@ public final class SoftReverb implements SoftAudioProcessor {
         }
     }
 
-    private final static class Comb {
+    private static final class Comb {
 
         private final float[] delaybuffer;
         private final int delaybuffersize;

jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java

@@ -178,7 +178,7 @@ public final class SoftSynthesizer implements AudioSynthesizer,
     static final String INFO_VENDOR = "OpenJDK";
     static final String INFO_DESCRIPTION = "Software MIDI Synthesizer";
     static final String INFO_VERSION = "1.0";
-    final static MidiDevice.Info info = new Info();
+    static final MidiDevice.Info info = new Info();
 
     private static SourceDataLine testline = null;
 

jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileWriter.java

@@ -307,7 +307,7 @@ public final class StandardMidiFileWriter extends MidiFileWriter {
         return ERROR;
     }
 
-    private final static long mask = 0x7F;
+    private static final long mask = 0x7F;
 
     private int writeVarInt(long value) throws IOException {
         int len = 1;

jdk/src/java.desktop/share/classes/com/sun/media/sound/UlawCodec.java

@@ -43,8 +43,8 @@ public final class UlawCodec extends SunCodec {
 
     /* Tables used for U-law decoding */
 
-    private final static byte[] ULAW_TABH = new byte[256];
+    private static final byte[] ULAW_TABH = new byte[256];
-    private final static byte[] ULAW_TABL = new byte[256];
+    private static final byte[] ULAW_TABL = new byte[256];
 
     private static final AudioFormat.Encoding[] ulawEncodings = {AudioFormat.Encoding.ULAW,
                                                                  AudioFormat.Encoding.PCM_SIGNED};

jdk/src/java.desktop/share/classes/java/applet/Applet.java

@@ -79,7 +79,7 @@ public class Applet extends Panel {
      * likely move it into RUNNING state).
      * The stub field will be restored by the reader.
      */
-    transient private AppletStub stub;
+    private transient AppletStub stub;
 
     /* version ID for serialized form. */
     private static final long serialVersionUID = -5836846270535785031L;
@@ -310,7 +310,7 @@ public class Applet extends Panel {
      *
      * @since       1.2
      */
-    public final static AudioClip newAudioClip(URL url) {
+    public static final AudioClip newAudioClip(URL url) {
         return new sun.applet.AppletAudioClip(url);
     }
 

jdk/src/java.desktop/share/classes/java/awt/AWTEvent.java

@@ -128,107 +128,107 @@ public abstract class AWTEvent extends EventObject {
     /**
      * The event mask for selecting component events.
      */
-    public final static long COMPONENT_EVENT_MASK = 0x01;
+    public static final long COMPONENT_EVENT_MASK = 0x01;
 
     /**
      * The event mask for selecting container events.
      */
-    public final static long CONTAINER_EVENT_MASK = 0x02;
+    public static final long CONTAINER_EVENT_MASK = 0x02;
 
     /**
      * The event mask for selecting focus events.
      */
-    public final static long FOCUS_EVENT_MASK = 0x04;
+    public static final long FOCUS_EVENT_MASK = 0x04;
 
     /**
      * The event mask for selecting key events.
      */
-    public final static long KEY_EVENT_MASK = 0x08;
+    public static final long KEY_EVENT_MASK = 0x08;
 
     /**
      * The event mask for selecting mouse events.
      */
-    public final static long MOUSE_EVENT_MASK = 0x10;
+    public static final long MOUSE_EVENT_MASK = 0x10;
 
     /**
      * The event mask for selecting mouse motion events.
      */
-    public final static long MOUSE_MOTION_EVENT_MASK = 0x20;
+    public static final long MOUSE_MOTION_EVENT_MASK = 0x20;
 
     /**
      * The event mask for selecting window events.
      */
-    public final static long WINDOW_EVENT_MASK = 0x40;
+    public static final long WINDOW_EVENT_MASK = 0x40;
 
     /**
      * The event mask for selecting action events.
      */
-    public final static long ACTION_EVENT_MASK = 0x80;
+    public static final long ACTION_EVENT_MASK = 0x80;
 
     /**
      * The event mask for selecting adjustment events.
      */
-    public final static long ADJUSTMENT_EVENT_MASK = 0x100;
+    public static final long ADJUSTMENT_EVENT_MASK = 0x100;
 
     /**
      * The event mask for selecting item events.
      */
-    public final static long ITEM_EVENT_MASK = 0x200;
+    public static final long ITEM_EVENT_MASK = 0x200;
 
     /**
      * The event mask for selecting text events.
      */
-    public final static long TEXT_EVENT_MASK = 0x400;
+    public static final long TEXT_EVENT_MASK = 0x400;
 
     /**
      * The event mask for selecting input method events.
      */
-    public final static long INPUT_METHOD_EVENT_MASK = 0x800;
+    public static final long INPUT_METHOD_EVENT_MASK = 0x800;
 
     /**
      * The pseudo event mask for enabling input methods.
      * We're using one bit in the eventMask so we don't need
      * a separate field inputMethodsEnabled.
      */
-    final static long INPUT_METHODS_ENABLED_MASK = 0x1000;
+    static final long INPUT_METHODS_ENABLED_MASK = 0x1000;
 
     /**
      * The event mask for selecting paint events.
      */
-    public final static long PAINT_EVENT_MASK = 0x2000;
+    public static final long PAINT_EVENT_MASK = 0x2000;
 
     /**
      * The event mask for selecting invocation events.
      */
-    public final static long INVOCATION_EVENT_MASK = 0x4000;
+    public static final long INVOCATION_EVENT_MASK = 0x4000;
 
     /**
      * The event mask for selecting hierarchy events.
      */
-    public final static long HIERARCHY_EVENT_MASK = 0x8000;
+    public static final long HIERARCHY_EVENT_MASK = 0x8000;
 
     /**
      * The event mask for selecting hierarchy bounds events.
      */
-    public final static long HIERARCHY_BOUNDS_EVENT_MASK = 0x10000;
+    public static final long HIERARCHY_BOUNDS_EVENT_MASK = 0x10000;
 
     /**
      * The event mask for selecting mouse wheel events.
      * @since 1.4
      */
-    public final static long MOUSE_WHEEL_EVENT_MASK = 0x20000;
+    public static final long MOUSE_WHEEL_EVENT_MASK = 0x20000;
 
     /**
      * The event mask for selecting window state events.
      * @since 1.4
      */
-    public final static long WINDOW_STATE_EVENT_MASK = 0x40000;
+    public static final long WINDOW_STATE_EVENT_MASK = 0x40000;
 
     /**
      * The event mask for selecting window focus events.
      * @since 1.4
      */
-    public final static long WINDOW_FOCUS_EVENT_MASK = 0x80000;
+    public static final long WINDOW_FOCUS_EVENT_MASK = 0x80000;
 
     /**
      * WARNING: there are more mask defined privately.  See
@@ -239,7 +239,7 @@ public abstract class AWTEvent extends EventObject {
      * The maximum value for reserved AWT event IDs. Programs defining
      * their own event IDs should use IDs greater than this value.
      */
-    public final static int RESERVED_ID_MAX = 1999;
+    public static final int RESERVED_ID_MAX = 1999;
 
     // security stuff
     private static Field inputEvent_CanAccessSystemClipboard_Field = null;

jdk/src/java.desktop/share/classes/java/awt/BasicStroke.java

@@ -117,39 +117,39 @@ public class BasicStroke implements Stroke {
      * Joins path segments by extending their outside edges until
      * they meet.
      */
-    @Native public final static int JOIN_MITER = 0;
+    @Native public static final int JOIN_MITER = 0;
 
     /**
      * Joins path segments by rounding off the corner at a radius
      * of half the line width.
      */
-    @Native public final static int JOIN_ROUND = 1;
+    @Native public static final int JOIN_ROUND = 1;
 
     /**
      * Joins path segments by connecting the outer corners of their
      * wide outlines with a straight segment.
      */
-    @Native public final static int JOIN_BEVEL = 2;
+    @Native public static final int JOIN_BEVEL = 2;
 
     /**
      * Ends unclosed subpaths and dash segments with no added
      * decoration.
      */
-    @Native public final static int CAP_BUTT = 0;
+    @Native public static final int CAP_BUTT = 0;
 
     /**
      * Ends unclosed subpaths and dash segments with a round
      * decoration that has a radius equal to half of the width
      * of the pen.
      */
-    @Native public final static int CAP_ROUND = 1;
+    @Native public static final int CAP_ROUND = 1;
 
     /**
      * Ends unclosed subpaths and dash segments with a square
      * projection that extends beyond the end of the segment
      * to a distance equal to half of the line width.
      */
-    @Native public final static int CAP_SQUARE = 2;
+    @Native public static final int CAP_SQUARE = 2;
 
     float width;
 

jdk/src/java.desktop/share/classes/java/awt/Color.java

@@ -62,145 +62,145 @@ public class Color implements Paint, java.io.Serializable {
     /**
      * The color white.  In the default sRGB space.
      */
-    public final static Color white     = new Color(255, 255, 255);
+    public static final Color white     = new Color(255, 255, 255);
 
     /**
      * The color white.  In the default sRGB space.
      * @since 1.4
      */
-    public final static Color WHITE = white;
+    public static final Color WHITE = white;
 
     /**
      * The color light gray.  In the default sRGB space.
      */
-    public final static Color lightGray = new Color(192, 192, 192);
+    public static final Color lightGray = new Color(192, 192, 192);
 
     /**
      * The color light gray.  In the default sRGB space.
      * @since 1.4
      */
-    public final static Color LIGHT_GRAY = lightGray;
+    public static final Color LIGHT_GRAY = lightGray;
 
     /**
      * The color gray.  In the default sRGB space.
      */
-    public final static Color gray      = new Color(128, 128, 128);
+    public static final Color gray      = new Color(128, 128, 128);
 
     /**
      * The color gray.  In the default sRGB space.
      * @since 1.4
      */
-    public final static Color GRAY = gray;
+    public static final Color GRAY = gray;
 
     /**
      * The color dark gray.  In the default sRGB space.
      */
-    public final static Color darkGray  = new Color(64, 64, 64);
+    public static final Color darkGray  = new Color(64, 64, 64);
 
     /**
      * The color dark gray.  In the default sRGB space.
      * @since 1.4
      */
-    public final static Color DARK_GRAY = darkGray;
+    public static final Color DARK_GRAY = darkGray;
 
     /**
      * The color black.  In the default sRGB space.
      */
-    public final static Color black     = new Color(0, 0, 0);
+    public static final Color black     = new Color(0, 0, 0);
 
     /**
      * The color black.  In the default sRGB space.
      * @since 1.4
      */
-    public final static Color BLACK = black;
+    public static final Color BLACK = black;
 
     /**
      * The color red.  In the default sRGB space.
      */
-    public final static Color red       = new Color(255, 0, 0);
+    public static final Color red       = new Color(255, 0, 0);
 
     /**
      * The color red.  In the default sRGB space.
      * @since 1.4
      */
-    public final static Color RED = red;
+    public static final Color RED = red;
 
     /**
      * The color pink.  In the default sRGB space.
      */
-    public final static Color pink      = new Color(255, 175, 175);
+    public static final Color pink      = new Color(255, 175, 175);
 
     /**
      * The color pink.  In the default sRGB space.
      * @since 1.4
      */
-    public final static Color PINK = pink;
+    public static final Color PINK = pink;
 
     /**
      * The color orange.  In the default sRGB space.
      */
-    public final static Color orange    = new Color(255, 200, 0);
+    public static final Color orange    = new Color(255, 200, 0);
 
     /**
      * The color orange.  In the default sRGB space.
      * @since 1.4
      */
-    public final static Color ORANGE = orange;
+    public static final Color ORANGE = orange;
 
     /**
      * The color yellow.  In the default sRGB space.
      */
-    public final static Color yellow    = new Color(255, 255, 0);
+    public static final Color yellow    = new Color(255, 255, 0);
 
     /**
      * The color yellow.  In the default sRGB space.
      * @since 1.4
      */
-    public final static Color YELLOW = yellow;
+    public static final Color YELLOW = yellow;
 
     /**
      * The color green.  In the default sRGB space.
      */
-    public final static Color green     = new Color(0, 255, 0);
+    public static final Color green     = new Color(0, 255, 0);
 
     /**
      * The color green.  In the default sRGB space.
      * @since 1.4
      */
-    public final static Color GREEN = green;
+    public static final Color GREEN = green;
 
     /**
      * The color magenta.  In the default sRGB space.
      */
-    public final static Color magenta   = new Color(255, 0, 255);
+    public static final Color magenta   = new Color(255, 0, 255);
 
     /**
      * The color magenta.  In the default sRGB space.
      * @since 1.4
      */
-    public final static Color MAGENTA = magenta;
+    public static final Color MAGENTA = magenta;
 
     /**
      * The color cyan.  In the default sRGB space.
      */
-    public final static Color cyan      = new Color(0, 255, 255);
+    public static final Color cyan      = new Color(0, 255, 255);
 
     /**
      * The color cyan.  In the default sRGB space.
      * @since 1.4
      */
-    public final static Color CYAN = cyan;
+    public static final Color CYAN = cyan;
 
     /**
      * The color blue.  In the default sRGB space.
      */
-    public final static Color blue      = new Color(0, 0, 255);
+    public static final Color blue      = new Color(0, 0, 255);
 
     /**
      * The color blue.  In the default sRGB space.
      * @since 1.4
      */
-    public final static Color BLUE = blue;
+    public static final Color BLUE = blue;
 
     /**
      * The color value.

jdk/src/java.desktop/share/classes/java/awt/Component.java

@@ -545,24 +545,24 @@ public abstract class Component implements ImageObserver, MenuContainer,
     transient InputMethodListener inputMethodListener;
 
     /** Internal, constants for serialization */
-    final static String actionListenerK = "actionL";
+    static final String actionListenerK = "actionL";
-    final static String adjustmentListenerK = "adjustmentL";
+    static final String adjustmentListenerK = "adjustmentL";
-    final static String componentListenerK = "componentL";
+    static final String componentListenerK = "componentL";
-    final static String containerListenerK = "containerL";
+    static final String containerListenerK = "containerL";
-    final static String focusListenerK = "focusL";
+    static final String focusListenerK = "focusL";
-    final static String itemListenerK = "itemL";
+    static final String itemListenerK = "itemL";
-    final static String keyListenerK = "keyL";
+    static final String keyListenerK = "keyL";
-    final static String mouseListenerK = "mouseL";
+    static final String mouseListenerK = "mouseL";
-    final static String mouseMotionListenerK = "mouseMotionL";
+    static final String mouseMotionListenerK = "mouseMotionL";
-    final static String mouseWheelListenerK = "mouseWheelL";
+    static final String mouseWheelListenerK = "mouseWheelL";
-    final static String textListenerK = "textL";
+    static final String textListenerK = "textL";
-    final static String ownedWindowK = "ownedL";
+    static final String ownedWindowK = "ownedL";
-    final static String windowListenerK = "windowL";
+    static final String windowListenerK = "windowL";
-    final static String inputMethodListenerK = "inputMethodL";
+    static final String inputMethodListenerK = "inputMethodL";
-    final static String hierarchyListenerK = "hierarchyL";
+    static final String hierarchyListenerK = "hierarchyL";
-    final static String hierarchyBoundsListenerK = "hierarchyBoundsL";
+    static final String hierarchyBoundsListenerK = "hierarchyBoundsL";
-    final static String windowStateListenerK = "windowStateL";
+    static final String windowStateListenerK = "windowStateL";
-    final static String windowFocusListenerK = "windowFocusL";
+    static final String windowFocusListenerK = "windowFocusL";
 
     /**
      * The <code>eventMask</code> is ONLY set by subclasses via
@@ -6209,7 +6209,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
      * @see #isCoalescingEnabled
      * @see #checkCoalescing
      */
-    transient private boolean coalescingEnabled = checkCoalescing();
+    private transient boolean coalescingEnabled = checkCoalescing();
 
     /**
      * Weak map of known coalesceEvent overriders.
@@ -7916,7 +7916,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
         }
     };
 
-    synchronized static void setRequestFocusController(RequestFocusController requestController)
+    static synchronized void setRequestFocusController(RequestFocusController requestController)
     {
         if (requestController == null) {
             requestFocusController = new DummyRequestFocusController();
@@ -9173,7 +9173,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
          * to add/remove ComponentListener and FocusListener to track
          * target Component's state.
          */
-        private volatile transient int propertyListenersCount = 0;
+        private transient volatile int propertyListenersCount = 0;
 
         /**
          * A component listener to track show/hide/resize events

jdk/src/java.desktop/share/classes/java/awt/Container.java

@@ -2975,7 +2975,7 @@ public class Container extends Component {
         }
     }
 
-    final static class WakingRunnable implements Runnable {
+    static final class WakingRunnable implements Runnable {
         public void run() {
         }
     }
@@ -3843,7 +3843,7 @@ public class Container extends Component {
          * Number of PropertyChangeListener objects registered. It's used
          * to add/remove ContainerListener to track target Container's state.
          */
-        private volatile transient int propertyListenersCount = 0;
+        private transient volatile int propertyListenersCount = 0;
 
         /**
          * The handler to fire {@code PropertyChange}

jdk/src/java.desktop/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java

@@ -62,8 +62,8 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
 {
     private static final PlatformLogger log = PlatformLogger.getLogger("java.awt.ContainerOrderFocusTraversalPolicy");
 
-    final private int FORWARD_TRAVERSAL = 0;
+    private final int FORWARD_TRAVERSAL = 0;
-    final private int BACKWARD_TRAVERSAL = 1;
+    private final int BACKWARD_TRAVERSAL = 1;
 
     /*
      * JDK 1.4 serialVersionUID
@@ -84,8 +84,8 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
      * that they need to invoke getFirstComponent or getLastComponent, the
      * list should be reused if possible.
      */
-    transient private Container cachedRoot;
+    private transient Container cachedRoot;
-    transient private List<Component> cachedCycle;
+    private transient List<Component> cachedCycle;
 
     /*
      * We suppose to use getFocusTraversalCycle & getComponentIndex methods in order

jdk/src/java.desktop/share/classes/java/awt/Cursor.java

@@ -124,7 +124,7 @@ public class Cursor implements java.io.Serializable {
     /**
      * This field is a private replacement for 'predefined' array.
      */
-    private final static Cursor[] predefinedPrivate = new Cursor[14];
+    private static final Cursor[] predefinedPrivate = new Cursor[14];
 
     /* Localization names and default values */
     static final String[][] cursorProperties = {
@@ -449,5 +449,5 @@ public class Cursor implements java.io.Serializable {
         }
     }
 
-    private native static void finalizeImpl(long pData);
+    private static native void finalizeImpl(long pData);
 }

jdk/src/java.desktop/share/classes/java/awt/Dialog.java

@@ -193,7 +193,7 @@ public class Dialog extends Window {
      *
      * @since 1.6
      */
-    public final static ModalityType DEFAULT_MODALITY_TYPE = ModalityType.APPLICATION_MODAL;
+    public static final ModalityType DEFAULT_MODALITY_TYPE = ModalityType.APPLICATION_MODAL;
 
     /**
      * True if this dialog is modal, false is the dialog is modeless.
@@ -265,7 +265,7 @@ public class Dialog extends Window {
     };
 
     /* operations with this list should be synchronized on tree lock*/
-    transient static IdentityArrayList<Dialog> modalDialogs = new IdentityArrayList<Dialog>();
+    static transient IdentityArrayList<Dialog> modalDialogs = new IdentityArrayList<Dialog>();
 
     transient IdentityArrayList<Window> blockedWindows = new IdentityArrayList<Window>();
 

jdk/src/java.desktop/share/classes/java/awt/DisplayMode.java

@@ -92,7 +92,7 @@ public final class DisplayMode {
      * display mode.
      * @see #getBitDepth
      */
-    @Native public final static int BIT_DEPTH_MULTI = -1;
+    @Native public static final int BIT_DEPTH_MULTI = -1;
 
     /**
      * Returns the bit depth of the display, in bits per pixel.  This may be
@@ -110,7 +110,7 @@ public final class DisplayMode {
      * Value of the refresh rate if not known.
      * @see #getRefreshRate
      */
-    @Native public final static int REFRESH_RATE_UNKNOWN = 0;
+    @Native public static final int REFRESH_RATE_UNKNOWN = 0;
 
     /**
      * Returns the refresh rate of the display, in hertz.  This may be

jdk/src/java.desktop/share/classes/java/awt/EventQueue.java

@@ -139,7 +139,7 @@ public class EventQueue {
      * Dummy runnable to wake up EDT from getNextEvent() after
      push/pop is performed
      */
-    private final static Runnable dummyRunnable = new Runnable() {
+    private static final Runnable dummyRunnable = new Runnable() {
         public void run() {
         }
     };

jdk/src/java.desktop/share/classes/java/awt/GraphicsDevice.java

@@ -99,18 +99,18 @@ public abstract class GraphicsDevice {
     /**
      * Device is a raster screen.
      */
-    public final static int TYPE_RASTER_SCREEN          = 0;
+    public static final int TYPE_RASTER_SCREEN          = 0;
 
     /**
      * Device is a printer.
      */
-    public final static int TYPE_PRINTER                = 1;
+    public static final int TYPE_PRINTER                = 1;
 
     /**
      * Device is an image buffer.  This buffer can reside in device
      * or system memory but it is not physically viewable by the user.
      */
-    public final static int TYPE_IMAGE_BUFFER           = 2;
+    public static final int TYPE_IMAGE_BUFFER           = 2;
 
     /**
      * Kinds of translucency supported by the underlying system.

jdk/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java

@@ -216,7 +216,7 @@ public abstract class KeyboardFocusManager
         return getCurrentKeyboardFocusManager(AppContext.getAppContext());
     }
 
-    synchronized static KeyboardFocusManager
+    static synchronized KeyboardFocusManager
         getCurrentKeyboardFocusManager(AppContext appcontext)
     {
         KeyboardFocusManager manager = (KeyboardFocusManager)
@@ -2599,7 +2599,7 @@ public abstract class KeyboardFocusManager
      * @param comp the component to dispatch the event to
      * @param event the event to dispatch to the component
      */
-    static private Throwable dispatchAndCatchException(Throwable ex, Component comp, FocusEvent event) {
+    private static Throwable dispatchAndCatchException(Throwable ex, Component comp, FocusEvent event) {
         Throwable retEx = null;
         try {
             comp.dispatchEvent(event);
@@ -2617,7 +2617,7 @@ public abstract class KeyboardFocusManager
         return ex;
     }
 
-    static private void handleException(Throwable ex) {
+    private static void handleException(Throwable ex) {
         ex.printStackTrace();
     }
 

jdk/src/java.desktop/share/classes/java/awt/List.java

@@ -209,7 +209,7 @@ public class List extends Component implements ItemSelectable, Accessible {
      * The default number of visible rows is 4.  A list with
      * zero rows is unusable and unsightly.
      */
-    final static int    DEFAULT_VISIBLE_ROWS = 4;
+    static final int    DEFAULT_VISIBLE_ROWS = 4;
 
     /**
      * Creates a new scrolling list initialized to display the specified

jdk/src/java.desktop/share/classes/java/awt/MenuComponent.java

@@ -123,8 +123,8 @@ public abstract class MenuComponent implements java.io.Serializable {
     /*
      * Internal constants for serialization.
      */
-    final static String actionListenerK = Component.actionListenerK;
+    static final String actionListenerK = Component.actionListenerK;
-    final static String itemListenerK = Component.itemListenerK;
+    static final String itemListenerK = Component.itemListenerK;
 
     /*
      * JDK 1.1 serialVersionUID

jdk/src/java.desktop/share/classes/java/awt/RenderingHints.java

@@ -110,7 +110,7 @@ public class RenderingHints
                 Integer.toHexString(privatekey);
         }
 
-        private synchronized static void recordIdentity(Key k) {
+        private static synchronized void recordIdentity(Key k) {
             Object identity = k.getIdentity();
             Object otherref = identitymap.get(identity);
             if (otherref != null) {

jdk/src/java.desktop/share/classes/java/awt/SequencedEvent.java

@@ -135,7 +135,7 @@ class SequencedEvent extends AWTEvent implements ActiveEvent {
     /**
      * true only if event exists and nested source appContext is disposed.
      */
-    private final static boolean isOwnerAppContextDisposed(SequencedEvent se) {
+    private static final boolean isOwnerAppContextDisposed(SequencedEvent se) {
         if (se != null) {
             Object target = se.nested.getSource();
             if (target instanceof Component) {
@@ -159,14 +159,14 @@ class SequencedEvent extends AWTEvent implements ActiveEvent {
         return this == getFirstWithContext() || disposed;
     }
 
-    private final synchronized static SequencedEvent getFirst() {
+    private static final synchronized SequencedEvent getFirst() {
         return list.getFirst();
     }
 
     /* Disposes all events from disposed AppContext
      * return first valid event
      */
-    private final static SequencedEvent getFirstWithContext() {
+    private static final SequencedEvent getFirstWithContext() {
         SequencedEvent first = getFirst();
         while(isOwnerAppContextDisposed(first)) {
             first.dispose();

jdk/src/java.desktop/share/classes/java/awt/SplashScreen.java

@@ -411,14 +411,14 @@ public final class SplashScreen {
 
     private static final PlatformLogger log = PlatformLogger.getLogger("java.awt.SplashScreen");
 
-    private native static void _update(long splashPtr, int[] data, int x, int y, int width, int height, int scanlineStride);
+    private static native void _update(long splashPtr, int[] data, int x, int y, int width, int height, int scanlineStride);
-    private native static boolean _isVisible(long splashPtr);
+    private static native boolean _isVisible(long splashPtr);
-    private native static Rectangle _getBounds(long splashPtr);
+    private static native Rectangle _getBounds(long splashPtr);
-    private native static long _getInstance();
+    private static native long _getInstance();
-    private native static void _close(long splashPtr);
+    private static native void _close(long splashPtr);
-    private native static String _getImageFileName(long splashPtr);
+    private static native String _getImageFileName(long splashPtr);
-    private native static String _getImageJarName(long SplashPtr);
+    private static native String _getImageJarName(long SplashPtr);
-    private native static boolean _setImageData(long SplashPtr, byte[] data);
+    private static native boolean _setImageData(long SplashPtr, byte[] data);
-    private native static float _getScaleFactor(long SplashPtr);
+    private static native float _getScaleFactor(long SplashPtr);
 
 }

jdk/src/java.desktop/share/classes/java/awt/SystemColor.java

@@ -58,187 +58,187 @@ public final class SystemColor extends Color implements java.io.Serializable {
      * {@link #desktop} system color.
      * @see SystemColor#desktop
      */
-    @Native public final static int DESKTOP = 0;
+    @Native public static final int DESKTOP = 0;
 
     /**
      * The array index for the
      * {@link #activeCaption} system color.
      * @see SystemColor#activeCaption
      */
-    @Native public final static int ACTIVE_CAPTION = 1;
+    @Native public static final int ACTIVE_CAPTION = 1;
 
     /**
      * The array index for the
      * {@link #activeCaptionText} system color.
      * @see SystemColor#activeCaptionText
      */
-    @Native public final static int ACTIVE_CAPTION_TEXT = 2;
+    @Native public static final int ACTIVE_CAPTION_TEXT = 2;
 
     /**
      * The array index for the
      * {@link #activeCaptionBorder} system color.
      * @see SystemColor#activeCaptionBorder
      */
-    @Native public final static int ACTIVE_CAPTION_BORDER = 3;
+    @Native public static final int ACTIVE_CAPTION_BORDER = 3;
 
     /**
      * The array index for the
      * {@link #inactiveCaption} system color.
      * @see SystemColor#inactiveCaption
      */
-    @Native public final static int INACTIVE_CAPTION = 4;
+    @Native public static final int INACTIVE_CAPTION = 4;
 
     /**
      * The array index for the
      * {@link #inactiveCaptionText} system color.
      * @see SystemColor#inactiveCaptionText
      */
-    @Native public final static int INACTIVE_CAPTION_TEXT = 5;
+    @Native public static final int INACTIVE_CAPTION_TEXT = 5;
 
     /**
      * The array index for the
      * {@link #inactiveCaptionBorder} system color.
      * @see SystemColor#inactiveCaptionBorder
      */
-    @Native public final static int INACTIVE_CAPTION_BORDER = 6;
+    @Native public static final int INACTIVE_CAPTION_BORDER = 6;
 
     /**
      * The array index for the
      * {@link #window} system color.
      * @see SystemColor#window
      */
-    @Native public final static int WINDOW = 7;
+    @Native public static final int WINDOW = 7;
 
     /**
      * The array index for the
      * {@link #windowBorder} system color.
      * @see SystemColor#windowBorder
      */
-    @Native public final static int WINDOW_BORDER = 8;
+    @Native public static final int WINDOW_BORDER = 8;
 
     /**
      * The array index for the
      * {@link #windowText} system color.
      * @see SystemColor#windowText
      */
-    @Native public final static int WINDOW_TEXT = 9;
+    @Native public static final int WINDOW_TEXT = 9;
 
     /**
      * The array index for the
      * {@link #menu} system color.
      * @see SystemColor#menu
      */
-    @Native public final static int MENU = 10;
+    @Native public static final int MENU = 10;
 
     /**
      * The array index for the
      * {@link #menuText} system color.
      * @see SystemColor#menuText
      */
-    @Native public final static int MENU_TEXT = 11;
+    @Native public static final int MENU_TEXT = 11;
 
     /**
      * The array index for the
      * {@link #text} system color.
      * @see SystemColor#text
      */
-    @Native public final static int TEXT = 12;
+    @Native public static final int TEXT = 12;
 
     /**
      * The array index for the
      * {@link #textText} system color.
      * @see SystemColor#textText
      */
-    @Native public final static int TEXT_TEXT = 13;
+    @Native public static final int TEXT_TEXT = 13;
 
     /**
      * The array index for the
      * {@link #textHighlight} system color.
      * @see SystemColor#textHighlight
      */
-    @Native public final static int TEXT_HIGHLIGHT = 14;
+    @Native public static final int TEXT_HIGHLIGHT = 14;
 
     /**
      * The array index for the
      * {@link #textHighlightText} system color.
      * @see SystemColor#textHighlightText
      */
-    @Native public final static int TEXT_HIGHLIGHT_TEXT = 15;
+    @Native public static final int TEXT_HIGHLIGHT_TEXT = 15;
 
     /**
      * The array index for the
      * {@link #textInactiveText} system color.
      * @see SystemColor#textInactiveText
      */
-    @Native public final static int TEXT_INACTIVE_TEXT = 16;
+    @Native public static final int TEXT_INACTIVE_TEXT = 16;
 
     /**
      * The array index for the
      * {@link #control} system color.
      * @see SystemColor#control
      */
-    @Native public final static int CONTROL = 17;
+    @Native public static final int CONTROL = 17;
 
     /**
      * The array index for the
      * {@link #controlText} system color.
      * @see SystemColor#controlText
      */
-    @Native public final static int CONTROL_TEXT = 18;
+    @Native public static final int CONTROL_TEXT = 18;
 
     /**
      * The array index for the
      * {@link #controlHighlight} system color.
      * @see SystemColor#controlHighlight
      */
-    @Native public final static int CONTROL_HIGHLIGHT = 19;
+    @Native public static final int CONTROL_HIGHLIGHT = 19;
 
     /**
      * The array index for the
      * {@link #controlLtHighlight} system color.
      * @see SystemColor#controlLtHighlight
      */
-    @Native public final static int CONTROL_LT_HIGHLIGHT = 20;
+    @Native public static final int CONTROL_LT_HIGHLIGHT = 20;
 
     /**
      * The array index for the
      * {@link #controlShadow} system color.
      * @see SystemColor#controlShadow
      */
-    @Native public final static int CONTROL_SHADOW = 21;
+    @Native public static final int CONTROL_SHADOW = 21;
 
     /**
      * The array index for the
      * {@link #controlDkShadow} system color.
      * @see SystemColor#controlDkShadow
      */
-    @Native public final static int CONTROL_DK_SHADOW = 22;
+    @Native public static final int CONTROL_DK_SHADOW = 22;
 
     /**
      * The array index for the
      * {@link #scrollbar} system color.
      * @see SystemColor#scrollbar
      */
-    @Native public final static int SCROLLBAR = 23;
+    @Native public static final int SCROLLBAR = 23;
 
     /**
      * The array index for the
      * {@link #info} system color.
      * @see SystemColor#info
      */
-    @Native public final static int INFO = 24;
+    @Native public static final int INFO = 24;
 
     /**
      * The array index for the
      * {@link #infoText} system color.
      * @see SystemColor#infoText
      */
-    @Native public final static int INFO_TEXT = 25;
+    @Native public static final int INFO_TEXT = 25;
 
     /**
      * The number of system colors in the array.
      */
-    @Native public final static int NUM_COLORS = 26;
+    @Native public static final int NUM_COLORS = 26;
 
     /******************************************************************************************/
 
@@ -280,146 +280,146 @@ public final class SystemColor extends Color implements java.io.Serializable {
    /**
      * The color rendered for the background of the desktop.
      */
-    public final static SystemColor desktop = new SystemColor((byte)DESKTOP);
+    public static final SystemColor desktop = new SystemColor((byte)DESKTOP);
 
     /**
      * The color rendered for the window-title background of the currently active window.
      */
-    public final static SystemColor activeCaption = new SystemColor((byte)ACTIVE_CAPTION);
+    public static final SystemColor activeCaption = new SystemColor((byte)ACTIVE_CAPTION);
 
     /**
      * The color rendered for the window-title text of the currently active window.
      */
-    public final static SystemColor activeCaptionText = new SystemColor((byte)ACTIVE_CAPTION_TEXT);
+    public static final SystemColor activeCaptionText = new SystemColor((byte)ACTIVE_CAPTION_TEXT);
 
     /**
      * The color rendered for the border around the currently active window.
      */
-    public final static SystemColor activeCaptionBorder = new SystemColor((byte)ACTIVE_CAPTION_BORDER);
+    public static final SystemColor activeCaptionBorder = new SystemColor((byte)ACTIVE_CAPTION_BORDER);
 
     /**
      * The color rendered for the window-title background of inactive windows.
      */
-    public final static SystemColor inactiveCaption = new SystemColor((byte)INACTIVE_CAPTION);
+    public static final SystemColor inactiveCaption = new SystemColor((byte)INACTIVE_CAPTION);
 
     /**
      * The color rendered for the window-title text of inactive windows.
      */
-    public final static SystemColor inactiveCaptionText = new SystemColor((byte)INACTIVE_CAPTION_TEXT);
+    public static final SystemColor inactiveCaptionText = new SystemColor((byte)INACTIVE_CAPTION_TEXT);
 
     /**
      * The color rendered for the border around inactive windows.
      */
-    public final static SystemColor inactiveCaptionBorder = new SystemColor((byte)INACTIVE_CAPTION_BORDER);
+    public static final SystemColor inactiveCaptionBorder = new SystemColor((byte)INACTIVE_CAPTION_BORDER);
 
     /**
      * The color rendered for the background of interior regions inside windows.
      */
-    public final static SystemColor window = new SystemColor((byte)WINDOW);
+    public static final SystemColor window = new SystemColor((byte)WINDOW);
 
     /**
      * The color rendered for the border around interior regions inside windows.
      */
-    public final static SystemColor windowBorder = new SystemColor((byte)WINDOW_BORDER);
+    public static final SystemColor windowBorder = new SystemColor((byte)WINDOW_BORDER);
 
     /**
      * The color rendered for text of interior regions inside windows.
      */
-    public final static SystemColor windowText = new SystemColor((byte)WINDOW_TEXT);
+    public static final SystemColor windowText = new SystemColor((byte)WINDOW_TEXT);
 
     /**
      * The color rendered for the background of menus.
      */
-    public final static SystemColor menu = new SystemColor((byte)MENU);
+    public static final SystemColor menu = new SystemColor((byte)MENU);
 
     /**
      * The color rendered for the text of menus.
      */
-    public final static SystemColor menuText = new SystemColor((byte)MENU_TEXT);
+    public static final SystemColor menuText = new SystemColor((byte)MENU_TEXT);
 
     /**
      * The color rendered for the background of text control objects, such as
      * textfields and comboboxes.
      */
-    public final static SystemColor text = new SystemColor((byte)TEXT);
+    public static final SystemColor text = new SystemColor((byte)TEXT);
 
     /**
      * The color rendered for the text of text control objects, such as textfields
      * and comboboxes.
      */
-    public final static SystemColor textText = new SystemColor((byte)TEXT_TEXT);
+    public static final SystemColor textText = new SystemColor((byte)TEXT_TEXT);
 
     /**
      * The color rendered for the background of selected items, such as in menus,
      * comboboxes, and text.
      */
-    public final static SystemColor textHighlight = new SystemColor((byte)TEXT_HIGHLIGHT);
+    public static final SystemColor textHighlight = new SystemColor((byte)TEXT_HIGHLIGHT);
 
     /**
      * The color rendered for the text of selected items, such as in menus, comboboxes,
      * and text.
      */
-    public final static SystemColor textHighlightText = new SystemColor((byte)TEXT_HIGHLIGHT_TEXT);
+    public static final SystemColor textHighlightText = new SystemColor((byte)TEXT_HIGHLIGHT_TEXT);
 
     /**
      * The color rendered for the text of inactive items, such as in menus.
      */
-    public final static SystemColor textInactiveText = new SystemColor((byte)TEXT_INACTIVE_TEXT);
+    public static final SystemColor textInactiveText = new SystemColor((byte)TEXT_INACTIVE_TEXT);
 
     /**
      * The color rendered for the background of control panels and control objects,
      * such as pushbuttons.
      */
-    public final static SystemColor control = new SystemColor((byte)CONTROL);
+    public static final SystemColor control = new SystemColor((byte)CONTROL);
 
     /**
      * The color rendered for the text of control panels and control objects,
      * such as pushbuttons.
      */
-    public final static SystemColor controlText = new SystemColor((byte)CONTROL_TEXT);
+    public static final SystemColor controlText = new SystemColor((byte)CONTROL_TEXT);
 
     /**
      * The color rendered for light areas of 3D control objects, such as pushbuttons.
      * This color is typically derived from the <code>control</code> background color
      * to provide a 3D effect.
      */
-    public final static SystemColor controlHighlight = new SystemColor((byte)CONTROL_HIGHLIGHT);
+    public static final SystemColor controlHighlight = new SystemColor((byte)CONTROL_HIGHLIGHT);
 
     /**
      * The color rendered for highlight areas of 3D control objects, such as pushbuttons.
      * This color is typically derived from the <code>control</code> background color
      * to provide a 3D effect.
      */
-    public final static SystemColor controlLtHighlight = new SystemColor((byte)CONTROL_LT_HIGHLIGHT);
+    public static final SystemColor controlLtHighlight = new SystemColor((byte)CONTROL_LT_HIGHLIGHT);
 
     /**
      * The color rendered for shadow areas of 3D control objects, such as pushbuttons.
      * This color is typically derived from the <code>control</code> background color
      * to provide a 3D effect.
      */
-    public final static SystemColor controlShadow = new SystemColor((byte)CONTROL_SHADOW);
+    public static final SystemColor controlShadow = new SystemColor((byte)CONTROL_SHADOW);
 
     /**
      * The color rendered for dark shadow areas on 3D control objects, such as pushbuttons.
      * This color is typically derived from the <code>control</code> background color
      * to provide a 3D effect.
      */
-    public final static SystemColor controlDkShadow = new SystemColor((byte)CONTROL_DK_SHADOW);
+    public static final SystemColor controlDkShadow = new SystemColor((byte)CONTROL_DK_SHADOW);
 
     /**
      * The color rendered for the background of scrollbars.
      */
-    public final static SystemColor scrollbar = new SystemColor((byte)SCROLLBAR);
+    public static final SystemColor scrollbar = new SystemColor((byte)SCROLLBAR);
 
     /**
      * The color rendered for the background of tooltips or spot help.
      */
-    public final static SystemColor info = new SystemColor((byte)INFO);
+    public static final SystemColor info = new SystemColor((byte)INFO);
 
     /**
      * The color rendered for the text of tooltips or spot help.
      */
-    public final static SystemColor infoText = new SystemColor((byte)INFO_TEXT);
+    public static final SystemColor infoText = new SystemColor((byte)INFO_TEXT);
 
     /*
      * JDK 1.1 serialVersionUID.

jdk/src/java.desktop/share/classes/java/awt/SystemTray.java

@@ -124,7 +124,7 @@ public class SystemTray {
     private static SystemTray systemTray;
     private int currentIconID = 0; // each TrayIcon added gets a unique ID
 
-    transient private SystemTrayPeer peer;
+    private transient SystemTrayPeer peer;
 
     private static final TrayIcon[] EMPTY_TRAY_ARRAY = new TrayIcon[0];
 

jdk/src/java.desktop/share/classes/java/awt/TextComponent.java

@@ -110,7 +110,7 @@ public class TextComponent extends Component implements Accessible {
     /**
      * A list of listeners that will receive events from this object.
      */
-    transient protected TextListener textListener;
+    protected transient TextListener textListener;
 
     /*
      * JDK 1.1 serialVersionUID

jdk/src/java.desktop/share/classes/java/awt/TexturePaintContext.java

@@ -237,7 +237,7 @@ abstract class TexturePaintContext implements PaintContext {
     private static WeakReference<Raster> xrgbRasRef;
     private static WeakReference<Raster> argbRasRef;
 
-    synchronized static WritableRaster makeRaster(ColorModel cm,
+    static synchronized WritableRaster makeRaster(ColorModel cm,
                                                   Raster srcRas,
                                                   int w, int h)
     {
@@ -273,7 +273,7 @@ abstract class TexturePaintContext implements PaintContext {
         }
     }
 
-    synchronized static void dropRaster(ColorModel cm, Raster outRas) {
+    static synchronized void dropRaster(ColorModel cm, Raster outRas) {
         if (outRas == null) {
             return;
         }
@@ -286,7 +286,7 @@ abstract class TexturePaintContext implements PaintContext {
 
     private static WeakReference<Raster> byteRasRef;
 
-    synchronized static WritableRaster makeByteRaster(Raster srcRas,
+    static synchronized WritableRaster makeByteRaster(Raster srcRas,
                                                       int w, int h)
     {
         if (byteRasRef != null) {
@@ -303,7 +303,7 @@ abstract class TexturePaintContext implements PaintContext {
         return srcRas.createCompatibleWritableRaster(w, h);
     }
 
-    synchronized static void dropByteRaster(Raster outRas) {
+    static synchronized void dropByteRaster(Raster outRas) {
         if (outRas == null) {
             return;
         }

jdk/src/java.desktop/share/classes/java/awt/Toolkit.java

@@ -1722,7 +1722,7 @@ public abstract class Toolkit {
      * Extracts a "pure" AWTEventListener from a AWTEventListenerProxy,
      * if the listener is proxied.
      */
-    static private AWTEventListener deProxyAWTEventListener(AWTEventListener l)
+    private static AWTEventListener deProxyAWTEventListener(AWTEventListener l)
     {
         AWTEventListener localL = l;
 
@@ -2007,7 +2007,7 @@ public abstract class Toolkit {
         }
     }
 
-    static private class ToolkitEventMulticaster extends AWTEventMulticaster
+    private static class ToolkitEventMulticaster extends AWTEventMulticaster
         implements AWTEventListener {
         // Implementation cloned from AWTEventMulticaster.
 

jdk/src/java.desktop/share/classes/java/awt/Transparency.java

@@ -37,20 +37,20 @@ public interface Transparency {
      * Represents image data that is guaranteed to be completely opaque,
      * meaning that all pixels have an alpha value of 1.0.
      */
-    @Native public final static int OPAQUE            = 1;
+    @Native public static final int OPAQUE            = 1;
 
     /**
      * Represents image data that is guaranteed to be either completely
      * opaque, with an alpha value of 1.0, or completely transparent,
      * with an alpha value of 0.0.
      */
-    @Native public final static int BITMASK = 2;
+    @Native public static final int BITMASK = 2;
 
     /**
      * Represents image data that contains or might contain arbitrary
      * alpha values between and including 0.0 and 1.0.
      */
-    @Native public final static int TRANSLUCENT        = 3;
+    @Native public static final int TRANSLUCENT        = 3;
 
     /**
      * Returns the type of this <code>Transparency</code>.

jdk/src/java.desktop/share/classes/java/awt/TrayIcon.java

@@ -92,7 +92,7 @@ public class TrayIcon {
     private int id;
     private String actionCommand;
 
-    transient private TrayIconPeer peer;
+    private transient TrayIconPeer peer;
 
     transient MouseListener mouseListener;
     transient MouseMotionListener mouseMotionListener;

jdk/src/java.desktop/share/classes/java/awt/WaitDispatchSupport.java

@@ -47,7 +47,7 @@ import sun.util.logging.PlatformLogger;
  */
 class WaitDispatchSupport implements SecondaryLoop {
 
-    private final static PlatformLogger log =
+    private static final PlatformLogger log =
         PlatformLogger.getLogger("java.awt.event.WaitDispatchSupport");
 
     private EventDispatchThread dispatchThread;
@@ -303,7 +303,7 @@ class WaitDispatchSupport implements SecondaryLoop {
         return false;
     }
 
-    private final static Object getTreeLock() {
+    private static final Object getTreeLock() {
         return Component.LOCK;
     }
 

jdk/src/java.desktop/share/classes/java/awt/Window.java

@@ -959,7 +959,7 @@ public class Window extends Container implements Accessible {
         }
     }
 
-    static private final AtomicBoolean
+    private static final AtomicBoolean
         beforeFirstWindowShown = new AtomicBoolean(true);
 
     final void closeSplashScreen() {

jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetDropEvent.java

@@ -267,7 +267,7 @@ public class DropTargetDropEvent extends DropTargetEvent {
      * fields
      */
 
-    static final private Point  zero     = new Point(0,0);
+    private static final Point  zero     = new Point(0,0);
 
     /**
      * The location of the drag cursor's hotspot in Component coordinates.

jdk/src/java.desktop/share/classes/java/awt/dnd/InvalidDnDOperationException.java

@@ -38,7 +38,7 @@ public class InvalidDnDOperationException extends IllegalStateException {
 
     private static final long serialVersionUID = -6062568741193956678L;
 
-    static private String dft_msg = "The operation requested cannot be performed by the DnD system since it is not in the appropriate state";
+    private static String dft_msg = "The operation requested cannot be performed by the DnD system since it is not in the appropriate state";
 
     /**
      * Create a default Exception

jdk/src/java.desktop/share/classes/java/awt/event/MouseEvent.java

@@ -623,7 +623,7 @@ public class MouseEvent extends InputEvent {
 
     /* if the button is an extra button and it is released or clicked then in Xsystem its state
        is not modified. Exclude this button number from ExtModifiers mask.*/
-    transient private boolean shouldExcludeButtonFromExtModifiers = false;
+    private transient boolean shouldExcludeButtonFromExtModifiers = false;
 
     /**
      * {@inheritDoc}

jdk/src/java.desktop/share/classes/java/awt/font/OpenType.java

@@ -43,307 +43,307 @@ public interface OpenType {
    * Character to glyph mapping.  Table tag "cmap" in the Open
    * Type Specification.
    */
-  public final static int       TAG_CMAP        = 0x636d6170;
+  public static final int       TAG_CMAP        = 0x636d6170;
 
   /**
    * Font header.  Table tag "head" in the Open
    * Type Specification.
    */
-  public final static int       TAG_HEAD        = 0x68656164;
+  public static final int       TAG_HEAD        = 0x68656164;
 
   /**
    * Naming table.  Table tag "name" in the Open
    * Type Specification.
    */
-  public final static int       TAG_NAME        = 0x6e616d65;
+  public static final int       TAG_NAME        = 0x6e616d65;
 
   /**
    * Glyph data.  Table tag "glyf" in the Open
    * Type Specification.
    */
-  public final static int       TAG_GLYF        = 0x676c7966;
+  public static final int       TAG_GLYF        = 0x676c7966;
 
   /**
    * Maximum profile.  Table tag "maxp" in the Open
    * Type Specification.
    */
-  public final static int       TAG_MAXP        = 0x6d617870;
+  public static final int       TAG_MAXP        = 0x6d617870;
 
   /**
    * CVT preprogram.  Table tag "prep" in the Open
    * Type Specification.
    */
-  public final static int       TAG_PREP        = 0x70726570;
+  public static final int       TAG_PREP        = 0x70726570;
 
   /**
    * Horizontal metrics.  Table tag "hmtx" in the Open
    * Type Specification.
    */
-  public final static int       TAG_HMTX        = 0x686d7478;
+  public static final int       TAG_HMTX        = 0x686d7478;
 
   /**
    * Kerning.  Table tag "kern" in the Open
    * Type Specification.
    */
-  public final static int       TAG_KERN        = 0x6b65726e;
+  public static final int       TAG_KERN        = 0x6b65726e;
 
   /**
    * Horizontal device metrics.  Table tag "hdmx" in the Open
    * Type Specification.
    */
-  public final static int       TAG_HDMX        = 0x68646d78;
+  public static final int       TAG_HDMX        = 0x68646d78;
 
   /**
    * Index to location.  Table tag "loca" in the Open
    * Type Specification.
    */
-  public final static int       TAG_LOCA        = 0x6c6f6361;
+  public static final int       TAG_LOCA        = 0x6c6f6361;
 
   /**
    * PostScript Information.  Table tag "post" in the Open
    * Type Specification.
    */
-  public final static int       TAG_POST        = 0x706f7374;
+  public static final int       TAG_POST        = 0x706f7374;
 
   /**
    * OS/2 and Windows specific metrics.  Table tag "OS/2"
    * in the Open Type Specification.
    */
-  public final static int       TAG_OS2 = 0x4f532f32;
+  public static final int       TAG_OS2 = 0x4f532f32;
 
   /**
    * Control value table.  Table tag "cvt "
    * in the Open Type Specification.
    */
-  public final static int       TAG_CVT = 0x63767420;
+  public static final int       TAG_CVT = 0x63767420;
 
   /**
    * Grid-fitting and scan conversion procedure.  Table tag
    * "gasp" in the Open Type Specification.
    */
-  public final static int       TAG_GASP        = 0x67617370;
+  public static final int       TAG_GASP        = 0x67617370;
 
   /**
    * Vertical device metrics.  Table tag "VDMX" in the Open
    * Type Specification.
    */
-  public final static int       TAG_VDMX        = 0x56444d58;
+  public static final int       TAG_VDMX        = 0x56444d58;
 
   /**
    * Vertical metrics.  Table tag "vmtx" in the Open
    * Type Specification.
    */
-  public final static int       TAG_VMTX        = 0x766d7478;
+  public static final int       TAG_VMTX        = 0x766d7478;
 
   /**
    * Vertical metrics header.  Table tag "vhea" in the Open
    * Type Specification.
    */
-  public final static int       TAG_VHEA        = 0x76686561;
+  public static final int       TAG_VHEA        = 0x76686561;
 
   /**
    * Horizontal metrics header.  Table tag "hhea" in the Open
    * Type Specification.
    */
-  public final static int       TAG_HHEA        = 0x68686561;
+  public static final int       TAG_HHEA        = 0x68686561;
 
   /**
    * Adobe Type 1 font data.  Table tag "typ1" in the Open
    * Type Specification.
    */
-  public final static int       TAG_TYP1        = 0x74797031;
+  public static final int       TAG_TYP1        = 0x74797031;
 
   /**
    * Baseline table.  Table tag "bsln" in the Open
    * Type Specification.
    */
-  public final static int       TAG_BSLN        = 0x62736c6e;
+  public static final int       TAG_BSLN        = 0x62736c6e;
 
   /**
    * Glyph substitution.  Table tag "GSUB" in the Open
    * Type Specification.
    */
-  public final static int       TAG_GSUB        = 0x47535542;
+  public static final int       TAG_GSUB        = 0x47535542;
 
   /**
    * Digital signature.  Table tag "DSIG" in the Open
    * Type Specification.
    */
-  public final static int       TAG_DSIG        = 0x44534947;
+  public static final int       TAG_DSIG        = 0x44534947;
 
   /**
    * Font program.   Table tag "fpgm" in the Open
    * Type Specification.
    */
-  public final static int       TAG_FPGM        = 0x6670676d;
+  public static final int       TAG_FPGM        = 0x6670676d;
 
   /**
    * Font variation.   Table tag "fvar" in the Open
    * Type Specification.
    */
-  public final static int       TAG_FVAR        = 0x66766172;
+  public static final int       TAG_FVAR        = 0x66766172;
 
   /**
    * Glyph variation.  Table tag "gvar" in the Open
    * Type Specification.
    */
-  public final static int       TAG_GVAR        = 0x67766172;
+  public static final int       TAG_GVAR        = 0x67766172;
 
   /**
    * Compact font format (Type1 font).  Table tag
    * "CFF " in the Open Type Specification.
    */
-  public final static int       TAG_CFF = 0x43464620;
+  public static final int       TAG_CFF = 0x43464620;
 
   /**
    * Multiple master supplementary data.  Table tag
    * "MMSD" in the Open Type Specification.
    */
-  public final static int       TAG_MMSD        = 0x4d4d5344;
+  public static final int       TAG_MMSD        = 0x4d4d5344;
 
   /**
    * Multiple master font metrics.  Table tag
    * "MMFX" in the Open Type Specification.
    */
-  public final static int       TAG_MMFX        = 0x4d4d4658;
+  public static final int       TAG_MMFX        = 0x4d4d4658;
 
   /**
    * Baseline data.  Table tag "BASE" in the Open
    * Type Specification.
    */
-  public final static int       TAG_BASE        = 0x42415345;
+  public static final int       TAG_BASE        = 0x42415345;
 
   /**
    * Glyph definition.  Table tag "GDEF" in the Open
    * Type Specification.
    */
-  public final static int       TAG_GDEF        = 0x47444546;
+  public static final int       TAG_GDEF        = 0x47444546;
 
   /**
    * Glyph positioning.  Table tag "GPOS" in the Open
    * Type Specification.
    */
-  public final static int       TAG_GPOS        = 0x47504f53;
+  public static final int       TAG_GPOS        = 0x47504f53;
 
   /**
    * Justification.  Table tag "JSTF" in the Open
    * Type Specification.
    */
-  public final static int       TAG_JSTF        = 0x4a535446;
+  public static final int       TAG_JSTF        = 0x4a535446;
 
   /**
    * Embedded bitmap data.  Table tag "EBDT" in the Open
    * Type Specification.
    */
-  public final static int       TAG_EBDT        = 0x45424454;
+  public static final int       TAG_EBDT        = 0x45424454;
 
   /**
    * Embedded bitmap location.  Table tag "EBLC" in the Open
    * Type Specification.
    */
-  public final static int       TAG_EBLC        = 0x45424c43;
+  public static final int       TAG_EBLC        = 0x45424c43;
 
   /**
    * Embedded bitmap scaling.  Table tag "EBSC" in the Open
    * Type Specification.
    */
-  public final static int       TAG_EBSC        = 0x45425343;
+  public static final int       TAG_EBSC        = 0x45425343;
 
   /**
    * Linear threshold.  Table tag "LTSH" in the Open
    * Type Specification.
    */
-  public final static int       TAG_LTSH        = 0x4c545348;
+  public static final int       TAG_LTSH        = 0x4c545348;
 
   /**
    * PCL 5 data.  Table tag "PCLT" in the Open
    * Type Specification.
    */
-  public final static int       TAG_PCLT        = 0x50434c54;
+  public static final int       TAG_PCLT        = 0x50434c54;
 
   /**
    * Accent attachment.  Table tag "acnt" in the Open
    * Type Specification.
    */
-  public final static int       TAG_ACNT        = 0x61636e74;
+  public static final int       TAG_ACNT        = 0x61636e74;
 
   /**
    * Axis variation.  Table tag "avar" in the Open
    * Type Specification.
    */
-  public final static int       TAG_AVAR        = 0x61766172;
+  public static final int       TAG_AVAR        = 0x61766172;
 
   /**
    * Bitmap data.  Table tag "bdat" in the Open
    * Type Specification.
    */
-  public final static int       TAG_BDAT        = 0x62646174;
+  public static final int       TAG_BDAT        = 0x62646174;
 
   /**
    * Bitmap location.  Table tag "bloc" in the Open
    * Type Specification.
    */
-  public final static int       TAG_BLOC        = 0x626c6f63;
+  public static final int       TAG_BLOC        = 0x626c6f63;
 
    /**
     * CVT variation.  Table tag "cvar" in the Open
     * Type Specification.
     */
-  public final static int       TAG_CVAR        = 0x63766172;
+  public static final int       TAG_CVAR        = 0x63766172;
 
   /**
    * Feature name.  Table tag "feat" in the Open
     * Type Specification.
    */
-  public final static int       TAG_FEAT        = 0x66656174;
+  public static final int       TAG_FEAT        = 0x66656174;
 
   /**
    * Font descriptors.  Table tag "fdsc" in the Open
    * Type Specification.
    */
-  public final static int       TAG_FDSC        = 0x66647363;
+  public static final int       TAG_FDSC        = 0x66647363;
 
   /**
    * Font metrics.  Table tag "fmtx" in the Open
    * Type Specification.
    */
-  public final static int       TAG_FMTX        = 0x666d7478;
+  public static final int       TAG_FMTX        = 0x666d7478;
 
   /**
    * Justification.  Table tag "just" in the Open
    * Type Specification.
    */
-  public final static int       TAG_JUST        = 0x6a757374;
+  public static final int       TAG_JUST        = 0x6a757374;
 
   /**
    * Ligature caret.   Table tag "lcar" in the Open
    * Type Specification.
    */
-  public final static int       TAG_LCAR        = 0x6c636172;
+  public static final int       TAG_LCAR        = 0x6c636172;
 
   /**
    * Glyph metamorphosis.  Table tag "mort" in the Open
    * Type Specification.
    */
-  public final static int       TAG_MORT        = 0x6d6f7274;
+  public static final int       TAG_MORT        = 0x6d6f7274;
 
   /**
    * Optical bounds.  Table tag "opbd" in the Open
    * Type Specification.
    */
-  public final static int       TAG_OPBD        = 0x6F706264;
+  public static final int       TAG_OPBD        = 0x6F706264;
 
   /**
    * Glyph properties.  Table tag "prop" in the Open
    * Type Specification.
    */
-  public final static int       TAG_PROP        = 0x70726f70;
+  public static final int       TAG_PROP        = 0x70726f70;
 
   /**
    * Tracking.  Table tag "trak" in the Open
    * Type Specification.
    */
-  public final static int       TAG_TRAK        = 0x7472616b;
+  public static final int       TAG_TRAK        = 0x7472616b;
 
   /**
    * Returns the version of the <code>OpenType</code> font.