diff -r 2a338536e642 -r f9cb6e427f9e jdk/src/java.desktop/share/classes/sun/awt/AppContext.java --- a/jdk/src/java.desktop/share/classes/sun/awt/AppContext.java Fri Sep 18 11:31:15 2015 -0700 +++ b/jdk/src/java.desktop/share/classes/sun/awt/AppContext.java Sat Sep 19 15:45:59 2015 -0700 @@ -148,8 +148,8 @@ /* * 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 @@ 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