Merge master with BETA_JAVA21

org.eclipse.jdt.debug.jdi.tests/pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <artifactId>eclipse.jdt.debug</artifactId>
     <groupId>eclipse.jdt.debug</groupId>
-    <version>4.29.0-SNAPSHOT</version>
+    <version>4.30.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.debug.jdi.tests</artifactId>

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventReader.java

@@ -42,8 +42,8 @@
  */
 
 public class EventReader extends AbstractReader {
-	private EventQueue fEventQueue;
-	private Vector<EventListener> fEventListeners = new Vector<>(); // A Vector of EventListener
+	private final EventQueue fEventQueue;
+	private final Vector<EventListener> fEventListeners = new Vector<>(); // A Vector of EventListener
 
 	/**
 	 * Constructor

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestTest.java

@@ -25,7 +25,7 @@
  */
 public class EventRequestTest extends AbstractJDITest {
 
-	private List<EventRequest> fRequests = new LinkedList<>();
+	private final List<EventRequest> fRequests = new LinkedList<>();
 	/**
 	 * Creates a new test.
 	 */

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventTest.java

@@ -25,7 +25,7 @@
  * Tests for JDI com.sun.jdi.event.Event.
  */
 public class EventTest extends AbstractJDITest {
-	private HashMap<EventRequest, Event> fAllEvents = new HashMap<>();
+	private final HashMap<EventRequest, Event> fAllEvents = new HashMap<>();
 	/**
 	 * Creates a new test.
 	 */

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FileConsoleReader.java

@@ -25,7 +25,7 @@
  * Tests continuous reading from a file and input stream
  */
 public class FileConsoleReader extends AbstractReader {
-	private InputStream fInput;
+	private final InputStream fInput;
 	private FileOutputStream fFileOutputStream;
 	/**
 	 * Creates a new console reader that will read from the given input stream.

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestCase.java

@@ -23,7 +23,7 @@
  * starting and shutting down the VM after each test.
  */
 public class JDITestCase extends TestCase {
-	private AbstractJDITest fTest;
+	private final AbstractJDITest fTest;
 	/**
 	 * Creates a new test for the given JDI test.
 	 * @param test

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestSuite.java

@@ -23,7 +23,7 @@
  * tearDown method once after.
  */
 public class JDITestSuite extends TestSuite {
-	private AbstractJDITest fTest;
+	private final AbstractJDITest fTest;
 	/**
 	 * Creates a new test suite for the given JDI test.
 	 * @param test

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocatableTest.java

@@ -32,8 +32,8 @@
  */
 public class LocatableTest extends AbstractJDITest {
 
-	private List<Mirror> fLocatables = new LinkedList<>();
-	private List<EventRequest> fRequests = new LinkedList<>();
+	private final List<Mirror> fLocatables = new LinkedList<>();
+	private final List<EventRequest> fRequests = new LinkedList<>();
 	/**
 	 * Creates a new test.
 	 */

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/NullConsoleReader.java

@@ -24,7 +24,7 @@
  */
 
 public class NullConsoleReader extends AbstractReader {
-	private InputStream fInput;
+	private final InputStream fInput;
 	/**
 	 * Constructor
 	 * @param name

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ReferenceTypeTest.java

@@ -33,22 +33,22 @@
  */
 public class ReferenceTypeTest extends AbstractJDITest {
 
-	private List<ReferenceType> fTypes = new LinkedList<>();
+	private final List<ReferenceType> fTypes = new LinkedList<>();
 
 	// These must match what is done in localSetUp
-	private boolean[] fSystemClassLoader = { true, true, false, false };
-	private boolean[] fHasMethods = { true, false, true, true };
-	private boolean[] fIsAbstract = { false, false, false, true };
-	private boolean[] fIsFinal = { false, true, false, false };
-	private boolean[] fIsStatic = { false, false, false, false };
-	private String[] fTypeName =
+	private final boolean[] fSystemClassLoader = { true, true, false, false };
+	private final boolean[] fHasMethods = { true, false, true, true };
+	private final boolean[] fIsAbstract = { false, false, false, true };
+	private final boolean[] fIsFinal = { false, true, false, false };
+	private final boolean[] fIsStatic = { false, false, false, false };
+	private final String[] fTypeName =
 		{
 			"java.lang.Object",
 			"java.lang.String[]",
 			"org.eclipse.debug.jdi.tests.program.MainClass",
 			"org.eclipse.debug.jdi.tests.program.Printable" };
-	private int fObjectIndex = 0;
-	private int fMainClassIndex = 2;
+	private final int fObjectIndex = 0;
+	private final int fMainClassIndex = 2;
 
 	/**
 	 * Creates a new test.

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/MainClass.java

@@ -50,9 +50,9 @@ public class MainClass extends Date implements Runnable, Printable {
 	private static boolean[] booleanArray = new boolean[0];
 	private static boolean[][] booleanDoubleArray = new boolean[0][0];
 
-	private String string = "";
-	private String[] stringArray = new String[0];
-	private String[][] stringDoubleArray = new String[0][0];
+	private final String string = "";
+	private final String[] stringArray = new String[0];
+	private final String[][] stringDoubleArray = new String[0][0];
 
 	/**
 	 * An integer value
@@ -98,9 +98,9 @@ public class MainClass extends Date implements Runnable, Printable {
 	 */
 	public boolean fBool = false;
 
-	private char fChar = 'a';
+	private final char fChar = 'a';
 
-	private String fString2 = "Hello";
+	private final String fString2 = "Hello";
 
 	protected final String fString3 = "HEY";
 

org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.debug.tests; singleton:=true
-Bundle-Version: 3.12.100.qualifier
+Bundle-Version: 3.12.200.qualifier
 Bundle-ClassPath: javadebugtests.jar
 Bundle-Activator: org.eclipse.jdt.debug.testplugin.JavaTestPlugin
 Bundle-Vendor: %providerName

org.eclipse.jdt.debug.tests/pom.xml

@@ -14,11 +14,11 @@
   <parent>
     <artifactId>eclipse.jdt.debug</artifactId>
     <groupId>eclipse.jdt.debug</groupId>
-    <version>4.29.0-SNAPSHOT</version>
+    <version>4.30.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.debug.tests</artifactId>
-  <version>3.12.100-SNAPSHOT</version>
+  <version>3.12.200-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <code.ignoredWarnings>${tests.ignoredWarnings}</code.ignoredWarnings>

org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/detailpane/TableDetailPane.java

@@ -67,8 +67,8 @@ public class TableDetailPane implements IDetailPane, IValueDetailListener {
 	 */
 	class DetailJob implements Runnable{
 
-		private IValue fValue;
-		private IValueDetailListener fListener;
+		private final IValue fValue;
+		private final IValueDetailListener fListener;
 
 		public DetailJob(IValue value, IValueDetailListener listener){
 			fValue = value;

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/test/stepping/StepFilterTests.java

@@ -29,8 +29,8 @@
  */
 public class StepFilterTests extends AbstractDebugTest {
 
-	private String fOriginalActiveFilters;
-	private String fOriginalInactiveFilters;
+	private final String fOriginalActiveFilters;
+	private final String fOriginalInactiveFilters;
 
 	/**
 	 * Constructor

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/test/stepping/StepIntoSelectionWithGenerics.java

@@ -31,10 +31,10 @@
  */
 public class StepIntoSelectionWithGenerics extends AbstractDebugTest {
 
-	private String qtypename = "a.b.c.StepIntoSelectionWithGenerics";
-	private String pname = "a.b.c";
-	private String jname = "StepIntoSelectionWithGenerics.java";
-	private String mname = "hello";
+	private final String qtypename = "a.b.c.StepIntoSelectionWithGenerics";
+	private final String pname = "a.b.c";
+	private final String jname = "StepIntoSelectionWithGenerics.java";
+	private final String mname = "hello";
 
 	/**
 	 * Constructor

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/BreakpointFieldLocator.java

@@ -33,7 +33,7 @@
  */
 public class BreakpointFieldLocator extends ASTVisitor {
 
-	private int fPosition;
+	private final int fPosition;
 
 	private String fTypeName;
 

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/BreakpointMethodLocator.java

@@ -36,7 +36,7 @@
  */
 public class BreakpointMethodLocator extends ASTVisitor {
 
-	private int fPosition;
+	private final int fPosition;
 
 	private String fTypeName;
 

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/RunToLineTests.java

@@ -50,7 +50,7 @@ public RunToLineTests(String name) {
 		super(name);
 	}
 
-	private Object fLock = new Object();
+	private final Object fLock = new Object();
 	private IEditorPart fEditor = null;
 
 	class MyListener implements IPerspectiveListener2 {

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/connectors/MockLaunch.java

@@ -28,10 +28,10 @@
 import org.eclipse.debug.core.model.ISourceLocator;
 
 public class MockLaunch implements ILaunch {
-	private ConcurrentLinkedDeque<IProcess> processes = new ConcurrentLinkedDeque<>();
-	private ConcurrentLinkedDeque<IDebugTarget> targets = new ConcurrentLinkedDeque<>();
+	private final ConcurrentLinkedDeque<IProcess> processes = new ConcurrentLinkedDeque<>();
+	private final ConcurrentLinkedDeque<IDebugTarget> targets = new ConcurrentLinkedDeque<>();
 	private ISourceLocator sourceLocator;
-	private Map<String, String> attributes = new HashMap<>();
+	private final Map<String, String> attributes = new HashMap<>();
 
 	@Override
 	public boolean canTerminate() {

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/connectors/MultipleConnectionsTest.java

@@ -42,7 +42,7 @@ public MultipleConnectionsTest(String name) {
 		super(name);
 	}
 
-	private ILaunch launch = new MockLaunch();
+	private final ILaunch launch = new MockLaunch();
 
 	private SocketListenConnector connector;
 

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ArgumentTests.java

@@ -48,7 +48,7 @@
  */
 public class ArgumentTests extends AbstractDebugTest {
 
-    private Object fLock = new Object();
+    private final Object fLock = new Object();
 	protected boolean fUseArgfile = false;
 
 	private class ConsoleArgumentOutputRetriever implements IConsoleLineTrackerExtension {

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/JavaDebugTargetTests.java

@@ -185,7 +185,7 @@ private List<IBreakpoint> getUserBreakpoints(JDIDebugTarget target) {
 
 	static private class JDIDebugTargetProxy {
 
-		private JDIDebugTarget target;
+		private final JDIDebugTarget target;
 
 		public JDIDebugTargetProxy(JDIDebugTarget target) {
 			this.target = target;

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/LaunchConfigurationManagerTests.java

@@ -34,7 +34,7 @@
  */
 public class LaunchConfigurationManagerTests extends AbstractDebugTest {
 
-	private LaunchConfigurationManager fLCM = DebugUIPlugin.getDefault().getLaunchConfigurationManager();
+	private final LaunchConfigurationManager fLCM = DebugUIPlugin.getDefault().getLaunchConfigurationManager();
 
 	public LaunchConfigurationManagerTests(String name) {
 		super(name);

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfConditionalBreakpointsTests.java

@@ -27,7 +27,7 @@
  * Tests performance of conditional breakpoints.
  */
 public class PerfConditionalBreakpointsTests extends AbstractDebugPerformanceTest {
-    private String fTypeName = "PerfLoop";
+    private final String fTypeName = "PerfLoop";
 
     private int fHitCount = 0;
 
@@ -39,9 +39,9 @@ public class PerfConditionalBreakpointsTests extends AbstractDebugPerformanceTes
 
     private boolean fWarmUpComplete = false;
 
-    private int fWarmUpRuns = 2;
+    private final int fWarmUpRuns = 2;
 
-    private int fMeasuredRuns = 10;
+    private final int fMeasuredRuns = 10;
 
     private class BreakpointListener implements IDebugEventSetListener {
         /**

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfSteppingTests.java

@@ -36,8 +36,8 @@ public PerfSteppingTests(String name) {
 	class MyFilter implements IDebugEventFilter {
 
 		private IJavaThread fThread = null;
-		private Object fLock;
-		private DebugEvent[] EMPTY = new DebugEvent[0];
+		private final Object fLock;
+		private final DebugEvent[] EMPTY = new DebugEvent[0];
 
 		/**
 		 * Constructor

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfVariableDetailTests.java

@@ -29,7 +29,7 @@
  */
 public class PerfVariableDetailTests extends AbstractDebugPerformanceTest implements IValueDetailListener {
 
-    private Object fLock = new Object();
+    private final Object fLock = new Object();
 
     /**
      * Constructor

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/Accessor.java

@@ -29,7 +29,7 @@
 public class Accessor {
 
 	/** The class to access. */
-	private Class<?> fClass;
+	private final Class<?> fClass;
 	/** The instance to access. */
 	private Object fInstance;
 

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/InstructionPointerManagerTests.java

@@ -63,14 +63,14 @@
  */
 public class InstructionPointerManagerTests extends AbstractDebugTest {
 
-	private Object fLock = new Object();
+	private final Object fLock = new Object();
 	private Annotation fAddedAnnotation = null;
 	private Annotation fRemovedAnnotation = null;
 
 	private MyPerspectiveListener fPerspectiveListener;
 	private MyAnnotationListener fAnnotationListener;
 	private IPartListener2 fPartListener;
-	private Set<IAnnotationModel> fAnnotationModelsWithListeners = new HashSet<>();
+	private final Set<IAnnotationModel> fAnnotationModelsWithListeners = new HashSet<>();
 
 	private static final String typeThreadStack = "org.eclipse.debug.tests.targets.ThreadStack";
 	private static final String typeClassOne = "org.eclipse.debug.tests.targets.ClassOne";

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/OpenFromClipboardTests.java

@@ -79,7 +79,7 @@ public class OpenFromClipboardTests {
 
 	private IPackageFragmentRoot fSourceFolder;
 
-	private Accessor fAccessor = new Accessor(OpenFromClipboardAction.class);
+	private final Accessor fAccessor = new Accessor(OpenFromClipboardAction.class);
 
 	public static IJavaProject fJProject;
 

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/ViewManagementTests.java

@@ -54,17 +54,17 @@ public static Test suite() {
 	 */
 	public static final String VIEW_ONE = "org.eclipse.jdt.debug.tests.context.view.one";
 
-	private Object fEventLock = new Object();
+	private final Object fEventLock = new Object();
 
 	/**
 	 * List of view ids expecting to open.
 	 */
-	private List<String> fExpectingOpenEvents = new ArrayList<>();
+	private final List<String> fExpectingOpenEvents = new ArrayList<>();
 
 	/**
 	 * List of view ids expecting to close.
 	 */
-	private List<String> fExpectingCloseEvents = new ArrayList<>();
+	private final List<String> fExpectingCloseEvents = new ArrayList<>();
 
 	/**
 	 * Constructor

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/ModelPresentationTests.java

@@ -36,7 +36,7 @@
  */
 public class ModelPresentationTests extends AbstractDebugTest {
 
-	private Map<String, Color> colors = new HashMap<>();
+	private final Map<String, Color> colors = new HashMap<>();
 	/**
 	 * Constructor
 	 */

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIJavaVariable.java

@@ -22,7 +22,7 @@
 
 public class TestIJavaVariable implements IJavaVariable {
 
-	private String name;
+	private final String name;
 	private IValue value;
 
 	public TestIJavaVariable(String name, IValue value) {