From a6c1b81b597890fedfddb31762c2280c7562ec08 Mon Sep 17 00:00:00 2001 From: Gayan Perera Date: Mon, 4 Sep 2023 07:51:13 +0200 Subject: [PATCH 1/6] Improve lambda type check by name for java21. Fix #300 (#302) --- .../eclipse/jdt/internal/debug/core/model/LambdaUtils.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/LambdaUtils.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/LambdaUtils.java index b85aa5139e..0337e239d2 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/LambdaUtils.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/LambdaUtils.java @@ -18,6 +18,7 @@ import java.util.Collections; import java.util.List; import java.util.Objects; +import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -41,6 +42,7 @@ public class LambdaUtils { private static final String LAMBDA_METHOD_PREFIX = "lambda$"; //$NON-NLS-1$ + private static final Pattern LAMBDA_TYPE_PATTERN = Pattern.compile(".*\\$\\$Lambda[\\$,\\.].*"); //$NON-NLS-1$ /** * Inspects the top stack frame of the context; if that frame is a lambda frame, looks for a variable with the specified name in that frame and @@ -205,7 +207,8 @@ public static boolean isLambdaFrame(IJavaStackFrame frame) throws DebugException * @since 3.15 */ public static boolean isLambdaField(IVariable variable) throws DebugException { - return (variable instanceof IJavaFieldVariable) && ((IJavaFieldVariable) variable).getDeclaringType().getName().contains("$Lambda$"); //$NON-NLS-1$ + return (variable instanceof IJavaFieldVariable) && + LAMBDA_TYPE_PATTERN.matcher(((IJavaFieldVariable) variable).getDeclaringType().getName()).matches(); } /** From a6819c3a8b19b610d1141c768b743a78aa93b4b3 Mon Sep 17 00:00:00 2001 From: Sarika Sinha Date: Mon, 4 Sep 2023 17:12:45 +0530 Subject: [PATCH 2/6] Revert "Improve lambda type check by name for java21. Fix #300 (#302)" (#303) This reverts commit a6c1b81b597890fedfddb31762c2280c7562ec08. --- .../eclipse/jdt/internal/debug/core/model/LambdaUtils.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/LambdaUtils.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/LambdaUtils.java index 0337e239d2..b85aa5139e 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/LambdaUtils.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/LambdaUtils.java @@ -18,7 +18,6 @@ import java.util.Collections; import java.util.List; import java.util.Objects; -import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -42,7 +41,6 @@ public class LambdaUtils { private static final String LAMBDA_METHOD_PREFIX = "lambda$"; //$NON-NLS-1$ - private static final Pattern LAMBDA_TYPE_PATTERN = Pattern.compile(".*\\$\\$Lambda[\\$,\\.].*"); //$NON-NLS-1$ /** * Inspects the top stack frame of the context; if that frame is a lambda frame, looks for a variable with the specified name in that frame and @@ -207,8 +205,7 @@ public static boolean isLambdaFrame(IJavaStackFrame frame) throws DebugException * @since 3.15 */ public static boolean isLambdaField(IVariable variable) throws DebugException { - return (variable instanceof IJavaFieldVariable) && - LAMBDA_TYPE_PATTERN.matcher(((IJavaFieldVariable) variable).getDeclaringType().getName()).matches(); + return (variable instanceof IJavaFieldVariable) && ((IJavaFieldVariable) variable).getDeclaringType().getName().contains("$Lambda$"); //$NON-NLS-1$ } /** From 60024cf70361fe853c584bd29b8a270c6f388cba Mon Sep 17 00:00:00 2001 From: Rahul Mohanan Date: Mon, 4 Sep 2023 17:50:30 +0530 Subject: [PATCH 3/6] POM and product version changes for 4.30 release Tracked in https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1289 --- org.eclipse.jdt.debug.jdi.tests/pom.xml | 2 +- org.eclipse.jdt.debug.tests/pom.xml | 2 +- org.eclipse.jdt.debug.ui/pom.xml | 2 +- org.eclipse.jdt.debug/pom.xml | 2 +- org.eclipse.jdt.launching.macosx/pom.xml | 2 +- org.eclipse.jdt.launching.ui.macosx/pom.xml | 2 +- org.eclipse.jdt.launching/pom.xml | 2 +- pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/org.eclipse.jdt.debug.jdi.tests/pom.xml b/org.eclipse.jdt.debug.jdi.tests/pom.xml index f263f98175..c1a138542e 100644 --- a/org.eclipse.jdt.debug.jdi.tests/pom.xml +++ b/org.eclipse.jdt.debug.jdi.tests/pom.xml @@ -14,7 +14,7 @@ eclipse.jdt.debug eclipse.jdt.debug - 4.29.0-SNAPSHOT + 4.30.0-SNAPSHOT org.eclipse.jdt org.eclipse.jdt.debug.jdi.tests diff --git a/org.eclipse.jdt.debug.tests/pom.xml b/org.eclipse.jdt.debug.tests/pom.xml index 106cab7f0f..9991776d59 100644 --- a/org.eclipse.jdt.debug.tests/pom.xml +++ b/org.eclipse.jdt.debug.tests/pom.xml @@ -14,7 +14,7 @@ eclipse.jdt.debug eclipse.jdt.debug - 4.29.0-SNAPSHOT + 4.30.0-SNAPSHOT org.eclipse.jdt org.eclipse.jdt.debug.tests diff --git a/org.eclipse.jdt.debug.ui/pom.xml b/org.eclipse.jdt.debug.ui/pom.xml index fa85477a6d..f04d9df531 100644 --- a/org.eclipse.jdt.debug.ui/pom.xml +++ b/org.eclipse.jdt.debug.ui/pom.xml @@ -14,7 +14,7 @@ eclipse.jdt.debug eclipse.jdt.debug - 4.29.0-SNAPSHOT + 4.30.0-SNAPSHOT org.eclipse.jdt org.eclipse.jdt.debug.ui diff --git a/org.eclipse.jdt.debug/pom.xml b/org.eclipse.jdt.debug/pom.xml index dc0cd6769b..a632c16819 100644 --- a/org.eclipse.jdt.debug/pom.xml +++ b/org.eclipse.jdt.debug/pom.xml @@ -14,7 +14,7 @@ eclipse.jdt.debug eclipse.jdt.debug - 4.29.0-SNAPSHOT + 4.30.0-SNAPSHOT org.eclipse.jdt org.eclipse.jdt.debug diff --git a/org.eclipse.jdt.launching.macosx/pom.xml b/org.eclipse.jdt.launching.macosx/pom.xml index 1d399fe9b4..76cd225d89 100644 --- a/org.eclipse.jdt.launching.macosx/pom.xml +++ b/org.eclipse.jdt.launching.macosx/pom.xml @@ -14,7 +14,7 @@ eclipse.jdt.debug eclipse.jdt.debug - 4.29.0-SNAPSHOT + 4.30.0-SNAPSHOT org.eclipse.jdt org.eclipse.jdt.launching.macosx diff --git a/org.eclipse.jdt.launching.ui.macosx/pom.xml b/org.eclipse.jdt.launching.ui.macosx/pom.xml index ae5803825a..a4d635be68 100644 --- a/org.eclipse.jdt.launching.ui.macosx/pom.xml +++ b/org.eclipse.jdt.launching.ui.macosx/pom.xml @@ -14,7 +14,7 @@ eclipse.jdt.debug eclipse.jdt.debug - 4.29.0-SNAPSHOT + 4.30.0-SNAPSHOT org.eclipse.jdt org.eclipse.jdt.launching.ui.macosx diff --git a/org.eclipse.jdt.launching/pom.xml b/org.eclipse.jdt.launching/pom.xml index 240225f760..1573ca846b 100644 --- a/org.eclipse.jdt.launching/pom.xml +++ b/org.eclipse.jdt.launching/pom.xml @@ -14,7 +14,7 @@ eclipse.jdt.debug eclipse.jdt.debug - 4.29.0-SNAPSHOT + 4.30.0-SNAPSHOT org.eclipse.jdt org.eclipse.jdt.launching diff --git a/pom.xml b/pom.xml index 530831884b..080fde95f3 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ org.eclipse eclipse-platform-parent - 4.29.0-SNAPSHOT + 4.30.0-SNAPSHOT ../eclipse-platform-parent From 66e4636f7f6755a9714472a706e5c53b479c9765 Mon Sep 17 00:00:00 2001 From: Deepika Udayagiri Date: Thu, 7 Sep 2023 17:56:21 +0530 Subject: [PATCH 4/6] Version bumps for 4.30 stream Tracked by https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1319 --- org.eclipse.jdt.debug/META-INF/MANIFEST.MF | 2 +- org.eclipse.jdt.debug/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jdt.debug/META-INF/MANIFEST.MF b/org.eclipse.jdt.debug/META-INF/MANIFEST.MF index 0764415c5d..f42eb8b380 100644 --- a/org.eclipse.jdt.debug/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.debug/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.debug; singleton:=true -Bundle-Version: 3.21.100.qualifier +Bundle-Version: 3.21.200.qualifier Bundle-ClassPath: jdimodel.jar Bundle-Activator: org.eclipse.jdt.internal.debug.core.JDIDebugPlugin Bundle-Vendor: %providerName diff --git a/org.eclipse.jdt.debug/pom.xml b/org.eclipse.jdt.debug/pom.xml index a632c16819..8042bb83a1 100644 --- a/org.eclipse.jdt.debug/pom.xml +++ b/org.eclipse.jdt.debug/pom.xml @@ -18,6 +18,6 @@ org.eclipse.jdt org.eclipse.jdt.debug - 3.21.100-SNAPSHOT + 3.21.200-SNAPSHOT eclipse-plugin From 4328b8fa60e23b2d1d2a7023c144e95ddef464c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= Date: Mon, 11 Sep 2023 17:00:35 +0200 Subject: [PATCH 5/6] Clean Up: Add final modifier to private fields --- .../eclipse/debug/jdi/tests/EventReader.java | 4 +-- .../debug/jdi/tests/EventRequestTest.java | 2 +- .../eclipse/debug/jdi/tests/EventTest.java | 2 +- .../debug/jdi/tests/FileConsoleReader.java | 2 +- .../eclipse/debug/jdi/tests/JDITestCase.java | 2 +- .../eclipse/debug/jdi/tests/JDITestSuite.java | 2 +- .../debug/jdi/tests/LocatableTest.java | 4 +-- .../debug/jdi/tests/NullConsoleReader.java | 2 +- .../debug/jdi/tests/ReferenceTypeTest.java | 18 +++++----- .../debug/jdi/tests/program/MainClass.java | 10 +++--- .../detailpane/TableDetailPane.java | 4 +-- .../debug/test/stepping/StepFilterTests.java | 4 +-- .../StepIntoSelectionWithGenerics.java | 8 ++--- .../breakpoints/BreakpointFieldLocator.java | 2 +- .../breakpoints/BreakpointMethodLocator.java | 2 +- .../tests/breakpoints/RunToLineTests.java | 2 +- .../debug/tests/connectors/MockLaunch.java | 6 ++-- .../connectors/MultipleConnectionsTest.java | 2 +- .../jdt/debug/tests/core/ArgumentTests.java | 2 +- .../tests/core/JavaDebugTargetTests.java | 2 +- .../LaunchConfigurationManagerTests.java | 2 +- .../PerfConditionalBreakpointsTests.java | 6 ++-- .../tests/performance/PerfSteppingTests.java | 4 +-- .../performance/PerfVariableDetailTests.java | 2 +- .../eclipse/jdt/debug/tests/ui/Accessor.java | 2 +- .../ui/InstructionPointerManagerTests.java | 4 +-- .../tests/ui/OpenFromClipboardTests.java | 2 +- .../debug/tests/ui/ViewManagementTests.java | 6 ++-- .../presentation/ModelPresentationTests.java | 2 +- .../ui/presentation/TestIJavaVariable.java | 2 +- .../ui/presentation/TestIWatchExpression.java | 4 +-- .../TestIntegerAccessUnboxing15.java | 2 +- .../jdt/debug/ui/JavaSourceLookupDialog.java | 4 +-- .../jdt/debug/ui/JavaUISourceLocator.java | 2 +- .../AppletParametersTab.java | 2 +- .../launchConfigurations/JavaConnectTab.java | 4 +-- .../ui/launchConfigurations/JavaJRETab.java | 2 +- .../core/refactoring/BreakpointChange.java | 16 ++++----- .../ClassPrepareBreakpointChange.java | 2 +- .../ClassPrepareBreakpointTypeChange.java | 2 +- .../ExceptionBreakpointChange.java | 2 +- .../ExceptionBreakpointTypeChange.java | 2 +- ...nchConfigurationProjectMainTypeChange.java | 8 ++--- .../refactoring/LineBreakpointChange.java | 2 +- .../refactoring/LineBreakpointTypeChange.java | 2 +- .../refactoring/MethodBreakpointChange.java | 4 +-- .../MethodBreakpointMethodChange.java | 2 +- .../MethodBreakpointTypeChange.java | 2 +- .../core/refactoring/WatchpointChange.java | 4 +-- .../refactoring/WatchpointFieldChange.java | 2 +- .../refactoring/WatchpointTypeChange.java | 2 +- .../WatchpointTypeRenameChange.java | 4 +-- .../debug/ui/DetailFormatterDialog.java | 6 ++-- .../debug/ui/ImageDescriptorRegistry.java | 4 +-- .../debug/ui/JDIElementImageDescriptor.java | 4 +-- .../jdt/internal/debug/ui/JavaDebugHover.java | 2 +- .../debug/ui/JavaDebugOptionsManager.java | 4 +-- .../debug/ui/JavaDetailFormattersManager.java | 16 ++++----- .../JavaDetailFormattersPreferencePage.java | 6 ++-- .../debug/ui/JavaHotCodeReplaceListener.java | 2 +- .../JavaLogicalStructuresPreferencePage.java | 2 +- .../ui/JavaPrimitivesPreferencePage.java | 2 +- ...SourceLocationWorkbenchAdapterFactory.java | 2 +- .../internal/debug/ui/StorageEditorInput.java | 2 +- .../debug/ui/actions/AddAdvancedAction.java | 2 +- .../BreakpointLocationVerifierJob.java | 12 +++---- .../ui/actions/ControlAccessibleListener.java | 2 +- .../ui/actions/EditClasspathEntryAction.java | 2 +- .../ui/actions/InstanceFiltersAction.java | 6 ++-- .../actions/OverrideDependenciesAction.java | 2 +- .../ui/actions/ProjectSelectionDialog.java | 2 +- .../actions/RestoreDefaultEntriesAction.java | 2 +- .../ui/actions/StepIntoSelectionHandler.java | 4 +-- .../debug/ui/actions/ViewFilterAction.java | 2 +- .../ui/breakpoints/AbstractDetailPane.java | 10 +++--- .../AbstractJavaBreakpointEditor.java | 2 +- .../JavaBreakpointTypeAdapterFactory.java | 4 +-- .../debug/ui/classpath/ClasspathGroup.java | 2 +- .../ui/classpath/ClasspathLabelProvider.java | 2 +- .../DefaultClasspathEntryDialog.java | 2 +- .../ui/classpath/RuntimeClasspathViewer.java | 4 +-- .../ui/console/AutoFormatSettingAction.java | 4 +-- .../ui/console/JavaStackTraceConsole.java | 4 +-- .../console/JavaStackTraceConsoleViewer.java | 2 +- .../ui/console/JavaStackTraceHyperlink.java | 2 +- .../ui/contentassist/DynamicTypeContext.java | 2 +- .../JavaDebugContentAssistProcessor.java | 4 +-- .../debug/ui/contentassist/TypeContext.java | 4 +-- .../ui/display/JavaInspectExpression.java | 4 +-- .../jdt/internal/debug/ui/jres/EEVMPage.java | 2 +- .../ExecutionEnvironmentsPreferencePage.java | 2 +- .../debug/ui/jres/InstalledJREsBlock.java | 4 +-- .../debug/ui/jres/JREsComboBlock.java | 8 ++--- .../ui/jres/JREsEnvironmentLabelProvider.java | 2 +- .../internal/debug/ui/jres/JREsUpdater.java | 2 +- .../debug/ui/jres/LibraryContentProvider.java | 6 ++-- .../debug/ui/jres/LibraryStandin.java | 2 +- .../debug/ui/jres/StandardVMPage.java | 2 +- .../debug/ui/jres/VMDetailsDialog.java | 2 +- .../debug/ui/jres/VMInstallWizard.java | 4 +-- .../debug/ui/jres/VMLibraryBlock.java | 2 +- .../internal/debug/ui/jres/VMTypePage.java | 2 +- .../ui/launcher/AbstractJavaMainTab.java | 2 +- .../ui/launcher/AppletSelectionDialog.java | 4 +-- .../ui/launcher/JreResolutionGenerator.java | 2 +- .../ui/launcher/MainMethodSearchEngine.java | 2 +- .../ui/launcher/NameValuePairDialog.java | 6 ++-- .../RuntimeClasspathAdvancedDialog.java | 4 +-- .../RuntimeClasspathEntryLabelProvider.java | 2 +- .../ui/launcher/RuntimeClasspathViewer.java | 2 +- .../launcher/SelectSystemLibraryQuickFix.java | 4 +-- .../ui/monitors/JavaContendedMonitor.java | 4 +-- .../debug/ui/monitors/JavaMonitor.java | 4 +-- .../debug/ui/monitors/JavaMonitorThread.java | 4 +-- .../debug/ui/monitors/JavaOwnedMonitor.java | 4 +-- .../debug/ui/monitors/JavaOwningThread.java | 4 +-- .../debug/ui/monitors/JavaWaitingThread.java | 4 +-- .../ui/monitors/ThreadMonitorManager.java | 4 +-- .../propertypages/ExceptionFilterEditor.java | 2 +- .../propertypages/InstanceFilterEditor.java | 8 ++--- .../ui/propertypages/ThreadFilterEditor.java | 6 ++-- .../VMCapabilitiesPropertyPage.java | 2 +- .../JavaSnippetCompletionProcessor.java | 4 +-- .../ui/snippeteditor/JavaSnippetEditor.java | 8 ++--- .../ui/snippeteditor/ScrapbookLauncher.java | 6 ++-- .../SnippetEditorPropertyPage.java | 6 ++-- .../JavaProjectSourceContainerBrowser.java | 2 +- .../StackFrameShowInSourceAdapter.java | 2 +- .../variables/JavaVariableLabelProvider.java | 2 +- .../ui/variables/JavaVariablesDetailPane.java | 2 +- .../internal/debug/eval/EvaluationResult.java | 2 +- .../internal/debug/eval/RemoteEvaluator.java | 4 +-- .../debug/eval/RemoteEvaluatorBuilder.java | 8 ++--- .../eval/ast/engine/ASTEvaluationEngine.java | 14 ++++---- .../ast/engine/ASTInstructionCompiler.java | 10 +++--- .../engine/BinaryBasedSourceGenerator.java | 8 ++--- .../ast/engine/EvaluationSourceGenerator.java | 8 ++--- .../debug/eval/ast/engine/Interpreter.java | 6 ++-- .../eval/ast/engine/InterpreterVariable.java | 6 ++-- .../ast/engine/JavaObjectRuntimeContext.java | 4 +-- .../engine/SourceBasedSourceGenerator.java | 18 +++++----- .../ast/instructions/ArrayAllocation.java | 6 ++-- .../ArrayInitializerInstruction.java | 6 ++-- .../debug/eval/ast/instructions/Cast.java | 6 ++-- .../ast/instructions/ConditionalJump.java | 2 +- .../eval/ast/instructions/Constructor.java | 4 +-- .../ast/instructions/EqualEqualOperator.java | 2 +- .../ast/instructions/InstructionSequence.java | 6 ++-- .../instructions/LocalVariableCreation.java | 10 +++--- .../debug/eval/ast/instructions/Pop.java | 2 +- .../eval/ast/instructions/PushArrayType.java | 4 +-- .../eval/ast/instructions/PushBoolean.java | 2 +- .../debug/eval/ast/instructions/PushChar.java | 2 +- .../eval/ast/instructions/PushDouble.java | 2 +- .../ast/instructions/PushFieldVariable.java | 2 +- .../eval/ast/instructions/PushFloat.java | 2 +- .../debug/eval/ast/instructions/PushInt.java | 2 +- .../ast/instructions/PushLocalVariable.java | 2 +- .../debug/eval/ast/instructions/PushLong.java | 2 +- .../ast/instructions/PushPrimitiveType.java | 2 +- .../instructions/PushStaticFieldVariable.java | 4 +-- .../eval/ast/instructions/PushString.java | 2 +- .../debug/eval/ast/instructions/PushThis.java | 2 +- .../debug/eval/ast/instructions/PushType.java | 2 +- .../eval/ast/instructions/RemoteOperator.java | 4 +-- .../eval/ast/instructions/SendMessage.java | 8 ++--- .../ast/instructions/SendStaticMessage.java | 8 ++--- .../org/eclipse/jdi/internal/FieldImpl.java | 2 +- .../jdi/internal/LocalVariableImpl.java | 16 ++++----- .../org/eclipse/jdi/internal/MethodImpl.java | 2 +- .../org/eclipse/jdi/internal/MirrorImpl.java | 2 +- .../eclipse/jdi/internal/MonitorInfoImpl.java | 6 ++-- .../jdi/internal/ObjectReferenceImpl.java | 2 +- .../jdi/internal/ReferenceTypeImpl.java | 10 +++--- .../internal/SourceDebugExtensionParser.java | 6 ++-- .../eclipse/jdi/internal/StackFrameImpl.java | 6 ++-- .../jdi/internal/TypeComponentImpl.java | 4 +-- .../org/eclipse/jdi/internal/ValueCache.java | 6 ++-- .../jdi/internal/VirtualMachineImpl.java | 12 +++---- .../jdi/internal/connect/ConnectorImpl.java | 16 ++++----- .../jdi/internal/connect/PacketManager.java | 2 +- .../connect/PacketReceiveManager.java | 8 ++--- .../internal/connect/PacketSendManager.java | 2 +- .../internal/connect/SocketConnection.java | 4 +-- .../connect/SocketTransportService.java | 4 +-- .../jdi/internal/connect/TransportImpl.java | 2 +- .../eclipse/jdi/internal/event/EventImpl.java | 2 +- .../jdi/internal/event/EventIteratorImpl.java | 2 +- .../request/EventRequestManagerImpl.java | 36 +++++++++---------- .../jdi/internal/request/RequestID.java | 2 +- .../jdi/internal/spy/JdwpConversation.java | 2 +- .../eclipse/jdi/internal/spy/TcpipSpy.java | 6 ++-- .../spy/UnableToParseDataException.java | 2 +- .../internal/debug/core/EventDispatcher.java | 6 ++-- .../internal/debug/core/JDIDebugPlugin.java | 2 +- .../BreakpointListenerManager.java | 2 +- .../ConditionalBreakpointHandler.java | 4 +-- .../core/breakpoints/JavaLineBreakpoint.java | 8 ++--- .../breakpoints/JavaMethodBreakpoint.java | 2 +- .../core/breakpoints/JavaWatchpoint.java | 2 +- .../ValidBreakpointLocationLocator.java | 12 +++---- .../core/hcr/JavaHotCodeReplaceManager.java | 8 ++--- .../JDIAllInstancesValue.java | 2 +- .../JDIPlaceholderVariable.java | 4 +-- .../JavaLogicalStructure.java | 8 ++--- .../JavaStructureErrorValue.java | 4 +-- .../LogicalObjectStructureValue.java | 4 +-- .../core/model/JDIArrayEntryVariable.java | 6 ++-- .../debug/core/model/JDIDebugTarget.java | 8 ++--- .../debug/core/model/JDIFieldVariable.java | 4 +-- .../debug/core/model/JDILocalVariable.java | 2 +- .../debug/core/model/JDIPlaceholderValue.java | 2 +- .../core/model/JDIReferenceListValue.java | 2 +- .../debug/core/model/JDIStackFrame.java | 6 ++-- .../debug/core/model/JDIThisVariable.java | 2 +- .../internal/debug/core/model/JDIValue.java | 2 +- .../jdt/internal/launching/CompositeId.java | 2 +- .../launching/EECompilationParticipant.java | 2 +- .../internal/launching/LaunchingPlugin.java | 4 +-- .../jdt/internal/launching/LibraryInfo.java | 8 ++--- .../RuntimeClasspathEntryResolver.java | 2 +- .../launching/RuntimeClasspathProvider.java | 2 +- .../SocketListenConnectorProcess.java | 8 ++--- .../launching/VMDefinitionsContainer.java | 6 ++-- .../environments/AccessRuleParticipant.java | 2 +- .../launching/environments/Analyzer.java | 2 +- .../environments/ExecutionEnvironment.java | 12 +++---- .../jdt/launching/AbstractVMInstall.java | 2 +- .../jdt/launching/AbstractVMInstallType.java | 2 +- .../jdt/launching/ExecutionArguments.java | 4 +-- .../jdt/launching/LibraryLocation.java | 8 ++--- .../jdt/launching/PropertyChangeEvent.java | 6 ++-- .../jdt/launching/VMRunnerConfiguration.java | 4 +-- .../environments/CompatibleEnvironment.java | 4 +-- .../ClasspathContainerSourceContainer.java | 2 +- .../ClasspathVariableSourceContainer.java | 2 +- .../JavaProjectSourceContainer.java | 2 +- .../PackageFragmentRootSourceContainer.java | 2 +- 238 files changed, 507 insertions(+), 507 deletions(-) diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventReader.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventReader.java index d3cbff01ad..7c6dae2f36 100644 --- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventReader.java +++ b/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 fEventListeners = new Vector<>(); // A Vector of EventListener + private final EventQueue fEventQueue; + private final Vector fEventListeners = new Vector<>(); // A Vector of EventListener /** * Constructor diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestTest.java index f7f87a9903..959be35611 100644 --- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestTest.java +++ b/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 fRequests = new LinkedList<>(); + private final List fRequests = new LinkedList<>(); /** * Creates a new test. */ diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventTest.java index 57720fe4c8..31fae24165 100644 --- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventTest.java +++ b/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 fAllEvents = new HashMap<>(); + private final HashMap fAllEvents = new HashMap<>(); /** * Creates a new test. */ diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FileConsoleReader.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FileConsoleReader.java index b14d60aec3..c19a0acb4a 100644 --- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FileConsoleReader.java +++ b/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. diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestCase.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestCase.java index 83e42d5957..627fdfa881 100644 --- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestCase.java +++ b/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 diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestSuite.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestSuite.java index de102d859f..2eabba68f2 100644 --- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestSuite.java +++ b/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 diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocatableTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocatableTest.java index 94e5a409c4..2a0958ec00 100644 --- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocatableTest.java +++ b/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 fLocatables = new LinkedList<>(); - private List fRequests = new LinkedList<>(); + private final List fLocatables = new LinkedList<>(); + private final List fRequests = new LinkedList<>(); /** * Creates a new test. */ diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/NullConsoleReader.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/NullConsoleReader.java index 24601fb1bd..9753007754 100644 --- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/NullConsoleReader.java +++ b/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 diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ReferenceTypeTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ReferenceTypeTest.java index dd0f707025..7829c26e5a 100644 --- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ReferenceTypeTest.java +++ b/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 fTypes = new LinkedList<>(); + private final List 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. diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/MainClass.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/MainClass.java index 8df96e2998..c0203aaba2 100644 --- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/MainClass.java +++ b/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"; diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/detailpane/TableDetailPane.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/detailpane/TableDetailPane.java index c39b62b0d5..8deb5b19e1 100644 --- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/detailpane/TableDetailPane.java +++ b/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; diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/test/stepping/StepFilterTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/test/stepping/StepFilterTests.java index 062d376480..5e0bf3c080 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/test/stepping/StepFilterTests.java +++ b/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 diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/test/stepping/StepIntoSelectionWithGenerics.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/test/stepping/StepIntoSelectionWithGenerics.java index 9ee7060e6b..f67225542b 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/test/stepping/StepIntoSelectionWithGenerics.java +++ b/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 diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/BreakpointFieldLocator.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/BreakpointFieldLocator.java index 62fd2ea5ec..a92426c5b4 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/BreakpointFieldLocator.java +++ b/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; diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/BreakpointMethodLocator.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/BreakpointMethodLocator.java index e779648d12..a6c3fee982 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/BreakpointMethodLocator.java +++ b/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; diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/RunToLineTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/RunToLineTests.java index e07d9a4564..5fa9a243e2 100755 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/RunToLineTests.java +++ b/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 { diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/connectors/MockLaunch.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/connectors/MockLaunch.java index 2f0f0a639d..54a70db0a9 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/connectors/MockLaunch.java +++ b/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 processes = new ConcurrentLinkedDeque<>(); - private ConcurrentLinkedDeque targets = new ConcurrentLinkedDeque<>(); + private final ConcurrentLinkedDeque processes = new ConcurrentLinkedDeque<>(); + private final ConcurrentLinkedDeque targets = new ConcurrentLinkedDeque<>(); private ISourceLocator sourceLocator; - private Map attributes = new HashMap<>(); + private final Map attributes = new HashMap<>(); @Override public boolean canTerminate() { diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/connectors/MultipleConnectionsTest.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/connectors/MultipleConnectionsTest.java index 35b8e4fbd6..7ff7e27651 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/connectors/MultipleConnectionsTest.java +++ b/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; diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ArgumentTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ArgumentTests.java index 1132e83a79..afc23bf7c0 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ArgumentTests.java +++ b/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 { diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/JavaDebugTargetTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/JavaDebugTargetTests.java index 2ddb84d564..a74fc7360c 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/JavaDebugTargetTests.java +++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/JavaDebugTargetTests.java @@ -185,7 +185,7 @@ private List getUserBreakpoints(JDIDebugTarget target) { static private class JDIDebugTargetProxy { - private JDIDebugTarget target; + private final JDIDebugTarget target; public JDIDebugTargetProxy(JDIDebugTarget target) { this.target = target; diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/LaunchConfigurationManagerTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/LaunchConfigurationManagerTests.java index 80f75f7093..9241d6983d 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/LaunchConfigurationManagerTests.java +++ b/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); diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfConditionalBreakpointsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfConditionalBreakpointsTests.java index 87499b50e2..394ff4482e 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfConditionalBreakpointsTests.java +++ b/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 { /** diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfSteppingTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfSteppingTests.java index 02657ad864..516afb0d61 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfSteppingTests.java +++ b/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 diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfVariableDetailTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfVariableDetailTests.java index 74cea5c23d..be1ce62c16 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfVariableDetailTests.java +++ b/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 diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/Accessor.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/Accessor.java index 7e408c7aef..e5c4134e4c 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/Accessor.java +++ b/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; diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/InstructionPointerManagerTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/InstructionPointerManagerTests.java index 0ee33a3b13..21f33f30e6 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/InstructionPointerManagerTests.java +++ b/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 fAnnotationModelsWithListeners = new HashSet<>(); + private final Set 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"; diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/OpenFromClipboardTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/OpenFromClipboardTests.java index 7a59eb3114..2e27a74e32 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/OpenFromClipboardTests.java +++ b/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; diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/ViewManagementTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/ViewManagementTests.java index 596449f700..1288fecd05 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/ViewManagementTests.java +++ b/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 fExpectingOpenEvents = new ArrayList<>(); + private final List fExpectingOpenEvents = new ArrayList<>(); /** * List of view ids expecting to close. */ - private List fExpectingCloseEvents = new ArrayList<>(); + private final List fExpectingCloseEvents = new ArrayList<>(); /** * Constructor diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/ModelPresentationTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/ModelPresentationTests.java index 29dc48dccc..adbae33b4d 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/ModelPresentationTests.java +++ b/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 colors = new HashMap<>(); + private final Map colors = new HashMap<>(); /** * Constructor */ diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIJavaVariable.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIJavaVariable.java index 68218b9693..7e1ce4ff86 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIJavaVariable.java +++ b/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) { diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIWatchExpression.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIWatchExpression.java index 7c9415a682..cebc1b4e73 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIWatchExpression.java +++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIWatchExpression.java @@ -21,8 +21,8 @@ import org.eclipse.debug.core.model.IWatchExpression; public class TestIWatchExpression implements IWatchExpression { - private IValue value; - private String expressionText; + private final IValue value; + private final String expressionText; public TestIWatchExpression(String expressionText, IValue value) { this.expressionText = expressionText; diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/variables/TestIntegerAccessUnboxing15.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/variables/TestIntegerAccessUnboxing15.java index b5a66bc99e..4963262688 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/variables/TestIntegerAccessUnboxing15.java +++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/variables/TestIntegerAccessUnboxing15.java @@ -37,7 +37,7 @@ public TestIntegerAccessUnboxing15(String name) { class Listener implements IEvaluationListener { - private Object lock = new Object(); + private final Object lock = new Object(); private IEvaluationResult endresult; /* (non-Javadoc) diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaSourceLookupDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaSourceLookupDialog.java index 1faaa2e144..a9d9a293de 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaSourceLookupDialog.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaSourceLookupDialog.java @@ -53,9 +53,9 @@ @Deprecated public class JavaSourceLookupDialog extends Dialog { - private SourceLookupBlock fSourceLookupBlock; + private final SourceLookupBlock fSourceLookupBlock; private ILaunchConfiguration fConfiguration; - private String fMessage; + private final String fMessage; private boolean fNotAskAgain; private Button fAskAgainCheckBox; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaUISourceLocator.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaUISourceLocator.java index be1ef34c86..e33bc5da02 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaUISourceLocator.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaUISourceLocator.java @@ -96,7 +96,7 @@ public class JavaUISourceLocator implements IPersistableSourceLocator { /** * Underlying source locator. */ - private JavaSourceLocator fSourceLocator; + private final JavaSourceLocator fSourceLocator; /** * Whether the user should be prompted for source. diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AppletParametersTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AppletParametersTab.java index 93c83ca16f..96ecd3be13 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AppletParametersTab.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AppletParametersTab.java @@ -100,7 +100,7 @@ public void widgetSelected(SelectionEvent e) { } - private AppletTabListener fListener= new AppletTabListener(); + private final AppletTabListener fListener= new AppletTabListener(); private static final String EMPTY_STRING = ""; //$NON-NLS-1$ diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaConnectTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaConnectTab.java index 13e03deb11..5d5b51e241 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaConnectTab.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaConnectTab.java @@ -84,13 +84,13 @@ public class JavaConnectTab extends AbstractJavaMainTab implements IPropertyChan // UI widgets private Button fAllowTerminateButton; private Map fArgumentMap; - private Map fFieldEditorMap = new HashMap<>(); + private final Map fFieldEditorMap = new HashMap<>(); private Composite fArgumentComposite; private Combo fConnectorCombo; // the selected connector private IVMConnector fConnector; - private IVMConnector[] fConnectors = JavaRuntime.getVMConnectors(); + private final IVMConnector[] fConnectors = JavaRuntime.getVMConnectors(); /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite) diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java index f27174227b..76d99837c6 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java @@ -93,7 +93,7 @@ public class JavaJRETab extends JavaLaunchTab { // Selection changed listener (checked JRE) - private IPropertyChangeListener fCheckListener = new IPropertyChangeListener() { + private final IPropertyChangeListener fCheckListener = new IPropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent event) { handleSelectedJREChanged(); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointChange.java index 134c358bd9..fdc145bff9 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointChange.java @@ -53,14 +53,14 @@ public abstract class BreakpointChange extends Change { */ protected static final int NO_LINE_NUMBER = -1; - private IJavaBreakpoint fBreakpoint; - private String fTypeName; - private int fHitCount; - private IJavaObject[] fInstanceFilters; - private int fSuspendPolicy; - private IJavaThread[] fThreadFilters; - private boolean fEnabled; - private String fWorkingSetNames; + private final IJavaBreakpoint fBreakpoint; + private final String fTypeName; + private final int fHitCount; + private final IJavaObject[] fInstanceFilters; + private final int fSuspendPolicy; + private final IJavaThread[] fThreadFilters; + private final boolean fEnabled; + private final String fWorkingSetNames; /** * Constructor diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ClassPrepareBreakpointChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ClassPrepareBreakpointChange.java index 2753ff196d..adc75f8565 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ClassPrepareBreakpointChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ClassPrepareBreakpointChange.java @@ -22,7 +22,7 @@ */ public abstract class ClassPrepareBreakpointChange extends BreakpointChange { - private int fMemberType; + private final int fMemberType; public ClassPrepareBreakpointChange(IJavaClassPrepareBreakpoint breakpoint) throws CoreException { super(breakpoint); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ClassPrepareBreakpointTypeChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ClassPrepareBreakpointTypeChange.java index 058a049ac2..7e0dc2142c 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ClassPrepareBreakpointTypeChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ClassPrepareBreakpointTypeChange.java @@ -34,7 +34,7 @@ */ public class ClassPrepareBreakpointTypeChange extends ClassPrepareBreakpointChange { - private IType fDestType; + private final IType fDestType; public ClassPrepareBreakpointTypeChange(IJavaClassPrepareBreakpoint breakpoint, IType destType) throws CoreException { super(breakpoint); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ExceptionBreakpointChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ExceptionBreakpointChange.java index 20c8f15e70..8b1f7b7419 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ExceptionBreakpointChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ExceptionBreakpointChange.java @@ -22,7 +22,7 @@ */ public abstract class ExceptionBreakpointChange extends BreakpointChange { - private String[] fExclusionFilters, fInclusionFilters; + private final String[] fExclusionFilters, fInclusionFilters; boolean fCaught, fUncaught, fChecked; public ExceptionBreakpointChange(IJavaExceptionBreakpoint breakpoint) throws CoreException { diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ExceptionBreakpointTypeChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ExceptionBreakpointTypeChange.java index 69ffc275ed..d5c9a17dfe 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ExceptionBreakpointTypeChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ExceptionBreakpointTypeChange.java @@ -32,7 +32,7 @@ */ public class ExceptionBreakpointTypeChange extends ExceptionBreakpointChange { - private IType fDestType; + private final IType fDestType; public ExceptionBreakpointTypeChange(IJavaExceptionBreakpoint breakpoint, IType destType) throws CoreException { super(breakpoint); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/LaunchConfigurationProjectMainTypeChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/LaunchConfigurationProjectMainTypeChange.java index 3ce1a66552..919856a6fe 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/LaunchConfigurationProjectMainTypeChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/LaunchConfigurationProjectMainTypeChange.java @@ -38,11 +38,11 @@ public class LaunchConfigurationProjectMainTypeChange extends Change { private ILaunchConfiguration fLaunchConfiguration; - private String fNewMainTypeName; - private String fNewProjectName; + private final String fNewMainTypeName; + private final String fNewProjectName; private String fNewLaunchConfigurationName; - private String fOldMainTypeName; - private String fOldProjectName; + private final String fOldMainTypeName; + private final String fOldProjectName; private String fNewConfigContainerName; /** diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/LineBreakpointChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/LineBreakpointChange.java index c1186c3e99..e63b586bd7 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/LineBreakpointChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/LineBreakpointChange.java @@ -22,7 +22,7 @@ */ public abstract class LineBreakpointChange extends BreakpointChange { - private int fCharEnd, fCharStart, fLineNumber; + private final int fCharEnd, fCharStart, fLineNumber; private boolean fConditionEnabled, fConditionSuspendOnTrue; private String fCondition; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/LineBreakpointTypeChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/LineBreakpointTypeChange.java index 5c93a28fd6..2d22ac2992 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/LineBreakpointTypeChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/LineBreakpointTypeChange.java @@ -33,7 +33,7 @@ */ public class LineBreakpointTypeChange extends LineBreakpointChange { - private IType fDestType; + private final IType fDestType; public LineBreakpointTypeChange(IJavaLineBreakpoint breakpoint, IType destType) throws CoreException { super(breakpoint); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/MethodBreakpointChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/MethodBreakpointChange.java index bae755210c..fcf6f4b1bf 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/MethodBreakpointChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/MethodBreakpointChange.java @@ -22,8 +22,8 @@ */ public abstract class MethodBreakpointChange extends LineBreakpointChange { - private String fMethodName, fSignature; - private boolean fEntry, fExit, fNativeOnly; + private final String fMethodName, fSignature; + private final boolean fEntry, fExit, fNativeOnly; /** * Constructor diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/MethodBreakpointMethodChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/MethodBreakpointMethodChange.java index a2793dfc0f..9bbe8cf7bb 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/MethodBreakpointMethodChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/MethodBreakpointMethodChange.java @@ -33,7 +33,7 @@ */ public class MethodBreakpointMethodChange extends MethodBreakpointChange { - private IMethod fDestMethod; + private final IMethod fDestMethod; public MethodBreakpointMethodChange(IJavaMethodBreakpoint breakpoint, IMethod destMethod) throws CoreException { super(breakpoint); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/MethodBreakpointTypeChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/MethodBreakpointTypeChange.java index 41ac273eca..cbe1a87722 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/MethodBreakpointTypeChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/MethodBreakpointTypeChange.java @@ -35,7 +35,7 @@ */ public class MethodBreakpointTypeChange extends MethodBreakpointChange { - private IType fDestType; + private final IType fDestType; public MethodBreakpointTypeChange(IJavaMethodBreakpoint breakpoint, IType destType) throws CoreException { super(breakpoint); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointChange.java index 4c4e84a4ca..7cd677f675 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointChange.java @@ -22,8 +22,8 @@ */ public abstract class WatchpointChange extends LineBreakpointChange { - private String fFieldName; - private boolean fAccess, fModification; + private final String fFieldName; + private final boolean fAccess, fModification; public WatchpointChange(IJavaWatchpoint watchpoint) throws CoreException { super(watchpoint); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointFieldChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointFieldChange.java index ba1947b019..70cd87e056 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointFieldChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointFieldChange.java @@ -33,7 +33,7 @@ */ public class WatchpointFieldChange extends WatchpointChange { - private IField fDestField; + private final IField fDestField; public WatchpointFieldChange(IJavaWatchpoint watchpoint, IField destField) throws CoreException { super(watchpoint); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointTypeChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointTypeChange.java index 97796f94e2..15583c9b43 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointTypeChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointTypeChange.java @@ -33,7 +33,7 @@ */ public class WatchpointTypeChange extends WatchpointChange { - private IType fDestType, fOriginalType; + private final IType fDestType, fOriginalType; public WatchpointTypeChange(IJavaWatchpoint watchpoint, IType destType, IType originalType) throws CoreException { super(watchpoint); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointTypeRenameChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointTypeRenameChange.java index eb8cf2036f..23a79b7a5c 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointTypeRenameChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointTypeRenameChange.java @@ -33,8 +33,8 @@ public class WatchpointTypeRenameChange extends WatchpointTypeChange { - private RefactoringProcessor fProcessor; - private RenameTypeArguments fArguments; + private final RefactoringProcessor fProcessor; + private final RenameTypeArguments fArguments; public WatchpointTypeRenameChange(IJavaWatchpoint watchpoint, IType destType, IType originalType, RefactoringProcessor processor, RenameTypeArguments arguments) throws CoreException { super(watchpoint, destType, originalType); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DetailFormatterDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DetailFormatterDialog.java index d870199899..47d7830e81 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DetailFormatterDialog.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DetailFormatterDialog.java @@ -81,7 +81,7 @@ public class DetailFormatterDialog extends StatusDialog implements ITypeProvider /** * The detail formatter to edit. */ - private DetailFormatter fDetailFormatter; + private final DetailFormatter fDetailFormatter; // widgets private Text fTypeNameText; @@ -97,7 +97,7 @@ public class DetailFormatterDialog extends StatusDialog implements ITypeProvider /** * Indicate if the type can be modified. */ - private boolean fEditTypeName; + private final boolean fEditTypeName; /** * The type object which corresponds to the given name. @@ -110,7 +110,7 @@ public class DetailFormatterDialog extends StatusDialog implements ITypeProvider /** * List of types that have detail formatters already defined. */ - private List fDefinedTypes; + private final List fDefinedTypes; /** * Activation handler for content assist, must be deactivated on disposal. diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ImageDescriptorRegistry.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ImageDescriptorRegistry.java index 9af7e02934..18ce91f2d1 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ImageDescriptorRegistry.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ImageDescriptorRegistry.java @@ -29,8 +29,8 @@ */ public class ImageDescriptorRegistry { - private Map fRegistry= Collections.synchronizedMap(new HashMap(10)); - private Display fDisplay; + private final Map fRegistry= Collections.synchronizedMap(new HashMap(10)); + private final Display fDisplay; /** * Creates a new image descriptor registry for the current or default display, diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIElementImageDescriptor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIElementImageDescriptor.java index f7d20f4b02..a1a5416b9b 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIElementImageDescriptor.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIElementImageDescriptor.java @@ -22,8 +22,8 @@ public class JDIElementImageDescriptor extends CompositeImageDescriptor { - private ImageDescriptor fBaseImage; - private int fFlags; + private final ImageDescriptor fBaseImage; + private final int fFlags; private Point fSize; public JDIElementImageDescriptor(ImageDescriptor baseImage, int flags, Point size) { fBaseImage = baseImage; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugHover.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugHover.java index 677fa4d97d..e6b5a706cd 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugHover.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugHover.java @@ -562,7 +562,7 @@ public boolean visit(ThisExpression node) { final String snippet = snippetBuilder.toString(); class Evaluator implements IEvaluationListener { - private CompletableFuture result = new CompletableFuture<>(); + private final CompletableFuture result = new CompletableFuture<>(); @Override public void evaluationComplete(IEvaluationResult result) { diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugOptionsManager.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugOptionsManager.java index 5590d96ba5..b87a9eccb3 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugOptionsManager.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugOptionsManager.java @@ -919,8 +919,8 @@ private static ISchedulingRule modifyWorkspaceRule() { private static class UpdateBreakpointMessagesJob extends Job { - private ISchedulingRule rule; - private ICoreRunnable runnable; + private final ISchedulingRule rule; + private final ICoreRunnable runnable; UpdateBreakpointMessagesJob(ISchedulingRule rule, ICoreRunnable runnable) { super("Updating breakpoint messages"); //$NON-NLS-1$ diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersManager.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersManager.java index 9092730e4c..41d1001a03 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersManager.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersManager.java @@ -94,7 +94,7 @@ static public JavaDetailFormattersManager getDefault() { * Cache of compiled expressions. * Associate a pair type name/debug target to a compiled expression. */ - private HashMap fCacheMap; + private final HashMap fCacheMap; /** * JavaDetailFormattersManager constructor. @@ -527,8 +527,8 @@ private synchronized void deleteCacheForTarget(IJavaDebugTarget debugTarget) { * expression with a pair type name/debug target */ static private class Key { - private String fTypeName; - private IJavaDebugTarget fDebugTarget; + private final String fTypeName; + private final IJavaDebugTarget fDebugTarget; Key(String typeName, IJavaDebugTarget debugTarget) { fTypeName= typeName; @@ -554,8 +554,8 @@ public int hashCode() { * Stores a compiled expression and evaluation engine used to evaluate the expression. */ static private class Expression { - private ICompiledExpression fExpression; - private IAstEvaluationEngine fEngine; + private final ICompiledExpression fExpression; + private final IAstEvaluationEngine fEngine; Expression(ICompiledExpression expression, IAstEvaluationEngine engine) { fExpression = expression; @@ -593,11 +593,11 @@ static private class EvaluationListener implements IEvaluationListener { */ private static final String STRING_SIGNATURE = "Ljava/lang/String;"; //$NON-NLS-1$ - private IJavaValue fValue; + private final IJavaValue fValue; - private IValueDetailListener fListener; + private final IValueDetailListener fListener; - private IJavaThread fThread; + private final IJavaThread fThread; public EvaluationListener(IJavaValue value, IJavaThread thread, IValueDetailListener listener) { fValue= value; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersPreferencePage.java index 4b122fa599..820563a0eb 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersPreferencePage.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersPreferencePage.java @@ -360,11 +360,11 @@ public boolean performOk() { class FormatterListViewerContentProvider implements IStructuredContentProvider { - private Set fDetailFormattersSet; + private final Set fDetailFormattersSet; - private List fDefinedTypes; + private final List fDefinedTypes; - private CheckboxTableViewer fViewer; + private final CheckboxTableViewer fViewer; /** * FormatterListViewerContentProvider constructor. diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaHotCodeReplaceListener.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaHotCodeReplaceListener.java index 1c7f55caf6..8eaca1ca13 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaHotCodeReplaceListener.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaHotCodeReplaceListener.java @@ -32,7 +32,7 @@ public class JavaHotCodeReplaceListener implements IJavaHotCodeReplaceListener { private HotCodeReplaceErrorDialog fHotCodeReplaceFailedErrorDialog = null; - private ILabelProvider fLabelProvider= DebugUITools.newDebugModelPresentation(); + private final ILabelProvider fLabelProvider= DebugUITools.newDebugModelPresentation(); /** * @see IJavaHotCodeReplaceListener#hotCodeReplaceSucceeded(IJavaDebugTarget) diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaLogicalStructuresPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaLogicalStructuresPreferencePage.java index 971e5dc90e..640ba1012d 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaLogicalStructuresPreferencePage.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaLogicalStructuresPreferencePage.java @@ -99,7 +99,7 @@ public Image getColumnImage(Object element, int columnIndex) { public class LogicalStructuresListViewerContentProvider implements IStructuredContentProvider { - private List fLogicalStructures; + private final List fLogicalStructures; LogicalStructuresListViewerContentProvider() { fLogicalStructures = new ArrayList<>(); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaPrimitivesPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaPrimitivesPreferencePage.java index d9e9f0127c..9a900b4d5b 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaPrimitivesPreferencePage.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaPrimitivesPreferencePage.java @@ -36,7 +36,7 @@ */ public class JavaPrimitivesPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { - private List fEdtiors = new ArrayList<>(); + private final List fEdtiors = new ArrayList<>(); public JavaPrimitivesPreferencePage() { super(DebugUIMessages.JavaPrimitivesPreferencePage_0); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaSourceLocationWorkbenchAdapterFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaSourceLocationWorkbenchAdapterFactory.java index 650a51b4e4..aabcb9ee67 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaSourceLocationWorkbenchAdapterFactory.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaSourceLocationWorkbenchAdapterFactory.java @@ -39,7 +39,7 @@ class SourceLocationPropertiesAdapter implements IWorkbenchAdapter { - private JavaElementLabelProvider fJavaElementLabelProvider = new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_BASICS); + private final JavaElementLabelProvider fJavaElementLabelProvider = new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_BASICS); /** * @see IWorkbenchAdapter#getChildren(Object) diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/StorageEditorInput.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/StorageEditorInput.java index b107aa8a63..a30bec89ad 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/StorageEditorInput.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/StorageEditorInput.java @@ -28,7 +28,7 @@ public abstract class StorageEditorInput extends PlatformObject implements IStor /** * Storage associated with this editor input */ - private IStorage fStorage; + private final IStorage fStorage; /** * Constructs an editor input on the given storage diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddAdvancedAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddAdvancedAction.java index 1e98d6cc57..78e655e019 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddAdvancedAction.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddAdvancedAction.java @@ -24,7 +24,7 @@ */ public class AddAdvancedAction extends RuntimeClasspathAction { - private IAction[] fActions; + private final IAction[] fActions; public AddAdvancedAction(IClasspathViewer viewer, IAction[] actions) { super(ActionMessages.AddAdvancedAction_Ad_vanced____1, viewer); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointLocationVerifierJob.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointLocationVerifierJob.java index 3c41dd992b..ffa0837d65 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointLocationVerifierJob.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointLocationVerifierJob.java @@ -46,28 +46,28 @@ public class BreakpointLocationVerifierJob extends Job { * The temporary breakpoint that has been set. Can be null if the callee was not able * to check if a breakpoint was already set at this position. */ - private IJavaLineBreakpoint fBreakpoint; + private final IJavaLineBreakpoint fBreakpoint; /** * The number of the line where the breakpoint has been requested. */ - private int fLineNumber; + private final int fLineNumber; /** * The qualified type name of the class where the temporary breakpoint as been set. * Can be null if fBreakpoint is null. */ - private String fTypeName; + private final String fTypeName; /** * The type in which should be set the breakpoint. */ - private IType fType; + private final IType fType; /** * The current IEditorPart */ - private IEditorPart fEditorPart; + private final IEditorPart fEditorPart; /** * The parsed {@link CompilationUnit} @@ -82,7 +82,7 @@ public class BreakpointLocationVerifierJob extends Job { /** * The status line to use to display errors */ - private IEditorStatusLine fStatusLine; + private final IEditorStatusLine fStatusLine; /** * If a best guess should be made at the breakpoint location diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ControlAccessibleListener.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ControlAccessibleListener.java index 9844f68115..dfdc712b28 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ControlAccessibleListener.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ControlAccessibleListener.java @@ -18,7 +18,7 @@ import org.eclipse.swt.widgets.Control; public class ControlAccessibleListener extends AccessibleAdapter { - private String controlName; + private final String controlName; public ControlAccessibleListener(String name) { controlName = name; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EditClasspathEntryAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EditClasspathEntryAction.java index 73de7621ca..efd65bfefd 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EditClasspathEntryAction.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EditClasspathEntryAction.java @@ -32,7 +32,7 @@ */ public class EditClasspathEntryAction extends RuntimeClasspathAction { - private ILaunchConfiguration fConfiguration; + private final ILaunchConfiguration fConfiguration; public EditClasspathEntryAction(IClasspathViewer viewer, ILaunchConfiguration configuration) { super(ActionMessages.EditClasspathEntryAction_0, viewer); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/InstanceFiltersAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/InstanceFiltersAction.java index a9a62a77ad..03a79b2b1f 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/InstanceFiltersAction.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/InstanceFiltersAction.java @@ -55,9 +55,9 @@ public class InstanceFiltersAction extends ObjectActionDelegate { */ class InstanceFilterDialog extends AbstractDebugCheckboxSelectionDialog { - private Object fInput; - private String fMessage; - private IBaseLabelProvider fLabelProvider; + private final Object fInput; + private final String fMessage; + private final IBaseLabelProvider fLabelProvider; public InstanceFilterDialog(Shell parentShell, Object input, IBaseLabelProvider labelProvider, String message){ super(parentShell); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OverrideDependenciesAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OverrideDependenciesAction.java index 334f43fd20..401e395533 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OverrideDependenciesAction.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OverrideDependenciesAction.java @@ -25,7 +25,7 @@ */ public class OverrideDependenciesAction extends RuntimeClasspathAction { - private JavaClasspathTab fTab; + private final JavaClasspathTab fTab; /** * Constructor diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ProjectSelectionDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ProjectSelectionDialog.java index 0e216e7000..2d9b1bf2b9 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ProjectSelectionDialog.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ProjectSelectionDialog.java @@ -46,7 +46,7 @@ public class ProjectSelectionDialog extends AbstractDebugCheckboxSelectionDialog private boolean fAddExportedEntries = true; private boolean fAddRequiredProjects = true; - private List fProjects; + private final List fProjects; /** * @param parentShell the parent {@link Shell} diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RestoreDefaultEntriesAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RestoreDefaultEntriesAction.java index 380bf0513f..22fc490af2 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RestoreDefaultEntriesAction.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RestoreDefaultEntriesAction.java @@ -29,7 +29,7 @@ */ public class RestoreDefaultEntriesAction extends RuntimeClasspathAction { - private JavaClasspathTab fTab; + private final JavaClasspathTab fTab; /** * Constructor diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionHandler.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionHandler.java index 219abd6113..af557416e0 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionHandler.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionHandler.java @@ -37,7 +37,7 @@ public class StepIntoSelectionHandler implements IDebugEventFilter { /** * The method to step into */ - private IMethod fMethod; + private final IMethod fMethod; /** * Resolved signature of the method to step into @@ -47,7 +47,7 @@ public class StepIntoSelectionHandler implements IDebugEventFilter { /** * The thread in which to step */ - private IJavaThread fThread; + private final IJavaThread fThread; /** * The initial stack frame diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ViewFilterAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ViewFilterAction.java index a2a0f815b3..65fd24497a 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ViewFilterAction.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ViewFilterAction.java @@ -36,7 +36,7 @@ public abstract class ViewFilterAction extends ViewerFilter implements IViewActi private IViewPart fView; private IAction fAction; - private IPropertyChangeListener fListener = new Updater(); + private final IPropertyChangeListener fListener = new Updater(); class Updater implements IPropertyChangeListener { diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AbstractDetailPane.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AbstractDetailPane.java index 3e8392e8e9..b368dc5f0c 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AbstractDetailPane.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AbstractDetailPane.java @@ -47,15 +47,15 @@ */ public abstract class AbstractDetailPane implements IDetailPane3 { - private String fName; - private String fDescription; - private String fId; + private final String fName; + private final String fDescription; + private final String fId; private AbstractJavaBreakpointEditor fEditor; - private Set fAutoSaveProperties = new HashSet<>(); + private final Set fAutoSaveProperties = new HashSet<>(); private IWorkbenchPartSite fSite; // property listeners - private ListenerList fListeners = new ListenerList<>(); + private final ListenerList fListeners = new ListenerList<>(); private Composite fEditorParent; /** diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AbstractJavaBreakpointEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AbstractJavaBreakpointEditor.java index 513ae62966..867d1a256b 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AbstractJavaBreakpointEditor.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AbstractJavaBreakpointEditor.java @@ -29,7 +29,7 @@ */ public abstract class AbstractJavaBreakpointEditor { - private ListenerList fListeners = new ListenerList<>(); + private final ListenerList fListeners = new ListenerList<>(); private boolean fDirty = false; private boolean fMnemonics = true; private boolean fSuppressPropertyChanges = false; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/JavaBreakpointTypeAdapterFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/JavaBreakpointTypeAdapterFactory.java index 286807c332..e455386e3c 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/JavaBreakpointTypeAdapterFactory.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/JavaBreakpointTypeAdapterFactory.java @@ -38,10 +38,10 @@ */ public class JavaBreakpointTypeAdapterFactory implements IAdapterFactory { - private Map fStratumTypes = new HashMap<>(); + private final Map fStratumTypes = new HashMap<>(); // map of breakpoint type names to breakpoint type categories - private Map fOtherTypes = new HashMap<>(); + private final Map fOtherTypes = new HashMap<>(); /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class) diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathGroup.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathGroup.java index dbaca9a640..547d8ed2bf 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathGroup.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathGroup.java @@ -17,7 +17,7 @@ import java.util.Iterator; public class ClasspathGroup extends AbstractClasspathEntry { - private String name; + private final String name; private boolean canBeRemoved= true; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathLabelProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathLabelProvider.java index 72ecf9f74b..70d62132be 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathLabelProvider.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathLabelProvider.java @@ -25,7 +25,7 @@ */ public class ClasspathLabelProvider implements ILabelProvider { - private RuntimeClasspathEntryLabelProvider runtimeClasspathLabelProvider= new RuntimeClasspathEntryLabelProvider(); + private final RuntimeClasspathEntryLabelProvider runtimeClasspathLabelProvider= new RuntimeClasspathEntryLabelProvider(); /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/DefaultClasspathEntryDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/DefaultClasspathEntryDialog.java index 2baa440523..79dd72b2a9 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/DefaultClasspathEntryDialog.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/DefaultClasspathEntryDialog.java @@ -44,7 +44,7 @@ */ public class DefaultClasspathEntryDialog extends MessageDialog { - private DefaultProjectClasspathEntry fEntry; + private final DefaultProjectClasspathEntry fEntry; private Button fButton; public DefaultClasspathEntryDialog(Shell parentShell, IRuntimeClasspathEntry entry) { diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/RuntimeClasspathViewer.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/RuntimeClasspathViewer.java index 55c8a38b31..e4caeb9418 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/RuntimeClasspathViewer.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/RuntimeClasspathViewer.java @@ -56,11 +56,11 @@ public class RuntimeClasspathViewer implements IClasspathViewer { /** * Entry changed listeners */ - private ListenerList fListeners = new ListenerList<>(); + private final ListenerList fListeners = new ListenerList<>(); private IClasspathEntry fCurrentParent= null; - private IPreferenceChangeListener fPrefListeners = new IPreferenceChangeListener() { + private final IPreferenceChangeListener fPrefListeners = new IPreferenceChangeListener() { @Override public void preferenceChange(PreferenceChangeEvent event) { diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/AutoFormatSettingAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/AutoFormatSettingAction.java index c8c57426a4..9b474692f4 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/AutoFormatSettingAction.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/AutoFormatSettingAction.java @@ -23,8 +23,8 @@ import org.eclipse.ui.PlatformUI; public class AutoFormatSettingAction extends Action { - private JavaStackTraceConsolePage fPage; - private IPreferenceStore fPreferenceStore; + private final JavaStackTraceConsolePage fPage; + private final IPreferenceStore fPreferenceStore; public AutoFormatSettingAction(JavaStackTraceConsolePage page) { super(ConsoleMessages.AutoFormatSettingAction_0, SWT.TOGGLE); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsole.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsole.java index 33fcca8b76..6a3cce5a38 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsole.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsole.java @@ -82,8 +82,8 @@ public StyleRange[] getStyleRanges(int offset, int length) { private static final String INDENT_STR = " "; //$NON-NLS-1$ private static final int INDENT_WIDTH = 4; - private JavaStackTraceConsolePartitioner partitioner = new JavaStackTraceConsolePartitioner(); - private IPropertyChangeListener propertyListener = new IPropertyChangeListener() { + private final JavaStackTraceConsolePartitioner partitioner = new JavaStackTraceConsolePartitioner(); + private final IPropertyChangeListener propertyListener = new IPropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent event) { String property = event.getProperty(); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsoleViewer.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsoleViewer.java index bc24d9691f..49bd259f8a 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsoleViewer.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsoleViewer.java @@ -28,7 +28,7 @@ */ public class JavaStackTraceConsoleViewer extends TextConsoleViewer { - private JavaStackTraceConsole fConsole; + private final JavaStackTraceConsole fConsole; private boolean fAutoFormat = false; /** diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceHyperlink.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceHyperlink.java index 05c299ace9..63d2e41fc5 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceHyperlink.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceHyperlink.java @@ -56,7 +56,7 @@ */ public class JavaStackTraceHyperlink implements IHyperlink { - private TextConsole fConsole; + private final TextConsole fConsole; /** * Constructor diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/contentassist/DynamicTypeContext.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/contentassist/DynamicTypeContext.java index 5f69b22e7c..df3be7da55 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/contentassist/DynamicTypeContext.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/contentassist/DynamicTypeContext.java @@ -39,7 +39,7 @@ public interface ITypeProvider { public IType getType() throws CoreException; } - private ITypeProvider fTypeProvider; + private final ITypeProvider fTypeProvider; /** * Constructs a completion context on the given type. diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/contentassist/JavaDebugContentAssistProcessor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/contentassist/JavaDebugContentAssistProcessor.java index 7f978c7681..208d97d181 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/contentassist/JavaDebugContentAssistProcessor.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/contentassist/JavaDebugContentAssistProcessor.java @@ -52,8 +52,8 @@ public class JavaDebugContentAssistProcessor implements IContentAssistProcessor private String fErrorMessage = null; private char[] fProposalAutoActivationSet; - private CompletionProposalComparator fComparator; - private IJavaDebugContentAssistContext fContext; + private final CompletionProposalComparator fComparator; + private final IJavaDebugContentAssistContext fContext; private ContentAssistant fAssistant; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/contentassist/TypeContext.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/contentassist/TypeContext.java index 59d0886ae3..16f6169f89 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/contentassist/TypeContext.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/contentassist/TypeContext.java @@ -27,8 +27,8 @@ */ public class TypeContext implements IJavaDebugContentAssistContext { - private IType fType; - private int fPosition; + private final IType fType; + private final int fPosition; /** * Constructs a completion context on the given type. diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/JavaInspectExpression.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/JavaInspectExpression.java index b6234dc845..bdd4fadd60 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/JavaInspectExpression.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/JavaInspectExpression.java @@ -42,12 +42,12 @@ public class JavaInspectExpression extends PlatformObject implements IErrorRepor /** * The value of this expression */ - private IJavaValue fValue; + private final IJavaValue fValue; /** * The code snippet for this expression. */ - private String fExpression; + private final String fExpression; private IEvaluationResult fResult; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/EEVMPage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/EEVMPage.java index 614eb2f2c7..41b92cf42e 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/EEVMPage.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/EEVMPage.java @@ -61,7 +61,7 @@ public class EEVMPage extends AbstractVMInstallPage { private Text fVMArgs; private Text fEEFile; private VMLibraryBlock fLibraryBlock; - private IStatus[] fFieldStatus = new IStatus[1]; + private final IStatus[] fFieldStatus = new IStatus[1]; private boolean fIgnoreCallbacks = false; /** diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/ExecutionEnvironmentsPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/ExecutionEnvironmentsPreferencePage.java index e45346b35b..70fb4c76d0 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/ExecutionEnvironmentsPreferencePage.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/ExecutionEnvironmentsPreferencePage.java @@ -67,7 +67,7 @@ public class ExecutionEnvironmentsPreferencePage extends PreferencePage implemen /** * Working copy "EE Profile -> Default JRE" */ - private Map fDefaults = new HashMap<>(); + private final Map fDefaults = new HashMap<>(); class JREsContentProvider implements IStructuredContentProvider { diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/InstalledJREsBlock.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/InstalledJREsBlock.java index 59852dc71b..b96f5b6108 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/InstalledJREsBlock.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/InstalledJREsBlock.java @@ -179,7 +179,7 @@ public void run() { /** * VMs being displayed */ - private List fVMs = new ArrayList<>(); + private final List fVMs = new ArrayList<>(); /** * The main list control @@ -199,7 +199,7 @@ public void run() { /** * Selection listeners (checked JRE changes) */ - private ListenerList fSelectionListeners = new ListenerList<>(); + private final ListenerList fSelectionListeners = new ListenerList<>(); /** * Previous selection diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsComboBlock.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsComboBlock.java index 38208230ae..00c780933e 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsComboBlock.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsComboBlock.java @@ -71,7 +71,7 @@ public class JREsComboBlock { /** * VMs being displayed */ - private List fVMs = new ArrayList<>(); + private final List fVMs = new ArrayList<>(); /** * The main control @@ -84,12 +84,12 @@ public class JREsComboBlock { /** * JRE change listeners */ - private ListenerList fListeners = new ListenerList<>(); + private final ListenerList fListeners = new ListenerList<>(); /** * Whether the default JRE should be in first position (if false, it becomes last). */ - private boolean fDefaultFirst; + private final boolean fDefaultFirst; /** * Default JRE descriptor or null if none. @@ -134,7 +134,7 @@ public class JREsComboBlock { /** * List of execution environments */ - private List fEnvironments = new ArrayList<>(); + private final List fEnvironments = new ArrayList<>(); private IStatus fStatus = OK_STATUS; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsEnvironmentLabelProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsEnvironmentLabelProvider.java index c6b9d20e1e..e863fa6ffe 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsEnvironmentLabelProvider.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsEnvironmentLabelProvider.java @@ -32,7 +32,7 @@ */ public class JREsEnvironmentLabelProvider extends JREsLabelProvider implements IFontProvider { - private IExecutionEnvironmentProvider fProvider; + private final IExecutionEnvironmentProvider fProvider; private Font fFont = null; /** diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsUpdater.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsUpdater.java index f211f0edde..3c7a89f198 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsUpdater.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsUpdater.java @@ -34,7 +34,7 @@ public class JREsUpdater { // the VMs defined when this updated is instantiated - private VMDefinitionsContainer fOriginalVMs; + private final VMDefinitionsContainer fOriginalVMs; /** * Contstructs a new VM updater to update VM install settings. diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/LibraryContentProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/LibraryContentProvider.java index 43e6e36d35..e424271c3c 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/LibraryContentProvider.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/LibraryContentProvider.java @@ -52,8 +52,8 @@ public class SubElement { public static final int SOURCE_PATH= 2; public static final int EXTERNAL_ANNOTATIONS_PATH = 3; - private LibraryStandin fParent; - private int fType; + private final LibraryStandin fParent; + private final int fType; public SubElement(LibraryStandin parent, int type) { fParent= parent; @@ -84,7 +84,7 @@ public void remove() { } } - private HashMap fChildren= new HashMap<>(); + private final HashMap fChildren= new HashMap<>(); private LibraryStandin[] fLibraries= new LibraryStandin[0]; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/LibraryStandin.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/LibraryStandin.java index df73a75b4c..67c4150062 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/LibraryStandin.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/LibraryStandin.java @@ -31,7 +31,7 @@ * */ public final class LibraryStandin { - private IPath fSystemLibrary; + private final IPath fSystemLibrary; private IPath fSystemLibrarySource; private IPath fExternalAnnotations; private IPath fPackageRootPath; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/StandardVMPage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/StandardVMPage.java index 058a897ceb..0d577debf4 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/StandardVMPage.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/StandardVMPage.java @@ -68,7 +68,7 @@ public class StandardVMPage extends AbstractVMInstallPage { // the VM install's javadoc location private URL fJavadocLocation = null; private boolean fAutoDetectAttributes = false; - private IStatus[] fFieldStatus = new IStatus[1]; + private final IStatus[] fFieldStatus = new IStatus[1]; /** * diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMDetailsDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMDetailsDialog.java index 3b5d3d83dd..7e514f8e7a 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMDetailsDialog.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMDetailsDialog.java @@ -41,7 +41,7 @@ */ public class VMDetailsDialog extends Dialog { - private IVMInstall fVM; + private final IVMInstall fVM; public VMDetailsDialog(Shell shell, IVMInstall vm) { super(shell); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMInstallWizard.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMInstallWizard.java index fe9a39f16c..1bc6b27fd0 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMInstallWizard.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMInstallWizard.java @@ -34,8 +34,8 @@ */ public abstract class VMInstallWizard extends Wizard { - private VMStandin fEditVM; - private String[] fExistingNames; + private final VMStandin fEditVM; + private final String[] fExistingNames; /** * Constructs a new wizard to add/edit a vm install. diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMLibraryBlock.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMLibraryBlock.java index d3ed19e5e7..82cd70631d 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMLibraryBlock.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMLibraryBlock.java @@ -87,7 +87,7 @@ public class VMLibraryBlock extends AbstractVMInstallPage implements SelectionLi private Button fSourceButton; protected Button fDefaultButton; - private IStatus[] fLibStatus; + private final IStatus[] fLibStatus; private Button fAnnotationsButton; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMTypePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMTypePage.java index b62e1e89b1..585efd97d3 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMTypePage.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMTypePage.java @@ -56,7 +56,7 @@ public class VMTypePage extends WizardPage { /** * Keep track of pages created, so we can dispose of them. */ - private Set fPages = new HashSet<>(); + private final Set fPages = new HashSet<>(); /** * Label provider for VM types diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AbstractJavaMainTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AbstractJavaMainTab.java index 18db3ea7bb..1a44620bb1 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AbstractJavaMainTab.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AbstractJavaMainTab.java @@ -87,7 +87,7 @@ public void widgetSelected(SelectionEvent e) { protected String fModuleName = EMPTY_STRING; - private WidgetListener fListener = new WidgetListener(); + private final WidgetListener fListener = new WidgetListener(); /** * chooses a project for the type of java launch config that it is diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletSelectionDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletSelectionDialog.java index 174e9722a8..d47fafcf87 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletSelectionDialog.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletSelectionDialog.java @@ -43,8 +43,8 @@ @SuppressWarnings("deprecation") public class AppletSelectionDialog extends TwoPaneElementSelector { - private IRunnableContext fRunnableContext; - private IJavaProject fProject; + private final IRunnableContext fRunnableContext; + private final IJavaProject fProject; private static final IType[] EMPTY_TYPE_ARRAY = new IType[] {}; private static class PackageRenderer extends JavaElementLabelProvider { diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JreResolutionGenerator.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JreResolutionGenerator.java index 028caccafe..cbf881ead2 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JreResolutionGenerator.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JreResolutionGenerator.java @@ -152,7 +152,7 @@ public boolean hasResolutions(IMarker marker) { private static class ConfigureSeverityResolution implements IMarkerResolution2, IMarkerResolutionRelevance { private final IJavaProject fProject; - private String fOptionId; + private final String fOptionId; public ConfigureSeverityResolution(IJavaProject project, String optionId) { fProject = project; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/MainMethodSearchEngine.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/MainMethodSearchEngine.java index f8e82d204d..9ea639e431 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/MainMethodSearchEngine.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/MainMethodSearchEngine.java @@ -44,7 +44,7 @@ public class MainMethodSearchEngine{ private class MethodCollector extends SearchRequestor { - private List fResult; + private final List fResult; public MethodCollector() { fResult = new ArrayList<>(200); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/NameValuePairDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/NameValuePairDialog.java index a921be0678..bff359e632 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/NameValuePairDialog.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/NameValuePairDialog.java @@ -34,9 +34,9 @@ public class NameValuePairDialog extends Dialog { private String fName; private String fValue; - private String fTitle; - private String[] fFieldLabels; - private String[] fInitialValues; + private final String fTitle; + private final String[] fFieldLabels; + private final String[] fInitialValues; private Label fNameLabel; private Text fNameText; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathAdvancedDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathAdvancedDialog.java index 81075aafa8..47954b76fc 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathAdvancedDialog.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathAdvancedDialog.java @@ -41,10 +41,10 @@ */ public class RuntimeClasspathAdvancedDialog extends Dialog { - private IAction[] fActions; + private final IAction[] fActions; private Button[] fButtons; - private IClasspathViewer fViewer; + private final IClasspathViewer fViewer; private Button fAddVariableStringButton; private Text fVariableString; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathEntryLabelProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathEntryLabelProvider.java index c50da7c943..fbf6d650b0 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathEntryLabelProvider.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathEntryLabelProvider.java @@ -50,7 +50,7 @@ */ public class RuntimeClasspathEntryLabelProvider extends LabelProvider { - private WorkbenchLabelProvider lp = new WorkbenchLabelProvider(); + private final WorkbenchLabelProvider lp = new WorkbenchLabelProvider(); /** * Context in which to render containers, or null diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathViewer.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathViewer.java index fdd3f6de7b..988f38169b 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathViewer.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathViewer.java @@ -45,7 +45,7 @@ public class RuntimeClasspathViewer extends TableViewer implements IClasspathVie /** * Entry changed listeners */ - private ListenerList fListeners = new ListenerList<>(); + private final ListenerList fListeners = new ListenerList<>(); /** * The runtime classpath entries displayed in this viewer diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SelectSystemLibraryQuickFix.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SelectSystemLibraryQuickFix.java index 343dfef9c6..e2b9d96864 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SelectSystemLibraryQuickFix.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SelectSystemLibraryQuickFix.java @@ -38,8 +38,8 @@ */ public class SelectSystemLibraryQuickFix extends JREResolution { - private IPath fOldPath; - private IJavaProject fProject; + private final IPath fOldPath; + private final IJavaProject fProject; public SelectSystemLibraryQuickFix(IPath oldPath, IJavaProject project) { fOldPath = oldPath; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaContendedMonitor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaContendedMonitor.java index c8ee72bd1b..822b1aea2e 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaContendedMonitor.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaContendedMonitor.java @@ -33,7 +33,7 @@ public class JavaContendedMonitor extends PlatformObject implements IDebugElemen /** * The monitor object in the threads and monitors model. */ - private JavaMonitor fMonitor; + private final JavaMonitor fMonitor; /** * The thread which owns this monitor. */ @@ -41,7 +41,7 @@ public class JavaContendedMonitor extends PlatformObject implements IDebugElemen /** * The parent, in the debug view tree. */ - private JavaOwningThread fParent; + private final JavaOwningThread fParent; /** * Constructor diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaMonitor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaMonitor.java index 7e5e233464..485608eec2 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaMonitor.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaMonitor.java @@ -33,7 +33,7 @@ public class JavaMonitor { /** * The underlying object. */ - private IJavaObject fMonitor; + private final IJavaObject fMonitor; /** * The thread which owns this monitor @@ -57,7 +57,7 @@ public class JavaMonitor { * The List of JavaContendedMonitor and JavaOwnedMonitor associated with this * monitor. */ - private List fElements= new ArrayList<>(); + private final List fElements= new ArrayList<>(); public JavaMonitor(IJavaObject monitor) { fMonitor= monitor; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaMonitorThread.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaMonitorThread.java index 410030456e..ec37950c08 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaMonitorThread.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaMonitorThread.java @@ -38,7 +38,7 @@ public class JavaMonitorThread extends PlatformObject { /** * The underlying thread. */ - private IJavaThread fThread; + private final IJavaThread fThread; private IThread fOriginalThread; @@ -63,7 +63,7 @@ public class JavaMonitorThread extends PlatformObject { /** * List of JavaOwningThread and JavaWaitingThread associated with this thread. */ - private List fElements= new ArrayList<>(); + private final List fElements= new ArrayList<>(); /** * JavaWaitingThread object used to return the JavaOwnedMonitor for this diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaOwnedMonitor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaOwnedMonitor.java index 669fff92eb..111ad699dc 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaOwnedMonitor.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaOwnedMonitor.java @@ -33,7 +33,7 @@ public class JavaOwnedMonitor extends PlatformObject implements IDebugElement, I /** * The monitor object in the thread and monitor model. */ - private JavaMonitor fMonitor; + private final JavaMonitor fMonitor; /** * The threads waiting for this monitor. @@ -42,7 +42,7 @@ public class JavaOwnedMonitor extends PlatformObject implements IDebugElement, I /** * The parent, in the debug view tree. */ - private JavaWaitingThread fParent; + private final JavaWaitingThread fParent; /** * Constructor diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaOwningThread.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaOwningThread.java index 1bae64503a..b102ccf2de 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaOwningThread.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaOwningThread.java @@ -31,7 +31,7 @@ public class JavaOwningThread extends PlatformObject implements IDebugElement, I /** * The thread object in the thread and monitor model. */ - private JavaMonitorThread fThread; + private final JavaMonitorThread fThread; /** * The monitor this thread is waiting for. @@ -40,7 +40,7 @@ public class JavaOwningThread extends PlatformObject implements IDebugElement, I /** * The parent, in the debug view tree. */ - private JavaContendedMonitor fParent; + private final JavaContendedMonitor fParent; /** * Constructor diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaWaitingThread.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaWaitingThread.java index 77ba0fa87b..8e8b6ed04c 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaWaitingThread.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaWaitingThread.java @@ -31,7 +31,7 @@ public class JavaWaitingThread implements IDebugElement, ITerminate { /** * The thread object in the thread and monitor model. */ - private JavaMonitorThread fThread; + private final JavaMonitorThread fThread; /** * The monitors this thread owns. @@ -40,7 +40,7 @@ public class JavaWaitingThread implements IDebugElement, ITerminate { /** * The parent, in the debug view tree. */ - private JavaOwnedMonitor fParent; + private final JavaOwnedMonitor fParent; public JavaWaitingThread(JavaMonitorThread thread, JavaOwnedMonitor parent) { fThread= thread; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/ThreadMonitorManager.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/ThreadMonitorManager.java index fb6d7b6c5e..4efc59924a 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/ThreadMonitorManager.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/ThreadMonitorManager.java @@ -45,11 +45,11 @@ public class ThreadMonitorManager implements IDebugEventSetListener, IPropertyCh /** * HashMap IJavaThread -> JavaMonitorThread */ - private HashMap fJavaMonitorThreads; + private final HashMap fJavaMonitorThreads; /** * HashMap IJavaObject -> JavaMonitor */ - private HashMap fJavaMonitors; + private final HashMap fJavaMonitors; private boolean fIsEnabled; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ExceptionFilterEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ExceptionFilterEditor.java index edae681225..335301b5d8 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ExceptionFilterEditor.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ExceptionFilterEditor.java @@ -39,7 +39,7 @@ public class ExceptionFilterEditor { protected static final String DEFAULT_PACKAGE = "(default package)"; //$NON-NLS-1$ - private IJavaExceptionBreakpoint fBreakpoint; + private final IJavaExceptionBreakpoint fBreakpoint; private JavaFilterTable fJavaFilterTable; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/InstanceFilterEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/InstanceFilterEditor.java index 8d504be088..897827eb79 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/InstanceFilterEditor.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/InstanceFilterEditor.java @@ -36,11 +36,11 @@ * */ public class InstanceFilterEditor { - private IJavaBreakpoint fBreakpoint; + private final IJavaBreakpoint fBreakpoint; private CheckboxTableViewer fInstanceViewer; - private Composite fParent; - private InstanceFilterContentProvider fContentProvider; - private CheckHandler fCheckHandler; + private final Composite fParent; + private final InstanceFilterContentProvider fContentProvider; + private final CheckHandler fCheckHandler; public InstanceFilterEditor(Composite parent, IJavaBreakpoint breakpoint) { fBreakpoint= breakpoint; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ThreadFilterEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ThreadFilterEditor.java index 395406ca40..8708a832c7 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ThreadFilterEditor.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ThreadFilterEditor.java @@ -47,10 +47,10 @@ */ public class ThreadFilterEditor { - private JavaBreakpointAdvancedPage fPage; + private final JavaBreakpointAdvancedPage fPage; private CheckboxTreeViewer fThreadViewer; - private ThreadFilterContentProvider fContentProvider; - private CheckHandler fCheckHandler; + private final ThreadFilterContentProvider fContentProvider; + private final CheckHandler fCheckHandler; private static String MAIN= "main"; //$NON-NLS-1$ public ThreadFilterEditor(Composite parent, JavaBreakpointAdvancedPage page) { diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/VMCapabilitiesPropertyPage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/VMCapabilitiesPropertyPage.java index 8cf014eede..0c14c600a8 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/VMCapabilitiesPropertyPage.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/VMCapabilitiesPropertyPage.java @@ -65,7 +65,7 @@ public ScrollPain(Composite parent) { } } - private List fExpandedComps; + private final List fExpandedComps; private static final String EXPANDED_STATE = "vmc_expanded_state"; //$NON-NLS-1$ private static Font fHeadingFont = JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetCompletionProcessor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetCompletionProcessor.java index fdba989c1d..aee5383ebf 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetCompletionProcessor.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetCompletionProcessor.java @@ -42,10 +42,10 @@ public class JavaSnippetCompletionProcessor implements IContentAssistProcessor { private CompletionProposalCollector fCollector; - private JavaSnippetEditor fEditor; + private final JavaSnippetEditor fEditor; private IContextInformationValidator fValidator; private TemplateEngine fTemplateEngine; - private CompletionProposalComparator fComparator; + private final CompletionProposalComparator fComparator; private String fErrorMessage; private char[] fProposalAutoActivationSet; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetEditor.java index f03386f746..508ce34a09 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetEditor.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetEditor.java @@ -176,7 +176,7 @@ public class JavaSnippetEditor extends AbstractDecoratedTextEditor implements ID /** * The debug model presentation used for computing toString */ - private IDebugModelPresentation fPresentation= DebugUITools.newDebugModelPresentation(JDIDebugModel.getPluginIdentifier()); + private final IDebugModelPresentation fPresentation= DebugUITools.newDebugModelPresentation(JDIDebugModel.getPluginIdentifier()); /** * The result of a toString evaluation returned asynchronously by the * debug model. @@ -191,14 +191,14 @@ private static class WaitThread extends Thread { /** * The display used for event dispatching. */ - private Display fDisplay; + private final Display fDisplay; /** * Indicates whether to continue event queue dispatching. */ private volatile boolean fContinueEventDispatching = true; - private Object fLock; + private final Object fLock; /** * Creates a "wait" thread * @@ -255,7 +255,7 @@ protected void block() { * Listens for part activation to set scrapbook active system property * for action enablement. */ - private IPartListener2 fActivationListener = new IPartListener2() { + private final IPartListener2 fActivationListener = new IPartListener2() { @Override public void partActivated(IWorkbenchPartReference partRef) { diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookLauncher.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookLauncher.java index 7646ae8d71..ef6eba9e57 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookLauncher.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookLauncher.java @@ -86,9 +86,9 @@ public class ScrapbookLauncher implements IDebugEventSetListener { private IJavaLineBreakpoint fMagicBreakpoint; - private HashMap fScrapbookToVMs = new HashMap<>(10); - private HashMap fVMsToBreakpoints = new HashMap<>(10); - private HashMap fVMsToScrapbooks = new HashMap<>(10); + private final HashMap fScrapbookToVMs = new HashMap<>(10); + private final HashMap fVMsToBreakpoints = new HashMap<>(10); + private final HashMap fVMsToScrapbooks = new HashMap<>(10); private static ScrapbookLauncher fgDefault = null; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetEditorPropertyPage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetEditorPropertyPage.java index 0f13dc1c14..2491e3e450 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetEditorPropertyPage.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetEditorPropertyPage.java @@ -41,11 +41,11 @@ */ public class SnippetEditorPropertyPage extends PropertyPage { - private WorkingDirectoryBlock fWorkingDirBlock = new JavaWorkingDirectoryBlock(); + private final WorkingDirectoryBlock fWorkingDirBlock = new JavaWorkingDirectoryBlock(); - private JavaJRETab fJRETab = new JavaJRETab(); + private final JavaJRETab fJRETab = new JavaJRETab(); - private VMArgumentsBlock fVMArgumentsBlock = new VMArgumentsBlock(); + private final VMArgumentsBlock fVMArgumentsBlock = new VMArgumentsBlock(); // launch config template for this scrapbook file private ILaunchConfiguration fConfig; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/JavaProjectSourceContainerBrowser.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/JavaProjectSourceContainerBrowser.java index 3c82081b0e..0127d783fb 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/JavaProjectSourceContainerBrowser.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/JavaProjectSourceContainerBrowser.java @@ -53,7 +53,7 @@ public class JavaProjectSourceContainerBrowser extends AbstractSourceContainerBr class ContentProvider implements IStructuredContentProvider { - private List fProjects; + private final List fProjects; public ContentProvider(List projects) { fProjects = projects; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/StackFrameShowInSourceAdapter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/StackFrameShowInSourceAdapter.java index 85b66a8386..53660ee31e 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/StackFrameShowInSourceAdapter.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/StackFrameShowInSourceAdapter.java @@ -60,7 +60,7 @@ public ISelection getSelection() { } - private IJavaStackFrame fFrame; + private final IJavaStackFrame fFrame; private ShowInContext fLazyContext = null; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableLabelProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableLabelProvider.java index 3db0fad3fa..96e98abf2a 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableLabelProvider.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableLabelProvider.java @@ -59,7 +59,7 @@ public class JavaVariableLabelProvider extends VariableLabelProvider implements /** * Map of view id to qualified name setting */ - private Map fQualifiedNameSettings = new HashMap<>(); + private final Map fQualifiedNameSettings = new HashMap<>(); private boolean fQualifiedNames = false; /** diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariablesDetailPane.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariablesDetailPane.java index 2451cfd928..e05581d8ab 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariablesDetailPane.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariablesDetailPane.java @@ -64,7 +64,7 @@ public class JavaVariablesDetailPane extends DefaultDetailPane { private FocusListener focusListener; private Composite fDetailPaneContainer; private Combo fExpressionHistory; - private IDialogSettings fExpressionHistoryDialogSettings; + private final IDialogSettings fExpressionHistoryDialogSettings; private static final int MAX_HISTORY_SIZE = 20; private static final String DS_SECTION_EXPRESSION_HISTORY = "expressionHistory"; //$NON-NLS-1$ private static final String DS_KEY_HISTORY_ENTRY_COUNT = "expressionHistoryEntryCount"; //$NON-NLS-1$ diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/EvaluationResult.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/EvaluationResult.java index 581b138448..bc39ed9ae6 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/EvaluationResult.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/EvaluationResult.java @@ -58,7 +58,7 @@ public class EvaluationResult implements IEvaluationResult { /** * List of Strings describing compilation problems. */ - private List fErrors; + private final List fErrors; /** * Whether the evaluation was terminated. diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/RemoteEvaluator.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/RemoteEvaluator.java index c19fab844e..97e51e35cd 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/RemoteEvaluator.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/RemoteEvaluator.java @@ -57,9 +57,9 @@ public class RemoteEvaluator { private final List variableNames; - private IJavaClassObject loadedClass = null; + private final IJavaClassObject loadedClass = null; - private String enclosingTypeName; + private final String enclosingTypeName; /** * Constructs a new evaluation engine for the given VM in the context of the specified project. Class files required for the evaluation will be diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/RemoteEvaluatorBuilder.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/RemoteEvaluatorBuilder.java index 1701071689..fb9b3eaafa 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/RemoteEvaluatorBuilder.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/RemoteEvaluatorBuilder.java @@ -43,8 +43,8 @@ @SuppressWarnings("rawtypes") public class RemoteEvaluatorBuilder { - private IJavaProject javaProject; - private ExpressionBinder binder; + private final IJavaProject javaProject; + private final ExpressionBinder binder; private final String enclosingTypeName; private final String packageName; private final boolean isStatic; @@ -55,7 +55,7 @@ public class RemoteEvaluatorBuilder { /** * The names and bytecodes of the code snippet class to instantiate */ - private LinkedHashMap classFiles = new LinkedHashMap<>(); + private final LinkedHashMap classFiles = new LinkedHashMap<>(); /** * The name of the code snippet class to instantiate @@ -240,7 +240,7 @@ private class FunctionalEvalVisitor extends ASTVisitor { private int indent = 2; - private Map localBindings = new HashMap<>(); + private final Map localBindings = new HashMap<>(); public FunctionalEvalVisitor() { } diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTEvaluationEngine.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTEvaluationEngine.java index 76999e3566..154fbff7c2 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTEvaluationEngine.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTEvaluationEngine.java @@ -750,19 +750,19 @@ public void dispose() { class EvalRunnable implements Runnable { - private InstructionSequence fExpression; + private final InstructionSequence fExpression; - private IJavaThread fThread; + private final IJavaThread fThread; - private int fEvaluationDetail; + private final int fEvaluationDetail; - private boolean fHitBreakpoints; + private final boolean fHitBreakpoints; - private IRuntimeContext fContext; + private final IRuntimeContext fContext; - private IEvaluationListener fListener; + private final IEvaluationListener fListener; - private boolean fDisableGcOnResult; + private final boolean fDisableGcOnResult; public EvalRunnable(InstructionSequence expression, IJavaThread thread, IRuntimeContext context, IEvaluationListener listener, diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTInstructionCompiler.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTInstructionCompiler.java index d422adf097..09376e00ed 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTInstructionCompiler.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTInstructionCompiler.java @@ -139,27 +139,27 @@ public CompleteInstruction(Jump instruction, String label, */ private static boolean VERBOSE = false; - private InstructionSequence fInstructions; + private final InstructionSequence fInstructions; /** * The list of pending break and continue instruction. */ - private List fCompleteInstructions; + private final List fCompleteInstructions; - private int fStartPosition; + private final int fStartPosition; private boolean fActive; private boolean fHasErrors; - private Stack fStack; + private final Stack fStack; private int fCounter; // internal index used to create unique variable name private int fUniqueIdIndex = 0; - private IJavaProject fJavaProject; + private final IJavaProject fJavaProject; /** * Create a new AST instruction compiler diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/BinaryBasedSourceGenerator.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/BinaryBasedSourceGenerator.java index adf6053b74..b44108a8e6 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/BinaryBasedSourceGenerator.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/BinaryBasedSourceGenerator.java @@ -36,11 +36,11 @@ public class BinaryBasedSourceGenerator { private static final String EVAL_METHOD_NAME = "___eval"; //$NON-NLS-1$ private static final String ANONYMOUS_CLASS_NAME = "___EvalClass"; //$NON-NLS-1$ - private String[] fLocalVariableTypeNames; + private final String[] fLocalVariableTypeNames; - private String[] fLocalVariableNames; + private final String[] fLocalVariableNames; - private boolean fIsInStaticMethod; + private final boolean fIsInStaticMethod; private StringBuilder fSource; @@ -54,7 +54,7 @@ public class BinaryBasedSourceGenerator { * Level of source code to generate (major, minor). For example 1 and 4 * indicates 1.4. */ - private int fSourceMajorLevel; + private final int fSourceMajorLevel; private int fSourceMinorLevel; public BinaryBasedSourceGenerator(String[] localTypesNames, diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/EvaluationSourceGenerator.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/EvaluationSourceGenerator.java index f544357955..3c4f66301f 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/EvaluationSourceGenerator.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/EvaluationSourceGenerator.java @@ -47,17 +47,17 @@ */ public class EvaluationSourceGenerator { - private String fCodeSnippet; + private final String fCodeSnippet; - private String[] fLocalVariableTypeNames; - private String[] fLocalVariableNames; + private final String[] fLocalVariableTypeNames; + private final String[] fLocalVariableNames; private String fSource; private String fCompilationUnitName; private int fSnippetStartPosition; private int fRunMethodStartPosition; private int fRunMethodLength; - private IJavaProject fJavaProject; + private final IJavaProject fJavaProject; /** * Rebuild source in presence of external local variables diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/Interpreter.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/Interpreter.java index 9a3a2b51ba..314c3a6b3b 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/Interpreter.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/Interpreter.java @@ -36,16 +36,16 @@ import com.sun.jdi.VMDisconnectedException; public class Interpreter { - private Instruction[] fInstructions; + private final Instruction[] fInstructions; private int fInstructionCounter; - private IRuntimeContext fContext; + private final IRuntimeContext fContext; private Stack fStack; private IJavaValue fLastValue; /** * The list of internal variables */ - private Map fInternalVariables; + private final Map fInternalVariables; /** * List of objects for which GC has been disabled diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/InterpreterVariable.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/InterpreterVariable.java index ab741bfdca..9577ce7e27 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/InterpreterVariable.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/InterpreterVariable.java @@ -28,19 +28,19 @@ public class InterpreterVariable implements IJavaVariable { /** * The reference type of this variable. */ - private IJavaType fReferenceType; + private final IJavaType fReferenceType; /** * The variable name. */ - private String fName; + private final String fName; /** * The variable value. */ private IValue fValue; - private IDebugTarget fDebugTarget; + private final IDebugTarget fDebugTarget; public InterpreterVariable(String name, IJavaType referenceType, IDebugTarget debugTarget) { diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/JavaObjectRuntimeContext.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/JavaObjectRuntimeContext.java index 99a649726c..5aae44a244 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/JavaObjectRuntimeContext.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/JavaObjectRuntimeContext.java @@ -26,12 +26,12 @@ public class JavaObjectRuntimeContext extends AbstractRuntimeContext { /** * this object or this context. */ - private IJavaObject fThisObject; + private final IJavaObject fThisObject; /** * The thread for this context. */ - private IJavaThread fThread; + private final IJavaThread fThread; /** * ObjectValueRuntimeContext constructor. diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/SourceBasedSourceGenerator.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/SourceBasedSourceGenerator.java index 825b1fd32d..0d14a6c08f 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/SourceBasedSourceGenerator.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/SourceBasedSourceGenerator.java @@ -130,20 +130,20 @@ public class SourceBasedSourceGenerator extends ASTVisitor { private static final String EVAL_METHOD_NAME = "___eval"; //$NON-NLS-1$ private static final String EVAL_FIELD_NAME = "___field"; //$NON-NLS-1$ - private String[] fLocalVariableTypeNames; - private String[] fLocalVariableNames; - private String fCodeSnippet; + private final String[] fLocalVariableTypeNames; + private final String[] fLocalVariableNames; + private final String fCodeSnippet; private boolean fRightTypeFound; - private boolean fCreateInAStaticMethod; + private final boolean fCreateInAStaticMethod; private boolean fEvaluateNextEndTypeDeclaration; private String fError; - private IType fType; - private int fLine; + private final IType fType; + private final int fLine; private StringBuilder fSource; @@ -159,17 +159,17 @@ public class SourceBasedSourceGenerator extends ASTVisitor { * Level of source code to generate (major, minor). For example 1 and 4 * indicates 1.4. */ - private int fSourceMajorLevel; + private final int fSourceMajorLevel; private int fSourceMinorLevel; - private Stack> fTypeParameterStack = new Stack<>(); + private final Stack> fTypeParameterStack = new Stack<>(); private Map fMatchingTypeParameters = null; private enum TypeParameterLocation { TYPE, METHOD, EMPTY; } - private Stack fTypeParameterTypeStack = new Stack<>(); + private final Stack fTypeParameterTypeStack = new Stack<>(); private CompilationUnit fCompilationUnit; { fTypeParameterStack.push(Collections.emptyMap()); diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/ArrayAllocation.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/ArrayAllocation.java index 4a44c4bdf3..8050137fd5 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/ArrayAllocation.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/ArrayAllocation.java @@ -21,11 +21,11 @@ public class ArrayAllocation extends ArrayInstruction { - private int fDimension; + private final int fDimension; - private int fExprDimension; + private final int fExprDimension; - private boolean fHasInitializer; + private final boolean fHasInitializer; private IJavaArrayType[] fCachedArrayTypes; diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/ArrayInitializerInstruction.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/ArrayInitializerInstruction.java index 2d9624217e..323f7c20f9 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/ArrayInitializerInstruction.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/ArrayInitializerInstruction.java @@ -19,11 +19,11 @@ public class ArrayInitializerInstruction extends ArrayInstruction { - private String fTypeSignature; + private final String fTypeSignature; - private int fDimensions; + private final int fDimensions; - private int fLength; + private final int fLength; /** * Constructor for ArrayInitializerInstruction. diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Cast.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Cast.java index 990c22b725..1763c87be5 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Cast.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Cast.java @@ -30,11 +30,11 @@ public class Cast extends CompoundInstruction { public static final String IS_INSTANCE = "isInstance"; //$NON-NLS-1$ public static final String IS_INSTANCE_SIGNATURE = "(Ljava/lang/Object;)Z"; //$NON-NLS-1$ - private int fTypeTypeId; + private final int fTypeTypeId; - private String fBaseTypeName; + private final String fBaseTypeName; - private int fDimension; + private final int fDimension; /** * Cast instruction constructor. diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/ConditionalJump.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/ConditionalJump.java index 97406fe832..a8f82fb97a 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/ConditionalJump.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/ConditionalJump.java @@ -20,7 +20,7 @@ import org.eclipse.jdt.debug.core.IJavaValue; public class ConditionalJump extends Jump { - private boolean fJumpOnTrue; + private final boolean fJumpOnTrue; public ConditionalJump(boolean jumpOnTrue) { fJumpOnTrue = jumpOnTrue; diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Constructor.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Constructor.java index bfaf9ea9df..cb63cb3499 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Constructor.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Constructor.java @@ -23,8 +23,8 @@ */ public class Constructor extends CompoundInstruction { - private int fArgCount; - private String fSignature; + private final int fArgCount; + private final String fSignature; public Constructor(String signature, int argCount, int start) { super(start); diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/EqualEqualOperator.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/EqualEqualOperator.java index 980ff790fa..03d4ee22f3 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/EqualEqualOperator.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/EqualEqualOperator.java @@ -19,7 +19,7 @@ public class EqualEqualOperator extends BinaryOperator { - private boolean fIsEquals; + private final boolean fIsEquals; public EqualEqualOperator(int leftTypeId, int rightTypeId, boolean isEquals, int start) { diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/InstructionSequence.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/InstructionSequence.java index 3de23798f3..750c7dc8b6 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/InstructionSequence.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/InstructionSequence.java @@ -22,13 +22,13 @@ public class InstructionSequence implements ICompiledExpression { - private List fInstructions; + private final List fInstructions; /** * A collection of error messages (String) that occurred while * creating this expression */ - private List fErrors; - private String fSnippet; + private final List fErrors; + private final String fSnippet; private CoreException fException; public InstructionSequence(String snippet) { diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/LocalVariableCreation.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/LocalVariableCreation.java index b1e7e58acb..63bd3bb4cf 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/LocalVariableCreation.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/LocalVariableCreation.java @@ -30,28 +30,28 @@ public class LocalVariableCreation extends CompoundInstruction { /** * Indicate if the type is a primitive type. */ - private boolean fIsPrimitiveType; + private final boolean fIsPrimitiveType; /** * The name of the variable to create. */ - private String fName; + private final String fName; /** * The signature of the type, or of the element type in case of an array * type. */ - private String fTypeSignature; + private final String fTypeSignature; /** * The dimension of the array type. */ - private int fDimension; + private final int fDimension; /** * Indicate if there is an initializer for this variable. */ - private boolean fHasInitializer; + private final boolean fHasInitializer; /** * Constructor for LocalVariableCreation. diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Pop.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Pop.java index bdd3310125..af268ed6c1 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Pop.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Pop.java @@ -15,7 +15,7 @@ public class Pop extends Instruction { - private int fSize; + private final int fSize; /** * @param start diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushArrayType.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushArrayType.java index 74f65ce79a..918b0736ac 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushArrayType.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushArrayType.java @@ -17,9 +17,9 @@ public class PushArrayType extends ArrayInstruction { - private String fTypeSignature; + private final String fTypeSignature; - private int fDimension; + private final int fDimension; public PushArrayType(String typeSignature, int dimension, int start) { super(start); diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushBoolean.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushBoolean.java index 97f5d0e7be..2ec3db923c 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushBoolean.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushBoolean.java @@ -17,7 +17,7 @@ * Pushes a boolean literal onto the stack. */ public class PushBoolean extends SimpleInstruction { - private boolean fValue; + private final boolean fValue; public PushBoolean(boolean value) { fValue = value; diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushChar.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushChar.java index f9f760b916..b55e205723 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushChar.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushChar.java @@ -18,7 +18,7 @@ */ public class PushChar extends SimpleInstruction { - private char fValue; + private final char fValue; public PushChar(char value) { fValue = value; diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushDouble.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushDouble.java index dce21655ef..75b2c1bce3 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushDouble.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushDouble.java @@ -18,7 +18,7 @@ */ public class PushDouble extends SimpleInstruction { - private double fValue; + private final double fValue; public PushDouble(double value) { fValue = value; diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushFieldVariable.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushFieldVariable.java index 09db1ad1a4..48d41b2e3b 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushFieldVariable.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushFieldVariable.java @@ -33,7 +33,7 @@ public class PushFieldVariable extends CompoundInstruction { private String fDeclaringTypeSignature; - private String fName; + private final String fName; private int fSuperClassLevel; diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushFloat.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushFloat.java index edaf3af699..49f918ec24 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushFloat.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushFloat.java @@ -18,7 +18,7 @@ */ public class PushFloat extends SimpleInstruction { - private float fValue; + private final float fValue; public PushFloat(float value) { fValue = value; diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushInt.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushInt.java index 714696260a..b209bbcd47 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushInt.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushInt.java @@ -18,7 +18,7 @@ */ public class PushInt extends SimpleInstruction { - private int fValue; + private final int fValue; public PushInt(int value) { fValue = value; diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushLocalVariable.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushLocalVariable.java index db4817afe3..a41379d451 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushLocalVariable.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushLocalVariable.java @@ -35,7 +35,7 @@ public class PushLocalVariable extends SimpleInstruction { /** * Name of variable to push. */ - private String fName; + private final String fName; public PushLocalVariable(String name) { fName = name; diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushLong.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushLong.java index 2567cdfafb..035f461e10 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushLong.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushLong.java @@ -18,7 +18,7 @@ */ public class PushLong extends SimpleInstruction { - private long fValue; + private final long fValue; public PushLong(long value) { fValue = value; diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushPrimitiveType.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushPrimitiveType.java index 135cff0cca..42aa3dd083 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushPrimitiveType.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushPrimitiveType.java @@ -22,7 +22,7 @@ */ public class PushPrimitiveType extends SimpleInstruction { - private String fName; + private final String fName; public PushPrimitiveType(String name) { fName = name; diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushStaticFieldVariable.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushStaticFieldVariable.java index 80ec8306fa..eda32e36ff 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushStaticFieldVariable.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushStaticFieldVariable.java @@ -28,9 +28,9 @@ */ public class PushStaticFieldVariable extends CompoundInstruction { - private String fFieldName; + private final String fFieldName; - private String fQualifiedTypeName; + private final String fQualifiedTypeName; public PushStaticFieldVariable(String fieldName, String qualifiedTypeName, int start) { diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushString.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushString.java index 411c2db4fb..56ba65d142 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushString.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushString.java @@ -18,7 +18,7 @@ */ public class PushString extends SimpleInstruction { - private String fValue; + private final String fValue; public PushString(String value) { fValue = value; diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushThis.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushThis.java index f8d250081f..725e915364 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushThis.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushThis.java @@ -26,7 +26,7 @@ */ public class PushThis extends SimpleInstruction { - private int fEnclosingLevel; + private final int fEnclosingLevel; public PushThis(int enclosingLevel) { fEnclosingLevel = enclosingLevel; diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushType.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushType.java index 4cd3c5f739..148bc9ef4e 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushType.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushType.java @@ -20,7 +20,7 @@ */ public class PushType extends SimpleInstruction { - private String fTypeName; + private final String fTypeName; public PushType(String signature) { fTypeName = signature; diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/RemoteOperator.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/RemoteOperator.java index c47f065598..b6d0d7d91a 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/RemoteOperator.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/RemoteOperator.java @@ -23,8 +23,8 @@ */ public class RemoteOperator extends CompoundInstruction { - private RemoteEvaluator fEvaluator; - private String fSignature; + private final RemoteEvaluator fEvaluator; + private final String fSignature; public RemoteOperator(String body, int start, RemoteEvaluator evaluator) { super(start); diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/SendMessage.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/SendMessage.java index 9fa85f8978..b0ed71d833 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/SendMessage.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/SendMessage.java @@ -28,10 +28,10 @@ */ public class SendMessage extends CompoundInstruction { - private int fArgCount; - private String fSelector; - private String fSignature; - private String fDeclaringType; + private final int fArgCount; + private final String fSelector; + private final String fSignature; + private final String fDeclaringType; public SendMessage(String selector, String signature, int argCount, String declaringType, int start) { diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/SendStaticMessage.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/SendStaticMessage.java index f3a19decdc..2dc213e9df 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/SendStaticMessage.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/SendStaticMessage.java @@ -30,10 +30,10 @@ */ public class SendStaticMessage extends CompoundInstruction { - private int fArgCount; - private String fSelector; - private String fSignature; - private String fTypeName; + private final int fArgCount; + private final String fSelector; + private final String fSignature; + private final String fTypeName; public SendStaticMessage(String typeName, String selector, String signature, int argCount, int start) { diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/FieldImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/FieldImpl.java index d6ba921d4c..7e7abf2478 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/FieldImpl.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/FieldImpl.java @@ -30,7 +30,7 @@ */ public class FieldImpl extends TypeComponentImpl implements Field { /** ID that corresponds to this reference. */ - private JdwpFieldID fFieldID; + private final JdwpFieldID fFieldID; private Type fType; private String fTypeName; diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/LocalVariableImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/LocalVariableImpl.java index 3d701c52aa..6af3fcb59c 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/LocalVariableImpl.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/LocalVariableImpl.java @@ -26,15 +26,15 @@ */ public class LocalVariableImpl extends MirrorImpl implements LocalVariable, Comparable { /** Method that holds local variable. */ - private MethodImpl fMethod; + private final MethodImpl fMethod; /** First code index at which the variable is visible (unsigned). */ - private long fCodeIndex; + private final long fCodeIndex; /** The variable's name. */ - private String fName; + private final String fName; /** The variable type's JNI signature. */ - private String fSignature; + private final String fSignature; /** The variable type generic signature. */ - private String fGenericSignature; + private final String fGenericSignature; /** The variable's type */ private Type fType; /** The variables type name */ @@ -49,11 +49,11 @@ public class LocalVariableImpl extends MirrorImpl implements LocalVariable, Comp * arguments are visible for the entire method. *

