From c673caf92ee19d59f03095ca5d15943a6e0ac540 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Thu, 8 Aug 2019 17:16:54 +0300 Subject: Remove unneeded suppress warnings. Change-Id: I6b552fd94ced0cd8c0d489386d4b594ae7df8fdf Signed-off-by: Alexander Kurtakov --- .../ui/preferences/FieldEditorOverlayPage.java | 1 - .../eclipse/cdt/dsf/debug/ui/DsfDebugUITools.java | 26 +++++++++------------- .../breakpoints/BreakpointVMProvider.java | 2 +- .../cdt/dsf/ui/concurrent/DisplayDsfExecutor.java | 3 +-- .../META-INF/MANIFEST.MF | 2 +- .../launcher/ContainerCommandLauncherFactory.java | 1 - .../docker/launcher/ContainerDataVolumeDialog.java | 3 +-- 7 files changed, 15 insertions(+), 23 deletions(-) diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FieldEditorOverlayPage.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FieldEditorOverlayPage.java index 6a47f9da134..393c2c78197 100644 --- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FieldEditorOverlayPage.java +++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FieldEditorOverlayPage.java @@ -332,7 +332,6 @@ public abstract class FieldEditorOverlayPage extends FieldEditorPreferencePage i /** * Creates a new preferences page and opens it */ - @SuppressWarnings("cast") protected void configureWorkspaceSettings() { try { // create a new instance of the current class diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/DsfDebugUITools.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/DsfDebugUITools.java index b4c430c94ea..fa707dc1cb0 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/DsfDebugUITools.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/DsfDebugUITools.java @@ -35,22 +35,18 @@ public class DsfDebugUITools { /** * @since 2.1 */ - @SuppressWarnings("unchecked") public static void enableActivity(final String activityID, final boolean enableit) { - PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { - @Override - public void run() { - IWorkbenchActivitySupport workbenchActivitySupport = PlatformUI.getWorkbench().getActivitySupport(); - IActivityManager activityManager = workbenchActivitySupport.getActivityManager(); - Set enabledActivityIds = new HashSet(activityManager.getEnabledActivityIds()); - boolean changed = false; - if (enableit) - changed = enabledActivityIds.add(activityID); - else - changed = enabledActivityIds.remove(activityID); - if (changed) - workbenchActivitySupport.setEnabledActivityIds(enabledActivityIds); - } + PlatformUI.getWorkbench().getDisplay().asyncExec(() -> { + IWorkbenchActivitySupport workbenchActivitySupport = PlatformUI.getWorkbench().getActivitySupport(); + IActivityManager activityManager = workbenchActivitySupport.getActivityManager(); + Set enabledActivityIds = new HashSet<>(activityManager.getEnabledActivityIds()); + boolean changed = false; + if (enableit) + changed = enabledActivityIds.add(activityID); + else + changed = enabledActivityIds.remove(activityID); + if (changed) + workbenchActivitySupport.setEnabledActivityIds(enabledActivityIds); }); } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMProvider.java index a25654d5a04..d699947880b 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMProvider.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMProvider.java @@ -112,7 +112,7 @@ public class BreakpointVMProvider extends AbstractVMProvider { @Override protected void retrieve(final DataRequestMonitor> rm) { getNestingCategoryBreakpoints(fParentPath, new DataRequestMonitor(getExecutor(), rm) { - @SuppressWarnings({ "cast", "unchecked" }) + @SuppressWarnings({ "unchecked" }) @Override protected void handleSuccess() { Map> bpsLists = new HashMap<>(); diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/DisplayDsfExecutor.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/DisplayDsfExecutor.java index 33ce2e84d85..34f12789d79 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/DisplayDsfExecutor.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/DisplayDsfExecutor.java @@ -275,9 +275,8 @@ public class DisplayDsfExecutor extends DefaultDsfExecutor { * Override to prevent clients from shutting down. The executor will be * shut down when the underlying display is discovered to be shut down. */ - @SuppressWarnings({ "cast", "unchecked" }) @Override public List shutdownNow() { - return Collections.EMPTY_LIST; + return Collections.emptyList(); } } diff --git a/launch/org.eclipse.cdt.docker.launcher/META-INF/MANIFEST.MF b/launch/org.eclipse.cdt.docker.launcher/META-INF/MANIFEST.MF index 57887039468..a44458de9ef 100644 --- a/launch/org.eclipse.cdt.docker.launcher/META-INF/MANIFEST.MF +++ b/launch/org.eclipse.cdt.docker.launcher/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.cdt.docker.launcher;singleton:=true -Bundle-Version: 1.2.200.qualifier +Bundle-Version: 1.2.300.qualifier Bundle-Activator: org.eclipse.cdt.docker.launcher.DockerLaunchUIPlugin Bundle-Vendor: %Plugin.vendor Bundle-Localization: plugin diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncherFactory.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncherFactory.java index 3cfb3df4174..24a48609bc5 100644 --- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncherFactory.java +++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/ContainerCommandLauncherFactory.java @@ -49,7 +49,6 @@ public class ContainerCommandLauncherFactory implements ICommandLauncherFactory, private IProject project; - @SuppressWarnings("restriction") @Override public ICommandLauncher getCommandLauncher(IProject project) { this.project = project; diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerDataVolumeDialog.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerDataVolumeDialog.java index 75f4626aa43..be205a63b06 100644 --- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerDataVolumeDialog.java +++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerDataVolumeDialog.java @@ -233,8 +233,7 @@ public class ContainerDataVolumeDialog extends Dialog { } private void setupValidationSupport(final Label errorMessageIcon, final Label errorMessageLabel) { - for (@SuppressWarnings("unchecked") - Iterator iterator = dbc.getBindings().iterator(); iterator.hasNext();) { + for (Iterator iterator = dbc.getBindings().iterator(); iterator.hasNext();) { final Binding binding = iterator.next(); binding.getModel().addChangeListener(onDataVolumeSettingsChanged(errorMessageIcon, errorMessageLabel)); } -- cgit v1.2.3