# HG changeset patch # User jlahoda # Date 1465813510 -7200 # Mon Jun 13 12:25:10 2016 +0200 # Node ID 90594b7605c6b0c2cf656cb09c9e5bbde301af61 # Parent 7d9f6823e0ede3c564a2692929120d05c053ebbd imported patch 8153362 diff --git a/src/java.desktop/share/classes/javax/swing/JRootPane.java b/src/java.desktop/share/classes/javax/swing/JRootPane.java --- a/src/java.desktop/share/classes/javax/swing/JRootPane.java +++ b/src/java.desktop/share/classes/javax/swing/JRootPane.java @@ -329,7 +329,7 @@ * @deprecated As of Java 2 platform v1.3. * @see #defaultButton */ - @Deprecated + @Deprecated @SuppressWarnings("unexportedinapi") protected DefaultAction defaultPressAction; /** * As of Java 2 platform v1.3 this unusable field is no longer used. @@ -340,7 +340,7 @@ * @deprecated As of Java 2 platform v1.3. * @see #defaultButton */ - @Deprecated + @Deprecated @SuppressWarnings("unexportedinapi") protected DefaultAction defaultReleaseAction; /** diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBorders.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBorders.java --- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBorders.java +++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBorders.java @@ -739,6 +739,7 @@ /** * The instance of {@code MetalBumps}. */ + @SuppressWarnings("unexportedinapi") protected MetalBumps bumps = new MetalBumps( 10, 10, MetalLookAndFeel.getControlHighlight(), MetalLookAndFeel.getControlDarkShadow(), diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java --- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java +++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java @@ -923,7 +923,8 @@ * @param fc a {@code JFileChooser} * @return a new instance of {@code DirectoryComboBoxRenderer} */ - protected DirectoryComboBoxRenderer createDirectoryComboBoxRenderer(JFileChooser fc) { + @SuppressWarnings("unexportedinapi") + protected DirectoryComboBoxRenderer createDirectoryComboBoxRenderer(JFileChooser fc) { return new DirectoryComboBoxRenderer(); } diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java --- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java +++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java @@ -62,6 +62,7 @@ /** * The metal bumps. */ + @SuppressWarnings("unexportedinapi") protected MetalBumps bumps; /** diff --git a/src/java.naming/share/classes/javax/naming/CompoundName.java b/src/java.naming/share/classes/javax/naming/CompoundName.java --- a/src/java.naming/share/classes/javax/naming/CompoundName.java +++ b/src/java.naming/share/classes/javax/naming/CompoundName.java @@ -153,6 +153,7 @@ * This field is initialized by the constructors and cannot be null. * It should be treated as a read-only variable by subclasses. */ + @SuppressWarnings("unexportedinapi") protected transient NameImpl impl; /** * Syntax properties for this compound name. diff --git a/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java --- a/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java +++ b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java @@ -215,7 +215,7 @@ * * @deprecated This field is unused. */ - @Deprecated + @Deprecated @SuppressWarnings("unexportedinapi") static protected AWTEventsListener awtListener = new AWTEventsListener(); static private final AWTEventsListener awtListener_private = new AWTEventsListener(); diff --git a/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java --- a/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java +++ b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java @@ -63,6 +63,7 @@ * occurs. By doing things this way, the actual number of listeners * installed on a component instance is drastically reduced. */ + @SuppressWarnings("unexportedinapi") static protected final AccessibilityEventListener accessibilityListener = new AccessibilityEventListener(); diff --git a/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java --- a/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java +++ b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java @@ -71,6 +71,7 @@ * occurs. By doing things this way, the actual number of listeners * installed on a component instance is drastically reduced. */ + @SuppressWarnings("unexportedinapi") static protected final SwingEventListener swingListener = new SwingEventListener(); /** diff --git a/src/jdk.jsobject/share/classes/netscape/javascript/JSObject.java b/src/jdk.jsobject/share/classes/netscape/javascript/JSObject.java --- a/src/jdk.jsobject/share/classes/netscape/javascript/JSObject.java +++ b/src/jdk.jsobject/share/classes/netscape/javascript/JSObject.java @@ -150,6 +150,7 @@ * @throws JSException when an error is reported from the browser or * JavaScript engine or if applet is {@code null} */ + @SuppressWarnings("unexportedinapi") public static JSObject getWindow(Applet applet) throws JSException { return ProviderLoader.callGetWindow(applet); } diff --git a/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContext.java b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContext.java --- a/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContext.java +++ b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContext.java @@ -36,40 +36,6 @@ */ public interface ExtendedGSSContext extends GSSContext { - // The impl is almost identical to GSSContextImpl with only 2 differences: - // 1. It implements the extended interface - // 2. It translates result to data types here in inquireSecContext - static class ExtendedGSSContextImpl extends GSSContextImpl - implements ExtendedGSSContext { - - public ExtendedGSSContextImpl(GSSContextImpl old) { - super(old); - } - - @Override - public Object inquireSecContext(InquireType type) throws GSSException { - SecurityManager security = System.getSecurityManager(); - if (security != null) { - security.checkPermission( - new InquireSecContextPermission(type.toString())); - } - Object output = super.inquireSecContext(type.name()); - if (output != null) { - if (type == InquireType.KRB5_GET_AUTHZ_DATA) { - AuthorizationData ad = (AuthorizationData) output; - AuthorizationDataEntry[] authzData = - new AuthorizationDataEntry[ad.count()]; - for (int i = 0; i < ad.count(); i++) { - authzData[i] = new AuthorizationDataEntry( - ad.item(i).adType, ad.item(i).adData); - } - output = authzData; - } - } - return output; - } - } - /** * Return the mechanism-specific attribute associated with {@code type}. *

