archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8263190: Update java.io, java.math, and java.text to use instanceof pattern variable

Browse source 
Reviewed-by: lancea, bpb, darcy, naoto, iris, dfuchs, smarks, redestad
This commit is contained in:
Patrick Concannon 2021-03-09 11:09:06 +00:00
parent 4f0a12ec87
commit 0f2402d0a2
15 changed files with 32 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/java.base/share/classes/java/io/FilePermission.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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
@ -566,11 +566,9 @@ public final class FilePermission extends Permission implements Serializable {
*/
@Override
public boolean implies(Permission p) {
if (!(p instanceof FilePermission))
if (!(p instanceof FilePermission that))
return false;
FilePermission that = (FilePermission) p;
// we get the effective mask. i.e., the "and" of this and that.
// They must be equal to that.mask for implies to return true.
@ -791,11 +789,9 @@ public final class FilePermission extends Permission implements Serializable {
if (obj == this)
return true;
if (! (obj instanceof FilePermission))
if (! (obj instanceof FilePermission that))
return false;
FilePermission that = (FilePermission) obj;
if (this.invalid || that.invalid) {
return false;
}
@ -1150,15 +1146,13 @@ final class FilePermissionCollection extends PermissionCollection
*/
@Override
public void add(Permission permission) {
if (! (permission instanceof FilePermission))
if (! (permission instanceof FilePermission fp))
throw new IllegalArgumentException("invalid permission: "+
permission);
if (isReadOnly())
throw new SecurityException(
"attempt to add a Permission to a readonly PermissionCollection");
FilePermission fp = (FilePermission)permission;
// Add permission to map if it is absent, or replace with new
// permission if applicable.
perms.merge(fp.getName(), fp,
@ -1195,11 +1189,9 @@ final class FilePermissionCollection extends PermissionCollection
*/
@Override
public boolean implies(Permission permission) {
if (! (permission instanceof FilePermission))
if (! (permission instanceof FilePermission fperm))
return false;
FilePermission fperm = (FilePermission) permission;
int desired = fperm.getMask();
int effective = 0;
int needed = desired;