--- old/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java	2015-09-18 13:05:07.697450266 -0700
+++ new/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java	2015-09-18 13:05:07.589450270 -0700
@@ -47,9 +47,9 @@
  */
 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;