* */ - private int fLength; + private final int fLength; /** The local variable's index in its frame. */ - private int fSlot; + private final int fSlot; /** Is the local variable an argument of its method? */ - private boolean fIsArgument; + private final boolean fIsArgument; public LocalVariableImpl(VirtualMachineImpl vmImpl, MethodImpl method, long codeIndex, String name, String signature, diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MethodImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MethodImpl.java index 258e9b19fe..023b9d4879 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MethodImpl.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MethodImpl.java @@ -56,7 +56,7 @@ public class MethodImpl extends TypeComponentImpl implements Method, Locatable { private static String[] fgInvokeOptions = null; /** MethodTypeID that corresponds to this reference. */ - private JdwpMethodID fMethodID; + private final JdwpMethodID fMethodID; /** The following are the stored results of JDWP calls. */ private List fVariables = null; diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MirrorImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MirrorImpl.java index 0e34040b07..86a6a6a014 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MirrorImpl.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MirrorImpl.java @@ -50,7 +50,7 @@ public class MirrorImpl implements Mirror { /** Description of Mirror object. */ protected String fDescription; /** Virtual Machine of Mirror object. */ - private VirtualMachineImpl fVirtualMachineImpl; + private final VirtualMachineImpl fVirtualMachineImpl; /** * VerboseWriter where verbose info is written to, null if no verbose must * be given. diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MonitorInfoImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MonitorInfoImpl.java index 2f5a229de4..8f334ee69d 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MonitorInfoImpl.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MonitorInfoImpl.java @@ -26,9 +26,9 @@ */ public class MonitorInfoImpl extends MirrorImpl implements MonitorInfo { - private ThreadReference fThread; - private ObjectReference fMonitor; - private int fDepth; + private final ThreadReference fThread; + private final ObjectReference fMonitor; + private final int fDepth; /** constructor **/ public MonitorInfoImpl(ThreadReference thread, int depth, diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ObjectReferenceImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ObjectReferenceImpl.java index e3a0e3b9c5..9c08d2cfd3 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ObjectReferenceImpl.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ObjectReferenceImpl.java @@ -54,7 +54,7 @@ public class ObjectReferenceImpl extends ValueImpl implements ObjectReference { public static final byte tag = JdwpID.OBJECT_TAG; /** ObjectID of object that corresponds to this reference. */ - private JdwpObjectID fObjectID; + private final JdwpObjectID fObjectID; /** * Cached reference type. This value is safe for caching because the type of * an object never changes. diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ReferenceTypeImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ReferenceTypeImpl.java index e1c1352698..c46772b338 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ReferenceTypeImpl.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ReferenceTypeImpl.java @@ -104,7 +104,7 @@ protected static class FileInfo { * the output source file, range in the output source file]. (Integer -> * List of int[2]). */ - private HashMap> fLineInfo; + private final HashMap> fLineInfo; /** * FileInfo constructor. @@ -194,12 +194,12 @@ protected static class Stratum { /** * The id of this stratum. */ - private String fId; + private final String fId; /** * The file info data associated to this stratum. */ - private List fFileInfos; + private final List fFileInfos; /** * Id of the primary file for this stratum. @@ -210,7 +210,7 @@ protected static class Stratum { * Map line number in the output source file -> list of line numbers in * the input source file. (Integer -> List of Integer) */ - private HashMap> fOutputLineToInputLine; + private final HashMap> fOutputLineToInputLine; /** * Stratum constructor. @@ -351,7 +351,7 @@ public List getInputLineInfos(int outputLineNumber) { } /** ReferenceTypeID that corresponds to this reference. */ - private JdwpReferenceTypeID fReferenceTypeID; + private final JdwpReferenceTypeID fReferenceTypeID; /** The following are the stored results of JDWP calls. */ protected List fInterfaces = null; diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/SourceDebugExtensionParser.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/SourceDebugExtensionParser.java index ed2fbeb18e..5739e1ca03 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/SourceDebugExtensionParser.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/SourceDebugExtensionParser.java @@ -47,7 +47,7 @@ private static class Lexer { static final int SHARP = 16; static final int PLUS = 17; - private char[] fSmap; + private final char[] fSmap; private int fPointer; private char fChar; @@ -251,9 +251,9 @@ public int lexemType() { /** * The reference type to which this source debug extension is associated. */ - private ReferenceTypeImpl fReferenceType; + private final ReferenceTypeImpl fReferenceType; - private List fDefinedStrata; + private final List fDefinedStrata; // parser data; private ReferenceTypeImpl.Stratum fCurrentStratum; diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/StackFrameImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/StackFrameImpl.java index 2b0bfa7dcb..7be86ae243 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/StackFrameImpl.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/StackFrameImpl.java @@ -49,11 +49,11 @@ */ public class StackFrameImpl extends MirrorImpl implements StackFrame, Locatable { /** FrameID that corresponds to this reference. */ - private JdwpFrameID fFrameID; + private final JdwpFrameID fFrameID; /** Thread under which this frame's method is running. */ - private ThreadReferenceImpl fThread; + private final ThreadReferenceImpl fThread; /** Location of the current instruction in the frame. */ - private LocationImpl fLocation; + private final LocationImpl fLocation; /** * Creates new StackFrameImpl. diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/TypeComponentImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/TypeComponentImpl.java index 994f582582..bef7fe2fb4 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/TypeComponentImpl.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/TypeComponentImpl.java @@ -28,9 +28,9 @@ public abstract class TypeComponentImpl extends AccessibleImpl implements /** JNI-style signature for this type. */ private String fSignature = null; /** the generic signature for this type, java 1.5 */ - private String fGenericSignature; + private final String fGenericSignature; /** ReferenceType that holds field or method. */ - private ReferenceTypeImpl fDeclaringType; + private final ReferenceTypeImpl fDeclaringType; /** Modifier bits. */ protected int fModifierBits; diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ValueCache.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ValueCache.java index 1d650451d3..df6b640b2a 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ValueCache.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ValueCache.java @@ -38,19 +38,19 @@ public class ValueCache { * Map to store pairs, where Reference is a soft reference * to an Object. */ - private Map> cacheTable = new Hashtable<>(); + private final Map> cacheTable = new Hashtable<>(); /** * Map to store pairs, to find the cacheTable-key of a * garbage collected Reference. */ - private Map, Object> refTable = new Hashtable<>(); + private final Map, Object> refTable = new Hashtable<>(); /** * The reference-queue that is registered with the soft references. The * garbage collector will enqueue soft references that are garbage * collected. */ - private ReferenceQueue refQueue = new ReferenceQueue<>(); + private final ReferenceQueue refQueue = new ReferenceQueue<>(); /** * Clean up all entries from the table for which the values were garbage diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineImpl.java index 0bd8c9ad7b..9a712df725 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineImpl.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineImpl.java @@ -84,9 +84,9 @@ public class VirtualMachineImpl extends MirrorImpl implements VirtualMachine, private static Map fgHCRResultMap = null; /** EventRequestManager that creates event objects on request. */ - private EventRequestManagerImpl fEventReqMgr; + private final EventRequestManagerImpl fEventReqMgr; /** EventQueue that returns EventSets from the Virtual Manager. */ - private EventQueueImpl fEventQueue; + private final EventQueueImpl fEventQueue; /** If a launching connector is used, we store the process. */ private Process fLaunchedProcess; @@ -96,8 +96,8 @@ public class VirtualMachineImpl extends MirrorImpl implements VirtualMachine, * optional: their only purpose is to speed up the debugger by being able to * use the stored results of JDWP calls. */ - private ValueCache fCachedReftypes = new ValueCache(); - private ValueCache fCachedObjects = new ValueCache(); + private final ValueCache fCachedReftypes = new ValueCache(); + private final ValueCache fCachedObjects = new ValueCache(); /** The following are the stored results of JDWP calls. */ private String fVersionDescription = null; // Text information on the VM @@ -159,8 +159,8 @@ public class VirtualMachineImpl extends MirrorImpl implements VirtualMachine, * The name of the current default stratum. */ private String fDefaultStratum; - private PacketReceiveManager fPacketReceiveManager; - private PacketSendManager fPacketSendManager; + private final PacketReceiveManager fPacketReceiveManager; + private final PacketSendManager fPacketSendManager; /** * Creates a new Virtual Machine. diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/ConnectorImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/ConnectorImpl.java index 8d579cf596..992255dd73 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/ConnectorImpl.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/ConnectorImpl.java @@ -34,7 +34,7 @@ */ public abstract class ConnectorImpl implements Connector { /** Virtual machine manager that created this connector. */ - private VirtualMachineManagerImpl fVirtualMachineManager; + private final VirtualMachineManagerImpl fVirtualMachineManager; /** Transport that is used for communication. */ protected Transport fTransport; @@ -118,10 +118,10 @@ public abstract static class ArgumentImpl implements */ private static final long serialVersionUID = 8850533280769854833L; - private String fName; - private String fDescription; - private String fLabel; - private boolean fMustSpecify; + private final String fName; + private final String fDescription; + private final String fLabel; + private final boolean fMustSpecify; protected ArgumentImpl(String name, String description, String label, boolean mustSpecify) { @@ -220,8 +220,8 @@ public String toString() { public static class IntegerArgumentImpl extends ArgumentImpl implements IntegerArgument { private static final long serialVersionUID = 6009335074727417445L; private Integer fValue; - private int fMin; - private int fMax; + private final int fMin; + private final int fMax; protected IntegerArgumentImpl(String name, String description, String label, boolean mustSpecify, int min, int max) { @@ -361,7 +361,7 @@ public String stringValueOf(boolean value) { public class SelectedArgumentImpl extends StringArgumentImpl implements SelectedArgument { private static final long serialVersionUID = 6009335074727417445L; - private List fChoices; + private final List fChoices; protected SelectedArgumentImpl(String name, String description, String label, boolean mustSpecify, List choices) { diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketManager.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketManager.java index 9af8687ac9..06835a0b0d 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketManager.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketManager.java @@ -24,7 +24,7 @@ */ public abstract class PacketManager implements Runnable { /** Connector that performs IO to Virtual Machine. */ - private Connection fConnection; + private final Connection fConnection; /** * Thread that handles the communication the other way (e.g. if we are * sending, the receiving thread). diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketReceiveManager.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketReceiveManager.java index 1d0d0b0c85..7f1ff4ad97 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketReceiveManager.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketReceiveManager.java @@ -44,18 +44,18 @@ public class PacketReceiveManager extends PacketManager { public static final int TIMEOUT_INFINITE = -1; /** List of Command packets received from Virtual Machine. */ - private LinkedList fCommandPackets; + private final LinkedList fCommandPackets; /** List of Reply packets received from Virtual Machine. */ - private LinkedList fReplyPackets; + private final LinkedList fReplyPackets; /** * List of Packets that have timed out already. Maintained so that responses * can be discarded if/when they are received. */ - private ArrayList fTimedOutPackets; + private final ArrayList fTimedOutPackets; - private VirtualMachineImpl fVM; + private final VirtualMachineImpl fVM; /** * Create a new thread that receives packets from the Virtual Machine. diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketSendManager.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketSendManager.java index 9cc4f9104b..002c66121c 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketSendManager.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketSendManager.java @@ -30,7 +30,7 @@ */ public class PacketSendManager extends PacketManager { /** List of packets to be sent to Virtual Machine */ - private LinkedList fOutgoingPackets; + private final LinkedList fOutgoingPackets; /** * Create a new thread that send packets to the Virtual Machine. diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketConnection.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketConnection.java index f7d81b85ca..cfe5cb6bb8 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketConnection.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketConnection.java @@ -28,9 +28,9 @@ public class SocketConnection extends Connection { // for attaching connector private Socket fSocket; - private InputStream fInput; + private final InputStream fInput; - private OutputStream fOutput; + private final OutputStream fOutput; SocketConnection(Socket socket, InputStream in, OutputStream out) { fSocket = socket; diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketTransportService.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketTransportService.java index 02caffeadf..df0ac331d9 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketTransportService.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketTransportService.java @@ -37,7 +37,7 @@ public class SocketTransportService extends TransportService { /** Handshake bytes used just after connecting VM. */ private static final byte[] handshakeBytes = "JDWP-Handshake".getBytes(); //$NON-NLS-1$ - private Capabilities fCapabilities = new Capabilities() { + private final Capabilities fCapabilities = new Capabilities() { @Override public boolean supportsAcceptTimeout() { return true; @@ -60,7 +60,7 @@ public boolean supportsMultipleConnections() { }; private static class SocketListenKey extends ListenKey { - private String fAddress; + private final String fAddress; SocketListenKey(String address) { fAddress = address; diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/TransportImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/TransportImpl.java index e134bf82c9..b4a575f149 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/TransportImpl.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/TransportImpl.java @@ -26,7 +26,7 @@ */ public abstract class TransportImpl implements Transport { /** Name of Transport. */ - private String fName; + private final String fName; /** * Constructs new SocketTransportImpl. diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventImpl.java index 5068ec9fd0..f0887e854a 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventImpl.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventImpl.java @@ -69,7 +69,7 @@ public abstract class EventImpl extends MirrorImpl implements Event { private static HashMap fEventKindMap = null; /** Request ID of event. */ - private RequestID fRequestID; + private final RequestID fRequestID; /** The EventRequest that requested this event. */ private EventRequest fRequest; diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventIteratorImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventIteratorImpl.java index 2e163bbb4c..ef7bf4912a 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventIteratorImpl.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventIteratorImpl.java @@ -25,7 +25,7 @@ */ public class EventIteratorImpl implements EventIterator { /** List iterator implementation of iterator. */ - private ListIterator fIterator; + private final ListIterator fIterator; /** * Creates new EventIteratorImpl. diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestManagerImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestManagerImpl.java index f478528adc..ccc7034f11 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestManagerImpl.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestManagerImpl.java @@ -82,8 +82,8 @@ public class EventRequestManagerImpl extends MirrorImpl implements EventRequestM private static class EventRequestType { - private ArrayList requests; - private Hashtable enabledrequests; + private final ArrayList requests; + private final Hashtable enabledrequests; private EventRequestType() { requests= new ArrayList<>(); @@ -100,22 +100,22 @@ public void clear() { } } - private EventRequestType ACCESS_WATCHPOINT_TYPE= new EventRequestType<>(); - private EventRequestType BREAKPOINT_TYPE= new EventRequestType<>(); - private EventRequestType CLASS_PREPARE_TYPE= new EventRequestType<>(); - private EventRequestType CLASS_UNLOAD_TYPE= new EventRequestType<>(); - private EventRequestType METHOD_ENTRY_TYPE= new EventRequestType<>(); - private EventRequestType METHOD_EXIT_TYPE= new EventRequestType<>(); - private EventRequestType EXCEPTION_TYPE= new EventRequestType<>(); - private EventRequestType MODIFICATION_WATCHPOINT_TYPE= new EventRequestType<>(); - private EventRequestType STEP_TYPE= new EventRequestType<>(); - private EventRequestType THREAD_DEATH_TYPE= new EventRequestType<>(); - private EventRequestType THREAD_START_TYPE= new EventRequestType<>(); - private EventRequestType VM_DEATH_TYPE= new EventRequestType<>(); - private EventRequestType MONITOR_CONTENDED_ENTERED_TYPE= new EventRequestType<>(); - private EventRequestType MONITOR_CONTENDED_ENTER_TYPE= new EventRequestType<>(); - private EventRequestType MONITOR_WAITED_TYPE= new EventRequestType<>(); - private EventRequestType MONITOR_WAIT_TYPE= new EventRequestType<>(); + private final EventRequestType ACCESS_WATCHPOINT_TYPE= new EventRequestType<>(); + private final EventRequestType BREAKPOINT_TYPE= new EventRequestType<>(); + private final EventRequestType CLASS_PREPARE_TYPE= new EventRequestType<>(); + private final EventRequestType CLASS_UNLOAD_TYPE= new EventRequestType<>(); + private final EventRequestType METHOD_ENTRY_TYPE= new EventRequestType<>(); + private final EventRequestType METHOD_EXIT_TYPE= new EventRequestType<>(); + private final EventRequestType EXCEPTION_TYPE= new EventRequestType<>(); + private final EventRequestType MODIFICATION_WATCHPOINT_TYPE= new EventRequestType<>(); + private final EventRequestType STEP_TYPE= new EventRequestType<>(); + private final EventRequestType THREAD_DEATH_TYPE= new EventRequestType<>(); + private final EventRequestType THREAD_START_TYPE= new EventRequestType<>(); + private final EventRequestType VM_DEATH_TYPE= new EventRequestType<>(); + private final EventRequestType MONITOR_CONTENDED_ENTERED_TYPE= new EventRequestType<>(); + private final EventRequestType MONITOR_CONTENDED_ENTER_TYPE= new EventRequestType<>(); + private final EventRequestType MONITOR_WAITED_TYPE= new EventRequestType<>(); + private final EventRequestType MONITOR_WAIT_TYPE= new EventRequestType<>(); /** * Creates new EventRequestManager. diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/RequestID.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/RequestID.java index 7a67175e77..038c36588b 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/RequestID.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/RequestID.java @@ -28,7 +28,7 @@ public class RequestID { public static final RequestID nullID = new RequestID(NULL_REQUEST_ID); /** Integer representation of request ID. */ - private int fRequestID; + private final int fRequestID; /** * Creates new request ID. diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/JdwpConversation.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/JdwpConversation.java index adaf6dcdbe..c556992be1 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/JdwpConversation.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/JdwpConversation.java @@ -16,7 +16,7 @@ import java.text.MessageFormat; public class JdwpConversation { - private int fId; + private final int fId; private JdwpCommandPacket fCommand; private JdwpReplyPacket fReply; diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/TcpipSpy.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/TcpipSpy.java index a704468d82..3af7fc095e 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/TcpipSpy.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/TcpipSpy.java @@ -49,9 +49,9 @@ public class TcpipSpy extends Thread { private static final byte[] handshakeBytes = "JDWP-Handshake".getBytes(); //$NON-NLS-1$ - private boolean fVMtoDebugger; - private DataInputStream fDataIn; - private DataOutputStream fDataOut; + private final boolean fVMtoDebugger; + private final DataInputStream fDataIn; + private final DataOutputStream fDataOut; private static VerbosePacketStream out = new VerbosePacketStream(System.out); private static Map fPackets = new HashMap<>(); diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/UnableToParseDataException.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/UnableToParseDataException.java index d7ccd87666..7290a3fbb8 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/UnableToParseDataException.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/UnableToParseDataException.java @@ -24,7 +24,7 @@ public class UnableToParseDataException extends Exception { */ private static final long serialVersionUID = 1L; - private byte[] fRemainingData; + private final byte[] fRemainingData; public UnableToParseDataException(String message, byte[] remainingData) { super(message); diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/EventDispatcher.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/EventDispatcher.java index ef7503317c..544b006325 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/EventDispatcher.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/EventDispatcher.java @@ -66,7 +66,7 @@ public class EventDispatcher implements Runnable { /** * The debug target this event dispatcher belongs to. */ - private JDIDebugTarget fTarget; + private final JDIDebugTarget fTarget; /** * Whether this dispatcher is shutdown. */ @@ -75,13 +75,13 @@ public class EventDispatcher implements Runnable { * Table of event listeners. Table is a mapping of EventRequest * to IJDIEventListener. */ - private HashMap fEventHandlers; + private final HashMap fEventHandlers; /** * Queue of debug model events to fire, created when processing events on * the target VM. Keyed by event sets, processed independently. */ - private Map> fSetToQueue = new HashMap<>(); + private final Map> fSetToQueue = new HashMap<>(); /** * Constructs a new event dispatcher listening for events originating from diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/JDIDebugPlugin.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/JDIDebugPlugin.java index 9d209fd677..dc24b2f0b0 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/JDIDebugPlugin.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/JDIDebugPlugin.java @@ -164,7 +164,7 @@ public class JDIDebugPlugin extends Plugin implements IEclipsePreferences.IPrefe * Whether this plug-in is in trace mode. Extra messages are logged in trace * mode. */ - private boolean fTrace = false; + private final boolean fTrace = false; /** * Detected (speculated) JDI interface version diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/BreakpointListenerManager.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/BreakpointListenerManager.java index 707c3ae9d0..6d35a779c7 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/BreakpointListenerManager.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/BreakpointListenerManager.java @@ -63,7 +63,7 @@ public class BreakpointListenerManager { private class JavaBreakpointListenerProxy implements IJavaBreakpointListener { - private IConfigurationElement fConfigElement; + private final IConfigurationElement fConfigElement; private IJavaBreakpointListener fDelegate; public JavaBreakpointListenerProxy(IConfigurationElement element) { diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ConditionalBreakpointHandler.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ConditionalBreakpointHandler.java index 57a1473fa8..91656805d6 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ConditionalBreakpointHandler.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ConditionalBreakpointHandler.java @@ -68,12 +68,12 @@ class EvaluationListener implements IEvaluationListener { /** * Lock for synchronizing evaluation */ - private Object fLock = new Object(); + private final Object fLock = new Object(); /** * The breakpoint that was hit */ - private JavaLineBreakpoint fBreakpoint; + private final JavaLineBreakpoint fBreakpoint; /** * Result of the vote diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaLineBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaLineBreakpoint.java index 8ed1c067e5..4f0d98e36f 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaLineBreakpoint.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaLineBreakpoint.java @@ -98,25 +98,25 @@ public class JavaLineBreakpoint extends JavaBreakpoint implements /** * Maps suspended threads to the suspend event that suspended them */ - private Map fSuspendEvents = new HashMap<>(); + private final Map fSuspendEvents = new HashMap<>(); /** * The map of cached compiled expressions (ICompiledExpression) for this * breakpoint, keyed by thread. This value must be cleared every time the * breakpoint is added to a target. */ - private Map fCompiledExpressions = new HashMap<>(); + private final Map fCompiledExpressions = new HashMap<>(); /** * Cache of projects for stack frames to avoid repetitive project resolution * on conditional breakpoints. */ - private Map fProjectsByFrame = new HashMap<>(); + private final Map fProjectsByFrame = new HashMap<>(); /** * The map of the result value of the condition (IValue) for this * breakpoint, keyed by debug target. */ - private Map fConditionValues = new HashMap<>(); + private final Map fConditionValues = new HashMap<>(); /** * Status code indicating that a request to create a breakpoint in a type diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodBreakpoint.java index 206894a0cc..28e7b8ed6b 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodBreakpoint.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodBreakpoint.java @@ -123,7 +123,7 @@ public class JavaMethodBreakpoint extends JavaLineBreakpoint implements *
  • Method exit (value EXIT_EVENT)
    • * */ - private Map fLastEventTypes = new HashMap<>(10); + private final Map fLastEventTypes = new HashMap<>(10); /** * Used to match type names diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaWatchpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaWatchpoint.java index 9d1e61d056..054d1b48bc 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaWatchpoint.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaWatchpoint.java @@ -97,7 +97,7 @@ public class JavaWatchpoint extends JavaLineBreakpoint implements *
  • Field modification (value MODIFICATION_EVENT)
    • * */ - private HashMap fLastEventTypes = new HashMap<>(10); + private final HashMap fLastEventTypes = new HashMap<>(10); public JavaWatchpoint() { } diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ValidBreakpointLocationLocator.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ValidBreakpointLocationLocator.java index de40f4249f..095cc79056 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ValidBreakpointLocationLocator.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ValidBreakpointLocationLocator.java @@ -130,11 +130,11 @@ public class ValidBreakpointLocationLocator extends ASTVisitor { public static final int LOCATION_LAMBDA_METHOD = 4; - private CompilationUnit fCompilationUnit; - private int fLineNumber; - private boolean fBindingsResolved; + private final CompilationUnit fCompilationUnit; + private final int fLineNumber; + private final boolean fBindingsResolved; private boolean fNeedBindings = false; - private boolean fBestMatch; + private final boolean fBestMatch; private int fLocationType; private boolean fLocationFound; @@ -146,8 +146,8 @@ public class ValidBreakpointLocationLocator extends ASTVisitor { private int fMemberOffset; private int fNodeLength; private List fLabels; - private int fInputOffset; - private int fInputLength; + private final int fInputOffset; + private final int fInputLength; /** * @param compilationUnit diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/hcr/JavaHotCodeReplaceManager.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/hcr/JavaHotCodeReplaceManager.java index 42c3f70b35..f93be200ee 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/hcr/JavaHotCodeReplaceManager.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/hcr/JavaHotCodeReplaceManager.java @@ -108,8 +108,8 @@ public class JavaHotCodeReplaceManager implements IResourceChangeListener, /** * The lists of hot swap targets which support HCR and those which don't */ - private ArrayList fHotSwapTargets = new ArrayList<>(1); - private ArrayList fNoHotSwapTargets = new ArrayList<>(1); + private final ArrayList fHotSwapTargets = new ArrayList<>(1); + private final ArrayList fNoHotSwapTargets = new ArrayList<>(1); /** * A mapping of the last time projects were built. @@ -118,13 +118,13 @@ public class JavaHotCodeReplaceManager implements IResourceChangeListener, *
  • value: build date (ProjectBuildTime)
    • * */ - private Map fProjectBuildTimes = new HashMap<>(); + private final Map fProjectBuildTimes = new HashMap<>(); private static Date fStartupDate = new Date(); /** * Cache of compilation unit deltas renewed on each HCR attempt. */ - private Map fDeltaCache = new HashMap<>(); + private final Map fDeltaCache = new HashMap<>(); /** * Utility object used for tracking build times of projects. The HCR manager diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JDIAllInstancesValue.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JDIAllInstancesValue.java index 325bbf60ed..aec0b82104 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JDIAllInstancesValue.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JDIAllInstancesValue.java @@ -41,7 +41,7 @@ public class JDIAllInstancesValue extends JDIArrayValue { private IJavaObject[] fInstances; - private JDIReferenceType fRoot; + private final JDIReferenceType fRoot; private IJavaArrayType fType; private boolean fIsMoreThanPreference; diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JDIPlaceholderVariable.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JDIPlaceholderVariable.java index 10e015cfda..8da5a3f9b4 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JDIPlaceholderVariable.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JDIPlaceholderVariable.java @@ -33,8 +33,8 @@ public class JDIPlaceholderVariable extends PlatformObject implements IJavaVariable { - private String fName; - private IJavaValue fValue; + private final String fName; + private final IJavaValue fValue; /** * When created for a logical structure we hold onto the original diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JavaLogicalStructure.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JavaLogicalStructure.java index fb936dbb58..d3b326aa2a 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JavaLogicalStructure.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JavaLogicalStructure.java @@ -93,10 +93,10 @@ public class JavaLogicalStructure implements ILogicalStructureType, ILogicalStru */ private class EvaluationBlock implements IEvaluationListener { - private IJavaObject fEvaluationValue; - private IJavaReferenceType fEvaluationType; - private IJavaThread fThread; - private IAstEvaluationEngine fEvaluationEngine; + private final IJavaObject fEvaluationValue; + private final IJavaReferenceType fEvaluationType; + private final IJavaThread fThread; + private final IAstEvaluationEngine fEvaluationEngine; private IEvaluationResult fResult; /** diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JavaStructureErrorValue.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JavaStructureErrorValue.java index 2fe112611d..b09c4e9378 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JavaStructureErrorValue.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JavaStructureErrorValue.java @@ -26,8 +26,8 @@ */ public class JavaStructureErrorValue implements IJavaValue { - private String[] fMessages; - private IJavaValue fValue; + private final String[] fMessages; + private final IJavaValue fValue; public JavaStructureErrorValue(String errorMessage, IJavaValue value) { fMessages = new String[] { errorMessage }; diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/LogicalObjectStructureValue.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/LogicalObjectStructureValue.java index fe06ed2056..d9de303eb2 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/LogicalObjectStructureValue.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/LogicalObjectStructureValue.java @@ -29,8 +29,8 @@ */ public class LogicalObjectStructureValue implements IJavaObject { - private IJavaObject fObject; - private JDIPlaceholderVariable[] fVariables; + private final IJavaObject fObject; + private final JDIPlaceholderVariable[] fVariables; /** * Constructs a proxy to the given object, with the given variables as diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIArrayEntryVariable.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIArrayEntryVariable.java index 0c9d3012c5..44d404e125 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIArrayEntryVariable.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIArrayEntryVariable.java @@ -39,12 +39,12 @@ public class JDIArrayEntryVariable extends JDIModificationVariable { /** * The index of the variable entry */ - private int fIndex; + private final int fIndex; /** * The array object */ - private ArrayReference fArray; + private final ArrayReference fArray; /** * The reference type name of this variable. Cached lazily. @@ -58,7 +58,7 @@ public class JDIArrayEntryVariable extends JDIModificationVariable { * * This is null when not created for a logical structure. */ - private IJavaValue fLogicalParent; + private final IJavaValue fLogicalParent; /** * Constructs an array entry at the given index in an array. diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java index 9668ecada0..5a6cfa5ded 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java @@ -139,7 +139,7 @@ public class JDIDebugTarget extends JDIDebugElement implements /** * List of thread groups in this target. */ - private List fGroups; + private final List fGroups; /** * Associated system process, or null if not available. @@ -312,7 +312,7 @@ public class JDIDebugTarget extends JDIDebugElement implements * * @since 3.6 */ - private ListenerList fHCRListeners = new ListenerList<>(); + private final ListenerList fHCRListeners = new ListenerList<>(); /** * Java scope of the current launch, "null" means everything is in scope @@ -332,7 +332,7 @@ public class JDIDebugTarget extends JDIDebugElement implements /** * Labels given by the user is stored in this map, where the key is the unique ID of the object. */ - private Map objectLabels = new HashMap<>(); + private final Map objectLabels = new HashMap<>(); /** * Creates a new JDI debug target for the given virtual machine. @@ -2344,7 +2344,7 @@ protected void setRequest(EventRequest request) { class ThreadDeathHandler implements IJDIEventListener { // terminated threads marked for removal from the fThreads list - private Map toRemove = Collections.synchronizedMap(new HashMap<>()); + private final Map toRemove = Collections.synchronizedMap(new HashMap<>()); protected ThreadDeathHandler() { createRequest(); diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIFieldVariable.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIFieldVariable.java index 5b7d121a0b..28d3779edc 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIFieldVariable.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIFieldVariable.java @@ -44,7 +44,7 @@ public class JDIFieldVariable extends JDIModificationVariable implements /** * The underlying field */ - private Field fField; + private final Field fField; /** * The object containing the field, or null for a static field. */ @@ -52,7 +52,7 @@ public class JDIFieldVariable extends JDIModificationVariable implements /** * The type containing the field. */ - private ReferenceType fType; + private final ReferenceType fType; /** * When created for a logical structure we hold onto the original diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDILocalVariable.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDILocalVariable.java index 532364cd46..d87e8ab700 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDILocalVariable.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDILocalVariable.java @@ -41,7 +41,7 @@ public class JDILocalVariable extends JDIModificationVariable { /** * The stack frame the local is contained in */ - private JDIStackFrame fStackFrame; + private final JDIStackFrame fStackFrame; /** * Constructs a local variable for the given local in a stack frame. diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIPlaceholderValue.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIPlaceholderValue.java index f41379cf07..0e5dd53e84 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIPlaceholderValue.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIPlaceholderValue.java @@ -23,7 +23,7 @@ */ public class JDIPlaceholderValue extends JDINullValue { - private String fMessage; + private final String fMessage; /** * Constructor, passes the debug target to the super class. diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIReferenceListValue.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIReferenceListValue.java index 8bf05e3d5a..d6784c91b4 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIReferenceListValue.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIReferenceListValue.java @@ -43,7 +43,7 @@ public class JDIReferenceListValue extends JDIObjectValue implements IIndexedValue { - private IJavaObject fRoot; + private final IJavaObject fRoot; private boolean fIsMoreThanPreference; private IJavaType fType = null; diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIStackFrame.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIStackFrame.java index 07751799bd..f613ad060a 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIStackFrame.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIStackFrame.java @@ -452,9 +452,9 @@ protected boolean isProbablyJavaCode() { private final static class LambdaASTVisitor extends ASTVisitor { private final ObjectReference underlyingThisObject; - private boolean methodIsStatic; - private CompilationUnit cu; - private int lineNo; + private final boolean methodIsStatic; + private final CompilationUnit cu; + private final int lineNo; private LambdaASTVisitor(boolean visitDocTags, ObjectReference underlyingThisObject, boolean methodIsStatic, CompilationUnit cu, int lineNo) { super(visitDocTags); diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThisVariable.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThisVariable.java index 6ed70cb950..2e3a27be53 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThisVariable.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThisVariable.java @@ -32,7 +32,7 @@ public class JDIThisVariable extends JDIVariable { /** * The wrapped object */ - private ObjectReference fObject; + private final ObjectReference fObject; /** * Constructs a variable representing 'this' in a stack frame. diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIValue.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIValue.java index 791e84c4b3..2a03a88639 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIValue.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIValue.java @@ -46,7 +46,7 @@ */ public class JDIValue extends JDIDebugElement implements IJavaValue { - private Value fValue; + private final Value fValue; private List fVariables; /** diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/CompositeId.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/CompositeId.java index f56d1b19aa..f3116a7c8d 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/CompositeId.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/CompositeId.java @@ -19,7 +19,7 @@ * Utility class for id's made of multiple Strings */ public class CompositeId { - private String[] fParts; + private final String[] fParts; public CompositeId(String[] parts) { fParts= parts; diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java index 35ae34cbec..d69b0124ff 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java @@ -51,7 +51,7 @@ public class EECompilationParticipant extends CompilationParticipant { * A set of projects that have been cleaned. When the build finishes for * a project that has been cleaned, we check for EE problems. */ - private Set fCleaned = new HashSet<>(); + private final Set fCleaned = new HashSet<>(); /* (non-Javadoc) * @see org.eclipse.jdt.core.compiler.CompilationParticipant#isActive(org.eclipse.jdt.core.IJavaProject) diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java index b0db73e436..24879dc671 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java @@ -200,7 +200,7 @@ class VMChanges implements IVMInstallChangedListener { private boolean fDefaultChanged = false; // old container ids to new - private HashMap fRenamedContainerIds = new HashMap<>(); + private final HashMap fRenamedContainerIds = new HashMap<>(); /** * Returns the JRE container id that the given VM would map to, or @@ -385,7 +385,7 @@ private void rebind(IProgressMonitor monitor, IJavaProject[] projects) throws Co } class JREUpdateJob extends Job { - private VMChanges fChanges; + private final VMChanges fChanges; public JREUpdateJob(VMChanges changes) { super(LaunchingMessages.LaunchingPlugin_1); diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LibraryInfo.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LibraryInfo.java index c99a8096d1..17965a28fd 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LibraryInfo.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LibraryInfo.java @@ -19,10 +19,10 @@ */ public class LibraryInfo { - private String fVersion; - private String[] fBootpath; - private String[] fExtensionDirs; - private String[] fEndorsedDirs; + private final String fVersion; + private final String[] fBootpath; + private final String[] fExtensionDirs; + private final String[] fEndorsedDirs; public LibraryInfo(String version, String[] bootpath, String[] extDirs, String[] endDirs) { fVersion = version; diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryResolver.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryResolver.java index b839d9da4f..50f1917080 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryResolver.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryResolver.java @@ -29,7 +29,7 @@ */ public class RuntimeClasspathEntryResolver implements IRuntimeClasspathEntryResolver2 { - private IConfigurationElement fConfigurationElement; + private final IConfigurationElement fConfigurationElement; private IRuntimeClasspathEntryResolver fDelegate; diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathProvider.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathProvider.java index 2ae69b4c23..6ec19a3e10 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathProvider.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathProvider.java @@ -25,7 +25,7 @@ */ public class RuntimeClasspathProvider implements IRuntimeClasspathProvider { - private IConfigurationElement fConfigurationElement; + private final IConfigurationElement fConfigurationElement; private IRuntimeClasspathProvider fDelegate; diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnectorProcess.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnectorProcess.java index 50ffe2313a..fed673b7d4 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnectorProcess.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnectorProcess.java @@ -62,11 +62,11 @@ public class SocketListenConnectorProcess implements IProcess { /** * The launch this process belongs to */ - private ILaunch fLaunch; + private final ILaunch fLaunch; /** * The port this connector will listen on. */ - private String fPort; + private final String fPort; /** * The number of incoming connections to accept (0 = unlimited). Setting to 1 mimics previous behaviour. */ @@ -289,8 +289,8 @@ private String getRunningTime() { */ class WaitForConnectionJob extends Job{ - private ListeningConnector fConnector; - private Map fArguments; + private final ListeningConnector fConnector; + private final Map fArguments; /** * Flag that can be set to tell this job that waiting * for incoming connections has been cancelled. If true, diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VMDefinitionsContainer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VMDefinitionsContainer.java index 638b7fbff9..6a14239fe3 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VMDefinitionsContainer.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VMDefinitionsContainer.java @@ -78,17 +78,17 @@ public class VMDefinitionsContainer { /** * Map of VMInstallTypes to Lists of corresponding VMInstalls. */ - private Map> fVMTypeToVMMap; + private final Map> fVMTypeToVMMap; /** * Cached list of VMs in this container */ - private List fVMList; + private final List fVMList; /** * VMs managed by this container whose install locations don't actually exist. */ - private List fInvalidVMList; + private final List fInvalidVMList; /** * The composite identifier of the default VM. This consists of the install type ID diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/AccessRuleParticipant.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/AccessRuleParticipant.java index fd487c46ec..70bcb33e8b 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/AccessRuleParticipant.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/AccessRuleParticipant.java @@ -30,7 +30,7 @@ */ class AccessRuleParticipant implements IAccessRuleParticipant { - private IConfigurationElement fElement; + private final IConfigurationElement fElement; private IAccessRuleParticipant fDelegate; diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/Analyzer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/Analyzer.java index 5409d764a1..062341304b 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/Analyzer.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/Analyzer.java @@ -28,7 +28,7 @@ */ class Analyzer implements IExecutionEnvironmentAnalyzerDelegate { - private IConfigurationElement fElement; + private final IConfigurationElement fElement; private IExecutionEnvironmentAnalyzerDelegate fDelegate; diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironment.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironment.java index 18294399a7..216a893bf6 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironment.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironment.java @@ -63,7 +63,7 @@ class ExecutionEnvironment implements IExecutionEnvironment { /** * Add a VM changed listener to clear cached values when a VM changes or is removed */ - private IVMInstallChangedListener fListener = new IVMInstallChangedListener() { + private final IVMInstallChangedListener fListener = new IVMInstallChangedListener() { /* (non-Javadoc) * @see org.eclipse.jdt.launching.IVMInstallChangedListener#defaultVMInstallChanged(org.eclipse.jdt.launching.IVMInstall, org.eclipse.jdt.launching.IVMInstall) @@ -102,7 +102,7 @@ public void vmRemoved(IVMInstall removedVm) { /** * The backing IConfigurationElement */ - private IConfigurationElement fElement; + private final IConfigurationElement fElement; /** * Environment specific rule participant or null if none. @@ -122,12 +122,12 @@ public void vmRemoved(IVMInstall removedVm) { /** * Set of compatible vm's - just the strictly compatible ones */ - private Set fStrictlyCompatible = new HashSet<>(); + private final Set fStrictlyCompatible = new HashSet<>(); /** * All compatible vm's */ - private List fCompatibleVMs = new ArrayList<>(); + private final List fCompatibleVMs = new ArrayList<>(); /** * default VM install or null if none @@ -144,7 +144,7 @@ public void vmRemoved(IVMInstall removedVm) { * Caches access rules returned by each participant for a given VM. * @since 3.3 */ - private Map> fParticipantMap = new HashMap<>(); + private final Map> fParticipantMap = new HashMap<>(); /** * Cache of VM -> IAccessRule[][] based on the current state of the participant @@ -152,7 +152,7 @@ public void vmRemoved(IVMInstall removedVm) { * for a specific VM. * @since 3.3 */ - private Map fRuleCache = new HashMap<>(); + private final Map fRuleCache = new HashMap<>(); /** * Wild card pattern matching all files diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstall.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstall.java index b0c6cde9f1..835149ede8 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstall.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstall.java @@ -67,7 +67,7 @@ public abstract class AbstractVMInstall implements IVMInstall, IVMInstall2, IVMI * Map VM specific attributes that are persisted restored with a VM install. * @since 3.4 */ - private Map fAttributeMap = new HashMap<>(); + private final Map fAttributeMap = new HashMap<>(); // system properties are cached in user preferences prefixed with this key, followed // by VM type, VM id, and system property name diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstallType.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstallType.java index 2110fcd839..7490fc4119 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstallType.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstallType.java @@ -39,7 +39,7 @@ */ public abstract class AbstractVMInstallType implements IVMInstallType, IExecutableExtension { - private List fVMs; + private final List fVMs; private String fId; /** diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/ExecutionArguments.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/ExecutionArguments.java index 27ca83de15..05b8d2af69 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/ExecutionArguments.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/ExecutionArguments.java @@ -27,8 +27,8 @@ * @noextend This class is not intended to be sub-classed by clients. */ public class ExecutionArguments { - private String fVMArgs; - private String fProgramArgs; + private final String fVMArgs; + private final String fProgramArgs; /** * Creates a new execution arguments object. diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/LibraryLocation.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/LibraryLocation.java index 583c0d40c5..34fa167816 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/LibraryLocation.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/LibraryLocation.java @@ -30,11 +30,11 @@ *

    */ public final class LibraryLocation { - private IPath fSystemLibrary; + private final IPath fSystemLibrary; private IPath fSystemLibrarySource; - private IPath fExternalAnnotations; - private IPath fPackageRootPath; - private URL fJavadocLocation; + private final IPath fExternalAnnotations; + private final IPath fPackageRootPath; + private final URL fJavadocLocation; private URL fIndexLocation; /** diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/PropertyChangeEvent.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/PropertyChangeEvent.java index 0c0ddfe55e..bd926a111e 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/PropertyChangeEvent.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/PropertyChangeEvent.java @@ -36,19 +36,19 @@ public class PropertyChangeEvent extends EventObject { /** * The name of the changed property. */ - private String propertyName; + private final String propertyName; /** * The old value of the changed property, or null if * not known or not relevant. */ - private Object oldValue; + private final Object oldValue; /** * The new value of the changed property, or null if * not known or not relevant. */ - private Object newValue; + private final Object newValue; /** * Creates a new property change event. diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/VMRunnerConfiguration.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/VMRunnerConfiguration.java index c43a96e37e..d873f505db 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/VMRunnerConfiguration.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/VMRunnerConfiguration.java @@ -28,11 +28,11 @@ * @noextend This class is not intended to be sub-classed by clients. */ public class VMRunnerConfiguration { - private String fClassToLaunch; + private final String fClassToLaunch; private String[] fVMArgs; private String[] fProgramArgs; private String[] fEnvironment; - private String[] fClassPath; + private final String[] fClassPath; private String[] fBootClassPath; private String[] fModulepath; private String fModuleDescription; diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/environments/CompatibleEnvironment.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/environments/CompatibleEnvironment.java index cd14842864..424e43b920 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/environments/CompatibleEnvironment.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/environments/CompatibleEnvironment.java @@ -33,8 +33,8 @@ */ public class CompatibleEnvironment { - private IExecutionEnvironment fEnvironment; - private boolean fIsStrictlyCompatible; + private final IExecutionEnvironment fEnvironment; + private final boolean fIsStrictlyCompatible; /** * Constructs a new compatible environment result from an execution environment diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathContainerSourceContainer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathContainerSourceContainer.java index ea96f90300..f1b6376c89 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathContainerSourceContainer.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathContainerSourceContainer.java @@ -42,7 +42,7 @@ public class ClasspathContainerSourceContainer extends CompositeSourceContainer /** * Associated classpath container path. */ - private IPath fContainerPath; + private final IPath fContainerPath; /** * Unique identifier for Java project source container type * (value org.eclipse.jdt.launching.sourceContainer.classpathContainer). diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathVariableSourceContainer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathVariableSourceContainer.java index 72c41493c8..fe0d487ece 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathVariableSourceContainer.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathVariableSourceContainer.java @@ -34,7 +34,7 @@ */ public class ClasspathVariableSourceContainer extends CompositeSourceContainer { - private IPath fVariable; + private final IPath fVariable; /** * Unique identifier for Java project source container type * (value org.eclipse.jdt.launching.sourceContainer.classpathVariable). diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaProjectSourceContainer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaProjectSourceContainer.java index f4bbce944d..385109e571 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaProjectSourceContainer.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaProjectSourceContainer.java @@ -45,7 +45,7 @@ public class JavaProjectSourceContainer extends CompositeSourceContainer { // Java project - private IJavaProject fProject; + private final IJavaProject fProject; // Source folders private ISourceContainer[] fSourceFolders; // Generic project container diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/PackageFragmentRootSourceContainer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/PackageFragmentRootSourceContainer.java index ecd05758f6..ee8fd0e060 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/PackageFragmentRootSourceContainer.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/PackageFragmentRootSourceContainer.java @@ -37,7 +37,7 @@ */ public class PackageFragmentRootSourceContainer extends AbstractSourceContainer { - private IPackageFragmentRoot fRoot; + private final IPackageFragmentRoot fRoot; /** * Unique identifier for Java project source container type * (value org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot). From 5f5a41188e447ee4e625dfa6f4684e78c42934dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= Date: Tue, 12 Sep 2023 11:25:48 +0200 Subject: [PATCH 6/6] version bumps --- org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.jdt.debug.tests/pom.xml | 2 +- org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jdt.debug.ui/pom.xml | 2 +- org.eclipse.jdt.launching/META-INF/MANIFEST.MF | 2 +- org.eclipse.jdt.launching/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF index 86436ab59c..6949995f27 100644 --- a/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF +++ b/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 diff --git a/org.eclipse.jdt.debug.tests/pom.xml b/org.eclipse.jdt.debug.tests/pom.xml index 9991776d59..f458cc1195 100644 --- a/org.eclipse.jdt.debug.tests/pom.xml +++ b/org.eclipse.jdt.debug.tests/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jdt org.eclipse.jdt.debug.tests - 3.12.100-SNAPSHOT + 3.12.200-SNAPSHOT eclipse-test-plugin ${tests.ignoredWarnings} diff --git a/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF b/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF index 1a889916bc..dbe840ada2 100644 --- a/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.debug.ui; singleton:=true -Bundle-Version: 3.13.100.qualifier +Bundle-Version: 3.13.200.qualifier Bundle-Activator: org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/org.eclipse.jdt.debug.ui/pom.xml b/org.eclipse.jdt.debug.ui/pom.xml index f04d9df531..d1c1481724 100644 --- a/org.eclipse.jdt.debug.ui/pom.xml +++ b/org.eclipse.jdt.debug.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jdt org.eclipse.jdt.debug.ui - 3.13.100-SNAPSHOT + 3.13.200-SNAPSHOT eclipse-plugin -warn:+resource,-deprecation,unavoidableGenericProblems diff --git a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF b/org.eclipse.jdt.launching/META-INF/MANIFEST.MF index 3394d2325f..169fcf5c3c 100644 --- a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.launching/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.launching; singleton:=true -Bundle-Version: 3.20.100.qualifier +Bundle-Version: 3.20.200.qualifier Bundle-Activator: org.eclipse.jdt.internal.launching.LaunchingPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/org.eclipse.jdt.launching/pom.xml b/org.eclipse.jdt.launching/pom.xml index 1573ca846b..7849a889ac 100644 --- a/org.eclipse.jdt.launching/pom.xml +++ b/org.eclipse.jdt.launching/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jdt org.eclipse.jdt.launching - 3.20.100-SNAPSHOT + 3.20.200-SNAPSHOT eclipse-plugin