--- old/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java	2015-09-18 13:07:07.637445674 -0700
+++ new/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java	2015-09-18 13:07:07.529445678 -0700
@@ -832,7 +832,7 @@
      * 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 @@
         return areExtraMouseButtonsEnabled;
     }
 
-    private native synchronized int getNumberOfButtonsImpl();
+    private synchronized native int getNumberOfButtonsImpl();
 
     @Override
     public int getNumberOfButtons(){