From 18e24d0619ffef7c6dbfc419105faba9f7ba1874 Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Wed, 7 Feb 2024 15:50:40 +0000 Subject: [PATCH] 8325109: Sort method modifiers in canonical order Reviewed-by: aivanov, rriggs, darcy, prappo --- .../share/classes/java/lang/ThreadBuilders.java | 2 +- .../share/classes/java/util/FormatItem.java | 2 +- .../classes/java/util/concurrent/ForkJoinTask.java | 2 +- .../internal/classfile/impl/AbstractInstruction.java | 4 ++-- .../internal/classfile/impl/AbstractPoolEntry.java | 12 ++++++------ .../classfile/impl/AbstractPseudoInstruction.java | 2 +- .../jdk/internal/classfile/impl/BoundAttribute.java | 2 +- .../internal/classfile/impl/UnboundAttribute.java | 2 +- .../internal/event/SecurityProviderServiceEvent.java | 2 +- .../jdk/internal/event/VirtualThreadEndEvent.java | 2 +- .../jdk/internal/event/VirtualThreadStartEvent.java | 2 +- .../classes/jdk/internal/math/FloatToDecimal.java | 2 +- .../share/classes/jdk/internal/vm/Continuation.java | 6 +++--- .../classes/jdk/internal/vm/ThreadContainers.java | 2 +- .../share/classes/sun/net/util/IPAddressUtil.java | 4 ++-- .../util/math/intpoly/IntegerPolynomialModBinP.java | 4 ++-- .../sun/java2d/loops/GraphicsPrimitiveMgr.java | 2 +- .../classes/com/sun/jndi/ldap/pool/Connections.java | 4 ++-- .../sun/security/jgss/wrapper/GSSNameElement.java | 2 +- .../java/accessibility/internal/AccessBridge.java | 2 +- .../com/sun/tools/javac/parser/JavaTokenizer.java | 2 +- .../share/classes/sun/security/pkcs11/P11Key.java | 4 ++-- .../sun/security/pkcs11/P11SecretKeyFactory.java | 2 +- .../jdk/incubator/vector/VectorOperators.java | 4 ++-- .../terminal/impl/jna/win/WindowsAnsiWriter.java | 2 +- .../doclets/toolkit/util/PreviewAPIListBuilder.java | 4 ++-- .../com/sun/tools/jdi/SunCommandLineLauncher.java | 2 +- .../classes/jdk/jfr/internal/EventWriterKey.java | 2 +- src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java | 2 +- .../share/classes/jdk/jfr/internal/TypeLibrary.java | 2 +- .../classes/jdk/jfr/snippet-files/Snippets.java | 10 +++++----- .../jpackage/internal/LinuxLaunchersAsServices.java | 2 +- .../classes/jdk/jpackage/internal/Enquoter.java | 4 ++-- .../classes/jdk/jpackage/internal/PackageFile.java | 2 +- .../jdk/jpackage/internal/ShellScriptResource.java | 4 ++-- .../jpackage/internal/UnixLaunchersAsServices.java | 2 +- .../igv/view/actions/ExpandAdjacentAction.java | 6 +++--- .../hotspot/igv/view/actions/ModelAwareAction.java | 2 +- .../com/sun/hotspot/igv/view/widgets/LineWidget.java | 2 +- 39 files changed, 61 insertions(+), 61 deletions(-) diff --git a/src/java.base/share/classes/java/lang/ThreadBuilders.java b/src/java.base/share/classes/java/lang/ThreadBuilders.java index 37ca9b8e922..ca29dc4f535 100644 --- a/src/java.base/share/classes/java/lang/ThreadBuilders.java +++ b/src/java.base/share/classes/java/lang/ThreadBuilders.java @@ -272,7 +272,7 @@ class ThreadBuilders { /** * Base ThreadFactory implementation. */ - private static abstract class BaseThreadFactory implements ThreadFactory { + private abstract static class BaseThreadFactory implements ThreadFactory { private static final VarHandle COUNT; static { try { diff --git a/src/java.base/share/classes/java/util/FormatItem.java b/src/java.base/share/classes/java/util/FormatItem.java index 9ac700ffa4f..adf8ef9ddd3 100644 --- a/src/java.base/share/classes/java/util/FormatItem.java +++ b/src/java.base/share/classes/java/util/FormatItem.java @@ -424,7 +424,7 @@ class FormatItem { } } - static abstract sealed class FormatItemModifier implements FormatConcatItem + abstract static sealed class FormatItemModifier implements FormatConcatItem permits FormatItemFillLeft, FormatItemFillRight { diff --git a/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java b/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java index 8706359cda2..e58af0b0fa5 100644 --- a/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java +++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java @@ -1624,7 +1624,7 @@ public abstract class ForkJoinTask implements Future, Serializable { * been cancelled on entry and might not otherwise be cancelled by * others. */ - static abstract class InterruptibleTask extends ForkJoinTask + abstract static class InterruptibleTask extends ForkJoinTask implements RunnableFuture { transient volatile Thread runner; abstract T compute() throws Exception; diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java index b77dbef8d29..4b0f4f12399 100644 --- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java +++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java @@ -114,7 +114,7 @@ public abstract sealed class AbstractInstruction @Override public abstract void writeTo(DirectCodeBuilder writer); - public static abstract sealed class BoundInstruction extends AbstractInstruction { + public abstract static sealed class BoundInstruction extends AbstractInstruction { final CodeImpl code; final int pos; @@ -760,7 +760,7 @@ public abstract sealed class AbstractInstruction } - public static abstract sealed class UnboundInstruction extends AbstractInstruction { + public abstract static sealed class UnboundInstruction extends AbstractInstruction { UnboundInstruction(Opcode op) { super(op, op.sizeIfFixed()); diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java index 3a1101fd52c..c86a61d64c9 100644 --- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java +++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java @@ -471,7 +471,7 @@ public abstract sealed class AbstractPoolEntry { } } - static abstract sealed class AbstractRefEntry extends AbstractPoolEntry { + abstract static sealed class AbstractRefEntry extends AbstractPoolEntry { protected final T ref1; public AbstractRefEntry(ConstantPool constantPool, int tag, int index, T ref1) { @@ -494,7 +494,7 @@ public abstract sealed class AbstractPoolEntry { } } - static abstract sealed class AbstractRefsEntry + abstract static sealed class AbstractRefsEntry extends AbstractPoolEntry { protected final T ref1; protected final U ref2; @@ -525,7 +525,7 @@ public abstract sealed class AbstractPoolEntry { } } - static abstract sealed class AbstractNamedEntry extends AbstractRefEntry { + abstract static sealed class AbstractNamedEntry extends AbstractRefEntry { public AbstractNamedEntry(ConstantPool constantPool, int tag, int index, Utf8EntryImpl ref1) { super(constantPool, tag, index, ref1); @@ -697,7 +697,7 @@ public abstract sealed class AbstractPoolEntry { } } - public static abstract sealed class AbstractMemberRefEntry + public abstract static sealed class AbstractMemberRefEntry extends AbstractRefsEntry implements MemberRefEntry { @@ -773,7 +773,7 @@ public abstract sealed class AbstractPoolEntry { } } - public static abstract sealed class AbstractDynamicConstantPoolEntry extends AbstractPoolEntry { + public abstract static sealed class AbstractDynamicConstantPoolEntry extends AbstractPoolEntry { private final int bsmIndex; private BootstrapMethodEntryImpl bootstrapMethod; @@ -1043,7 +1043,7 @@ public abstract sealed class AbstractPoolEntry { } - static abstract sealed class PrimitiveEntry + abstract static sealed class PrimitiveEntry extends AbstractPoolEntry { protected final T val; diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPseudoInstruction.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPseudoInstruction.java index c34ca69241d..ffc36037905 100644 --- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPseudoInstruction.java +++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPseudoInstruction.java @@ -154,7 +154,7 @@ public abstract sealed class AbstractPseudoInstruction } - private static abstract sealed class AbstractLocalPseudo extends AbstractPseudoInstruction { + private abstract static sealed class AbstractLocalPseudo extends AbstractPseudoInstruction { protected final int slot; protected final Utf8Entry name; protected final Utf8Entry descriptor; diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java index 0d740b2af24..d572e09040e 100644 --- a/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java +++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java @@ -935,7 +935,7 @@ public abstract sealed class BoundAttribute> } } - public static abstract sealed class BoundCodeAttribute + public abstract static sealed class BoundCodeAttribute extends BoundAttribute implements CodeAttribute permits CodeImpl { diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/UnboundAttribute.java b/src/java.base/share/classes/jdk/internal/classfile/impl/UnboundAttribute.java index d35ae76773c..bdb293493bf 100644 --- a/src/java.base/share/classes/jdk/internal/classfile/impl/UnboundAttribute.java +++ b/src/java.base/share/classes/jdk/internal/classfile/impl/UnboundAttribute.java @@ -897,7 +897,7 @@ public abstract sealed class UnboundAttribute> } } - public static abstract non-sealed class AdHocAttribute> + public abstract static non-sealed class AdHocAttribute> extends UnboundAttribute { public AdHocAttribute(AttributeMapper mapper) { diff --git a/src/java.base/share/classes/jdk/internal/event/SecurityProviderServiceEvent.java b/src/java.base/share/classes/jdk/internal/event/SecurityProviderServiceEvent.java index 2c2c487849b..8dca527ca4c 100644 --- a/src/java.base/share/classes/jdk/internal/event/SecurityProviderServiceEvent.java +++ b/src/java.base/share/classes/jdk/internal/event/SecurityProviderServiceEvent.java @@ -30,7 +30,7 @@ package jdk.internal.event; */ public final class SecurityProviderServiceEvent extends Event { - private final static SecurityProviderServiceEvent EVENT = new SecurityProviderServiceEvent(); + private static final SecurityProviderServiceEvent EVENT = new SecurityProviderServiceEvent(); /** * Returns {@code true} if event is enabled, {@code false} otherwise. diff --git a/src/java.base/share/classes/jdk/internal/event/VirtualThreadEndEvent.java b/src/java.base/share/classes/jdk/internal/event/VirtualThreadEndEvent.java index 84536009e29..6920eb031fe 100644 --- a/src/java.base/share/classes/jdk/internal/event/VirtualThreadEndEvent.java +++ b/src/java.base/share/classes/jdk/internal/event/VirtualThreadEndEvent.java @@ -28,7 +28,7 @@ package jdk.internal.event; * Event recording that a virtual thread has terminated. */ public class VirtualThreadEndEvent extends Event { - private final static VirtualThreadEndEvent EVENT = new VirtualThreadEndEvent(); + private static final VirtualThreadEndEvent EVENT = new VirtualThreadEndEvent(); /** * Returns {@code true} if event is enabled, {@code false} otherwise. diff --git a/src/java.base/share/classes/jdk/internal/event/VirtualThreadStartEvent.java b/src/java.base/share/classes/jdk/internal/event/VirtualThreadStartEvent.java index e5a6f6179dd..5e80e8ac701 100644 --- a/src/java.base/share/classes/jdk/internal/event/VirtualThreadStartEvent.java +++ b/src/java.base/share/classes/jdk/internal/event/VirtualThreadStartEvent.java @@ -28,7 +28,7 @@ package jdk.internal.event; * Event recording that a virtual thread has been started. */ public class VirtualThreadStartEvent extends Event { - private final static VirtualThreadStartEvent EVENT = new VirtualThreadStartEvent(); + private static final VirtualThreadStartEvent EVENT = new VirtualThreadStartEvent(); /** * Returns {@code true} if event is enabled, {@code false} otherwise. diff --git a/src/java.base/share/classes/jdk/internal/math/FloatToDecimal.java b/src/java.base/share/classes/jdk/internal/math/FloatToDecimal.java index 681457e8e23..56382767f75 100644 --- a/src/java.base/share/classes/jdk/internal/math/FloatToDecimal.java +++ b/src/java.base/share/classes/jdk/internal/math/FloatToDecimal.java @@ -35,7 +35,7 @@ import static jdk.internal.math.MathUtils.*; /** * This class exposes a method to render a {@code float} as a string. */ -final public class FloatToDecimal { +public final class FloatToDecimal { /* * For full details about this code see the following references: * diff --git a/src/java.base/share/classes/jdk/internal/vm/Continuation.java b/src/java.base/share/classes/jdk/internal/vm/Continuation.java index f8d09c74647..5c1d41c36d9 100644 --- a/src/java.base/share/classes/jdk/internal/vm/Continuation.java +++ b/src/java.base/share/classes/jdk/internal/vm/Continuation.java @@ -296,10 +296,10 @@ public class Continuation { } @IntrinsicCandidate - private native static int doYield(); + private static native int doYield(); @IntrinsicCandidate - private native static void enterSpecial(Continuation c, boolean isContinue, boolean isVirtualThread); + private static native void enterSpecial(Continuation c, boolean isContinue, boolean isVirtualThread); @Hidden @@ -448,7 +448,7 @@ public class Continuation { return res != 0; } - static private native int isPinned0(ContinuationScope scope); + private static native int isPinned0(ContinuationScope scope); private boolean fence() { U.storeFence(); // needed to prevent certain transformations by the compiler diff --git a/src/java.base/share/classes/jdk/internal/vm/ThreadContainers.java b/src/java.base/share/classes/jdk/internal/vm/ThreadContainers.java index 4a342fe2855..e1672febc3c 100644 --- a/src/java.base/share/classes/jdk/internal/vm/ThreadContainers.java +++ b/src/java.base/share/classes/jdk/internal/vm/ThreadContainers.java @@ -208,7 +208,7 @@ public class ThreadContainers { * Root container that "contains" all platform threads not started in a container. * It may include all virtual threads started directly with the Thread API. */ - private static abstract class RootContainer extends ThreadContainer { + private abstract static class RootContainer extends ThreadContainer { protected RootContainer() { super(true); } diff --git a/src/java.base/share/classes/sun/net/util/IPAddressUtil.java b/src/java.base/share/classes/sun/net/util/IPAddressUtil.java index d6a182fa088..e81b6543393 100644 --- a/src/java.base/share/classes/sun/net/util/IPAddressUtil.java +++ b/src/java.base/share/classes/sun/net/util/IPAddressUtil.java @@ -882,8 +882,8 @@ public class IPAddressUtil { private static final int[] SUPPORTED_RADIXES = new int[]{HEXADECIMAL, OCTAL, DECIMAL}; // BSD parser's return values - private final static long CANT_PARSE_IN_RADIX = -1L; - private final static long TERMINAL_PARSE_ERROR = -2L; + private static final long CANT_PARSE_IN_RADIX = -1L; + private static final long TERMINAL_PARSE_ERROR = -2L; private static final String ALLOW_AMBIGUOUS_IPADDRESS_LITERALS_SP = "jdk.net.allowAmbiguousIPAddressLiterals"; private static final boolean ALLOW_AMBIGUOUS_IPADDRESS_LITERALS_SP_VALUE = Boolean.valueOf( diff --git a/src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomialModBinP.java b/src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomialModBinP.java index a65508e777a..c6e58322d7c 100644 --- a/src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomialModBinP.java +++ b/src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomialModBinP.java @@ -205,7 +205,7 @@ public sealed class IntegerPolynomialModBinP extends IntegerPolynomial { /** * The field of integers modulo the order of the Curve25519 subgroup */ - public final static class Curve25519OrderField extends IntegerPolynomialModBinP { + public static final class Curve25519OrderField extends IntegerPolynomialModBinP { public Curve25519OrderField() { super(26, 10, 252, @@ -216,7 +216,7 @@ public sealed class IntegerPolynomialModBinP extends IntegerPolynomial { /** * The field of integers modulo the order of the Curve448 subgroup */ - public final static class Curve448OrderField extends IntegerPolynomialModBinP { + public static final class Curve448OrderField extends IntegerPolynomialModBinP { public Curve448OrderField() { super(28, 16, 446, diff --git a/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java b/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java index b029a437b35..dea2f3f2be7 100644 --- a/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java +++ b/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java @@ -245,7 +245,7 @@ public final class GraphicsPrimitiveMgr { * A holder for general primitives to avoid circular dependencies * between GraphicsPrimitiveMgr and Blit/etc classes. */ - final static class GeneralPrimitives { + static final class GeneralPrimitives { private static GraphicsPrimitive[] primitives; diff --git a/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java b/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java index 253dfff674c..c356e4a7522 100644 --- a/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java +++ b/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java @@ -70,11 +70,11 @@ final class Connections implements PoolCallback { com.sun.jndi.ldap.LdapPoolManager.trace; private static final int DEFAULT_SIZE = 10; - final private int initSize; + private final int initSize; private final int maxSize; private final int prefSize; private final List conns; - final private PooledConnectionFactory factory; + private final PooledConnectionFactory factory; private boolean closed = false; // Closed for business private Reference ref; // maintains reference to id to prevent premature GC diff --git a/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSNameElement.java b/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSNameElement.java index 11427aa10a1..0a51a5291cb 100644 --- a/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSNameElement.java +++ b/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSNameElement.java @@ -54,7 +54,7 @@ public class GSSNameElement implements GSSNameSpi { final long pName; // Pointer to the gss_name_t structure private String printableName; private Oid printableType; - final private GSSLibStub cStub; + private final GSSLibStub cStub; static final GSSNameElement DEF_ACCEPTOR = new GSSNameElement(); diff --git a/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java b/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java index 4ad2ff3e67e..8488fb526ee 100644 --- a/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java +++ b/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java @@ -7424,7 +7424,7 @@ public final class AccessBridge { * A helper class to handle coordinate conversion between screen and user spaces. * See {@link sun.java2d.SunGraphicsEnvironment} */ - private static abstract class AccessibilityGraphicsEnvironment extends GraphicsEnvironment { + private abstract static class AccessibilityGraphicsEnvironment extends GraphicsEnvironment { /** * Returns the graphics configuration which bounds contain the given point in the user's space. * diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java index 4e0754869cd..6d52a30a18c 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java @@ -62,7 +62,7 @@ public class JavaTokenizer extends UnicodeReader { /** * Sentinel for non-value. */ - private final static int NOT_FOUND = -1; + private static final int NOT_FOUND = -1; /** * The source language setting. Copied from scanner factory. diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java index e987a1733bb..4d8a33c07d4 100644 --- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java +++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java @@ -414,7 +414,7 @@ abstract class P11Key implements Key, Length { } // base class for all PKCS11 private keys - private static abstract class P11PrivateKey extends P11Key implements + private abstract static class P11PrivateKey extends P11Key implements PrivateKey { @Serial private static final long serialVersionUID = -2138581185214187615L; @@ -479,7 +479,7 @@ abstract class P11Key implements Key, Length { } // base class for all PKCS11 public keys - private static abstract class P11PublicKey extends P11Key implements + private abstract static class P11PublicKey extends P11Key implements PublicKey { @Serial private static final long serialVersionUID = 1L; diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java index 91572aec6b2..64a05a5cacf 100644 --- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java +++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java @@ -129,7 +129,7 @@ final class P11SecretKeyFactory extends SecretKeyFactorySpi { } } - static abstract sealed class PBEKeyInfo extends KeyInfo + abstract static sealed class PBEKeyInfo extends KeyInfo permits AESPBEKeyInfo, PBKDF2KeyInfo, P12MacPBEKeyInfo { public static final long INVALID_PRF = -1; public final long kdfMech; diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorOperators.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorOperators.java index ece08e22872..507fe84bfba 100644 --- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorOperators.java +++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorOperators.java @@ -801,7 +801,7 @@ public abstract class VectorOperators { kind, dom, ran); } - private static abstract class OperatorImpl implements Operator { + private abstract static class OperatorImpl implements Operator { private final String symName; private final String opName; private final int opInfo; @@ -1111,7 +1111,7 @@ public abstract class VectorOperators { private static final @Stable ConversionImpl[][][] CACHES = new ConversionImpl[KIND_LIMIT][LINE_LIMIT][LINE_LIMIT]; - private synchronized static void initCaches() { + private static synchronized void initCaches() { for (var f : VectorOperators.class.getFields()) { if (f.getType() != Conversion.class) continue; ConversionImpl conv; diff --git a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/WindowsAnsiWriter.java b/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/WindowsAnsiWriter.java index e3ed6e76bf9..5ae0df1b201 100644 --- a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/WindowsAnsiWriter.java +++ b/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/WindowsAnsiWriter.java @@ -70,7 +70,7 @@ public final class WindowsAnsiWriter extends AnsiWriter { BACKGROUND_WHITE, }; - private final static int MAX_ESCAPE_SEQUENCE_LENGTH = 100; + private static final int MAX_ESCAPE_SEQUENCE_LENGTH = 100; private final Pointer console; diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/PreviewAPIListBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/PreviewAPIListBuilder.java index 2b1556cdebb..65d0a50a4b6 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/PreviewAPIListBuilder.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/PreviewAPIListBuilder.java @@ -41,8 +41,8 @@ import java.util.TreeSet; */ public class PreviewAPIListBuilder extends SummaryAPIListBuilder { - final private Map elementJeps = new HashMap<>(); - final private Map jeps = new HashMap<>(); + private final Map elementJeps = new HashMap<>(); + private final Map jeps = new HashMap<>(); /** * The JEP for a preview feature in this release. diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java index 26393537dc4..41a1972a937 100644 --- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java +++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java @@ -47,7 +47,7 @@ public class SunCommandLineLauncher extends AbstractLauncher { private static final String ARG_QUOTE = "quote"; private static final String ARG_VM_EXEC = "vmexec"; - static private final String ARG_VM_INCLUDE_VTHREADS = "includevirtualthreads"; + private static final String ARG_VM_INCLUDE_VTHREADS = "includevirtualthreads"; TransportService transportService; Transport transport; diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventWriterKey.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventWriterKey.java index 55ac7f6899c..7f9c22f0234 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventWriterKey.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventWriterKey.java @@ -31,7 +31,7 @@ import java.io.InputStream; // without the need to load classes or have an impact on security // related events, like SecureRandom::getAlgorithm("NativePRNGNonBlocking") does public final class EventWriterKey { - private final static long KEY = createKey(); + private static final long KEY = createKey(); private static boolean loaded; private static boolean logged; diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java index bfd6796474e..7fcadcddeb0 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java @@ -50,7 +50,7 @@ public final class JVM { */ public static final Object CHUNK_ROTATION_MONITOR = new ChunkRotationMonitor(); - private volatile static boolean nativeOK; + private static volatile boolean nativeOK; private static native void registerNatives(); diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/TypeLibrary.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/TypeLibrary.java index f461212659d..4663ead6838 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/TypeLibrary.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/TypeLibrary.java @@ -339,7 +339,7 @@ public final class TypeLibrary { } // By convention all events have these fields. - public synchronized static void addImplicitFields(Type type, boolean requestable, boolean hasDuration, boolean hasThread, boolean hasStackTrace, boolean hasCutoff) { + public static synchronized void addImplicitFields(Type type, boolean requestable, boolean hasDuration, boolean hasThread, boolean hasStackTrace, boolean hasCutoff) { if (!implicitFieldTypes) { createAnnotationType(Timespan.class); createAnnotationType(Timestamp.class); diff --git a/src/jdk.jfr/share/classes/jdk/jfr/snippet-files/Snippets.java b/src/jdk.jfr/share/classes/jdk/jfr/snippet-files/Snippets.java index 53db6f76094..37487d7195a 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/snippet-files/Snippets.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/snippet-files/Snippets.java @@ -177,9 +177,9 @@ public class Snippets { @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) public @interface Temperature { - public final static String KELVIN = "KELVIN"; - public final static String CELSIUS = "CELSIUS"; - public final static String FAHRENEHIT = "FAHRENHEIT"; + public static final String KELVIN = "KELVIN"; + public static final String CELSIUS = "CELSIUS"; + public static final String FAHRENEHIT = "FAHRENHEIT"; String value() default CELSIUS; } @@ -191,7 +191,7 @@ public class Snippets { @Category({ "Hardware", "CPU" }) @Period("1 s") @StackTrace(false) - static public class CPUEvent extends Event { + public static class CPUEvent extends Event { @Label("ID") String id; @@ -266,7 +266,7 @@ public class Snippets { @Category("Debugging") @StackTrace(false) @Enabled(false) - static public class StopWatchEvent extends Event { + public static class StopWatchEvent extends Event { } public void update() { diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxLaunchersAsServices.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxLaunchersAsServices.java index 9c5b272b431..1f86ce6fd23 100644 --- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxLaunchersAsServices.java +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxLaunchersAsServices.java @@ -98,7 +98,7 @@ public final class LinuxLaunchersAsServices extends UnixLaunchersAsServices { private final Path unitFilename; } - private final static List REQUIRED_PACKAGES = List.of("systemd", + private static final List REQUIRED_PACKAGES = List.of("systemd", "coreutils" /* /usr/bin/wc */, "grep"); private static final String COMMON_SCRIPTS = "COMMON_SCRIPTS"; diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Enquoter.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Enquoter.java index 11b83df1132..5f016c3f4bf 100644 --- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Enquoter.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Enquoter.java @@ -98,7 +98,7 @@ final class Enquoter { private BiConsumer escaper; private Predicate needQuotes = str -> false; - private final static Predicate QUOTE_IF_WHITESPACES = new Predicate() { + private static final Predicate QUOTE_IF_WHITESPACES = new Predicate() { @Override public boolean test(String t) { return pattern.matcher(t).find(); @@ -106,7 +106,7 @@ final class Enquoter { private final Pattern pattern = Pattern.compile("\\s"); }; - private final static BiConsumer PREPEND_BACKSLASH = (chr, buf) -> { + private static final BiConsumer PREPEND_BACKSLASH = (chr, buf) -> { buf.append('\\'); buf.appendCodePoint(chr); }; diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackageFile.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackageFile.java index 69f0ff86fba..87935a9287c 100644 --- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackageFile.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackageFile.java @@ -62,5 +62,5 @@ public final class PackageFile { private final String packageName; - private final static String FILENAME = ".package"; + private static final String FILENAME = ".package"; } diff --git a/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/ShellScriptResource.java b/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/ShellScriptResource.java index 7f93c92189a..c6303636c66 100644 --- a/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/ShellScriptResource.java +++ b/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/ShellScriptResource.java @@ -71,9 +71,9 @@ final class ShellScriptResource { private Set execPerms = ALL_CAN_EXECUTE; private OverridableResource resource; - private final static Set ALL_CAN_EXECUTE = Set.of( + private static final Set ALL_CAN_EXECUTE = Set.of( PosixFilePermission.OWNER_EXECUTE, PosixFilePermission.GROUP_EXECUTE, PosixFilePermission.OTHERS_EXECUTE); - private final static Set OWNER_CAN_EXECUTE = Set.of( + private static final Set OWNER_CAN_EXECUTE = Set.of( PosixFilePermission.OWNER_EXECUTE); } diff --git a/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/UnixLaunchersAsServices.java b/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/UnixLaunchersAsServices.java index 1e90c8371b1..3d8982584e1 100644 --- a/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/UnixLaunchersAsServices.java +++ b/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/UnixLaunchersAsServices.java @@ -104,7 +104,7 @@ class UnixLaunchersAsServices extends ShellCustomAction { return launchers.isEmpty(); } - static abstract class UnixLauncherAsService extends LauncherAsService { + abstract static class UnixLauncherAsService extends LauncherAsService { UnixLauncherAsService(String name, Map mainParams, OverridableResource resource) { diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExpandAdjacentAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExpandAdjacentAction.java index 0873c95b054..49d58a11edf 100644 --- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExpandAdjacentAction.java +++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExpandAdjacentAction.java @@ -33,7 +33,7 @@ import org.openide.util.HelpCtx; import org.openide.util.actions.CallableSystemAction; -abstract public class ExpandAdjacentAction extends CallableSystemAction { +public abstract class ExpandAdjacentAction extends CallableSystemAction { protected void expandFigures(Function> getAdjacentFigures) { EditorTopComponent editor = EditorTopComponent.getActive(); @@ -47,9 +47,9 @@ abstract public class ExpandAdjacentAction extends CallableSystemAction { } } - abstract public void performAction(); + public abstract void performAction(); - abstract public String getName(); + public abstract String getName(); @Override public HelpCtx getHelpCtx() { diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ModelAwareAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ModelAwareAction.java index 4449f62b8c7..0a09eba5ed0 100644 --- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ModelAwareAction.java +++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ModelAwareAction.java @@ -30,7 +30,7 @@ import org.openide.util.ImageUtilities; import org.openide.util.Lookup; -abstract public class ModelAwareAction extends ContextAction { +public abstract class ModelAwareAction extends ContextAction { public ModelAwareAction() { putValue(Action.SMALL_ICON , ImageUtilities.loadImageIcon(iconResource(), true)); diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/LineWidget.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/LineWidget.java index a6e52eaed6f..61b71453915 100644 --- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/LineWidget.java +++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/LineWidget.java @@ -58,7 +58,7 @@ public class LineWidget extends Widget implements PopupMenuProvider { public final int HOVER_ARROW_SIZE = 8; public final int BOLD_STROKE_WIDTH = 2; public final int HOVER_STROKE_WIDTH = 3; - private final static double ZOOM_FACTOR = 0.1; + private static final double ZOOM_FACTOR = 0.1; private final OutputSlot outputSlot; private final DiagramScene scene; private final List connections;