--- old/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java	2015-09-18 13:06:53.305446223 -0700
+++ new/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java	2015-09-18 13:06:53.189446227 -0700
@@ -34,13 +34,13 @@
 
 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");