diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppEventHandler.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppEventHandler.java
index b98d57395103c8ba98923197dcfc64de63ac1caa..d40b57a31f6ec4c4e6cb5ea582e9fcd03f2c1303 100644
--- a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppEventHandler.java
+++ b/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;
}
diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java b/jdk/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java
index e098654a03d9b734d1dc8b91ded87c54e995af2e..5dec385d5aad55d7352593968db48c620fa1192c 100644
--- a/jdk/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java
+++ b/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;
/**
diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonBorder.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonBorder.java
index f76a8d3e8ae2ef0189cbc8f9a7fd6244fd4a09a2..aa2947cb87d7f571b93c11d4c4e2579c76b7f736 100644
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonBorder.java
+++ b/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();
}
diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java
index f3520368911702cd765cb06de2e5eb5bb762ef76..0d48390c6f8b056c5a5a447b033056bb700d4ca4 100644
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java
+++ b/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();
}
diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java
index eba20b93e77e2af106c251bbbe9fb9a21e0426b2..c05f191ef38f50334f26cab303c78980561220f7 100644
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java
+++ b/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);
}
diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java
index 0f2f4d97d4d56d0bd5754ef4dd15d4b43fb47a33..4d6d463fa5ca7844f0509ae5ff015f59445a3a8a 100644
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java
+++ b/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();
}
diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxButton.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxButton.java
index 901d7e9e2bde529ef4d9cf45f84c945593d0f512..777c4c826158050b01c8ee7a2b9e564f0c1ae389 100644
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxButton.java
+++ b/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;
- final protected JList<?> list;
- final protected CellRendererPane rendererPane;
- final protected AquaComboBoxUI ui;
+ protected final JComboBox<Object> comboBox;
+ protected final JList<?> list;
+ protected final CellRendererPane rendererPane;
+ protected final AquaComboBoxUI ui;
protected final AquaPainter<JRSUIState> painter = AquaPainter.create(JRSUIState.getInstance());
boolean isPopDown;
diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileSystemModel.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileSystemModel.java
index 266d5065ca3c833a0668577a9f35516ecf669850..887ab5c8bd304021d68780cc31cf66a1906522b3 100644
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileSystemModel.java
+++ b/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 final static String SORT_ASCENDING_CHANGED = "sortAscendingChanged";
+ public static final String SORT_BY_CHANGED = "sortByChanged";
+ public static final String SORT_ASCENDING_CHANGED = "sortAscendingChanged";
public AquaFileSystemModel(final JFileChooser filechooser, final JTable filelist, final String[] colNames) {
fileCacheLock = new Object();
diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaIcon.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaIcon.java
index e8f854918aa9df83ccf3d80564dde539d1fdb15a..b4bc1e69d581b22a725ff4c34ef02935af59c609 100644
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaIcon.java
+++ b/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;
diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameDockIconUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameDockIconUI.java
index 370cb4e996f957848b5eb0fe2f17237a77fdfce4..a24faef499a640e7bfd79184fc3c1901165fefb1 100644
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameDockIconUI.java
+++ b/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;
- final static int ROUND_ADDITIONAL_HEIGHT = 8;
- final static int ROUND_ADDITIONAL_WIDTH = 12;
+ static final int NUB_HEIGHT = 7;
+ static final int ROUND_ADDITIONAL_HEIGHT = 8;
+ static final int ROUND_ADDITIONAL_WIDTH = 12;
DockLabel(final String text) {
super(text);
diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java
index 83a6182ea03f54f8f880dcd0ef82788c55b872bf..d6395accd001d6cc4a0000efff38ed60abedfb6c 100644
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java
+++ b/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) {
diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaRootPaneUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaRootPaneUI.java
index 93888e75e6fc5bad4c28a8b3799e9684781aab9c..3ab83b037c811a9a278596dc3e80f46fd2dc8fcd 100644
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaRootPaneUI.java
+++ b/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();
diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java
index 9b27b35cf50c4473e6d55919b516044fbed45a1e..94d6929440764aa34362ec85683203f99d5ba315 100644
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java
+++ b/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";
- final static String PREVIOUS = "navigatePrevious";
- final static String RIGHT = "navigateRight";
- final static String LEFT = "navigateLeft";
- final static String UP = "navigateUp";
- final static String DOWN = "navigateDown";
- final static String PAGE_UP = "navigatePageUp";
- final static String PAGE_DOWN = "navigatePageDown";
- final static String REQUEST_FOCUS = "requestFocus";
- final static String REQUEST_FOCUS_FOR_VISIBLE = "requestFocusForVisibleComponent";
- final static String SET_SELECTED = "setSelectedIndex";
- final static String SELECT_FOCUSED = "selectTabWithFocus";
- final static String SCROLL_FORWARD = "scrollTabsForwardAction";
- final static String SCROLL_BACKWARD = "scrollTabsBackwardAction";
+ static final String NEXT = "navigateNext";
+ static final String PREVIOUS = "navigatePrevious";
+ static final String RIGHT = "navigateRight";
+ static final String LEFT = "navigateLeft";
+ static final String UP = "navigateUp";
+ static final String DOWN = "navigateDown";
+ static final String PAGE_UP = "navigatePageUp";
+ static final String PAGE_DOWN = "navigatePageDown";
+ static final String REQUEST_FOCUS = "requestFocus";
+ static final String REQUEST_FOCUS_FOR_VISIBLE = "requestFocusForVisibleComponent";
+ static final String SET_SELECTED = "setSelectedIndex";
+ static final String SELECT_FOCUSED = "selectTabWithFocus";
+ static final String SCROLL_FORWARD = "scrollTabsForwardAction";
+ static final String SCROLL_BACKWARD = "scrollTabsBackwardAction";
Actions(final String key) {
super(key);
diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderUI.java
index dbc8c8c86ad079baf0cb8305d119fd885189c5a1..2dec5c895eb8bc387dfcd7b062ae6a1d9c0f2c69 100644
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderUI.java
+++ b/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() {
diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java
index 17b372af8586fdb2fe311e535aaada806b425a67..7c4a33515660a31e400ffe74303ec47ad1afbd5d 100644
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java
+++ b/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 final static String SYSTEM_PROPERTY_KEY = "swing.component.sizevariant";
+ protected static final String CLIENT_PROPERTY_KEY = "JComponent.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;
diff --git a/jdk/src/java.desktop/macosx/classes/sun/java2d/CRenderer.java b/jdk/src/java.desktop/macosx/classes/sun/java2d/CRenderer.java
index b5570f6ce939c0d90c7c0fe87fd7976c6f347dbd..5b622eb18993b9b06dbc7239ebe55b9df07f2ba9 100644
--- a/jdk/src/java.desktop/macosx/classes/sun/java2d/CRenderer.java
+++ b/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 {
diff --git a/jdk/src/java.desktop/macosx/classes/sun/java2d/CompositeCRenderer.java b/jdk/src/java.desktop/macosx/classes/sun/java2d/CompositeCRenderer.java
index c36472ee87d450b102d736be367a9d6d4515d223..cbbf76278d88b7cc83ecf56926c764536a295b80 100644
--- a/jdk/src/java.desktop/macosx/classes/sun/java2d/CompositeCRenderer.java
+++ b/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;
- final static int fPaddingHalf = fPadding / 2;
+ static final int fPadding = 4;
+ static final int fPaddingHalf = fPadding / 2;
private static AffineTransform sIdentityMatrix = new AffineTransform();
diff --git a/jdk/src/java.desktop/macosx/classes/sun/java2d/OSXSurfaceData.java b/jdk/src/java.desktop/macosx/classes/sun/java2d/OSXSurfaceData.java
index f6e04c8e539f372bf937182df5720950349fa9ed..d1444b81a90dae51c4836d9d9275b23016f58c56 100644
--- a/jdk/src/java.desktop/macosx/classes/sun/java2d/OSXSurfaceData.java
+++ b/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;
- final static float LOWER_BND = -UPPER_BND;
+ static final float UPPER_BND = Float.MAX_VALUE / 2.0f;
+ static final float LOWER_BND = -UPPER_BND;
protected static CRenderer sQuartzPipe = null;
protected static CTextPipe sCocoaTextPipe = null;
diff --git a/jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java b/jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java
index 3aaa1bcf31bc9bd7762798c918062e293e85e897..c260e60ad68e70b77c6d8e3709736bc5192d5b8a 100644
--- a/jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java
+++ b/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) {
diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java
index 44136640ccf2442d46493e7f29f7a9c3080e0ea4..2870e7ba22b3af9868fa8c3d527064616a37b31d 100644
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java
+++ b/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 final static int STATE_INIT = 1;
- private final static int STATE_MESSAGELOOP = 2;
- private final static int STATE_SHUTDOWN = 3;
- private final static int STATE_CLEANUP = 4;
- private final static int STATE_DONE = 5;
+ private static final int STATE_NONE = 0;
+ private static final int STATE_INIT = 1;
+ private static final int STATE_MESSAGELOOP = 2;
+ private static final int STATE_SHUTDOWN = 3;
+ private static final int STATE_CLEANUP = 4;
+ 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);
}
diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java
index d3ab6a651de362d99e9cc1763d340f5cf0935c5d..919c31cb2342233918a9773731e1416f12547dd6 100644
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java
+++ b/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;
- final static int JAVA_AX_SELECTED_CHILDREN = -2;
- final static int JAVA_AX_VISIBLE_CHILDREN = -3;
+ static final int JAVA_AX_ALL_CHILDREN = -1;
+ static final int JAVA_AX_SELECTED_CHILDREN = -2;
+ 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) {
diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java
index d5131d9f61fb60cda58de09e7409cc70b467e4b8..2805211d3d142cd0e41e611bf11fe60e0ba87564 100644
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java
+++ b/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) {
diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java
index 80a68126a98bbb49398069b167826420b6eabbcf..a1606d2f959ccde896b869c3ce35609e8190bccb 100644
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java
+++ b/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;
- static private final int kRawText = 1;
- static private final int kSelectedRawText = 2;
- static private final int kConvertedText = 3;
- static private final int kSelectedConvertedText = 4;
+ private static final int kCaretPosition = 0;
+ private static final int kRawText = 1;
+ private static final int kSelectedRawText = 2;
+ private static final int kConvertedText = 3;
+ 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];
diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CWarningWindow.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CWarningWindow.java
index 05db2784b95dd21b9e8002dd62ccbed13532bf77..b2c36705a0988157852ddbdf95030fdb784478c0 100644
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CWarningWindow.java
+++ b/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 final static int HIDING_DELAY = 2000;
+ private static final int SHOWING_DELAY = 300;
+ 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() {
diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CocoaConstants.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CocoaConstants.java
index e94f512b0fb4481d7b472ead5a49965ed1f81e83..a60cc43c411ee17ec4c1b7241ebcd4c6b9bb9c31 100644
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CocoaConstants.java
+++ b/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 final static int NSLeftMouseUp = 2;
- public final static int NSRightMouseDown = 3;
- public final static int NSRightMouseUp = 4;
- public final static int NSMouseMoved = 5;
- public final static int NSLeftMouseDragged = 6;
- public final static int NSRightMouseDragged = 7;
- public final static int NSMouseEntered = 8;
- public final static int NSMouseExited = 9;
- public final static int NSKeyDown = 10;
- public final static int NSKeyUp = 11;
- public final static int NSFlagsChanged = 12;
+ public static final int NSLeftMouseDown = 1;
+ public static final int NSLeftMouseUp = 2;
+ public static final int NSRightMouseDown = 3;
+ public static final int NSRightMouseUp = 4;
+ public static final int NSMouseMoved = 5;
+ public static final int NSLeftMouseDragged = 6;
+ public static final int NSRightMouseDragged = 7;
+ public static final int NSMouseEntered = 8;
+ public static final int NSMouseExited = 9;
+ public static final int NSKeyDown = 10;
+ public static final int NSKeyUp = 11;
+ public static final int NSFlagsChanged = 12;
- public final static int NSScrollWheel = 22;
- public final static int NSOtherMouseDown = 25;
- public final static int NSOtherMouseUp = 26;
- public final static int NSOtherMouseDragged = 27;
+ public static final int NSScrollWheel = 22;
+ public static final int NSOtherMouseDown = 25;
+ public static final int NSOtherMouseUp = 26;
+ 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 final static int kCGMouseButtonRight = 1;
- public final static int kCGMouseButtonCenter = 2;
+ public static final int kCGMouseButtonLeft = 0;
+ public static final int kCGMouseButtonRight = 1;
+ public static final int kCGMouseButtonCenter = 2;
// See https://wiki.mozilla.org/NPAPI:CocoaEventModel
- public final static int NPCocoaEventDrawRect = 1;
- public final static int NPCocoaEventMouseDown = 2;
- public final static int NPCocoaEventMouseUp = 3;
- public final static int NPCocoaEventMouseMoved = 4;
- public final static int NPCocoaEventMouseEntered = 5;
- public final static int NPCocoaEventMouseExited = 6;
- public final static int NPCocoaEventMouseDragged = 7;
- public final static int NPCocoaEventKeyDown = 8;
- public final static int NPCocoaEventKeyUp = 9;
- public final static int NPCocoaEventFlagsChanged = 10;
- public final static int NPCocoaEventFocusChanged = 11;
- public final static int NPCocoaEventWindowFocusChanged = 12;
- public final static int NPCocoaEventScrollWheel = 13;
- public final static int NPCocoaEventTextInput = 14;
+ public static final int NPCocoaEventDrawRect = 1;
+ public static final int NPCocoaEventMouseDown = 2;
+ public static final int NPCocoaEventMouseUp = 3;
+ public static final int NPCocoaEventMouseMoved = 4;
+ public static final int NPCocoaEventMouseEntered = 5;
+ public static final int NPCocoaEventMouseExited = 6;
+ public static final int NPCocoaEventMouseDragged = 7;
+ public static final int NPCocoaEventKeyDown = 8;
+ public static final int NPCocoaEventKeyUp = 9;
+ public static final int NPCocoaEventFlagsChanged = 10;
+ public static final int NPCocoaEventFocusChanged = 11;
+ public static final int NPCocoaEventWindowFocusChanged = 12;
+ public static final int NPCocoaEventScrollWheel = 13;
+ public static final int NPCocoaEventTextInput = 14;
}
diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
index 0188339093e40fe0d45a0d0f6cfc27fe4d49b8bc..eccba3032dded9d49fa40e9726e268ab8bdd8ed8 100644
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
+++ b/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;
- public final static int KEYBOARD_FOCUS_COLOR = 0;
- public final static int INACTIVE_SELECTION_BACKGROUND_COLOR = 1;
- public final static int INACTIVE_SELECTION_FOREGROUND_COLOR = 2;
+ private static final int NUM_APPLE_COLORS = 3;
+ public static final int KEYBOARD_FOCUS_COLOR = 0;
+ public static final int INACTIVE_SELECTION_BACKGROUND_COLOR = 1;
+ 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
diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/editors/NumberEditor.java b/jdk/src/java.desktop/share/classes/com/sun/beans/editors/NumberEditor.java
index 3941e2cf0bcb673048ae53d5b8d8fdec037be235..9097546d2e0a5b2336c04f67e185554c66bf4079 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/beans/editors/NumberEditor.java
+++ b/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();
diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/I18N.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/I18N.java
index 7d55e35cacc0b463e5f4e4226122ebb676e66b13..a3c865b3aad09ee76e0c8a200f9c8e22127ba57e 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/I18N.java
+++ b/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);
}
diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/LZWStringTable.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/LZWStringTable.java
index 7d1714630b94b6382026c175824ecf14f4550af3..c90ed4b2b444bcf6a17d7a7815e6798046e6de21 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/LZWStringTable.java
+++ b/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 final static short NEXT_FIRST = (short)0xFFFF;
+ private static final short HASH_FREE = (short)0xFFFF;
+ private static final short NEXT_FIRST = (short)0xFFFF;
- private final static int MAXBITS = 12;
- private final static int MAXSTR = (1 << MAXBITS);
+ private static final int MAXBITS = 12;
+ private static final int MAXSTR = (1 << MAXBITS);
- private final static short HASHSIZE = 9973;
- private final static short HASHSTEP = 2039;
+ private static final short HASHSIZE = 9973;
+ 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;
}
diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
index 5743cedc904882efa9373223717e4064dfcd6ad8..5a0e560f9ae02293ca5317fa193cabc31b66f3f8 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
+++ b/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;
}
diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java
index 742a9f9ad1ed163e02a0b3e2b5836056996f7cd4..f52982a4461cf395f3d6aef60470329b5c9300cb 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java
+++ b/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
diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
index 3e55c0837de328dc1b90089814d58090c7e03137..ad61aca85f1fc87da7372ec6f415c5febd29fdaa 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
+++ b/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;
- final static GTKPainter INSTANCE = new GTKPainter();
+ private static final GTKEngine ENGINE = GTKEngine.INSTANCE;
+ static final GTKPainter INSTANCE = new GTKPainter();
private GTKPainter() {
}
diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifBorders.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifBorders.java
index 950f7d18b2494c448cbebd7e8168bb8dcba3386d..2b1b9b89f7ab3d73de8df024230862ab45ed20cb 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifBorders.java
+++ b/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
diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java
index 62b1577c7ca8863db2e2bd77f4cf228241c9e37c..11dc92d3a8d35400f6b6fa4d1c112cf341f6b7d6 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java
+++ b/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;
diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java
index d7c69ccec46d28533da8fd203a787cb228b1edb0..16f56e2f9c93b1232aacc33010243351786b2620 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java
+++ b/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;
- final static int LABEL_DIVIDER = 4; // padding between icon and label
+ static final int LABEL_HEIGHT = 18;
+ 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) {
diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifIconFactory.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifIconFactory.java
index 394bb8923271bd933e86b4fdc34a55d7cf2d4762..4c8e33fcf877d4801de1b6a140e15b9031ebd51a 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifIconFactory.java
+++ b/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");
diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java
index 167a8d019c50770fdc98f4538cbd9a0afe5f97a3..3d38e3b4b718cc9c6e7e16004f22f2e213a5d7b4 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java
+++ b/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) {
diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java
index 8cb5028c4768b1d782cd310ac04814ba0d893dc5..63514f643435880f48b7d94b254d00dd52a0582a 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java
+++ b/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 final static Border vsbMarginBorderL = new EmptyBorder(0, 0, 0, 4);
- private final static Border hsbMarginBorder = new EmptyBorder(4, 0, 0, 0);
+ private static final Border vsbMarginBorderR = new EmptyBorder(0, 4, 0, 0);
+ private static final Border vsbMarginBorderL = new EmptyBorder(0, 0, 0, 4);
+ private static final Border hsbMarginBorder = new EmptyBorder(4, 0, 0, 0);
private CompoundBorder vsbBorder;
private CompoundBorder hsbBorder;
diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java
index 70edf604df5d2f401a728d0b732680c61233acf1..dab22fd293ec84f5a6290ad51f999e93d765ab45 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java
+++ b/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 =
diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java
index 91f4530dabf704e501203aa16c4ff83d248d1585..91c919c8711308fd6cc42ce0a28e4447e83d8023 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java
+++ b/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;
diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
index ca9121c225d2394edd775b108907fe77e4d90515..0dc3cb844ceace7f451e19d2af81901669644778 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
+++ b/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;
diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java
index 4faeba214aa6e1730ab91097f22d3273d473825e..01de04d1deaa884e7fa98351bdc7ca44259fe014 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java
+++ b/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();
diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
index 8496e36319665b037cee3134a5f19ce8b20aae56..abdcb841f9aa061eca2eb2e544fa0cf2daa960d3 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
+++ b/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;
diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java
index 347f2943155ec0d90a12c76041a68e1f6a225c39..8f7309496843c4a290a82cd005509f0e2ad9783a 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java
+++ b/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) {
diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java
index d532090669cde91b4a15d9d0d803bf54cb58c8b8..8849b786f6fa1e0f5e1c6bc86787bacef1424d0a 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java
+++ b/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;
- static protected final int SIZE = 9;
+ protected static final int HALF_SIZE = 4;
+ 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();
}
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileWriter.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileWriter.java
index 7a459158a309624bcd96a57fb58c4e3a4320b2be..3020c348953be60788bd12cf51c5ccb453ef2cac 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileWriter.java
+++ b/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.
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatConverter.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatConverter.java
index 9b850e03ad333a59a7ff9c8f6e3fcc35e69845ee..910e2dc8352b2833f970852caa4d9ffdeb792979 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatConverter.java
+++ b/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;
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSRegion.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSRegion.java
index 3ef1e845c87edfcbd2d2172c4049b4fcf74499ab..feb99823a9862882f5ca239238c81573013c2088 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSRegion.java
+++ b/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;
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSampleLoop.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSampleLoop.java
index 091e38385ddb8bc6a94feb2f16f751c149a9cc05..724815bd1bd9aab2718ddf32d42b952e9a2e38b6 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSampleLoop.java
+++ b/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 final static int LOOP_TYPE_RELEASE = 1;
+ public static final int LOOP_TYPE_FORWARD = 0;
+ public static final int LOOP_TYPE_RELEASE = 1;
long type;
long start;
long length;
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbank.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbank.java
index 376521338c2a9f7dfaaf6e788971b915eb7ef5a6..59d0c8cf6aff4b1a535825184b9175d31e1ff0c5 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbank.java
+++ b/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;
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/EmergencySoundbank.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/EmergencySoundbank.java
index 587d3ff7ebeff7f8b45566a88f4440dd57e41e37..22638076fcd0297b6fa056955dbc7e227f6063ef 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/EmergencySoundbank.java
+++ b/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;
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java
index 0b2d9a33d525ecfd3f77a3d82149f7ef420814f1..1ac0a54a3d84f42070226c1a7625d779b672d906 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java
+++ b/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>");
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java
index eaacf0991be8deb0850ab6031a0ac00c45fb5754..dd0894aaf02935819b80657f51bb99dd543c0772 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java
+++ b/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
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiUtils.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiUtils.java
index 40f7cd9f5766c73e46cddbae8eb15e3fd9ecccbe..a56b5eca48e4f11e5e2a9d4633cdfeb77d0a54ed 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiUtils.java
+++ b/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 final static int META_END_OF_TRACK_TYPE = 0x2F;
- public final static int META_TEMPO_TYPE = 0x51;
+ public static final int DEFAULT_TEMPO_MPQ = 500000; // 120bpm
+ public static final int META_END_OF_TRACK_TYPE = 0x2F;
+ public static final int META_TEMPO_TYPE = 0x51;
/**
* Suppresses default constructor, ensuring non-instantiability.
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelConnectionBlock.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelConnectionBlock.java
index 05a438fac8e54814bbc4138eddefddf874b73f94..4b10cfad0a10a6a2ebe28b7d6c3aea22f1a0812f 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelConnectionBlock.java
+++ b/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;
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelTransform.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelTransform.java
index f39f996d1ca09cf43e5af3d36cc02e445dad406a..cbe0adb97b5a93d3b5df4dd0041086547a97500c 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelTransform.java
+++ b/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);
}
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/Platform.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/Platform.java
index 469be149c8198910ce0042a4ba0e074fed142f09..09ece592c93d28514d56f64f22927f590eeba8cd 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/Platform.java
+++ b/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 native static String nGetExtraLibraries();
- private native static int nGetLibraryForFeature(int feature);
+ private static native boolean nIsBigEndian();
+ private static native String nGetExtraLibraries();
+ private static native int nGetLibraryForFeature(int feature);
/**
* Read the required system properties.
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/PortMixer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/PortMixer.java
index ee0fbd064aef5bfc0a28bacee5d004c6d19ece89..8bf34bd8fdff572d248e37ba4e93df4f8e3d8931 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/PortMixer.java
+++ b/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,
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/RealTimeSequencer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/RealTimeSequencer.java
index ea782e811b070de30bbebe739b803fb1d43dee37..b26708b12f10c3dc1c4964d6f32500e6e4454cf2 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/RealTimeSequencer.java
+++ b/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 final static boolean DEBUG_PUMP_ALL = false;
+ private static final boolean DEBUG_PUMP = false;
+ private static final boolean DEBUG_PUMP_ALL = false;
/**
* Event Dispatcher thread. Should be using a shared event
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Modulator.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Modulator.java
index 2d85032ce4df9ff1448c71af1b9486c779db028a..11930714219285f2f0c755d4b3d47ff024936a9b 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Modulator.java
+++ b/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 final static int SOURCE_NOTE_ON_VELOCITY = 2;
- public final static int SOURCE_NOTE_ON_KEYNUMBER = 3;
- public final static int SOURCE_POLY_PRESSURE = 10;
- public final static int SOURCE_CHANNEL_PRESSURE = 13;
- public final static int SOURCE_PITCH_WHEEL = 14;
- public final static int SOURCE_PITCH_SENSITIVITY = 16;
- public final static int SOURCE_MIDI_CONTROL = 128 * 1;
- public final static int SOURCE_DIRECTION_MIN_MAX = 256 * 0;
- public final static int SOURCE_DIRECTION_MAX_MIN = 256 * 1;
- public final static int SOURCE_POLARITY_UNIPOLAR = 512 * 0;
- public final static int SOURCE_POLARITY_BIPOLAR = 512 * 1;
- public final static int SOURCE_TYPE_LINEAR = 1024 * 0;
- public final static int SOURCE_TYPE_CONCAVE = 1024 * 1;
- public final static int SOURCE_TYPE_CONVEX = 1024 * 2;
- public final static int SOURCE_TYPE_SWITCH = 1024 * 3;
- public final static int TRANSFORM_LINEAR = 0;
- public final static int TRANSFORM_ABSOLUTE = 2;
+ public static final int SOURCE_NONE = 0;
+ public static final int SOURCE_NOTE_ON_VELOCITY = 2;
+ public static final int SOURCE_NOTE_ON_KEYNUMBER = 3;
+ public static final int SOURCE_POLY_PRESSURE = 10;
+ public static final int SOURCE_CHANNEL_PRESSURE = 13;
+ public static final int SOURCE_PITCH_WHEEL = 14;
+ public static final int SOURCE_PITCH_SENSITIVITY = 16;
+ public static final int SOURCE_MIDI_CONTROL = 128 * 1;
+ public static final int SOURCE_DIRECTION_MIN_MAX = 256 * 0;
+ public static final int SOURCE_DIRECTION_MAX_MIN = 256 * 1;
+ public static final int SOURCE_POLARITY_UNIPOLAR = 512 * 0;
+ public static final int SOURCE_POLARITY_BIPOLAR = 512 * 1;
+ public static final int SOURCE_TYPE_LINEAR = 1024 * 0;
+ public static final int SOURCE_TYPE_CONCAVE = 1024 * 1;
+ public static final int SOURCE_TYPE_CONVEX = 1024 * 2;
+ public static final int SOURCE_TYPE_SWITCH = 1024 * 3;
+ public static final int TRANSFORM_LINEAR = 0;
+ public static final int TRANSFORM_ABSOLUTE = 2;
int sourceOperator;
int destinationOperator;
short amount;
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Region.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Region.java
index 02dd53e97c989566b28f462f7c9d676b0cf7879f..264c3f9038c9d8bd582dab76fc18d4d36a28ab24 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Region.java
+++ b/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 final static int GENERATOR_ENDADDRSOFFSET = 1;
- public final static int GENERATOR_STARTLOOPADDRSOFFSET = 2;
- public final static int GENERATOR_ENDLOOPADDRSOFFSET = 3;
- public final static int GENERATOR_STARTADDRSCOARSEOFFSET = 4;
- public final static int GENERATOR_MODLFOTOPITCH = 5;
- public final static int GENERATOR_VIBLFOTOPITCH = 6;
- public final static int GENERATOR_MODENVTOPITCH = 7;
- public final static int GENERATOR_INITIALFILTERFC = 8;
- public final static int GENERATOR_INITIALFILTERQ = 9;
- public final static int GENERATOR_MODLFOTOFILTERFC = 10;
- public final static int GENERATOR_MODENVTOFILTERFC = 11;
- public final static int GENERATOR_ENDADDRSCOARSEOFFSET = 12;
- public final static int GENERATOR_MODLFOTOVOLUME = 13;
- public final static int GENERATOR_UNUSED1 = 14;
- public final static int GENERATOR_CHORUSEFFECTSSEND = 15;
- public final static int GENERATOR_REVERBEFFECTSSEND = 16;
- public final static int GENERATOR_PAN = 17;
- public final static int GENERATOR_UNUSED2 = 18;
- public final static int GENERATOR_UNUSED3 = 19;
- public final static int GENERATOR_UNUSED4 = 20;
- public final static int GENERATOR_DELAYMODLFO = 21;
- public final static int GENERATOR_FREQMODLFO = 22;
- public final static int GENERATOR_DELAYVIBLFO = 23;
- public final static int GENERATOR_FREQVIBLFO = 24;
- public final static int GENERATOR_DELAYMODENV = 25;
- public final static int GENERATOR_ATTACKMODENV = 26;
- public final static int GENERATOR_HOLDMODENV = 27;
- public final static int GENERATOR_DECAYMODENV = 28;
- public final static int GENERATOR_SUSTAINMODENV = 29;
- public final static int GENERATOR_RELEASEMODENV = 30;
- public final static int GENERATOR_KEYNUMTOMODENVHOLD = 31;
- public final static int GENERATOR_KEYNUMTOMODENVDECAY = 32;
- public final static int GENERATOR_DELAYVOLENV = 33;
- public final static int GENERATOR_ATTACKVOLENV = 34;
- public final static int GENERATOR_HOLDVOLENV = 35;
- public final static int GENERATOR_DECAYVOLENV = 36;
- public final static int GENERATOR_SUSTAINVOLENV = 37;
- public final static int GENERATOR_RELEASEVOLENV = 38;
- public final static int GENERATOR_KEYNUMTOVOLENVHOLD = 39;
- public final static int GENERATOR_KEYNUMTOVOLENVDECAY = 40;
- public final static int GENERATOR_INSTRUMENT = 41;
- public final static int GENERATOR_RESERVED1 = 42;
- public final static int GENERATOR_KEYRANGE = 43;
- public final static int GENERATOR_VELRANGE = 44;
- public final static int GENERATOR_STARTLOOPADDRSCOARSEOFFSET = 45;
- public final static int GENERATOR_KEYNUM = 46;
- public final static int GENERATOR_VELOCITY = 47;
- public final static int GENERATOR_INITIALATTENUATION = 48;
- public final static int GENERATOR_RESERVED2 = 49;
- public final static int GENERATOR_ENDLOOPADDRSCOARSEOFFSET = 50;
- public final static int GENERATOR_COARSETUNE = 51;
- public final static int GENERATOR_FINETUNE = 52;
- public final static int GENERATOR_SAMPLEID = 53;
- public final static int GENERATOR_SAMPLEMODES = 54;
- public final static int GENERATOR_RESERVED3 = 55;
- public final static int GENERATOR_SCALETUNING = 56;
- public final static int GENERATOR_EXCLUSIVECLASS = 57;
- public final static int GENERATOR_OVERRIDINGROOTKEY = 58;
- public final static int GENERATOR_UNUSED5 = 59;
- public final static int GENERATOR_ENDOPR = 60;
+ public static final int GENERATOR_STARTADDRSOFFSET = 0;
+ public static final int GENERATOR_ENDADDRSOFFSET = 1;
+ public static final int GENERATOR_STARTLOOPADDRSOFFSET = 2;
+ public static final int GENERATOR_ENDLOOPADDRSOFFSET = 3;
+ public static final int GENERATOR_STARTADDRSCOARSEOFFSET = 4;
+ public static final int GENERATOR_MODLFOTOPITCH = 5;
+ public static final int GENERATOR_VIBLFOTOPITCH = 6;
+ public static final int GENERATOR_MODENVTOPITCH = 7;
+ public static final int GENERATOR_INITIALFILTERFC = 8;
+ public static final int GENERATOR_INITIALFILTERQ = 9;
+ public static final int GENERATOR_MODLFOTOFILTERFC = 10;
+ public static final int GENERATOR_MODENVTOFILTERFC = 11;
+ public static final int GENERATOR_ENDADDRSCOARSEOFFSET = 12;
+ public static final int GENERATOR_MODLFOTOVOLUME = 13;
+ public static final int GENERATOR_UNUSED1 = 14;
+ public static final int GENERATOR_CHORUSEFFECTSSEND = 15;
+ public static final int GENERATOR_REVERBEFFECTSSEND = 16;
+ public static final int GENERATOR_PAN = 17;
+ public static final int GENERATOR_UNUSED2 = 18;
+ public static final int GENERATOR_UNUSED3 = 19;
+ public static final int GENERATOR_UNUSED4 = 20;
+ public static final int GENERATOR_DELAYMODLFO = 21;
+ public static final int GENERATOR_FREQMODLFO = 22;
+ public static final int GENERATOR_DELAYVIBLFO = 23;
+ public static final int GENERATOR_FREQVIBLFO = 24;
+ public static final int GENERATOR_DELAYMODENV = 25;
+ public static final int GENERATOR_ATTACKMODENV = 26;
+ public static final int GENERATOR_HOLDMODENV = 27;
+ public static final int GENERATOR_DECAYMODENV = 28;
+ public static final int GENERATOR_SUSTAINMODENV = 29;
+ public static final int GENERATOR_RELEASEMODENV = 30;
+ public static final int GENERATOR_KEYNUMTOMODENVHOLD = 31;
+ public static final int GENERATOR_KEYNUMTOMODENVDECAY = 32;
+ public static final int GENERATOR_DELAYVOLENV = 33;
+ public static final int GENERATOR_ATTACKVOLENV = 34;
+ public static final int GENERATOR_HOLDVOLENV = 35;
+ public static final int GENERATOR_DECAYVOLENV = 36;
+ public static final int GENERATOR_SUSTAINVOLENV = 37;
+ public static final int GENERATOR_RELEASEVOLENV = 38;
+ public static final int GENERATOR_KEYNUMTOVOLENVHOLD = 39;
+ public static final int GENERATOR_KEYNUMTOVOLENVDECAY = 40;
+ public static final int GENERATOR_INSTRUMENT = 41;
+ public static final int GENERATOR_RESERVED1 = 42;
+ public static final int GENERATOR_KEYRANGE = 43;
+ public static final int GENERATOR_VELRANGE = 44;
+ public static final int GENERATOR_STARTLOOPADDRSCOARSEOFFSET = 45;
+ public static final int GENERATOR_KEYNUM = 46;
+ public static final int GENERATOR_VELOCITY = 47;
+ public static final int GENERATOR_INITIALATTENUATION = 48;
+ public static final int GENERATOR_RESERVED2 = 49;
+ public static final int GENERATOR_ENDLOOPADDRSCOARSEOFFSET = 50;
+ public static final int GENERATOR_COARSETUNE = 51;
+ public static final int GENERATOR_FINETUNE = 52;
+ public static final int GENERATOR_SAMPLEID = 53;
+ public static final int GENERATOR_SAMPLEMODES = 54;
+ public static final int GENERATOR_RESERVED3 = 55;
+ public static final int GENERATOR_SCALETUNING = 56;
+ public static final int GENERATOR_EXCLUSIVECLASS = 57;
+ public static final int GENERATOR_OVERRIDINGROOTKEY = 58;
+ public static final int GENERATOR_UNUSED5 = 59;
+ 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;
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java
index ee0c9f7dab15428730ac80514c7c76c3aff2e2c6..cf4d2894431e3d63a1ddf3fcfc18962e662e5c0b 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java
+++ b/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 final static int EG_DELAY = 1;
- public final static int EG_ATTACK = 2;
- public final static int EG_HOLD = 3;
- public final static int EG_DECAY = 4;
- public final static int EG_SUSTAIN = 5;
- public final static int EG_RELEASE = 6;
- public final static int EG_SHUTDOWN = 7;
- public final static int EG_END = 8;
+ public static final int EG_OFF = 0;
+ public static final int EG_DELAY = 1;
+ public static final int EG_ATTACK = 2;
+ public static final int EG_HOLD = 3;
+ public static final int EG_DECAY = 4;
+ public static final int EG_SUSTAIN = 5;
+ public static final int EG_RELEASE = 6;
+ public static final int EG_SHUTDOWN = 7;
+ public static final int EG_END = 8;
int max_count = 10;
int used_count = 0;
private final int[] stage = new int[max_count];
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftFilter.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftFilter.java
index 187fa20508eefe5a1868c41596428d51eb4aef50..98b4c7af9df6da7fa2edf90fdac40f73e8afb0fd 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftFilter.java
+++ b/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 final static int FILTERTYPE_LP12 = 0x01;
- public final static int FILTERTYPE_HP12 = 0x11;
- public final static int FILTERTYPE_BP12 = 0x21;
- public final static int FILTERTYPE_NP12 = 0x31;
- public final static int FILTERTYPE_LP24 = 0x03;
- public final static int FILTERTYPE_HP24 = 0x13;
+ public static final int FILTERTYPE_LP6 = 0x00;
+ public static final int FILTERTYPE_LP12 = 0x01;
+ public static final int FILTERTYPE_HP12 = 0x11;
+ public static final int FILTERTYPE_BP12 = 0x21;
+ public static final int FILTERTYPE_NP12 = 0x31;
+ public static final int FILTERTYPE_LP24 = 0x03;
+ public static final int FILTERTYPE_HP24 = 0x13;
//
// 0x0 = 1st-order, 6 dB/oct
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMainMixer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMainMixer.java
index 02ce9e02518d1e129d6359b2b0bd6bea5da24bf8..d3f8713180c1e9a9f7f9e96bc926ffa6f1dd1f24 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMainMixer.java
+++ b/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 final static int CHANNEL_RIGHT = 1;
- public final static int CHANNEL_MONO = 2;
- public final static int CHANNEL_DELAY_LEFT = 3;
- public final static int CHANNEL_DELAY_RIGHT = 4;
- public final static int CHANNEL_DELAY_MONO = 5;
- public final static int CHANNEL_EFFECT1 = 6;
- public final static int CHANNEL_EFFECT2 = 7;
- public final static int CHANNEL_DELAY_EFFECT1 = 8;
- public final static int CHANNEL_DELAY_EFFECT2 = 9;
- public final static int CHANNEL_LEFT_DRY = 10;
- public final static int CHANNEL_RIGHT_DRY = 11;
- public final static int CHANNEL_SCRATCH1 = 12;
- public final static int CHANNEL_SCRATCH2 = 13;
+ public static final int CHANNEL_LEFT = 0;
+ public static final int CHANNEL_RIGHT = 1;
+ public static final int CHANNEL_MONO = 2;
+ public static final int CHANNEL_DELAY_LEFT = 3;
+ public static final int CHANNEL_DELAY_RIGHT = 4;
+ public static final int CHANNEL_DELAY_MONO = 5;
+ public static final int CHANNEL_EFFECT1 = 6;
+ public static final int CHANNEL_EFFECT2 = 7;
+ public static final int CHANNEL_DELAY_EFFECT1 = 8;
+ public static final int CHANNEL_DELAY_EFFECT2 = 9;
+ public static final int CHANNEL_LEFT_DRY = 10;
+ public static final int CHANNEL_RIGHT_DRY = 11;
+ public static final int CHANNEL_SCRATCH1 = 12;
+ public static final int CHANNEL_SCRATCH2 = 13;
boolean active_sensing_on = false;
private long msec_last_activity = -1;
private boolean pusher_silent = false;
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMainMixer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMainMixer.java
index 43e796ff14fb14ae14b75eee9b5dd1cfc49cf5d0..c07bc59befad5132343bc4b9dcd0aaf847f2666b 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMainMixer.java
+++ b/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;
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftReverb.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftReverb.java
index c30aae03f6d19a05297da76614d6f36cb76b9114..3876758ad96778693e322a0435a3e83da2569da8 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftReverb.java
+++ b/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;
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java
index b888742970f268851e2e1aa249d1cdace9c9296a..277e3db2b25a281f3003fa03a2dce78099488f8c 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java
+++ b/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;
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileWriter.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileWriter.java
index 365fd9c6c28e8c18e994a6307b966790280e4a53..f03921e72dfec076f451b3ea804912962779d4bc 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileWriter.java
+++ b/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;
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/UlawCodec.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/UlawCodec.java
index 337fe1997881365af03b2e5ca71418f798d9fccf..5dde45b734b7b4f403151394d3971a7ae9d4c991 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/UlawCodec.java
+++ b/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 final static byte[] ULAW_TABL = new byte[256];
+ private static final byte[] ULAW_TABH = 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};
diff --git a/jdk/src/java.desktop/share/classes/java/applet/Applet.java b/jdk/src/java.desktop/share/classes/java/applet/Applet.java
index 9fb8551881ac4d32e5491c9333fb3d6fef461819..aed6eae421bd2cf4f3d7683daa5e221afc7333b8 100644
--- a/jdk/src/java.desktop/share/classes/java/applet/Applet.java
+++ b/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);
}
diff --git a/jdk/src/java.desktop/share/classes/java/awt/AWTEvent.java b/jdk/src/java.desktop/share/classes/java/awt/AWTEvent.java
index abad30da22be341f31121e05d22402e8d72d3649..04c4effeafaee1c8aeec04aa4575d22a36d5993a 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/AWTEvent.java
+++ b/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;
diff --git a/jdk/src/java.desktop/share/classes/java/awt/BasicStroke.java b/jdk/src/java.desktop/share/classes/java/awt/BasicStroke.java
index a2b14cfa798d2a202daa72f9e12d02a47388cb15..7e20e92af3a31fd1060800c0792c33b115d8a0b2 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/BasicStroke.java
+++ b/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;
diff --git a/jdk/src/java.desktop/share/classes/java/awt/Color.java b/jdk/src/java.desktop/share/classes/java/awt/Color.java
index 3a94d73ac74602a5fe3e8f6a31591d770d48b70f..da62fc631da047bec8b6c5c1553456ea7c248d97 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/Color.java
+++ b/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.
diff --git a/jdk/src/java.desktop/share/classes/java/awt/Component.java b/jdk/src/java.desktop/share/classes/java/awt/Component.java
index deff1a9e0ae6605f9657b238c70f1f821a14841b..87bab7eac207e22354f1f19e6eb1300b66d12895 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/Component.java
+++ b/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";
- final static String adjustmentListenerK = "adjustmentL";
- final static String componentListenerK = "componentL";
- final static String containerListenerK = "containerL";
- final static String focusListenerK = "focusL";
- final static String itemListenerK = "itemL";
- final static String keyListenerK = "keyL";
- final static String mouseListenerK = "mouseL";
- final static String mouseMotionListenerK = "mouseMotionL";
- final static String mouseWheelListenerK = "mouseWheelL";
- final static String textListenerK = "textL";
- final static String ownedWindowK = "ownedL";
- final static String windowListenerK = "windowL";
- final static String inputMethodListenerK = "inputMethodL";
- final static String hierarchyListenerK = "hierarchyL";
- final static String hierarchyBoundsListenerK = "hierarchyBoundsL";
- final static String windowStateListenerK = "windowStateL";
- final static String windowFocusListenerK = "windowFocusL";
+ static final String actionListenerK = "actionL";
+ static final String adjustmentListenerK = "adjustmentL";
+ static final String componentListenerK = "componentL";
+ static final String containerListenerK = "containerL";
+ static final String focusListenerK = "focusL";
+ static final String itemListenerK = "itemL";
+ static final String keyListenerK = "keyL";
+ static final String mouseListenerK = "mouseL";
+ static final String mouseMotionListenerK = "mouseMotionL";
+ static final String mouseWheelListenerK = "mouseWheelL";
+ static final String textListenerK = "textL";
+ static final String ownedWindowK = "ownedL";
+ static final String windowListenerK = "windowL";
+ static final String inputMethodListenerK = "inputMethodL";
+ static final String hierarchyListenerK = "hierarchyL";
+ static final String hierarchyBoundsListenerK = "hierarchyBoundsL";
+ static final String windowStateListenerK = "windowStateL";
+ 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
diff --git a/jdk/src/java.desktop/share/classes/java/awt/Container.java b/jdk/src/java.desktop/share/classes/java/awt/Container.java
index 0ed78e598df1425677943c0c2bc7890f15f8c05b..6e19e26c5d5e26034f9dd2023ed8b3e8093e197f 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/Container.java
+++ b/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}
diff --git a/jdk/src/java.desktop/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java b/jdk/src/java.desktop/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java
index ef010fd9897b0f91fe41f16ac422ccb288cbe6eb..312149763dfa27380c7114067f1f51f9a71b75aa 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java
+++ b/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;
- final private int BACKWARD_TRAVERSAL = 1;
+ private final int FORWARD_TRAVERSAL = 0;
+ 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;
- transient private List<Component> cachedCycle;
+ private transient Container cachedRoot;
+ private transient List<Component> cachedCycle;
/*
* We suppose to use getFocusTraversalCycle & getComponentIndex methods in order
diff --git a/jdk/src/java.desktop/share/classes/java/awt/Cursor.java b/jdk/src/java.desktop/share/classes/java/awt/Cursor.java
index 3e6d9410476bc1d581d3bd4c6f3d57fbbd691584..0ca5a3060ad3e55d34a6b84dc6b3584d36615a39 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/Cursor.java
+++ b/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);
}
diff --git a/jdk/src/java.desktop/share/classes/java/awt/Dialog.java b/jdk/src/java.desktop/share/classes/java/awt/Dialog.java
index 2b3f4c2584c03bc9180c81d3f7c49b55c526f658..84fb5e77e3799d9e48ebc9b8bde0020b1b2e391c 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/Dialog.java
+++ b/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>();
diff --git a/jdk/src/java.desktop/share/classes/java/awt/DisplayMode.java b/jdk/src/java.desktop/share/classes/java/awt/DisplayMode.java
index 4156430061557ad7b4671fb3d305d46ea73c2945..12730fde5f4298d88808eabf48c1a68617c97a5f 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/DisplayMode.java
+++ b/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
diff --git a/jdk/src/java.desktop/share/classes/java/awt/EventQueue.java b/jdk/src/java.desktop/share/classes/java/awt/EventQueue.java
index ae728fe295f1295c2ad10ecb820ea463f2128195..11f156094cff60cd4e0b70abb57605ece467e00a 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/EventQueue.java
+++ b/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() {
}
};
diff --git a/jdk/src/java.desktop/share/classes/java/awt/GraphicsDevice.java b/jdk/src/java.desktop/share/classes/java/awt/GraphicsDevice.java
index 819aa49989b16685908df5e14981cf878d764c4a..fdc44ca6ab79374d382f839578581888b2d1bad8 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/GraphicsDevice.java
+++ b/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.
diff --git a/jdk/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java b/jdk/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java
index f234b1bf784b33d1cc9bf72d2f7eb19b936fd91e..7f1c6dcd88a02372f08f913e32a9dd7b032b4919 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java
+++ b/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();
}
diff --git a/jdk/src/java.desktop/share/classes/java/awt/List.java b/jdk/src/java.desktop/share/classes/java/awt/List.java
index f8504ca9fe414b1c81a07cbcbd89e30ea11a7c55..4112f87fbe2b853e518cc16d77a1b64b40c08941 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/List.java
+++ b/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
diff --git a/jdk/src/java.desktop/share/classes/java/awt/MenuComponent.java b/jdk/src/java.desktop/share/classes/java/awt/MenuComponent.java
index b99e1c3eb7f7717f8705b1bc3b1a7e1c8419d437..fca144ac0f84e19346dc3fdce1e201ef080d5fe0 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/MenuComponent.java
+++ b/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;
- final static String itemListenerK = Component.itemListenerK;
+ static final String actionListenerK = Component.actionListenerK;
+ static final String itemListenerK = Component.itemListenerK;
/*
* JDK 1.1 serialVersionUID
diff --git a/jdk/src/java.desktop/share/classes/java/awt/RenderingHints.java b/jdk/src/java.desktop/share/classes/java/awt/RenderingHints.java
index 353a49c52cf99a6d1339984eb95993403752cc1b..09bee025b5f392469e3a17f1acd9f872dd7f290c 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/RenderingHints.java
+++ b/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) {
diff --git a/jdk/src/java.desktop/share/classes/java/awt/SequencedEvent.java b/jdk/src/java.desktop/share/classes/java/awt/SequencedEvent.java
index 835c040c85c0b4179246fd3f6992c42bafe0b475..678067ab1439e4d79316f76d7bd6c8e314464719 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/SequencedEvent.java
+++ b/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();
diff --git a/jdk/src/java.desktop/share/classes/java/awt/SplashScreen.java b/jdk/src/java.desktop/share/classes/java/awt/SplashScreen.java
index 28ff40eb73c54dcbc9c66ddc1f0cf37ca6f1309c..3cf8ac0a6cd55cc9a726fada5ab454b459b0b8af 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/SplashScreen.java
+++ b/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 native static boolean _isVisible(long splashPtr);
- private native static Rectangle _getBounds(long splashPtr);
- private native static long _getInstance();
- private native static void _close(long splashPtr);
- private native static String _getImageFileName(long splashPtr);
- private native static String _getImageJarName(long SplashPtr);
- private native static boolean _setImageData(long SplashPtr, byte[] data);
- private native static float _getScaleFactor(long SplashPtr);
+ private static native void _update(long splashPtr, int[] data, int x, int y, int width, int height, int scanlineStride);
+ private static native boolean _isVisible(long splashPtr);
+ private static native Rectangle _getBounds(long splashPtr);
+ private static native long _getInstance();
+ private static native void _close(long splashPtr);
+ private static native String _getImageFileName(long splashPtr);
+ private static native String _getImageJarName(long SplashPtr);
+ private static native boolean _setImageData(long SplashPtr, byte[] data);
+ private static native float _getScaleFactor(long SplashPtr);
}
diff --git a/jdk/src/java.desktop/share/classes/java/awt/SystemColor.java b/jdk/src/java.desktop/share/classes/java/awt/SystemColor.java
index 65b01b2c05b6ea49e13059c4f9a02d535798eba8..38a173f339ad6ed259bff549a7ade3da4ae036a6 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/SystemColor.java
+++ b/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.
diff --git a/jdk/src/java.desktop/share/classes/java/awt/SystemTray.java b/jdk/src/java.desktop/share/classes/java/awt/SystemTray.java
index e542dfc1712d08e20534c2ba7c9d9f34469e578f..e61716ee537338a224436fb1afa7906fee6df1e9 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/SystemTray.java
+++ b/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];
diff --git a/jdk/src/java.desktop/share/classes/java/awt/TextComponent.java b/jdk/src/java.desktop/share/classes/java/awt/TextComponent.java
index ed28e1b0470e2db84f9e53e794896b52672059ef..9e7c22a49bb56d102a8d5350db4c746e8fc64428 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/TextComponent.java
+++ b/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
diff --git a/jdk/src/java.desktop/share/classes/java/awt/TexturePaintContext.java b/jdk/src/java.desktop/share/classes/java/awt/TexturePaintContext.java
index 12111967c0b057de38aa45f55b69b675c0b33eef..3b96d069408691e10c692b9af0c02f83c66495db 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/TexturePaintContext.java
+++ b/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;
}
diff --git a/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java b/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java
index a51b36c855d3407b25d2b7ec3fffa148adcf1a77..ee020270f197f2f326c2b1d3e1aed593374f18bb 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java
+++ b/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.
diff --git a/jdk/src/java.desktop/share/classes/java/awt/Transparency.java b/jdk/src/java.desktop/share/classes/java/awt/Transparency.java
index 2c8f845a4732a76caa0e2f37424321e97e9e8b06..42b87caa4c542468865f9a0f7a7492647be5f35c 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/Transparency.java
+++ b/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>.
diff --git a/jdk/src/java.desktop/share/classes/java/awt/TrayIcon.java b/jdk/src/java.desktop/share/classes/java/awt/TrayIcon.java
index 5199b0cc064546bbcd3f94ebd7deb05b0c98f6e1..3c7182afcfab7ccf7ddaa4210cd67d96d2b2391e 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/TrayIcon.java
+++ b/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;
diff --git a/jdk/src/java.desktop/share/classes/java/awt/WaitDispatchSupport.java b/jdk/src/java.desktop/share/classes/java/awt/WaitDispatchSupport.java
index d3a692ab5a8ade183417c88d7899fa216adb41cf..5ca267f98a9e7aa12f559420b3b510c4c49c62ba 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/WaitDispatchSupport.java
+++ b/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;
}
diff --git a/jdk/src/java.desktop/share/classes/java/awt/Window.java b/jdk/src/java.desktop/share/classes/java/awt/Window.java
index 0a03eeddee2ec254fac04557db5ea40262131c54..6f834a3f152128ec7b4a4fff0a4aaa91dc66b695 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/Window.java
+++ b/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() {
diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetDropEvent.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetDropEvent.java
index 32b16e161690bf42e398e439541697c9ce7d5be3..6b197ae6b1ffde727358000ec46b752ee50dae95 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetDropEvent.java
+++ b/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.
diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/InvalidDnDOperationException.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/InvalidDnDOperationException.java
index e0727aba3b507a09e7a676ea44e79ca8eedbd4ac..c57573797e038248cd835a16f0dd23006488749e 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/dnd/InvalidDnDOperationException.java
+++ b/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
diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/MouseEvent.java b/jdk/src/java.desktop/share/classes/java/awt/event/MouseEvent.java
index 2804f2b57aca390b3cd85613f313da9d941cf198..de522828a4d981eaa727210029f715d4067227de 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/event/MouseEvent.java
+++ b/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}
diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/OpenType.java b/jdk/src/java.desktop/share/classes/java/awt/font/OpenType.java
index ebe6cb39adfa46a470333b085897894dde283e8c..ee0acf6ab4d5998fd98d2826f532ddd43917f74e 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/font/OpenType.java
+++ b/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.
diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/Arc2D.java b/jdk/src/java.desktop/share/classes/java/awt/geom/Arc2D.java
index be51e8a4bc36e1b36c4e3f78d0d2b9fd65f0cf5a..74cad6ef4a547025108dcd1a4cdbf88635164faa 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/geom/Arc2D.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/geom/Arc2D.java
@@ -60,7 +60,7 @@ public abstract class Arc2D extends RectangularShape {
* connecting the two ends of the arc segment.
* @since 1.2
*/
- public final static int OPEN = 0;
+ public static final int OPEN = 0;
/**
* The closure type for an arc closed by drawing a straight
@@ -68,7 +68,7 @@ public abstract class Arc2D extends RectangularShape {
* arc segment.
* @since 1.2
*/
- public final static int CHORD = 1;
+ public static final int CHORD = 1;
/**
* The closure type for an arc closed by drawing straight line
@@ -76,7 +76,7 @@ public abstract class Arc2D extends RectangularShape {
* of the full ellipse and from that point to the end of the arc segment.
* @since 1.2
*/
- public final static int PIE = 2;
+ public static final int PIE = 2;
/**
* This class defines an arc specified in {@code float} precision.
diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/Path2D.java b/jdk/src/java.desktop/share/classes/java/awt/geom/Path2D.java
index e05d3579fc101f30f60144838d4754161778a1fe..9ef2bb1bfd80812566b6faf921ac3516dee9aaed 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/geom/Path2D.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/geom/Path2D.java
@@ -2675,7 +2675,7 @@ public abstract class Path2D implements Shape, Cloneable {
}
}
- static abstract class Iterator implements PathIterator {
+ abstract static class Iterator implements PathIterator {
int typeIdx;
int pointIdx;
Path2D path;
diff --git a/jdk/src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java b/jdk/src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java
index df09076410db88e4074da1e7125b90c4f1ddf594..fc7b61c4b7b961ea347bcf0dbb8d0bc856acacf0 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java
@@ -71,36 +71,36 @@ public class InputMethodHighlight {
/**
* Constant for the raw text state.
*/
- public final static int RAW_TEXT = 0;
+ public static final int RAW_TEXT = 0;
/**
* Constant for the converted text state.
*/
- public final static int CONVERTED_TEXT = 1;
+ public static final int CONVERTED_TEXT = 1;
/**
* Constant for the default highlight for unselected raw text.
*/
- public final static InputMethodHighlight UNSELECTED_RAW_TEXT_HIGHLIGHT =
+ public static final InputMethodHighlight UNSELECTED_RAW_TEXT_HIGHLIGHT =
new InputMethodHighlight(false, RAW_TEXT);
/**
* Constant for the default highlight for selected raw text.
*/
- public final static InputMethodHighlight SELECTED_RAW_TEXT_HIGHLIGHT =
+ public static final InputMethodHighlight SELECTED_RAW_TEXT_HIGHLIGHT =
new InputMethodHighlight(true, RAW_TEXT);
/**
* Constant for the default highlight for unselected converted text.
*/
- public final static InputMethodHighlight UNSELECTED_CONVERTED_TEXT_HIGHLIGHT =
+ public static final InputMethodHighlight UNSELECTED_CONVERTED_TEXT_HIGHLIGHT =
new InputMethodHighlight(false, CONVERTED_TEXT);
/**
* Constant for the default highlight for selected converted text.
*/
- public final static InputMethodHighlight SELECTED_CONVERTED_TEXT_HIGHLIGHT =
+ public static final InputMethodHighlight SELECTED_CONVERTED_TEXT_HIGHLIGHT =
new InputMethodHighlight(true, CONVERTED_TEXT);
diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/BufferedImage.java b/jdk/src/java.desktop/share/classes/java/awt/image/BufferedImage.java
index 5aeef7c009bffde78b8b0ca2cd34293da00db2dc..888490d533262da83c1994c54f68fe261363d4aa 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/image/BufferedImage.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/image/BufferedImage.java
@@ -281,7 +281,7 @@ public class BufferedImage extends java.awt.Image
private static final int DCM_BGR_BLU_MASK = 0xff0000;
- static private native void initIDs();
+ private static native void initIDs();
static {
ColorModel.loadLibraries();
initIDs();
diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/ColorModel.java b/jdk/src/java.desktop/share/classes/java/awt/image/ColorModel.java
index 10439c7f835504f7a21b06e9e83a71f0f976166d..7440de35e7feb11252416ed05fa958a4e4f740c6 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/image/ColorModel.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/image/ColorModel.java
@@ -403,7 +403,7 @@ public abstract class ColorModel implements Transparency{
* @return <code>true</code> if alpha is supported in this
* <code>ColorModel</code>; <code>false</code> otherwise.
*/
- final public boolean hasAlpha() {
+ public final boolean hasAlpha() {
return supportsAlpha;
}
@@ -419,7 +419,7 @@ public abstract class ColorModel implements Transparency{
* in the pixel values to be translated by this
* <code>ColorModel</code>; <code>false</code> otherwise.
*/
- final public boolean isAlphaPremultiplied() {
+ public final boolean isAlphaPremultiplied() {
return isAlphaPremultiplied;
}
@@ -430,7 +430,7 @@ public abstract class ColorModel implements Transparency{
* @return the transfer type.
* @since 1.3
*/
- final public int getTransferType() {
+ public final int getTransferType() {
return transferType;
}
@@ -1512,7 +1512,7 @@ public abstract class ColorModel implements Transparency{
* @return the <code>ColorSpace</code> of this
* <code>ColorModel</code>.
*/
- final public ColorSpace getColorSpace() {
+ public final ColorSpace getColorSpace() {
return colorSpace;
}
diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java b/jdk/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java
index d53f71974873089ce852a3a0250e7317e9175adf..8588ef7fc7136602b7be798b2cc1da487ee80b53 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java
@@ -266,7 +266,7 @@ public class DirectColorModel extends PackedColorModel {
* @return the mask, which indicates which bits of the <code>int</code>
* pixel representation contain the red color sample.
*/
- final public int getRedMask() {
+ public final int getRedMask() {
return maskArray[0];
}
@@ -276,7 +276,7 @@ public class DirectColorModel extends PackedColorModel {
* @return the mask, which indicates which bits of the <code>int</code>
* pixel representation contain the green color sample.
*/
- final public int getGreenMask() {
+ public final int getGreenMask() {
return maskArray[1];
}
@@ -286,7 +286,7 @@ public class DirectColorModel extends PackedColorModel {
* @return the mask, which indicates which bits of the <code>int</code>
* pixel representation contain the blue color sample.
*/
- final public int getBlueMask() {
+ public final int getBlueMask() {
return maskArray[2];
}
@@ -296,7 +296,7 @@ public class DirectColorModel extends PackedColorModel {
* @return the mask, which indicates which bits of the <code>int</code>
* pixel representation contain the alpha sample.
*/
- final public int getAlphaMask() {
+ public final int getAlphaMask() {
if (supportsAlpha) {
return maskArray[3];
} else {
@@ -365,7 +365,7 @@ public class DirectColorModel extends PackedColorModel {
* @return the red color component for the specified pixel, from
* 0 to 255 in the sRGB <code>ColorSpace</code>.
*/
- final public int getRed(int pixel) {
+ public final int getRed(int pixel) {
if (is_sRGB) {
return getsRGBComponentFromsRGB(pixel, 0);
} else if (is_LinearRGB) {
@@ -388,7 +388,7 @@ public class DirectColorModel extends PackedColorModel {
* @return the green color component for the specified pixel, from
* 0 to 255 in the sRGB <code>ColorSpace</code>.
*/
- final public int getGreen(int pixel) {
+ public final int getGreen(int pixel) {
if (is_sRGB) {
return getsRGBComponentFromsRGB(pixel, 1);
} else if (is_LinearRGB) {
@@ -411,7 +411,7 @@ public class DirectColorModel extends PackedColorModel {
* @return the blue color component for the specified pixel, from
* 0 to 255 in the sRGB <code>ColorSpace</code>.
*/
- final public int getBlue(int pixel) {
+ public final int getBlue(int pixel) {
if (is_sRGB) {
return getsRGBComponentFromsRGB(pixel, 2);
} else if (is_LinearRGB) {
@@ -428,7 +428,7 @@ public class DirectColorModel extends PackedColorModel {
* @return the value of the alpha component of <code>pixel</code>
* from 0 to 255.
*/
- final public int getAlpha(int pixel) {
+ public final int getAlpha(int pixel) {
if (!supportsAlpha) return 255;
int a = ((pixel & maskArray[3]) >>> maskOffsets[3]);
if (scaleFactors[3] != 1.0f) {
@@ -450,7 +450,7 @@ public class DirectColorModel extends PackedColorModel {
* pixel.
* @see ColorModel#getRGBdefault
*/
- final public int getRGB(int pixel) {
+ public final int getRGB(int pixel) {
if (is_sRGB || is_LinearRGB) {
return (getAlpha(pixel) << 24)
| (getRed(pixel) << 16)
@@ -923,7 +923,7 @@ public class DirectColorModel extends PackedColorModel {
* @return an array containing the color and alpha components of the
* specified pixel starting at the specified offset.
*/
- final public int[] getComponents(int pixel, int[] components, int offset) {
+ public final int[] getComponents(int pixel, int[] components, int offset) {
if (components == null) {
components = new int[offset+numComponents];
}
@@ -974,7 +974,7 @@ public class DirectColorModel extends PackedColorModel {
* <code>transferType</code> is not supported by this
* color model
*/
- final public int[] getComponents(Object pixel, int[] components,
+ public final int[] getComponents(Object pixel, int[] components,
int offset) {
int intpixel=0;
switch (transferType) {
@@ -1010,7 +1010,7 @@ public class DirectColorModel extends PackedColorModel {
* @see WritableRaster
* @see SampleModel
*/
- final public WritableRaster createCompatibleWritableRaster (int w,
+ public final WritableRaster createCompatibleWritableRaster (int w,
int h) {
if ((w <= 0) || (h <= 0)) {
throw new IllegalArgumentException("Width (" + w + ") and height (" + h +
@@ -1173,7 +1173,7 @@ public class DirectColorModel extends PackedColorModel {
* <code>transferType</code> is not supported by this
* color model
*/
- final public ColorModel coerceData (WritableRaster raster,
+ public final ColorModel coerceData (WritableRaster raster,
boolean isAlphaPremultiplied)
{
if (!supportsAlpha ||
diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java b/jdk/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java
index 16431ebc8afb7272e12c1022e6211e64b3d737fe..ae1b85c145398499b23c2fd3fe0a2256745710ae 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java
@@ -135,7 +135,7 @@ public class IndexColorModel extends ColorModel {
private static int[] opaqueBits = {8, 8, 8};
private static int[] alphaBits = {8, 8, 8, 8};
- static private native void initIDs();
+ private static native void initIDs();
static {
ColorModel.loadLibraries();
initIDs();
@@ -634,7 +634,7 @@ public class IndexColorModel extends ColorModel {
* <code>IndexColorModel</code>.
* @return the size of the color and alpha component arrays.
*/
- final public int getMapSize() {
+ public final int getMapSize() {
return map_size;
}
@@ -650,7 +650,7 @@ public class IndexColorModel extends ColorModel {
* <code>IndexColorModel</code> object, or -1 if there
* is no such pixel
*/
- final public int getTransparentPixel() {
+ public final int getTransparentPixel() {
return transparent_index;
}
@@ -661,7 +661,7 @@ public class IndexColorModel extends ColorModel {
* @param r the specified array into which the elements of the
* array of red color components are copied
*/
- final public void getReds(byte r[]) {
+ public final void getReds(byte r[]) {
for (int i = 0; i < map_size; i++) {
r[i] = (byte) (rgb[i] >> 16);
}
@@ -674,7 +674,7 @@ public class IndexColorModel extends ColorModel {
* @param g the specified array into which the elements of the
* array of green color components are copied
*/
- final public void getGreens(byte g[]) {
+ public final void getGreens(byte g[]) {
for (int i = 0; i < map_size; i++) {
g[i] = (byte) (rgb[i] >> 8);
}
@@ -687,7 +687,7 @@ public class IndexColorModel extends ColorModel {
* @param b the specified array into which the elements of the
* array of blue color components are copied
*/
- final public void getBlues(byte b[]) {
+ public final void getBlues(byte b[]) {
for (int i = 0; i < map_size; i++) {
b[i] = (byte) rgb[i];
}
@@ -700,7 +700,7 @@ public class IndexColorModel extends ColorModel {
* @param a the specified array into which the elements of the
* array of alpha components are copied
*/
- final public void getAlphas(byte a[]) {
+ public final void getAlphas(byte a[]) {
for (int i = 0; i < map_size; i++) {
a[i] = (byte) (rgb[i] >> 24);
}
@@ -717,7 +717,7 @@ public class IndexColorModel extends ColorModel {
* values from this array of color and alpha components
* are copied.
*/
- final public void getRGBs(int rgb[]) {
+ public final void getRGBs(int rgb[]) {
System.arraycopy(this.rgb, 0, rgb, 0, map_size);
}
@@ -776,7 +776,7 @@ public class IndexColorModel extends ColorModel {
* @param pixel the specified pixel
* @return the value of the red color component for the specified pixel
*/
- final public int getRed(int pixel) {
+ public final int getRed(int pixel) {
return (rgb[pixel & pixel_mask] >> 16) & 0xff;
}
@@ -791,7 +791,7 @@ public class IndexColorModel extends ColorModel {
* @param pixel the specified pixel
* @return the value of the green color component for the specified pixel
*/
- final public int getGreen(int pixel) {
+ public final int getGreen(int pixel) {
return (rgb[pixel & pixel_mask] >> 8) & 0xff;
}
@@ -806,7 +806,7 @@ public class IndexColorModel extends ColorModel {
* @param pixel the specified pixel
* @return the value of the blue color component for the specified pixel
*/
- final public int getBlue(int pixel) {
+ public final int getBlue(int pixel) {
return rgb[pixel & pixel_mask] & 0xff;
}
@@ -819,7 +819,7 @@ public class IndexColorModel extends ColorModel {
* @param pixel the specified pixel
* @return the value of the alpha component for the specified pixel
*/
- final public int getAlpha(int pixel) {
+ public final int getAlpha(int pixel) {
return (rgb[pixel & pixel_mask] >> 24) & 0xff;
}
@@ -834,7 +834,7 @@ public class IndexColorModel extends ColorModel {
* @return the color and alpha components of the specified pixel
* @see ColorModel#getRGBdefault
*/
- final public int getRGB(int pixel) {
+ public final int getRGB(int pixel) {
return rgb[pixel & pixel_mask];
}
diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/Kernel.java b/jdk/src/java.desktop/share/classes/java/awt/image/Kernel.java
index 71b58094cc0a47da81a544226971998695f8bb9e..ef5b547f6a0578ba193ccc0f7d904390f5f2a2cc 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/image/Kernel.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/image/Kernel.java
@@ -83,7 +83,7 @@ public class Kernel implements Cloneable {
* Returns the X origin of this <code>Kernel</code>.
* @return the X origin.
*/
- final public int getXOrigin(){
+ public final int getXOrigin(){
return xOrigin;
}
@@ -91,7 +91,7 @@ public class Kernel implements Cloneable {
* Returns the Y origin of this <code>Kernel</code>.
* @return the Y origin.
*/
- final public int getYOrigin() {
+ public final int getYOrigin() {
return yOrigin;
}
@@ -99,7 +99,7 @@ public class Kernel implements Cloneable {
* Returns the width of this <code>Kernel</code>.
* @return the width of this <code>Kernel</code>.
*/
- final public int getWidth() {
+ public final int getWidth() {
return width;
}
@@ -107,7 +107,7 @@ public class Kernel implements Cloneable {
* Returns the height of this <code>Kernel</code>.
* @return the height of this <code>Kernel</code>.
*/
- final public int getHeight() {
+ public final int getHeight() {
return height;
}
@@ -123,7 +123,7 @@ public class Kernel implements Cloneable {
* @throws IllegalArgumentException if <code>data</code> is less
* than the size of this <code>Kernel</code>
*/
- final public float[] getKernelData(float[] data) {
+ public final float[] getKernelData(float[] data) {
if (data == null) {
data = new float[this.data.length];
}
diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/PackedColorModel.java b/jdk/src/java.desktop/share/classes/java/awt/image/PackedColorModel.java
index 1ff6ecd0b10b01db074fa560d20470f7d44a921b..f084fdda04e6a029bd6876968f69bfaa8d096032 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/image/PackedColorModel.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/image/PackedColorModel.java
@@ -240,7 +240,7 @@ public abstract class PackedColorModel extends ColorModel {
* <code>PackedColorModel</code> or if <code>index</code> is
* less than zero
*/
- final public int getMask(int index) {
+ public final int getMask(int index) {
return maskArray[index];
}
@@ -251,7 +251,7 @@ public abstract class PackedColorModel extends ColorModel {
* <code>int</code> pixel
* representation contain the color or alpha samples.
*/
- final public int[] getMasks() {
+ public final int[] getMasks() {
return maskArray.clone();
}
@@ -415,7 +415,7 @@ public abstract class PackedColorModel extends ColorModel {
return true;
}
- private final static int[] createBitsArray(int[]colorMaskArray,
+ private static final int[] createBitsArray(int[]colorMaskArray,
int alphaMask) {
int numColors = colorMaskArray.length;
int numAlpha = (alphaMask == 0 ? 0 : 1);
@@ -438,7 +438,7 @@ public abstract class PackedColorModel extends ColorModel {
return arr;
}
- private final static int[] createBitsArray(int rmask, int gmask, int bmask,
+ private static final int[] createBitsArray(int rmask, int gmask, int bmask,
int amask) {
int[] arr = new int[3 + (amask == 0 ? 0 : 1)];
arr[0] = countBits(rmask);
@@ -466,7 +466,7 @@ public abstract class PackedColorModel extends ColorModel {
return arr;
}
- private final static int countBits(int mask) {
+ private static final int countBits(int mask) {
int count = 0;
if (mask != 0) {
while ((mask & 1) == 0) {
diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/Raster.java b/jdk/src/java.desktop/share/classes/java/awt/image/Raster.java
index 2b0592168faad170d65ec5a96091df4225ed6247..db350da62ce83a1353675f32b0912c16a779090b 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/image/Raster.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/image/Raster.java
@@ -167,7 +167,7 @@ public class Raster {
/** The parent of this Raster, or null. */
protected Raster parent;
- static private native void initIDs();
+ private static native void initIDs();
static {
ColorModel.loadLibraries();
initIDs();
@@ -1139,7 +1139,7 @@ public class Raster {
* @return the X translation from the coordinate space of the
* Raster's SampleModel to that of the Raster.
*/
- final public int getSampleModelTranslateX() {
+ public final int getSampleModelTranslateX() {
return sampleModelTranslateX;
}
@@ -1151,7 +1151,7 @@ public class Raster {
* @return the Y translation from the coordinate space of the
* Raster's SampleModel to that of the Raster.
*/
- final public int getSampleModelTranslateY() {
+ public final int getSampleModelTranslateY() {
return sampleModelTranslateY;
}
@@ -1360,35 +1360,35 @@ public class Raster {
/** Returns the minimum valid X coordinate of the Raster.
* @return the minimum x coordinate of this <code>Raster</code>.
*/
- final public int getMinX() {
+ public final int getMinX() {
return minX;
}
/** Returns the minimum valid Y coordinate of the Raster.
* @return the minimum y coordinate of this <code>Raster</code>.
*/
- final public int getMinY() {
+ public final int getMinY() {
return minY;
}
/** Returns the width in pixels of the Raster.
* @return the width of this <code>Raster</code>.
*/
- final public int getWidth() {
+ public final int getWidth() {
return width;
}
/** Returns the height in pixels of the Raster.
* @return the height of this <code>Raster</code>.
*/
- final public int getHeight() {
+ public final int getHeight() {
return height;
}
/** Returns the number of bands (samples per pixel) in this Raster.
* @return the number of bands of this <code>Raster</code>.
*/
- final public int getNumBands() {
+ public final int getNumBands() {
return numBands;
}
@@ -1403,7 +1403,7 @@ public class Raster {
* as the storage data type of the DataBuffer.
* @return the number of data elements.
*/
- final public int getNumDataElements() {
+ public final int getNumDataElements() {
return sampleModel.getNumDataElements();
}
@@ -1419,7 +1419,7 @@ public class Raster {
* be one of the types defined in DataBuffer.
* @return this transfer type.
*/
- final public int getTransferType() {
+ public final int getTransferType() {
return sampleModel.getTransferType();
}
diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/RescaleOp.java b/jdk/src/java.desktop/share/classes/java/awt/image/RescaleOp.java
index 1bf21db235457bda70d3c4065d9093872e4c79d1..b2d09dbe67ec2200d49f855147d90de278a22f22 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/image/RescaleOp.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/image/RescaleOp.java
@@ -142,7 +142,7 @@ public class RescaleOp implements BufferedImageOp, RasterOp {
* this <code>RescaleOp</code>
* @return the scale factors of this <code>RescaleOp</code>.
*/
- final public float[] getScaleFactors (float scaleFactors[]) {
+ public final float[] getScaleFactors (float scaleFactors[]) {
if (scaleFactors == null) {
return this.scaleFactors.clone();
}
@@ -160,7 +160,7 @@ public class RescaleOp implements BufferedImageOp, RasterOp {
* this <code>RescaleOp</code>
* @return the offsets of this <code>RescaleOp</code>.
*/
- final public float[] getOffsets(float offsets[]) {
+ public final float[] getOffsets(float offsets[]) {
if (offsets == null) {
return this.offsets.clone();
}
@@ -176,7 +176,7 @@ public class RescaleOp implements BufferedImageOp, RasterOp {
* @return the number of scaling factors and offsets of this
* <code>RescaleOp</code>.
*/
- final public int getNumFactors() {
+ public final int getNumFactors() {
return length;
}
diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/SampleModel.java b/jdk/src/java.desktop/share/classes/java/awt/image/SampleModel.java
index d21b45271b49b5d67526c9f5dec2d2cf52c2da25..5356e70fa75849233de70347ffa1daf0871487c7 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/image/SampleModel.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/image/SampleModel.java
@@ -99,7 +99,7 @@ public abstract class SampleModel
*/
protected int dataType;
- static private native void initIDs();
+ private static native void initIDs();
static {
ColorModel.loadLibraries();
initIDs();
@@ -153,7 +153,7 @@ public abstract class SampleModel
* @return the width in pixels of the region of image data
* that this <code>SampleModel</code> describes.
*/
- final public int getWidth() {
+ public final int getWidth() {
return width;
}
@@ -161,7 +161,7 @@ public abstract class SampleModel
* @return the height in pixels of the region of image data
* that this <code>SampleModel</code> describes.
*/
- final public int getHeight() {
+ public final int getHeight() {
return height;
}
@@ -169,7 +169,7 @@ public abstract class SampleModel
* @return the number of bands of image data that this
* <code>SampleModel</code> describes.
*/
- final public int getNumBands() {
+ public final int getNumBands() {
return numBands;
}
@@ -193,7 +193,7 @@ public abstract class SampleModel
/** Returns the data type of the DataBuffer storing the pixel data.
* @return the data type.
*/
- final public int getDataType() {
+ public final int getDataType() {
return dataType;
}
diff --git a/jdk/src/java.desktop/share/classes/java/beans/BeanInfo.java b/jdk/src/java.desktop/share/classes/java/beans/BeanInfo.java
index 92be1eb81a45e8c49e14c6e6295f77e9badb0397..ed40e177c89ae439425544ac100ce0f57b56892f 100644
--- a/jdk/src/java.desktop/share/classes/java/beans/BeanInfo.java
+++ b/jdk/src/java.desktop/share/classes/java/beans/BeanInfo.java
@@ -159,20 +159,20 @@ public interface BeanInfo {
/**
* Constant to indicate a 16 x 16 color icon.
*/
- final static int ICON_COLOR_16x16 = 1;
+ static final int ICON_COLOR_16x16 = 1;
/**
* Constant to indicate a 32 x 32 color icon.
*/
- final static int ICON_COLOR_32x32 = 2;
+ static final int ICON_COLOR_32x32 = 2;
/**
* Constant to indicate a 16 x 16 monochrome icon.
*/
- final static int ICON_MONO_16x16 = 3;
+ static final int ICON_MONO_16x16 = 3;
/**
* Constant to indicate a 32 x 32 monochrome icon.
*/
- final static int ICON_MONO_32x32 = 4;
+ static final int ICON_MONO_32x32 = 4;
}
diff --git a/jdk/src/java.desktop/share/classes/java/beans/Introspector.java b/jdk/src/java.desktop/share/classes/java/beans/Introspector.java
index 6b88e9a87fb307d2d38e1d3f4a05dd0515e2def4..12ef918d8c6db91d8745fcc1adee4f06c142f25c 100644
--- a/jdk/src/java.desktop/share/classes/java/beans/Introspector.java
+++ b/jdk/src/java.desktop/share/classes/java/beans/Introspector.java
@@ -102,17 +102,17 @@ public class Introspector {
* Flag to indicate to use of all beaninfo.
* @since 1.2
*/
- public final static int USE_ALL_BEANINFO = 1;
+ public static final int USE_ALL_BEANINFO = 1;
/**
* Flag to indicate to ignore immediate beaninfo.
* @since 1.2
*/
- public final static int IGNORE_IMMEDIATE_BEANINFO = 2;
+ public static final int IGNORE_IMMEDIATE_BEANINFO = 2;
/**
* Flag to indicate to ignore all beaninfo.
* @since 1.2
*/
- public final static int IGNORE_ALL_BEANINFO = 3;
+ public static final int IGNORE_ALL_BEANINFO = 3;
// Static Caches to speed up introspection.
private static final WeakCache<Class<?>, Method[]> declaredMethodCache = new WeakCache<>();
@@ -139,7 +139,7 @@ public class Introspector {
// events maps from String names to EventSetDescriptors
private Map<String, EventSetDescriptor> events;
- private final static EventSetDescriptor[] EMPTY_EVENTSETDESCRIPTORS = new EventSetDescriptor[0];
+ private static final EventSetDescriptor[] EMPTY_EVENTSETDESCRIPTORS = new EventSetDescriptor[0];
static final String ADD_PREFIX = "add";
static final String REMOVE_PREFIX = "remove";
diff --git a/jdk/src/java.desktop/share/classes/java/beans/MetaData.java b/jdk/src/java.desktop/share/classes/java/beans/MetaData.java
index ee64475b8c43425937991b279fd9b8d824a96c33..40662cf772a942ac69181717a0d63f57537127ca 100644
--- a/jdk/src/java.desktop/share/classes/java/beans/MetaData.java
+++ b/jdk/src/java.desktop/share/classes/java/beans/MetaData.java
@@ -356,7 +356,7 @@ delegates to be registered with concrete classes.
*
* @author Sergey A. Malenkov
*/
-private static abstract class java_util_Collections extends PersistenceDelegate {
+private abstract static class java_util_Collections extends PersistenceDelegate {
protected boolean mutatesTo(Object oldInstance, Object newInstance) {
if (!super.mutatesTo(oldInstance, newInstance)) {
return false;
@@ -1319,7 +1319,7 @@ static final class sun_swing_PrintColorUIResource_PersistenceDelegate extends Pe
}
@SuppressWarnings("rawtypes")
- public synchronized static PersistenceDelegate getPersistenceDelegate(Class type) {
+ public static synchronized PersistenceDelegate getPersistenceDelegate(Class type) {
if (type == null) {
return nullPersistenceDelegate;
}
diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleRole.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleRole.java
index c7ed50f32d35c2eeb1f4185fd6303fe1467efc2a..d154cf7e93354c09f115dfdb5db717dcb9d9504c 100644
--- a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleRole.java
+++ b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleRole.java
@@ -588,7 +588,7 @@ public class AccessibleRole extends AccessibleBundle {
*
* @since 1.5
*/
- static public final AccessibleRole EDITBAR =
+ public static final AccessibleRole EDITBAR =
new AccessibleRole("editbar");
/**
@@ -597,7 +597,7 @@ public class AccessibleRole extends AccessibleBundle {
*
* @since 1.5
*/
- static public final AccessibleRole PROGRESS_MONITOR =
+ public static final AccessibleRole PROGRESS_MONITOR =
new AccessibleRole("progressMonitor");
diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleState.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleState.java
index 746f1d97daa5d29c81c3ebba10ba26bb4abe1f46..3417d3ecdcfa426696a3744c844cea5d5ca44de2 100644
--- a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleState.java
+++ b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleState.java
@@ -353,7 +353,7 @@ public class AccessibleState extends AccessibleBundle {
*
* @since 1.5
*/
- static public final AccessibleState TRUNCATED
+ public static final AccessibleState TRUNCATED
= new AccessibleState("truncated");
/**
diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java b/jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java
index 0402993cc5fe0b8fd3a379b9aa4238249598b32c..8bc873cfabc50cba1759955e65627b6ee20bf5ba 100644
--- a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java
+++ b/jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java
@@ -1252,7 +1252,7 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat {
// Standard format descriptor
- private synchronized static void createStandardFormat() {
+ private static synchronized void createStandardFormat() {
if (standardFormat == null) {
standardFormat = new StandardMetadataFormat();
}
diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaSize.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaSize.java
index e21d8b52c1e6f1c5eb7bed1eafef34011553b9f6..b6fdbdccb4f73cc0fc2a8705f0e9adbaed97d59f 100644
--- a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaSize.java
+++ b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaSize.java
@@ -288,7 +288,7 @@ public class MediaSize extends Size2DSyntax implements Attribute {
* Class MediaSize.ISO includes {@link MediaSize MediaSize} values for ISO
* media.
*/
- public final static class ISO {
+ public static final class ISO {
/**
* Specifies the ISO A0 size, 841 mm by 1189 mm.
*/
@@ -437,7 +437,7 @@ public class MediaSize extends Size2DSyntax implements Attribute {
* Class MediaSize.JIS includes {@link MediaSize MediaSize} values for JIS
* (Japanese) media. *
*/
- public final static class JIS {
+ public static final class JIS {
/**
* Specifies the JIS B0 size, 1030 mm by 1456 mm.
@@ -601,7 +601,7 @@ public class MediaSize extends Size2DSyntax implements Attribute {
* Class MediaSize.NA includes {@link MediaSize MediaSize} values for North
* American media.
*/
- public final static class NA {
+ public static final class NA {
/**
* Specifies the North American letter size, 8.5 inches by 11 inches.
@@ -721,7 +721,7 @@ public class MediaSize extends Size2DSyntax implements Attribute {
* Class MediaSize.Engineering includes {@link MediaSize MediaSize} values
* for engineering media.
*/
- public final static class Engineering {
+ public static final class Engineering {
/**
* Specifies the engineering A size, 8.5 inch by 11 inch.
@@ -764,7 +764,7 @@ public class MediaSize extends Size2DSyntax implements Attribute {
* Class MediaSize.Other includes {@link MediaSize MediaSize} values for
* miscellaneous media.
*/
- public final static class Other {
+ public static final class Other {
/**
* Specifies the executive size, 7.25 inches by 10.5 inches.
*/
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MetaMessage.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MetaMessage.java
index 2e73cc37ddfef46d73f36cd3e1ac5768fc36bfb7..edb326852f3fb07d0037b778f885ab96ce791bae 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/MetaMessage.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/MetaMessage.java
@@ -214,7 +214,7 @@ public class MetaMessage extends MidiMessage {
return length;
}
- private final static long mask = 0x7F;
+ private static final long mask = 0x7F;
private void writeVarInt(byte[] data, int off, long value) {
int shift=63; // number of bitwise left-shifts of mask
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/AbstractCellEditor.java b/jdk/src/java.desktop/share/classes/javax/swing/AbstractCellEditor.java
index 993ca5c200ef349b23223600b19944f2e38fabae..9479eb0669473774634051476e91b6e3a039d22f 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/AbstractCellEditor.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/AbstractCellEditor.java
@@ -60,7 +60,7 @@ public abstract class AbstractCellEditor implements CellEditor, Serializable {
/**
* The change event.
*/
- transient protected ChangeEvent changeEvent = null;
+ protected transient ChangeEvent changeEvent = null;
// Force this to be implemented.
// public Object getCellEditorValue()
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/BorderFactory.java b/jdk/src/java.desktop/share/classes/javax/swing/BorderFactory.java
index c1e3ad166799c6eeb056abd6a1c2b8aaa45d3680..f1013e50d1b392a39986a8eb3d6d17895bda30d9 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/BorderFactory.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/BorderFactory.java
@@ -536,7 +536,7 @@ public class BorderFactory
titlePosition, titleFont, titleColor);
}
//// EmptyBorder ///////////////////////////////////////////////////////////
- final static Border emptyBorder = new EmptyBorder(0, 0, 0, 0);
+ static final Border emptyBorder = new EmptyBorder(0, 0, 0, 0);
/**
* Creates an empty border that takes up no space. (The width
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java b/jdk/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java
index fe2ddd143cd7fab1576f550370c7825da1f67bb5..ac8216af4a6fb94d8c48639813bce9001dbea647 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java
@@ -89,33 +89,33 @@ public class DefaultButtonModel implements ButtonModel, Serializable {
* indicates partial commitment towards choosing/triggering
* the button.
*/
- public final static int ARMED = 1 << 0;
+ public static final int ARMED = 1 << 0;
/**
* Identifies the "selected" bit in the bitmask, which
* indicates that the button has been selected. Only needed for
* certain types of buttons - such as radio button or check box.
*/
- public final static int SELECTED = 1 << 1;
+ public static final int SELECTED = 1 << 1;
/**
* Identifies the "pressed" bit in the bitmask, which
* indicates that the button is pressed.
*/
- public final static int PRESSED = 1 << 2;
+ public static final int PRESSED = 1 << 2;
/**
* Identifies the "enabled" bit in the bitmask, which
* indicates that the button can be selected by
* an input device (such as a mouse pointer).
*/
- public final static int ENABLED = 1 << 3;
+ public static final int ENABLED = 1 << 3;
/**
* Identifies the "rollover" bit in the bitmask, which
* indicates that the mouse is over the button.
*/
- public final static int ROLLOVER = 1 << 4;
+ public static final int ROLLOVER = 1 << 4;
/**
* {@inheritDoc}
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DefaultDesktopManager.java b/jdk/src/java.desktop/share/classes/javax/swing/DefaultDesktopManager.java
index 49eecf1e77cd544d4ee1092af042664fb6635c7c..e28f446a5f2cf54e533cddbee97db7b559148aed 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/DefaultDesktopManager.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/DefaultDesktopManager.java
@@ -50,11 +50,11 @@ import java.beans.PropertyVetoException;
*/
@SuppressWarnings("serial") // No Interesting Non-Transient State
public class DefaultDesktopManager implements DesktopManager, java.io.Serializable {
- final static String HAS_BEEN_ICONIFIED_PROPERTY = "wasIconOnce";
+ static final String HAS_BEEN_ICONIFIED_PROPERTY = "wasIconOnce";
- final static int DEFAULT_DRAG_MODE = 0;
- final static int OUTLINE_DRAG_MODE = 1;
- final static int FASTER_DRAG_MODE = 2;
+ static final int DEFAULT_DRAG_MODE = 0;
+ static final int OUTLINE_DRAG_MODE = 1;
+ static final int FASTER_DRAG_MODE = 2;
int dragMode = DEFAULT_DRAG_MODE;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/GroupLayout.java b/jdk/src/java.desktop/share/classes/javax/swing/GroupLayout.java
index b1012ce1a8c214f60d32e2a84b03c823bef2df8d..40ead7d79df6cc7a668a6ed7f08690643dfc3266 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/GroupLayout.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/GroupLayout.java
@@ -3391,7 +3391,7 @@ public class GroupLayout implements LayoutManager2 {
* Represents two springs that should have autopadding inserted between
* them.
*/
- private final static class AutoPreferredGapMatch {
+ private static final class AutoPreferredGapMatch {
public final ComponentSpring source;
public final ComponentSpring target;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/ImageIcon.java b/jdk/src/java.desktop/share/classes/javax/swing/ImageIcon.java
index 564e173c5c8acbd399bd66797c64c834578e50be..8c913e173329fde2896dab46360a21fc8c3a37d3 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/ImageIcon.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/ImageIcon.java
@@ -74,8 +74,8 @@ public class ImageIcon implements Icon, Serializable, Accessible {
* images symbolically rather than including the image data
* in the archive.
*/
- transient private String filename;
- transient private URL location;
+ private transient String filename;
+ private transient URL location;
transient Image image;
transient int loadStatus = 0;
@@ -88,7 +88,7 @@ public class ImageIcon implements Icon, Serializable, Accessible {
* @deprecated since 1.8
*/
@Deprecated
- protected final static Component component;
+ protected static final Component component;
/**
* Do not use this shared media tracker, which is used to load images.
@@ -96,7 +96,7 @@ public class ImageIcon implements Icon, Serializable, Accessible {
* @deprecated since 1.8
*/
@Deprecated
- protected final static MediaTracker tracker;
+ protected static final MediaTracker tracker;
static {
component = AccessController.doPrivileged(new PrivilegedAction<Component>() {
@@ -144,7 +144,7 @@ public class ImageIcon implements Icon, Serializable, Accessible {
*/
private static int mediaTrackerID;
- private final static Object TRACKER_KEY = new StringBuilder("TRACKER_KEY");
+ private static final Object TRACKER_KEY = new StringBuilder("TRACKER_KEY");
int width = -1;
int height = -1;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JComponent.java b/jdk/src/java.desktop/share/classes/javax/swing/JComponent.java
index e716698ae5ef712527875500a031a1f5c34982d6..d00d42c8bbbda3abeed76659f9f559c518a2cbb5 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JComponent.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JComponent.java
@@ -377,8 +377,8 @@ public abstract class JComponent extends Container implements Serializable,
/**
* AA text hints.
*/
- transient private Object aaHint;
- transient private Object lcdRenderingHint;
+ private transient Object aaHint;
+ private transient Object lcdRenderingHint;
static Graphics safelyGetGraphics(Component c) {
return safelyGetGraphics(c, SwingUtilities.getRoot(c));
@@ -2805,7 +2805,7 @@ public abstract class JComponent extends Container implements Serializable,
* @see #setLocale
* @since 1.4
*/
- static public Locale getDefaultLocale() {
+ public static Locale getDefaultLocale() {
Locale l = (Locale) SwingUtilities.appContextGet(defaultLocale);
if( l == null ) {
//REMIND(bcb) choosing the default value is more complicated
@@ -2832,7 +2832,7 @@ public abstract class JComponent extends Container implements Serializable,
* @see #setLocale
* @since 1.4
*/
- static public void setDefaultLocale( Locale l ) {
+ public static void setDefaultLocale( Locale l ) {
SwingUtilities.appContextPut(defaultLocale, l);
}
@@ -3714,7 +3714,7 @@ public abstract class JComponent extends Container implements Serializable,
* to add/remove ContainerListener and FocusListener to track
* target JComponent's state
*/
- private volatile transient int propertyListenersCount = 0;
+ private transient volatile int propertyListenersCount = 0;
/**
* This field duplicates the function of the accessibleAWTFocusHandler field
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JEditorPane.java b/jdk/src/java.desktop/share/classes/javax/swing/JEditorPane.java
index 744535d77b84a3336cc2bbae7b484d00a2eaf936..cfcd56585bef8296c705230d7c6eb0368d66a772 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JEditorPane.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JEditorPane.java
@@ -1537,7 +1537,7 @@ public class JEditorPane extends JTextComponent {
private Hashtable<String, Object> pageProperties;
/** Should be kept in sync with javax.swing.text.html.FormView counterpart. */
- final static String PostDataProperty = "javax.swing.JEditorPane.postdata";
+ static final String PostDataProperty = "javax.swing.JEditorPane.postdata";
/**
* Table of registered type handlers for this editor.
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JFormattedTextField.java b/jdk/src/java.desktop/share/classes/javax/swing/JFormattedTextField.java
index 3eedeb0a554de1ccfca89d7111770ed34c2a19c1..e15d327a0f8a279bcb7810b8ca66df49d7e1e05b 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JFormattedTextField.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JFormattedTextField.java
@@ -860,7 +860,7 @@ public class JFormattedTextField extends JTextField {
* doesn't have focus.
* @since 1.4
*/
- public static abstract class AbstractFormatterFactory {
+ public abstract static class AbstractFormatterFactory {
/**
* Returns an <code>AbstractFormatter</code> that can handle formatting
* of the passed in <code>JFormattedTextField</code>.
@@ -903,7 +903,7 @@ public class JFormattedTextField extends JTextField {
* at the appropriate times.
* @since 1.4
*/
- public static abstract class AbstractFormatter implements Serializable {
+ public abstract static class AbstractFormatter implements Serializable {
private JFormattedTextField ftf;
/**
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JInternalFrame.java b/jdk/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
index 06aff62f849582a0adb98b11ab0ca8a4c8437b44..8860915a82e64e1c0f864faa8f156f49687af119 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
@@ -198,31 +198,31 @@ public class JInternalFrame extends JComponent implements
private Component lastFocusOwner;
/** Bound property name. */
- public final static String CONTENT_PANE_PROPERTY = "contentPane";
+ public static final String CONTENT_PANE_PROPERTY = "contentPane";
/** Bound property name. */
- public final static String MENU_BAR_PROPERTY = "JMenuBar";
+ public static final String MENU_BAR_PROPERTY = "JMenuBar";
/** Bound property name. */
- public final static String TITLE_PROPERTY = "title";
+ public static final String TITLE_PROPERTY = "title";
/** Bound property name. */
- public final static String LAYERED_PANE_PROPERTY = "layeredPane";
+ public static final String LAYERED_PANE_PROPERTY = "layeredPane";
/** Bound property name. */
- public final static String ROOT_PANE_PROPERTY = "rootPane";
+ public static final String ROOT_PANE_PROPERTY = "rootPane";
/** Bound property name. */
- public final static String GLASS_PANE_PROPERTY = "glassPane";
+ public static final String GLASS_PANE_PROPERTY = "glassPane";
/** Bound property name. */
- public final static String FRAME_ICON_PROPERTY = "frameIcon";
+ public static final String FRAME_ICON_PROPERTY = "frameIcon";
/**
* Constrained property name indicated that this frame has
* selected status.
*/
- public final static String IS_SELECTED_PROPERTY = "selected";
+ public static final String IS_SELECTED_PROPERTY = "selected";
/** Constrained property name indicating that the internal frame is closed. */
- public final static String IS_CLOSED_PROPERTY = "closed";
+ public static final String IS_CLOSED_PROPERTY = "closed";
/** Constrained property name indicating that the internal frame is maximized. */
- public final static String IS_MAXIMUM_PROPERTY = "maximum";
+ public static final String IS_MAXIMUM_PROPERTY = "maximum";
/** Constrained property name indicating that the internal frame is iconified. */
- public final static String IS_ICON_PROPERTY = "icon";
+ public static final String IS_ICON_PROPERTY = "icon";
private static final Object PROPERTY_CHANGE_LISTENER_KEY =
new StringBuilder("InternalFramePropertyChangeListener");
@@ -2159,7 +2159,7 @@ public class JInternalFrame extends JComponent implements
* @author David Kloba
*/
@SuppressWarnings("serial") // Same-version serialization only
- static public class JDesktopIcon extends JComponent implements Accessible
+ public static class JDesktopIcon extends JComponent implements Accessible
{
JInternalFrame internalFrame;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JLayeredPane.java b/jdk/src/java.desktop/share/classes/javax/swing/JLayeredPane.java
index 4a891217e2dab1859ffd32dfa3994803206eb6f5..ce5998f8f56dc9e6255a61b17c86e49caf9db325 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JLayeredPane.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JLayeredPane.java
@@ -159,25 +159,25 @@ import javax.accessibility.*;
public class JLayeredPane extends JComponent implements Accessible {
/// Watch the values in getObjectForLayer()
/** Convenience object defining the Default layer. Equivalent to new Integer(0).*/
- public final static Integer DEFAULT_LAYER = 0;
+ public static final Integer DEFAULT_LAYER = 0;
/** Convenience object defining the Palette layer. Equivalent to new Integer(100).*/
- public final static Integer PALETTE_LAYER = 100;
+ public static final Integer PALETTE_LAYER = 100;
/** Convenience object defining the Modal layer. Equivalent to new Integer(200).*/
- public final static Integer MODAL_LAYER = 200;
+ public static final Integer MODAL_LAYER = 200;
/** Convenience object defining the Popup layer. Equivalent to new Integer(300).*/
- public final static Integer POPUP_LAYER = 300;
+ public static final Integer POPUP_LAYER = 300;
/** Convenience object defining the Drag layer. Equivalent to new Integer(400).*/
- public final static Integer DRAG_LAYER = 400;
+ public static final Integer DRAG_LAYER = 400;
/** Convenience object defining the Frame Content layer.
* This layer is normally only use to position the contentPane and menuBar
* components of JFrame.
* Equivalent to new Integer(-30000).
* @see JFrame
*/
- public final static Integer FRAME_CONTENT_LAYER = new Integer(-30000);
+ public static final Integer FRAME_CONTENT_LAYER = new Integer(-30000);
/** Bound property */
- public final static String LAYER_PROPERTY = "layeredContainerLayer";
+ public static final String LAYER_PROPERTY = "layeredContainerLayer";
// Hashtable to store layer values for non-JComponent components
private Hashtable<Component,Integer> componentToLayer;
private boolean optimizedDrawingPossible = true;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JList.java b/jdk/src/java.desktop/share/classes/javax/swing/JList.java
index 82ba88e3311c821b90f969639aab477232eae6c1..14379bd566868ea49227f49a99b1e26cfa9714ba 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JList.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JList.java
@@ -161,8 +161,8 @@ import static sun.swing.SwingUtilities2.Section.*;
* // Display an icon and a string for each object in the list.
*
* class MyCellRenderer extends JLabel implements ListCellRenderer<Object> {
- * final static ImageIcon longIcon = new ImageIcon("long.gif");
- * final static ImageIcon shortIcon = new ImageIcon("short.gif");
+ * static final ImageIcon longIcon = new ImageIcon("long.gif");
+ * static final ImageIcon shortIcon = new ImageIcon("short.gif");
*
* // This is the only method defined by ListCellRenderer.
* // We just reconfigure the JLabel each time we're called.
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JOptionPane.java b/jdk/src/java.desktop/share/classes/javax/swing/JOptionPane.java
index 45fbcceb83f705a5ba344e9ebb86f6d430228bf0..491fddee12f170ba4dc7f2b70508402c59e8b828 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JOptionPane.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JOptionPane.java
@@ -394,13 +394,13 @@ public class JOptionPane extends JComponent implements Accessible
public static final String WANTS_INPUT_PROPERTY = "wantsInput";
/** Icon used in pane. */
- transient protected Icon icon;
+ protected transient Icon icon;
/** Message to display. */
- transient protected Object message;
+ protected transient Object message;
/** Options to display to the user. */
- transient protected Object[] options;
+ protected transient Object[] options;
/** Value that should be initially selected in <code>options</code>. */
- transient protected Object initialValue;
+ protected transient Object initialValue;
/** Message type. */
protected int messageType;
/**
@@ -412,7 +412,7 @@ public class JOptionPane extends JComponent implements Accessible
protected int optionType;
/** Currently selected value, will be a valid option, or
* <code>UNINITIALIZED_VALUE</code> or <code>null</code>. */
- transient protected Object value;
+ protected transient Object value;
/** Array of values the user can choose from. Look and feel will
* provide the UI component to choose this from. */
protected transient Object[] selectionValues;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JPopupMenu.java b/jdk/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
index 89311ba1228691a0822b7ef2419ffa2266d333be..0df8c1263082a84d2af30cebc87fc4f86bc2672e 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
@@ -1545,7 +1545,7 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
* A popup menu-specific separator.
*/
@SuppressWarnings("serial")
- static public class Separator extends JSeparator
+ public static class Separator extends JSeparator
{
/**
* Constructs a popup menu-specific Separator.
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JProgressBar.java b/jdk/src/java.desktop/share/classes/javax/swing/JProgressBar.java
index 4026cb84879ea5955a8764b5d01878eaf62434f0..c823176ca3686af76a06eaae0e4db3b01a9c7e31 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JProgressBar.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JProgressBar.java
@@ -190,15 +190,15 @@ public class JProgressBar extends JComponent implements SwingConstants, Accessib
/**
* The default minimum for a progress bar is 0.
*/
- static final private int defaultMinimum = 0;
+ private static final int defaultMinimum = 0;
/**
* The default maximum for a progress bar is 100.
*/
- static final private int defaultMaximum = 100;
+ private static final int defaultMaximum = 100;
/**
* The default orientation for a progress bar is <code>HORIZONTAL</code>.
*/
- static final private int defaultOrientation = HORIZONTAL;
+ private static final int defaultOrientation = HORIZONTAL;
/**
* Only one <code>ChangeEvent</code> is needed per instance since the
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JSplitPane.java b/jdk/src/java.desktop/share/classes/javax/swing/JSplitPane.java
index 072fefd8d3a2e5e65d702d8ef9caee9c18fdb3e7..4b490b76cc47978d234ad4dabcde58d39006acff 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JSplitPane.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JSplitPane.java
@@ -113,7 +113,7 @@ public class JSplitPane extends JComponent implements Accessible
* split along the y axis. For example the two
* <code>Component</code>s will be split one on top of the other.
*/
- public final static int VERTICAL_SPLIT = 0;
+ public static final int VERTICAL_SPLIT = 0;
/**
* Horizontal split indicates the <code>Component</code>s are
@@ -121,75 +121,75 @@ public class JSplitPane extends JComponent implements Accessible
* <code>Component</code>s will be split one to the left of the
* other.
*/
- public final static int HORIZONTAL_SPLIT = 1;
+ public static final int HORIZONTAL_SPLIT = 1;
/**
* Used to add a <code>Component</code> to the left of the other
* <code>Component</code>.
*/
- public final static String LEFT = "left";
+ public static final String LEFT = "left";
/**
* Used to add a <code>Component</code> to the right of the other
* <code>Component</code>.
*/
- public final static String RIGHT = "right";
+ public static final String RIGHT = "right";
/**
* Used to add a <code>Component</code> above the other
* <code>Component</code>.
*/
- public final static String TOP = "top";
+ public static final String TOP = "top";
/**
* Used to add a <code>Component</code> below the other
* <code>Component</code>.
*/
- public final static String BOTTOM = "bottom";
+ public static final String BOTTOM = "bottom";
/**
* Used to add a <code>Component</code> that will represent the divider.
*/
- public final static String DIVIDER = "divider";
+ public static final String DIVIDER = "divider";
/**
* Bound property name for orientation (horizontal or vertical).
*/
- public final static String ORIENTATION_PROPERTY = "orientation";
+ public static final String ORIENTATION_PROPERTY = "orientation";
/**
* Bound property name for continuousLayout.
*/
- public final static String CONTINUOUS_LAYOUT_PROPERTY = "continuousLayout";
+ public static final String CONTINUOUS_LAYOUT_PROPERTY = "continuousLayout";
/**
* Bound property name for border.
*/
- public final static String DIVIDER_SIZE_PROPERTY = "dividerSize";
+ public static final String DIVIDER_SIZE_PROPERTY = "dividerSize";
/**
* Bound property for oneTouchExpandable.
*/
- public final static String ONE_TOUCH_EXPANDABLE_PROPERTY =
+ public static final String ONE_TOUCH_EXPANDABLE_PROPERTY =
"oneTouchExpandable";
/**
* Bound property for lastLocation.
*/
- public final static String LAST_DIVIDER_LOCATION_PROPERTY =
+ public static final String LAST_DIVIDER_LOCATION_PROPERTY =
"lastDividerLocation";
/**
* Bound property for the dividerLocation.
* @since 1.3
*/
- public final static String DIVIDER_LOCATION_PROPERTY = "dividerLocation";
+ public static final String DIVIDER_LOCATION_PROPERTY = "dividerLocation";
/**
* Bound property for weight.
* @since 1.3
*/
- public final static String RESIZE_WEIGHT_PROPERTY = "resizeWeight";
+ public static final String RESIZE_WEIGHT_PROPERTY = "resizeWeight";
/**
* How the views are split.
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JTable.java b/jdk/src/java.desktop/share/classes/javax/swing/JTable.java
index 3bcd70467f0302ecc131c8bea619f5dcbc3b0e90..6b83043597e29c9e6a886cab1205cd50203191f2 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JTable.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JTable.java
@@ -343,27 +343,27 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
protected boolean cellSelectionEnabled;
/** If editing, the <code>Component</code> that is handling the editing. */
- transient protected Component editorComp;
+ protected transient Component editorComp;
/**
* The active cell editor object, that overwrites the screen real estate
* occupied by the current cell and allows the user to change its contents.
* {@code null} if the table isn't currently editing.
*/
- transient protected TableCellEditor cellEditor;
+ protected transient TableCellEditor cellEditor;
/** Identifies the column of the cell being edited. */
- transient protected int editingColumn;
+ protected transient int editingColumn;
/** Identifies the row of the cell being edited. */
- transient protected int editingRow;
+ protected transient int editingRow;
/**
* A table of objects that display the contents of a cell,
* indexed by class as declared in <code>getColumnClass</code>
* in the <code>TableModel</code> interface.
*/
- transient protected Hashtable<Object, Object> defaultRenderersByColumnClass;
+ protected transient Hashtable<Object, Object> defaultRenderersByColumnClass;
// Logicaly, the above is a Hashtable<Class<?>, TableCellRenderer>.
// It is declared otherwise to accomodate using UIDefaults.
@@ -372,7 +372,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
* indexed by class as declared in <code>getColumnClass</code>
* in the <code>TableModel</code> interface.
*/
- transient protected Hashtable<Object, Object> defaultEditorsByColumnClass;
+ protected transient Hashtable<Object, Object> defaultEditorsByColumnClass;
// Logicaly, the above is a Hashtable<Class<?>, TableCellEditor>.
// It is declared otherwise to accomodate using UIDefaults.
@@ -880,7 +880,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
* replaced by <code>new JScrollPane(aTable)</code>.
*/
@Deprecated
- static public JScrollPane createScrollPaneForTable(JTable aTable) {
+ public static JScrollPane createScrollPaneForTable(JTable aTable) {
return new JScrollPane(aTable);
}
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JToolBar.java b/jdk/src/java.desktop/share/classes/javax/swing/JToolBar.java
index 6fff218430f2f7814b7b03a69ed7d847ae401076..0a7e6fef71dac3da0dfe5938c98206f6595eb71a 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JToolBar.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JToolBar.java
@@ -593,7 +593,7 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
* A toolbar-specific separator. An object with dimension but
* no contents used to divide buttons on a tool bar into groups.
*/
- static public class Separator extends JSeparator
+ public static class Separator extends JSeparator
{
private Dimension separatorSize;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JTree.java b/jdk/src/java.desktop/share/classes/javax/swing/JTree.java
index 4cec5c377d735902697e8b472b8b5c592b78f4c1..9d58f86ea09cbf918c9f9615f05846de23e864db 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JTree.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JTree.java
@@ -155,12 +155,12 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* The model that defines the tree displayed by this object.
*/
- transient protected TreeModel treeModel;
+ protected transient TreeModel treeModel;
/**
* Models the set of selected nodes in this tree.
*/
- transient protected TreeSelectionModel selectionModel;
+ protected transient TreeSelectionModel selectionModel;
/**
* True if the root node is displayed, false if its children are
@@ -172,7 +172,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
* The cell used to draw nodes. If <code>null</code>, the UI uses a default
* <code>cellRenderer</code>.
*/
- transient protected TreeCellRenderer cellRenderer;
+ protected transient TreeCellRenderer cellRenderer;
/**
* Height to use for each display row. If this is <= 0 the renderer
@@ -189,7 +189,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
* information must be determined by visiting all the parent
* paths and seeing if they are visible.
*/
- transient private Hashtable<TreePath, Boolean> expandedState;
+ private transient Hashtable<TreePath, Boolean> expandedState;
/**
@@ -227,7 +227,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
* Editor for the entries. Default is <code>null</code>
* (tree is not editable).
*/
- transient protected TreeCellEditor cellEditor;
+ protected transient TreeCellEditor cellEditor;
/**
* Is the tree editable? Default is false.
@@ -277,13 +277,13 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Updates the <code>expandedState</code>.
*/
- transient protected TreeModelListener treeModelListener;
+ protected transient TreeModelListener treeModelListener;
/**
* Used when <code>setExpandedState</code> is invoked,
* will be a <code>Stack</code> of <code>Stack</code>s.
*/
- transient private Stack<Stack<TreePath>> expandedStack;
+ private transient Stack<Stack<TreePath>> expandedStack;
/**
* Lead selection path, may not be <code>null</code>.
@@ -459,40 +459,40 @@ public class JTree extends JComponent implements Scrollable, Accessible
// Bound property names
//
/** Bound property name for <code>cellRenderer</code>. */
- public final static String CELL_RENDERER_PROPERTY = "cellRenderer";
+ public static final String CELL_RENDERER_PROPERTY = "cellRenderer";
/** Bound property name for <code>treeModel</code>. */
- public final static String TREE_MODEL_PROPERTY = "model";
+ public static final String TREE_MODEL_PROPERTY = "model";
/** Bound property name for <code>rootVisible</code>. */
- public final static String ROOT_VISIBLE_PROPERTY = "rootVisible";
+ public static final String ROOT_VISIBLE_PROPERTY = "rootVisible";
/** Bound property name for <code>showsRootHandles</code>. */
- public final static String SHOWS_ROOT_HANDLES_PROPERTY = "showsRootHandles";
+ public static final String SHOWS_ROOT_HANDLES_PROPERTY = "showsRootHandles";
/** Bound property name for <code>rowHeight</code>. */
- public final static String ROW_HEIGHT_PROPERTY = "rowHeight";
+ public static final String ROW_HEIGHT_PROPERTY = "rowHeight";
/** Bound property name for <code>cellEditor</code>. */
- public final static String CELL_EDITOR_PROPERTY = "cellEditor";
+ public static final String CELL_EDITOR_PROPERTY = "cellEditor";
/** Bound property name for <code>editable</code>. */
- public final static String EDITABLE_PROPERTY = "editable";
+ public static final String EDITABLE_PROPERTY = "editable";
/** Bound property name for <code>largeModel</code>. */
- public final static String LARGE_MODEL_PROPERTY = "largeModel";
+ public static final String LARGE_MODEL_PROPERTY = "largeModel";
/** Bound property name for selectionModel. */
- public final static String SELECTION_MODEL_PROPERTY = "selectionModel";
+ public static final String SELECTION_MODEL_PROPERTY = "selectionModel";
/** Bound property name for <code>visibleRowCount</code>. */
- public final static String VISIBLE_ROW_COUNT_PROPERTY = "visibleRowCount";
+ public static final String VISIBLE_ROW_COUNT_PROPERTY = "visibleRowCount";
/** Bound property name for <code>messagesStopCellEditing</code>. */
- public final static String INVOKES_STOP_CELL_EDITING_PROPERTY = "invokesStopCellEditing";
+ public static final String INVOKES_STOP_CELL_EDITING_PROPERTY = "invokesStopCellEditing";
/** Bound property name for <code>scrollsOnExpand</code>. */
- public final static String SCROLLS_ON_EXPAND_PROPERTY = "scrollsOnExpand";
+ public static final String SCROLLS_ON_EXPAND_PROPERTY = "scrollsOnExpand";
/** Bound property name for <code>toggleClickCount</code>. */
- public final static String TOGGLE_CLICK_COUNT_PROPERTY = "toggleClickCount";
+ public static final String TOGGLE_CLICK_COUNT_PROPERTY = "toggleClickCount";
/** Bound property name for <code>leadSelectionPath</code>.
* @since 1.3 */
- public final static String LEAD_SELECTION_PATH_PROPERTY = "leadSelectionPath";
+ public static final String LEAD_SELECTION_PATH_PROPERTY = "leadSelectionPath";
/** Bound property name for anchor selection path.
* @since 1.3 */
- public final static String ANCHOR_SELECTION_PATH_PROPERTY = "anchorSelectionPath";
+ public static final String ANCHOR_SELECTION_PATH_PROPERTY = "anchorSelectionPath";
/** Bound property name for expands selected paths property
* @since 1.3 */
- public final static String EXPANDS_SELECTED_PATHS_PROPERTY = "expandsSelectedPaths";
+ public static final String EXPANDS_SELECTED_PATHS_PROPERTY = "expandsSelectedPaths";
/**
@@ -3322,7 +3322,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
*
* @return single instance of {@code EmptySelectionModel}
*/
- static public EmptySelectionModel sharedInstance() {
+ public static EmptySelectionModel sharedInstance() {
return sharedInstance;
}
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JViewport.java b/jdk/src/java.desktop/share/classes/javax/swing/JViewport.java
index 856e172f6f7aa68ce30c026ac7aedf98353e3161..8090dc78087553d059f6fbf5fc6e1fc192d9363f 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JViewport.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JViewport.java
@@ -139,7 +139,7 @@ public class JViewport extends JComponent implements Accessible
protected boolean backingStore = false;
/** The view image used for a backing store. */
- transient protected Image backingStoreImage = null;
+ protected transient Image backingStoreImage = null;
/**
* The <code>scrollUnderway</code> flag is used for components like
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/RowFilter.java b/jdk/src/java.desktop/share/classes/javax/swing/RowFilter.java
index bfa413e26f89b0f19413dd014bfc2b7e452d46fe..167a91239f93c69d02950b21fbf933915c067f6d 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/RowFilter.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/RowFilter.java
@@ -340,7 +340,7 @@ public abstract class RowFilter<M,I> {
* @see javax.swing.DefaultRowSorter#setRowFilter(javax.swing.RowFilter)
* @since 1.6
*/
- public static abstract class Entry<M, I> {
+ public abstract static class Entry<M, I> {
/**
* Creates an <code>Entry</code>.
*/
@@ -409,7 +409,7 @@ public abstract class RowFilter<M,I> {
}
- private static abstract class GeneralFilter<M, I> extends RowFilter<M, I> {
+ private abstract static class GeneralFilter<M, I> extends RowFilter<M, I> {
private int[] columns;
GeneralFilter(int[] columns) {
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/SortingFocusTraversalPolicy.java b/jdk/src/java.desktop/share/classes/javax/swing/SortingFocusTraversalPolicy.java
index 057d4d4a58c1042be2259275e3c868af316ed246..9057e80faad8f03a39557433f9c1325a1e023d15 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/SortingFocusTraversalPolicy.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/SortingFocusTraversalPolicy.java
@@ -83,16 +83,16 @@ public class SortingFocusTraversalPolicy
* that they need to invoke getFirstComponent or getLastComponent, the
* sorted list should be reused if possible.
*/
- transient private Container cachedRoot;
- transient private List<Component> cachedCycle;
+ private transient Container cachedRoot;
+ private transient List<Component> cachedCycle;
// Delegate our fitness test to ContainerOrder so that we only have to
// code the algorithm once.
private static final SwingContainerOrderFocusTraversalPolicy
fitnessTestPolicy = new SwingContainerOrderFocusTraversalPolicy();
- final private int FORWARD_TRAVERSAL = 0;
- final private int BACKWARD_TRAVERSAL = 1;
+ private final int FORWARD_TRAVERSAL = 0;
+ private final int BACKWARD_TRAVERSAL = 1;
/*
* When true (by default), the legacy merge-sort algo is used to sort an FTP cycle.
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/SwingWorker.java b/jdk/src/java.desktop/share/classes/javax/swing/SwingWorker.java
index 753ca525ffd2720027e936545b2137bbdf0f7736..40da1c24a02b0ab59d3303affe7c9387ea358bf8 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/SwingWorker.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/SwingWorker.java
@@ -827,7 +827,7 @@ public abstract class SwingWorker<T, V> implements RunnableFuture<T> {
}
private static class DoSubmitAccumulativeRunnable
extends AccumulativeRunnable<Runnable> implements ActionListener {
- private final static int DELAY = 1000 / 30;
+ private static final int DELAY = 1000 / 30;
@Override
protected void run(List<Runnable> args) {
for (Runnable runnable : args) {
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/Timer.java b/jdk/src/java.desktop/share/classes/javax/swing/Timer.java
index e15736c800476ee41edea390fb939b032d209e56..73b5da9c85a101bd31ca093086e4b8f088644da9 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/Timer.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/Timer.java
@@ -172,16 +172,16 @@ public class Timer implements Serializable
// notify is set to true when the Timer fires and the Runnable is queued.
// It will be set to false after notifying the listeners (if coalesce is
// true) or if the developer invokes stop.
- private transient final AtomicBoolean notify = new AtomicBoolean(false);
+ private final transient AtomicBoolean notify = new AtomicBoolean(false);
private volatile int initialDelay, delay;
private volatile boolean repeats = true, coalesce = true;
- private transient final Runnable doPostEvent;
+ private final transient Runnable doPostEvent;
private static volatile boolean logTimers;
- private transient final Lock lock = new ReentrantLock();
+ private final transient Lock lock = new ReentrantLock();
// This field is maintained by TimerQueue.
// eventQueued can also be reset by the TimerQueue, but will only ever
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/TimerQueue.java b/jdk/src/java.desktop/share/classes/javax/swing/TimerQueue.java
index e2ac94080f7d1e241536106f6da1aa4470c6ba8b..5f05a3b6beb3518b09fe2721f6fd5780ecc513b5 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/TimerQueue.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/TimerQueue.java
@@ -267,7 +267,7 @@ class TimerQueue implements Runnable
}
- final public long getDelay(TimeUnit unit) {
+ public final long getDelay(TimeUnit unit) {
return unit.convert(time - now(), TimeUnit.NANOSECONDS);
}
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/TransferHandler.java b/jdk/src/java.desktop/share/classes/javax/swing/TransferHandler.java
index 886b41b7a2ce7025bf31faf182c918c346d76c2e..b342363d63809f0ca2b9c0c95c2c2d585cd20761 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/TransferHandler.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/TransferHandler.java
@@ -210,7 +210,7 @@ public class TransferHandler implements Serializable {
* @see #importData(TransferHandler.TransferSupport)
* @since 1.6
*/
- public final static class TransferSupport {
+ public static final class TransferSupport {
private boolean isDrop;
private Component component;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/UIManager.java b/jdk/src/java.desktop/share/classes/javax/swing/UIManager.java
index 7746b9fb3897b61ed9600afa329750ba4a7a72d3..deca83eecf925750da91373814213f084b03072a 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/UIManager.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/UIManager.java
@@ -1074,7 +1074,7 @@ public class UIManager implements Serializable
* @see #getAuxiliaryLookAndFeels
* @see #getInstalledLookAndFeels
*/
- static public void addAuxiliaryLookAndFeel(LookAndFeel laf) {
+ public static void addAuxiliaryLookAndFeel(LookAndFeel laf) {
maybeInitialize();
if (!laf.isSupportedLookAndFeel()) {
@@ -1115,7 +1115,7 @@ public class UIManager implements Serializable
* @see #setLookAndFeel
* @see #getInstalledLookAndFeels
*/
- static public boolean removeAuxiliaryLookAndFeel(LookAndFeel laf) {
+ public static boolean removeAuxiliaryLookAndFeel(LookAndFeel laf) {
maybeInitialize();
boolean result;
@@ -1153,7 +1153,7 @@ public class UIManager implements Serializable
* @see #setLookAndFeel
* @see #getInstalledLookAndFeels
*/
- static public LookAndFeel[] getAuxiliaryLookAndFeels() {
+ public static LookAndFeel[] getAuxiliaryLookAndFeels() {
maybeInitialize();
Vector<LookAndFeel> v = getLAFState().auxLookAndFeels;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/border/TitledBorder.java b/jdk/src/java.desktop/share/classes/javax/swing/border/TitledBorder.java
index dadc36bba45df23c096c4de78f2e62fc1c66480d..2732cb9cde378f4bc9686d668dce732f77d44218 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/border/TitledBorder.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/border/TitledBorder.java
@@ -100,55 +100,55 @@ public class TitledBorder extends AbstractBorder
/**
* Use the default vertical orientation for the title text.
*/
- static public final int DEFAULT_POSITION = 0;
+ public static final int DEFAULT_POSITION = 0;
/** Position the title above the border's top line. */
- static public final int ABOVE_TOP = 1;
+ public static final int ABOVE_TOP = 1;
/** Position the title in the middle of the border's top line. */
- static public final int TOP = 2;
+ public static final int TOP = 2;
/** Position the title below the border's top line. */
- static public final int BELOW_TOP = 3;
+ public static final int BELOW_TOP = 3;
/** Position the title above the border's bottom line. */
- static public final int ABOVE_BOTTOM = 4;
+ public static final int ABOVE_BOTTOM = 4;
/** Position the title in the middle of the border's bottom line. */
- static public final int BOTTOM = 5;
+ public static final int BOTTOM = 5;
/** Position the title below the border's bottom line. */
- static public final int BELOW_BOTTOM = 6;
+ public static final int BELOW_BOTTOM = 6;
/**
* Use the default justification for the title text.
*/
- static public final int DEFAULT_JUSTIFICATION = 0;
+ public static final int DEFAULT_JUSTIFICATION = 0;
/** Position title text at the left side of the border line. */
- static public final int LEFT = 1;
+ public static final int LEFT = 1;
/** Position title text in the center of the border line. */
- static public final int CENTER = 2;
+ public static final int CENTER = 2;
/** Position title text at the right side of the border line. */
- static public final int RIGHT = 3;
+ public static final int RIGHT = 3;
/** Position title text at the left side of the border line
* for left to right orientation, at the right side of the
* border line for right to left orientation.
*/
- static public final int LEADING = 4;
+ public static final int LEADING = 4;
/** Position title text at the right side of the border line
* for left to right orientation, at the left side of the
* border line for right to left orientation.
*/
- static public final int TRAILING = 5;
+ public static final int TRAILING = 5;
/**
* Space between the border and the component's edge
*/
- static protected final int EDGE_SPACING = 2;
+ protected static final int EDGE_SPACING = 2;
/**
* Space between the border and text
*/
- static protected final int TEXT_SPACING = 2;
+ protected static final int TEXT_SPACING = 2;
/**
* Horizontal inset of text that is left or right justified
*/
- static protected final int TEXT_INSET_H = 5;
+ protected static final int TEXT_INSET_H = 5;
/**
* Creates a TitledBorder instance.
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java b/jdk/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
index 4e0df90b8c699bfe2bb874a4a451a207ee73a1aa..f7265cd04be0aef182a79a93cf3a1c0194f6dbfc 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
@@ -100,7 +100,7 @@ import sun.reflect.misc.ReflectUtil;
@SuppressWarnings("serial")
public class EventListenerList implements Serializable {
/* A null array to be shared by all empty listener lists*/
- private final static Object[] NULL_ARRAY = new Object[0];
+ private static final Object[] NULL_ARRAY = new Object[0];
/** The list of ListenerType - Listener pairs */
protected transient Object[] listenerList = NULL_ARRAY;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonUI.java
index 0e1aa403faca6e37711ee282fb7f6ac8619f930e..1146e469cc36c52420d87fbfeed8f3105c0d904a 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonUI.java
@@ -64,7 +64,7 @@ public class BasicButtonUI extends ButtonUI{
*/
protected int defaultTextShiftOffset;
- private final static String propertyPrefix = "Button" + ".";
+ private static final String propertyPrefix = "Button" + ".";
private static final Object BASIC_BUTTON_UI_KEY = new Object();
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java
index d0deeb59ca557b4dcf58f2208760d01e3d5f3fd7..37501888a60006941ad9c215219655103862f5b5 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java
@@ -54,7 +54,7 @@ public class BasicCheckBoxUI extends BasicRadioButtonUI {
private static final Object BASIC_CHECK_BOX_UI_KEY = new Object();
- private final static String propertyPrefix = "CheckBox" + ".";
+ private static final String propertyPrefix = "CheckBox" + ".";
// ********************************
// Create PLAF
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java
index 231eced6f52bdc0add6441faa334a15a1860b524..3fa7f8d57632e91921db39b6e6c802616f0dd7fc 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java
@@ -57,7 +57,7 @@ implements ListCellRenderer<Object>, Serializable {
* the <code>setBorder</code> method.
*/
protected static Border noFocusBorder = new EmptyBorder(1, 1, 1, 1);
- private final static Border SAFE_NO_FOCUS_BORDER = new EmptyBorder(1, 1, 1, 1);
+ private static final Border SAFE_NO_FOCUS_BORDER = new EmptyBorder(1, 1, 1, 1);
/**
* Constructs a new instance of {@code BasicComboBoxRenderer}.
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicIconFactory.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicIconFactory.java
index 638885127b2d65b9df9b0e3e2f94a66fcc751932..4db5f6078f8152947983ccde39f185fa2208435e 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicIconFactory.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicIconFactory.java
@@ -167,7 +167,7 @@ public class BasicIconFactory implements Serializable
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) {
}
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java
index f48737501136a5e7f4b69574b1d915745ea1677c..ae8827a4f82da1f681ffb996a210aef632532ca4 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java
@@ -167,35 +167,35 @@ public class BasicListUI extends ListUI
/**
* The bit relates to model changed property.
*/
- protected final static int modelChanged = 1 << 0;
+ protected static final int modelChanged = 1 << 0;
/**
* The bit relates to selection model changed property.
*/
- protected final static int selectionModelChanged = 1 << 1;
+ protected static final int selectionModelChanged = 1 << 1;
/**
* The bit relates to font changed property.
*/
- protected final static int fontChanged = 1 << 2;
+ protected static final int fontChanged = 1 << 2;
/**
* The bit relates to fixed cell width changed property.
*/
- protected final static int fixedCellWidthChanged = 1 << 3;
+ protected static final int fixedCellWidthChanged = 1 << 3;
/**
* The bit relates to fixed cell height changed property.
*/
- protected final static int fixedCellHeightChanged = 1 << 4;
+ protected static final int fixedCellHeightChanged = 1 << 4;
/**
* The bit relates to prototype cell value changed property.
*/
- protected final static int prototypeCellValueChanged = 1 << 5;
+ protected static final int prototypeCellValueChanged = 1 << 5;
/**
* The bit relates to cell renderer changed property.
*/
- protected final static int cellRendererChanged = 1 << 6;
- private final static int layoutOrientationChanged = 1 << 7;
- private final static int heightChanged = 1 << 8;
- private final static int widthChanged = 1 << 9;
- private final static int componentOrientationChanged = 1 << 10;
+ protected static final int cellRendererChanged = 1 << 6;
+ private static final int layoutOrientationChanged = 1 << 7;
+ private static final int heightChanged = 1 << 8;
+ private static final int widthChanged = 1 << 9;
+ private static final int componentOrientationChanged = 1 << 10;
private static final int DROP_LINE_THICKNESS = 2;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java
index 15fc03fd2dce6c236ab80234f1655513d7a895d0..83e5e7af6147bda8e3477229734f3e6fc93243ae 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java
@@ -53,7 +53,7 @@ public class BasicRadioButtonUI extends BasicToggleButtonUI
private boolean defaults_initialized = false;
- private final static String propertyPrefix = "RadioButton" + ".";
+ private static final String propertyPrefix = "RadioButton" + ".";
private KeyListener keyListener = null;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java
index 870115cf18f4ba40e453b43ef20b51c2b512bffb..fdab80f77b81be1e49b6f8147302a2e85088cbfe 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java
@@ -115,7 +115,7 @@ public class BasicScrollBarUI
/** Scroll timer */
protected Timer scrollTimer;
- private final static int scrollSpeedThrottle = 60; // delay in milli seconds
+ private static final int scrollSpeedThrottle = 60; // delay in milli seconds
/**
* True indicates a middle click will absolutely position the
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
index 0330ee43226cd7b59e94a2daff0dd05b6405e864..80377239e6e3c63385de473d0696cd6b80bc76c8 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
@@ -2542,21 +2542,21 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants {
}
private static class Actions extends UIAction {
- final static String NEXT = "navigateNext";
- final static String PREVIOUS = "navigatePrevious";
- final static String RIGHT = "navigateRight";
- final static String LEFT = "navigateLeft";
- final static String UP = "navigateUp";
- final static String DOWN = "navigateDown";
- final static String PAGE_UP = "navigatePageUp";
- final static String PAGE_DOWN = "navigatePageDown";
- final static String REQUEST_FOCUS = "requestFocus";
- final static String REQUEST_FOCUS_FOR_VISIBLE =
+ static final String NEXT = "navigateNext";
+ static final String PREVIOUS = "navigatePrevious";
+ static final String RIGHT = "navigateRight";
+ static final String LEFT = "navigateLeft";
+ static final String UP = "navigateUp";
+ static final String DOWN = "navigateDown";
+ static final String PAGE_UP = "navigatePageUp";
+ static final String PAGE_DOWN = "navigatePageDown";
+ static final String REQUEST_FOCUS = "requestFocus";
+ static final String REQUEST_FOCUS_FOR_VISIBLE =
"requestFocusForVisibleComponent";
- final static String SET_SELECTED = "setSelectedIndex";
- final static String SELECT_FOCUSED = "selectTabWithFocus";
- final static String SCROLL_FORWARD = "scrollTabsForwardAction";
- final static String SCROLL_BACKWARD = "scrollTabsBackwardAction";
+ static final String SET_SELECTED = "setSelectedIndex";
+ static final String SELECT_FOCUSED = "selectTabWithFocus";
+ static final String SCROLL_FORWARD = "scrollTabsForwardAction";
+ static final String SCROLL_BACKWARD = "scrollTabsBackwardAction";
Actions(String key) {
super(key);
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java
index 5f394dbbefb88b1a8a290d04e788cb17b50361bd..e28fd6c8e3e202b974e618ec7f0645ed7ffc602b 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java
@@ -46,7 +46,7 @@ public class BasicToggleButtonUI extends BasicButtonUI {
private static final Object BASIC_TOGGLE_BUTTON_UI_KEY = new Object();
- private final static String propertyPrefix = "ToggleButton" + ".";
+ private static final String propertyPrefix = "ToggleButton" + ".";
// ********************************
// Create PLAF
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTreeUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
index 14e468450319beb7134e360e3dce939a719407a6..7216dfe4a4bfcc64036d244d9c4db66b9b2d8693 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
@@ -61,16 +61,16 @@ public class BasicTreeUI extends TreeUI
new StringBuilder("Tree.baselineComponent");
// Old actions forward to an instance of this.
- static private final Actions SHARED_ACTION = new Actions();
+ private static final Actions SHARED_ACTION = new Actions();
/**
* The collapsed icon.
*/
- transient protected Icon collapsedIcon;
+ protected transient Icon collapsedIcon;
/**
* The expanded icon.
*/
- transient protected Icon expandedIcon;
+ protected transient Icon expandedIcon;
/**
* Color used to draw hash marks. If <code>null</code> no hash marks
@@ -98,14 +98,14 @@ public class BasicTreeUI extends TreeUI
protected JTree tree;
/** Renderer that is being used to do the actual cell drawing. */
- transient protected TreeCellRenderer currentCellRenderer;
+ protected transient TreeCellRenderer currentCellRenderer;
/** Set to true if the renderer that is currently in the tree was
* created by this instance. */
protected boolean createdRenderer;
/** Editor for the tree. */
- transient protected TreeCellEditor cellEditor;
+ protected transient TreeCellEditor cellEditor;
/** Set to true if editor that is currently in the tree was
* created by this instance. */
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java
index e18d44a37a02abe37291eafd7117dac0a02f21e8..8e1417d0dbb3b5f04f1661a4fbc1d64e238461d2 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java
@@ -60,7 +60,7 @@ public class MetalCheckBoxUI extends MetalRadioButtonUI {
private static final Object METAL_CHECK_BOX_UI_KEY = new Object();
- private final static String propertyPrefix = "CheckBox" + ".";
+ private static final String propertyPrefix = "CheckBox" + ".";
private boolean defaults_initialized = false;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
index 0e905398dac382105445d4d14d4ef61f7c2d2b52..d1b3c1e2166754a885ec1dcbf930d20631d13cc2 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
@@ -954,7 +954,7 @@ public class MetalFileChooserUI extends BasicFileChooserUI {
}
}
- final static int space = 10;
+ static final int space = 10;
class IndentIcon implements Icon {
Icon icon = null;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalIconFactory.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalIconFactory.java
index 8cd0bd04ace20ebd6608a3262445aa21b4bf83c5..926835fb8969a6872f727c30ec60078b324649e2 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalIconFactory.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalIconFactory.java
@@ -1617,7 +1617,7 @@ public class MetalIconFactory implements Serializable {
} // End class TreeFloppyDriveIcon
- static private final Dimension folderIcon16Size = new Dimension( 16, 16 );
+ private static final Dimension folderIcon16Size = new Dimension( 16, 16 );
/**
* Utility class for caching icon images. This is necessary because
@@ -1787,7 +1787,7 @@ public class MetalIconFactory implements Serializable {
}
- static private final Dimension fileIcon16Size = new Dimension( 16, 16 );
+ private static final Dimension fileIcon16Size = new Dimension( 16, 16 );
/**
* <p>
@@ -1887,7 +1887,7 @@ public class MetalIconFactory implements Serializable {
}
- static private final Dimension treeControlSize = new Dimension( 18, 18 );
+ private static final Dimension treeControlSize = new Dimension( 18, 18 );
/**
* <p>
@@ -2052,9 +2052,9 @@ public class MetalIconFactory implements Serializable {
// Menu Icons
//
- static private final Dimension menuArrowIconSize = new Dimension( 4, 8 );
- static private final Dimension menuCheckIconSize = new Dimension( 10, 10 );
- static private final int xOff = 4;
+ private static final Dimension menuArrowIconSize = new Dimension( 4, 8 );
+ private static final Dimension menuCheckIconSize = new Dimension( 10, 10 );
+ private static final int xOff = 4;
private static class MenuArrowIcon implements Icon, UIResource, Serializable
{
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java
index 2b92e81e86485e5181825ef51a972e0d7a81db56..15c9fd8eb134dc6af5967e8bad254535d3eec787 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java
@@ -88,7 +88,7 @@ public class MetalToolBarUI extends BasicToolBarUI
/**
* Registers the specified component.
*/
- synchronized static void register(JComponent c) {
+ static synchronized void register(JComponent c) {
if (c == null) {
// Exception is thrown as convenience for callers that are
// typed to throw an NPE.
@@ -100,7 +100,7 @@ public class MetalToolBarUI extends BasicToolBarUI
/**
* Unregisters the specified component.
*/
- synchronized static void unregister(JComponent c) {
+ static synchronized void unregister(JComponent c) {
for (int counter = components.size() - 1; counter >= 0; counter--) {
// Search for the component, removing any flushed references
// along the way.
@@ -116,7 +116,7 @@ public class MetalToolBarUI extends BasicToolBarUI
* Finds a previously registered component of class <code>target</code>
* that shares the JRootPane ancestor of <code>from</code>.
*/
- synchronized static Object findRegisteredComponentOfType(JComponent from,
+ static synchronized Object findRegisteredComponentOfType(JComponent from,
Class<?> target) {
JRootPane rp = SwingUtilities.getRootPane(from);
if (rp != null) {
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java b/jdk/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java
index af19749c9d321e3d53d5ab61ab79a5111c0d10ae..56af1a11ccf3c8329f5cb987b6cdeeed36b66e05 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java
@@ -73,7 +73,7 @@ public class DefaultTableColumnModel implements TableColumnModel,
protected EventListenerList listenerList = new EventListenerList();
/** Change event (only one needed) */
- transient protected ChangeEvent changeEvent = null;
+ protected transient ChangeEvent changeEvent = null;
/** Column selection allowed in this column model */
protected boolean columnSelectionAllowed;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java b/jdk/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java
index 12ebf26ee5114f1dbb1b06ecd07f2b4c27454920..546e962c9fa2b936b41b8c76260bbe8cc53fd068 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java
@@ -106,13 +106,13 @@ public class JTableHeader extends JComponent implements TableColumnModelListener
protected boolean updateTableInRealTime;
/** The index of the column being resized. <code>null</code> if not resizing. */
- transient protected TableColumn resizingColumn;
+ protected transient TableColumn resizingColumn;
/** The index of the column being dragged. <code>null</code> if not dragging. */
- transient protected TableColumn draggedColumn;
+ protected transient TableColumn draggedColumn;
/** The distance from its original position the column has been dragged. */
- transient protected int draggedDistance;
+ protected transient int draggedDistance;
/**
* The default renderer to be used when a <code>TableColumn</code>
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/table/TableColumn.java b/jdk/src/java.desktop/share/classes/javax/swing/table/TableColumn.java
index 8facbc8205752849580e029533ca7197774b1a6a..0d54da6d1d74e7f570d34a21cbc7ed2499f61942 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/table/TableColumn.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/table/TableColumn.java
@@ -92,25 +92,25 @@ public class TableColumn extends Object implements Serializable {
* Warning: The value of this constant, "columWidth" is wrong as the
* name of the property is "columnWidth".
*/
- public final static String COLUMN_WIDTH_PROPERTY = "columWidth";
+ public static final String COLUMN_WIDTH_PROPERTY = "columWidth";
/**
* Obsolete as of Java 2 platform v1.3. Please use string literals to identify
* properties.
*/
- public final static String HEADER_VALUE_PROPERTY = "headerValue";
+ public static final String HEADER_VALUE_PROPERTY = "headerValue";
/**
* Obsolete as of Java 2 platform v1.3. Please use string literals to identify
* properties.
*/
- public final static String HEADER_RENDERER_PROPERTY = "headerRenderer";
+ public static final String HEADER_RENDERER_PROPERTY = "headerRenderer";
/**
* Obsolete as of Java 2 platform v1.3. Please use string literals to identify
* properties.
*/
- public final static String CELL_RENDERER_PROPERTY = "cellRenderer";
+ public static final String CELL_RENDERER_PROPERTY = "cellRenderer";
//
// Instance Variables
@@ -173,7 +173,7 @@ public class TableColumn extends Object implements Serializable {
* end of the resize.
*/
@Deprecated
- transient protected int resizedPostingDisableCount;
+ protected transient int resizedPostingDisableCount;
/**
* If any <code>PropertyChangeListeners</code> have been registered, the
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java b/jdk/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
index 191805e16c0a5ca92fa2ff741987b938d05fb1ab..2b87618abd9af96ffff170fce39fded82e72eaf2 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
@@ -1300,7 +1300,7 @@ public abstract class AbstractDocument implements Document, Serializable {
* @return the thread actively modifying the document
* or <code>null</code> if there are no modifications in progress
*/
- protected synchronized final Thread getCurrentWriter() {
+ protected final synchronized Thread getCurrentWriter() {
return currWriter;
}
@@ -1329,7 +1329,7 @@ public abstract class AbstractDocument implements Document, Serializable {
* where order of delivery is not guaranteed and all listeners
* should be notified before further mutations are allowed.
*/
- protected synchronized final void writeLock() {
+ protected final synchronized void writeLock() {
try {
while ((numReaders > 0) || (currWriter != null)) {
if (Thread.currentThread() == currWriter) {
@@ -1359,7 +1359,7 @@ public abstract class AbstractDocument implements Document, Serializable {
*
* @see #writeLock
*/
- protected synchronized final void writeUnlock() {
+ protected final synchronized void writeUnlock() {
if (--numWriters <= 0) {
numWriters = 0;
currWriter = null;
@@ -1378,7 +1378,7 @@ public abstract class AbstractDocument implements Document, Serializable {
*
* @see #readUnlock
*/
- public synchronized final void readLock() {
+ public final synchronized void readLock() {
try {
while (currWriter != null) {
if (currWriter == Thread.currentThread()) {
@@ -1412,7 +1412,7 @@ public abstract class AbstractDocument implements Document, Serializable {
*
* @see #readLock
*/
- public synchronized final void readUnlock() {
+ public final synchronized void readUnlock() {
if (currWriter == Thread.currentThread()) {
// writer has full read access.... may try to acquire
// lock in notification
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java b/jdk/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java
index fb07a9533c056a56cf4b9c96cd16ae372799b3db..0ca0fecb5a845fc33616b35b175cdce1df1e7c55 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java
@@ -261,7 +261,7 @@ public abstract class AbstractWriter {
* @throws BadLocationException for an invalid location within
* the document
*/
- abstract protected void write() throws IOException, BadLocationException;
+ protected abstract void write() throws IOException, BadLocationException;
/**
* Returns the text associated with the element.
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java b/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
index f474ac79addc2ec9c052d60d1e632498d9cdde01..134d94cb1fa3c2e72dfd53c95a67ca5d15beaad9 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
@@ -1598,11 +1598,11 @@ public class DefaultCaret extends Rectangle implements Caret, FocusListener, Mou
boolean dotLTR;
boolean markLTR;
transient Handler handler = new Handler();
- transient private int[] flagXPoints = new int[3];
- transient private int[] flagYPoints = new int[3];
+ private transient int[] flagXPoints = new int[3];
+ private transient int[] flagYPoints = new int[3];
private transient NavigationFilter.FilterBypass filterBypass;
- static private transient Action selectWord = null;
- static private transient Action selectLine = null;
+ private static transient Action selectWord = null;
+ private static transient Action selectLine = null;
/**
* This is used to indicate if the caret currently owns the selection.
* This is always false if the system does not support the system
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultHighlighter.java b/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultHighlighter.java
index 42d81e952d33cef5bef2b97e667f2ae52cdd1590..cc423788a0a105b5b790d0b24c96d97ab8be94aa 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultHighlighter.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultHighlighter.java
@@ -352,7 +352,7 @@ public class DefaultHighlighter extends LayeredHighlighter {
// ---- member variables --------------------------------------------
- private final static Highlighter.Highlight[] noHighlights =
+ private static final Highlighter.Highlight[] noHighlights =
new Highlighter.Highlight[0];
private Vector<HighlightInfo> highlights = new Vector<HighlightInfo>();
private JTextComponent component;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java b/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java
index 24e4be19cfd053994f109efb97b89eefd0abe070..16fbdfe8315d2bdcbd8478069144059e5a2e162d 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java
@@ -2650,7 +2650,7 @@ public class DefaultStyledDocument extends AbstractDocument implements StyledDoc
}
/** Class-specific reference queues. */
- private final static Map<Class<?>, ReferenceQueue<DefaultStyledDocument>> queueMap
+ private static final Map<Class<?>, ReferenceQueue<DefaultStyledDocument>> queueMap
= new HashMap<Class<?>, ReferenceQueue<DefaultStyledDocument>>();
/** A weak reference to the document object. */
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/DocumentFilter.java b/jdk/src/java.desktop/share/classes/javax/swing/text/DocumentFilter.java
index e71502cc66ef29c8d2a7cfa4668d3307f90bad2f..2b0c819a480ab6dd05ea8d9e63e381791e5573bb 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/DocumentFilter.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/DocumentFilter.java
@@ -129,7 +129,7 @@ public class DocumentFilter {
* are invoked from the DocumentFilter.
* @since 1.4
*/
- public static abstract class FilterBypass {
+ public abstract static class FilterBypass {
/**
* Returns the Document the mutation is occurring on.
*
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/GapContent.java b/jdk/src/java.desktop/share/classes/javax/swing/text/GapContent.java
index 0781815c7c49343e80ac60841c43f386aef750b4..282e08f78b2c4405e9015b2fd9937b036c9f3fa3 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/GapContent.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/GapContent.java
@@ -332,7 +332,7 @@ public class GapContent extends GapVector implements AbstractDocument.Content, S
private transient ReferenceQueue<StickyPosition> queue;
- final static int GROWTH_SIZE = 1024 * 512;
+ static final int GROWTH_SIZE = 1024 * 512;
// --- gap management -------------------------------
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/GlyphView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/GlyphView.java
index d29b56bde191613ecbe220bdd280b45c9b3078da..2698c90bc6e26e227587f499759c443240dfe7f3 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/GlyphView.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/GlyphView.java
@@ -1153,7 +1153,7 @@ public class GlyphView extends View implements TabableView, Cloneable {
*
* @since 1.3
*/
- public static abstract class GlyphPainter {
+ public abstract static class GlyphPainter {
/**
* Determine the span the glyphs given a start location
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/LayeredHighlighter.java b/jdk/src/java.desktop/share/classes/javax/swing/text/LayeredHighlighter.java
index a3ee23e214e97dc12683292d060b7d51f2a4eebc..d7d35659f97f4a33aafb09c99b87c2efcb060886 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/LayeredHighlighter.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/LayeredHighlighter.java
@@ -55,7 +55,7 @@ public abstract class LayeredHighlighter implements Highlighter {
/**
* Layered highlight renderer.
*/
- static public abstract class LayerPainter implements Highlighter.HighlightPainter {
+ public abstract static class LayerPainter implements Highlighter.HighlightPainter {
/**
* @return a shape
* @param g Graphics used to draw
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/NavigationFilter.java b/jdk/src/java.desktop/share/classes/javax/swing/text/NavigationFilter.java
index 94e76e71a1cd90bbc13b83dacf441dedf1113319..ca59891e884df1cbdd67a3ccf391b1a4fe3e5cbb 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/NavigationFilter.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/NavigationFilter.java
@@ -120,7 +120,7 @@ public class NavigationFilter {
* not callback into the NavigationFilter.
* @since 1.4
*/
- public static abstract class FilterBypass {
+ public abstract static class FilterBypass {
/**
* Returns the Caret that is changing.
*
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/ParagraphView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/ParagraphView.java
index b42b04997d40e7d4b5eafe2bfdb65bf4a628ada8..154db5cf7efe3050b40ba95916518ae9308120dd 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/ParagraphView.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/ParagraphView.java
@@ -1184,11 +1184,11 @@ public class ParagraphView extends FlowView implements TabExpander {
lineSpacing);
}
- final static int SPACE_ADDON = 0;
- final static int SPACE_ADDON_LEFTOVER_END = 1;
- final static int START_JUSTIFIABLE = 2;
+ static final int SPACE_ADDON = 0;
+ static final int SPACE_ADDON_LEFTOVER_END = 1;
+ static final int START_JUSTIFIABLE = 2;
//this should be the last index in justificationData
- final static int END_JUSTIFIABLE = 3;
+ static final int END_JUSTIFIABLE = 3;
int justificationData[] = null;
}
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/TableView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/TableView.java
index b74c85747387bc9dd1af41ae2259e460724edca6..cc286d8697a56e67c12fc430a26276cef45e3dc2 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/TableView.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/TableView.java
@@ -579,7 +579,7 @@ public abstract class TableView extends BoxView {
SizeRequirements[] columnRequirements;
Vector<TableRow> rows;
boolean gridValid;
- static final private BitSet EMPTY = new BitSet();
+ private static final BitSet EMPTY = new BitSet();
/**
* View of a row in a row-centric table.
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/CSS.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/CSS.java
index 46fce89a2d1215417b982e5f7c73e6e10794a0f5..85cf2a8d16f0372206d29cbd01760a23d703d94b 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/html/CSS.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/html/CSS.java
@@ -2433,7 +2433,7 @@ public class CSS implements Serializable {
}
// CSS.Values are static, don't archive it.
- transient private CSS.Value style;
+ private transient CSS.Value style;
}
@SuppressWarnings("serial") // Same-version serialization only
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/CSSBorder.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/CSSBorder.java
index 5945f34e3d25290560505a9716f1f9688a0bcc78..e91ea51535eb9b09e4618c58c92b28fb97939c70 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/html/CSSBorder.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/html/CSSBorder.java
@@ -54,13 +54,13 @@ import javax.swing.text.html.CSS.Value;
class CSSBorder extends AbstractBorder {
/** Indices for the attribute groups. */
- final static int COLOR = 0, STYLE = 1, WIDTH = 2;
+ static final int COLOR = 0, STYLE = 1, WIDTH = 2;
/** Indices for the box sides within the attribute group. */
- final static int TOP = 0, RIGHT = 1, BOTTOM = 2, LEFT = 3;
+ static final int TOP = 0, RIGHT = 1, BOTTOM = 2, LEFT = 3;
/** The attribute groups. */
- final static Attribute[][] ATTRIBUTES = {
+ static final Attribute[][] ATTRIBUTES = {
{ Attribute.BORDER_TOP_COLOR, Attribute.BORDER_RIGHT_COLOR,
Attribute.BORDER_BOTTOM_COLOR, Attribute.BORDER_LEFT_COLOR, },
{ Attribute.BORDER_TOP_STYLE, Attribute.BORDER_RIGHT_STYLE,
@@ -70,12 +70,12 @@ class CSSBorder extends AbstractBorder {
};
/** Parsers for the border properties. */
- final static CssValue PARSERS[] = {
+ static final CssValue PARSERS[] = {
new ColorValue(), new BorderStyle(), new BorderWidthValue(null, 0),
};
/** Default values for the border properties. */
- final static Object[] DEFAULTS = {
+ static final Object[] DEFAULTS = {
Attribute.BORDER_COLOR, // marker: value will be computed on request
PARSERS[1].parseCssValue(Attribute.BORDER_STYLE.getDefaultValue()),
PARSERS[2].parseCssValue(Attribute.BORDER_WIDTH.getDefaultValue()),
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/FormView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/FormView.java
index ccc9aef6fda932c5a1143455387c0fcf58efaede..3ca0dd18e0d75b4f6e252e2939af5c5f2e0fbb7c 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/html/FormView.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/html/FormView.java
@@ -129,7 +129,7 @@ public class FormView extends ComponentView implements ActionListener {
* Document attribute name for storing POST data. JEditorPane.getPostData()
* uses the same name, should be kept in sync.
*/
- final static String PostDataProperty = "javax.swing.JEditorPane.postdata";
+ static final String PostDataProperty = "javax.swing.JEditorPane.postdata";
/**
* Used to indicate if the maximum span should be the same as the
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
index ec3fe0f5c15a63e6395def5088210337f24f2461..d61d1f8de5b3b40da2f571fea71737f29e32fa73 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
@@ -1885,7 +1885,7 @@ public class HTMLDocument extends DefaultStyledDocument {
* its use should be performed under the protection of
* Document.render.
*/
- public static abstract class Iterator {
+ public abstract static class Iterator {
/**
* Return the attributes for this tag.
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java
index 91a8c4981fffb529cc7f3f7dd02fb982e6277440..7815746065383a2c23d500251b70191fe7424dff 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java
@@ -987,7 +987,7 @@ public class HTMLEditorKit extends StyledEditorKit implements Accessible {
* providing a different parser while reusing some of the
* implementation provided by this editor kit.
*/
- public static abstract class Parser {
+ public abstract static class Parser {
/**
* Parse the given stream and drive the given callback
* with the results of the parse. This method should
@@ -1564,7 +1564,7 @@ public class HTMLEditorKit extends StyledEditorKit implements Accessible {
* methods may have inconsistent behavior, or return the wrong thing.
*/
@SuppressWarnings("serial") // Superclass is not serializable across versions
- public static abstract class HTMLTextAction extends StyledTextAction {
+ public abstract static class HTMLTextAction extends StyledTextAction {
/**
* Creates a new HTMLTextAction from a string action name.
@@ -2009,7 +2009,7 @@ public class HTMLEditorKit extends StyledEditorKit implements Accessible {
/*
* Returns the object in an AttributeSet matching a key
*/
- static private Object getAttrValue(AttributeSet attr, HTML.Attribute key) {
+ private static Object getAttrValue(AttributeSet attr, HTML.Attribute key) {
Enumeration<?> names = attr.getAttributeNames();
while (names.hasMoreElements()) {
Object nextKey = names.nextElement();
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/Map.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/Map.java
index c40e237aaf33e3623cd81499d8904931cc2d8859..cc79b5aeb3bbbbfbeaf174888a1bd9b8fd14cf74 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/html/Map.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/html/Map.java
@@ -180,7 +180,7 @@ class Map implements Serializable {
* % the returned value with be negative. If a parse error results
* from trying to parse one of the numbers null is returned.
*/
- static protected int[] extractCoords(Object stringCoords) {
+ protected static int[] extractCoords(Object stringCoords) {
if (stringCoords == null || !(stringCoords instanceof String)) {
return null;
}
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java
index 52007ba4a8e8024fd2c4631f6e7044a6d35e0332..07e18dc8765b2bbd94a76af5e79dab3b3ed4b5d6 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java
@@ -3196,7 +3196,7 @@ public class StyleSheet extends StyleContext {
// ---- Variables ---------------------------------------------
- final static int DEFAULT_FONT_SIZE = 3;
+ static final int DEFAULT_FONT_SIZE = 3;
private CSS css;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/TableView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/TableView.java
index 6632b2ea318f075b22e5bb58203321b08bbe2066..ef9cb1db858386114865d854d2249d3797605810 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/html/TableView.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/html/TableView.java
@@ -996,7 +996,7 @@ import javax.swing.text.*;
boolean skipComments = false;
boolean gridValid;
- static final private BitSet EMPTY = new BitSet();
+ private static final BitSet EMPTY = new BitSet();
class ColumnIterator implements CSS.LayoutIterator {
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFAttributes.java b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFAttributes.java
index 8b3c74c0a09481cfd0d63e2906b0b7370fe1c88c..99f2822cdcc4c132af6fce9f77b360b72b2825f3 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFAttributes.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFAttributes.java
@@ -145,7 +145,7 @@ class RTFAttributes
/************************************************************************/
/************************************************************************/
- static abstract class GenericAttribute
+ abstract static class GenericAttribute
{
int domain;
Object swingName;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFGenerator.java b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFGenerator.java
index 4069bad51420fe46664e6cf33a13a9f41b25ed4d..0a67b87b67468ca4c3c3158e839224c2719331a6 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFGenerator.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFGenerator.java
@@ -76,14 +76,14 @@ class RTFGenerator extends Object
/** The default color, used for text without an explicit color
* attribute. */
- static public final Color defaultRTFColor = Color.black;
+ public static final Color defaultRTFColor = Color.black;
- static public final float defaultFontSize = 12f;
+ public static final float defaultFontSize = 12f;
- static public final String defaultFontFamily = "Helvetica";
+ public static final String defaultFontFamily = "Helvetica";
/* constants so we can avoid allocating objects in inner loops */
- final static private Object MagicToken;
+ private static final Object MagicToken;
/* An array of character-keyword pairs. This could be done
as a dictionary (and lookup would be quicker), but that
@@ -91,7 +91,7 @@ class RTFGenerator extends Object
written (slow!). */
static class CharacterKeywordPair
{ public char character; public String keyword; }
- static protected CharacterKeywordPair[] textKeywords;
+ protected static CharacterKeywordPair[] textKeywords;
static {
MagicToken = new Object();
@@ -112,7 +112,7 @@ class RTFGenerator extends Object
static final char[] hexdigits = { '0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-static public void writeDocument(Document d, OutputStream to)
+public static void writeDocument(Document d, OutputStream to)
throws IOException
{
RTFGenerator gen = new RTFGenerator(to);
@@ -238,7 +238,7 @@ private Integer findStyleNumber(AttributeSet a, String domain)
return null;
}
-static private Object attrDiff(MutableAttributeSet oldAttrs,
+private static Object attrDiff(MutableAttributeSet oldAttrs,
AttributeSet newAttrs,
Object key,
Object dfl)
@@ -265,7 +265,7 @@ static private Object attrDiff(MutableAttributeSet oldAttrs,
return null;
}
-static private boolean equalArraysOK(Object a, Object b)
+private static boolean equalArraysOK(Object a, Object b)
{
Object[] aa, bb;
if (a == b)
@@ -987,7 +987,7 @@ static int[] outputConversionForName(String name)
* corresponding byte value (as an int, since bytes are signed).
*/
/* Not very efficient. TODO. */
-static protected int convertCharacter(int[] conversion, char ch)
+protected static int convertCharacter(int[] conversion, char ch)
{
int index;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java
index 619db88060976cb5820bbbf2bf3c074e33d96eb6..703263b8971147909d359b7c63b689fb38b4dccb 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java
@@ -86,7 +86,7 @@ class RTFReader extends RTFParser
* Unicode character. */
int skippingCharacters;
- static private Dictionary<String, RTFAttribute> straightforwardAttributes;
+ private static Dictionary<String, RTFAttribute> straightforwardAttributes;
static {
straightforwardAttributes = RTFAttributes.attributesByKeyword();
}
@@ -1066,7 +1066,7 @@ abstract class AttributeTrackingDestination implements Destination
parserState.put("sec", sectionAttributes);
}
- abstract public void handleText(String text);
+ public abstract void handleText(String text);
public void handleBinaryBlob(byte[] data)
{
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/AbstractLayoutCache.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/AbstractLayoutCache.java
index 280942cbd6ba05495137ccd5b48ead8ba73d9f6e..3d0f4ef9d1ffcd52dbb20e197d6d168cef7d6bf0 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/tree/AbstractLayoutCache.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/tree/AbstractLayoutCache.java
@@ -513,7 +513,7 @@ public abstract class AbstractLayoutCache implements RowMapper {
* Used by <code>AbstractLayoutCache</code> to determine the size
* and x origin of a particular node.
*/
- static public abstract class NodeDimensions {
+ public abstract static class NodeDimensions {
/**
* Returns, by reference in bounds, the size and x origin to
* place value at. The calling method is responsible for determining
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
index 83aa19839f80efb0d24515929e6b5536fc752aed..dca39cf51550af767e0506d635a192bf486e2b71 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
@@ -95,7 +95,7 @@ public class DefaultMutableTreeNode implements Cloneable,
* An enumeration that is always empty. This is used when an enumeration
* of a leaf node's children is requested.
*/
- static public final Enumeration<TreeNode> EMPTY_ENUMERATION
+ public static final Enumeration<TreeNode> EMPTY_ENUMERATION
= Collections.emptyEnumeration();
/** this node's parent, or null if this node has no parent */
@@ -105,7 +105,7 @@ public class DefaultMutableTreeNode implements Cloneable,
protected Vector<TreeNode> children;
/** optional user object */
- transient protected Object userObject;
+ protected transient Object userObject;
/** true if the node is able to have children */
protected boolean allowsChildren;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java
index fdd8e5c1cc5711873fdf0bf53e25ff04e908f833..0fe4e7eb1cdf61908966e2e7023c267d60abb6f5 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java
@@ -72,7 +72,7 @@ public class DefaultTreeCellEditor implements ActionListener, TreeCellEditor,
* Component used in editing, obtained from the
* <code>editingContainer</code>.
*/
- transient protected Component editingComponent;
+ protected transient Component editingComponent;
/**
* As of Java 2 platform v1.4 this field should no longer be used. If
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
index c8784e93c433f1aeb4e2af45c1899d160ea15a1e..c7cdfc366ea6f80c860c8c8d97402ac4b1ae2760 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
@@ -131,13 +131,13 @@ public class DefaultTreeCellRenderer extends JLabel implements TreeCellRenderer
// Icons
/** Icon used to show non-leaf nodes that aren't expanded. */
- transient protected Icon closedIcon;
+ protected transient Icon closedIcon;
/** Icon used to show leaf nodes. */
- transient protected Icon leafIcon;
+ protected transient Icon leafIcon;
/** Icon used to show non-leaf nodes that are expanded. */
- transient protected Icon openIcon;
+ protected transient Icon openIcon;
// Colors
/** Color to use for the foreground for selected nodes. */
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
index 810262b97f4835438b9778b25ce1647358749e2e..755dd99e6c377e9d2228073b2c32978f39290976 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
@@ -78,7 +78,7 @@ public class DefaultTreeSelectionModel implements Cloneable, Serializable, TreeS
protected EventListenerList listenerList = new EventListenerList();
/** Provides a row for a given path. */
- transient protected RowMapper rowMapper;
+ protected transient RowMapper rowMapper;
/** Handles maintaining the list selection model. The RowMapper is used
* to map from a TreePath to a row, and the value is then placed here. */
diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java
index f2b0434090ddf2f88590ef33134be707df45740c..fcefccd989324ae6009205584aeac110570df0ba 100644
--- a/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java
+++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java
@@ -72,23 +72,23 @@ abstract class AppletPanel extends Panel implements AppletStub, Runnable {
protected AppletClassLoader loader;
/* applet event ids */
- public final static int APPLET_DISPOSE = 0;
- public final static int APPLET_LOAD = 1;
- public final static int APPLET_INIT = 2;
- public final static int APPLET_START = 3;
- public final static int APPLET_STOP = 4;
- public final static int APPLET_DESTROY = 5;
- public final static int APPLET_QUIT = 6;
- public final static int APPLET_ERROR = 7;
+ public static final int APPLET_DISPOSE = 0;
+ public static final int APPLET_LOAD = 1;
+ public static final int APPLET_INIT = 2;
+ public static final int APPLET_START = 3;
+ public static final int APPLET_STOP = 4;
+ public static final int APPLET_DESTROY = 5;
+ public static final int APPLET_QUIT = 6;
+ public static final int APPLET_ERROR = 7;
/* send to the parent to force relayout */
- public final static int APPLET_RESIZE = 51234;
+ public static final int APPLET_RESIZE = 51234;
/* sent to a (distant) parent to indicate that the applet is being
* loaded or as completed loading
*/
- public final static int APPLET_LOADING = 51235;
- public final static int APPLET_LOADING_COMPLETED = 51236;
+ public static final int APPLET_LOADING = 51235;
+ public static final int APPLET_LOADING_COMPLETED = 51236;
/**
* The current status. One of:
@@ -132,14 +132,14 @@ abstract class AppletPanel extends Panel implements AppletStub, Runnable {
boolean loadAbortRequest = false;
/* abstract classes */
- abstract protected String getCode();
- abstract protected String getJarFiles();
+ protected abstract String getCode();
+ protected abstract String getJarFiles();
@Override
- abstract public int getWidth();
+ public abstract int getWidth();
@Override
- abstract public int getHeight();
- abstract public boolean hasInitialFocus();
+ public abstract int getHeight();
+ public abstract boolean hasInitialFocus();
private static int threadGroupNumber = 0;
@@ -250,11 +250,11 @@ abstract class AppletPanel extends Panel implements AppletStub, Runnable {
private Queue<Integer> queue = null;
- synchronized public void addAppletListener(AppletListener l) {
+ public synchronized void addAppletListener(AppletListener l) {
listeners = AppletEventMulticaster.add(listeners, l);
}
- synchronized public void removeAppletListener(AppletListener l) {
+ public synchronized void removeAppletListener(AppletListener l) {
listeners = AppletEventMulticaster.remove(listeners, l);
}
diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletViewer.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletViewer.java
index 7a0a875260877e845898cfaf22b8f5675679fc63..b310b277f93d272652aef661fa3710b10ca661ec 100644
--- a/jdk/src/java.desktop/share/classes/sun/applet/AppletViewer.java
+++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletViewer.java
@@ -1081,7 +1081,7 @@ public class AppletViewer extends Frame implements AppletContext, Printable {
static String encoding = null;
- static private Reader makeReader(InputStream is) {
+ private static Reader makeReader(InputStream is) {
if (encoding != null) {
try {
return new BufferedReader(new InputStreamReader(is, encoding));
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/AppContext.java b/jdk/src/java.desktop/share/classes/sun/awt/AppContext.java
index c6e0b02b834800038550fc0eeb037cfcdecffadd..e1109ed45df6179dc723c186b75b48443905a014 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/AppContext.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/AppContext.java
@@ -148,8 +148,8 @@ public final class AppContext {
/*
* The keys to store EventQueue push/pop lock and condition.
*/
- public final static Object EVENT_QUEUE_LOCK_KEY = new StringBuilder("EventQueue.Lock");
- public final static Object EVENT_QUEUE_COND_KEY = new StringBuilder("EventQueue.Condition");
+ public static final Object EVENT_QUEUE_LOCK_KEY = new StringBuilder("EventQueue.Lock");
+ public static final Object EVENT_QUEUE_COND_KEY = new StringBuilder("EventQueue.Condition");
/* A map of AppContexts, referenced by ThreadGroup.
*/
@@ -172,7 +172,7 @@ public final class AppContext {
private static volatile AppContext mainAppContext = null;
private static class GetAppContextLock {};
- private final static Object getAppContextLock = new GetAppContextLock();
+ private static final Object getAppContextLock = new GetAppContextLock();
/*
* The hash map associated with this AppContext. A private delegate
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/DebugSettings.java b/jdk/src/java.desktop/share/classes/sun/awt/DebugSettings.java
index 6ed7478c20f8b57b87a36c108e380853c83b4d33..bd75e206d59bb4e91fbc97018b0872a49671c130 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/DebugSettings.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/DebugSettings.java
@@ -252,9 +252,9 @@ public final class DebugSettings {
private static final String PROP_CTRACE = "ctrace";
private static final int PROP_CTRACE_LEN = PROP_CTRACE.length();
- private native synchronized void setCTracingOn(boolean enabled);
- private native synchronized void setCTracingOn(boolean enabled, String file);
- private native synchronized void setCTracingOn(boolean enabled, String file, int line);
+ private synchronized native void setCTracingOn(boolean enabled);
+ private synchronized native void setCTracingOn(boolean enabled, String file);
+ private synchronized native void setCTracingOn(boolean enabled, String file, int line);
private void loadNativeSettings() {
boolean ctracingOn;
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/ExtendedKeyCodes.java b/jdk/src/java.desktop/share/classes/sun/awt/ExtendedKeyCodes.java
index fc004ba2a283c2afdacc1c0c964f399f13c00cab..1e054b9de818e125ee3c8c7341e0e581132019ae 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/ExtendedKeyCodes.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/ExtendedKeyCodes.java
@@ -12,16 +12,16 @@ public class ExtendedKeyCodes {
* or higher.
*/
// Keycodes declared in KeyEvent.java with corresponding Unicode values.
- private final static HashMap<Integer, Integer> regularKeyCodesMap =
+ private static final HashMap<Integer, Integer> regularKeyCodesMap =
new HashMap<Integer,Integer>(98, 1.0f);
// Keycodes derived from Unicode values. Here should be collected codes
// for characters appearing on the primary layer of at least one
// known keyboard layout. For instance, sterling sign is on the primary layer
// of the Mac Italian layout.
- private final static HashSet<Integer> extendedKeyCodesSet =
+ private static final HashSet<Integer> extendedKeyCodesSet =
new HashSet<Integer>(501, 1.0f);
- final public static int getExtendedKeyCodeForChar( int c ) {
+ public static final int getExtendedKeyCodeForChar( int c ) {
int uc = Character.toUpperCase( c );
int lc = Character.toLowerCase( c );
if (regularKeyCodesMap.containsKey( c )) {
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/OSInfo.java b/jdk/src/java.desktop/share/classes/sun/awt/OSInfo.java
index 4a515a1734c56ca205d90e661df9e5f6388dd77e..57226bef8ca9b14c3ccdec7585b2c65d7c11d972 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/OSInfo.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/OSInfo.java
@@ -60,7 +60,7 @@ public class OSInfo {
private static final String OS_NAME = "os.name";
private static final String OS_VERSION = "os.version";
- private final static Map<String, WindowsVersion> windowsVersionMap = new HashMap<String, OSInfo.WindowsVersion>();
+ private static final Map<String, WindowsVersion> windowsVersionMap = new HashMap<String, OSInfo.WindowsVersion>();
static {
windowsVersionMap.put(WINDOWS_95.toString(), WINDOWS_95);
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/SunHints.java b/jdk/src/java.desktop/share/classes/sun/awt/SunHints.java
index b82e05644575dc01ed57b796ab048c08a6338018..560b822de1a09f419a4a1adaf3c673e085ea546e 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/SunHints.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/SunHints.java
@@ -102,7 +102,7 @@ public class SunHints {
private static Value[][] ValueObjects =
new Value[NUM_KEYS][VALS_PER_KEY];
- private synchronized static void register(SunHints.Key key,
+ private static synchronized void register(SunHints.Key key,
Value value) {
int kindex = key.getIndex();
int vindex = value.getIndex();
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java b/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java
index 61df2fa0909fba786f68feac584dc79bd69b72b4..96a475e1c68ffdfa9f4e6c6f5e3a77c3d3e5f68c 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java
@@ -113,7 +113,7 @@ public abstract class SunToolkit extends Toolkit
* the 4-bytes limit for the int type. (CR 6799099)
* One more bit is reserved for FIRST_HIGH_BIT.
*/
- public final static int MAX_BUTTONS_SUPPORTED = 20;
+ public static final int MAX_BUTTONS_SUPPORTED = 20;
/**
* Creates and initializes EventQueue instance for the specified
@@ -1820,7 +1820,7 @@ public abstract class SunToolkit extends Toolkit
* Returns the value of "sun.awt.disableMixing" property. Default
* value is {@code false}.
*/
- public synchronized static boolean getSunAwtDisableMixing() {
+ public static synchronized boolean getSunAwtDisableMixing() {
if (sunAwtDisableMixing == null) {
sunAwtDisableMixing = AccessController.doPrivileged(
new GetBooleanAction("sun.awt.disableMixing"));
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/UngrabEvent.java b/jdk/src/java.desktop/share/classes/sun/awt/UngrabEvent.java
index ed126eee7bba2cdb5d821555ef124c006b11ad23..c9d97b8ed9511b1a78df743d92096e6f9f0f5900 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/UngrabEvent.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/UngrabEvent.java
@@ -42,7 +42,7 @@ import java.awt.Component;
@SuppressWarnings("serial")
public class UngrabEvent extends AWTEvent {
- private final static int UNGRAB_EVENT_ID = 1998;
+ private static final int UNGRAB_EVENT_ID = 1998;
public UngrabEvent(Component source) {
super(source, UNGRAB_EVENT_ID);
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java b/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java
index 9808a3af3be32a9fc1a24ef17b5848ccecad2303..1714fea6113bab72962ed292f974b53121dee121 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java
@@ -1080,14 +1080,14 @@ search:
return new File(filePath);
}
- private final static String[] DEPLOYMENT_CACHE_PROPERTIES = {
+ private static final String[] DEPLOYMENT_CACHE_PROPERTIES = {
"deployment.system.cachedir",
"deployment.user.cachedir",
"deployment.javaws.cachedir",
"deployment.javapi.cachedir"
};
- private final static ArrayList <File> deploymentCacheDirectoryList = new ArrayList<>();
+ private static final ArrayList <File> deploymentCacheDirectoryList = new ArrayList<>();
private static boolean isFileInWebstartedCache(File f) {
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java b/jdk/src/java.desktop/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java
index 46b4333ff33237012045d3eb2d0038fd8c000a2f..d0e5c577b78153944ac88aaa38591345cbf6509b 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java
@@ -81,12 +81,12 @@ public abstract class SunDragSourceContextPeer implements DragSourceContextPeer
* dispatch constants
*/
- protected final static int DISPATCH_ENTER = 1;
- protected final static int DISPATCH_MOTION = 2;
- protected final static int DISPATCH_CHANGED = 3;
- protected final static int DISPATCH_EXIT = 4;
- protected final static int DISPATCH_FINISH = 5;
- protected final static int DISPATCH_MOUSE_MOVED = 6;
+ protected static final int DISPATCH_ENTER = 1;
+ protected static final int DISPATCH_MOTION = 2;
+ protected static final int DISPATCH_CHANGED = 3;
+ protected static final int DISPATCH_EXIT = 4;
+ protected static final int DISPATCH_FINISH = 5;
+ protected static final int DISPATCH_MOUSE_MOVED = 6;
/**
* construct a new SunDragSourceContextPeer
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java b/jdk/src/java.desktop/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
index 5a89f09c233b0ec3abbaae6031bf3da4026362e6..7f18fdae53717e3ab0a7a824d8f4d463d41deea0 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
@@ -137,10 +137,10 @@ public abstract class SunDropTargetContextPeer implements DropTargetContextPeer,
* constants used by dropAccept() or dropReject()
*/
- protected final static int STATUS_NONE = 0; // none pending
- protected final static int STATUS_WAIT = 1; // drop pending
- protected final static int STATUS_ACCEPT = 2;
- protected final static int STATUS_REJECT = -1;
+ protected static final int STATUS_NONE = 0; // none pending
+ protected static final int STATUS_WAIT = 1; // drop pending
+ protected static final int STATUS_ACCEPT = 2;
+ protected static final int STATUS_REJECT = -1;
/**
* create the peer
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/geom/AreaOp.java b/jdk/src/java.desktop/share/classes/sun/awt/geom/AreaOp.java
index bdbf2cb2b7e07c4f1b48ddc857c1a692030965dc..785ffb2331c42f79f7101efe2e7da5df268ee90f 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/geom/AreaOp.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/geom/AreaOp.java
@@ -31,7 +31,7 @@ import java.util.Comparator;
import java.util.Arrays;
public abstract class AreaOp {
- public static abstract class CAGOp extends AreaOp {
+ public abstract static class CAGOp extends AreaOp {
boolean inLeft;
boolean inRight;
boolean inResult;
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/geom/Crossings.java b/jdk/src/java.desktop/share/classes/sun/awt/geom/Crossings.java
index 0b4b8d8025f21405a4f503102714d9b2ca040be7..ae330cddedfb2c7cdffaf66293c20c4663d3221e 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/geom/Crossings.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/geom/Crossings.java
@@ -307,7 +307,7 @@ public abstract class Crossings {
return false;
}
- public final static class EvenOdd extends Crossings {
+ public static final class EvenOdd extends Crossings {
public EvenOdd(double xlo, double ylo, double xhi, double yhi) {
super(xlo, ylo, xhi, yhi);
}
@@ -390,7 +390,7 @@ public abstract class Crossings {
}
}
- public final static class NonZero extends Crossings {
+ public static final class NonZero extends Crossings {
private int crosscounts[];
public NonZero(double xlo, double ylo, double xhi, double yhi) {
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/im/CompositionArea.java b/jdk/src/java.desktop/share/classes/sun/awt/im/CompositionArea.java
index f53713ea7b2c3aaa015bb67aaf39357362fab0fd..d15de28044bf34f52b9b99c40222ac1897cf796b 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/im/CompositionArea.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/im/CompositionArea.java
@@ -64,11 +64,11 @@ public final class CompositionArea extends JPanel implements InputMethodListener
private TextLayout composedTextLayout;
private TextHitInfo caret = null;
private JFrame compositionWindow;
- private final static int TEXT_ORIGIN_X = 5;
- private final static int TEXT_ORIGIN_Y = 15;
- private final static int PASSIVE_WIDTH = 480;
- private final static int WIDTH_MARGIN=10;
- private final static int HEIGHT_MARGIN=3;
+ private static final int TEXT_ORIGIN_X = 5;
+ private static final int TEXT_ORIGIN_Y = 15;
+ private static final int PASSIVE_WIDTH = 480;
+ private static final int WIDTH_MARGIN=10;
+ private static final int HEIGHT_MARGIN=3;
CompositionArea() {
// create composition window with localized title
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodContext.java b/jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodContext.java
index fad9a6bae6d9d31b4c4e7b80c7eb9608e58975b6..63cbccbb6ad378956943ce6c199eeb2230f32a18 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodContext.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodContext.java
@@ -66,7 +66,7 @@ public class InputMethodContext
private CompositionAreaHandler compositionAreaHandler;
private Object compositionAreaHandlerLock = new Object();
- static private boolean belowTheSpotInputRequested;
+ private static boolean belowTheSpotInputRequested;
private boolean inputMethodSupportsBelowTheSpot;
static {
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.java
index 2ac4d180152c6796e52a42b9af9e70994b47d0a1..673e51d8518b6daa2b6e2569b63bfa7b8e3ce104 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.java
@@ -76,7 +76,7 @@ public class ByteComponentRaster extends SunWritableRaster {
/** A cached copy of minY + height for use in bounds checks. */
private int maxY;
- static private native void initIDs();
+ private static native void initIDs();
static {
/* ensure that the necessary native libraries are loaded */
NativeLibLoader.loadLibraries();
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.java b/jdk/src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.java
index ef78c83d2ce881e178fd4861e9777a08fe333f8f..f9696c17eb82719aed0ffe87251d1b0ecfbe7867 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.java
@@ -73,7 +73,7 @@ public class BytePackedRaster extends SunWritableRaster {
/** A cached copy of minY + height for use in bounds checks. */
private int maxY;
- static private native void initIDs();
+ private static native void initIDs();
static {
/* ensure that the necessary native libraries are loaded */
NativeLibLoader.loadLibraries();
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ImageCache.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ImageCache.java
index c7088bacf527256cf673307c6f5f4437c6c5441c..cd22ccb7b15a8f0590a5178dd16b28694ee88c62 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/image/ImageCache.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/image/ImageCache.java
@@ -40,7 +40,7 @@ import sun.awt.AppContext;
* The ImageCache must be used from the thread with an AppContext only.
*
*/
-final public class ImageCache {
+public final class ImageCache {
// Ordered Map keyed by args hash, ordered by most recent accessed entry.
private final LinkedHashMap<PixelsKey, ImageSoftReference> map
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ImageRepresentation.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ImageRepresentation.java
index 90bb2ac638841b1e2fd13d1d588d31cca52cddec..3634fac5e3cd3eb777e55b5d1fa0ea298f06c496 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/image/ImageRepresentation.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/image/ImageRepresentation.java
@@ -75,7 +75,7 @@ public class ImageRepresentation extends ImageWatched implements ImageConsumer
boolean isDefaultBI = false;
boolean isSameCM = false;
- private native static void initIDs();
+ private static native void initIDs();
static {
/* ensure that the necessary native libraries are loaded */
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ImagingLib.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ImagingLib.java
index 683b8fe7e759bca2912d46b0cea3dd2650e79949..55bd33305e4489ec98167be9d410a8f7f3999838 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/image/ImagingLib.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/image/ImagingLib.java
@@ -73,18 +73,18 @@ public class ImagingLib {
*/
private static native boolean init();
- static public native int transformBI(BufferedImage src, BufferedImage dst,
+ public static native int transformBI(BufferedImage src, BufferedImage dst,
double[] matrix, int interpType);
- static public native int transformRaster(Raster src, Raster dst,
+ public static native int transformRaster(Raster src, Raster dst,
double[] matrix,
int interpType);
- static public native int convolveBI(BufferedImage src, BufferedImage dst,
+ public static native int convolveBI(BufferedImage src, BufferedImage dst,
Kernel kernel, int edgeHint);
- static public native int convolveRaster(Raster src, Raster dst,
+ public static native int convolveRaster(Raster src, Raster dst,
Kernel kernel, int edgeHint);
- static public native int lookupByteBI(BufferedImage src, BufferedImage dst,
+ public static native int lookupByteBI(BufferedImage src, BufferedImage dst,
byte[][] table);
- static public native int lookupByteRaster(Raster src, Raster dst,
+ public static native int lookupByteRaster(Raster src, Raster dst,
byte[][] table);
static {
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.java b/jdk/src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.java
index a420f95f003c314efee09e22547de0d963f2c028..cd84986b77f604db0306b5a8801d78074cae582a 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.java
@@ -91,7 +91,7 @@ public class IntegerComponentRaster extends SunWritableRaster {
/** A cached copy of minY + height for use in bounds checks. */
private int maxY;
- static private native void initIDs();
+ private static native void initIDs();
static {
/* ensure that the necessary native libraries are loaded */
NativeLibLoader.loadLibraries();
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/PNGImageDecoder.java b/jdk/src/java.desktop/share/classes/sun/awt/image/PNGImageDecoder.java
index 7f78de6e982bace8dfdd6720d25607546d04b80a..0627f91fca3a8c32ca8c892625107b689a5c8dec 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/image/PNGImageDecoder.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/image/PNGImageDecoder.java
@@ -650,13 +650,13 @@ public class PNGImageDecoder extends ImageDecoder
}
/* code changed to make it work with ImageDecoder architecture
static int ThreadLimit = 10;
- private synchronized static void waitTurn() {
+ private static synchronized void waitTurn() {
try {
while(ThreadLimit<=0) PNGImageDecoder.class.wait(1000);
} catch(InterruptedException e){}
ThreadLimit--;
}
- private synchronized static void endTurn() {
+ private static synchronized void endTurn() {
if(ThreadLimit<=0) PNGImageDecoder.class.notify();
ThreadLimit++;
}
@@ -771,7 +771,7 @@ public class PNGImageDecoder extends ImageDecoder
is the 1's complement of the final running CRC (see the
crc() routine below)). */
- static private int update_crc(int crc, byte[] buf, int offset, int len) {
+ private static int update_crc(int crc, byte[] buf, int offset, int len) {
int c = crc;
while (--len>=0)
c = crc_table[(c ^ buf[offset++]) & 0xff] ^ (c >>> 8);
@@ -779,7 +779,7 @@ public class PNGImageDecoder extends ImageDecoder
}
/* Return the CRC of the bytes buf[0..len-1]. */
- static private int crc(byte[] buf, int offset, int len) {
+ private static int crc(byte[] buf, int offset, int len) {
return update_crc(0xffffffff, buf, offset, len) ^ 0xffffffff;
}
public static class Chromaticities {
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.java
index aa1c56a064dc19f3e6e0a7e055f6c81422d46af1..76ab7d75ce467eb55af560572c6daf585708a5db 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.java
@@ -76,7 +76,7 @@ public class ShortComponentRaster extends SunWritableRaster {
/** A cached copy of minY + height for use in bounds checks. */
private int maxY;
- static private native void initIDs();
+ private static native void initIDs();
static {
/* ensure that the necessary native libraries are loaded */
NativeLibLoader.loadLibraries();
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java b/jdk/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java
index 887ad5ae28db83ace7a65bf447dc7af1de2f7420..1b2db0f867f8d3eb5d11ea496bd0a2b838fdabaa 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java
@@ -51,7 +51,7 @@ import sun.java2d.loops.CompositeType;
*/
public abstract class SurfaceManager {
- public static abstract class ImageAccessor {
+ public abstract static class ImageAccessor {
public abstract SurfaceManager getSurfaceManager(Image img);
public abstract void setSurfaceManager(Image img, SurfaceManager mgr);
}
diff --git a/jdk/src/java.desktop/share/classes/sun/dc/DuctusRenderingEngine.java b/jdk/src/java.desktop/share/classes/sun/dc/DuctusRenderingEngine.java
index 6cba2eb3571e67932cf11ad13bb1b4ada3d60dbe..0355813d92d58227ef2a4d9665ae705ce8820ddd 100644
--- a/jdk/src/java.desktop/share/classes/sun/dc/DuctusRenderingEngine.java
+++ b/jdk/src/java.desktop/share/classes/sun/dc/DuctusRenderingEngine.java
@@ -359,7 +359,7 @@ public class DuctusRenderingEngine extends RenderingEngine {
private static Rasterizer theRasterizer;
- public synchronized static Rasterizer getRasterizer() {
+ public static synchronized Rasterizer getRasterizer() {
Rasterizer r = theRasterizer;
if (r == null) {
r = new Rasterizer();
@@ -369,7 +369,7 @@ public class DuctusRenderingEngine extends RenderingEngine {
return r;
}
- public synchronized static void dropRasterizer(Rasterizer r) {
+ public static synchronized void dropRasterizer(Rasterizer r) {
r.reset();
theRasterizer = r;
}
diff --git a/jdk/src/java.desktop/share/classes/sun/font/Type1Font.java b/jdk/src/java.desktop/share/classes/sun/font/Type1Font.java
index 68bc7eaaeb9d042f4111190c90a7ea609433679a..39a1c08d0e0d0e4c17a87b9419ab4a259e7e2e2f 100644
--- a/jdk/src/java.desktop/share/classes/sun/font/Type1Font.java
+++ b/jdk/src/java.desktop/share/classes/sun/font/Type1Font.java
@@ -102,8 +102,8 @@ public class Type1Font extends FileFont {
private String psName = null;
- static private HashMap<String, String> styleAbbreviationsMapping;
- static private HashSet<String> styleNameTokes;
+ private static HashMap<String, String> styleAbbreviationsMapping;
+ private static HashSet<String> styleNameTokes;
static {
styleAbbreviationsMapping = new HashMap<>();
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/NullSurfaceData.java b/jdk/src/java.desktop/share/classes/sun/java2d/NullSurfaceData.java
index c085da0d5377ad4da3dcd5abf7838322cfdc7f0d..6b93d81afb67f6185fa75969f1e2a4bed35567aa 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/NullSurfaceData.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/NullSurfaceData.java
@@ -63,7 +63,7 @@ public class NullSurfaceData extends SurfaceData {
return this;
}
- private final static NullPipe nullpipe = new NullPipe();
+ private static final NullPipe nullpipe = new NullPipe();
public void validatePipe(SunGraphics2D sg2d) {
sg2d.drawpipe = nullpipe;
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/StateTrackableDelegate.java b/jdk/src/java.desktop/share/classes/sun/java2d/StateTrackableDelegate.java
index 692f3761dc40a7bc39f746f678d0d8b52e50487e..25231aa8f4f6e79e4c9c65e99ade6746703a120e 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/StateTrackableDelegate.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/StateTrackableDelegate.java
@@ -44,7 +44,7 @@ public final class StateTrackableDelegate implements StateTrackable {
* of the StateTrackable interface that is permanently in the
* {@link State#UNTRACKABLE UNTRACKABLE} state.
*/
- public final static StateTrackableDelegate UNTRACKABLE_DELEGATE =
+ public static final StateTrackableDelegate UNTRACKABLE_DELEGATE =
new StateTrackableDelegate(UNTRACKABLE);
/**
@@ -52,7 +52,7 @@ public final class StateTrackableDelegate implements StateTrackable {
* of the StateTrackable interface that is permanently in the
* {@link State#IMMUTABLE IMMUTABLE} state.
*/
- public final static StateTrackableDelegate IMMUTABLE_DELEGATE =
+ public static final StateTrackableDelegate IMMUTABLE_DELEGATE =
new StateTrackableDelegate(IMMUTABLE);
/**
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java b/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java
index 36955e280e5adc527beb6d70471eec3741b1def2..7ed0e3a7033119abedcedff6ab86803937c2c7b3 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java
@@ -252,7 +252,7 @@ public final class SunGraphics2D
private FontInfo glyphVectorFontInfo;
private FontRenderContext glyphVectorFRC;
- private final static int slowTextTransformMask =
+ private static final int slowTextTransformMask =
AffineTransform.TYPE_GENERAL_TRANSFORM
| AffineTransform.TYPE_MASK_ROTATION
| AffineTransform.TYPE_FLIP;
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/SurfaceManagerFactory.java b/jdk/src/java.desktop/share/classes/sun/java2d/SurfaceManagerFactory.java
index 80c63a3fc7c436eceb2e443427531080d13d174c..39b6d2e33cf5b355c0cad10537e341ba8787a98b 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/SurfaceManagerFactory.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/SurfaceManagerFactory.java
@@ -50,7 +50,7 @@ public abstract class SurfaceManagerFactory {
*
* @return the surface manager factory
*/
- public synchronized static SurfaceManagerFactory getInstance() {
+ public static synchronized SurfaceManagerFactory getInstance() {
if (instance == null) {
throw new IllegalStateException("No SurfaceManagerFactory set.");
@@ -65,7 +65,7 @@ public abstract class SurfaceManagerFactory {
*
* @param factory the factory to set
*/
- public synchronized static void setInstance(SurfaceManagerFactory factory) {
+ public static synchronized void setInstance(SurfaceManagerFactory factory) {
if (factory == null) {
// We don't want to allow setting this to null at any time.
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java b/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java
index 2a554db1f3f56dc8f45fff8431cedccbb704302a..a9e6adbbed95d89e39d2b36e7c9575b04b57e06d 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java
@@ -136,7 +136,7 @@ public class LCMS implements PCMM {
private native void setTagDataNative(long ptr, int tagSignature,
byte[] data);
- public synchronized static native LCMSProfile getProfileID(ICC_Profile profile);
+ public static synchronized native LCMSProfile getProfileID(ICC_Profile profile);
/* Helper method used from LCMSColorTransfrom */
static long createTransform(
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/CompositeType.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/CompositeType.java
index 5eeaf85f7eaeffa8ccc9bb154f76310930e399e5..a8227cdb739a51cdad04723da8c2c17c4ce2aba3 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/CompositeType.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/CompositeType.java
@@ -242,7 +242,7 @@ public final class CompositeType {
this.uniqueID = makeUniqueID(desc);
}
- public synchronized static int makeUniqueID(String desc) {
+ public static synchronized int makeUniqueID(String desc) {
Integer i = compositeUIDMap.get(desc);
if (i == null) {
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphList.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphList.java
index 09284087fc6daab7e083f4ce9ca9dd38386b9c47..47490290a018d97ef339915e11aab5650049dc36 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphList.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphList.java
@@ -39,9 +39,9 @@ import sun.font.GlyphList;
*/
public class DrawGlyphList extends GraphicsPrimitive {
- public final static String methodSignature = "DrawGlyphList(...)".toString();
+ public static final String methodSignature = "DrawGlyphList(...)".toString();
- public final static int primTypeID = makePrimTypeID();
+ public static final int primTypeID = makePrimTypeID();
public static DrawGlyphList locate(SurfaceType srctype,
CompositeType comptype,
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListAA.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListAA.java
index 83aee554241ce4044fbb515dbc3dd9a382856a77..bd3dc8b08ce6c04e63329be72663a91d464e3dad 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListAA.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListAA.java
@@ -39,9 +39,9 @@ import sun.font.GlyphList;
*/
public class DrawGlyphListAA extends GraphicsPrimitive {
- public final static String methodSignature = "DrawGlyphListAA(...)".toString();
+ public static final String methodSignature = "DrawGlyphListAA(...)".toString();
- public final static int primTypeID = makePrimTypeID();
+ public static final int primTypeID = makePrimTypeID();
public static DrawGlyphListAA locate(SurfaceType srctype,
CompositeType comptype,
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListLCD.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListLCD.java
index 892dc64f7c5f3be6506be6118c5bb2d7d7c83f41..41722876ee890f53b32d0bfc67896a1d1336dce4 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListLCD.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListLCD.java
@@ -39,10 +39,10 @@ import sun.font.GlyphList;
*/
public class DrawGlyphListLCD extends GraphicsPrimitive {
- public final static String
+ public static final String
methodSignature = "DrawGlyphListLCD(...)".toString();
- public final static int primTypeID = makePrimTypeID();
+ public static final int primTypeID = makePrimTypeID();
public static DrawGlyphListLCD locate(SurfaceType srctype,
CompositeType comptype,
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawLine.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawLine.java
index 6abd9c13f12feb9ccad5155534995e25389e06bd..2d5e1de7d845ad2f779167dd158ddef46f2ebe7d 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawLine.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawLine.java
@@ -44,9 +44,9 @@ import sun.java2d.SurfaceData;
*/
public class DrawLine extends GraphicsPrimitive
{
- public final static String methodSignature = "DrawLine(...)".toString();
+ public static final String methodSignature = "DrawLine(...)".toString();
- public final static int primTypeID = makePrimTypeID();
+ public static final int primTypeID = makePrimTypeID();
public static DrawLine locate(SurfaceType srctype,
CompositeType comptype,
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawParallelogram.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawParallelogram.java
index a936d49f3d72d1ac37f363c232e9847f780d94f0..6d16e06794320519066601d8c4e1155a4f73de10 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawParallelogram.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawParallelogram.java
@@ -42,10 +42,10 @@ import sun.java2d.SurfaceData;
*/
public class DrawParallelogram extends GraphicsPrimitive
{
- public final static String methodSignature =
+ public static final String methodSignature =
"DrawParallelogram(...)".toString();
- public final static int primTypeID = makePrimTypeID();
+ public static final int primTypeID = makePrimTypeID();
public static DrawParallelogram locate(SurfaceType srctype,
CompositeType comptype,
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawPath.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawPath.java
index 4da3295b81896a4556795b35ee9382c6d4f88e78..571a01a91f87cae69253949312a5516102603efa 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawPath.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawPath.java
@@ -38,10 +38,10 @@ import java.awt.geom.Path2D;
*/
public class DrawPath extends GraphicsPrimitive {
- public final static String methodSignature =
+ public static final String methodSignature =
"DrawPath(...)".toString();
- public final static int primTypeID = makePrimTypeID();
+ public static final int primTypeID = makePrimTypeID();
public static DrawPath locate(SurfaceType srctype,
CompositeType comptype,
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawPolygons.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawPolygons.java
index eecb6337f36711d381cddecc19c65b21598e0b56..518aeaca44ad4f3ca0606d362b457a662efb1d58 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawPolygons.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawPolygons.java
@@ -41,9 +41,9 @@ import sun.java2d.SurfaceData;
*/
public class DrawPolygons extends GraphicsPrimitive
{
- public final static String methodSignature = "DrawPolygons(...)".toString();
+ public static final String methodSignature = "DrawPolygons(...)".toString();
- public final static int primTypeID = makePrimTypeID();
+ public static final int primTypeID = makePrimTypeID();
public static DrawPolygons locate(SurfaceType srctype,
CompositeType comptype,
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawRect.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawRect.java
index 17f588d37326d42fbb3eed6d24165c103afc28ff..4c38e5e1882df94f3999f68b63ce2ed1035102e1 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawRect.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawRect.java
@@ -44,9 +44,9 @@ import sun.java2d.SurfaceData;
*/
public class DrawRect extends GraphicsPrimitive
{
- public final static String methodSignature = "DrawRect(...)".toString();
+ public static final String methodSignature = "DrawRect(...)".toString();
- public final static int primTypeID = makePrimTypeID();
+ public static final int primTypeID = makePrimTypeID();
public static DrawRect locate(SurfaceType srctype,
CompositeType comptype,
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillParallelogram.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillParallelogram.java
index 54138340162f14fd894960a16429bed4960a77bc..b895c0b8737de886b643f6313c8e4b1c971cb4e0 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillParallelogram.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillParallelogram.java
@@ -40,10 +40,10 @@ import sun.java2d.SurfaceData;
*/
public class FillParallelogram extends GraphicsPrimitive
{
- public final static String methodSignature =
+ public static final String methodSignature =
"FillParallelogram(...)".toString();
- public final static int primTypeID = makePrimTypeID();
+ public static final int primTypeID = makePrimTypeID();
public static FillParallelogram locate(SurfaceType srctype,
CompositeType comptype,
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillPath.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillPath.java
index 95a653e76a466e68a1ee84e8fe19440e31b45db7..524240ed4d1ae0b8c7f0c97760a11b5cb4f40704 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillPath.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillPath.java
@@ -38,10 +38,10 @@ import java.awt.geom.Path2D;
*/
public class FillPath extends GraphicsPrimitive {
- public final static String methodSignature =
+ public static final String methodSignature =
"FillPath(...)".toString();
- public final static int primTypeID = makePrimTypeID();
+ public static final int primTypeID = makePrimTypeID();
public static FillPath locate(SurfaceType srctype,
CompositeType comptype,
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillRect.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillRect.java
index 804e7546b84b5a33856da95baff2ff9a865fdcdd..39ed1cbbf6bb121ece1978dfe0a20f0c9f5ae219 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillRect.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillRect.java
@@ -44,9 +44,9 @@ import sun.java2d.SurfaceData;
*/
public class FillRect extends GraphicsPrimitive
{
- public final static String methodSignature = "FillRect(...)".toString();
+ public static final String methodSignature = "FillRect(...)".toString();
- public final static int primTypeID = makePrimTypeID();
+ public static final int primTypeID = makePrimTypeID();
public static FillRect locate(SurfaceType srctype,
CompositeType comptype,
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillSpans.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillSpans.java
index 93c7b17f5e9e7310ec7a0cc86bdcf20c83ed8610..199d07c18ff30d05a46f75fd6f8a5dcee7bf5240 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillSpans.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillSpans.java
@@ -45,9 +45,9 @@ import sun.java2d.SurfaceData;
*/
public class FillSpans extends GraphicsPrimitive
{
- public final static String methodSignature = "FillSpans(...)".toString();
+ public static final String methodSignature = "FillSpans(...)".toString();
- public final static int primTypeID = makePrimTypeID();
+ public static final int primTypeID = makePrimTypeID();
public static FillSpans locate(SurfaceType srctype,
CompositeType comptype,
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitive.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitive.java
index 6db75f45f52572fa2f11a6ee63f4e2ca00fd1366..38bbaeb5178be31c0115df695d5cb3d64f901746 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitive.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitive.java
@@ -119,14 +119,14 @@ public abstract class GraphicsPrimitive {
private long pNativePrim; // Native blit loop info
- public synchronized static final int makePrimTypeID() {
+ public static final synchronized int makePrimTypeID() {
if (unusedPrimID > 255) {
throw new InternalError("primitive id overflow");
}
return unusedPrimID++;
}
- public synchronized static final int makeUniqueID(int primTypeID,
+ public static final synchronized int makeUniqueID(int primTypeID,
SurfaceType src,
CompositeType cmp,
SurfaceType dst)
@@ -456,7 +456,7 @@ public abstract class GraphicsPrimitive {
}
}
- public synchronized static void tracePrimitive(Object prim) {
+ public static synchronized void tracePrimitive(Object prim) {
if ((traceflags & TRACECOUNTS) != 0) {
if (traceMap == null) {
traceMap = new HashMap<>();
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java
index 177aa2148aae9cc93f86b6116b246527a73b3582..6865c3ad1dc98fc8b03982ca0ec8092139b7fa79 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java
@@ -98,7 +98,7 @@ public final class GraphicsPrimitiveMgr {
private GraphicsPrimitiveMgr() {
}
- public synchronized static void register(GraphicsPrimitive[] newPrimitives)
+ public static synchronized void register(GraphicsPrimitive[] newPrimitives)
{
GraphicsPrimitive[] devCollection = primitives;
int oldSize = 0;
@@ -121,7 +121,7 @@ public final class GraphicsPrimitiveMgr {
primitives = temp;
}
- public synchronized static void registerGeneral(GraphicsPrimitive gen) {
+ public static synchronized void registerGeneral(GraphicsPrimitive gen) {
if (generalPrimitives == null) {
generalPrimitives = new GraphicsPrimitive[] {gen};
return;
@@ -133,7 +133,7 @@ public final class GraphicsPrimitiveMgr {
generalPrimitives = newGen;
}
- public synchronized static GraphicsPrimitive locate(int primTypeID,
+ public static synchronized GraphicsPrimitive locate(int primTypeID,
SurfaceType dsttype)
{
return locate(primTypeID,
@@ -142,7 +142,7 @@ public final class GraphicsPrimitiveMgr {
dsttype);
}
- public synchronized static GraphicsPrimitive locate(int primTypeID,
+ public static synchronized GraphicsPrimitive locate(int primTypeID,
SurfaceType srctype,
CompositeType comptype,
SurfaceType dsttype)
@@ -170,7 +170,7 @@ public final class GraphicsPrimitiveMgr {
return prim;
}
- public synchronized static GraphicsPrimitive
+ public static synchronized GraphicsPrimitive
locatePrim(int primTypeID,
SurfaceType srctype,
CompositeType comptype,
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/ProcessPath.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/ProcessPath.java
index 3ed651e50896ab24485d67f67ad620eae257d04c..8ee35b2202e63eeb562998e4b5e22a299bac32b0 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/ProcessPath.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/ProcessPath.java
@@ -45,7 +45,7 @@ public class ProcessPath {
/* Public interfaces and methods for drawing and filling general paths */
- public static abstract class DrawHandler {
+ public abstract static class DrawHandler {
public int xMin;
public int yMin;
public int xMax;
@@ -121,7 +121,7 @@ public class ProcessPath {
public static final int PH_MODE_DRAW_CLIP = 0;
public static final int PH_MODE_FILL_CLIP = 1;
- public static abstract class ProcessHandler implements EndSubPathHandler {
+ public abstract static class ProcessHandler implements EndSubPathHandler {
DrawHandler dhnd;
int clipMode;
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLPaints.java b/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLPaints.java
index 1991d82f10b4e023a38becce8b40cf325174edcc..8416a0daa6c7a03ded625dd8ebae1ec201659b93 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLPaints.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLPaints.java
@@ -151,7 +151,7 @@ abstract class OGLPaints {
/****************** Shared MultipleGradientPaint support ********************/
- private static abstract class MultiGradient extends OGLPaints {
+ private abstract static class MultiGradient extends OGLPaints {
protected MultiGradient() {}
/**
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/AAShapePipe.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/AAShapePipe.java
index 239d134fca06d383dd1b01008204a6ac383ae9d3..dcabdbcc3ee52012b0a0e3ba2fffce9bef18bc74 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/AAShapePipe.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/AAShapePipe.java
@@ -127,7 +127,7 @@ public class AAShapePipe
private static byte[] theTile;
- private synchronized static byte[] getAlphaTile(int len) {
+ private static synchronized byte[] getAlphaTile(int len) {
byte[] t = theTile;
if (t == null || t.length < len) {
t = new byte[len];
@@ -137,7 +137,7 @@ public class AAShapePipe
return t;
}
- private synchronized static void dropAlphaTile(byte[] t) {
+ private static synchronized void dropAlphaTile(byte[] t) {
theTile = t;
}
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/LoopPipe.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/LoopPipe.java
index 9327f45bc0d92daeb07b398779ef5d1143cb4b55..93ba37dd96c3674f6f66b6a579c919aaba914c3c 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/LoopPipe.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/LoopPipe.java
@@ -52,7 +52,7 @@ public class LoopPipe
ShapeDrawPipe,
LoopBasedPipe
{
- final static RenderingEngine RenderEngine = RenderingEngine.getInstance();
+ static final RenderingEngine RenderEngine = RenderingEngine.getInstance();
public void drawLine(SunGraphics2D sg2d,
int x1, int y1, int x2, int y2)
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/SpanShapeRenderer.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/SpanShapeRenderer.java
index 2715a28bdf68a9d95a8ba2e0c83ea6250418aa36..e740373f85620f4dbd9f6dd81bf4b1fb68fa796c 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/SpanShapeRenderer.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/SpanShapeRenderer.java
@@ -42,7 +42,7 @@ import sun.awt.SunHints;
* perform the actual rendering.
*/
public abstract class SpanShapeRenderer implements ShapeDrawPipe {
- final static RenderingEngine RenderEngine = RenderingEngine.getInstance();
+ static final RenderingEngine RenderEngine = RenderingEngine.getInstance();
public static class Composite extends SpanShapeRenderer {
CompositePipe comppipe;
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pisces/Renderer.java b/jdk/src/java.desktop/share/classes/sun/java2d/pisces/Renderer.java
index de7740e33565d09ef712083525f08b95bc778ad5..58cbf18132879038bb4e39fb19531a8680ae1077 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/pisces/Renderer.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/pisces/Renderer.java
@@ -311,12 +311,12 @@ final class Renderer implements PathConsumer2D {
public static final int WIND_NON_ZERO = 1;
// Antialiasing
- final private int SUBPIXEL_LG_POSITIONS_X;
- final private int SUBPIXEL_LG_POSITIONS_Y;
- final private int SUBPIXEL_POSITIONS_X;
- final private int SUBPIXEL_POSITIONS_Y;
- final private int SUBPIXEL_MASK_X;
- final private int SUBPIXEL_MASK_Y;
+ private final int SUBPIXEL_LG_POSITIONS_X;
+ private final int SUBPIXEL_LG_POSITIONS_Y;
+ private final int SUBPIXEL_POSITIONS_X;
+ private final int SUBPIXEL_POSITIONS_Y;
+ private final int SUBPIXEL_MASK_X;
+ private final int SUBPIXEL_MASK_Y;
final int MAX_AA_ALPHA;
// Cache to store RLE-encoded coverage mask of the current primitive
diff --git a/jdk/src/java.desktop/share/classes/sun/print/CustomMediaSizeName.java b/jdk/src/java.desktop/share/classes/sun/print/CustomMediaSizeName.java
index 5b9b4b19883a1d6502ebddd858c88c1825a8206b..1baf9a6755d6bd3ee95991c1b76da0ff4e2ae93f 100644
--- a/jdk/src/java.desktop/share/classes/sun/print/CustomMediaSizeName.java
+++ b/jdk/src/java.desktop/share/classes/sun/print/CustomMediaSizeName.java
@@ -43,7 +43,7 @@ class CustomMediaSizeName extends MediaSizeName {
}
- private synchronized static int nextValue(String name) {
+ private static synchronized int nextValue(String name) {
customStringTable.add(name);
return (customStringTable.size()-1);
diff --git a/jdk/src/java.desktop/share/classes/sun/print/CustomMediaTray.java b/jdk/src/java.desktop/share/classes/sun/print/CustomMediaTray.java
index 7607cd8d1189ca2cd877e881dd288aaa9b91e7b0..394aba988c1794abf78e27032a206046b0a50c85 100644
--- a/jdk/src/java.desktop/share/classes/sun/print/CustomMediaTray.java
+++ b/jdk/src/java.desktop/share/classes/sun/print/CustomMediaTray.java
@@ -40,7 +40,7 @@ class CustomMediaTray extends MediaTray {
}
- private synchronized static int nextValue(String name) {
+ private static synchronized int nextValue(String name) {
customStringTable.add(name);
return (customStringTable.size()-1);
}
diff --git a/jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java b/jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java
index 63118aa4841b5a94b34ad9d29ef8ec7b381e6761..3d848fa5bae5bf7dd0b6a2856e71ec1f5021f0b0 100644
--- a/jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java
+++ b/jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java
@@ -66,9 +66,9 @@ import java.awt.print.*;
public class PSStreamPrintJob implements CancelablePrintJob {
- transient private Vector<PrintJobListener> jobListeners;
- transient private Vector<PrintJobAttributeListener> attrListeners;
- transient private Vector<PrintJobAttributeSet> listenedAttributeSets;
+ private transient Vector<PrintJobListener> jobListeners;
+ private transient Vector<PrintJobAttributeListener> attrListeners;
+ private transient Vector<PrintJobAttributeSet> listenedAttributeSets;
private PSStreamPrintService service;
private boolean fidelity;
diff --git a/jdk/src/java.desktop/share/classes/sun/print/PeekGraphics.java b/jdk/src/java.desktop/share/classes/sun/print/PeekGraphics.java
index ffa0aabe25db62dbba30cc29eab2c19842f7c9f7..0e33bf191eb20a8ae8cb4d89f51fc375db33ee52 100644
--- a/jdk/src/java.desktop/share/classes/sun/print/PeekGraphics.java
+++ b/jdk/src/java.desktop/share/classes/sun/print/PeekGraphics.java
@@ -1885,7 +1885,7 @@ public class PeekGraphics extends Graphics2D
return mHeight;
}
- synchronized private void waitForDimensions(Image img) {
+ private synchronized void waitForDimensions(Image img) {
mHeight = img.getHeight(this);
mWidth = img.getWidth(this);
while (!badImage && (mWidth < 0 || mHeight < 0)) {
@@ -1903,7 +1903,7 @@ public class PeekGraphics extends Graphics2D
}
}
- synchronized public boolean imageUpdate(Image image, int flags,
+ public synchronized boolean imageUpdate(Image image, int flags,
int x, int y, int w, int h) {
boolean dontCallMeAgain = (flags & (HEIGHT | ABORT | ERROR)) != 0;
diff --git a/jdk/src/java.desktop/share/classes/sun/print/PrintJob2D.java b/jdk/src/java.desktop/share/classes/sun/print/PrintJob2D.java
index cd3ded43f75548ee2d6eaa42ca25b7d91f5a9dc1..9f14ff7ba03977a8b8dd1f8998f9583377b42bd4 100644
--- a/jdk/src/java.desktop/share/classes/sun/print/PrintJob2D.java
+++ b/jdk/src/java.desktop/share/classes/sun/print/PrintJob2D.java
@@ -263,27 +263,27 @@ public class PrintJob2D extends PrintJob implements Printable, Runnable {
// The following Strings are maintained for backward-compatibility with
// Properties based print control.
- private final static String DEST_PROP = "awt.print.destination";
- private final static String PRINTER = "printer";
- private final static String FILE = "file";
+ private static final String DEST_PROP = "awt.print.destination";
+ private static final String PRINTER = "printer";
+ private static final String FILE = "file";
- private final static String PRINTER_PROP = "awt.print.printer";
+ private static final String PRINTER_PROP = "awt.print.printer";
- private final static String FILENAME_PROP = "awt.print.fileName";
+ private static final String FILENAME_PROP = "awt.print.fileName";
- private final static String NUMCOPIES_PROP = "awt.print.numCopies";
+ private static final String NUMCOPIES_PROP = "awt.print.numCopies";
- private final static String OPTIONS_PROP = "awt.print.options";
+ private static final String OPTIONS_PROP = "awt.print.options";
- private final static String ORIENT_PROP = "awt.print.orientation";
- private final static String PORTRAIT = "portrait";
- private final static String LANDSCAPE = "landscape";
+ private static final String ORIENT_PROP = "awt.print.orientation";
+ private static final String PORTRAIT = "portrait";
+ private static final String LANDSCAPE = "landscape";
- private final static String PAPERSIZE_PROP = "awt.print.paperSize";
- private final static String LETTER = "letter";
- private final static String LEGAL = "legal";
- private final static String EXECUTIVE = "executive";
- private final static String A4 = "a4";
+ private static final String PAPERSIZE_PROP = "awt.print.paperSize";
+ private static final String LETTER = "letter";
+ private static final String LEGAL = "legal";
+ private static final String EXECUTIVE = "executive";
+ private static final String A4 = "a4";
private Properties props;
diff --git a/jdk/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java b/jdk/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
index 7a24a722efbf69c6b90f168484948000097d2dc4..b322567936947d079c4a20ca47ee0c43f7dc43e7 100644
--- a/jdk/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
+++ b/jdk/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
@@ -335,67 +335,67 @@ public abstract class RasterPrinterJob extends PrinterJob {
* Returns the resolution in dots per inch across the width
* of the page.
*/
- abstract protected double getXRes();
+ protected abstract double getXRes();
/**
* Returns the resolution in dots per inch down the height
* of the page.
*/
- abstract protected double getYRes();
+ protected abstract double getYRes();
/**
* Must be obtained from the current printer.
* Value is in device pixels.
* Not adjusted for orientation of the paper.
*/
- abstract protected double getPhysicalPrintableX(Paper p);
+ protected abstract double getPhysicalPrintableX(Paper p);
/**
* Must be obtained from the current printer.
* Value is in device pixels.
* Not adjusted for orientation of the paper.
*/
- abstract protected double getPhysicalPrintableY(Paper p);
+ protected abstract double getPhysicalPrintableY(Paper p);
/**
* Must be obtained from the current printer.
* Value is in device pixels.
* Not adjusted for orientation of the paper.
*/
- abstract protected double getPhysicalPrintableWidth(Paper p);
+ protected abstract double getPhysicalPrintableWidth(Paper p);
/**
* Must be obtained from the current printer.
* Value is in device pixels.
* Not adjusted for orientation of the paper.
*/
- abstract protected double getPhysicalPrintableHeight(Paper p);
+ protected abstract double getPhysicalPrintableHeight(Paper p);
/**
* Must be obtained from the current printer.
* Value is in device pixels.
* Not adjusted for orientation of the paper.
*/
- abstract protected double getPhysicalPageWidth(Paper p);
+ protected abstract double getPhysicalPageWidth(Paper p);
/**
* Must be obtained from the current printer.
* Value is in device pixels.
* Not adjusted for orientation of the paper.
*/
- abstract protected double getPhysicalPageHeight(Paper p);
+ protected abstract double getPhysicalPageHeight(Paper p);
/**
* Begin a new page.
*/
- abstract protected void startPage(PageFormat format, Printable painter,
+ protected abstract void startPage(PageFormat format, Printable painter,
int index, boolean paperChanged)
throws PrinterException;
/**
* End a page.
*/
- abstract protected void endPage(PageFormat format, Printable painter,
+ protected abstract void endPage(PageFormat format, Printable painter,
int index)
throws PrinterException;
@@ -406,7 +406,7 @@ public abstract class RasterPrinterJob extends PrinterJob {
* page. The width and height of the band is
* specified by the caller.
*/
- abstract protected void printBand(byte[] data, int x, int y,
+ protected abstract void printBand(byte[] data, int x, int y,
int width, int height)
throws PrinterException;
diff --git a/jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java b/jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java
index ece4f48ef975bf01a5d02b6c5e3381d68abcf557..f4694100cd2ecb6dbb46b1f4863b08dc93315325 100644
--- a/jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java
+++ b/jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java
@@ -87,17 +87,17 @@ public class ServiceDialog extends JDialog implements ActionListener {
/**
* Waiting print status (user response pending).
*/
- public final static int WAITING = 0;
+ public static final int WAITING = 0;
/**
* Approve print status (user activated "Print" or "OK").
*/
- public final static int APPROVE = 1;
+ public static final int APPROVE = 1;
/**
* Cancel print status (user activated "Cancel");
*/
- public final static int CANCEL = 2;
+ public static final int CANCEL = 2;
private static final String strBundle = "sun.print.resources.serviceui";
private static final Insets panelInsets = new Insets(6, 6, 6, 6);
diff --git a/jdk/src/java.desktop/share/classes/sun/swing/FilePane.java b/jdk/src/java.desktop/share/classes/sun/swing/FilePane.java
index 34af52a315eab843f5794e2368ac0eb74da5f0e5..778e40cc05263f5485fa4bcc8168eecb5a20e519 100644
--- a/jdk/src/java.desktop/share/classes/sun/swing/FilePane.java
+++ b/jdk/src/java.desktop/share/classes/sun/swing/FilePane.java
@@ -63,14 +63,14 @@ public class FilePane extends JPanel implements PropertyChangeListener {
// Constants for actions. These are used for the actions' ACTION_COMMAND_KEY
// and as keys in the action maps for FilePane and the corresponding UI classes
- public final static String ACTION_APPROVE_SELECTION = "approveSelection";
- public final static String ACTION_CANCEL = "cancelSelection";
- public final static String ACTION_EDIT_FILE_NAME = "editFileName";
- public final static String ACTION_REFRESH = "refresh";
- public final static String ACTION_CHANGE_TO_PARENT_DIRECTORY = "Go Up";
- public final static String ACTION_NEW_FOLDER = "New Folder";
- public final static String ACTION_VIEW_LIST = "viewTypeList";
- public final static String ACTION_VIEW_DETAILS = "viewTypeDetails";
+ public static final String ACTION_APPROVE_SELECTION = "approveSelection";
+ public static final String ACTION_CANCEL = "cancelSelection";
+ public static final String ACTION_EDIT_FILE_NAME = "editFileName";
+ public static final String ACTION_REFRESH = "refresh";
+ public static final String ACTION_CHANGE_TO_PARENT_DIRECTORY = "Go Up";
+ public static final String ACTION_NEW_FOLDER = "New Folder";
+ public static final String ACTION_VIEW_LIST = "viewTypeList";
+ public static final String ACTION_VIEW_DETAILS = "viewTypeDetails";
private Action[] actions;
diff --git a/jdk/src/java.desktop/share/classes/sun/swing/ImageCache.java b/jdk/src/java.desktop/share/classes/sun/swing/ImageCache.java
index 869e30cd8f46844033653b0e4778a3b4f402daa8..57a8ea095ad0f602f143df5afb12e66d4c10f2ab 100644
--- a/jdk/src/java.desktop/share/classes/sun/swing/ImageCache.java
+++ b/jdk/src/java.desktop/share/classes/sun/swing/ImageCache.java
@@ -37,7 +37,7 @@ public class ImageCache {
// Maximum number of entries to cache
private int maxCount;
// The entries.
- final private LinkedList<SoftReference<Entry>> entries;
+ private final LinkedList<SoftReference<Entry>> entries;
public ImageCache(int maxCount) {
this.maxCount = maxCount;
@@ -102,10 +102,10 @@ public class ImageCache {
* Caches set of arguments and Image.
*/
private static class Entry {
- final private GraphicsConfiguration config;
- final private int w;
- final private int h;
- final private Object[] args;
+ private final GraphicsConfiguration config;
+ private final int w;
+ private final int h;
+ private final Object[] args;
private Image image;
Entry(GraphicsConfiguration config, int w, int h, Object[] args) {
diff --git a/jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUI.java b/jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUI.java
index 1f93fa7fc2499f6f63f517791a5f536997f850ab..6767719797bdf5141ee1b2ee62fe6282eb44e70b 100644
--- a/jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUI.java
+++ b/jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUI.java
@@ -228,8 +228,8 @@ public abstract class SynthFileChooserUI extends BasicFileChooserUI implements
protected void paint(SynthContext context, Graphics g) {
}
- abstract public void setFileName(String fileName);
- abstract public String getFileName();
+ public abstract void setFileName(String fileName);
+ public abstract String getFileName();
protected void doSelectedFileChanged(PropertyChangeEvent e) {
}
diff --git a/jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java b/jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
index 4fa7306fdd09449105ad0650d459e98995cb5669..3197fd82cd45a748ec83802980a5f4c8f026e90a 100644
--- a/jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
+++ b/jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
@@ -699,7 +699,7 @@ public class SynthFileChooserUIImpl extends SynthFileChooserUI {
}
}
- final static int space = 10;
+ static final int space = 10;
class IndentIcon implements Icon {
Icon icon = null;
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java
index 27661ee35d769e67857498143c055dc49ee84379..42fd317d69dd476ec61d98a494838de8dd1b0b39 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java
@@ -169,12 +169,12 @@ public abstract class InfoWindow extends Window {
display();
}};
- private final static int TOOLTIP_SHOW_TIME = 10000;
- private final static int TOOLTIP_START_DELAY_TIME = 1000;
- private final static int TOOLTIP_MAX_LENGTH = 64;
- private final static int TOOLTIP_MOUSE_CURSOR_INDENT = 5;
- private final static Color TOOLTIP_BACKGROUND_COLOR = new Color(255, 255, 220);
- private final static Font TOOLTIP_TEXT_FONT = XWindow.getDefaultFont();
+ private static final int TOOLTIP_SHOW_TIME = 10000;
+ private static final int TOOLTIP_START_DELAY_TIME = 1000;
+ private static final int TOOLTIP_MAX_LENGTH = 64;
+ private static final int TOOLTIP_MOUSE_CURSOR_INDENT = 5;
+ private static final Color TOOLTIP_BACKGROUND_COLOR = new Color(255, 255, 220);
+ private static final Font TOOLTIP_TEXT_FONT = XWindow.getDefaultFont();
public Tooltip(Frame parent, Object target,
LiveArguments liveArguments)
@@ -258,15 +258,15 @@ public abstract class InfoWindow extends Window {
private final LiveArguments liveArguments;
private final Object target;
- private final static int BALLOON_SHOW_TIME = 10000;
- private final static int BALLOON_TEXT_MAX_LENGTH = 256;
- private final static int BALLOON_WORD_LINE_MAX_LENGTH = 16;
- private final static int BALLOON_WORD_LINE_MAX_COUNT = 4;
- private final static int BALLOON_ICON_WIDTH = 32;
- private final static int BALLOON_ICON_HEIGHT = 32;
- private final static int BALLOON_TRAY_ICON_INDENT = 0;
- private final static Color BALLOON_CAPTION_BACKGROUND_COLOR = new Color(200, 200 ,255);
- private final static Font BALLOON_CAPTION_FONT = new Font(Font.DIALOG, Font.BOLD, 12);
+ private static final int BALLOON_SHOW_TIME = 10000;
+ private static final int BALLOON_TEXT_MAX_LENGTH = 256;
+ private static final int BALLOON_WORD_LINE_MAX_LENGTH = 16;
+ private static final int BALLOON_WORD_LINE_MAX_COUNT = 4;
+ private static final int BALLOON_ICON_WIDTH = 32;
+ private static final int BALLOON_ICON_HEIGHT = 32;
+ private static final int BALLOON_TRAY_ICON_INDENT = 0;
+ private static final Color BALLOON_CAPTION_BACKGROUND_COLOR = new Color(200, 200 ,255);
+ private static final Font BALLOON_CAPTION_FONT = new Font(Font.DIALOG, Font.BOLD, 12);
private Panel mainPanel = new Panel();
private Panel captionPanel = new Panel();
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/MWMConstants.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/MWMConstants.java
index 72d5f0b94c94d00bcd6b23db32ee02226bd7561c..24c2d860257cd5d6619269bfca7aa37a26ddc89c 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/MWMConstants.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/MWMConstants.java
@@ -26,7 +26,7 @@
package sun.awt.X11;
-final public class MWMConstants {
+public final class MWMConstants {
private MWMConstants(){}
@@ -62,8 +62,8 @@ final public class MWMConstants {
/* number of elements of size 32 in _MWM_HINTS */
static final int PROP_MWM_HINTS_ELEMENTS = 5;
/* number of elements of size 32 in _MWM_INFO */
- final static int PROP_MOTIF_WM_INFO_ELEMENTS= 2;
- final static int PROP_MWM_INFO_ELEMENTS= PROP_MOTIF_WM_INFO_ELEMENTS;
+ static final int PROP_MOTIF_WM_INFO_ELEMENTS= 2;
+ static final int PROP_MWM_INFO_ELEMENTS= PROP_MOTIF_WM_INFO_ELEMENTS;
static final String MWM_HINTS_ATOM_NAME = "_MOTIF_WM_HINTS";
}
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAwtState.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAwtState.java
index b0a8186c77af4368f08ca7d4c7d2d812cdcb7fa3..5847d7c5133822cc260a509a1d7fc7d07d721c33 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAwtState.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAwtState.java
@@ -27,7 +27,7 @@
* This class is a placeholder for all internal static objects that represent
* system state. We keep our representation up-to-date with actual system
* state by tracking events, such as X Focus, Component under cursor etc.
- * All attributes should be static private with accessors to simpify change
+ * All attributes should be private static with accessors to simpify change
* tracking.
*/
package sun.awt.X11;
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XBaseMenuWindow.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XBaseMenuWindow.java
index 04948a265b8b660eb25c549055060b5251e7a948..85481f55c46ea14d5c74fca9e51ab845807e22b1 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XBaseMenuWindow.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XBaseMenuWindow.java
@@ -41,7 +41,7 @@ import sun.java2d.SunGraphics2D;
* The abstract class XBaseMenuWindow is the superclass
* of all menu windows.
*/
-abstract public class XBaseMenuWindow extends XWindow {
+public abstract class XBaseMenuWindow extends XWindow {
/************************************************
*
@@ -89,7 +89,7 @@ abstract public class XBaseMenuWindow extends XWindow {
* no other locks should be taken when
* thread own this lock.
*/
- static private Object menuTreeLock = new Object();
+ private static Object menuTreeLock = new Object();
/************************************************
*
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java
index 1d8804ec9c66b2de950c109416df0c858238e162..ecca4d3081c7ae625a706472c6848fcb70f196f4 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java
@@ -72,8 +72,8 @@ public class XBaseWindow {
private XSizeHints hints;
private XWMHints wmHints;
- final static int MIN_SIZE = 1;
- final static int DEF_LOCATION = 1;
+ static final int MIN_SIZE = 1;
+ static final int DEF_LOCATION = 1;
private static XAtom wm_client_leader;
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XButtonPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XButtonPeer.java
index 68d0803000a5df0c88929ffdd4de290aa4f2771d..2e2bd0ef2a77eaf616b7da146ef3f95f4f0ab16f 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XButtonPeer.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XButtonPeer.java
@@ -40,7 +40,7 @@ public class XButtonPeer extends XComponentPeer implements ButtonPeer {
private Insets borderInsets;
private Insets contentAreaInsets;
- private final static String propertyPrefix = "Button" + ".";
+ private static final String propertyPrefix = "Button" + ".";
protected Color focusColor = SystemColor.windowText;
private boolean disposed = false;
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java
index 95d1364c13cc56653d40dea85b7e89a6a3e99e47..b38297278c67a73f98e1be58da576981d6fb45b4 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java
@@ -50,10 +50,10 @@ public class XChoicePeer extends XComponentPeer implements ChoicePeer, ToplevelS
// at a time in an
// unfurled Choice
// Description of these constants in ListHelper
- public final static int TEXT_SPACE = 1;
- public final static int BORDER_WIDTH = 1;
- public final static int ITEM_MARGIN = 1;
- public final static int SCROLLBAR_WIDTH = 15;
+ public static final int TEXT_SPACE = 1;
+ public static final int BORDER_WIDTH = 1;
+ public static final int ITEM_MARGIN = 1;
+ public static final int SCROLLBAR_WIDTH = 15;
// SHARE THESE!
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XComponentPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XComponentPeer.java
index 3c5d162bd18d0615bb22965ac7f5ef4dcd940eca..5e8937436c0b2beae5872908974f839659da83be 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XComponentPeer.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XComponentPeer.java
@@ -210,7 +210,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
* Descendants should use this method to determine whether or not native window
* has focus.
*/
- final public boolean hasFocus() {
+ public final boolean hasFocus() {
return bHasFocus;
}
@@ -242,7 +242,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
private static Class<?> seClass;
private static Constructor<?> seCtor;
- final static AWTEvent wrapInSequenced(AWTEvent event) {
+ static final AWTEvent wrapInSequenced(AWTEvent event) {
try {
if (seClass == null) {
seClass = Class.forName("java.awt.SequencedEvent");
@@ -283,7 +283,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
// TODO: consider moving it to KeyboardFocusManagerPeerImpl
@SuppressWarnings("deprecation")
- final public boolean requestFocus(Component lightweightChild, boolean temporary,
+ public final boolean requestFocus(Component lightweightChild, boolean temporary,
boolean focusedWindowChangeAllowed, long time,
CausedFocusEvent.Cause cause)
{
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XConstants.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XConstants.java
index 91c533898b8df57c5c4a17748c0486a588773653..ddc4cd1033277367c0cbdcb6694c09322b26a569 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XConstants.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XConstants.java
@@ -25,7 +25,7 @@
package sun.awt.X11;
-final public class XConstants {
+public final class XConstants {
private XConstants(){}
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XCursorFontConstants.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XCursorFontConstants.java
index 44148f8744f4a1ed313663dd24185b90c274a383..cb785ee97971f873caeb4d37a3e4051890651206 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XCursorFontConstants.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XCursorFontConstants.java
@@ -25,7 +25,7 @@
package sun.awt.X11;
-final public class XCursorFontConstants {
+public final class XCursorFontConstants {
private XCursorFontConstants(){}
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java
index 966d30a8e81156226bf080f5b0d7d1343eef57b3..0df07fb6fd7becf15a1025e4b08df2387490970b 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java
@@ -904,7 +904,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
return getSize().height;
}
- final public WindowDimensions getDimensions() {
+ public final WindowDimensions getDimensions() {
return dimensions;
}
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragAndDropProtocols.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragAndDropProtocols.java
index 161fc285a02e8cb156c02da0d1b8b3d0d9dee909..cb61fad7c88b9b23a4e1a45ed2ec0dda34b1435a 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragAndDropProtocols.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragAndDropProtocols.java
@@ -36,8 +36,8 @@ import java.util.List;
* @since 1.5
*/
final class XDragAndDropProtocols {
- private final static List<XDragSourceProtocol> dragProtocols;
- private final static List<XDropTargetProtocol> dropProtocols;
+ private static final List<XDragSourceProtocol> dragProtocols;
+ private static final List<XDropTargetProtocol> dropProtocols;
public static final String XDnD = "XDnD";
public static final String MotifDnD = "MotifDnD";
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java
index 7a9826ba63bd5b51a3e75d5770ee7a98c64875d3..1e59ce16e82aabf7bab52b305f5dbcd24a64f703 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java
@@ -238,7 +238,7 @@ final class XDropTargetContextPeer extends SunDropTargetContextPeer {
static final class XDropTargetProtocolListenerImpl
implements XDropTargetProtocolListener {
- private final static XDropTargetProtocolListener theInstance =
+ private static final XDropTargetProtocolListener theInstance =
new XDropTargetProtocolListenerImpl();
private XDropTargetProtocolListenerImpl() {}
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedHelper.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedHelper.java
index 947a3cb543c51b0d9a8c8ba4cfc9e44a3dbab472..f54f4bd9e6610bb63037bf7613a2b65079131848 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedHelper.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedHelper.java
@@ -38,43 +38,43 @@ import java.awt.event.InputEvent;
*/
public class XEmbedHelper {
private static final PlatformLogger xembedLog = PlatformLogger.getLogger("sun.awt.X11.xembed");
- final static Unsafe unsafe = Unsafe.getUnsafe();
+ static final Unsafe unsafe = Unsafe.getUnsafe();
- final static int XEMBED_VERSION = 0,
+ static final int XEMBED_VERSION = 0,
XEMBED_MAPPED = (1 << 0);
/* XEMBED messages */
- final static int XEMBED_EMBEDDED_NOTIFY = 0;
- final static int XEMBED_WINDOW_ACTIVATE = 1;
- final static int XEMBED_WINDOW_DEACTIVATE = 2;
- final static int XEMBED_REQUEST_FOCUS =3;
- final static int XEMBED_FOCUS_IN = 4;
- final static int XEMBED_FOCUS_OUT = 5;
- final static int XEMBED_FOCUS_NEXT = 6;
- final static int XEMBED_FOCUS_PREV = 7;
+ static final int XEMBED_EMBEDDED_NOTIFY = 0;
+ static final int XEMBED_WINDOW_ACTIVATE = 1;
+ static final int XEMBED_WINDOW_DEACTIVATE = 2;
+ static final int XEMBED_REQUEST_FOCUS =3;
+ static final int XEMBED_FOCUS_IN = 4;
+ static final int XEMBED_FOCUS_OUT = 5;
+ static final int XEMBED_FOCUS_NEXT = 6;
+ static final int XEMBED_FOCUS_PREV = 7;
/* 8-9 were used for XEMBED_GRAB_KEY/XEMBED_UNGRAB_KEY */
- final static int XEMBED_GRAB_KEY = 8;
- final static int XEMBED_UNGRAB_KEY = 9;
- final static int XEMBED_MODALITY_ON = 10;
- final static int XEMBED_MODALITY_OFF = 11;
- final static int XEMBED_REGISTER_ACCELERATOR = 12;
- final static int XEMBED_UNREGISTER_ACCELERATOR= 13;
- final static int XEMBED_ACTIVATE_ACCELERATOR = 14;
+ static final int XEMBED_GRAB_KEY = 8;
+ static final int XEMBED_UNGRAB_KEY = 9;
+ static final int XEMBED_MODALITY_ON = 10;
+ static final int XEMBED_MODALITY_OFF = 11;
+ static final int XEMBED_REGISTER_ACCELERATOR = 12;
+ static final int XEMBED_UNREGISTER_ACCELERATOR= 13;
+ static final int XEMBED_ACTIVATE_ACCELERATOR = 14;
- final static int NON_STANDARD_XEMBED_GTK_GRAB_KEY = 108;
- final static int NON_STANDARD_XEMBED_GTK_UNGRAB_KEY = 109;
+ static final int NON_STANDARD_XEMBED_GTK_GRAB_KEY = 108;
+ static final int NON_STANDARD_XEMBED_GTK_UNGRAB_KEY = 109;
// A detail code is required for XEMBED_FOCUS_IN. The following values are valid:
/* Details for XEMBED_FOCUS_IN: */
- final static int XEMBED_FOCUS_CURRENT = 0;
- final static int XEMBED_FOCUS_FIRST = 1;
- final static int XEMBED_FOCUS_LAST = 2;
+ static final int XEMBED_FOCUS_CURRENT = 0;
+ static final int XEMBED_FOCUS_FIRST = 1;
+ static final int XEMBED_FOCUS_LAST = 2;
// Modifiers bits
- final static int XEMBED_MODIFIER_SHIFT = (1 << 0);
- final static int XEMBED_MODIFIER_CONTROL = (1 << 1);
- final static int XEMBED_MODIFIER_ALT = (1 << 2);
- final static int XEMBED_MODIFIER_SUPER = (1 << 3);
- final static int XEMBED_MODIFIER_HYPER = (1 << 4);
+ static final int XEMBED_MODIFIER_SHIFT = (1 << 0);
+ static final int XEMBED_MODIFIER_CONTROL = (1 << 1);
+ static final int XEMBED_MODIFIER_ALT = (1 << 2);
+ static final int XEMBED_MODIFIER_SUPER = (1 << 3);
+ static final int XEMBED_MODIFIER_HYPER = (1 << 4);
static XAtom XEmbedInfo;
static XAtom XEmbed;
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java
index f88132bf1e951c6a981fd292d5d518927c21f86d..57d4764d893914e613fcf33c7e99bd5b131a5d81 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java
@@ -862,8 +862,8 @@ class XFileDialogPeer extends XDialogPeer
@SuppressWarnings("serial") // JDK-implementation class
class Separator extends Canvas {
- public final static int HORIZONTAL = 0;
- public final static int VERTICAL = 1;
+ public static final int HORIZONTAL = 0;
+ public static final int VERTICAL = 1;
int orientation;
@SuppressWarnings("deprecation")
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XIconWindow.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XIconWindow.java
index 07899ef8de48489d512c33aac7841b8ab5ca20c6..5736af6387041f985776ff5a60567c4d2ab921cb 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XIconWindow.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XIconWindow.java
@@ -34,7 +34,7 @@ import sun.awt.image.ImageRepresentation;
import sun.util.logging.PlatformLogger;
public class XIconWindow extends XBaseWindow {
- private final static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XIconWindow");
+ private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XIconWindow");
XDecoratedPeer parent;
Dimension size;
long iconPixmap = 0;
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XLayerProtocol.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XLayerProtocol.java
index 6c1786b11ad1becdda0242394eef9a072fd5c01e..69e514fad23e9f1025fccee167c7b768d5b8ee49 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XLayerProtocol.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XLayerProtocol.java
@@ -28,7 +28,7 @@ package sun.awt.X11;
public interface XLayerProtocol {
- final static int LAYER_NORMAL = 0,
+ static final int LAYER_NORMAL = 0,
LAYER_ALWAYS_ON_TOP = 1;
boolean supportsLayer(int layer);
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java
index b744d5e8cbdbbea22ad28f151c79d5032b7480b4..e28817f06f86270a3f62fbf99f853628ae55efbb 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java
@@ -42,28 +42,28 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XListPeer");
- public final static int MARGIN = 2;
- public final static int SPACE = 1;
- public final static int SCROLLBAR_AREA = 17; // Area reserved for the
+ public static final int MARGIN = 2;
+ public static final int SPACE = 1;
+ public static final int SCROLLBAR_AREA = 17; // Area reserved for the
// scrollbar
- public final static int SCROLLBAR_WIDTH = 13; // Actual width of the
+ public static final int SCROLLBAR_WIDTH = 13; // Actual width of the
// scrollbar
- public final static int NONE = -1;
- public final static int WINDOW = 0;
- public final static int VERSCROLLBAR = 1;
- public final static int HORSCROLLBAR = 2;
- public final static int DEFAULT_VISIBLE_ROWS = 4; // From java.awt.List,
- public final static int HORIZ_SCROLL_AMT = 10;
-
- private final static int PAINT_VSCROLL = 2;
- private final static int PAINT_HSCROLL = 4;
- private final static int PAINT_ITEMS = 8;
- private final static int PAINT_FOCUS = 16;
- private final static int PAINT_BACKGROUND = 32;
- private final static int PAINT_HIDEFOCUS = 64;
- private final static int PAINT_ALL =
+ public static final int NONE = -1;
+ public static final int WINDOW = 0;
+ public static final int VERSCROLLBAR = 1;
+ public static final int HORSCROLLBAR = 2;
+ public static final int DEFAULT_VISIBLE_ROWS = 4; // From java.awt.List,
+ public static final int HORIZ_SCROLL_AMT = 10;
+
+ private static final int PAINT_VSCROLL = 2;
+ private static final int PAINT_HSCROLL = 4;
+ private static final int PAINT_ITEMS = 8;
+ private static final int PAINT_FOCUS = 16;
+ private static final int PAINT_BACKGROUND = 32;
+ private static final int PAINT_HIDEFOCUS = 64;
+ private static final int PAINT_ALL =
PAINT_VSCROLL | PAINT_HSCROLL | PAINT_ITEMS | PAINT_FOCUS | PAINT_BACKGROUND;
- private final static int COPY_AREA = 128;
+ private static final int COPY_AREA = 128;
XVerticalScrollbar vsb;
XHorizontalScrollbar hsb;
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java
index 256767446e26e1d63bf6e8ef5de4a7ad745bc0b1..2936b2af0c1f51a2ffc0e2ef94e3df836932c4ea 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java
@@ -56,15 +56,15 @@ public class XMenuBarPeer extends XBaseMenuWindow implements MenuBarPeer {
/*
* dimension constants
*/
- private final static int BAR_SPACING_TOP = 3;
- private final static int BAR_SPACING_BOTTOM = 3;
- private final static int BAR_SPACING_LEFT = 3;
- private final static int BAR_SPACING_RIGHT = 3;
- private final static int BAR_ITEM_SPACING = 2;
- private final static int BAR_ITEM_MARGIN_LEFT = 10;
- private final static int BAR_ITEM_MARGIN_RIGHT = 10;
- private final static int BAR_ITEM_MARGIN_TOP = 2;
- private final static int BAR_ITEM_MARGIN_BOTTOM = 2;
+ private static final int BAR_SPACING_TOP = 3;
+ private static final int BAR_SPACING_BOTTOM = 3;
+ private static final int BAR_SPACING_LEFT = 3;
+ private static final int BAR_SPACING_RIGHT = 3;
+ private static final int BAR_ITEM_SPACING = 2;
+ private static final int BAR_ITEM_MARGIN_LEFT = 10;
+ private static final int BAR_ITEM_MARGIN_RIGHT = 10;
+ private static final int BAR_ITEM_MARGIN_TOP = 2;
+ private static final int BAR_ITEM_MARGIN_BOTTOM = 2;
/************************************************
*
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuItemPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuItemPeer.java
index dd576070ff221d4919b9fe7a78203aa787ea516f..aa1c85d7908fcefcccdd6aa08180f59084a90c50 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuItemPeer.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuItemPeer.java
@@ -75,8 +75,8 @@ public class XMenuItemPeer implements MenuItemPeer {
/*
* Size constants
*/
- private final static int SEPARATOR_WIDTH = 20;
- private final static int SEPARATOR_HEIGHT = 5;
+ private static final int SEPARATOR_WIDTH = 20;
+ private static final int SEPARATOR_HEIGHT = 5;
/************************************************
*
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuWindow.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuWindow.java
index a79753facf04ee43af503989156c78d8026d8c54..7bd63917663310c8042f2a160a1094d37d356725 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuWindow.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuWindow.java
@@ -52,16 +52,16 @@ public class XMenuWindow extends XBaseMenuWindow {
/*
* dimension constants
*/
- private final static int WINDOW_SPACING_LEFT = 2;
- private final static int WINDOW_SPACING_RIGHT = 2;
- private final static int WINDOW_SPACING_TOP = 2;
- private final static int WINDOW_SPACING_BOTTOM = 2;
- private final static int WINDOW_ITEM_INDENT = 15;
- private final static int WINDOW_ITEM_MARGIN_LEFT = 2;
- private final static int WINDOW_ITEM_MARGIN_RIGHT = 2;
- private final static int WINDOW_ITEM_MARGIN_TOP = 2;
- private final static int WINDOW_ITEM_MARGIN_BOTTOM = 2;
- private final static int WINDOW_SHORTCUT_SPACING = 10;
+ private static final int WINDOW_SPACING_LEFT = 2;
+ private static final int WINDOW_SPACING_RIGHT = 2;
+ private static final int WINDOW_SPACING_TOP = 2;
+ private static final int WINDOW_SPACING_BOTTOM = 2;
+ private static final int WINDOW_ITEM_INDENT = 15;
+ private static final int WINDOW_ITEM_MARGIN_LEFT = 2;
+ private static final int WINDOW_ITEM_MARGIN_RIGHT = 2;
+ private static final int WINDOW_ITEM_MARGIN_TOP = 2;
+ private static final int WINDOW_ITEM_MARGIN_BOTTOM = 2;
+ private static final int WINDOW_SHORTCUT_SPACING = 10;
/*
* Checkmark
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java
index 5ba80bbef0fc54bf9f5ad3a63f33f433525fff8b..2d82ace98454ff240b36c839f2443b03e3d91aa0 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java
@@ -33,8 +33,8 @@ import sun.util.logging.PlatformLogger;
final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProtocol
{
- private final static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XNETProtocol");
- private final static PlatformLogger iconLog = PlatformLogger.getLogger("sun.awt.X11.icon.XNETProtocol");
+ private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XNETProtocol");
+ private static final PlatformLogger iconLog = PlatformLogger.getLogger("sun.awt.X11.icon.XNETProtocol");
private static PlatformLogger stateLog = PlatformLogger.getLogger("sun.awt.X11.states.XNETProtocol");
/**
@@ -280,9 +280,9 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt
XAtom XA_NET_WM_WINDOW_OPACITY = XAtom.get("_NET_WM_WINDOW_OPACITY");
/* For _NET_WM_STATE ClientMessage requests */
- final static int _NET_WM_STATE_REMOVE =0; /* remove/unset property */
- final static int _NET_WM_STATE_ADD =1; /* add/set property */
- final static int _NET_WM_STATE_TOGGLE =2; /* toggle property */
+ static final int _NET_WM_STATE_REMOVE =0; /* remove/unset property */
+ static final int _NET_WM_STATE_ADD =1; /* add/set property */
+ static final int _NET_WM_STATE_TOGGLE =2; /* toggle property */
boolean supportChecked = false;
long NetWindow = 0;
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XPopupMenuPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XPopupMenuPeer.java
index 03a4db3f9f9b27ea5056a7e85d1c59533968ef83..c510836a2fa07e6b38ee5a17722d3ef7197c9600 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XPopupMenuPeer.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XPopupMenuPeer.java
@@ -58,8 +58,8 @@ public class XPopupMenuPeer extends XMenuWindow implements PopupMenuPeer {
/*
* Painting constants
*/
- private final static int CAPTION_MARGIN_TOP = 4;
- private final static int CAPTION_SEPARATOR_HEIGHT = 6;
+ private static final int CAPTION_MARGIN_TOP = 4;
+ private static final int CAPTION_SEPARATOR_HEIGHT = 6;
/************************************************
*
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XProtocol.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XProtocol.java
index e4cf2f3e49bbae5b67b474c941300643e8ef7c37..ed3352b9f721ab339d2a27e6b2f19b76212899d3 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XProtocol.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XProtocol.java
@@ -30,7 +30,7 @@ import sun.util.logging.PlatformLogger;
import java.util.*;
class XProtocol {
- private final static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XProtocol");
+ private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XProtocol");
private Map<XAtom, XAtomList> atomToList = new HashMap<XAtom, XAtomList>();
private Map<XAtom, Long> atomToAnchor = new HashMap<XAtom, Long>();
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XProtocolConstants.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XProtocolConstants.java
index 0b80c5f56a8c57c80b65fbd812c50e92a7ba414a..89412f48cb9b1299ecc9b6ad86453278a0ef7458 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XProtocolConstants.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XProtocolConstants.java
@@ -25,7 +25,7 @@
package sun.awt.X11;
-final public class XProtocolConstants {
+public final class XProtocolConstants {
private XProtocolConstants(){}
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XRobotPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XRobotPeer.java
index 4a3554816d14ee45e03e29aee61cffd0b8804aaa..156abd9ce68121a73ea68fab2a40f31e12fdc342 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XRobotPeer.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XRobotPeer.java
@@ -107,16 +107,16 @@ class XRobotPeer implements RobotPeer {
return pixelArray;
}
- private static native synchronized void setup(int numberOfButtons, int[] buttonDownMasks);
+ private static synchronized native void setup(int numberOfButtons, int[] buttonDownMasks);
- private static native synchronized void mouseMoveImpl(X11GraphicsConfig xgc, int x, int y);
- private static native synchronized void mousePressImpl(int buttons);
- private static native synchronized void mouseReleaseImpl(int buttons);
- private static native synchronized void mouseWheelImpl(int wheelAmt);
+ private static synchronized native void mouseMoveImpl(X11GraphicsConfig xgc, int x, int y);
+ private static synchronized native void mousePressImpl(int buttons);
+ private static synchronized native void mouseReleaseImpl(int buttons);
+ private static synchronized native void mouseWheelImpl(int wheelAmt);
- private static native synchronized void keyPressImpl(int keycode);
- private static native synchronized void keyReleaseImpl(int keycode);
+ private static synchronized native void keyPressImpl(int keycode);
+ private static synchronized native void keyReleaseImpl(int keycode);
- private static native synchronized void getRGBPixelsImpl(X11GraphicsConfig xgc,
+ private static synchronized native void getRGBPixelsImpl(X11GraphicsConfig xgc,
int x, int y, int width, int height, int pixelArray[], boolean isGtkSupported);
}
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java
index 9f2c39ce1e2d4125d7650815f6b44c17e6d4744a..80156180b3123a34a267d576774820de1dbc6000 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java
@@ -34,13 +34,13 @@ import sun.awt.AWTAccessor;
class XScrollPanePeer extends XComponentPeer implements ScrollPanePeer, XScrollbarClient {
- public final static int MARGIN = 1;
- public final static int SCROLLBAR;
- public final static int SPACE = 2;
- public final static int SCROLLBAR_INSET = 2;
+ public static final int MARGIN = 1;
+ public static final int SCROLLBAR;
+ public static final int SPACE = 2;
+ public static final int SCROLLBAR_INSET = 2;
- public final static int VERTICAL = 1 << 0;
- public final static int HORIZONTAL = 1 << 1;
+ public static final int VERTICAL = 1 << 0;
+ public static final int HORIZONTAL = 1 << 1;
static {
SCROLLBAR = XToolkit.getUIDefaults().getInt("ScrollBar.defaultWidth");
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java
index 71aa8fe0de41665f0615b74cfdda45332e0619ca..ca43f7a501bfcad924bb93200e3485ccbb9ff1f1 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java
@@ -51,7 +51,7 @@ abstract class XScrollbar {
private XScrollRepeater i_scroller = new XScrollRepeater(null);
// Thumb length is always >= MIN_THUMB_H
- private final static int MIN_THUMB_H = 5;
+ private static final int MIN_THUMB_H = 5;
private static final int ARROW_IND = 1;
@@ -115,7 +115,7 @@ abstract class XScrollbar {
}
}
- abstract protected void rebuildArrows();
+ protected abstract void rebuildArrows();
public void setSize(int width, int height) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarPeer.java
index 7f0aa8c643acf7c7de0cdfdca431b2ca932c4ef4..cf32749eea849aa4021df15ffd07b7b9fd312a2d 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarPeer.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarPeer.java
@@ -31,7 +31,7 @@ import java.awt.peer.*;
import sun.util.logging.PlatformLogger;
class XScrollbarPeer extends XComponentPeer implements ScrollbarPeer, XScrollbarClient {
- private final static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XScrollbarPeer");
+ private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XScrollbarPeer");
private static final int DEFAULT_LENGTH = 50;
private static final int DEFAULT_WIDTH_SOLARIS = 19;
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java
index 1b890710594d1ce3987f222b71c146aad3ae6530..6b97e48a297a87431d140a10294583ae0d134860 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java
@@ -67,7 +67,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
//There is 400 ms is set by default on Windows and 500 by default on KDE and GNOME.
//We use the same hardcoded constant.
- private final static int AWT_MULTICLICK_DEFAULT_TIME = 500;
+ private static final int AWT_MULTICLICK_DEFAULT_TIME = 500;
static final boolean PRIMARY_LOOP = false;
static final boolean SECONDARY_LOOP = true;
@@ -140,8 +140,8 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
*/
static native long getTrayIconDisplayTimeout();
- private native static void initIDs();
- native static void waitForEvents(long nextTaskTime);
+ private static native void initIDs();
+ static native void waitForEvents(long nextTaskTime);
static Thread toolkitThread;
static boolean isToolkitThread() {
return Thread.currentThread() == toolkitThread;
@@ -1102,7 +1102,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
* Returns the value of "sun.awt.disableGtkFileDialogs" property. Default
* value is {@code false}.
*/
- public synchronized static boolean getSunAwtDisableGtkFileDialogs() {
+ public static synchronized boolean getSunAwtDisableGtkFileDialogs() {
if (sunAwtDisableGtkFileDialogs == null) {
sunAwtDisableGtkFileDialogs = AccessController.doPrivileged(
new GetBooleanAction("sun.awt.disableGtkFileDialogs"));
@@ -1579,8 +1579,8 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
return Math.min(XConstants.MAX_BUTTONS, ((SunToolkit) (Toolkit.getDefaultToolkit())).getNumberOfButtons());
}
- private final static String prefix = "DnD.Cursor.";
- private final static String postfix = ".32x32";
+ private static final String prefix = "DnD.Cursor.";
+ private static final String postfix = ".32x32";
private static final String dndPrefix = "DnD.";
@Override
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java
index 39940c48e2f12f3cb5332bbe77eedd051e117464..eba30a7e2af0a31ce34e0f1795f8df04a8a48915 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java
@@ -63,8 +63,8 @@ public class XTrayIconPeer implements TrayIconPeer,
int old_x, old_y;
int ex_width, ex_height;
- final static int TRAY_ICON_WIDTH = 24;
- final static int TRAY_ICON_HEIGHT = 24;
+ static final int TRAY_ICON_WIDTH = 24;
+ static final int TRAY_ICON_HEIGHT = 24;
XTrayIconPeer(TrayIcon target)
throws AWTException
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XUtilConstants.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XUtilConstants.java
index 1d2a641e02e542cc35f76f3fdc9fdd807e081651..1aeb61e3fff489369aee037908d49f43ea1762af 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XUtilConstants.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XUtilConstants.java
@@ -25,7 +25,7 @@
package sun.awt.X11;
-final public class XUtilConstants {
+public final class XUtilConstants {
private XUtilConstants(){}
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWINProtocol.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWINProtocol.java
index 8932d0392686cec51cf7ea9366a03f1003bee3e6..c4f1f8ea8b3a5b38eaf3a18936c8953921554cfe 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWINProtocol.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWINProtocol.java
@@ -30,7 +30,7 @@ import java.awt.*;
import sun.util.logging.PlatformLogger;
class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol {
- final static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XWINProtocol");
+ static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XWINProtocol");
/* Gnome WM spec */
XAtom XA_WIN_SUPPORTING_WM_CHECK = XAtom.get("_WIN_SUPPORTING_WM_CHECK");
@@ -187,15 +187,15 @@ class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol {
XAtom XA_WIN_LAYER = XAtom.get("_WIN_LAYER");
/* _WIN_STATE bits */
- final static int WIN_STATE_STICKY =(1<<0); /* everyone knows sticky */
- final static int WIN_STATE_MINIMIZED =(1<<1); /* Reserved - definition is unclear */
- final static int WIN_STATE_MAXIMIZED_VERT =(1<<2); /* window in maximized V state */
- final static int WIN_STATE_MAXIMIZED_HORIZ =(1<<3); /* window in maximized H state */
- final static int WIN_STATE_HIDDEN =(1<<4); /* not on taskbar but window visible*/
- final static int WIN_STATE_SHADED =(1<<5); /* shaded (MacOS / Afterstep style) */
+ static final int WIN_STATE_STICKY =(1<<0); /* everyone knows sticky */
+ static final int WIN_STATE_MINIMIZED =(1<<1); /* Reserved - definition is unclear */
+ static final int WIN_STATE_MAXIMIZED_VERT =(1<<2); /* window in maximized V state */
+ static final int WIN_STATE_MAXIMIZED_HORIZ =(1<<3); /* window in maximized H state */
+ static final int WIN_STATE_HIDDEN =(1<<4); /* not on taskbar but window visible*/
+ static final int WIN_STATE_SHADED =(1<<5); /* shaded (MacOS / Afterstep style) */
/* _WIN_LAYER values */
- final static int WIN_LAYER_ONTOP = 6;
- final static int WIN_LAYER_NORMAL = 4;
+ static final int WIN_LAYER_ONTOP = 6;
+ static final int WIN_LAYER_NORMAL = 4;
long WinWindow = 0;
boolean supportChecked = false;
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWM.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWM.java
index 265cdb7930e127726a954d988cfbd9e1d7130c58..61d2cbc380deaa297c8f27139b28598b4e8ec760 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWM.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWM.java
@@ -50,9 +50,9 @@ import sun.util.logging.PlatformLogger;
final class XWM
{
- private final static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XWM");
- private final static PlatformLogger insLog = PlatformLogger.getLogger("sun.awt.X11.insets.XWM");
- private final static PlatformLogger stateLog = PlatformLogger.getLogger("sun.awt.X11.states.XWM");
+ private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XWM");
+ private static final PlatformLogger insLog = PlatformLogger.getLogger("sun.awt.X11.insets.XWM");
+ private static final PlatformLogger stateLog = PlatformLogger.getLogger("sun.awt.X11.states.XWM");
static final XAtom XA_MWM_HINTS = new XAtom();
@@ -66,30 +66,30 @@ final class XWM
XAtom XA_UTF8_STRING = XAtom.get("UTF8_STRING"); /* like STRING but encoding is UTF-8 */
/* Currently we only care about max_v and max_h in _NET_WM_STATE */
- final static int AWT_NET_N_KNOWN_STATES=2;
+ static final int AWT_NET_N_KNOWN_STATES=2;
/* Enlightenment */
- final static XAtom XA_E_FRAME_SIZE = new XAtom();
+ static final XAtom XA_E_FRAME_SIZE = new XAtom();
/* KWin (KDE2) */
- final static XAtom XA_KDE_NET_WM_FRAME_STRUT = new XAtom();
+ static final XAtom XA_KDE_NET_WM_FRAME_STRUT = new XAtom();
/* KWM (KDE 1.x) OBSOLETE??? */
- final static XAtom XA_KWM_WIN_ICONIFIED = new XAtom();
- final static XAtom XA_KWM_WIN_MAXIMIZED = new XAtom();
+ static final XAtom XA_KWM_WIN_ICONIFIED = new XAtom();
+ static final XAtom XA_KWM_WIN_MAXIMIZED = new XAtom();
/* OpenLook */
- final static XAtom XA_OL_DECOR_DEL = new XAtom();
- final static XAtom XA_OL_DECOR_HEADER = new XAtom();
- final static XAtom XA_OL_DECOR_RESIZE = new XAtom();
- final static XAtom XA_OL_DECOR_PIN = new XAtom();
- final static XAtom XA_OL_DECOR_CLOSE = new XAtom();
+ static final XAtom XA_OL_DECOR_DEL = new XAtom();
+ static final XAtom XA_OL_DECOR_HEADER = new XAtom();
+ static final XAtom XA_OL_DECOR_RESIZE = new XAtom();
+ static final XAtom XA_OL_DECOR_PIN = new XAtom();
+ static final XAtom XA_OL_DECOR_CLOSE = new XAtom();
/* EWMH */
- final static XAtom XA_NET_FRAME_EXTENTS = new XAtom();
- final static XAtom XA_NET_REQUEST_FRAME_EXTENTS = new XAtom();
+ static final XAtom XA_NET_FRAME_EXTENTS = new XAtom();
+ static final XAtom XA_NET_REQUEST_FRAME_EXTENTS = new XAtom();
- final static int
+ static final int
UNDETERMINED_WM = 1,
NO_WM = 2,
OTHER_WM = 3,
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWarningWindow.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWarningWindow.java
index 0717dee3479d0295004f1c5652b99ba8f399b3e4..e1fa63e2604265cf8f59eb254d1ee0e3434dad79 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWarningWindow.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWarningWindow.java
@@ -33,14 +33,14 @@ import sun.awt.AWTAccessor;
import sun.awt.SunToolkit;
class XWarningWindow extends XWindow {
- private final static int SHOWING_DELAY = 330;
- private final static int HIDING_DELAY = 2000;
+ private static final int SHOWING_DELAY = 330;
+ private static final int HIDING_DELAY = 2000;
private final Window ownerWindow;
private WeakReference<XWindowPeer> ownerPeer;
private long parentWindow;
- private final static String OWNER = "OWNER";
+ private static final String OWNER = "OWNER";
private InfoWindow.Tooltip tooltip;
/**
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java
index f48ec9cc114eabbfc3230dc18842c1cf6034479b..597020da9e37f7e551e6ece70ee0371dfa519e14 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java
@@ -54,7 +54,7 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
* allow a smudge factor so that moving the mouse by a small
* amount does not wipe out the multi-click state variables.
*/
- private final static int AWT_MULTICLICK_SMUDGE = 4;
+ private static final int AWT_MULTICLICK_SMUDGE = 4;
// ButtonXXX events stuff
static int lastX = 0, lastY = 0;
static long lastTime = 0;
@@ -123,7 +123,7 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
native void getWMInsets(long window, long left, long top, long right, long bottom, long border);
native long getTopWindow(long window, long rootWin);
native void getWindowBounds(long window, long x, long y, long width, long height);
- private native static void initIDs();
+ private static native void initIDs();
static {
initIDs();
@@ -441,7 +441,7 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
// and one that does not get overridden. The problem is that in postInit
// we call setBackground and we don't have all the stuff initialized to
// do a full paint for most peers. So we cannot call setBackground in postInit.
- final public void xSetBackground(Color c) {
+ public final void xSetBackground(Color c) {
XToolkit.awtLock();
try {
winBackground(c);
@@ -1046,13 +1046,13 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
return xEventType == XConstants.KeyPress ? java.awt.event.KeyEvent.KEY_PRESSED :
xEventType == XConstants.KeyRelease ? java.awt.event.KeyEvent.KEY_RELEASED : 0;
}
- static private long xkeycodeToKeysym(XKeyEvent ev) {
+ private static long xkeycodeToKeysym(XKeyEvent ev) {
return XKeysym.getKeysym( ev );
}
private long xkeycodeToPrimaryKeysym(XKeyEvent ev) {
return XKeysym.xkeycode2primary_keysym( ev );
}
- static private int primaryUnicode2JavaKeycode(int uni) {
+ private static int primaryUnicode2JavaKeycode(int uni) {
return (uni > 0? sun.awt.ExtendedKeyCodes.getExtendedKeyCodeForChar(uni) : 0);
//return (uni > 0? uni + 0x01000000 : 0);
}
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java
index 4a948698705aab786a7ef4d3a588943ffc57754b..fd6464b41d358ba7293c0ec861ac97d9db0a1be8 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java
@@ -429,7 +429,7 @@ class XWindowPeer extends XPanelPeer implements WindowPeer,
}
private static ArrayList<IconInfo> defaultIconInfo;
- protected synchronized static java.util.List<IconInfo> getDefaultIconInfo() {
+ protected static synchronized java.util.List<IconInfo> getDefaultIconInfo() {
if (defaultIconInfo == null) {
defaultIconInfo = new ArrayList<IconInfo>();
if (XlibWrapper.dataModel == 32) {
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java
index 01d06404ff4ba14aa50aa2f65a1d24be65c466bb..bc9e3667a1fc2118b8b464c83d3c3871ca6f32f8 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java
@@ -313,7 +313,7 @@ static native String XSetLocaleModifiers(String modifier_list);
long delete, long req_type, long actualy_type,
long actualy_format, long nitems_ptr,
long bytes_after, long data_ptr);
- native static void XChangePropertyImpl(long display, long window, long atom,
+ static native void XChangePropertyImpl(long display, long window, long atom,
long type, int format, int mode, long data,
int nelements);
static void XChangeProperty(long display, long window, long atom,
@@ -566,8 +566,8 @@ static native String XSetLocaleModifiers(String modifier_list);
/* Global memory area used for X lib parameter passing */
- final static long lbuffer = unsafe.allocateMemory(64); // array to hold 8 longs
- final static long ibuffer = unsafe.allocateMemory(32); // array to hold 8 ints
+ static final long lbuffer = unsafe.allocateMemory(64); // array to hold 8 longs
+ static final long ibuffer = unsafe.allocateMemory(32); // array to hold 8 ints
static final long larg1 = lbuffer;
static final long larg2 = larg1+8;
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java
index 61df81610c54026c47477b269953069e04db74a0..0ac2a16243aacfbbe705be5cfab1a1fd808c2444 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java
@@ -125,7 +125,7 @@ public abstract class X11InputMethod extends InputMethodAdapter {
// private data (X11InputMethodData structure defined in
// awt_InputMethod.c) for native methods
// this structure needs to be accessed within AWT_LOCK/UNLOCK
- transient private long pData = 0; // accessed by native
+ private transient long pData = 0; // accessed by native
// Initialize highlight mapping table
static {
diff --git a/jdk/src/java.desktop/unix/classes/sun/font/X11GB18030_0.java b/jdk/src/java.desktop/unix/classes/sun/font/X11GB18030_0.java
index 6efa4051de2b337528a600dbcf998f6d82f9cc2f..1a9ea8f7d3fb699d0109ec48fa59115a82ab22b4 100644
--- a/jdk/src/java.desktop/unix/classes/sun/font/X11GB18030_0.java
+++ b/jdk/src/java.desktop/unix/classes/sun/font/X11GB18030_0.java
@@ -56,7 +56,7 @@ public class X11GB18030_0 extends Charset {
protected int encodeSingle(char inputChar) {
return -1;
}
- private final static String innerIndex0=
+ private static final String innerIndex0=
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
@@ -570,7 +570,7 @@ public class X11GB18030_0 extends Charset {
"\uA5F0\uA5F1\uA5F2\uA5F3\uA5F4\uA5F5\uA5F6\u0000"+
"\u0000\u0000\u0000\u0000\uA960\uA963\uA964\u0000";
- private final static String innerIndex1=
+ private static final String innerIndex1=
"\u0000\u0000\u0000\u0000\u0000\uA8C5\uA8C6\uA8C7"+
"\uA8C8\uA8C9\uA8CA\uA8CB\uA8CC\uA8CD\uA8CE\uA8CF"+
"\uA8D0\uA8D1\uA8D2\uA8D3\uA8D4\uA8D5\uA8D6\uA8D7"+
@@ -1084,7 +1084,7 @@ public class X11GB18030_0 extends Charset {
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000";
- private final static String innerIndex2=
+ private static final String innerIndex2=
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
@@ -1598,7 +1598,7 @@ public class X11GB18030_0 extends Charset {
"\u8BAF\uE6CD\u8BB0\u8BB1\u8BB2\u8BB3\u8BB4\u8BB5"+
"\u8BB6\u8BB7\u8BB8\u8BB9\u8BBA\u8BBB\u8BBC\u8BBD";
- private final static String innerIndex3=
+ private static final String innerIndex3=
"\u8BBE\u8BBF\u8BC0\u8BC1\u8BC2\u8BC3\u8BC4\u8BC5"+
"\u8BC6\uE6D2\u8BC7\u8BC8\u8BC9\u8BCA\u8BCB\u8BCC"+
"\u8BCD\u8BCE\u8BCF\u8BD0\u8BD1\u8BD2\uE6D4\uE6D3"+
@@ -2112,7 +2112,7 @@ public class X11GB18030_0 extends Charset {
"\u99C6\u99C7\u99C8\u99C9\u99CA\u99CB\u99CC\u99CD"+
"\u99CE\u99CF\u99D0\u99D1\u99D2\u99D3\u99D4\u99D5";
- private final static String innerIndex4=
+ private static final String innerIndex4=
"\u99D6\u99D7\u99D8\u99D9\u99DA\u99DB\u99DC\u99DD"+
"\u99DE\u99DF\u99E0\u99E1\u99E2\u99E3\u99E4\u99E5"+
"\u99E6\u99E7\u99E8\u99E9\u99EA\u99EB\u99EC\u99ED"+
@@ -2626,7 +2626,7 @@ public class X11GB18030_0 extends Charset {
"\uB87B\uB87C\uB87D\uB87E\uB880\uB881\uB882\uB883"+
"\uB884\uD6F1\uF3C3\uB885\uB886\uF3C4\uB887\uB8CD";
- private final static String innerIndex5=
+ private static final String innerIndex5=
"\uB888\uB889\uB88A\uF3C6\uF3C7\uB88B\uB0CA\uB88C"+
"\uF3C5\uB88D\uF3C9\uCBF1\uB88E\uB88F\uB890\uF3CB"+
"\uB891\uD0A6\uB892\uB893\uB1CA\uF3C8\uB894\uB895"+
@@ -3140,7 +3140,7 @@ public class X11GB18030_0 extends Charset {
"\uD64C\uD64D\uD64E\uD64F\uD650\uD651\uD652\uD653"+
"\uD654\uD655\uD656\uD657\uD658\uD659\uD65A\uD65B";
- private final static String innerIndex6=
+ private static final String innerIndex6=
"\uD65C\uD65D\uD65E\uD65F\uD660\uD661\uD662\uE5C0"+
"\uD663\uD664\uD665\uD666\uD667\uD668\uD669\uD66A"+
"\uD66B\uD66C\uD66D\uD66E\uD66F\uD670\uD671\uD672"+
@@ -3654,7 +3654,7 @@ public class X11GB18030_0 extends Charset {
"\uF38D\uF38E\uF38F\uF390\uF391\uF392\uF393\uF394"+
"\uF395\uF7DB\uF396\uF7D9\uF397\uF398\uF399\uF39A";
- private final static String innerIndex7=
+ private static final String innerIndex7=
"\uF39B\uF39C\uF39D\uD7D7\uF39E\uF39F\uF3A0\uF440"+
"\uF7DC\uF441\uF442\uF443\uF444\uF445\uF446\uF7DD"+
"\uF447\uF448\uF449\uF7DE\uF44A\uF44B\uF44C\uF44D"+
@@ -4168,7 +4168,7 @@ public class X11GB18030_0 extends Charset {
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000";
- private final static String innerIndex8=
+ private static final String innerIndex8=
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
@@ -4234,7 +4234,7 @@ public class X11GB18030_0 extends Charset {
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000";
- private final static short index1[] = {
+ private static final short index1[] = {
1, 2, 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
6, 7, 8, 9, 10, 11, 12, 0, 0, 0, 0, 0, 0, 0, 13, 14,
@@ -4253,7 +4253,7 @@ public class X11GB18030_0 extends Charset {
0, 0, 0, 0, 0, 0, 0, 0, 0, 126, 127, 0, 0, 0, 128, 129
};
- private final static String index2[] = {
+ private static final String index2[] = {
innerIndex0,
innerIndex1,
innerIndex2,
diff --git a/jdk/src/java.desktop/unix/classes/sun/font/X11GB18030_1.java b/jdk/src/java.desktop/unix/classes/sun/font/X11GB18030_1.java
index b6c18e5b72c74b080693f2d552c726fbe96cadc7..0d88040388791159e79608dce588afbf39802765 100644
--- a/jdk/src/java.desktop/unix/classes/sun/font/X11GB18030_1.java
+++ b/jdk/src/java.desktop/unix/classes/sun/font/X11GB18030_1.java
@@ -55,7 +55,7 @@ public class X11GB18030_1 extends Charset {
protected int encodeSingle(char inputChar) {
return -1;
}
- private final static String innerIndex0=
+ private static final String innerIndex0=
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
@@ -569,7 +569,7 @@ public class X11GB18030_1 extends Charset {
"\u0DD2\u0DD3\u0DD4\u0DD5\u0DD6\u0DD7\u0DD8\u0DD9"+
"\u0DDA\u0DDB\u0DDC\u0DDD\u0DDE\u0DDF\u0DE0\u0DE1";
- private final static String innerIndex1=
+ private static final String innerIndex1=
"\u0DE2\u0DE3\u0DE4\u0DE5\u0DE6\u0DE7\u0DE8\u0DE9"+
"\u0DEA\u0DEB\u0DEC\u0DED\u0DEE\u0DEF\u0DF0\u0DF1"+
"\u0DF2\u0DF3\u0DF4\u0DF5\u0DF6\u0DF7\u0DF8\u0DF9"+
@@ -1083,7 +1083,7 @@ public class X11GB18030_1 extends Charset {
"\u1DD2\u1DD3\u1DD4\u1DD5\u1DD6\u1DD7\u1DD8\u1DD9"+
"\u1DDA\u1DDB\u1DDC\u1DDD\u1DDE\u1DDF\u1DE0\u1DE1";
- private final static String innerIndex2=
+ private static final String innerIndex2=
"\u1DE2\u1DE3\u1DE4\u1DE5\u1DE6\u1DE7\u1DE8\u1DE9"+
"\u1DEA\u1DEB\u1DEC\u1DED\u1DEE\u1DEF\u1DF0\u1DF1"+
"\u1DF2\u1DF3\u1DF4\u1DF5\u1DF6\u1DF7\u1DF8\u1DF9"+
@@ -1597,7 +1597,7 @@ public class X11GB18030_1 extends Charset {
"\u2CA2\u2CA3\u2CA4\u2CA5\u2CA6\u2CA7\u2CA8\u2CA9"+
"\u2CAA\u2CAB\u2CAC\u2CAD\u2CAE\u2CAF\u2CB0\u2CB1";
- private final static String innerIndex3=
+ private static final String innerIndex3=
"\u2CB2\u2CB3\u2CB4\u2CB5\u2CB6\u2CB7\u2CB8\u2CB9"+
"\u2CBA\u2CBB\u2CBC\u2CBD\u2CBE\u2CBF\u2CC0\u2CC1"+
"\u2CC2\u2CC3\u2CC4\u2CC5\u2CC6\u2CC7\u2CC8\u2CC9"+
@@ -2111,7 +2111,7 @@ public class X11GB18030_1 extends Charset {
"\u3B79\u3B7A\u3B7B\u3B7C\u3B7D\u3B7E\u3B7F\u3B80"+
"\u3B81\u3B82\u3B83\u3B84\u3B85\u3B86\u3B87\u3B88";
- private final static String innerIndex4=
+ private static final String innerIndex4=
"\u3B89\u3B8A\u3B8B\u3B8C\u3B8D\u3B8E\u3B8F\u3B90"+
"\u3B91\u3B92\u3B93\u3B94\u3B95\u3B96\u3B97\u3B98"+
"\u3B99\u3B9A\u3B9B\u3B9C\u3B9D\u3B9E\u3B9F\u3BA0"+
@@ -2625,7 +2625,7 @@ public class X11GB18030_1 extends Charset {
"\u4AAD\u4AAE\u4AAF\u4AB0\u4AB1\u4AB2\u4AB3\u4AB4"+
"\u4AB5\u4AB6\u4AB7\u4AB8\u4AB9\u4ABA\u4ABB\u4ABC";
- private final static String innerIndex5=
+ private static final String innerIndex5=
"\u4ABD\u4ABE\u4ABF\u4AC0\u4AC1\u4AC2\u4AC3\u4AC4"+
"\u4AC5\u4AC6\u4AC7\u4AC8\u4AC9\u4ACA\u4ACB\u4ACC"+
"\u4ACD\u4ACE\u4ACF\u4AD0\u4AD1\u4AD2\u4AD3\u4AD4"+
@@ -3139,7 +3139,7 @@ public class X11GB18030_1 extends Charset {
"\u5AAD\u5AAE\u5AAF\u5AB0\u5AB1\u5AB2\u5AB3\u5AB4"+
"\u5AB5\u5AB6\u5AB7\u5AB8\u5AB9\u5ABA\u5ABB\u5ABC";
- private final static String innerIndex6=
+ private static final String innerIndex6=
"\u5ABD\u5ABE\u5ABF\u5AC0\u5AC1\u5AC2\u5AC3\u5AC4"+
"\u5AC5\u5AC6\u5AC7\u5AC8\u5AC9\u5ACA\u5ACB\u5ACC"+
"\u5ACD\u5ACE\u5ACF\u5AD0\u5AD1\u5AD2\u5AD3\u5AD4"+
@@ -3653,7 +3653,7 @@ public class X11GB18030_1 extends Charset {
"\u6AAD\u6AAE\u6AAF\u6AB0\u6AB1\u6AB2\u6AB3\u6AB4"+
"\u6AB5\u6AB6\u6AB7\u6AB8\u6AB9\u6ABA\u6ABB\u6ABC";
- private final static String innerIndex7=
+ private static final String innerIndex7=
"\u6ABD\u6ABE\u6ABF\u6AC0\u6AC1\u6AC2\u6AC3\u6AC4"+
"\u6AC5\u6AC6\u6AC7\u6AC8\u6AC9\u6ACA\u6ACB\u6ACC"+
"\u6ACD\u6ACE\u6ACF\u6AD0\u6AD1\u6AD2\u6AD3\u6AD4"+
@@ -4167,7 +4167,7 @@ public class X11GB18030_1 extends Charset {
"\u7AAD\u7AAE\u7AAF\u7AB0\u7AB1\u7AB2\u7AB3\u7AB4"+
"\u7AB5\u7AB6\u7AB7\u7AB8\u7AB9\u7ABA\u7ABB\u7ABC";
- private final static String innerIndex8=
+ private static final String innerIndex8=
"\u7ABD\u7ABE\u7ABF\u7AC0\u7AC1\u7AC2\u7AC3\u7AC4"+
"\u7AC5\u7AC6\u7AC7\u7AC8\u7AC9\u7ACA\u7ACB\u7ACC"+
"\u7ACD\u7ACE\u7ACF\u7AD0\u7AD1\u7AD2\u7AD3\u7AD4"+
@@ -4681,7 +4681,7 @@ public class X11GB18030_1 extends Charset {
"\u8999\u899A\u899B\u899C\u899D\u899E\u899F\u89A0"+
"\u89A1\u89A2\u89A3\u89A4\u89A5\u89A6\u89A7\u89A8";
- private final static String innerIndex9=
+ private static final String innerIndex9=
"\u89A9\u89AA\u89AB\u89AC\u89AD\u89AE\u89AF\u89B0"+
"\u89B1\u89B2\u89B3\u89B4\u89B5\u89B6\u89B7\u89B8"+
"\u89B9\u89BA\u89BB\u89BC\u89BD\u89BE\u89BF\u89C0"+
@@ -5195,7 +5195,7 @@ public class X11GB18030_1 extends Charset {
"\u9950\u9951\u9952\u9953\u9954\u9955\u9956\u9957"+
"\u9958\u9959\u995A\u995B\u995C\u995D\u995E\u995F";
- private final static String innerIndex10=
+ private static final String innerIndex10=
"\u9960\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
@@ -5229,7 +5229,7 @@ public class X11GB18030_1 extends Charset {
"\u99EC\u99ED\u99EE\u99EF\u99F0\u99F1\u99F2\u99F3"+
"\u99F4\u99F5\u99F6\u99F7\u99F8\u0000\u99FA\u99FB";
- private final static short index1[] = {
+ private static final short index1[] = {
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
@@ -5248,7 +5248,7 @@ public class X11GB18030_1 extends Charset {
145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160
};
- private final static String index2[] = {
+ private static final String index2[] = {
innerIndex0,
innerIndex1,
innerIndex2,
diff --git a/jdk/src/java.desktop/unix/classes/sun/font/X11Johab.java b/jdk/src/java.desktop/unix/classes/sun/font/X11Johab.java
index b70b8af4828e4f44e6a5324168eaf59f744cc055..814e175483c6bc96846a2f7b37600b8831d1332d 100644
--- a/jdk/src/java.desktop/unix/classes/sun/font/X11Johab.java
+++ b/jdk/src/java.desktop/unix/classes/sun/font/X11Johab.java
@@ -55,7 +55,7 @@ public class X11Johab extends Charset {
return true;
}
- private final static String innerIndex0=
+ private static final String innerIndex0=
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
@@ -569,7 +569,7 @@ public class X11Johab extends Charset {
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000";
- private final static String innerIndex1=
+ private static final String innerIndex1=
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
@@ -1083,7 +1083,7 @@ public class X11Johab extends Charset {
"\uE978\u0000\u0000\u0000\uF866\u0000\uE4F6\u0000"+
"\u0000\u0000\u0000\uF3DA\u0000\uF894\u0000\u0000";
- private final static String innerIndex2=
+ private static final String innerIndex2=
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uEC9F"+
"\u0000\u0000\u0000\u0000\u0000\uE5CF\uE39A\u0000"+
"\u0000\uE1DF\u0000\u0000\uF5CB\u0000\uED92\uE0AB"+
@@ -1597,7 +1597,7 @@ public class X11Johab extends Charset {
"\uF6C1\u0000\u0000\uEEB6\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000";
- private final static String innerIndex3=
+ private static final String innerIndex3=
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\uEDC7\uE63C\u0000\u0000\u0000"+
"\u0000\uE957\u0000\u0000\u0000\u0000\u0000\uEBA9"+
@@ -2111,7 +2111,7 @@ public class X11Johab extends Charset {
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\uE1A7\u0000\u0000\uE33C\u0000";
- private final static String innerIndex4=
+ private static final String innerIndex4=
"\uE3BA\u0000\uF3C4\u0000\uEDB3\uF8F5\uEFE1\uF9E0"+
"\uF94C\u0000\uE832\uE833\u0000\uE431\u0000\u0000"+
"\uE491\u0000\u0000\u0000\uEC7D\u0000\u0000\uEA79"+
@@ -2625,7 +2625,7 @@ public class X11Johab extends Charset {
"\u0000\u0000\u0000\u0000\uE695\u0000\u0000\u0000"+
"\u0000\u0000\u0000\uE9B8\uE2C5\uEADF\u0000\u0000";
- private final static String innerIndex5=
+ private static final String innerIndex5=
"\u0000\u0000\u0000\u0000\uF44E\uF631\u0000\uF0CB"+
"\uF3FC\u0000\uF4C7\u0000\u0000\uEB7B\u0000\u0000"+
"\u0000\u0000\u0000\uF1FC\u0000\u0000\uEBDB\u0000"+
@@ -3139,7 +3139,7 @@ public class X11Johab extends Charset {
"\u0000\u0000\u0000\uE995\uE7B0\u0000\uEE79\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000";
- private final static String innerIndex6=
+ private static final String innerIndex6=
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\uED4C\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
@@ -3653,7 +3653,7 @@ public class X11Johab extends Charset {
"\u9E89\u9E8A\u9E8B\u9E8C\u9E8D\u9E8E\u9E8F\u9E90"+
"\u9E91\u9E93\u9E94\u9E95\u9E96\u9E97\u9E98\u9E99";
- private final static String innerIndex7=
+ private static final String innerIndex7=
"\u9E9A\u9E9B\u9E9C\u9E9D\u9EA1\u9EA2\u9EA3\u9EA4"+
"\u9EA5\u9EA6\u9EA7\u9EA8\u9EA9\u9EAA\u9EAB\u9EAC"+
"\u9EAD\u9EAE\u9EAF\u9EB0\u9EB1\u9EB3\u9EB4\u9EB5"+
@@ -4167,7 +4167,7 @@ public class X11Johab extends Charset {
"\uBA71\uBA73\uBA74\uBA75\uBA76\uBA77\uBA78\uBA79"+
"\uBA7A\uBA7B\uBA7C\uBA7D\uBA81\uBA82\uBA83\uBA84";
- private final static String innerIndex8=
+ private static final String innerIndex8=
"\uBA85\uBA86\uBA87\uBA88\uBA89\uBA8A\uBA8B\uBA8C"+
"\uBA8D\uBA8E\uBA8F\uBA90\uBA91\uBA93\uBA94\uBA95"+
"\uBA96\uBA97\uBA98\uBA99\uBA9A\uBA9B\uBA9C\uBA9D"+
@@ -4681,7 +4681,7 @@ public class X11Johab extends Charset {
"\uF171\uF174\uF177\uF178\uF199\uF19A\uF19C\uF1A1"+
"\uF1A2\uF1A3\uF1EE\uF26B\uF44D\uF49C\uF4B1\uF537";
- private final static String innerIndex9=
+ private static final String innerIndex9=
"\uF57E\uF696\uF698\uF6B8\uF6C8\uF6D3\uF76B\uF792"+
"\uF831\uF832\uF876\uF939\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
@@ -4747,7 +4747,7 @@ public class X11Johab extends Charset {
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000";
- private final static short index1[] = {
+ private static final short index1[] = {
1, 2, 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
6, 7, 8, 9, 10, 11, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/jdk/src/java.desktop/unix/classes/sun/font/X11SunUnicode_0.java b/jdk/src/java.desktop/unix/classes/sun/font/X11SunUnicode_0.java
index 9c666e0ff294ba2dba1edcaf8974266c51b9ba0a..1ac132f83ab6f284c2c1dcb3bd000e97b5fc5af9 100644
--- a/jdk/src/java.desktop/unix/classes/sun/font/X11SunUnicode_0.java
+++ b/jdk/src/java.desktop/unix/classes/sun/font/X11SunUnicode_0.java
@@ -55,7 +55,7 @@ public class X11SunUnicode_0 extends Charset {
super(cs, index1, index2);
}
- private final static String innerIndex0=
+ private static final String innerIndex0=
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
@@ -121,7 +121,7 @@ public class X11SunUnicode_0 extends Charset {
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000";
- private final static short index1[] = {
+ private static final short index1[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -140,7 +140,7 @@ public class X11SunUnicode_0 extends Charset {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
- private final static String index2[] = {
+ private static final String index2[] = {
innerIndex0
};
diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/jules/IdleTileCache.java b/jdk/src/java.desktop/unix/classes/sun/java2d/jules/IdleTileCache.java
index f7040dacde2b21e4b1348450eb8f8d5c992a2767..f54d2ad0f297f49b1520dca86b9d5def8d56b9ae 100644
--- a/jdk/src/java.desktop/unix/classes/sun/java2d/jules/IdleTileCache.java
+++ b/jdk/src/java.desktop/unix/classes/sun/java2d/jules/IdleTileCache.java
@@ -28,8 +28,8 @@ package sun.java2d.jules;
import java.util.*;
public class IdleTileCache {
- final static int IDLE_TILE_SYNC_GRANULARITY = 16;
- final static ArrayList<JulesTile> idleBuffers = new ArrayList<JulesTile>();
+ static final int IDLE_TILE_SYNC_GRANULARITY = 16;
+ static final ArrayList<JulesTile> idleBuffers = new ArrayList<JulesTile>();
ArrayList<JulesTile> idleTileWorkerCacheList = new ArrayList<JulesTile>();
ArrayList<JulesTile> idleTileConsumerCacheList =
diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesAATileGenerator.java b/jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesAATileGenerator.java
index 47c91b4f1c13d5b6e6c01db7977b876dbb9cb2cf..e22f32ea7f197125fd83fae5823aed13e2a93165 100644
--- a/jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesAATileGenerator.java
+++ b/jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesAATileGenerator.java
@@ -33,13 +33,13 @@ import sun.java2d.xr.*;
public class JulesAATileGenerator implements AATileGenerator {
/* Threading stuff */
- final static ExecutorService rasterThreadPool =
+ static final ExecutorService rasterThreadPool =
Executors.newCachedThreadPool();
- final static int CPU_CNT = Runtime.getRuntime().availableProcessors();
+ static final int CPU_CNT = Runtime.getRuntime().availableProcessors();
- final static boolean ENABLE_THREADING = false;
- final static int THREAD_MIN = 16;
- final static int THREAD_BEGIN = 16;
+ static final boolean ENABLE_THREADING = false;
+ static final int THREAD_MIN = 16;
+ static final int THREAD_BEGIN = 16;
IdleTileCache tileCache;
TileWorker worker;
@@ -47,8 +47,8 @@ public class JulesAATileGenerator implements AATileGenerator {
int rasterTileCnt;
/* Tiling */
- final static int TILE_SIZE = 32;
- final static int TILE_SIZE_FP = 32 << 16;
+ static final int TILE_SIZE = 32;
+ static final int TILE_SIZE_FP = 32 << 16;
int left, right, top, bottom, width, height;
int leftFP, topFP;
int tileCnt, tilesX, tilesY;
diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/jules/TileWorker.java b/jdk/src/java.desktop/unix/classes/sun/java2d/jules/TileWorker.java
index 871602dfee43e091bcc4b1604bad8f19c4e27454..494ccbe27f7296d3643ed42a2d048ea1f75b1497 100644
--- a/jdk/src/java.desktop/unix/classes/sun/java2d/jules/TileWorker.java
+++ b/jdk/src/java.desktop/unix/classes/sun/java2d/jules/TileWorker.java
@@ -28,7 +28,7 @@ package sun.java2d.jules;
import java.util.*;
public class TileWorker implements Runnable {
- final static int RASTERIZED_TILE_SYNC_GRANULARITY = 8;
+ static final int RASTERIZED_TILE_SYNC_GRANULARITY = 8;
final ArrayList<JulesTile> rasterizedTileConsumerCache =
new ArrayList<JulesTile>();
final LinkedList<JulesTile> rasterizedBuffers = new LinkedList<JulesTile>();
diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XIDGenerator.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XIDGenerator.java
index a9e132c776ff80b77b6adcf84fc19102e77dd9c5..b99666bb3b0f46fdb8e2e7576ff0192ca005d887 100644
--- a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XIDGenerator.java
+++ b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XIDGenerator.java
@@ -34,7 +34,7 @@ package sun.java2d.xr;
*/
public class XIDGenerator {
- private final static int XID_BUFFER_SIZE = 512;
+ private static final int XID_BUFFER_SIZE = 512;
int[] xidBuffer = new int[XID_BUFFER_SIZE];
int currentIndex = XID_BUFFER_SIZE;
diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRBackendNative.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRBackendNative.java
index e7cac195001e85a91ff4ac8286c87d06c3c2f909..9f0810e418d8ae13c401b52b9784bf929772cf6e 100644
--- a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRBackendNative.java
+++ b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRBackendNative.java
@@ -107,7 +107,7 @@ public class XRBackendNative implements XRBackend {
int x1, int y1, int x2, int y2,
int numStops, int repeat);
- private native static int
+ private static native int
XRCreateRadialGradientPaintNative(float[] fractionsArray,
short[] pixelsArray, int numStops,
int centerX, int centerY,
diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java
index 1b4ff652056ab9e04675a9dbe281768916020941..b58e01ef56118be22c3a3e1e013d1ff00a9a76fd 100644
--- a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java
+++ b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java
@@ -48,9 +48,9 @@ public class XRCompositeManager {
private static boolean enableGradCache = true;
private static XRCompositeManager instance;
- private final static int SOLID = 0;
- private final static int TEXTURE = 1;
- private final static int GRADIENT = 2;
+ private static final int SOLID = 0;
+ private static final int TEXTURE = 1;
+ private static final int GRADIENT = 2;
int srcType;
XRSolidSrcPict solidSrc32;
diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XcbRequestCounter.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XcbRequestCounter.java
index 963eb98c03a0b1c5a8995d84ffe60c3a4a7099c4..3bd4bf4702fd011b07c37e95374e7fe4ebd98ef8 100644
--- a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XcbRequestCounter.java
+++ b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XcbRequestCounter.java
@@ -32,7 +32,7 @@ package sun.java2d.xr;
*/
public class XcbRequestCounter {
- private final static long MAX_UINT = 4294967295L;
+ private static final long MAX_UINT = 4294967295L;
long value;
diff --git a/jdk/src/java.desktop/unix/classes/sun/print/IPPPrintService.java b/jdk/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
index e077a771b1aaf24bceb78b7149ce631bfe6118a4..4b48259696233591e5f32195499eece07cd34744 100644
--- a/jdk/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
+++ b/jdk/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
@@ -83,7 +83,7 @@ public class IPPPrintService implements PrintService, SunPrinterJobService {
private String printer;
private URI myURI;
private URL myURL;
- transient private ServiceNotifier notifier = null;
+ private transient ServiceNotifier notifier = null;
private static int MAXCOPIES = 1000;
private static short MAX_ATTRIBUTE_LENGTH = 255;
diff --git a/jdk/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java b/jdk/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java
index 46a776e3b3d1650c5ccff9890d885f13452556a6..a0891b4b4ff8968f18e3c1d46dc40056e6b9fd03 100644
--- a/jdk/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java
+++ b/jdk/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java
@@ -90,9 +90,9 @@ import java.awt.print.*;
public class UnixPrintJob implements CancelablePrintJob {
private static String debugPrefix = "UnixPrintJob>> ";
- transient private Vector<PrintJobListener> jobListeners;
- transient private Vector<PrintJobAttributeListener> attrListeners;
- transient private Vector<PrintJobAttributeSet> listenedAttributeSets;
+ private transient Vector<PrintJobListener> jobListeners;
+ private transient Vector<PrintJobAttributeListener> attrListeners;
+ private transient Vector<PrintJobAttributeSet> listenedAttributeSets;
private PrintService service;
private boolean fidelity;
diff --git a/jdk/src/java.desktop/unix/classes/sun/print/UnixPrintService.java b/jdk/src/java.desktop/unix/classes/sun/print/UnixPrintService.java
index 91f0e2350caf1360aa9bc03e1f77bfdde9fa702c..c02a57cdc3ee06e52b3a708e62d27448dd5c370c 100644
--- a/jdk/src/java.desktop/unix/classes/sun/print/UnixPrintService.java
+++ b/jdk/src/java.desktop/unix/classes/sun/print/UnixPrintService.java
@@ -192,8 +192,8 @@ public class UnixPrintService implements PrintService, AttributeUpdater,
private PrinterName name;
private boolean isInvalid;
- transient private PrintServiceAttributeSet lastSet;
- transient private ServiceNotifier notifier = null;
+ private transient PrintServiceAttributeSet lastSet;
+ private transient ServiceNotifier notifier = null;
UnixPrintService(String name) {
if (name == null) {
diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java
index 6c40c230120bd73d6771523a799753d0d5947830..51e16b0a1f1a9ceb3ed1a86e14c6ca9f56e8461d 100644
--- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java
@@ -233,7 +233,7 @@ public abstract class WComponentPeer extends WObjectPeer
paintArea.paint(target, shouldClearRectBeforePaint());
}
- native synchronized void updateWindow();
+ synchronized native void updateWindow();
@Override
public void paint(Graphics g) {
@@ -566,7 +566,7 @@ public abstract class WComponentPeer extends WObjectPeer
}
// fallback default font object
- final static Font defaultFont = new Font(Font.DIALOG, Font.PLAIN, 12);
+ static final Font defaultFont = new Font(Font.DIALOG, Font.PLAIN, 12);
@Override
public Graphics getGraphics() {
diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WDialogPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WDialogPeer.java
index fea3588ffecaf65ac1f5102a70ccd8838df55756..86c708006c16f2e31a9210059ee9ce82e7cd0109 100644
--- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WDialogPeer.java
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WDialogPeer.java
@@ -35,7 +35,7 @@ final class WDialogPeer extends WWindowPeer implements DialogPeer {
// Platform default background for dialogs. Gets set on target if
// target has none explicitly specified.
- final static Color defaultBackground = SystemColor.control;
+ static final Color defaultBackground = SystemColor.control;
// If target doesn't have its background color set, we set its
// background to platform default.
diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WFramePeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WFramePeer.java
index 37486e18ebac150e5c035c26a78ebaea7b6de535..b60fb0b082bdc7d963e0391a8d9af157dee890d3 100644
--- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WFramePeer.java
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WFramePeer.java
@@ -195,7 +195,7 @@ class WFramePeer extends WWindowPeer implements FramePeer {
setState(target.getExtendedState());
}
- private native static int getSysMenuHeight();
+ private static native int getSysMenuHeight();
native void pSetIMMOption(String option);
void notifyIMMOptionChange(){
diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java
index aaf2df9c5d0a2bc545909bf72b62b9bc0e763240..4bd8f7b5e98f745a1ff2e9549995565eb648e85b 100644
--- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java
@@ -67,23 +67,23 @@ final class WInputMethod extends InputMethodAdapter
private boolean statusWindowHidden = false;
// attribute definition in Win32 (in IMM.H)
- public final static byte ATTR_INPUT = 0x00;
- public final static byte ATTR_TARGET_CONVERTED = 0x01;
- public final static byte ATTR_CONVERTED = 0x02;
- public final static byte ATTR_TARGET_NOTCONVERTED = 0x03;
- public final static byte ATTR_INPUT_ERROR = 0x04;
+ public static final byte ATTR_INPUT = 0x00;
+ public static final byte ATTR_TARGET_CONVERTED = 0x01;
+ public static final byte ATTR_CONVERTED = 0x02;
+ public static final byte ATTR_TARGET_NOTCONVERTED = 0x03;
+ public static final byte ATTR_INPUT_ERROR = 0x04;
// cmode definition in Win32 (in IMM.H)
- public final static int IME_CMODE_ALPHANUMERIC = 0x0000;
- public final static int IME_CMODE_NATIVE = 0x0001;
- public final static int IME_CMODE_KATAKANA = 0x0002;
- public final static int IME_CMODE_LANGUAGE = 0x0003;
- public final static int IME_CMODE_FULLSHAPE = 0x0008;
- public final static int IME_CMODE_HANJACONVERT = 0x0040;
- public final static int IME_CMODE_ROMAN = 0x0010;
+ public static final int IME_CMODE_ALPHANUMERIC = 0x0000;
+ public static final int IME_CMODE_NATIVE = 0x0001;
+ public static final int IME_CMODE_KATAKANA = 0x0002;
+ public static final int IME_CMODE_LANGUAGE = 0x0003;
+ public static final int IME_CMODE_FULLSHAPE = 0x0008;
+ public static final int IME_CMODE_HANJACONVERT = 0x0040;
+ public static final int IME_CMODE_ROMAN = 0x0010;
// flag values for endCompositionNative() behavior
- private final static boolean COMMIT_INPUT = true;
- private final static boolean DISCARD_INPUT = false;
+ private static final boolean COMMIT_INPUT = true;
+ private static final boolean DISCARD_INPUT = false;
private static Map<TextAttribute,Object> [] highlightStyles;
diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WObjectPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WObjectPeer.java
index 83f7c586f2a1ffb748ba314cc06781a5471e61ac..c456df27dd93e24d9fbd0aae9a621d25f7e1dd7b 100644
--- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WObjectPeer.java
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WObjectPeer.java
@@ -66,7 +66,7 @@ abstract class WObjectPeer {
* Subclasses should override disposeImpl() instead of dispose(). Client
* code should always invoke dispose(), never disposeImpl().
*/
- abstract protected void disposeImpl();
+ protected abstract void disposeImpl();
public final void dispose() {
boolean call_disposeImpl = false;
diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WScrollPanePeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WScrollPanePeer.java
index 4b083475db992243b7c5945da7d212240228d325..325da0f8d06014804e0122859e851e57c4df6bb4 100644
--- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WScrollPanePeer.java
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WScrollPanePeer.java
@@ -78,7 +78,7 @@ final class WScrollPanePeer extends WPanelPeer implements ScrollPanePeer {
private native void setInsets();
@Override
- public native synchronized void setScrollPosition(int x, int y);
+ public synchronized native void setScrollPosition(int x, int y);
@Override
public int getHScrollbarHeight() {
@@ -112,7 +112,7 @@ final class WScrollPanePeer extends WPanelPeer implements ScrollPanePeer {
setInsets();
}
- native synchronized void setSpans(int viewWidth, int viewHeight,
+ synchronized native void setSpans(int viewWidth, int viewHeight,
int childWidth, int childHeight);
/**
diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java
index e4e6675acde8d35a8352752f6349401a74ad43f2..970ab07f84322c92a79d7940ac6104023f616c86 100644
--- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java
@@ -832,7 +832,7 @@ public final class WToolkit extends SunToolkit implements Runnable {
* Have Win32GraphicsEnvironment execute the display change code on the
* Event thread.
*/
- static public void displayChanged() {
+ public static void displayChanged() {
EventQueue.invokeLater(new Runnable() {
@Override
public void run() {
@@ -1127,7 +1127,7 @@ public final class WToolkit extends SunToolkit implements Runnable {
return areExtraMouseButtonsEnabled;
}
- private native synchronized int getNumberOfButtonsImpl();
+ private synchronized native int getNumberOfButtonsImpl();
@Override
public int getNumberOfButtons(){
diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java
index e88411d6537b244ed96916190c050db84169d588..09b564f194e9381ffd8984bb522fb6108494a326 100644
--- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java
@@ -40,9 +40,9 @@ import sun.awt.SunToolkit;
import sun.awt.image.IntegerComponentRaster;
final class WTrayIconPeer extends WObjectPeer implements TrayIconPeer {
- final static int TRAY_ICON_WIDTH = 16;
- final static int TRAY_ICON_HEIGHT = 16;
- final static int TRAY_ICON_MASK_SIZE = (TRAY_ICON_WIDTH * TRAY_ICON_HEIGHT) / 8;
+ static final int TRAY_ICON_WIDTH = 16;
+ static final int TRAY_ICON_HEIGHT = 16;
+ static final int TRAY_ICON_MASK_SIZE = (TRAY_ICON_WIDTH * TRAY_ICON_HEIGHT) / 8;
IconObserver observer = new IconObserver();
boolean firstUpdate = true;
diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java
index 1a8c8de70bbeb3fb45119ca487e3494402e38fcd..5605ecd04bdbcbd46d25a6d4a6c173cc76030727 100644
--- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java
@@ -59,7 +59,7 @@ public class WWindowPeer extends WPanelPeer implements WindowPeer,
* is a list of windows, sorted by the time of activation: later a window is
* activated, greater its index is in the list.
*/
- private final static StringBuffer ACTIVE_WINDOWS_KEY =
+ private static final StringBuffer ACTIVE_WINDOWS_KEY =
new StringBuffer("active_windows_list");
/*
@@ -72,7 +72,7 @@ public class WWindowPeer extends WPanelPeer implements WindowPeer,
/*
* The object is a listener for the AppContext.GUI_DISPOSED property.
*/
- private final static PropertyChangeListener guiDisposedListener =
+ private static final PropertyChangeListener guiDisposedListener =
new GuiDisposedListener();
/*
diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DPaints.java b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DPaints.java
index b328ce3a0837bc4ca1a90d9e4a75199d89ec5147..7d5bd4423eacfb9b885c0715440c7d6577ba2552 100644
--- a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DPaints.java
+++ b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DPaints.java
@@ -158,7 +158,7 @@ abstract class D3DPaints {
/****************** Shared MultipleGradientPaint support ********************/
- private static abstract class MultiGradient extends D3DPaints {
+ private abstract static class MultiGradient extends D3DPaints {
/**
* Note that this number is lower than the MULTI_MAX_FRACTIONS
diff --git a/jdk/src/java.desktop/windows/classes/sun/print/Win32MediaTray.java b/jdk/src/java.desktop/windows/classes/sun/print/Win32MediaTray.java
index 79198ec4655852cf2e025517c2a99aaed62fe77e..43ce6a19d6a348a6e27f82edfb02d9ce95c71c27 100644
--- a/jdk/src/java.desktop/windows/classes/sun/print/Win32MediaTray.java
+++ b/jdk/src/java.desktop/windows/classes/sun/print/Win32MediaTray.java
@@ -59,7 +59,7 @@ public class Win32MediaTray extends MediaTray {
winID = id;
}
- private synchronized static int nextValue(String name) {
+ private static synchronized int nextValue(String name) {
winStringTable.add(name);
return (getTraySize()-1);
}
diff --git a/jdk/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java b/jdk/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java
index df8b9923a5ecf1b74c4db4662154d9d051c40026..1933f8b659feb55805433c7b2c415a0a24f417ca 100644
--- a/jdk/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java
+++ b/jdk/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java
@@ -79,9 +79,9 @@ import java.awt.print.*;
public class Win32PrintJob implements CancelablePrintJob {
- transient private Vector<PrintJobListener> jobListeners;
- transient private Vector<PrintJobAttributeListener> attrListeners;
- transient private Vector<PrintJobAttributeSet> listenedAttributeSets;
+ private transient Vector<PrintJobListener> jobListeners;
+ private transient Vector<PrintJobAttributeListener> attrListeners;
+ private transient Vector<PrintJobAttributeSet> listenedAttributeSets;
private Win32PrintService service;
private boolean fidelity;
diff --git a/jdk/src/java.desktop/windows/classes/sun/print/Win32PrintService.java b/jdk/src/java.desktop/windows/classes/sun/print/Win32PrintService.java
index d99fee887dbffe585913021ae3b8018c88aecc95..cdb18138ed3277f156dd539e59c87f4e02563567 100644
--- a/jdk/src/java.desktop/windows/classes/sun/print/Win32PrintService.java
+++ b/jdk/src/java.desktop/windows/classes/sun/print/Win32PrintService.java
@@ -195,8 +195,8 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
private PrinterName name;
private String port;
- transient private PrintServiceAttributeSet lastSet;
- transient private ServiceNotifier notifier = null;
+ private transient PrintServiceAttributeSet lastSet;
+ private transient ServiceNotifier notifier = null;
private MediaSizeName[] mediaSizeNames;
private MediaPrintableArea[] mediaPrintables;
@@ -1734,7 +1734,7 @@ class Win32MediaSize extends MediaSizeName {
}
- private synchronized static int nextValue(String name) {
+ private static synchronized int nextValue(String name) {
winStringTable.add(name);
return (winStringTable.size()-1);
}