Skip to content

Commit bb73093

Browse files
committed
feedback from Sean, Phil and Alan
1 parent eb6c566 commit bb73093

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

src/java.base/share/classes/java/lang/SecurityManager.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,6 @@ public void checkMulticast(InetAddress maddr) {
10891089
* @throws NullPointerException if the address argument is
10901090
* {@code null}.
10911091
* @since 1.1
1092-
* @deprecated Use #checkPermission(java.security.Permission) instead
10931092
* @see #checkPermission(java.security.Permission) checkPermission
10941093
*/
10951094
@Deprecated(since="1.4", forRemoval=true)

src/java.base/share/classes/java/security/AccessController.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,8 @@ public static <T> T doPrivileged(PrivilegedAction<T> action,
446446
*/
447447
@CallerSensitive
448448
public static <T> T doPrivileged(PrivilegedAction<T> action,
449-
@SuppressWarnings("removal") AccessControlContext context, Permission... perms) {
449+
@SuppressWarnings("removal") AccessControlContext context,
450+
Permission... perms) {
450451

451452
@SuppressWarnings("removal")
452453
AccessControlContext parent = getContext();
@@ -511,7 +512,8 @@ public static <T> T doPrivileged(PrivilegedAction<T> action,
511512
*/
512513
@CallerSensitive
513514
public static <T> T doPrivilegedWithCombiner(PrivilegedAction<T> action,
514-
@SuppressWarnings("removal") AccessControlContext context, Permission... perms) {
515+
@SuppressWarnings("removal") AccessControlContext context,
516+
Permission... perms) {
515517

516518
@SuppressWarnings("removal")
517519
AccessControlContext parent = getContext();
@@ -874,7 +876,8 @@ private static PrivilegedActionException wrapException(Exception e) {
874876
*/
875877
@CallerSensitive
876878
public static <T> T doPrivileged(PrivilegedExceptionAction<T> action,
877-
@SuppressWarnings("removal") AccessControlContext context, Permission... perms)
879+
@SuppressWarnings("removal") AccessControlContext context,
880+
Permission... perms)
878881
throws PrivilegedActionException
879882
{
880883
@SuppressWarnings("removal")

src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ private static JRSUIConstants.Size getSizeFromString(final String name) {
7373

7474
private static Size getDefaultSize() {
7575
@SuppressWarnings("removal")
76-
final String sizeProperty = AccessController.doPrivileged(new GetPropertyAction(SYSTEM_PROPERTY_KEY));
76+
final String sizeProperty = AccessController.doPrivileged(
77+
new GetPropertyAction(SYSTEM_PROPERTY_KEY));
7778
final JRSUIConstants.Size size = getSizeFromString(sizeProperty);
7879
if (size != null) return size;
7980
return JRSUIConstants.Size.REGULAR;

0 commit comments

Comments
 (0)