diff --git a/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSCredential.java b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSCredential.java --- a/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSCredential.java +++ b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSCredential.java @@ -35,14 +35,6 @@ */ public interface ExtendedGSSCredential extends GSSCredential { - static class ExtendedGSSCredentialImpl extends GSSCredentialImpl - implements ExtendedGSSCredential { - - public ExtendedGSSCredentialImpl(GSSCredentialImpl old) { - super(old); - } - } - /** * Impersonates a principal. In Kerberos, this can be implemented * using the Microsoft S4U2self extension. diff --git a/src/jdk.security.jgss/share/classes/com/sun/security/jgss/Extender.java b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/Extender.java --- a/src/jdk.security.jgss/share/classes/com/sun/security/jgss/Extender.java +++ b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/Extender.java @@ -27,9 +27,11 @@ import org.ietf.jgss.GSSContext; import org.ietf.jgss.GSSCredential; +import org.ietf.jgss.GSSException; import sun.security.jgss.GSSContextImpl; import sun.security.jgss.GSSCredentialImpl; import sun.security.jgss.JgssExtender; +import sun.security.krb5.internal.AuthorizationData; // The com.sun.security.jgss extension to JGSS-API class Extender extends JgssExtender { @@ -39,18 +41,61 @@ } public GSSCredential wrap(GSSCredential cred) { - if (cred instanceof ExtendedGSSCredential.ExtendedGSSCredentialImpl) { + if (cred instanceof ExtendedGSSCredentialImpl) { return cred; } else { - return new ExtendedGSSCredential.ExtendedGSSCredentialImpl((GSSCredentialImpl)cred); + return new ExtendedGSSCredentialImpl((GSSCredentialImpl)cred); } } public GSSContext wrap(GSSContext ctxt) { - if (ctxt instanceof ExtendedGSSContext.ExtendedGSSContextImpl) { + if (ctxt instanceof ExtendedGSSContextImpl) { return ctxt; } else { - return new ExtendedGSSContext.ExtendedGSSContextImpl((GSSContextImpl)ctxt); + return new ExtendedGSSContextImpl((GSSContextImpl)ctxt); } } + + // The impl is almost identical to GSSContextImpl with only 2 differences: + // 1. It implements the extended interface + // 2. It translates result to data types here in inquireSecContext + class ExtendedGSSContextImpl extends GSSContextImpl + implements ExtendedGSSContext { + + public ExtendedGSSContextImpl(GSSContextImpl old) { + super(old); + } + + @Override + public Object inquireSecContext(InquireType type) throws GSSException { + SecurityManager security = System.getSecurityManager(); + if (security != null) { + security.checkPermission( + new InquireSecContextPermission(type.toString())); + } + Object output = super.inquireSecContext(type.name()); + if (output != null) { + if (type == InquireType.KRB5_GET_AUTHZ_DATA) { + AuthorizationData ad = (AuthorizationData) output; + AuthorizationDataEntry[] authzData = + new AuthorizationDataEntry[ad.count()]; + for (int i = 0; i < ad.count(); i++) { + authzData[i] = new AuthorizationDataEntry( + ad.item(i).adType, ad.item(i).adData); + } + output = authzData; + } + } + return output; + } + } + + class ExtendedGSSCredentialImpl extends GSSCredentialImpl + implements ExtendedGSSCredential { + + public ExtendedGSSCredentialImpl(GSSCredentialImpl old) { + super(old); + } + } + }