--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java	Fri Sep 18 11:31:15 2015 -0700
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java	Sat Sep 19 15:45:59 2015 -0700
@@ -51,7 +51,7 @@
     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 protected void rebuildArrows();
+    protected abstract void rebuildArrows();
 
     public void setSize(int width, int height) {
         if (log.isLoggable(PlatformLogger.Level.FINER)) {