stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8264333: Use the blessed modifier order in jdk.jshell

Browse Source 
Reviewed-by: iris, shade
This commit is contained in:
Alex Blewitt 2021-03-30 08:15:50 +00:00 committed by Aleksey Shipilev
parent d2a63f259e
commit 8735259f05
3 changed files with 4 additions and 4 deletions
src/jdk.jshell/share/classes/jdk/jshell
Diag.javaMaskCommentsAndModifiers.javaTaskFactory.java

2
src/jdk.jshell/share/classes/jdk/jshell/Diag.java

@ -46,7 +46,7 @@ public abstract class Diag {
/**
* Used to signal that no position is available.
*/
public final static long NOPOS = Diagnostic.NOPOS;
public static final long NOPOS = Diagnostic.NOPOS;
/**
* Indicates whether this diagnostic is an error (as opposed to a warning or

4
src/jdk.jshell/share/classes/jdk/jshell/MaskCommentsAndModifiers.java

@ -36,11 +36,11 @@ import java.util.stream.Stream;
*/
class MaskCommentsAndModifiers {
private final static Set<String> IGNORED_MODIFIERS =
private static final Set<String> IGNORED_MODIFIERS =
Stream.of( "public", "protected", "private", "static" )
.collect( Collectors.toSet() );
private final static Set<String> ALL_MODIFIERS =
private static final Set<String> ALL_MODIFIERS =
Stream.of(
"public", "protected", "private",
"static", "abstract", "final",

2
src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java

@ -103,7 +103,7 @@ class TaskFactory {
private final MemoryFileManager fileManager;
private final JShell state;
private String classpath = System.getProperty("java.class.path");
private final static Version INITIAL_SUPPORTED_VER = Version.parse("9");
private static final Version INITIAL_SUPPORTED_VER = Version.parse("9");
TaskFactory(JShell state) {
this.state = state;