8275385: Change nested classes in jdk.jdi to static nested classes

Reviewed-by: sspitsyn, amenkov, cjplummer
openjdk · Nov 15, 2021 · 7a870418a3e8de3b290ba71cbe4ca7979ec029f9 · 7a87041 · openjdk-notifier · Nov 15, 2021
1 parent db0c8d5
commit 7a870418a3e8de3b290ba71cbe4ca7979ec029f9
Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Commands.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Commands.java
@@ -50,7 +50,7 @@ class Commands {
      */
     protected static final int LIST_LINE_LOOKBEHIND = 4;
 
-    abstract class AsyncExecution {
+    abstract static class AsyncExecution {
         abstract void action();
 
         AsyncExecution() {

diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/ConnectorImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ConnectorImpl.java
@@ -146,7 +146,7 @@ public String toString() {
     }
 
     @SuppressWarnings("serial") // JDK implementation class
-    abstract class ArgumentImpl implements Connector.Argument, Cloneable {
+    abstract static class ArgumentImpl implements Connector.Argument, Cloneable {
         private String name;
         private String label;
         private String description;
@@ -275,7 +275,7 @@ public boolean booleanValue() {
         }
     }
 
-    class IntegerArgumentImpl extends ConnectorImpl.ArgumentImpl
+    static class IntegerArgumentImpl extends ConnectorImpl.ArgumentImpl
                               implements Connector.IntegerArgument {
         private static final long serialVersionUID = 763286081923797770L;
         private final int min;
@@ -376,7 +376,7 @@ public int min() {
         }
     }
 
-    class StringArgumentImpl extends ConnectorImpl.ArgumentImpl
+    static class StringArgumentImpl extends ConnectorImpl.ArgumentImpl
                              implements Connector.StringArgument {
         private static final long serialVersionUID = 7500484902692107464L;
         StringArgumentImpl(String name, String label, String description,
@@ -393,7 +393,7 @@ public boolean isValid(String value) {
         }
     }
 
-    class SelectedArgumentImpl extends ConnectorImpl.ArgumentImpl
+    static class SelectedArgumentImpl extends ConnectorImpl.ArgumentImpl
                               implements Connector.SelectedArgument {
         private static final long serialVersionUID = -5689584530908382517L;
         @SuppressWarnings("serial") // Type of field is not Serializable

diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/SDE.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/SDE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -39,7 +39,7 @@ class SDE {
     /* for C capatibility */
     static final String NullString = null;
 
-    private class FileTableRecord {
+    private static class FileTableRecord {
         int fileId;
         String sourceName;
         String sourcePath; // do not read - use accessor
@@ -72,7 +72,7 @@ String getSourcePath(ReferenceTypeImpl refType) {
         }
     }
 
-    private class LineTableRecord {
+    private static class LineTableRecord {
         int jplsStart;
         int jplsEnd;
         int jplsLineInc;
@@ -82,7 +82,7 @@ private class LineTableRecord {
         int fileId;
     }
 
-    private class StratumTableRecord {
+    private static class StratumTableRecord {
         String id;
         int fileIndex;
         int lineIndex;