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

8276348: Use blessed modifier order in java.base

Browse source 
Reviewed-by: dfuchs, darcy, iris, rriggs, martin
This commit is contained in:
Pavel Rappo 2021-11-03 10:07:48 +00:00
parent 465d350d0b
commit 615063364a
21 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/share/classes/java/io/ObjectInputFilter.java
View file

@ -561,7 +561,7 @@ public interface ObjectInputFilter {
/**
* Lock object for filter and filter factory.
*/
private final static Object serialFilterLock = new Object();
private static final Object serialFilterLock = new Object();
/**
* The property name for the filter.
@ -906,7 +906,7 @@ public interface ObjectInputFilter {
* used for all ObjectInputStreams that do not set their own filters.
*
*/
final static class Global implements ObjectInputFilter {
static final class Global implements ObjectInputFilter {
/**
* The pattern used to create the filter.
*/

2
src/java.base/share/classes/java/io/ObjectStreamClass.java
View file

@ -2515,7 +2515,7 @@ public class ObjectStreamClass implements Serializable {
}
// a key composed of ObjectStreamField[] names and types
static abstract class Key {
abstract static class Key {
abstract int length();
abstract String fieldName(int i);
abstract Class<?> fieldType(int i);

2
src/java.base/share/classes/java/lang/Object.java
View file

@ -278,7 +278,7 @@ public class Object {
* <li>By executing the body of a {@code synchronized} statement
* that synchronizes on the object.
* <li>For objects of type {@code Class,} by executing a
* synchronized static method of that class.
* static synchronized method of that class.
* </ul>
* <p>
* Only one thread at a time can own an object's monitor.

2
src/java.base/share/classes/java/lang/Process.java
View file

@ -845,7 +845,7 @@ public abstract class Process {
* A nested class to delay looking up the Charset for the native encoding.
*/
private static class CharsetHolder {
private final static Charset nativeCharset;
private static final Charset nativeCharset;
static {
Charset cs;
try {

6
src/java.base/share/classes/java/lang/StackStreamFactory.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 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
@ -118,7 +118,7 @@ final class StackStreamFactory {
* For example, StackFrameInfo for StackWalker::walk or
* Class<?> for StackWalker::getCallerClass
*/
static abstract class AbstractStackWalker<R, T> {
abstract static class AbstractStackWalker<R, T> {
protected final StackWalker walker;
protected final Thread thread;
protected final int maxDepth;
@ -783,7 +783,7 @@ final class StackStreamFactory {
*
* Each specialized AbstractStackWalker subclass may subclass the FrameBuffer.
*/
static abstract class FrameBuffer<F> {
abstract static class FrameBuffer<F> {
static final int START_POS = 2; // 0th and 1st elements are reserved
// buffers for VM to fill stack frame info

4
src/java.base/share/classes/java/lang/System.java
View file

@ -331,7 +331,7 @@ public final class System {
private static class CallersHolder {
// Remember callers of setSecurityManager() here so that warning
// is only printed once for each different caller
final static Map<Class<?>, Boolean> callers
static final Map<Class<?>, Boolean> callers
= Collections.synchronizedMap(new WeakHashMap<>());
}
@ -1595,7 +1595,7 @@ public final class System {
*
* @since 9
*/
public static abstract class LoggerFinder {
public abstract static class LoggerFinder {
/**
* The {@code RuntimePermission("loggerFinder")} is
* necessary to subclass and instantiate the {@code LoggerFinder} class,

4
src/java.base/share/classes/java/lang/WeakPairMap.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 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
@ -340,7 +340,7 @@ final class WeakPairMap<K1, K2, V> {
/**
* Common abstract supertype of a pair of WeakReference peers.
*/
private static abstract class WeakRefPeer<K> extends WeakReference<K> {
private abstract static class WeakRefPeer<K> extends WeakReference<K> {
WeakRefPeer(K k, ReferenceQueue<Object> queue) {
super(Objects.requireNonNull(k), queue);

4
src/java.base/share/classes/java/lang/invoke/AbstractConstantGroup.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 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
@ -244,7 +244,7 @@ abstract class AbstractConstantGroup implements ConstantGroup {
}
}
static abstract
abstract static
class WithCache extends AbstractConstantGroup {
@Stable final Object[] cache;

6
src/java.base/share/classes/java/lang/invoke/CallSite.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 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
@ -84,8 +84,8 @@ private static CallSite bootstrapDynamic(MethodHandles.Lookup caller, String nam
* @author John Rose, JSR 292 EG
* @since 1.7
*/
abstract
public class CallSite {
public
abstract class CallSite {
// The actual payload of this call site.
// Can be modified using {@link MethodHandleNatives#setCallSiteTargetNormal} or {@link MethodHandleNatives#setCallSiteTargetVolatile}.

2
src/java.base/share/classes/java/net/InetAddress.java
View file

@ -215,7 +215,7 @@ public class InetAddress implements java.io.Serializable {
@Native static final int IPv6 = 2;
/* Specify address family preference */
static transient final int preferIPv6Address;
static final transient int preferIPv6Address;
static class InetAddressHolder {
/**

2
src/java.base/share/classes/java/security/Provider.java
View file

@ -820,7 +820,7 @@ public abstract class Provider extends Properties {
// legacy properties changed since last call to any services method?
private transient boolean legacyChanged;
// serviceMap changed since last call to getServices()
private volatile transient boolean servicesChanged;
private transient volatile boolean servicesChanged;
// Map<String,String> used to keep track of legacy registration
private transient Map<String,String> legacyStrings;

8
src/java.base/share/classes/java/util/ImmutableCollections.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 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
@ -142,7 +142,7 @@ class ImmutableCollections {
static UnsupportedOperationException uoe() { return new UnsupportedOperationException(); }
@jdk.internal.ValueBased
static abstract class AbstractImmutableCollection<E> extends AbstractCollection<E> {
abstract static class AbstractImmutableCollection<E> extends AbstractCollection<E> {
// all mutating methods throw UnsupportedOperationException
@Override public boolean add(E e) { throw uoe(); }
@Override public boolean addAll(Collection<? extends E> c) { throw uoe(); }
@ -249,7 +249,7 @@ class ImmutableCollections {
// ---------- List Implementations ----------
@jdk.internal.ValueBased
static abstract class AbstractImmutableList<E> extends AbstractImmutableCollection<E>
abstract static class AbstractImmutableList<E> extends AbstractImmutableCollection<E>
implements List<E>, RandomAccess {
// all mutating methods throw UnsupportedOperationException
@ -742,7 +742,7 @@ class ImmutableCollections {
// ---------- Set Implementations ----------
@jdk.internal.ValueBased
static abstract class AbstractImmutableSet<E> extends AbstractImmutableCollection<E>
abstract static class AbstractImmutableSet<E> extends AbstractImmutableCollection<E>
implements Set<E> {
@Override