Merge

39 files changed, 86 insertions, 157 deletions

diff --git a/src/share/classes/javax/crypto/JceSecurity.java b/src/share/classes/javax/crypto/JceSecurity.java
index 7e0624622..fb7052d24 100644
--- a/src/share/classes/javax/crypto/JceSecurity.java
+++ b/src/share/classes/javax/crypto/JceSecurity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -216,26 +216,28 @@ final class JceSecurity {
             new WeakHashMap<>();
 
     /*
-     * Retuns the CodeBase for the given class.
+     * Returns the CodeBase for the given class.
      */
     static URL getCodeBase(final Class<?> clazz) {
-        URL url = codeBaseCacheRef.get(clazz);
-        if (url == null) {
-            url = AccessController.doPrivileged(new PrivilegedAction<URL>() {
-                public URL run() {
-                    ProtectionDomain pd = clazz.getProtectionDomain();
-                    if (pd != null) {
-                        CodeSource cs = pd.getCodeSource();
-                        if (cs != null) {
-                            return cs.getLocation();
+        synchronized (codeBaseCacheRef) {
+            URL url = codeBaseCacheRef.get(clazz);
+            if (url == null) {
+                url = AccessController.doPrivileged(new PrivilegedAction<URL>() {
+                    public URL run() {
+                        ProtectionDomain pd = clazz.getProtectionDomain();
+                        if (pd != null) {
+                            CodeSource cs = pd.getCodeSource();
+                            if (cs != null) {
+                                return cs.getLocation();
+                            }
                         }
+                        return NULL_URL;
                     }
-                    return NULL_URL;
-                }
-            });
-            codeBaseCacheRef.put(clazz, url);
+                });
+                codeBaseCacheRef.put(clazz, url);
+            }
+            return (url == NULL_URL) ? null : url;
         }
-        return (url == NULL_URL) ? null : url;
     }
 
     private static void setupJurisdictionPolicies() throws Exception {
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java b/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
index 28494fe6f..82be7d0f9 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
@@ -379,15 +379,11 @@ public class BasicInternalFrameTitlePane extends JComponent
         InternalFrameEvent e = new InternalFrameEvent(
             frame, InternalFrameEvent.INTERNAL_FRAME_CLOSING);
         // Try posting event, unless there's a SecurityManager.
-        if (JInternalFrame.class.getClassLoader() == null) {
-            try {
-                Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(e);
-                return;
-            } catch (SecurityException se) {
-                // Use dispatchEvent instead.
-            }
+        try {
+            Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(e);
+        } catch (SecurityException se) {
+            frame.dispatchEvent(e);
         }
-        frame.dispatchEvent(e);
     }
 
 
diff --git a/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java b/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java
index ff3eab8f1..01aa45ff0 100644
--- a/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java
+++ b/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java
@@ -31,6 +31,7 @@ import javax.swing.*;
 import javax.swing.plaf.UIResource;
 import javax.swing.Painter;
 import java.awt.print.PrinterGraphics;
+import sun.reflect.misc.MethodUtil;
 
 /**
  * Convenient base class for defining Painter instances for rendering a
@@ -445,8 +446,8 @@ public abstract class AbstractRegionPainter implements Painter<JComponent> {
             } else {
                 String s = "get" + Character.toUpperCase(property.charAt(0)) + property.substring(1);
                 try {
-                    Method method = c.getClass().getMethod(s);
-                    color = (Color) method.invoke(c);
+                    Method method = MethodUtil.getMethod(c.getClass(), s, null);
+                    color = (Color) MethodUtil.invoke(method, c, null);
                 } catch (Exception e) {
                     //don't do anything, it just didn't work, that's all.
                     //This could be a normal occurance if you use a property
diff --git a/src/share/classes/javax/swing/plaf/nimbus/skin.laf b/src/share/classes/javax/swing/plaf/nimbus/skin.laf
index 390100421..394721e1c 100644
--- a/src/share/classes/javax/swing/plaf/nimbus/skin.laf
+++ b/src/share/classes/javax/swing/plaf/nimbus/skin.laf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
@@ -13424,10 +13424,10 @@
             <state stateKeys="Selected">
                 <style>
                    <textForeground>
-                      <matte red="255" green="255" blue="255" alpha="255" uiDefaultParentName="nimbusLightBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="false"/>
+                      <matte red="255" green="255" blue="255" alpha="255" uiDefaultParentName="nimbusLightBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
                    </textForeground>
                    <textBackground>
-                      <matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="false"/>
+                      <matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
                    </textBackground>
                    <background/>
                    <inherit-textForeground>false</inherit-textForeground>
@@ -13453,7 +13453,7 @@
                 <style>
                    <textForeground/>
                    <textBackground>
-                       <matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="false"/>
+                       <matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
                    </textBackground>
                    <background/>
                    <inherit-textBackground>false</inherit-textBackground>
@@ -13477,7 +13477,7 @@
             <state stateKeys="Disabled">
                 <style>
                    <textForeground>
-                      <matte red="142" green="143" blue="145" alpha="255" uiDefaultParentName="nimbusDisabledText" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="false"/>
+                      <matte red="142" green="143" blue="145" alpha="255" uiDefaultParentName="nimbusDisabledText" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
                    </textForeground>
                    <textBackground/>
                    <background/>
@@ -13520,7 +13520,7 @@
                         </textForeground>
                         <textBackground/>
                         <background>
-                           <matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="false"/>
+                           <matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
                         </background>
                         <inherit-textForeground>false</inherit-textForeground>
                         <inherit-background>false</inherit-background>
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthButtonUI.java b/src/share/classes/javax/swing/plaf/synth/SynthButtonUI.java
index 74e13aaa9..38900d04b 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthButtonUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthButtonUI.java
@@ -138,9 +138,7 @@ public class SynthButtonUI extends BasicButtonUI implements
     }
 
     SynthContext getContext(JComponent c, int state) {
-        Region region = SynthLookAndFeel.getRegion(c);
-        return SynthContext.getContext(SynthContext.class, c, region,
-                                       style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     /**
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthColorChooserUI.java b/src/share/classes/javax/swing/plaf/synth/SynthColorChooserUI.java
index 925668456..72ab2b09a 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthColorChooserUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthColorChooserUI.java
@@ -128,8 +128,7 @@ public class SynthColorChooserUI extends BasicColorChooserUI implements
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private int getComponentState(JComponent c) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java b/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java
index 754484d03..d56a5a65e 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java
@@ -208,8 +208,7 @@ public class SynthComboBoxUI extends BasicComboBoxUI implements
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private int getComponentState(JComponent c) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthContext.java b/src/share/classes/javax/swing/plaf/synth/SynthContext.java
index 6d89a4a06..64b6e536f 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthContext.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthContext.java
@@ -24,8 +24,9 @@
  */
 package javax.swing.plaf.synth;
 
-import javax.swing.*;
-import java.util.*;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import javax.swing.JComponent;
 
 /**
  * An immutable transient object containing contextual information about
@@ -39,59 +40,32 @@ import java.util.*;
  * @author Scott Violet
  */
 public class SynthContext {
-    private static final Map<Class, List<SynthContext>> contextMap;
+    private static final Queue<SynthContext> queue = new ConcurrentLinkedQueue<>();
 
     private JComponent component;
     private Region region;
     private SynthStyle style;
     private int state;
 
-
-    static {
-        contextMap = new HashMap<Class, List<SynthContext>>();
+    static SynthContext getContext(JComponent c, SynthStyle style, int state) {
+        return getContext(c, SynthLookAndFeel.getRegion(c), style, state);
     }
 
-
-    static SynthContext getContext(Class type, JComponent component,
+    static SynthContext getContext(JComponent component,
                                    Region region, SynthStyle style,
                                    int state) {
-        SynthContext context = null;
-
-        synchronized(contextMap) {
-            List<SynthContext> instances = contextMap.get(type);
-
-            if (instances != null) {
-                int size = instances.size();
-
-                if (size > 0) {
-                    context = instances.remove(size - 1);
-                }
-            }
-        }
+        SynthContext context = queue.poll();
         if (context == null) {
-            try {
-                context = (SynthContext)type.newInstance();
-            } catch (IllegalAccessException iae) {
-            } catch (InstantiationException ie) {
-            }
+            context = new SynthContext();
         }
         context.reset(component, region, style, state);
         return context;
     }
 
     static void releaseContext(SynthContext context) {
-        synchronized(contextMap) {
-            List<SynthContext> instances = contextMap.get(context.getClass());
-
-            if (instances == null) {
-                instances = new ArrayList<SynthContext>(5);
-                contextMap.put(context.getClass(), instances);
-            }
-            instances.add(context);
-        }
+        queue.offer(context);
     }
 
-
     SynthContext() {
     }
 
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthDesktopIconUI.java b/src/share/classes/javax/swing/plaf/synth/SynthDesktopIconUI.java
index cde0f050e..ff668963e 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthDesktopIconUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthDesktopIconUI.java
@@ -142,9 +142,7 @@ public class SynthDesktopIconUI extends BasicDesktopIconUI
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        Region region = SynthLookAndFeel.getRegion(c);
-        return SynthContext.getContext(SynthContext.class, c, region,
-                                       style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private int getComponentState(JComponent c) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthDesktopPaneUI.java b/src/share/classes/javax/swing/plaf/synth/SynthDesktopPaneUI.java
index c1099085b..3620bda50 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthDesktopPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthDesktopPaneUI.java
@@ -430,8 +430,7 @@ public class SynthDesktopPaneUI extends BasicDesktopPaneUI implements
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                     SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private int getComponentState(JComponent c) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java b/src/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java
index 2ccf59268..69489197d 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java
@@ -139,8 +139,7 @@ public class SynthEditorPaneUI extends BasicEditorPaneUI implements SynthUI {
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private int getComponentState(JComponent c) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameTitlePane.java b/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameTitlePane.java
index f0f7b607e..a538457c0 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameTitlePane.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameTitlePane.java
@@ -67,8 +67,7 @@ class SynthInternalFrameTitlePane extends BasicInternalFrameTitlePane
     }
 
     public SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private Region getRegion(JComponent c) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameUI.java b/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameUI.java
index 34c94cdbc..c5c1ef7fd 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameUI.java
@@ -141,8 +141,7 @@ public class SynthInternalFrameUI extends BasicInternalFrameUI
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                            SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private int getComponentState(JComponent c) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthLabelUI.java b/src/share/classes/javax/swing/plaf/synth/SynthLabelUI.java
index 45031e991..22e57e5e4 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthLabelUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthLabelUI.java
@@ -91,8 +91,7 @@ public class SynthLabelUI extends BasicLabelUI implements SynthUI {
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private int getComponentState(JComponent c) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthListUI.java b/src/share/classes/javax/swing/plaf/synth/SynthListUI.java
index 5f19a1940..249bc0aa2 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthListUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthListUI.java
@@ -188,8 +188,7 @@ public class SynthListUI extends BasicListUI
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private int getComponentState(JComponent c) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java b/src/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java
index 9c1f9cba2..1f0966464 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java
@@ -116,8 +116,7 @@ public class SynthMenuBarUI extends BasicMenuBarUI
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private int getComponentState(JComponent c) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java b/src/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java
index 19ac0a760..956f76f1f 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java
@@ -170,8 +170,7 @@ public class SynthMenuItemUI extends BasicMenuItemUI implements
     }
 
     SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     SynthContext getContext(JComponent c, Region region) {
@@ -179,8 +178,7 @@ public class SynthMenuItemUI extends BasicMenuItemUI implements
     }
 
     private SynthContext getContext(JComponent c, Region region, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                                       region, accStyle, state);
+        return SynthContext.getContext(c, region, accStyle, state);
     }
 
     private int getComponentState(JComponent c) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java b/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java
index 3f53f461e..7bb66a25c 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java
@@ -170,9 +170,7 @@ public class SynthMenuUI extends BasicMenuUI
     }
 
     SynthContext getContext(JComponent c, int state) {
-        Region region = SynthLookAndFeel.getRegion(c);
-        return SynthContext.getContext(SynthContext.class, c, region,
-                                       style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     SynthContext getContext(JComponent c, Region region) {
@@ -180,8 +178,7 @@ public class SynthMenuUI extends BasicMenuUI
     }
 
     private SynthContext getContext(JComponent c, Region region, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                                       region, accStyle, state);
+        return SynthContext.getContext(c, region, accStyle, state);
     }
 
     private int getComponentState(JComponent c) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java b/src/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java
index 42d454cf8..de6f2a713 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java
@@ -140,8 +140,7 @@ public class SynthOptionPaneUI extends BasicOptionPaneUI implements
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private int getComponentState(JComponent c) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthPanelUI.java b/src/share/classes/javax/swing/plaf/synth/SynthPanelUI.java
index ddfff5c15..73f37ff53 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthPanelUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthPanelUI.java
@@ -127,8 +127,7 @@ public class SynthPanelUI extends BasicPanelUI
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private int getComponentState(JComponent c) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthParser.java b/src/share/classes/javax/swing/plaf/synth/SynthParser.java
index a03e752e4..c27b10456 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthParser.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthParser.java
@@ -67,6 +67,7 @@ import org.xml.sax.SAXParseException;
 import org.xml.sax.helpers.DefaultHandler;
 
 import com.sun.beans.decoder.DocumentHandler;
+import sun.reflect.misc.ReflectUtil;
 
 class SynthParser extends DefaultHandler {
     //
@@ -648,7 +649,7 @@ class SynthParser extends DefaultHandler {
                     }
                     else {
                         try {
-                            typeClass = Class.forName(typeName.substring(
+                            typeClass = ReflectUtil.forName(typeName.substring(
                                                       0, classIndex));
                         } catch (ClassNotFoundException cnfe) {
                             throw new SAXException("Unknown class: " +
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java b/src/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java
index d228abab7..cbb09f292 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java
@@ -123,8 +123,7 @@ public class SynthPopupMenuUI extends BasicPopupMenuUI
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private int getComponentState(JComponent c) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java b/src/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java
index 1afc81bb1..c37ce4903 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java
@@ -138,8 +138,7 @@ public class SynthProgressBarUI extends BasicProgressBarUI
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                            SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private int getComponentState(JComponent c) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java b/src/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java
index 0d437de76..1115fe355 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java
@@ -80,8 +80,7 @@ public class SynthRootPaneUI extends BasicRootPaneUI implements SynthUI {
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private int getComponentState(JComponent c) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java b/src/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java
index 21b0a52b5..04b89bbee 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java
@@ -185,8 +185,7 @@ public class SynthScrollBarUI extends BasicScrollBarUI
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private SynthContext getContext(JComponent c, Region region) {
@@ -199,8 +198,7 @@ public class SynthScrollBarUI extends BasicScrollBarUI
         if (region == Region.SCROLL_BAR_THUMB) {
             style = thumbStyle;
         }
-        return SynthContext.getContext(SynthContext.class, c, region, style,
-                                       state);
+        return SynthContext.getContext(c, region, style, state);
     }
 
     private int getComponentState(JComponent c, Region region) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthScrollPaneUI.java b/src/share/classes/javax/swing/plaf/synth/SynthScrollPaneUI.java
index 82d0b5e1e..b8b13c7fc 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthScrollPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthScrollPaneUI.java
@@ -211,8 +211,7 @@ public class SynthScrollPaneUI extends BasicScrollPaneUI
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private int getComponentState(JComponent c) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthSeparatorUI.java b/src/share/classes/javax/swing/plaf/synth/SynthSeparatorUI.java
index 7e759d4e3..158e16bd5 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthSeparatorUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthSeparatorUI.java
@@ -248,8 +248,7 @@ public class SynthSeparatorUI extends SeparatorUI
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     public void propertyChange(PropertyChangeEvent evt) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java b/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java
index 65d461264..5cc7cd486 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java
@@ -722,8 +722,7 @@ public class SynthSliderUI extends BasicSliderUI
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                            SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private SynthContext getContext(JComponent c, Region subregion) {
@@ -732,14 +731,13 @@ public class SynthSliderUI extends BasicSliderUI
 
     private SynthContext getContext(JComponent c, Region subregion, int state) {
         SynthStyle style = null;
-        Class klass = SynthContext.class;
 
         if (subregion == Region.SLIDER_TRACK) {
             style = sliderTrackStyle;
         } else if (subregion == Region.SLIDER_THUMB) {
             style = sliderThumbStyle;
         }
-        return SynthContext.getContext(klass, c, subregion, style, state);
+        return SynthContext.getContext(c, subregion, style, state);
     }
 
     private int getComponentState(JComponent c, Region region) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthSpinnerUI.java b/src/share/classes/javax/swing/plaf/synth/SynthSpinnerUI.java
index d8bc4feea..a1293dfda 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthSpinnerUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthSpinnerUI.java
@@ -278,8 +278,7 @@ public class SynthSpinnerUI extends BasicSpinnerUI
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     /**
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java b/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java
index 665286c4d..225c41f3f 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java
@@ -209,8 +209,7 @@ public class SynthSplitPaneUI extends BasicSplitPaneUI
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     SynthContext getContext(JComponent c, Region region) {
@@ -219,11 +218,9 @@ public class SynthSplitPaneUI extends BasicSplitPaneUI
 
     private SynthContext getContext(JComponent c, Region region, int state) {
         if (region == Region.SPLIT_PANE_DIVIDER) {
-            return SynthContext.getContext(SynthContext.class, c, region,
-                                           dividerStyle, state);
+            return SynthContext.getContext(c, region, dividerStyle, state);
         }
-        return SynthContext.getContext(SynthContext.class, c, region,
-                                       style, state);
+        return SynthContext.getContext(c, region, style, state);
     }
 
     private int getComponentState(JComponent c, Region subregion) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java b/src/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java
index 95aa6dcc7..6d9dee073 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java
@@ -235,13 +235,11 @@ public class SynthTabbedPaneUI extends BasicTabbedPaneUI
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c),style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private SynthContext getContext(JComponent c, Region subregion, int state){
         SynthStyle style = null;
-        Class klass = SynthContext.class;
 
         if (subregion == Region.TABBED_PANE_TAB) {
             style = tabStyle;
@@ -252,7 +250,7 @@ public class SynthTabbedPaneUI extends BasicTabbedPaneUI
         else if (subregion == Region.TABBED_PANE_CONTENT) {
             style = tabContentStyle;
         }
-        return SynthContext.getContext(klass, c, subregion, style, state);
+        return SynthContext.getContext(c, subregion, style, state);
     }
 
     /**
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthTableHeaderUI.java b/src/share/classes/javax/swing/plaf/synth/SynthTableHeaderUI.java
index ec358aa30..c95469c46 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthTableHeaderUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthTableHeaderUI.java
@@ -193,8 +193,7 @@ public class SynthTableHeaderUI extends BasicTableHeaderUI
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     /**
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthTableUI.java b/src/share/classes/javax/swing/plaf/synth/SynthTableUI.java
index 49dfe4b1b..d39a47d24 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthTableUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthTableUI.java
@@ -246,8 +246,7 @@ public class SynthTableUI extends BasicTableUI
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
 //
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java b/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java
index e39f144cc..fa84eeb1a 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java
@@ -118,8 +118,7 @@ public class SynthTextAreaUI extends BasicTextAreaUI implements SynthUI {
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     /**
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java b/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java
index f033e97d0..3831da9cf 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java
@@ -156,8 +156,7 @@ public class SynthTextFieldUI extends BasicTextFieldUI implements SynthUI {
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     /**
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java b/src/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java
index f65fdd14d..51d2fefd1 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java
@@ -178,19 +178,17 @@ public class SynthToolBarUI extends BasicToolBarUI
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private SynthContext getContext(JComponent c, Region region, SynthStyle style) {
-        return SynthContext.getContext(SynthContext.class, c, region,
+        return SynthContext.getContext(c, region,
                                        style, getComponentState(c, region));
     }
 
     private SynthContext getContext(JComponent c, Region region,
                                     SynthStyle style, int state) {
-        return SynthContext.getContext(SynthContext.class, c, region,
-                                       style, state);
+        return SynthContext.getContext(c, region, style, state);
     }
 
     private int getComponentState(JComponent c, Region region) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthToolTipUI.java b/src/share/classes/javax/swing/plaf/synth/SynthToolTipUI.java
index afd49f4a7..dc42debba 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthToolTipUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthToolTipUI.java
@@ -107,8 +107,7 @@ public class SynthToolTipUI extends BasicToolTipUI
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private int getComponentState(JComponent c) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java b/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java
index 70f7f6456..721c322ee 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java
@@ -173,8 +173,7 @@ public class SynthTreeUI extends BasicTreeUI
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                    SynthLookAndFeel.getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private SynthContext getContext(JComponent c, Region region) {
@@ -182,8 +181,7 @@ public class SynthTreeUI extends BasicTreeUI
     }
 
     private SynthContext getContext(JComponent c, Region region, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                                       region, cellStyle, state);
+        return SynthContext.getContext(c, region, cellStyle, state);
     }
 
     private int getComponentState(JComponent c, Region region) {
diff --git a/src/share/classes/javax/swing/plaf/synth/SynthViewportUI.java b/src/share/classes/javax/swing/plaf/synth/SynthViewportUI.java
index 4c5a9b0cd..dc3e6c6e1 100644
--- a/src/share/classes/javax/swing/plaf/synth/SynthViewportUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthViewportUI.java
@@ -141,8 +141,7 @@ public class SynthViewportUI extends ViewportUI
     }
 
     private SynthContext getContext(JComponent c, int state) {
-        return SynthContext.getContext(SynthContext.class, c,
-                                       getRegion(c), style, state);
+        return SynthContext.getContext(c, style, state);
     }
 
     private Region getRegion(JComponent c) {