8276641: Use blessed modifier order in jshell

magicus · magicus · commit b9331360f50a · 2021-11-05T12:06:39.000Z
Reviewed-by: iris
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AnsiWriter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AnsiWriter.java
@@ -45,7 +45,7 @@ public AnsiWriter(Writer out) {
         super(out);
     }
 
-    private final static int MAX_ESCAPE_SEQUENCE_LENGTH = 100;
+    private static final int MAX_ESCAPE_SEQUENCE_LENGTH = 100;
     private final char[] buffer = new char[MAX_ESCAPE_SEQUENCE_LENGTH];
     private int pos = 0;
     private int startOfValue;
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
@@ -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.jshell/share/classes/jdk/jshell/Key.java b/src/jdk.jshell/share/classes/jdk/jshell/Key.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 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
@@ -76,7 +76,7 @@ abstract class Key {
      * They are keyed off at least the name.  They may be Modified/Replaced
      * with new input.
      */
-    static abstract class PersistentKey extends Key {
+    abstract static class PersistentKey extends Key {
 
         private final String name;
 
@@ -95,7 +95,7 @@ static abstract class PersistentKey extends Key {
     /**
      * Grouping for snippets which reference declarations
      */
-    static abstract class DeclarationKey extends PersistentKey {
+    abstract static class DeclarationKey extends PersistentKey {
 
         DeclarationKey(JShell state, String name) {
             super(state, name);
@@ -201,7 +201,7 @@ public String toString() { return "ImportKey(" + name() + "," +
      * exactly same entry is made again. The referenced snippets are thus
      * unmodifiable.
      */
-    static abstract class UniqueKey extends Key {
+    abstract static class UniqueKey extends Key {
 
         UniqueKey(JShell state) {
             super(state);
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/MemoryFileManager.java b/src/jdk.jshell/share/classes/jdk/jshell/MemoryFileManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -73,7 +73,7 @@ Iterable<? extends Path> getLocationAsPaths(Location loc) {
         return this.stdFileManager.getLocationAsPaths(loc);
     }
 
-    static abstract class MemoryJavaFileObject extends SimpleJavaFileObject {
+    abstract static class MemoryJavaFileObject extends SimpleJavaFileObject {
 
         public MemoryJavaFileObject(String name, JavaFileObject.Kind kind) {
             super(URI.create("string:///" + name.replace('.', '/')
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/spi/ExecutionControl.java b/src/jdk.jshell/share/classes/jdk/jshell/spi/ExecutionControl.java
@@ -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
@@ -337,7 +337,7 @@ public String name() {
     /**
      * The abstract base of all {@code ExecutionControl} exceptions.
      */
-    public static abstract class ExecutionControlException extends Exception {
+    public abstract static class ExecutionControlException extends Exception {
 
         private static final long serialVersionUID = 1L;
 
@@ -410,7 +410,7 @@ public boolean[] installed() {
     /**
      * The abstract base of of exceptions specific to running user code.
      */
-    public static abstract class RunException extends ExecutionControlException {
+    public abstract static class RunException extends ExecutionControlException {
 
         private static final long serialVersionUID = 1L;
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public AnsiWriter(Writer out) {`
`45`	`45`	`super(out);`
`46`	`46`	`}`
`47`	`47`
`48`		`- private final static int MAX_ESCAPE_SEQUENCE_LENGTH = 100;`
	`48`	`+ private static final int MAX_ESCAPE_SEQUENCE_LENGTH = 100;`
`49`	`49`	`private final char[] buffer = new char[MAX_ESCAPE_SEQUENCE_LENGTH];`
`50`	`50`	`private int pos = 0;`
`51`	`51`	`private int startOfValue;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -73,7 +73,7 @@ Iterable<? extends Path> getLocationAsPaths(Location loc) {`
`73`	`73`	`return this.stdFileManager.getLocationAsPaths(loc);`
`74`	`74`	`}`
`75`	`75`
`76`		`- static abstract class MemoryJavaFileObject extends SimpleJavaFileObject {`
	`76`	`+ abstract static class MemoryJavaFileObject extends SimpleJavaFileObject {`
`77`	`77`
`78`	`78`	`public MemoryJavaFileObject(String name, JavaFileObject.Kind kind) {`
`79`	`79`	`super(URI.create("string:///" + name.replace('.', '/')`