Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8276641: Use blessed modifier order in jshell
Reviewed-by: iris
  • Loading branch information
magicus committed Nov 5, 2021
1 parent 0616d86 commit b933136
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
Expand Up @@ -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;
Expand Down
Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions 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
Expand Down Expand Up @@ -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;

Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
@@ -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
Expand Down Expand Up @@ -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('.', '/')
Expand Down
@@ -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
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down

1 comment on commit b933136

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.