From a688e3115e2a397643abffe53ad584aaeb5f45c0 Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Sat, 7 Jun 2025 02:51:24 +0000 Subject: [PATCH] Perform clean code of debug/org.eclipse.debug.tests --- .../debug/tests/breakpoint/SerialExecutorTest.java | 1 - .../tests/console/ConsoleDocumentAdapterTests.java | 1 - .../debug/tests/console/IOConsoleTestUtil.java | 2 -- .../tests/console/ProcessConsoleManagerTests.java | 1 - .../debug/tests/console/ProcessConsoleTests.java | 12 +----------- .../tests/launching/LaunchConfigurationTests.java | 2 +- .../debug/tests/launching/LaunchManagerTests.java | 2 +- .../TestLogicalStructureTypeDelegate.java | 3 +-- .../debug/tests/sourcelookup/TestSourceDirector.java | 3 +-- .../src/org/eclipse/debug/tests/ui/SpyTabGroup.java | 3 +-- .../debug/tests/view/memory/TableRenderingTests.java | 1 - .../debug/tests/viewer/model/FilterTests.java | 6 ++---- .../model/TreeModelViewerAutopopulateAgent.java | 3 +-- 13 files changed, 9 insertions(+), 31 deletions(-) diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/SerialExecutorTest.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/SerialExecutorTest.java index 94d27230403..540b7875689 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/SerialExecutorTest.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/SerialExecutorTest.java @@ -26,7 +26,6 @@ import org.eclipse.debug.tests.AbstractDebugTest; import org.junit.Test; -@SuppressWarnings("restriction") public class SerialExecutorTest extends AbstractDebugTest { @Override public void tearDown() throws Exception { 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 59a5ffc8dc2..35d88afd32d 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 @@ -46,7 +46,6 @@ * Primary tests fixed width mode and calculation of {@link TextChangingEvent}s. *

*/ -@SuppressWarnings("restriction") public class ConsoleDocumentAdapterTests extends AbstractDebugTest { /** diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/IOConsoleTestUtil.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/IOConsoleTestUtil.java index d1c60c6dab6..e781094c958 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/IOConsoleTestUtil.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/IOConsoleTestUtil.java @@ -786,7 +786,6 @@ public void setIgnoreFixedConsole(boolean ignoreWrappeding) { * * @return output partition identifier */ - @SuppressWarnings("restriction") public static String outputPartitionType() { return org.eclipse.ui.internal.console.IOConsolePartition.OUTPUT_PARTITION_TYPE; } @@ -797,7 +796,6 @@ public static String outputPartitionType() { * * @return input partition identifier */ - @SuppressWarnings("restriction") public static String inputPartitionType() { return org.eclipse.ui.internal.console.IOConsolePartition.INPUT_PARTITION_TYPE; } diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ProcessConsoleManagerTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ProcessConsoleManagerTests.java index 00728b27b68..b841ef2fe86 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ProcessConsoleManagerTests.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ProcessConsoleManagerTests.java @@ -45,7 +45,6 @@ /** * Tests the ProcessConsoleManager. */ -@SuppressWarnings("restriction") public class ProcessConsoleManagerTests extends AbstractDebugTest { /** 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 8c6a9b33edc..5054f3055a3 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 @@ -192,7 +192,6 @@ public void processConsoleUTF8Input(String prefix, int numTwoByteCharacters) thr final ILaunch launch = new Launch(null, ILaunchManager.RUN_MODE, null); launch.setAttribute(DebugPlugin.ATTR_CONSOLE_ENCODING, StandardCharsets.UTF_8.toString()); final IProcess process = DebugPlugin.newProcess(launch, mockProcess, "testUtf8Input"); - @SuppressWarnings("restriction") final org.eclipse.debug.internal.ui.views.console.ProcessConsole console = new org.eclipse.debug.internal.ui.views.console.ProcessConsole(process, new ConsoleColorProvider(), StandardCharsets.UTF_8.toString()); try { console.initialize(); @@ -223,11 +222,9 @@ public void testInputReadJobCancel() throws Exception { final MockProcess mockProcess = new MockProcess(MockProcess.RUN_FOREVER); try { final IProcess process = mockProcess.toRuntimeProcess("testInputReadJobCancel"); - @SuppressWarnings("restriction") final org.eclipse.debug.internal.ui.views.console.ProcessConsole console = new org.eclipse.debug.internal.ui.views.console.ProcessConsole(process, new ConsoleColorProvider()); try { console.initialize(); - @SuppressWarnings("restriction") final Class jobFamily = org.eclipse.debug.internal.ui.views.console.ProcessConsole.class; assertThat(Job.getJobManager().find(jobFamily)).as("check input read job started").hasSizeGreaterThan(0); Job.getJobManager().cancel(jobFamily); @@ -287,7 +284,6 @@ public void processTerminationTest(ILaunchConfiguration launchConfig, boolean te final AtomicBoolean terminationSignaled = new AtomicBoolean(false); final Process mockProcess = new MockProcess(null, null, terminateBeforeConsoleInitialization ? 0 : -1); final IProcess process = DebugPlugin.newProcess(new Launch(launchConfig, ILaunchManager.RUN_MODE, null), mockProcess, name.getMethodName()); - @SuppressWarnings("restriction") final org.eclipse.debug.internal.ui.views.console.ProcessConsole console = new org.eclipse.debug.internal.ui.views.console.ProcessConsole(process, new ConsoleColorProvider()); console.addPropertyChangeListener(event -> { if (event.getSource() == console && IConsoleConstants.P_CONSOLE_OUTPUT_COMPLETE.equals(event.getProperty())) { @@ -389,7 +385,6 @@ private IOConsole doConsoleOutputTest(byte[] testContent, Map la final IProcess process = mockProcess.toRuntimeProcess("Output Redirect", launchConfigAttributes); final String encoding = launchConfigAttributes != null ? (String) launchConfigAttributes.get(DebugPlugin.ATTR_CONSOLE_ENCODING) : null; final AtomicBoolean consoleFinished = new AtomicBoolean(false); - @SuppressWarnings("restriction") final org.eclipse.debug.internal.ui.views.console.ProcessConsole console = new org.eclipse.debug.internal.ui.views.console.ProcessConsole(process, new ConsoleColorProvider(), encoding); console.addPropertyChangeListener((PropertyChangeEvent event) -> { if (event.getSource() == console && IConsoleConstants.P_CONSOLE_OUTPUT_COMPLETE.equals(event.getProperty())) { @@ -409,9 +404,7 @@ private IOConsole doConsoleOutputTest(byte[] testContent, Map la final IDocument doc = console.getDocument(); if (outFile != null) { - @SuppressWarnings("restriction") - String expectedPathMsg = MessageFormat.format(org.eclipse.debug.internal.ui.views.console.ConsoleMessages.ProcessConsole_1, new Object[] { - outFile.getAbsolutePath() }); + String expectedPathMsg = MessageFormat.format(org.eclipse.debug.internal.ui.views.console.ConsoleMessages.ProcessConsole_1, outFile.getAbsolutePath()); assertEquals("No or wrong output of redirect file path in console.", expectedPathMsg, doc.get(doc.getLineOffset(0), doc.getLineLength(0))); assertThat(console.getHyperlinks()).as("check redirect file path is linked").hasSize(1); } @@ -450,7 +443,6 @@ public void testOutput() throws Exception { launchConfigAttributes.put(DebugPlugin.ATTR_CONSOLE_ENCODING, consoleEncoding); final IProcess process = mockProcess.toRuntimeProcess("simpleOutput", launchConfigAttributes); sysout.println(lines[1]); - @SuppressWarnings("restriction") final org.eclipse.debug.internal.ui.views.console.ProcessConsole console = new org.eclipse.debug.internal.ui.views.console.ProcessConsole(process, new ConsoleColorProvider(), consoleEncoding); sysout.println(lines[2]); try { @@ -507,7 +499,6 @@ public void testBinaryOutputToFile() throws Exception { launchConfigAttributes.put(IDebugUIConstants.ATTR_CAPTURE_IN_FILE, outFile.getCanonicalPath()); launchConfigAttributes.put(IDebugUIConstants.ATTR_CAPTURE_IN_CONSOLE, false); final IProcess process = mockProcess.toRuntimeProcess("redirectBinaryOutput", launchConfigAttributes); - @SuppressWarnings("restriction") final org.eclipse.debug.internal.ui.views.console.ProcessConsole console = new org.eclipse.debug.internal.ui.views.console.ProcessConsole(process, new ConsoleColorProvider(), consoleEncoding); try { console.initialize(); @@ -562,7 +553,6 @@ public void testBinaryInputFromFile() throws Exception { launchConfigAttributes.put(IDebugUIConstants.ATTR_CAPTURE_STDIN_FILE, inFile.getCanonicalPath()); launchConfigAttributes.put(IDebugUIConstants.ATTR_CAPTURE_IN_CONSOLE, false); final IProcess process = mockProcess.toRuntimeProcess("redirectBinaryInput", launchConfigAttributes); - @SuppressWarnings("restriction") final org.eclipse.debug.internal.ui.views.console.ProcessConsole console = new org.eclipse.debug.internal.ui.views.console.ProcessConsole(process, new ConsoleColorProvider(), consoleEncoding); try { console.initialize(); diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java index ae979f38a9e..912c6b79eb3 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java @@ -86,7 +86,7 @@ @SuppressWarnings("deprecation") public class LaunchConfigurationTests extends AbstractLaunchTest implements ILaunchConfigurationListener { - @SuppressWarnings({ "restriction", "unused" }) + @SuppressWarnings({ "unused" }) // Only ensures org.eclipse.ui.externaltools is required private static final org.eclipse.ui.externaltools.internal.model.BuilderUtils ref = null; diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchManagerTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchManagerTests.java index f8cfdb473ab..7c4e305ff5d 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchManagerTests.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchManagerTests.java @@ -545,7 +545,7 @@ public void testToolTipCalculationLogsError() throws Exception { } class LogListener implements ILogListener { - private Map logs = new HashMap<>(); + private final Map logs = new HashMap<>(); @Override public synchronized void logging(IStatus status, String plugin) { diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/logicalstructure/TestLogicalStructureTypeDelegate.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/logicalstructure/TestLogicalStructureTypeDelegate.java index 13576c139f8..17e31c9c22d 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/logicalstructure/TestLogicalStructureTypeDelegate.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/logicalstructure/TestLogicalStructureTypeDelegate.java @@ -9,8 +9,7 @@ public class TestLogicalStructureTypeDelegate implements ILogicalStructureTypeDe @Override public boolean providesLogicalStructure(IValue value) { - if (value instanceof TestValue) { - TestValue testValue = (TestValue) value; + if (value instanceof TestValue testValue) { return "raw".equals(testValue.getValueString()); } return false; diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/sourcelookup/TestSourceDirector.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/sourcelookup/TestSourceDirector.java index 11edfce68f1..9bcadcc55b1 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/sourcelookup/TestSourceDirector.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/sourcelookup/TestSourceDirector.java @@ -23,8 +23,7 @@ public class TestSourceDirector extends AbstractSourceLookupDirector { public Object getSourceElement(Object element) { if (element instanceof String) { return element.toString() + System.currentTimeMillis(); - } else if (element instanceof IStackFrame) { - IStackFrame frame = (IStackFrame) element; + } else if (element instanceof IStackFrame frame) { return frame.getModelIdentifier() + System.currentTimeMillis(); } return super.getSourceElement(element); diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/ui/SpyTabGroup.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/ui/SpyTabGroup.java index 3a623cbd8d6..4925f4fdd52 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/ui/SpyTabGroup.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/ui/SpyTabGroup.java @@ -15,13 +15,12 @@ import org.eclipse.debug.tests.ui.SpyTab.SpyTabB; import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup; import org.eclipse.debug.ui.ILaunchConfigurationDialog; -import org.eclipse.debug.ui.ILaunchConfigurationTab; public class SpyTabGroup extends AbstractLaunchConfigurationTabGroup { @Override public void createTabs(ILaunchConfigurationDialog dialog, String mode) { - setTabs(new ILaunchConfigurationTab[] { new SpyTabA(), new SpyTabB() }); + setTabs(new SpyTabA(), new SpyTabB()); } } \ No newline at end of file diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/view/memory/TableRenderingTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/view/memory/TableRenderingTests.java index 2fcb4505582..37ef9950d92 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/view/memory/TableRenderingTests.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/view/memory/TableRenderingTests.java @@ -32,7 +32,6 @@ * Tests for translation of memory bytes between in-memory representation and UI * presentation */ -@SuppressWarnings("restriction") public class TableRenderingTests { private static final byte[] BYTES_1 = new byte[] { (byte) 0x87 }; diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTests.java index ec6b0d2ccc6..d1142715efd 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTests.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTests.java @@ -60,8 +60,7 @@ static class TestViewerFilter extends ViewerFilter { @Override public boolean select(Viewer viewer, Object parentElement, Object element) { - if (element instanceof TestElement) { - TestElement te = (TestElement)element; + if (element instanceof TestElement te) { return !fPattern.matcher(te.getLabel()).find(); } @@ -88,8 +87,7 @@ public boolean isApplicable(ITreeModelViewer viewer, Object parentElement) { @Override public boolean select(Viewer viewer, Object parentElement, Object element) { - if (element instanceof TestElement) { - TestElement te = (TestElement)element; + if (element instanceof TestElement te) { return !fPattern.matcher(te.getLabel()).find(); } diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TreeModelViewerAutopopulateAgent.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TreeModelViewerAutopopulateAgent.java index 33b262cafe7..4d0781ba412 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TreeModelViewerAutopopulateAgent.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TreeModelViewerAutopopulateAgent.java @@ -79,8 +79,7 @@ public void viewerUpdatesComplete() { } private TreePath getTreePath(Widget w) { - if (w instanceof TreeItem) { - TreeItem item = (TreeItem)w; + if (w instanceof TreeItem item) { LinkedList segments = new LinkedList<>(); while (item != null) { Object segment = item.getData();