From 7e754c584568a0ab15fb8fbc82b2651623945812 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Sun, 20 Sep 2026 13:50:16 +0200 Subject: [PATCH 1/2] Move Test and Example projects transitively requiring Java-25 to Java-25 And use unnamed variables to avoid warnings about unused parameters. --- ant/org.eclipse.ant.tests.core/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- ant/org.eclipse.ant.tests.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../pda/breakpoints/PDALineBreakpoint.java | 2 +- .../breakpoints/PDARunToLineBreakpoint.java | 2 +- .../core/pda/breakpoints/PDAWatchpoint.java | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.debug.examples.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../ui/midi/launcher/MidiMainTab.java | 2 +- .../ui/pda/adapters/PDAVirtualFindAction.java | 2 +- .../examples/ui/pda/launcher/PDAMainTab.java | 2 +- debug/org.eclipse.debug.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../tests/breakpoint/TestBreakpoint.java | 2 +- .../console/ConsoleDocumentAdapterTests.java | 2 +- .../debug/tests/console/ConsoleMock.java | 2 +- .../debug/tests/console/IOConsoleTests.java | 6 +-- .../tests/console/ProcessConsoleTests.java | 2 +- .../tests/launching/LaunchGroupTests.java | 2 +- .../tests/ui/ResumeOthersCommandTests.java | 4 +- .../model/JFaceViewerTopIndexTests.java | 2 +- .../debug/tests/viewer/model/UpdateTests.java | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../filesystem/NestedProjectCreator.java | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../internal/builders/AutoBuildJobTest.java | 2 +- .../tests/internal/builders/BuilderTest.java | 16 +++---- .../builders/ComputeProjectOrderTest.java | 2 +- .../builders/MultiProjectBuildTest.java | 2 +- .../builders/RelaxedSchedRuleBuilderTest.java | 2 +- .../BuildManagerRuleConflictMessageTest.java | 4 +- .../FileSystemResourceManagerTest.java | 6 +-- .../tests/internal/localstore/MoveTest.java | 4 +- .../internal/localstore/RefreshLocalTest.java | 2 +- .../localstore/SymlinkResourceTest.java | 8 ++-- .../internal/localstore/UnifiedTreeTest.java | 2 +- .../ModelObjectReaderWriterTest.java | 3 +- .../ProjectDynamicReferencesTest.java | 2 +- .../resources/ProjectPreferencesTest.java | 4 +- .../resources/WorkspaceConcurrencyTest.java | 14 +++--- .../watson/ElementTreeIteratorTest.java | 4 +- .../core/tests/resources/CharsetTest.java | 2 +- .../tests/resources/HiddenResourceTest.java | 10 ++--- .../core/tests/resources/IFileTest.java | 16 +++---- .../resources/IResourceChangeEventTest.java | 4 +- .../IResourceChangeListenerTest.java | 44 +++++++++---------- .../tests/resources/IResourceDeltaTest.java | 4 +- .../core/tests/resources/IResourceTest.java | 10 ++--- .../tests/resources/ISynchronizerTest.java | 10 ++--- .../tests/resources/IWorkspaceRootTest.java | 6 +-- .../core/tests/resources/IWorkspaceTest.java | 4 +- .../tests/resources/LinkedResourceTest.java | 2 +- .../core/tests/resources/MarkerTest.java | 30 ++++++------- .../resources/MarkersChangeListener.java | 2 +- .../tests/resources/ResourceTestUtil.java | 4 +- .../core/tests/resources/ResourceURLTest.java | 5 ++- .../resources/TeamPrivateMemberTest.java | 6 +-- .../resources/perf/BenchMiscWorkspace.java | 2 +- .../tests/resources/perf/BenchWorkspace.java | 6 +-- .../perf/BuilderPerformanceTest.java | 2 +- .../perf/ConcurrencyPerformanceTest.java | 2 +- .../perf/LocalHistoryPerformanceTest.java | 2 +- .../resources/perf/MarkerPerformanceTest.java | 6 +-- .../perf/WorkspacePerformanceTest.java | 2 +- .../resources/regression/Bug_025457.java | 6 +-- .../resources/regression/Bug_026294.java | 6 +-- .../resources/regression/Bug_032076.java | 4 +- .../resources/regression/Bug_098740.java | 2 +- .../resources/regression/Bug_127562.java | 2 +- .../resources/regression/Bug_303517.java | 9 ++-- .../resources/regression/Bug_378156.java | 4 +- .../tests/resources/regression/IFileTest.java | 2 +- .../resources/regression/IResourceTest.java | 8 ++-- .../resources/regression/PR_1GHOM0N_Test.java | 2 +- .../IWorkspaceRunnableUseCaseTest.java | 2 +- .../util/FileStoreAutoDeleteExtension.java | 2 +- .../util/WorkspaceResetExtension.java | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../xml/XMLCompareAddIdMapDialog.java | 4 +- .../xml/XMLCompareEditCopyIdMapDialog.java | 2 +- .../xml/XMLCompareEditMappingDialog.java | 6 +-- .../xml/XMLCompareEditOrderedDialog.java | 4 +- .../org.eclipse.compare.examples/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../filesystem/ui/ConfigurationWizard.java | 2 +- .../filesystem/ui/FileSystemMainPage.java | 2 +- .../filesystem/ui/ShowHistoryAction.java | 2 +- .../PessimisticFilesystemProvider.java | 2 +- .../pessimistic/ui/DisconnectAction.java | 2 +- .../org.eclipse.compare.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../eclipse/compare/tests/AsyncExecTests.java | 4 +- .../org.eclipse.core.tests.net/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.team.tests.core/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../PessimisticRepositoryProvider.java | 2 +- .../team/tests/ui/UnifiedDiffManagerTest.java | 2 +- 128 files changed, 271 insertions(+), 270 deletions(-) diff --git a/ant/org.eclipse.ant.tests.core/.classpath b/ant/org.eclipse.ant.tests.core/.classpath index a1a40ac122c..575248113a0 100644 --- a/ant/org.eclipse.ant.tests.core/.classpath +++ b/ant/org.eclipse.ant.tests.core/.classpath @@ -1,6 +1,6 @@ - + diff --git a/ant/org.eclipse.ant.tests.core/.settings/org.eclipse.jdt.core.prefs b/ant/org.eclipse.ant.tests.core/.settings/org.eclipse.jdt.core.prefs index f2465fa86c5..627d565790b 100644 --- a/ant/org.eclipse.ant.tests.core/.settings/org.eclipse.jdt.core.prefs +++ b/ant/org.eclipse.ant.tests.core/.settings/org.eclipse.jdt.core.prefs @@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=25 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.compliance=25 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -141,7 +141,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 +org.eclipse.jdt.core.compiler.source=25 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING diff --git a/ant/org.eclipse.ant.tests.core/META-INF/MANIFEST.MF b/ant/org.eclipse.ant.tests.core/META-INF/MANIFEST.MF index 9d492517091..946c2c5293f 100644 --- a/ant/org.eclipse.ant.tests.core/META-INF/MANIFEST.MF +++ b/ant/org.eclipse.ant.tests.core/META-INF/MANIFEST.MF @@ -21,6 +21,6 @@ Import-Package: org.assertj.core.api, org.junit.jupiter.api.function;version="[5.14.0,6.0.0)", org.junit.platform.suite.api;version="[1.14.0,2.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Eclipse-BundleShape: dir Automatic-Module-Name: org.eclipse.ant.tests.core diff --git a/ant/org.eclipse.ant.tests.ui/.classpath b/ant/org.eclipse.ant.tests.ui/.classpath index b083a892da2..341034c3add 100644 --- a/ant/org.eclipse.ant.tests.ui/.classpath +++ b/ant/org.eclipse.ant.tests.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/ant/org.eclipse.ant.tests.ui/.settings/org.eclipse.jdt.core.prefs b/ant/org.eclipse.ant.tests.ui/.settings/org.eclipse.jdt.core.prefs index 2453c012887..d0d91231311 100644 --- a/ant/org.eclipse.ant.tests.ui/.settings/org.eclipse.jdt.core.prefs +++ b/ant/org.eclipse.ant.tests.ui/.settings/org.eclipse.jdt.core.prefs @@ -21,9 +21,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=25 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.compliance=25 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -143,7 +143,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 +org.eclipse.jdt.core.compiler.source=25 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING diff --git a/ant/org.eclipse.ant.tests.ui/META-INF/MANIFEST.MF b/ant/org.eclipse.ant.tests.ui/META-INF/MANIFEST.MF index 0e13e7be4a0..884d4f63478 100644 --- a/ant/org.eclipse.ant.tests.ui/META-INF/MANIFEST.MF +++ b/ant/org.eclipse.ant.tests.ui/META-INF/MANIFEST.MF @@ -43,6 +43,6 @@ Import-Package: org.assertj.core.api, org.junit.jupiter.api.extension;version="[5.14.0,6.0.0)", org.junit.jupiter.api.function;version="[5.14.0,6.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Eclipse-BundleShape: dir Automatic-Module-Name: org.eclipse.ant.tests.ui diff --git a/debug/org.eclipse.debug.examples.core/.classpath b/debug/org.eclipse.debug.examples.core/.classpath index d3944f9b386..d0cfec5ac51 100644 --- a/debug/org.eclipse.debug.examples.core/.classpath +++ b/debug/org.eclipse.debug.examples.core/.classpath @@ -1,6 +1,6 @@ - + diff --git a/debug/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.core.prefs b/debug/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.core.prefs index 8d75a44062d..13c7c65eb53 100644 --- a/debug/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.core.prefs +++ b/debug/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.core.prefs @@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=25 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.compliance=25 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -140,7 +140,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 +org.eclipse.jdt.core.compiler.source=25 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING diff --git a/debug/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF b/debug/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF index 52f65cd3865..250c64d90d0 100644 --- a/debug/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Export-Package: org.eclipse.debug.examples.core.midi.launcher;x-friends:="org.ec org.eclipse.debug.examples.core.pda.protocol;x-friends:="org.eclipse.debug.examples.ui", org.eclipse.debug.examples.core.pda.sourcelookup;x-friends:="org.eclipse.debug.examples.ui", org.eclipse.debug.examples.pdavm;x-friends:="org.eclipse.debug.examples.ui" -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Automatic-Module-Name: org.eclipse.debug.examples.core diff --git a/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDALineBreakpoint.java b/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDALineBreakpoint.java index 70b280c3fee..5c65bd48338 100644 --- a/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDALineBreakpoint.java +++ b/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDALineBreakpoint.java @@ -61,7 +61,7 @@ public PDALineBreakpoint() { * @throws CoreException if unable to create the breakpoint */ public PDALineBreakpoint(final IResource resource, final int lineNumber) throws CoreException { - IWorkspaceRunnable runnable = monitor -> { + IWorkspaceRunnable runnable = _ -> { IMarker marker = resource.createMarker("org.eclipse.debug.examples.core.pda.markerType.lineBreakpoint"); //$NON-NLS-1$ setMarker(marker); marker.setAttribute(IBreakpoint.ENABLED, Boolean.TRUE); diff --git a/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDARunToLineBreakpoint.java b/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDARunToLineBreakpoint.java index e9629042ae9..cfae8c83ca4 100644 --- a/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDARunToLineBreakpoint.java +++ b/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDARunToLineBreakpoint.java @@ -36,7 +36,7 @@ public class PDARunToLineBreakpoint extends PDALineBreakpoint { * @exception DebugException if unable to create the breakpoint */ public PDARunToLineBreakpoint(final IFile resource, final int lineNumber) throws DebugException { - IWorkspaceRunnable runnable = monitor -> { + IWorkspaceRunnable runnable = _ -> { // associate with workspace root to avoid drawing in editor ruler IMarker marker = ResourcesPlugin.getWorkspace().getRoot().createMarker("org.eclipse.debug.examples.core.pda.markerType.lineBreakpoint"); //$NON-NLS-1$ setMarker(marker); diff --git a/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDAWatchpoint.java b/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDAWatchpoint.java index b126728b0e4..83df6f03777 100644 --- a/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDAWatchpoint.java +++ b/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDAWatchpoint.java @@ -66,7 +66,7 @@ public PDAWatchpoint() { * @throws CoreException if unable to create the watchpoint */ public PDAWatchpoint(final IResource resource, final int lineNumber, final String functionName, final String varName, final boolean access, final boolean modification) throws CoreException { - IWorkspaceRunnable runnable = monitor -> { + IWorkspaceRunnable runnable = _ -> { IMarker marker = resource.createMarker("org.eclipse.debug.examples.core.pda.markerType.watchpoint"); //$NON-NLS-1$ setMarker(marker); setEnabled(true); diff --git a/debug/org.eclipse.debug.examples.memory/.classpath b/debug/org.eclipse.debug.examples.memory/.classpath index 375961e4d61..7a42e53ced4 100644 --- a/debug/org.eclipse.debug.examples.memory/.classpath +++ b/debug/org.eclipse.debug.examples.memory/.classpath @@ -1,6 +1,6 @@ - + diff --git a/debug/org.eclipse.debug.examples.memory/.settings/org.eclipse.jdt.core.prefs b/debug/org.eclipse.debug.examples.memory/.settings/org.eclipse.jdt.core.prefs index bf59df13ac6..e4848a1c055 100644 --- a/debug/org.eclipse.debug.examples.memory/.settings/org.eclipse.jdt.core.prefs +++ b/debug/org.eclipse.debug.examples.memory/.settings/org.eclipse.jdt.core.prefs @@ -19,9 +19,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=25 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.compliance=25 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -136,7 +136,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 +org.eclipse.jdt.core.compiler.source=25 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING diff --git a/debug/org.eclipse.debug.examples.memory/META-INF/MANIFEST.MF b/debug/org.eclipse.debug.examples.memory/META-INF/MANIFEST.MF index 474d8c243ec..b3dc99ea8d0 100644 --- a/debug/org.eclipse.debug.examples.memory/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.debug.examples.memory/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)", org.eclipse.debug.ui;bundle-version="3.10.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Automatic-Module-Name: org.eclipse.debug.examples.memory diff --git a/debug/org.eclipse.debug.examples.mixedmode/.classpath b/debug/org.eclipse.debug.examples.mixedmode/.classpath index 375961e4d61..7a42e53ced4 100755 --- a/debug/org.eclipse.debug.examples.mixedmode/.classpath +++ b/debug/org.eclipse.debug.examples.mixedmode/.classpath @@ -1,6 +1,6 @@ - + diff --git a/debug/org.eclipse.debug.examples.mixedmode/.settings/org.eclipse.jdt.core.prefs b/debug/org.eclipse.debug.examples.mixedmode/.settings/org.eclipse.jdt.core.prefs index bf59df13ac6..e4848a1c055 100644 --- a/debug/org.eclipse.debug.examples.mixedmode/.settings/org.eclipse.jdt.core.prefs +++ b/debug/org.eclipse.debug.examples.mixedmode/.settings/org.eclipse.jdt.core.prefs @@ -19,9 +19,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=25 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.compliance=25 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -136,7 +136,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 +org.eclipse.jdt.core.compiler.source=25 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING diff --git a/debug/org.eclipse.debug.examples.mixedmode/META-INF/MANIFEST.MF b/debug/org.eclipse.debug.examples.mixedmode/META-INF/MANIFEST.MF index 4fcc1fd31ab..eba843f8c28 100755 --- a/debug/org.eclipse.debug.examples.mixedmode/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.debug.examples.mixedmode/META-INF/MANIFEST.MF @@ -10,5 +10,5 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.208.0", org.eclipse.debug.ui;bundle-version="3.10.0" Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.debug.internal.examples.mixedmode;x-internal:=true -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Automatic-Module-Name: org.eclipse.debug.examples.mixedmode diff --git a/debug/org.eclipse.debug.examples.ui/.classpath b/debug/org.eclipse.debug.examples.ui/.classpath index 375961e4d61..7a42e53ced4 100644 --- a/debug/org.eclipse.debug.examples.ui/.classpath +++ b/debug/org.eclipse.debug.examples.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/debug/org.eclipse.debug.examples.ui/.settings/org.eclipse.jdt.core.prefs b/debug/org.eclipse.debug.examples.ui/.settings/org.eclipse.jdt.core.prefs index 8d75a44062d..13c7c65eb53 100644 --- a/debug/org.eclipse.debug.examples.ui/.settings/org.eclipse.jdt.core.prefs +++ b/debug/org.eclipse.debug.examples.ui/.settings/org.eclipse.jdt.core.prefs @@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=25 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.compliance=25 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -140,7 +140,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 +org.eclipse.jdt.core.compiler.source=25 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING diff --git a/debug/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF index d84af91d7af..d1bb36740f2 100644 --- a/debug/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Export-Package: org.eclipse.debug.examples.ui.midi.adapters;x-internal:=true, org.eclipse.debug.examples.ui.pda.launcher;x-internal:=true, org.eclipse.debug.examples.ui.pda.presentation;x-internal:=true, org.eclipse.debug.examples.ui.pda.views;x-internal:=true -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Automatic-Module-Name: org.eclipse.debug.examples.ui diff --git a/debug/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiMainTab.java b/debug/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiMainTab.java index 68310450e2f..5c45bbaaa22 100644 --- a/debug/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiMainTab.java +++ b/debug/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiMainTab.java @@ -78,7 +78,7 @@ public void createControl(Composite parent) { gd = new GridData(GridData.FILL_HORIZONTAL); fFileText.setLayoutData(gd); fFileText.setFont(font); - fFileText.addModifyListener(event -> updateLaunchConfigurationDialog()); + fFileText.addModifyListener(_ -> updateLaunchConfigurationDialog()); fFileButton = createPushButton(comp, "&Browse...", null); //$NON-NLS-1$ fFileButton.addSelectionListener(new SelectionAdapter() { diff --git a/debug/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAVirtualFindAction.java b/debug/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAVirtualFindAction.java index 4331995ba13..59b3f12e024 100644 --- a/debug/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAVirtualFindAction.java +++ b/debug/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAVirtualFindAction.java @@ -261,7 +261,7 @@ public void run() { private int calcUpdatesCount(IModelDelta stateDelta) { final int[] count = new int[] {0}; - IModelDeltaVisitor deltaCounter = (delta, depth) -> { + IModelDeltaVisitor deltaCounter = (delta, _) -> { if ((delta.getFlags() & IModelDelta.EXPAND) != 0) { count[0] += delta.getChildCount(); return true; diff --git a/debug/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDAMainTab.java b/debug/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDAMainTab.java index b05c1fe3a0c..5b5b7a3ac7d 100644 --- a/debug/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDAMainTab.java +++ b/debug/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDAMainTab.java @@ -73,7 +73,7 @@ public void createControl(Composite parent) { gd = new GridData(GridData.FILL_HORIZONTAL); fProgramText.setLayoutData(gd); fProgramText.setFont(font); - fProgramText.addModifyListener(event -> updateLaunchConfigurationDialog()); + fProgramText.addModifyListener(_ -> updateLaunchConfigurationDialog()); fProgramButton = createPushButton(comp, "&Browse...", null); //$NON-NLS-1$ fProgramButton.addSelectionListener(new SelectionAdapter() { diff --git a/debug/org.eclipse.debug.tests/.classpath b/debug/org.eclipse.debug.tests/.classpath index c9bfedfe9ca..d0198cd6cd1 100644 --- a/debug/org.eclipse.debug.tests/.classpath +++ b/debug/org.eclipse.debug.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/debug/org.eclipse.debug.tests/.settings/org.eclipse.jdt.core.prefs b/debug/org.eclipse.debug.tests/.settings/org.eclipse.jdt.core.prefs index a0b26e19558..fba790e10a6 100644 --- a/debug/org.eclipse.debug.tests/.settings/org.eclipse.jdt.core.prefs +++ b/debug/org.eclipse.debug.tests/.settings/org.eclipse.jdt.core.prefs @@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=25 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.compliance=25 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -140,7 +140,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 +org.eclipse.jdt.core.compiler.source=25 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING diff --git a/debug/org.eclipse.debug.tests/META-INF/MANIFEST.MF b/debug/org.eclipse.debug.tests/META-INF/MANIFEST.MF index 1dd65e70878..d71cf8970a9 100644 --- a/debug/org.eclipse.debug.tests/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.debug.tests/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.208.0,4.0.0)", org.eclipse.jface.text;bundle-version="[3.30.0,4.0.0)", org.eclipse.ui.workbench.texteditor;bundle-version="[3.20.0,4.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Bundle-Vendor: %providerName Export-Package: org.eclipse.debug.tests, org.eclipse.debug.tests.breakpoint, diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/TestBreakpoint.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/TestBreakpoint.java index 0f7e76e612a..1e1f73f0ccf 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/TestBreakpoint.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/TestBreakpoint.java @@ -42,7 +42,7 @@ public TestBreakpoint() { TestBreakpoint(String text, final String markerType) { final IResource resource = ResourcesPlugin.getWorkspace().getRoot(); - IWorkspaceRunnable wr = monitor -> { + IWorkspaceRunnable wr = _ -> { // create the marker setMarker(resource.createMarker(markerType)); ensureMarker().setAttribute(ID, getModelIdentifier()); diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleDocumentAdapterTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleDocumentAdapterTests.java index 98f726b3552..805321dfcbb 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleDocumentAdapterTests.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleDocumentAdapterTests.java @@ -943,7 +943,7 @@ public void testChangeDocument() { @Test public void testInvalidInvocations() { final AtomicInteger expectedErrors = new AtomicInteger(0); - final ILogListener logListener = (status, plugin) -> { + final ILogListener logListener = (status, _) -> { if (status.matches(IStatus.ERROR)) { expectedErrors.decrementAndGet(); } diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleMock.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleMock.java index b5b866504a1..68bbe4ca2d9 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleMock.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleMock.java @@ -87,7 +87,7 @@ public void createControl(Composite parent) { super.createControl(parent); // This listener is get called if the page is really shown // in the console view - getControl().addListener(SWT.Show, event -> { + getControl().addListener(SWT.Show, _ -> { int count = showCalled.incrementAndGet(); if (count == 1) { count = allShownConsoles.incrementAndGet(); diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/IOConsoleTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/IOConsoleTests.java index b697821a3fd..8af6d227db9 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/IOConsoleTests.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/IOConsoleTests.java @@ -98,7 +98,7 @@ public class IOConsoleTests { private final Queue loggedErrors = new ConcurrentLinkedQueue<>(); /** Listener to count error messages while testing. */ - private final ILogListener errorLogListener = (IStatus status, String plugin) -> { + private final ILogListener errorLogListener = (IStatus status, String _) -> { if (status.matches(IStatus.ERROR)) { loggedErrors.add(status); } @@ -326,9 +326,9 @@ public void testInputFile() throws Exception { final IOConsoleTestUtil c = getTestUtil("Test input file"); // open default output stream to match usual behavior where two output // streams are open and to prevent premature console closing - try (IOConsoleOutputStream defaultOutputStream = c.getDefaultOutputStream()) { + try (IOConsoleOutputStream _ = c.getDefaultOutputStream()) { try (InputStream in = new ByteArrayInputStream(new byte[0])) { - try (InputStream defaultIn = c.getConsole().getInputStream()) { + try (InputStream _ = c.getConsole().getInputStream()) { // just close input stream } c.getConsole().setInputStream(in); diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ProcessConsoleTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ProcessConsoleTests.java index 4bc7cb528ff..88c58f845b7 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ProcessConsoleTests.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ProcessConsoleTests.java @@ -98,7 +98,7 @@ public class ProcessConsoleTests { private final List loggedErrors = Collections.synchronizedList(new ArrayList<>()); /** Listener to count error messages in {@link ConsolePlugin} log. */ - private final ILogListener errorLogListener = (status, plugin) -> { + private final ILogListener errorLogListener = (status, _) -> { if (status.matches(IStatus.ERROR)) { loggedErrors.add(status); } diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchGroupTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchGroupTests.java index 2d3be5c6015..5b2b37905bc 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchGroupTests.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchGroupTests.java @@ -393,7 +393,7 @@ public boolean buildForLaunch(ILaunchConfiguration configuration, String mode, I private static DummyStream attachDummyProcess(final ILaunch l) { final DummyStream dummy = new DummyStream(); - final InvocationHandler streamProxyHandler = (proxy, method, args) -> { + final InvocationHandler streamProxyHandler = (_, method, _) -> { String name = method.getName(); if (name.equals("getOutputStreamMonitor")) { //$NON-NLS-1$ return dummy; diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/ui/ResumeOthersCommandTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/ui/ResumeOthersCommandTests.java index 4c1e57f18d0..2a4ef8a64a6 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/ui/ResumeOthersCommandTests.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/ui/ResumeOthersCommandTests.java @@ -64,7 +64,7 @@ void run(Object[] targets) throws Exception { private static IDebugTarget createTargetProxy(Supplier threadsSupplier) { return (IDebugTarget) Proxy.newProxyInstance(ResumeOthersCommandTests.class.getClassLoader(), new Class[] { - IDebugTarget.class }, (proxy, method, args) -> (switch (method.getName()) { + IDebugTarget.class }, (proxy, method, _) -> (switch (method.getName()) { case "getThreads" -> threadsSupplier.get(); case "hasThreads" -> { IThread[] threads = threadsSupplier.get(); @@ -78,7 +78,7 @@ private static IDebugTarget createTargetProxy(Supplier threadsSupplie private static IThread createThreadProxy(Supplier targetSupplier) { AtomicBoolean suspended = new AtomicBoolean(true); return (IThread) Proxy.newProxyInstance(ResumeOthersCommandTests.class.getClassLoader(), new Class[] { - IThread.class }, (proxy, method, args) -> (switch (method.getName()) { + IThread.class }, (_, method, _) -> (switch (method.getName()) { case "canResume" -> suspended.get(); case "resume" -> { suspended.set(false); diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/JFaceViewerTopIndexTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/JFaceViewerTopIndexTests.java index 38190fc61d7..6c1b9f24783 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/JFaceViewerTopIndexTests.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/JFaceViewerTopIndexTests.java @@ -413,7 +413,7 @@ public void testRestoreRevealAfterRevealCancel2() throws Exception { // Update the viewer with new selection delta to something new in the view TreePath pathToBeRevealed = model.findElement("2.1"); //$NON-NLS-1$ ModelDelta revealDelta = model.makeElementDelta(pathToBeRevealed, IModelDelta.REVEAL); - revealDelta.accept((delta, depth) -> { + revealDelta.accept((delta, _) -> { ((ModelDelta) delta).setFlags(delta.getFlags() | IModelDelta.EXPAND); return true; }); diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/UpdateTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/UpdateTests.java index 9447c8d2f35..1cb94996cdb 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/UpdateTests.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/UpdateTests.java @@ -308,7 +308,7 @@ public void testInsertAtInvalidIndex() throws Exception { final int insertIndex = model.getRootElement().getChildren().length; ModelDelta delta = model.insertElementChild(TreePath.EMPTY, insertIndex, new TestElement(model, "last - invalid index", new TestElement[0])); //$NON-NLS-1$ // Change insert index to out of range - delta.accept((visitorDelta, depth) -> { + delta.accept((visitorDelta, _) -> { if ((visitorDelta.getFlags() & IModelDelta.INSERTED) != 0) { ((ModelDelta) visitorDelta).setIndex(insertIndex + 1); return false; diff --git a/debug/org.eclipse.debug.ui.launchview.tests/.classpath b/debug/org.eclipse.debug.ui.launchview.tests/.classpath index 1aa9eca95a0..2198f331b94 100644 --- a/debug/org.eclipse.debug.ui.launchview.tests/.classpath +++ b/debug/org.eclipse.debug.ui.launchview.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/debug/org.eclipse.debug.ui.launchview.tests/.settings/org.eclipse.jdt.core.prefs b/debug/org.eclipse.debug.ui.launchview.tests/.settings/org.eclipse.jdt.core.prefs index c307395bc35..cc635cd4a87 100644 --- a/debug/org.eclipse.debug.ui.launchview.tests/.settings/org.eclipse.jdt.core.prefs +++ b/debug/org.eclipse.debug.ui.launchview.tests/.settings/org.eclipse.jdt.core.prefs @@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=25 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.compliance=25 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -140,7 +140,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 +org.eclipse.jdt.core.compiler.source=25 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING diff --git a/debug/org.eclipse.debug.ui.launchview.tests/META-INF/MANIFEST.MF b/debug/org.eclipse.debug.ui.launchview.tests/META-INF/MANIFEST.MF index a37ed58e6e7..65b830bd4ef 100644 --- a/debug/org.eclipse.debug.ui.launchview.tests/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.debug.ui.launchview.tests/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)", Import-Package: org.junit.jupiter.api;version="[5.14.0,6.0.0)", org.junit.platform.suite.api;version="[1.14.0,2.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Bundle-Vendor: %providerName Eclipse-BundleShape: dir Automatic-Module-Name: org.eclipse.debug.ui.launchview.tests diff --git a/resources/examples/org.eclipse.ui.examples.filesystem/.classpath b/resources/examples/org.eclipse.ui.examples.filesystem/.classpath index 375961e4d61..7a42e53ced4 100644 --- a/resources/examples/org.eclipse.ui.examples.filesystem/.classpath +++ b/resources/examples/org.eclipse.ui.examples.filesystem/.classpath @@ -1,6 +1,6 @@ - + diff --git a/resources/examples/org.eclipse.ui.examples.filesystem/.settings/org.eclipse.jdt.core.prefs b/resources/examples/org.eclipse.ui.examples.filesystem/.settings/org.eclipse.jdt.core.prefs index d907e64c349..01e5a2beaf3 100644 --- a/resources/examples/org.eclipse.ui.examples.filesystem/.settings/org.eclipse.jdt.core.prefs +++ b/resources/examples/org.eclipse.ui.examples.filesystem/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=25 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.compliance=25 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -13,7 +13,7 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 +org.eclipse.jdt.core.compiler.source=25 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/resources/examples/org.eclipse.ui.examples.filesystem/META-INF/MANIFEST.MF b/resources/examples/org.eclipse.ui.examples.filesystem/META-INF/MANIFEST.MF index 325dc32f3e9..6d773f78da7 100644 --- a/resources/examples/org.eclipse.ui.examples.filesystem/META-INF/MANIFEST.MF +++ b/resources/examples/org.eclipse.ui.examples.filesystem/META-INF/MANIFEST.MF @@ -12,4 +12,4 @@ Require-Bundle: org.eclipse.core.filesystem, org.eclipse.osgi, org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 diff --git a/resources/examples/org.eclipse.ui.examples.filesystem/src/org/eclipse/ui/examples/filesystem/NestedProjectCreator.java b/resources/examples/org.eclipse.ui.examples.filesystem/src/org/eclipse/ui/examples/filesystem/NestedProjectCreator.java index 6ad9d4c4c91..e7fd78e813a 100644 --- a/resources/examples/org.eclipse.ui.examples.filesystem/src/org/eclipse/ui/examples/filesystem/NestedProjectCreator.java +++ b/resources/examples/org.eclipse.ui.examples.filesystem/src/org/eclipse/ui/examples/filesystem/NestedProjectCreator.java @@ -69,7 +69,7 @@ public void createNestedProjects(IProject[] projects, Shell parentShell) { private void doCreateNestedProjects(final IProject[] projects, Shell shell) throws InvocationTargetException, InterruptedException { final Object[] result = new Object[1]; - context.run(true, true, monitor -> result[0] = findNestedProjects(projects)); + context.run(true, true, _ -> result[0] = findNestedProjects(projects)); if (result[0] == null) return; IProjectDescription[] rawDescriptions = (IProjectDescription[]) result[0]; diff --git a/resources/tests/org.eclipse.core.tests.resources/.classpath b/resources/tests/org.eclipse.core.tests.resources/.classpath index 427e49b0d47..d0198cd6cd1 100644 --- a/resources/tests/org.eclipse.core.tests.resources/.classpath +++ b/resources/tests/org.eclipse.core.tests.resources/.classpath @@ -1,6 +1,6 @@ - + diff --git a/resources/tests/org.eclipse.core.tests.resources/.settings/org.eclipse.jdt.core.prefs b/resources/tests/org.eclipse.core.tests.resources/.settings/org.eclipse.jdt.core.prefs index 9023fcc6884..523c82a52be 100644 --- a/resources/tests/org.eclipse.core.tests.resources/.settings/org.eclipse.jdt.core.prefs +++ b/resources/tests/org.eclipse.core.tests.resources/.settings/org.eclipse.jdt.core.prefs @@ -16,9 +16,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=25 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=25 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -122,7 +122,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=25 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 diff --git a/resources/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF b/resources/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF index f4c074d7ad0..67609896715 100644 --- a/resources/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF +++ b/resources/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF @@ -45,6 +45,6 @@ Import-Package: org.assertj.core.api, org.junit.platform.suite.api;version="[1.14.0,2.0.0)", org.mockito Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Eclipse-BundleShape: dir Automatic-Module-Name: org.eclipse.core.tests.resources diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/AutoBuildJobTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/AutoBuildJobTest.java index aeb96d2b511..5c14e80ad03 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/AutoBuildJobTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/AutoBuildJobTest.java @@ -148,7 +148,7 @@ public void testExtraBuildIfBuildRequestedFromOtherThreadDuringRun() throws Exce public IProject[] build(int kind, Map args, IProgressMonitor monitor) throws CoreException { // Simulate someone requests autobuild in parallel to already running autobuild. // That shouldn't be ignored, otherwise no build may happen - Job job = Job.createSystem("", (ICoreRunnable) m -> requestAutoBuildJobExecution()); + Job job = Job.createSystem("", (ICoreRunnable) _ -> requestAutoBuildJobExecution()); job.schedule(); try { job.join(); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuilderTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuilderTest.java index ef167ed32fc..29c94378f6e 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuilderTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuilderTest.java @@ -373,7 +373,7 @@ public void testPreBuildEvent() throws CoreException { // Create some resource handles final boolean[] notified = new boolean[] {false}; IProject proj1 = workspace.getRoot().getProject("PROJECT" + 1); - final IResourceChangeListener listener = event -> notified[0] = true; + final IResourceChangeListener listener = _ -> notified[0] = true; try { workspace.addResourceChangeListener(listener, IResourceChangeEvent.PRE_BUILD); // Turn auto-building off @@ -483,7 +483,7 @@ public void testChangeDynamicBuildOrder() throws CoreException { setAutoBuilding(true); setBuildOrder((IProject[]) null); // Create and set a build spec for project two - getWorkspace().run((IWorkspaceRunnable) monitor -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { proj2.create(createTestMonitor()); proj2.open(createTestMonitor()); IProjectDescription desc = proj2.getDescription(); @@ -497,7 +497,7 @@ public void testChangeDynamicBuildOrder() throws CoreException { verifier.reset(); //create project two and establish a build order by adding a dynamic //reference from proj2->proj1 in the same operation - getWorkspace().run((IWorkspaceRunnable) monitor -> extracted(proj1, proj2), createTestMonitor()); + getWorkspace().run((IWorkspaceRunnable) _ -> extracted(proj1, proj2), createTestMonitor()); waitForBuild(); //ensure the build happened in the correct order, and that both projects were built @@ -557,7 +557,7 @@ public void testChangeDynamicBuildOrderDuringPreBuild() throws Throwable { Function::identity); // Add pre-build listener that swap around the dependencies - IResourceChangeListener buildListener = event -> { + IResourceChangeListener buildListener = _ -> { try { IProjectDescription desc1 = proj1.getDescription(); IProjectDescription desc2 = proj2.getDescription(); @@ -811,7 +811,7 @@ public void testExceptionBuilder() throws CoreException { project.setDescription(desc, createTestMonitor()); final AtomicReference listenerCalled = new AtomicReference<>(); - IResourceChangeListener listener = event -> listenerCalled.set(true); + IResourceChangeListener listener = _ -> listenerCalled.set(true); try { getWorkspace().addResourceChangeListener(listener, IResourceChangeEvent.POST_BUILD); // do an incremental build -- build should fail, but POST_BUILD should still @@ -902,7 +902,7 @@ public void testIncrementalBuildBeforeAutobuild() throws Exception { //change the file and then immediately perform build final ByteArrayOutputStream out = new ByteArrayOutputStream(); AtomicReference exception = new AtomicReference<>(); - getWorkspace().run((IWorkspaceRunnable) monitor -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { input.setContents(new byte[] { 5, 4, 3, 2, 1 }, IResource.NONE, createTestMonitor()); project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, createTestMonitor()); try (InputStream inputStream = output.getContents()) { @@ -950,7 +950,7 @@ public void testInterruptAutobuild() throws Exception { final TestBarrier2 barrier = new TestBarrier2(); barrier.setStatus(TestBarrier2.STATUS_WAIT_FOR_START); //install a listener that will cause autobuild to be interrupted - IResourceChangeListener listener = event -> { + IResourceChangeListener listener = _ -> { blockedJob.schedule(); //wait for autobuild to become blocking while (!Job.getJobManager().currentJob().isBlocking()) { @@ -1115,7 +1115,7 @@ public void testTurnOnAutobuild() throws CoreException { // Now make a change and then turn autobuild on. Turning it on should // cause a build. - IWorkspaceRunnable r = monitor -> { + IWorkspaceRunnable r = _ -> { file.setContents(createRandomContentsStream(), IResource.NONE, createTestMonitor()); IWorkspaceDescription description = getWorkspace().getDescription(); description.setAutoBuilding(true); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/ComputeProjectOrderTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/ComputeProjectOrderTest.java index 7f8be68ed6b..f052a1adfcf 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/ComputeProjectOrderTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/ComputeProjectOrderTest.java @@ -58,7 +58,7 @@ public void testFilterDigraphDuration() { } // keep everything long timestamp = System.currentTimeMillis(); - Digraph filtered = ComputeProjectOrder.buildFilteredDigraph(digraph, o -> false, Object.class); + Digraph filtered = ComputeProjectOrder.buildFilteredDigraph(digraph, _ -> false, Object.class); assertEquals(digraph.vertexMap.keySet(), filtered.vertexMap.keySet()); long duration = System.currentTimeMillis() - timestamp; System.err.println(duration); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/MultiProjectBuildTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/MultiProjectBuildTest.java index f03be1ab353..84d55e16ae0 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/MultiProjectBuildTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/MultiProjectBuildTest.java @@ -69,7 +69,7 @@ private IProject[][] interestingProjects() { * Modifies any files in the given projects, all in a single operation */ private void dirty(final IProject[] projects) throws CoreException { - getWorkspace().run((IWorkspaceRunnable) monitor -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { for (IProject project : projects) { for (IResource member : project.members()) { if (member.getType() == IResource.FILE && !member.getName().equals(IProjectDescription.DESCRIPTION_FILE_NAME)) { diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/RelaxedSchedRuleBuilderTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/RelaxedSchedRuleBuilderTest.java index c458e812042..d186095519e 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/RelaxedSchedRuleBuilderTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/RelaxedSchedRuleBuilderTest.java @@ -605,7 +605,7 @@ private void invokeTestBug343256(IProject project, ISchedulingRule[] getRules, I private static class ErrorLogging { private final Queue loggedErrors = new ConcurrentLinkedQueue<>(); - private final ILogListener errorLogListener = (IStatus status, String plugin) -> { + private final ILogListener errorLogListener = (IStatus status, String _) -> { if (status.matches(IStatus.ERROR)) { loggedErrors.add(status); } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/events/BuildManagerRuleConflictMessageTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/events/BuildManagerRuleConflictMessageTest.java index e5f3a4a72e2..8b760a91b75 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/events/BuildManagerRuleConflictMessageTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/events/BuildManagerRuleConflictMessageTest.java @@ -106,7 +106,7 @@ protected IProject[] build(int kind, Map args, IProgressMonitor private static IBuildConfiguration stubBuildConfiguration(IProject project) { return (IBuildConfiguration) Proxy.newProxyInstance(IBuildConfiguration.class.getClassLoader(), - new Class[] { IBuildConfiguration.class }, (proxy, method, args) -> { + new Class[] { IBuildConfiguration.class }, (_, method, _) -> { if ("getProject".equals(method.getName())) { return project; } @@ -117,7 +117,7 @@ private static IBuildConfiguration stubBuildConfiguration(IProject project) { private static IProject stubProject(String path) { IPath fullPath = IPath.fromPortableString(path); return (IProject) Proxy.newProxyInstance(IProject.class.getClassLoader(), - new Class[] { IProject.class }, (proxy, method, args) -> { + new Class[] { IProject.class }, (_, method, _) -> { if ("getFullPath".equals(method.getName())) { return fullPath; } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/FileSystemResourceManagerTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/FileSystemResourceManagerTest.java index 8c8d955c491..7ccd6279548 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/FileSystemResourceManagerTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/FileSystemResourceManagerTest.java @@ -202,7 +202,7 @@ public void testIsLocal() throws CoreException { // test the depth parameter final IFolder folder = project.getFolder("Folder1"); - IWorkspaceRunnable operation = monitor -> { + IWorkspaceRunnable operation = _ -> { IResource[] members = folder.members(); for (IResource member : members) { ((Resource) member).getResourceInfo(false, true).clear(M_LOCAL_EXISTS); @@ -400,7 +400,7 @@ public void testWriteProject() throws CoreException { final IFileStore fileStore = ((Resource) project).getStore(); // create project and then delete from file system // wrap in runnable to prevent snapshot from occurring in the middle. - getWorkspace().run((IWorkspaceRunnable) monitor -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { removeFromFileSystem(project); assertFalse(fileStore.fetchInfo().isDirectory()); //write project in a runnable, otherwise tree will be locked @@ -459,7 +459,7 @@ protected void write(final IFile file, final InputStream contents, final boolean } private void write(final IFolder folder, final boolean force, IProgressMonitor monitor) throws CoreException { - IWorkspaceRunnable operation = pm -> getLocalManager().write(folder, force, monitor); + IWorkspaceRunnable operation = _ -> getLocalManager().write(folder, force, monitor); getWorkspace().run(operation, monitor); } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/MoveTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/MoveTest.java index 0b506f6b91f..840b5986349 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/MoveTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/MoveTest.java @@ -479,14 +479,14 @@ public void testMoveResource() throws Exception { IFile ghostFile = project.getFile("ghost"); final IFile hackFile = ghostFile; final Workspace workspace = (Workspace) getWorkspace(); - IWorkspaceRunnable operation = monitor -> workspace.createResource(hackFile, false); + IWorkspaceRunnable operation = _ -> workspace.createResource(hackFile, false); workspace.run(operation, null); IFile fileDestination = project.getFile("destination"); assertThrows(CoreException.class, () -> ghostFile.move(fileDestination.getFullPath(), true, null)); /* move file over a phantom */ assertTrue(ghostFile.exists()); - operation = monitor -> ((Resource) hackFile).convertToPhantom(); + operation = _ -> ((Resource) hackFile).convertToPhantom(); workspace.run(operation, null); assertFalse(ghostFile.exists()); ResourceInfo info = ((File) ghostFile).getResourceInfo(true, false); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/RefreshLocalTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/RefreshLocalTest.java index 429c555c19f..03095a17167 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/RefreshLocalTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/RefreshLocalTest.java @@ -176,7 +176,7 @@ public void testRefreshFolder() throws Throwable { IFile file = project.getFile("file"); final IFile hackFile = file; final Workspace workspace = (Workspace) getWorkspace(); - IWorkspaceRunnable operation = monitor -> { + IWorkspaceRunnable operation = _ -> { workspace.createResource(hackFile, false); ((Resource) hackFile).getResourceInfo(false, true).set(M_LOCAL_EXISTS); }; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/SymlinkResourceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/SymlinkResourceTest.java index 288a0ee4cd2..f0bc8cee8f8 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/SymlinkResourceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/SymlinkResourceTest.java @@ -103,7 +103,7 @@ public void testGithubBug2220(boolean useAdvancedLinkCheck) throws Exception { createInWorkspace(project); /* Re-use projects which are cleaned up automatically */ - getWorkspace().run((IWorkspaceRunnable) monitor -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { /* delete open project because we must re-open with BACKGROUND_REFRESH */ project.delete(IResource.NEVER_DELETE_PROJECT_CONTENT, createTestMonitor()); project.create(null); @@ -178,7 +178,7 @@ public void testBug232426() throws Exception { IProject project = getWorkspace().getRoot().getProject("Project"); createInWorkspace(project); /* Re-use projects which are cleaned up automatically */ - getWorkspace().run((IWorkspaceRunnable) monitor -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { /* delete open project because we must re-open with BACKGROUND_REFRESH */ project.delete(IResource.NEVER_DELETE_PROJECT_CONTENT, createTestMonitor()); project.create(null); @@ -216,7 +216,7 @@ public void testBug358830(boolean useAdvancedLinkCheck) throws Exception { IProject project = getWorkspace().getRoot().getProject("Project"); createInWorkspace(project); /* Re-use projects which are cleaned up automatically */ - getWorkspace().run((IWorkspaceRunnable) monitor -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { /* delete open project because we must re-open with BACKGROUND_REFRESH */ project.delete(IResource.NEVER_DELETE_PROJECT_CONTENT, createTestMonitor()); project.create(null); @@ -231,7 +231,7 @@ public void testBug358830(boolean useAdvancedLinkCheck) throws Exception { // wait for BACKGROUND_REFRESH to complete. waitForRefresh(); final int resourceCount[] = new int[] { 0 }; - project.accept(resource -> { + project.accept(_ -> { resourceCount[0]++; return true; }); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/UnifiedTreeTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/UnifiedTreeTest.java index d0517a45e45..ebae228ccdb 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/UnifiedTreeTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/UnifiedTreeTest.java @@ -70,7 +70,7 @@ protected void createFiles(IFileStore folder, Hashtable set) thr protected void createFiles(final IContainer target, final Hashtable set) throws CoreException { final Workspace workspace = (Workspace) getWorkspace(); - IWorkspaceRunnable operation = monitor -> { + IWorkspaceRunnable operation = _ -> { for (int i = 0; i < LIMIT; i++) { IFile child = target.getFile(IPath.fromOSString("wbFile" + i)); workspace.createResource(child, false); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ModelObjectReaderWriterTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ModelObjectReaderWriterTest.java index 6c79fb6532f..3e217f22ee3 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ModelObjectReaderWriterTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ModelObjectReaderWriterTest.java @@ -541,8 +541,7 @@ public void testMultipleProjectDescriptions() throws Throwable { ProjectDescriptionReader reader = new ProjectDescriptionReader(getWorkspace()); for (int i = 0; i < members.length; i++) { - URL currentURL = null; - currentURL = new URL(whereToLook, members[i]); + URL currentURL = whereToLook.toURI().resolve(members[i]).toURL(); try (InputStream is = currentURL.openStream()) { InputSource in = new InputSource(is); ProjectDescription description = reader.read(in); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectDynamicReferencesTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectDynamicReferencesTest.java index 983d68fbfe9..86429a27be6 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectDynamicReferencesTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectDynamicReferencesTest.java @@ -264,7 +264,7 @@ public List getDependentProjects(IBuildConfiguration buildConfiguratio } public static void addReference(IProject project, IProject dependentProject) { - List depProjects = dependentProjects.computeIfAbsent(project, proj -> new ArrayList<>()); + List depProjects = dependentProjects.computeIfAbsent(project, _ -> new ArrayList<>()); depProjects.add(dependentProject); } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectPreferencesTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectPreferencesTest.java index 4b3dfb79583..9b0412b7a1e 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectPreferencesTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectPreferencesTest.java @@ -516,7 +516,7 @@ public void test_61843() throws Exception { } // add a log listener to ensure that no errors are reported silently - ILogListener logListener = (status, plugin) -> { + ILogListener logListener = (status, _) -> { Throwable exception = status.getException(); if (exception == null || !(exception instanceof CoreException coreException)) { return; @@ -525,7 +525,7 @@ public void test_61843() throws Exception { }; // listener to react to changes in the workspace - IResourceChangeListener rclistener = event -> new ProjectScope(project).getNode(qualifier); + IResourceChangeListener rclistener = _ -> new ProjectScope(project).getNode(qualifier); // add the listeners try { diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/WorkspaceConcurrencyTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/WorkspaceConcurrencyTest.java index 34ef623ee51..3d0dcd8db0d 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/WorkspaceConcurrencyTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/WorkspaceConcurrencyTest.java @@ -62,7 +62,7 @@ private void sleep(long duration) { public void testEndRuleInWorkspaceOperation() { final IProject project = getWorkspace().getRoot().getProject("testEndRuleInWorkspaceOperation"); assertThrows(RuntimeException.class, - () -> getWorkspace().run((IWorkspaceRunnable) monitor -> Job.getJobManager().endRule(project), project, + () -> getWorkspace().run((IWorkspaceRunnable) _ -> Job.getJobManager().endRule(project), project, IResource.NONE, createTestMonitor())); } @@ -78,7 +78,7 @@ public void testCancelOnBlocked() throws Throwable { //simulating a scenario where workspace lock is held indefinitely final AtomicIntegerArray barrier = new AtomicIntegerArray(new int[1]); final AtomicReference errorInListener = new AtomicReference<>(); - IResourceChangeListener listener = event -> { + IResourceChangeListener listener = _ -> { //block until we are told to do otherwise barrier.set(0, TestBarrier2.STATUS_START); try { @@ -105,7 +105,7 @@ public void testCancelOnBlocked() throws Throwable { final AtomicReference errorInThread = new AtomicReference<>(); Thread t2 = new Thread(() -> { try { - getWorkspace().run((IWorkspaceRunnable) monitor -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { //no-op }, new CancelingProgressMonitor()); } catch (CoreException e1) { @@ -150,7 +150,7 @@ public boolean isConflicting(ISchedulingRule schedulingRule) { return schedulingRule == this; } }; - getWorkspace().run((IWorkspaceRunnable) monitor -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { // noop }, rule, IResource.NONE, createTestMonitor()); } @@ -177,7 +177,7 @@ public void testRunWhileBuilding() throws Throwable { createInWorkspace(touch); createInWorkspace(ruleFile); AtomicReference failure = new AtomicReference<>(); - IResourceChangeListener listener = event -> { + IResourceChangeListener listener = _ -> { try { touch.touch(null); } catch (CoreException | RuntimeException e2) { @@ -215,7 +215,7 @@ protected IStatus run(IProgressMonitor monitor) { @Override protected IStatus run(IProgressMonitor monitor) { try { - workspace.run((IWorkspaceRunnable) monitor1 -> { + workspace.run((IWorkspaceRunnable) _ -> { //signal that this job has started status.set(1, TestBarrier2.STATUS_RUNNING); //let job one finish @@ -235,7 +235,7 @@ protected IStatus run(IProgressMonitor monitor) { @Override protected IStatus run(IProgressMonitor monitor) { try { - workspace.run((IWorkspaceRunnable) monitor1 -> { + workspace.run((IWorkspaceRunnable) _ -> { //signal that this job has started status.set(2, TestBarrier2.STATUS_RUNNING); //let job two finish diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/watson/ElementTreeIteratorTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/watson/ElementTreeIteratorTest.java index b23c256a670..747eeeb02e0 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/watson/ElementTreeIteratorTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/watson/ElementTreeIteratorTest.java @@ -67,7 +67,7 @@ public void testConcurrentModification() { final ElementTree tree = baseTree.newEmptyDelta(); modifyTree(tree); final ArrayList elts = new ArrayList<>(); - final IElementContentVisitor visitor = (tree1, requestor, info) -> { + final IElementContentVisitor visitor = (_, _, info) -> { elts.add(info); return true; }; @@ -100,7 +100,7 @@ public void testContentIterator() { int n = 3; setupElementTree(tree, n); final ArrayList elts = new ArrayList<>(); - IElementContentVisitor elementVisitor = (tree1, requestor, info) -> { + IElementContentVisitor elementVisitor = (_, requestor, _) -> { elts.add(requestor.requestPath()); return true; }; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/CharsetTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/CharsetTest.java index 141b46adfff..738907dda10 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/CharsetTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/CharsetTest.java @@ -1153,7 +1153,7 @@ public void testDeltasFile() throws CoreException { verifier.addExpectedChange(new IResource[] {file1, file2}, IResourceDelta.CHANGED, IResourceDelta.ENCODING); verifier.addExpectedChange(prefs.getParent(), IResourceDelta.CHANGED, 0); verifier.addExpectedChange(prefs, IResourceDelta.CHANGED, IResourceDelta.CONTENT); - workspace.run((IWorkspaceRunnable) monitor -> { + workspace.run((IWorkspaceRunnable) _ -> { file1.setCharset("FOO", createTestMonitor()); file2.setCharset("FOO", createTestMonitor()); }, createTestMonitor()); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/HiddenResourceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/HiddenResourceTest.java index 03b5743e3ff..c205f61ace0 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/HiddenResourceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/HiddenResourceTest.java @@ -452,7 +452,7 @@ public void testDeltas(TestInfo testInfo) throws CoreException { final IResource[] resources = new IResource[] { project, folder, file, subFile, settings, prefs }; final ResourceDeltaVerifier listener = new ResourceDeltaVerifier(); try { - IWorkspaceRunnable body = monitor -> createInWorkspace(resources); + IWorkspaceRunnable body = _ -> createInWorkspace(resources); listener.addExpectedChange(resources, IResourceDelta.ADDED, IResource.NONE); listener.addExpectedChange(project, IResourceDelta.ADDED, IResourceDelta.OPEN); listener.addExpectedChange(description, IResourceDelta.ADDED, IResource.NONE); @@ -469,7 +469,7 @@ public void testDeltas(TestInfo testInfo) throws CoreException { } try { - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { createInWorkspace(resources); setHidden(folder, true, IResource.DEPTH_ZERO); }; @@ -488,7 +488,7 @@ public void testDeltas(TestInfo testInfo) throws CoreException { } try { - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { createInWorkspace(resources); setHidden(project, true, IResource.DEPTH_INFINITE); }; @@ -512,14 +512,14 @@ private void removeResourceChangeListener(final ResourceDeltaVerifier listener) // otherwise it would be removed while auto refresh is running // and might even get called in another thread after removing in this thread listener.shutDown(); - getWorkspace().run(p -> getWorkspace().removeResourceChangeListener(listener), null); + getWorkspace().run(_ -> getWorkspace().removeResourceChangeListener(listener), null); } private void addResourceChangeListener(ResourceDeltaVerifier listener) throws CoreException { // addResourceChangeListener need to happen in an atomic workspace operation // otherwise it would be added while auto refresh is running // and might get called in another thread before explicit refresh in this thread - getWorkspace().run(p -> { + getWorkspace().run(_ -> { getWorkspace().addResourceChangeListener(listener); listener.active(); }, null); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFileTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFileTest.java index 68b5bd163fa..d8ca9f6d629 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFileTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFileTest.java @@ -558,7 +558,7 @@ public void testWrite() throws CoreException { assertEquals(!deleteBefore, derived.exists()); FussyProgressMonitor monitor = new FussyProgressMonitor(); AtomicInteger changeCount = new AtomicInteger(); - ResourcesPlugin.getWorkspace().addResourceChangeListener(event -> changeCount.incrementAndGet()); + ResourcesPlugin.getWorkspace().addResourceChangeListener(_ -> changeCount.incrementAndGet()); derived.write(("updateOrCreate" + i).getBytes(), false, setDerived, keepHistory, monitor); assertEquals(1, changeCount.get(), "not atomic"); monitor.assertUsedUp(); @@ -635,7 +635,7 @@ public void testWrites() throws CoreException { assertEquals(!deleteBefore, derived.exists()); FussyProgressMonitor monitor = new FussyProgressMonitor(); AtomicInteger changeCount = new AtomicInteger(); - ResourcesPlugin.getWorkspace().addResourceChangeListener(event -> changeCount.incrementAndGet()); + ResourcesPlugin.getWorkspace().addResourceChangeListener(_ -> changeCount.incrementAndGet()); String derivedContent = "updateOrCreate" + i; String otherContent = "other" + i; ResourcesPlugin.getWorkspace().write( @@ -676,15 +676,15 @@ public void testWriteRule() throws CoreException { IWorkspace workspace = ResourcesPlugin.getWorkspace(); resource.delete(false, null); AtomicInteger changeCount = new AtomicInteger(); - ResourcesPlugin.getWorkspace().addResourceChangeListener(event -> changeCount.incrementAndGet()); - workspace.run(pm -> { + ResourcesPlugin.getWorkspace().addResourceChangeListener(_ -> changeCount.incrementAndGet()); + workspace.run(_ -> { resource.write(("create").getBytes(), false, false, false, null); }, workspace.getRuleFactory().createRule(resource), IWorkspace.AVOID_UPDATE, null); assertTrue(resource.exists()); assertEquals(1, changeCount.get(), "not atomic"); // test that modifyRule can be used for IFile.write() if the file already exits: changeCount.set(0); - workspace.run(pm -> { + workspace.run(_ -> { resource.write(("replace").getBytes(), false, false, false, null); }, workspace.getRuleFactory().modifyRule(resource), IWorkspace.AVOID_UPDATE, null); assertTrue(resource.exists()); @@ -1029,16 +1029,16 @@ public void testGetContents2() throws IOException, CoreException { ensureOutOfSync(target); CoreException firstException = assertThrows(CoreException.class, () -> { - try (InputStream content = target.getContents(false)) { + try (InputStream _ = target.getContents(false)) { } }); assertEquals(IResourceStatus.OUT_OF_SYNC_LOCAL, firstException.getStatus().getCode()); - try (InputStream content = target.getContents(true)) { + try (InputStream _ = target.getContents(true)) { } CoreException secondException = assertThrows(CoreException.class, () -> { - try (InputStream content = target.getContents(false)) { + try (InputStream _ = target.getContents(false)) { } }); assertEquals(IResourceStatus.OUT_OF_SYNC_LOCAL, secondException.getStatus().getCode()); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceChangeEventTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceChangeEventTest.java index 8ffa531c346..0866686eb3c 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceChangeEventTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceChangeEventTest.java @@ -74,7 +74,7 @@ public void setUp() throws Exception { allResources = new IResource[] {project1, project2, folder1, folder2, folder3, file1, file2, file3}; // Create and open the resources - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { createInWorkspace(allResources); marker2 = file2.createMarker(IMarker.BOOKMARK); marker3 = file3.createMarker(IMarker.BOOKMARK); @@ -125,7 +125,7 @@ public void testFindMarkerDeltas() throws CoreException { getWorkspace().addResourceChangeListener(listener); //do the work - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { marker1 = file1.createMarker(IMarker.BOOKMARK); marker2.delete(); marker3.setAttribute("Foo", true); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceChangeListenerTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceChangeListenerTest.java index 12c4a8b888f..a322a5d44b5 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceChangeListenerTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceChangeListenerTest.java @@ -139,7 +139,7 @@ public void resourceChanged(IResourceChangeEvent event) { fCounter = 0; long start = System.currentTimeMillis(); IResourceDelta delta = event.getDelta(); - delta.accept(delta2 -> { + delta.accept(_ -> { fCounter++; return true; }); @@ -155,7 +155,7 @@ public void resourceChanged(IResourceChangeEvent event) { // add the listener getWorkspace().addResourceChangeListener(listener); // setup the test data - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { IProject project = getWorkspace().getRoot().getProject("Test"); IProjectDescription description = getWorkspace().newProjectDescription(project.getName()); IPath root = getWorkspace().getRoot().getLocation(); @@ -169,7 +169,7 @@ public void resourceChanged(IResourceChangeEvent event) { getWorkspace().run(body, createTestMonitor()); // touch all resources (so that they appear in the delta) - body = monitor -> { + body = _ -> { IResourceVisitor visitor = resource -> { resource.touch(createTestMonitor()); return true; @@ -241,7 +241,7 @@ public void setUp() throws Exception { project1MetaData = project1.getFile(IProjectDescription.DESCRIPTION_FILE_NAME); project2MetaData = project2.getFile(IProjectDescription.DESCRIPTION_FILE_NAME); // Create and open a project, folder and file - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { project1.create(createTestMonitor()); project1.open(createTestMonitor()); folder1.create(true, true, createTestMonitor()); @@ -276,7 +276,7 @@ public void test_1GDK9OG() throws Throwable { // create the resource change listener IResourceChangeListener listener = event -> { try { - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { // modify the tree. IResourceDeltaVisitor visitor = delta -> { IResource resource = delta.getResource(); @@ -407,7 +407,7 @@ public void testBug45996() throws Throwable { // create the resource change listener IResourceChangeListener listener = event -> { try { - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { // modify the tree. IResourceDeltaVisitor visitor = delta -> { IResource resource = delta.getResource(); @@ -476,7 +476,7 @@ public void testBuildKind() throws CoreException { assertEquals(trigger, postBuild.trigger, i + ""); assertEquals(0, postChange.trigger, i + ""); - workspace.run((IWorkspaceRunnable) monitor -> { + workspace.run((IWorkspaceRunnable) _ -> { file1.touch(null); project1.build(trigger, createTestMonitor()); }, createTestMonitor()); @@ -569,7 +569,7 @@ public void testChangeFileToFolder() throws CoreException { public void testChangeFolderToFile() throws CoreException { /* change to a folder */ verifier.reset(); - getWorkspace().run((IWorkspaceRunnable) m -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { file1.delete(true, createTestMonitor()); folder3.create(true, true, createTestMonitor()); }, null); @@ -591,7 +591,7 @@ public void testChangeFolderToFile() throws CoreException { @Test public void testChangeProject() throws CoreException { verifier.reset(); - getWorkspace().run((IWorkspaceRunnable) m -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { project2.create(createTestMonitor()); project2.open(createTestMonitor()); }, null); @@ -682,7 +682,7 @@ public void testDeleteInPostBuildListener() throws Throwable { // register the listener with the workspace. getWorkspace().addResourceChangeListener(listener, IResourceChangeEvent.POST_BUILD); try { - getWorkspace().run((IWorkspaceRunnable) monitor -> getWorkspace().getRoot().accept(resource -> { + getWorkspace().run((IWorkspaceRunnable) _ -> getWorkspace().getRoot().accept(resource -> { resource.touch(createTestMonitor()); return true; }), createTestMonitor()); @@ -989,7 +989,7 @@ public void testHiddenPhantomChanges() throws Throwable { removeFromWorkspace(phantomResources); try { //create a phantom folder - workspace.run((IWorkspaceRunnable) monitor -> workspace.getSynchronizer().setSyncInfo(partner, phantomFolder, new byte[] {1}), createTestMonitor()); + workspace.run((IWorkspaceRunnable) _ -> workspace.getSynchronizer().setSyncInfo(partner, phantomFolder, new byte[] {1}), createTestMonitor()); //create children in phantom folder IFile fileInFolder = phantomFolder.getFile("FileInPrivateFolder"); workspace.getSynchronizer().setSyncInfo(partner, fileInFolder, new byte[] {1}); @@ -998,12 +998,12 @@ public void testHiddenPhantomChanges() throws Throwable { //delete children in phantom folder workspace.getSynchronizer().flushSyncInfo(partner, fileInFolder, IResource.DEPTH_INFINITE); //delete phantom folder and change some other file - workspace.run((IWorkspaceRunnable) monitor -> { + workspace.run((IWorkspaceRunnable) _ -> { phantomFolder.delete(IResource.NONE, createTestMonitor()); file1.setContents(createRandomContentsStream(), IResource.NONE, createTestMonitor()); }, createTestMonitor()); //create phantom file - workspace.run((IWorkspaceRunnable) monitor -> workspace.getSynchronizer().setSyncInfo(partner, phantomFile, new byte[] {2}), createTestMonitor()); + workspace.run((IWorkspaceRunnable) _ -> workspace.getSynchronizer().setSyncInfo(partner, phantomFile, new byte[] {2}), createTestMonitor()); //modify phantom file workspace.getSynchronizer().setSyncInfo(partner, phantomFile, new byte[] {3}); //delete phantom file @@ -1038,7 +1038,7 @@ public void testHiddenTeamPrivateChanges() throws Throwable { workspace.addResourceChangeListener(listener); try { //create a team private folder - workspace.run((IWorkspaceRunnable) monitor -> { + workspace.run((IWorkspaceRunnable) _ -> { teamPrivateFolder.create(true, true, createTestMonitor()); teamPrivateFolder.setTeamPrivateMember(true); }, createTestMonitor()); @@ -1050,12 +1050,12 @@ public void testHiddenTeamPrivateChanges() throws Throwable { //delete children in team private folder fileInFolder.delete(IResource.NONE, createTestMonitor()); //delete team private folder and change some other file - workspace.run((IWorkspaceRunnable) monitor -> { + workspace.run((IWorkspaceRunnable) _ -> { teamPrivateFolder.delete(IResource.NONE, createTestMonitor()); file1.setContents(createRandomContentsStream(), IResource.NONE, createTestMonitor()); }, createTestMonitor()); //create team private file - workspace.run((IWorkspaceRunnable) monitor -> { + workspace.run((IWorkspaceRunnable) _ -> { teamPrivateFile.create(createRandomContentsStream(), true, createTestMonitor()); teamPrivateFile.setTeamPrivateMember(true); }, createTestMonitor()); @@ -1495,7 +1495,7 @@ public void testReplaceFolderWithFolder() throws CoreException { folder2 = project1.getFolder("Folder2"); folder3 = project1.getFolder("Folder3"); verifier.reset(); - getWorkspace().run((IWorkspaceRunnable) m -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { file1.delete(false, null); folder2.create(false, true, null); }, null); @@ -1539,7 +1539,7 @@ public void testSwapFiles() throws CoreException { file2 = project1.getFile("File2"); file3 = project1.getFile("File3"); verifier.reset(); - getWorkspace().run((IWorkspaceRunnable) m -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { file1.create(new ByteArrayInputStream(new byte[] { 65 }), false, null); file2.create(new ByteArrayInputStream(new byte[] { 67 }), false, null); }, null); @@ -1564,7 +1564,7 @@ public void testSwapFiles() throws CoreException { @Test public void testSwapFolders() throws CoreException { verifier.reset(); - getWorkspace().run((IWorkspaceRunnable) m -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { folder2 = project1.getFolder("Folder2"); folder3 = project1.getFolder("Folder3"); file1.delete(false, null); @@ -1598,7 +1598,7 @@ public void testTeamPrivateChanges() throws CoreException { // create a team private folder verifier.reset(); verifier.addExpectedChange(teamPrivateFolder, IResourceDelta.ADDED, 0); - workspace.run((IWorkspaceRunnable) monitor -> { + workspace.run((IWorkspaceRunnable) _ -> { teamPrivateFolder.create(true, true, createTestMonitor()); teamPrivateFolder.setTeamPrivateMember(true); }, createTestMonitor()); @@ -1623,7 +1623,7 @@ public void testTeamPrivateChanges() throws CoreException { // delete team private folder and change some other file verifier.addExpectedChange(teamPrivateFolder, IResourceDelta.REMOVED, 0); verifier.addExpectedChange(file1, IResourceDelta.CHANGED, IResourceDelta.CONTENT); - workspace.run((IWorkspaceRunnable) monitor -> { + workspace.run((IWorkspaceRunnable) _ -> { teamPrivateFolder.delete(IResource.NONE, createTestMonitor()); file1.setContents(createRandomContentsStream(), IResource.NONE, createTestMonitor()); }, createTestMonitor()); @@ -1631,7 +1631,7 @@ public void testTeamPrivateChanges() throws CoreException { verifier.reset(); // create team private file verifier.addExpectedChange(teamPrivateFile, IResourceDelta.ADDED, 0); - workspace.run((IWorkspaceRunnable) monitor -> { + workspace.run((IWorkspaceRunnable) _ -> { teamPrivateFile.create(createRandomContentsStream(), true, createTestMonitor()); teamPrivateFile.setTeamPrivateMember(true); }, createTestMonitor()); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceDeltaTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceDeltaTest.java index a799d3b7abb..ca14753d0b9 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceDeltaTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceDeltaTest.java @@ -72,7 +72,7 @@ public void setUp() throws Exception { allResources = new IResource[] {project1, project2, folder1, folder2, folder3, file1, file2, file3}; // Create and open the resources - IWorkspaceRunnable body = monitor -> createInWorkspace(allResources); + IWorkspaceRunnable body = _ -> createInWorkspace(allResources); getWorkspace().run(body, createTestMonitor()); } @@ -119,7 +119,7 @@ public void testFindMember() throws CoreException { getWorkspace().addResourceChangeListener(listener); //do the work - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { file1.setContents(createRandomContentsStream(), true, true, createTestMonitor()); folder2.delete(true, createTestMonitor()); file4.create(createRandomContentsStream(), true, createTestMonitor()); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceTest.java index 030d4ed876c..a02eec58d6a 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceTest.java @@ -729,16 +729,16 @@ public void testAcceptDoNotCheckExistence() throws CoreException { createInWorkspace(project); // pass DEPTH_ONE to avoid using proxy visitor - assertThrows(CoreException.class, () -> a.accept((IResourceVisitor) resource -> true, IResource.DEPTH_ONE, IResource.NONE)); + assertThrows(CoreException.class, () -> a.accept((IResourceVisitor) _ -> true, IResource.DEPTH_ONE, IResource.NONE)); - assertThrows(CoreException.class, () -> a.accept(proxy -> true, IResource.NONE)); + assertThrows(CoreException.class, () -> a.accept(_ -> true, IResource.NONE)); // pass DEPTH_ONE to avoid using proxy visitor // if we don't check for existence, then no exception should be thrown - a.accept((IResourceVisitor) resource -> true, IResource.DEPTH_ONE, IContainer.DO_NOT_CHECK_EXISTENCE); + a.accept((IResourceVisitor) _ -> true, IResource.DEPTH_ONE, IContainer.DO_NOT_CHECK_EXISTENCE); // if we don't check for existence, then no exception should be thrown - a.accept(proxy -> true, IContainer.DO_NOT_CHECK_EXISTENCE); + a.accept(_ -> true, IContainer.DO_NOT_CHECK_EXISTENCE); } @Test @@ -1795,7 +1795,7 @@ public void testGetModificationStampAfterReplace() throws Exception { assertNotEquals(modificationStamp, IResource.NULL_STAMP); // Remove and re-create the file in a workspace operation - getWorkspace().run((IWorkspaceRunnable) monitor -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { file.delete(false, createTestMonitor()); file.create(nullInputStream(), true, createTestMonitor()); }, createTestMonitor()); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ISynchronizerTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ISynchronizerTest.java index 19b9471d151..63bf3032650 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ISynchronizerTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ISynchronizerTest.java @@ -87,7 +87,7 @@ protected void flushAllSyncInfo(final IResource root) throws CoreException { final ISynchronizer synchronizer = getWorkspace().getSynchronizer(); final QualifiedName[] partners = synchronizer.getPartners(); - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { IResourceVisitor visitor = resource -> { for (QualifiedName partner : partners) { synchronizer.setSyncInfo(partner, resource, null); @@ -157,7 +157,7 @@ public void testDeleteResources() throws CoreException { // delete all resources under the projects. final IProject[] projects = getWorkspace().getRoot().getProjects(); - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { for (IProject project : projects) { IResource[] children = project.members(); for (IResource element : children) { @@ -221,7 +221,7 @@ public void testDeleteResources2() throws CoreException { // delete all resources under the projects. final IProject[] projects = getWorkspace().getRoot().getProjects(); - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { for (IProject project : projects) { for (IResource element : project.members()) { if (!element.getName().equals(IProjectDescription.DESCRIPTION_FILE_NAME)) { @@ -242,7 +242,7 @@ public void testDeleteResources2() throws CoreException { getWorkspace().getRoot().accept(visitor); // remove the sync info for the immediate children of the projects. - body = monitor -> { + body = _ -> { for (IProject project : projects) { for (IResource element : project.members(true)) { synchronizer.setSyncInfo(qname, element, null); @@ -439,7 +439,7 @@ public String requestName() { // read in the data try (InputStream fileInput = Files.newInputStream(file.toPath())) { try (DataInputStream input = new DataInputStream(fileInput)) { - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { SyncInfoReader reader = new SyncInfoReader((Workspace) getWorkspace(), synchronizer); try { reader.readSyncInfo(input); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceRootTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceRootTest.java index 71fdb67187d..ff799d7cd58 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceRootTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceRootTest.java @@ -313,16 +313,16 @@ public void testPersistentPropertyInRunnable() throws CoreException { final IWorkspaceRoot root = getWorkspace().getRoot(); final String value = "this is a test property value"; final QualifiedName name = new QualifiedName("test", "testProperty"); - getWorkspace().run((IWorkspaceRunnable) monitor -> root.setPersistentProperty(name, value), createTestMonitor()); + getWorkspace().run((IWorkspaceRunnable) _ -> root.setPersistentProperty(name, value), createTestMonitor()); final String[] storedValue = new String[1]; - getWorkspace().run((IWorkspaceRunnable) monitor -> storedValue[0] = root.getPersistentProperty(name), + getWorkspace().run((IWorkspaceRunnable) _ -> storedValue[0] = root.getPersistentProperty(name), createTestMonitor()); assertEquals(value, storedValue[0]); final QualifiedName name2 = new QualifiedName("test", "testNonProperty"); final String[] changedStoredValue = new String[1]; - getWorkspace().run((IWorkspaceRunnable) monitor -> changedStoredValue[0] = root.getPersistentProperty(name2), + getWorkspace().run((IWorkspaceRunnable) _ -> changedStoredValue[0] = root.getPersistentProperty(name2), createTestMonitor()); assertEquals(null, changedStoredValue[0]); } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceTest.java index 19ad9e3054c..d4234c4d19a 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceTest.java @@ -108,7 +108,7 @@ protected IProjectNatureDescriptor findNature(IProjectNatureDescriptor[] descrip */ @Test public void testCancelRunnable() { - assertThrows(OperationCanceledException.class, () -> getWorkspace().run((IWorkspaceRunnable) monitor -> { + assertThrows(OperationCanceledException.class, () -> getWorkspace().run((IWorkspaceRunnable) _ -> { throw new OperationCanceledException(); }, createTestMonitor())); } @@ -638,7 +638,7 @@ public void testMultiCopy() throws Exception { public void testMultiCreation() throws Throwable { final IProject project = getWorkspace().getRoot().getProject("bar"); final IResource[] resources = buildResources(project, "a/", "a/b"); - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { project.create(null); project.open(null); // define an operation which will create a bunch of resources including a project. diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceTest.java index a2474b1c2af..723e1cc3973 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceTest.java @@ -694,7 +694,7 @@ public void testCreateLinkInDotProject() throws Exception { final byte[] finalContents = oldContents; // recreate the link in a workspace runnable with create scheduling rule getWorkspace().run( - (IWorkspaceRunnable) monitor -> dotProject.setContents(finalContents, + (IWorkspaceRunnable) _ -> dotProject.setContents(finalContents, IResource.NONE, createTestMonitor()), getWorkspace().getRuleFactory().modifyRule(dotProject), IResource.NONE, createTestMonitor()); } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerTest.java index 19429919ee3..6ab1a938c03 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerTest.java @@ -97,7 +97,7 @@ private void setResourceChangeListener(MarkersChangeListener listener) throws Co // and might even get called in another thread after removing in this thread // listener.shutDown(); if (registeredResourceChangeLister != null) { - getWorkspace().run(p -> getWorkspace().removeResourceChangeListener(registeredResourceChangeLister), null); + getWorkspace().run(_ -> getWorkspace().removeResourceChangeListener(registeredResourceChangeLister), null); } registeredResourceChangeLister = listener; if (listener == null) { @@ -106,7 +106,7 @@ private void setResourceChangeListener(MarkersChangeListener listener) throws Co // addResourceChangeListener need to happen in an atomic workspace operation // otherwise it would be added while auto refresh is running // and might get called in another thread before explicit refresh in this thread - getWorkspace().run(p -> { + getWorkspace().run(_ -> { getWorkspace().addResourceChangeListener(listener); // listener.active(); }, null); @@ -184,7 +184,7 @@ public IResource[] createLargeHierarchy() throws CoreException { protected IMarker[] createMarkers(final IResource[] hosts, final String type) throws CoreException { final IMarker[] result = new IMarker[hosts.length]; - getWorkspace().run((IWorkspaceRunnable) monitor -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { for (int i = 0; i < hosts.length; i++) { result[i] = hosts[i].createMarker(type); } @@ -714,7 +714,7 @@ public void testMarkerChangesInDelta() throws CoreException { public void testMarkerDeltaAttributes() throws CoreException { // create markers on various resources final IMarker[] markers = new IMarker[3]; - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { markers[0] = resources[0].createMarker(IMarker.BOOKMARK); markers[1] = resources[1].createMarker(IMarker.BOOKMARK); markers[1].setAttribute(IMarker.CHAR_START, 5); @@ -751,7 +751,7 @@ public void testMarkerDeltaAttributes() throws CoreException { // add+change listener.expectChanges(markers[1]); - getWorkspace().run((IWorkspaceRunnable) monitor -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { markers[1].setAttribute(IMarker.CHAR_START, 5); markers[1].setAttribute(IMarker.CHAR_END, 10); }, createTestMonitor()); @@ -759,7 +759,7 @@ public void testMarkerDeltaAttributes() throws CoreException { // change+remove same marker listener.expectChanges(markers[1]); - getWorkspace().run((IWorkspaceRunnable) monitor -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { markers[1].setAttribute(IMarker.CHAR_START, 5); markers[1].setAttribute(IMarker.CHAR_START, null); }, createTestMonitor()); @@ -767,7 +767,7 @@ public void testMarkerDeltaAttributes() throws CoreException { // change multiple markers listener.expectChanges(markers); - getWorkspace().run((IWorkspaceRunnable) monitor -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { markers[0].setAttribute(IMarker.CHAR_START, 5); markers[1].setAttribute(IMarker.CHAR_START, 10); markers[2].setAttribute(IMarker.PRIORITY, IMarker.PRIORITY_LOW); @@ -788,7 +788,7 @@ public void testMarkerDeltasCopyResource() throws CoreException { final Hashtable table = new Hashtable<>(1); final int[] count = new int[1]; count[0] = 0; - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { IResourceVisitor visitor = resource -> { if (resource.getType() == IResource.ROOT || resource.getType() == IResource.PROJECT) { return true; @@ -827,7 +827,7 @@ public void testMarkerDeltasMerge() throws CoreException { for (final IResource resource : resources) { // ADD + REMOVE = nothing - IWorkspaceRunnable addAndRemoveOperation = monitor -> { + IWorkspaceRunnable addAndRemoveOperation = _ -> { listener.reset(); IMarker marker = resource.createMarker(IMarker.PROBLEM); assertMarkerExists(marker); @@ -842,7 +842,7 @@ public void testMarkerDeltasMerge() throws CoreException { // cannot re-assign variable value within the code below, so must // put our marker value inside an array and set the element. AtomicReference addAndChangeMarker = new AtomicReference<>(); - IWorkspaceRunnable addAndChangeOperation = monitor -> { + IWorkspaceRunnable addAndChangeOperation = _ -> { listener.reset(); addAndChangeMarker.set(resource.createMarker(IMarker.PROBLEM)); assertMarkerExists(addAndChangeMarker.get()); @@ -881,7 +881,7 @@ public void testMarkerDeltasMerge() throws CoreException { IMarker changeAndChangeMarker = resource.createMarker(IMarker.PROBLEM); assertMarkerExists(changeAndChangeMarker); - IWorkspaceRunnable changeAndChangeOperation = monitor -> { + IWorkspaceRunnable changeAndChangeOperation = _ -> { listener.reset(); changeAndChangeMarker.setAttribute(IMarker.MESSAGE, "my message text"); assertMarkerHasAttributeValue(changeAndChangeMarker, IMarker.MESSAGE, "my message text"); @@ -896,7 +896,7 @@ public void testMarkerDeltasMerge() throws CoreException { // CHANGE + REMOVE = REMOVE IMarker changeAndRemoveMarker = resource.createMarker(IMarker.PROBLEM); assertMarkerExists(changeAndRemoveMarker); - IWorkspaceRunnable changeAndRemoveOperation = monitor -> { + IWorkspaceRunnable changeAndRemoveOperation = _ -> { listener.reset(); changeAndRemoveMarker.setAttribute(IMarker.MESSAGE, "my message text"); assertMarkerHasAttributeValue(changeAndRemoveMarker, IMarker.MESSAGE, "my message text"); @@ -1017,7 +1017,7 @@ public void testMarkerDeltasMoveProject() throws Exception { final Hashtable table = new Hashtable<>(1); final int[] count = new int[1]; count[0] = 0; - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { IResourceVisitor visitor = resource -> { if (resource.getType() == IResource.ROOT) { return true; @@ -1112,7 +1112,7 @@ public String requestName() { // read in the markers from the file try (InputStream fileInput = Files.newInputStream(file.toPath())) { try (DataInputStream input = new DataInputStream(fileInput)) { - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { MarkerReader reader = new MarkerReader((Workspace) getWorkspace()); try { reader.read(input, true); @@ -1201,7 +1201,7 @@ public String requestName() { // read in the markers from the file try (InputStream fileInput = Files.newInputStream(file.toPath())) { try (DataInputStream input = new DataInputStream(fileInput)) { - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { MarkerReader reader = new MarkerReader((Workspace) getWorkspace()); try { reader.read(input, true); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkersChangeListener.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkersChangeListener.java index b45eadece52..d8fa6f2b3d0 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkersChangeListener.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkersChangeListener.java @@ -113,7 +113,7 @@ protected void resourceChanged(IResourceDelta delta) { } if ((delta.getFlags() & IResourceDelta.MARKERS) != 0) { IPath path = delta.getFullPath(); - List v = changes.computeIfAbsent(path, p -> Collections.synchronizedList(new ArrayList<>())); + List v = changes.computeIfAbsent(path, _ -> Collections.synchronizedList(new ArrayList<>())); IMarkerDelta[] markerDeltas = delta.getMarkerDeltas(); for (IMarkerDelta markerDelta : markerDeltas) { v.add(markerDelta); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTestUtil.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTestUtil.java index 3f2481fc490..482957376ed 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTestUtil.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTestUtil.java @@ -163,7 +163,7 @@ public static void createInWorkspace(IFile resource, String contents) throws Cor } IWorkspaceRunnable body; if (resource.exists()) { - body = monitor -> resource.setContents(contentStream, true, false, null); + body = _ -> resource.setContents(contentStream, true, false, null); } else { body = monitor -> { createInWorkspace(resource.getParent(), monitor); @@ -253,7 +253,7 @@ public static void removeFromWorkspace(IResource resource) throws CoreException * project is currently closed. */ public static void removeFromWorkspace(final IResource[] resources) throws CoreException { - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { for (IResource resource : resources) { removeFromWorkspace(resource); } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceURLTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceURLTest.java index 0e7250c7da4..dfeeee169e0 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceURLTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceURLTest.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.InputStream; +import java.net.URI; import java.net.URL; import org.eclipse.core.internal.resources.PlatformURLResourceConnection; import org.eclipse.core.resources.IFile; @@ -65,7 +66,7 @@ protected IProject getTestProject2() { } private URL getURL(IPath path) throws Throwable { - return new URL("platform:/resource" + path.makeAbsolute().toString()); + return new URI("platform:/resource" + path.makeAbsolute().toString()).toURL(); } private URL getURL(IResource resource) throws Throwable { @@ -112,7 +113,7 @@ public void testSpaces() throws Exception { IProject project = getWorkspace().getRoot().getProject("My Project"); IFile file = project.getFile("a.txt"); createInWorkspace(file, CONTENT); - URL url = new URL(PlatformURLResourceConnection.RESOURCE_URL_STRING + "My%20Project/a.txt"); + URL url = new URI(PlatformURLResourceConnection.RESOURCE_URL_STRING + "My%20Project/a.txt").toURL(); try (InputStream stream = url.openStream()) { assertThat(stream).hasContent(CONTENT); } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/TeamPrivateMemberTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/TeamPrivateMemberTest.java index 635244916ba..20c85cf0983 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/TeamPrivateMemberTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/TeamPrivateMemberTest.java @@ -445,7 +445,7 @@ public void testDeltas() throws CoreException { final ResourceDeltaVerifier listener = new ResourceDeltaVerifier(); getWorkspace().addResourceChangeListener(listener); try { - IWorkspaceRunnable body = monitor -> createInWorkspace(resources); + IWorkspaceRunnable body = _ -> createInWorkspace(resources); listener.addExpectedChange(resources, IResourceDelta.ADDED, IResource.NONE); listener.addExpectedChange(project, IResourceDelta.ADDED, IResourceDelta.OPEN); listener.addExpectedChange(description, IResourceDelta.ADDED, IResource.NONE); @@ -460,7 +460,7 @@ public void testDeltas() throws CoreException { // set the folder to be team private and do the same test getWorkspace().addResourceChangeListener(listener); try { - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { createInWorkspace(resources); setTeamPrivateMember(folder, true, IResource.DEPTH_ZERO); }; @@ -478,7 +478,7 @@ public void testDeltas() throws CoreException { // set all resources to be team private and do the same test getWorkspace().addResourceChangeListener(listener); try { - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { createInWorkspace(resources); setTeamPrivateMember(project, true, IResource.DEPTH_INFINITE); }; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BenchMiscWorkspace.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BenchMiscWorkspace.java index 6eae7dadca4..060e20cb421 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BenchMiscWorkspace.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BenchMiscWorkspace.java @@ -43,7 +43,7 @@ void storeTestInfo(TestInfo info) { @Test public void testNoOp() throws Exception { final IWorkspace ws = ResourcesPlugin.getWorkspace(); - final IWorkspaceRunnable noop = monitor -> { + final IWorkspaceRunnable noop = _ -> { }; //run a first operation to make sure no other jobs are running before starting timer ws.run(noop, null); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BenchWorkspace.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BenchWorkspace.java index 16b612db88e..e6f2aa4e88e 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BenchWorkspace.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BenchWorkspace.java @@ -49,7 +49,7 @@ public class BenchWorkspace { * Creates the given number of problem markers on each resource in the workspace. */ private void addProblems(final int problemCount) throws CoreException { - IWorkspaceRunnable runnable = monitor -> getWorkspace().getRoot().accept(resource -> { + IWorkspaceRunnable runnable = _ -> getWorkspace().getRoot().accept(resource -> { for (int i = 0; i < problemCount; i++) { IMarker marker = resource.createMarker(IMarker.PROBLEM); marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_WARNING); @@ -113,7 +113,7 @@ int findMaxProblemSeverity2(IWorkspaceRoot root) throws CoreException { @BeforeEach public void setUp(TestInfo info) throws Exception { testInfo = info; - IWorkspaceRunnable runnable = monitor -> { + IWorkspaceRunnable runnable = _ -> { //create resources project = getWorkspace().getRoot().getProject("TestProject"); project.create(null); @@ -153,7 +153,7 @@ public void waitForBackgroundActivity() { @Test public void testCountResourcesDuringOperation() throws Exception { final Workspace workspace = (Workspace) getWorkspace(); - IWorkspaceRunnable runnable = monitor -> { + IWorkspaceRunnable runnable = _ -> { //touch all files workspace.getRoot().accept(resource -> { resource.touch(null); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BuilderPerformanceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BuilderPerformanceTest.java index 623d0c1169d..4b4b4572c7b 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BuilderPerformanceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BuilderPerformanceTest.java @@ -46,7 +46,7 @@ public class BuilderPerformanceTest extends WorkspacePerformanceTest { */ void createAndPopulateProject(final IProject project, final IFolder folder, final int totalResources) throws CoreException { - getWorkspace().run((IWorkspaceRunnable) monitor -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName()); desc.setBuildSpec(new ICommand[] { createCommand(desc, "Builder1"), createCommand(desc, "Builder2"), createCommand(desc, "Builder3"), createCommand(desc, "Builder4"), diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/ConcurrencyPerformanceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/ConcurrencyPerformanceTest.java index 542cdb648ca..84aaba88986 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/ConcurrencyPerformanceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/ConcurrencyPerformanceTest.java @@ -36,7 +36,7 @@ void storeTestInfo(TestInfo info) { @Test public void testSimpleCalls() throws Exception { - final IWorkspaceRunnable job = monitor -> { + final IWorkspaceRunnable job = _ -> { // do nothing }; new PerformanceTestRunner() { diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/LocalHistoryPerformanceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/LocalHistoryPerformanceTest.java index 32b75a34f40..8e79d807ede 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/LocalHistoryPerformanceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/LocalHistoryPerformanceTest.java @@ -70,7 +70,7 @@ void createTree(IFolder base, final int filesPerFolder, final int statesPerFile) folders[3] = folders[2].getFolder("folder4"); folders[4] = folders[3].getFolder("folder5"); final IWorkspace workspace = getWorkspace(); - workspace.run((IWorkspaceRunnable) monitor -> { + workspace.run((IWorkspaceRunnable) _ -> { createInWorkspace(folders); for (IFolder folder : folders) { for (int j = 0; j < filesPerFolder; j++) { diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/MarkerPerformanceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/MarkerPerformanceTest.java index d39a1f0626f..11928bbe889 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/MarkerPerformanceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/MarkerPerformanceTest.java @@ -43,7 +43,7 @@ public class MarkerPerformanceTest { @Test public void testSetAttributes1() throws Exception { //benchmark setting many attributes in a single operation - final IWorkspaceRunnable runnable = monitor -> { + final IWorkspaceRunnable runnable = _ -> { //set all attributes for each marker for (int i = 0; i < NUM_MARKERS; i++) { for (int j = 0; j < REPEAT; j++) { @@ -64,7 +64,7 @@ protected void test() throws CoreException { @Test public void testSetAttributes2() throws Exception { //benchmark setting many attributes in a single operation - final IWorkspaceRunnable runnable = monitor -> { + final IWorkspaceRunnable runnable = _ -> { //set one attribute per marker, repeat for all attributes for (int j = 0; j < REPEAT; j++) { for (int i = 0; i < NUM_MARKERS; i++) { @@ -84,7 +84,7 @@ protected void test() throws CoreException { public void setUp(TestInfo info) throws Exception { testInfo = info; final IMarker[] createdMarkers = new IMarker[NUM_MARKERS]; - IWorkspaceRunnable runnable = monitor -> { + IWorkspaceRunnable runnable = _ -> { //create resources project = getWorkspace().getRoot().getProject("TestProject"); project.create(null); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/WorkspacePerformanceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/WorkspacePerformanceTest.java index 0a343750d3b..fb298527cee 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/WorkspacePerformanceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/WorkspacePerformanceTest.java @@ -67,7 +67,7 @@ IFolder copyFolder() throws CoreException { * Creates a project and fills it with contents */ void createAndPopulateProject(final int totalResources) throws CoreException { - getWorkspace().run((IWorkspaceRunnable) monitor -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { testProject.create(createTestMonitor()); testProject.open(createTestMonitor()); createFolder(testFolder, totalResources); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_025457.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_025457.java index a9eef69bd61..96e615cdcf4 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_025457.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_025457.java @@ -59,7 +59,7 @@ public void testFile() throws Exception { createInWorkspace(sourceFile, content); //open a stream in the source to cause the rename to fail - try (InputStream stream = sourceFile.getContents()) { + try (InputStream _ = sourceFile.getContents()) { //try to rename the file (should fail) assertThrows(CoreException.class, () -> sourceFile.move(destFile.getFullPath(), IResource.NONE, createTestMonitor())); @@ -87,7 +87,7 @@ public void testFolder() throws IOException, CoreException { createInWorkspace(sourceFile); //open a stream in the source to cause the rename to fail - try (InputStream stream = sourceFile.getContents()) { + try (InputStream _ = sourceFile.getContents()) { //try to rename the project (should fail) assertThrows(CoreException.class, () -> sourceFolder.move(destFolder.getFullPath(), IResource.NONE, createTestMonitor())); @@ -114,7 +114,7 @@ public void testProject() throws IOException, CoreException { createInWorkspace(sourceFile); //open a stream in the source to cause the rename to fail - try (InputStream stream = sourceFile.getContents()) { + try (InputStream _ = sourceFile.getContents()) { //try to rename the project (should fail) assertThrows(CoreException.class, () -> source.move(destination.getFullPath(), IResource.NONE, createTestMonitor())); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_026294.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_026294.java index 2e114ba53d1..96b79afe323 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_026294.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_026294.java @@ -82,7 +82,7 @@ public void testDeleteOpenProjectWindows() throws Exception { assertExistsInFileSystem(projectFile); // opens a file so it cannot be removed on Windows - try (InputStream input = file1.getContents()) { + try (InputStream _ = file1.getContents()) { assertThat(projectFile).matches(IResource::exists, "exists"); assertThat(projectFile).matches(isSynchronizedDepthInfinite, "is synchronized"); @@ -193,7 +193,7 @@ public void testDeleteClosedProjectWindows() throws Exception { IPath projectRoot = project.getLocation(); // opens a file so it cannot be removed on Windows - try (InputStream input = file1.getContents()) { + try (InputStream _ = file1.getContents()) { project.close(createTestMonitor()); assertThrows(CoreException.class, () -> project.delete(IResource.FORCE | IResource.ALWAYS_DELETE_PROJECT_CONTENT, createTestMonitor())); @@ -269,7 +269,7 @@ public void testDeleteFolderWindows() throws Exception { createInWorkspace(new IResource[] { file1, file3 }); // opens a file so it cannot be removed on Windows - try (InputStream input = file1.getContents()) { + try (InputStream _ = file1.getContents()) { assertThrows(CoreException.class, () -> folder.delete(IResource.FORCE, createTestMonitor())); assertThat(file1).matches(IResource::exists, "exists"); assertThat(file3).matches(not(IResource::exists), "not exists"); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_032076.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_032076.java index 2828450dfaf..ccc71015551 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_032076.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_032076.java @@ -86,7 +86,7 @@ public void testFileBugOnWindows() throws Exception { markerId = bookmark.getId(); // opens the file so it cannot be removed on Windows - try (InputStream input = sourceFile.getContents()) { + try (InputStream _ = sourceFile.getContents()) { assertThrows(CoreException.class, () -> sourceFile.move(destinationFile.getFullPath(), IResource.FORCE, createTestMonitor())); @@ -140,7 +140,7 @@ public void testFolderBugOnWindows() throws Exception { markerId = bookmark.getId(); // opens a file so it (and its parent) cannot be removed on Windows - try (InputStream input = file1.getContents()) { + try (InputStream _ = file1.getContents()) { assertThrows(CoreException.class, () -> folder.move(destinationFolder.getFullPath(), IResource.FORCE, createTestMonitor())); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_098740.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_098740.java index 5965ed96cba..dbfc57d895f 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_098740.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_098740.java @@ -40,7 +40,7 @@ public void testBug() throws CoreException { createInWorkspace(project); project.close(createTestMonitor()); assertThrows(CoreException.class, () -> project.members()); - IResourceVisitor visitor = resource -> true; + IResourceVisitor visitor = _ -> true; assertThrows(CoreException.class, () -> project.accept(visitor, IResource.DEPTH_INFINITE, IResource.NONE)); } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_127562.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_127562.java index b3fda8a5f8f..514c235e2e0 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_127562.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_127562.java @@ -39,7 +39,7 @@ public void testBug() throws CoreException { createInWorkspace(project); IProjectDescription description = project.getDescription(); description.setComment("Foo"); - getWorkspace().run((IWorkspaceRunnable) monitor -> project.setDescription(description, createTestMonitor()), + getWorkspace().run((IWorkspaceRunnable) _ -> project.setDescription(description, createTestMonitor()), getWorkspace().getRoot(), IResource.NONE, createTestMonitor()); } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_303517.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_303517.java index 7d06525e888..4b31e8d0b11 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_303517.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_303517.java @@ -90,7 +90,8 @@ public void testExists() throws Exception { // Core.resources still thinks the file exists assertThat(f).matches(IResource::exists, "exists"); assertThrows(CoreException.class, () -> { - try(InputStream in = f.getContents()) {} + try (InputStream _ = f.getContents()) { + } }); // Wait for auto-refresh to happen @@ -113,7 +114,7 @@ public void testGetContents() throws Exception { // Touch on file-system touchInFilesystem(f); CoreException exception = assertThrows(CoreException.class, () -> { - try (InputStream in = f.getContents(false)) { + try (InputStream _ = f.getContents(false)) { } }); // File is out-of-sync, so this is good. @@ -124,7 +125,7 @@ public void testGetContents() throws Exception { Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_REFRESH, createTestMonitor()); // File is now in sync. - try (InputStream in = f.getContents(false)) { + try (InputStream _ = f.getContents(false)) { } } @@ -152,7 +153,7 @@ public void testGetContentsTrue() throws Exception { // with IResourceStatus.RESOURCE_NOT_FOUND error code. f.getLocation().toFile().delete(); CoreException exception = assertThrows(CoreException.class, () -> { - try (InputStream in = f.getContents(true)) { + try (InputStream _ = f.getContents(true)) { } }); assertEquals(IResourceStatus.RESOURCE_NOT_FOUND, exception.getStatus().getCode()); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_378156.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_378156.java index 524c79084f4..e927e2fc975 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_378156.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_378156.java @@ -140,12 +140,12 @@ public void testBugOneThread() throws Exception { SignaledBuilder builder = SignaledBuilder.getInstance(project1); builder.reset(); - getWorkspace().run((IWorkspaceRunnable) monitor -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { //modify the file so autobuild is needed file.setContents(createRandomContentsStream(), IResource.NONE, null); //create a nested operation that immediately cancels try { - getWorkspace().run((IWorkspaceRunnable) monitor1 -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { throw new OperationCanceledException(); }, null); } catch (OperationCanceledException e) { diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IFileTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IFileTest.java index f7e6f7081ab..3079b41a469 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IFileTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IFileTest.java @@ -146,7 +146,7 @@ public void testIssue2290() throws CoreException, InterruptedException, BrokenBa // Can't use `Job.cancel()`, it makes `getResult()` unstable. // https://github.com/eclipse-platform/eclipse.platform/issues/2339 AtomicBoolean keepRunning = new AtomicBoolean(true); - Job createDelete = Job.create("Create/delete", ignored -> { + Job createDelete = Job.create("Create/delete", _ -> { try { jobStart.await(); while (keepRunning.get()) { diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IResourceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IResourceTest.java index a6de742372f..76c3f40c7ae 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IResourceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IResourceTest.java @@ -130,7 +130,7 @@ public void testBug28790() throws CoreException { */ @Test public void testBug31750() { - IResourceProxyVisitor visitor = proxy -> { + IResourceProxyVisitor visitor = _ -> { throw new OperationCanceledException(); }; assertThrows(OperationCanceledException.class, () -> getWorkspace().getRoot().accept(visitor, IResource.NONE)); @@ -188,7 +188,7 @@ public boolean visit(IResourceDelta aDelta) { getWorkspace().addResourceChangeListener(listener, IResourceChangeEvent.POST_CHANGE); // removing and adding sync info causes phantom to be deleted and recreated - getWorkspace().run((IWorkspaceRunnable) monitor -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { ISynchronizer synchronizer = getWorkspace().getSynchronizer(); synchronizer.flushSyncInfo(name, file, IResource.DEPTH_INFINITE); synchronizer.setSyncInfo(name, file, new byte[] { 1 }); @@ -471,7 +471,7 @@ public void testGetContents_1GBZD4S() throws Throwable { final AtomicReference listenerInMainThreadCallback = new AtomicReference<>(() -> { }); - IResourceChangeListener listener = event -> { + IResourceChangeListener listener = _ -> { listenerInMainThreadCallback.set(() -> { assertEquals(newContents, target.readString()); }); @@ -486,7 +486,7 @@ public void testGetContents_1GBZD4S() throws Throwable { listenerInMainThreadCallback.get().execute(); CoreException exception = assertThrows(CoreException.class, () -> { - try (InputStream is = target.getContents(false)) { + try (InputStream _ = target.getContents(false)) { } }); assertEquals(IResourceStatus.OUT_OF_SYNC_LOCAL, exception.getStatus().getCode()); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/PR_1GHOM0N_Test.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/PR_1GHOM0N_Test.java index caa2ee94173..a51ec086ff5 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/PR_1GHOM0N_Test.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/PR_1GHOM0N_Test.java @@ -48,7 +48,7 @@ public void test_1GEAB3C() throws CoreException { // try and reproduce the error (there are problems when calling an incremental // build from within an operation...it leaves the tree immutable) - IWorkspaceRunnable body = monitor -> { + IWorkspaceRunnable body = _ -> { project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, createTestMonitor()); IFile file = project.getFile("test.txt"); file.create(createRandomContentsStream(), true, createTestMonitor()); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IWorkspaceRunnableUseCaseTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IWorkspaceRunnableUseCaseTest.java index 0ec85fd04f3..93b9620ce61 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IWorkspaceRunnableUseCaseTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IWorkspaceRunnableUseCaseTest.java @@ -37,7 +37,7 @@ public class IWorkspaceRunnableUseCaseTest { protected IWorkspaceRunnable createRunnable(final IProject project, final IWorkspaceRunnable nestedOperation, final boolean triggerBuild, final Exception exceptionToThrow) { - return monitor -> { + return _ -> { if (exceptionToThrow != null) { if (exceptionToThrow instanceof CoreException ce) { throw ce; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/util/FileStoreAutoDeleteExtension.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/util/FileStoreAutoDeleteExtension.java index 97880e26868..426609f45f1 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/util/FileStoreAutoDeleteExtension.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/util/FileStoreAutoDeleteExtension.java @@ -67,7 +67,7 @@ public void deleteOnTearDown(IFileStore store) { @Override public void afterEach(ExtensionContext context) throws Exception { - getWorkspace().run((IWorkspaceRunnable) monitor -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { getWorkspace().getRoot().delete(true, true, createTestMonitor()); // clear stores in workspace runnable to avoid interaction with resource jobs for (IFileStore element : storesToDelete) { diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/util/WorkspaceResetExtension.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/util/WorkspaceResetExtension.java index 81af73f6faf..b115137270f 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/util/WorkspaceResetExtension.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/util/WorkspaceResetExtension.java @@ -77,7 +77,7 @@ private void restoreCleanWorkspace() { // Wait for any build job that may still be executed waitForBuild(); try { - getWorkspace().run((IWorkspaceRunnable) monitor -> { + getWorkspace().run((IWorkspaceRunnable) _ -> { getWorkspace().getRoot().delete(true, true, createTestMonitor()); }, null); } catch (CoreException e) { diff --git a/team/examples/org.eclipse.compare.examples.xml/.classpath b/team/examples/org.eclipse.compare.examples.xml/.classpath index 737f0ece063..81f3dd2e9e4 100644 --- a/team/examples/org.eclipse.compare.examples.xml/.classpath +++ b/team/examples/org.eclipse.compare.examples.xml/.classpath @@ -1,6 +1,6 @@ - + diff --git a/team/examples/org.eclipse.compare.examples.xml/.settings/org.eclipse.jdt.core.prefs b/team/examples/org.eclipse.compare.examples.xml/.settings/org.eclipse.jdt.core.prefs index 00b0b4db9d3..77965320904 100644 --- a/team/examples/org.eclipse.compare.examples.xml/.settings/org.eclipse.jdt.core.prefs +++ b/team/examples/org.eclipse.compare.examples.xml/.settings/org.eclipse.jdt.core.prefs @@ -21,9 +21,9 @@ org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Ownin org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=25 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.compliance=25 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -143,6 +143,6 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 +org.eclipse.jdt.core.compiler.source=25 org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/team/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF b/team/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF index 1796267e4b4..8d429e36718 100644 --- a/team/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF +++ b/team/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF @@ -16,5 +16,5 @@ Require-Bundle: org.eclipse.core.runtime, Import-Package: org.junit.jupiter.api;version="[5.14.0,6.0.0)", org.junit.platform.suite.api;version="[1.14.0,2.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Automatic-Module-Name: org.eclipse.compare.examples.xml diff --git a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareAddIdMapDialog.java b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareAddIdMapDialog.java index 5f822f72c05..c6a1d2a8236 100644 --- a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareAddIdMapDialog.java +++ b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareAddIdMapDialog.java @@ -86,7 +86,7 @@ protected Control createDialogArea(Composite ancestor) { data.widthHint = convertWidthInCharsToPixels(30); fIdMapText.setLayoutData(data); fIdMapText.setText(fIdMap.getName()); - fIdMapText.addModifyListener(e -> doValidation()); + fIdMapText.addModifyListener(_ -> doValidation()); label= new Label(inner, SWT.NULL); label.setText(XMLCompareMessages.XMLCompareAddIdMapDialog_extlabel); @@ -97,7 +97,7 @@ protected Control createDialogArea(Composite ancestor) { data.widthHint = convertWidthInCharsToPixels(30); fIdMapExtText.setLayoutData(data); fIdMapExtText.setText(fIdMap.getExtension()); - fIdMapExtText.addModifyListener(e -> doValidation()); + fIdMapExtText.addModifyListener(_ -> doValidation()); fIdMapText.setFocus(); diff --git a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditCopyIdMapDialog.java b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditCopyIdMapDialog.java index 469675a88b1..269d30f54d1 100644 --- a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditCopyIdMapDialog.java +++ b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditCopyIdMapDialog.java @@ -86,7 +86,7 @@ protected Control createDialogArea(Composite ancestor) { fIdMapText= new Text(inner, SWT.BORDER); fIdMapText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - fIdMapText.addModifyListener(e -> doValidation()); + fIdMapText.addModifyListener(_ -> doValidation()); fIdMapText.setFocus(); diff --git a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditMappingDialog.java b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditMappingDialog.java index 494c4802319..2335d423a28 100644 --- a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditMappingDialog.java +++ b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditMappingDialog.java @@ -90,7 +90,7 @@ protected Control createDialogArea(Composite ancestor) { fElementText= new Text(inner, SWT.BORDER); fElementText.setText(fMapping.getElement()); fElementText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - fElementText.addModifyListener(e -> doValidation()); + fElementText.addModifyListener(_ -> doValidation()); //Signature label= new Label(inner, SWT.NULL); @@ -102,7 +102,7 @@ protected Control createDialogArea(Composite ancestor) { GridData data= new GridData(GridData.FILL_HORIZONTAL); data.widthHint= convertWidthInCharsToPixels(50); fSignatureText.setLayoutData(data); - fSignatureText.addModifyListener(e -> doValidation()); + fSignatureText.addModifyListener(_ -> doValidation()); //Id Attribute label= new Label(inner, SWT.NULL); @@ -112,7 +112,7 @@ protected Control createDialogArea(Composite ancestor) { fIdAttributeText= new Text(inner, SWT.BORDER); fIdAttributeText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - fIdAttributeText.addModifyListener(e -> doValidation()); + fIdAttributeText.addModifyListener(_ -> doValidation()); //Id Source createIdSourceGroup(inner); diff --git a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditOrderedDialog.java b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditOrderedDialog.java index 362bec25335..03f58d7b5b8 100644 --- a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditOrderedDialog.java +++ b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditOrderedDialog.java @@ -85,7 +85,7 @@ protected Control createDialogArea(Composite ancestor) { fElementText= new Text(inner, SWT.BORDER); fElementText.setText(fMapping.getElement()); fElementText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - fElementText.addModifyListener(e -> doValidation()); + fElementText.addModifyListener(_ -> doValidation()); //Signature label= new Label(inner, SWT.NULL); @@ -97,7 +97,7 @@ protected Control createDialogArea(Composite ancestor) { GridData data= new GridData(GridData.FILL_HORIZONTAL); data.widthHint= convertWidthInCharsToPixels(50); fSignatureText.setLayoutData(data); - fSignatureText.addModifyListener(e -> doValidation()); + fSignatureText.addModifyListener(_ -> doValidation()); fElementText.setFocus(); diff --git a/team/examples/org.eclipse.compare.examples/.classpath b/team/examples/org.eclipse.compare.examples/.classpath index 375961e4d61..7a42e53ced4 100644 --- a/team/examples/org.eclipse.compare.examples/.classpath +++ b/team/examples/org.eclipse.compare.examples/.classpath @@ -1,6 +1,6 @@ - + diff --git a/team/examples/org.eclipse.compare.examples/.settings/org.eclipse.jdt.core.prefs b/team/examples/org.eclipse.compare.examples/.settings/org.eclipse.jdt.core.prefs index 33252260e38..8a4c622430d 100644 --- a/team/examples/org.eclipse.compare.examples/.settings/org.eclipse.jdt.core.prefs +++ b/team/examples/org.eclipse.compare.examples/.settings/org.eclipse.jdt.core.prefs @@ -8,9 +8,9 @@ org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=25 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.compliance=25 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -68,6 +68,6 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 +org.eclipse.jdt.core.compiler.source=25 org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/team/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF b/team/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF index 10ba54728fb..a5020c64f4a 100644 --- a/team/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF +++ b/team/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF @@ -12,5 +12,5 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.208.0", org.eclipse.jface.text, org.eclipse.core.runtime Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Automatic-Module-Name: org.eclipse.compare.examples diff --git a/team/examples/org.eclipse.team.examples.filesystem/.classpath b/team/examples/org.eclipse.team.examples.filesystem/.classpath index 375961e4d61..7a42e53ced4 100644 --- a/team/examples/org.eclipse.team.examples.filesystem/.classpath +++ b/team/examples/org.eclipse.team.examples.filesystem/.classpath @@ -1,6 +1,6 @@ - + diff --git a/team/examples/org.eclipse.team.examples.filesystem/.settings/org.eclipse.jdt.core.prefs b/team/examples/org.eclipse.team.examples.filesystem/.settings/org.eclipse.jdt.core.prefs index 81dde86c051..472dbba6de7 100644 --- a/team/examples/org.eclipse.team.examples.filesystem/.settings/org.eclipse.jdt.core.prefs +++ b/team/examples/org.eclipse.team.examples.filesystem/.settings/org.eclipse.jdt.core.prefs @@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=25 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.compliance=25 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -129,7 +129,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 +org.eclipse.jdt.core.compiler.source=25 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true diff --git a/team/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF b/team/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF index 9ae8396862f..67be34a02a0 100644 --- a/team/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF +++ b/team/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF @@ -31,5 +31,5 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui.navigator Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.team.examples.filesystem.FileSystemPlugin -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Automatic-Module-Name: org.eclipse.team.examples.filesystem diff --git a/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ConfigurationWizard.java b/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ConfigurationWizard.java index df53445267d..b7945f5c115 100644 --- a/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ConfigurationWizard.java +++ b/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ConfigurationWizard.java @@ -106,7 +106,7 @@ public boolean performFinish() { @Override public T getAdapter(Class adapter) { if (adapter == IConfigurationWizardExtension.class) { - return adapter.cast((IConfigurationWizardExtension) (workbench, projects) -> setProjects(projects)); + return adapter.cast((IConfigurationWizardExtension) (_, projects) -> setProjects(projects)); } return null; } diff --git a/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemMainPage.java b/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemMainPage.java index 9718fe19bb9..48346dbcfae 100644 --- a/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemMainPage.java +++ b/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemMainPage.java @@ -226,7 +226,7 @@ public void createControl(Composite parent) { Button browse = new Button(composite, SWT.NULL); browse.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END)); browse.setText(Policy.bind("FileSystemMainPage.browseDir")); //$NON-NLS-1$ - browse.addListener(SWT.Selection, event -> { + browse.addListener(SWT.Selection, _ -> { DirectoryDialog d = new DirectoryDialog(getShell()); String directory = d.open(); if(directory!=null) { diff --git a/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ShowHistoryAction.java b/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ShowHistoryAction.java index fe8419bcb2b..20a167404e8 100644 --- a/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ShowHistoryAction.java +++ b/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ShowHistoryAction.java @@ -37,7 +37,7 @@ public class ShowHistoryAction extends ActionDelegate implements IObjectActionDe public void run(IAction action) { final Shell shell = Display.getDefault().getActiveShell(); try { - new ProgressMonitorDialog(shell).run(true, true, monitor -> { + new ProgressMonitorDialog(shell).run(true, true, _ -> { final IResource resource = (IResource) fSelection.getFirstElement(); Runnable r = () -> TeamUI.showHistoryFor(TeamUIPlugin.getActivePage(), resource, null); diff --git a/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticFilesystemProvider.java b/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticFilesystemProvider.java index 186ea37cb12..f8f62477ff7 100644 --- a/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticFilesystemProvider.java +++ b/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticFilesystemProvider.java @@ -640,7 +640,7 @@ private void fireStateChanged(final Collection resources, boolean que Thread t= new Thread(() -> { try { ResourcesPlugin.getWorkspace().run( - (IWorkspaceRunnable) monitor -> { + (IWorkspaceRunnable) _ -> { }, null); } catch (CoreException e) { diff --git a/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/DisconnectAction.java b/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/DisconnectAction.java index d352f949e3c..023492dde54 100644 --- a/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/DisconnectAction.java +++ b/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/DisconnectAction.java @@ -52,7 +52,7 @@ public void run(IAction action) { } if (!projects.isEmpty()) { IRunnableWithProgress runnable= monitor -> { - IWorkspaceRunnable runnable1= monitor1 -> { + IWorkspaceRunnable runnable1= _ -> { for (IProject project : projects) { PessimisticFilesystemProvider provider= getProvider(project); if (provider != null) { diff --git a/team/tests/org.eclipse.compare.tests/.classpath b/team/tests/org.eclipse.compare.tests/.classpath index 1aa9eca95a0..2198f331b94 100644 --- a/team/tests/org.eclipse.compare.tests/.classpath +++ b/team/tests/org.eclipse.compare.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/team/tests/org.eclipse.compare.tests/.settings/org.eclipse.jdt.core.prefs b/team/tests/org.eclipse.compare.tests/.settings/org.eclipse.jdt.core.prefs index ac3e183299f..8b09b3f8aca 100644 --- a/team/tests/org.eclipse.compare.tests/.settings/org.eclipse.jdt.core.prefs +++ b/team/tests/org.eclipse.compare.tests/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=25 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.compliance=25 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -135,6 +135,6 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 +org.eclipse.jdt.core.compiler.source=25 org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/team/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF b/team/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF index 1f8e3634d9f..ddbee68c498 100644 --- a/team/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF +++ b/team/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Import-Package: org.assertj.core.api, Bundle-Activator: org.eclipse.compare.tests.CompareTestPlugin Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Bundle-Localization: plugin Export-Package: org.eclipse.compare.tests, org.eclipse.compare.tests.performance diff --git a/team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/AsyncExecTests.java b/team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/AsyncExecTests.java index 602e7bc4235..1bf9c6b3e9b 100644 --- a/team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/AsyncExecTests.java +++ b/team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/AsyncExecTests.java @@ -35,10 +35,10 @@ public class AsyncExecTests { public void testQueueAdd() { WorkQueue q = new WorkQueue(); assertTrue(q.isEmpty()); - IRunnableWithProgress r = monitor -> { + IRunnableWithProgress r = _ -> { // Nothing to do for now }; - IRunnableWithProgress r2 = monitor -> { + IRunnableWithProgress r2 = _ -> { // Nothing to do for now }; // Ensure that adding an element adds it diff --git a/team/tests/org.eclipse.core.tests.net/.classpath b/team/tests/org.eclipse.core.tests.net/.classpath index 675a5e2962b..2198f331b94 100644 --- a/team/tests/org.eclipse.core.tests.net/.classpath +++ b/team/tests/org.eclipse.core.tests.net/.classpath @@ -1,6 +1,6 @@ - + diff --git a/team/tests/org.eclipse.core.tests.net/.settings/org.eclipse.jdt.core.prefs b/team/tests/org.eclipse.core.tests.net/.settings/org.eclipse.jdt.core.prefs index 27956cb9ddb..563191de9c3 100644 --- a/team/tests/org.eclipse.core.tests.net/.settings/org.eclipse.jdt.core.prefs +++ b/team/tests/org.eclipse.core.tests.net/.settings/org.eclipse.jdt.core.prefs @@ -9,9 +9,9 @@ org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=25 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=25 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -72,6 +72,6 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=25 org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/team/tests/org.eclipse.core.tests.net/META-INF/MANIFEST.MF b/team/tests/org.eclipse.core.tests.net/META-INF/MANIFEST.MF index 323d078a0a8..db2d1977c9a 100644 --- a/team/tests/org.eclipse.core.tests.net/META-INF/MANIFEST.MF +++ b/team/tests/org.eclipse.core.tests.net/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Import-Package: org.assertj.core.api, org.junit.jupiter.api;version="[5.14.0,6.0.0)", org.junit.platform.suite.api;version="[1.14.0,2.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Eclipse-BundleShape: dir Export-Package: org.eclipse.core.tests.net Automatic-Module-Name: org.eclipse.core.tests.net diff --git a/team/tests/org.eclipse.team.tests.core/.classpath b/team/tests/org.eclipse.team.tests.core/.classpath index 1aa9eca95a0..2198f331b94 100644 --- a/team/tests/org.eclipse.team.tests.core/.classpath +++ b/team/tests/org.eclipse.team.tests.core/.classpath @@ -1,6 +1,6 @@ - + diff --git a/team/tests/org.eclipse.team.tests.core/.settings/org.eclipse.jdt.core.prefs b/team/tests/org.eclipse.team.tests.core/.settings/org.eclipse.jdt.core.prefs index d2c72f33ee9..9f5b192a855 100644 --- a/team/tests/org.eclipse.team.tests.core/.settings/org.eclipse.jdt.core.prefs +++ b/team/tests/org.eclipse.team.tests.core/.settings/org.eclipse.jdt.core.prefs @@ -19,9 +19,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=25 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.compliance=25 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -124,6 +124,6 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 +org.eclipse.jdt.core.compiler.source=25 org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/team/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF b/team/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF index 9c2838508b8..da9a9c1490c 100644 --- a/team/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF +++ b/team/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF @@ -33,5 +33,5 @@ Import-Package: org.assertj.core.api, org.junit.platform.suite.api;version="[1.14.0,2.0.0)" Bundle-ActivationPolicy: lazy Eclipse-BundleShape: dir -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Automatic-Module-Name: org.eclipse.team.tests.core diff --git a/team/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/PessimisticRepositoryProvider.java b/team/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/PessimisticRepositoryProvider.java index 4468b7479b6..17e940037a5 100644 --- a/team/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/PessimisticRepositoryProvider.java +++ b/team/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/PessimisticRepositoryProvider.java @@ -68,7 +68,7 @@ private static class WritabilityEnforcingFileModificationValidator extends FileM public IStatus validateEdit(final IFile[] files, FileModificationValidationContext context) { if (markWritableOnEdit) { try { - ResourcesPlugin.getWorkspace().run((IWorkspaceRunnable) monitor -> { + ResourcesPlugin.getWorkspace().run((IWorkspaceRunnable) _ -> { for (int i = 0, length = files.length; i < length; i++) { try { setReadOnly(files[i], false); diff --git a/team/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/UnifiedDiffManagerTest.java b/team/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/UnifiedDiffManagerTest.java index 85dc2071aef..a8e845f9f19 100644 --- a/team/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/UnifiedDiffManagerTest.java +++ b/team/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/UnifiedDiffManagerTest.java @@ -80,7 +80,7 @@ public class UnifiedDiffManagerTest { private IFile file; private ITextEditor editor; private final List loggedErrors = synchronizedList(new ArrayList<>()); - private final ILogListener logListener = (status, plugin) -> { + private final ILogListener logListener = (status, _) -> { if (status.getSeverity() == IStatus.ERROR) { loggedErrors.add(status); } From 1518b91a2ceaae3992eb0ab8c83d37a47c717c44 Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Sun, 20 Sep 2026 12:04:40 +0000 Subject: [PATCH 2/2] Version bump(s) for 4.42 stream --- debug/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF | 2 +- debug/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.ui.examples.filesystem/META-INF/MANIFEST.MF | 2 +- team/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debug/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF b/debug/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF index 250c64d90d0..c1d8bed1c4c 100644 --- a/debug/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.debug.examples.core;singleton:=true -Bundle-Version: 1.7.0.qualifier +Bundle-Version: 1.8.0.qualifier Bundle-Activator: org.eclipse.debug.examples.core.pda.DebugCorePlugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.debug.core;bundle-version="3.9.0" diff --git a/debug/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF index d1bb36740f2..bbeb321257c 100644 --- a/debug/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.debug.examples.ui;singleton:=true -Bundle-Version: 1.9.200.qualifier +Bundle-Version: 1.10.0.qualifier Bundle-Activator: org.eclipse.debug.examples.ui.pda.DebugUIPlugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)", org.eclipse.ui, diff --git a/resources/examples/org.eclipse.ui.examples.filesystem/META-INF/MANIFEST.MF b/resources/examples/org.eclipse.ui.examples.filesystem/META-INF/MANIFEST.MF index 6d773f78da7..bc4ecdcb718 100644 --- a/resources/examples/org.eclipse.ui.examples.filesystem/META-INF/MANIFEST.MF +++ b/resources/examples/org.eclipse.ui.examples.filesystem/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Automatic-Module-Name: org.eclipse.ui.examples.filesystem Bundle-Name: Efs Examples Plug-in Bundle-SymbolicName: org.eclipse.ui.examples.filesystem;singleton:=true -Bundle-Version: 1.2.100.qualifier +Bundle-Version: 1.3.0.qualifier Bundle-Vendor: Eclipse.org Require-Bundle: org.eclipse.core.filesystem, org.eclipse.core.resources, diff --git a/team/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF b/team/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF index a5020c64f4a..5dd50bfb948 100644 --- a/team/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF +++ b/team/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.compare.examples; singleton:=true -Bundle-Version: 3.5.200.qualifier +Bundle-Version: 3.6.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.compare.examples.structurecreator diff --git a/team/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF b/team/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF index 67be34a02a0..64c999f915c 100644 --- a/team/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF +++ b/team/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.team.examples.filesystem; singleton:=true -Bundle-Version: 3.8.200.qualifier +Bundle-Version: 3.9.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.team.examples.filesystem,