From 43e7fa17261300e42c23cb671df970daf1c9c720 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Tue, 19 Nov 2019 14:13:40 -0500 Subject: [PATCH] Bug 553231: Apply all cleanups Change-Id: Icc2bbbd8c9b1e5c8999cf5fdada0aa01113231c6 --- .../org/eclipse/launchbar/core/internal/Activator.java | 2 ++ .../launchbar/ui/controls/internal/ConfigSelector.java | 2 +- .../launchbar/ui/controls/internal/LaunchBarControl.java | 2 +- .../ui/internal/commands/BuildActiveCommandHandler.java | 2 +- .../ui/internal/commands/StopActiveCommandHandler.java | 2 +- .../ui/internal/dialogs/NewLaunchConfigEditPage.java | 2 +- .../launchbar/core/PerTargetLaunchConfigProviderTest.java | 2 +- .../launchbar/core/internal/LaunchBarManager2Test.java | 8 ++++---- .../launchbar/core/internal/LaunchBarManagerTest.java | 6 +++--- 9 files changed, 15 insertions(+), 13 deletions(-) diff --git a/bundles/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/Activator.java b/bundles/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/Activator.java index ad239646431..ba17d2770d3 100644 --- a/bundles/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/Activator.java +++ b/bundles/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/Activator.java @@ -32,6 +32,7 @@ public class Activator extends Plugin { private static LaunchTargetManager launchTargetManager; private static LaunchBarManager launchBarManager; + @Override public void start(BundleContext bundleContext) throws Exception { super.start(bundleContext); plugin = this; @@ -43,6 +44,7 @@ public class Activator extends Plugin { bundleContext.registerService(ILaunchBarManager.class, launchBarManager, null); } + @Override public void stop(BundleContext bundleContext) throws Exception { super.stop(bundleContext); plugin = null; diff --git a/bundles/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/ConfigSelector.java b/bundles/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/ConfigSelector.java index 881b5e5384e..cadeb5c55a9 100644 --- a/bundles/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/ConfigSelector.java +++ b/bundles/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/ConfigSelector.java @@ -189,7 +189,7 @@ public class ConfigSelector extends CSelector { } catch (CoreException e) { return e.getStatus(); } - }; + } }.schedule(); } } diff --git a/bundles/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/LaunchBarControl.java b/bundles/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/LaunchBarControl.java index 6014bef2fae..90d31b71a62 100644 --- a/bundles/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/LaunchBarControl.java +++ b/bundles/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/LaunchBarControl.java @@ -165,7 +165,7 @@ public class LaunchBarControl implements ILaunchBarListener { } catch (Exception ex) { Activator.log(ex); } - }; + } }); button.addDisposeListener(e -> image.dispose()); return button; diff --git a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/commands/BuildActiveCommandHandler.java b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/commands/BuildActiveCommandHandler.java index b2a48988b8a..5ca972b1385 100644 --- a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/commands/BuildActiveCommandHandler.java +++ b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/commands/BuildActiveCommandHandler.java @@ -142,7 +142,7 @@ public class BuildActiveCommandHandler extends AbstractHandler { }.schedule(); return Status.OK_STATUS; - }; + } }.schedule(); } catch (CoreException e) { diff --git a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/commands/StopActiveCommandHandler.java b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/commands/StopActiveCommandHandler.java index 1607c245353..8ab0ebd033a 100644 --- a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/commands/StopActiveCommandHandler.java +++ b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/commands/StopActiveCommandHandler.java @@ -77,7 +77,7 @@ public class StopActiveCommandHandler extends AbstractHandler { } catch (CoreException e) { return e.getStatus(); } - }; + } }.schedule(); } } diff --git a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/dialogs/NewLaunchConfigEditPage.java b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/dialogs/NewLaunchConfigEditPage.java index b77735f0015..2f825ee02bd 100644 --- a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/dialogs/NewLaunchConfigEditPage.java +++ b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/dialogs/NewLaunchConfigEditPage.java @@ -207,7 +207,7 @@ public class NewLaunchConfigEditPage extends WizardPage implements IPageChanging public ILaunchConfigurationWorkingCopy getWorkingCopy() { return super.getWorkingCopy(); } - }; + } public LaunchGroupExtension getLaunchGroup() { if (workingCopy == null) diff --git a/tests/org.eclipse.launchbar.core.tests/src/org/eclipse/launchbar/core/PerTargetLaunchConfigProviderTest.java b/tests/org.eclipse.launchbar.core.tests/src/org/eclipse/launchbar/core/PerTargetLaunchConfigProviderTest.java index 1ea6eedbae8..c8c8158ed58 100644 --- a/tests/org.eclipse.launchbar.core.tests/src/org/eclipse/launchbar/core/PerTargetLaunchConfigProviderTest.java +++ b/tests/org.eclipse.launchbar.core.tests/src/org/eclipse/launchbar/core/PerTargetLaunchConfigProviderTest.java @@ -146,7 +146,7 @@ public class PerTargetLaunchConfigProviderTest { return config; } - }; + } @Test public void testPopulateLaunchConfiguration() throws CoreException { diff --git a/tests/org.eclipse.launchbar.core.tests/src/org/eclipse/launchbar/core/internal/LaunchBarManager2Test.java b/tests/org.eclipse.launchbar.core.tests/src/org/eclipse/launchbar/core/internal/LaunchBarManager2Test.java index 9b8fd54f73c..a214309bc32 100644 --- a/tests/org.eclipse.launchbar.core.tests/src/org/eclipse/launchbar/core/internal/LaunchBarManager2Test.java +++ b/tests/org.eclipse.launchbar.core.tests/src/org/eclipse/launchbar/core/internal/LaunchBarManager2Test.java @@ -19,9 +19,9 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; @@ -113,7 +113,7 @@ public class LaunchBarManager2Test { ILaunchTargetManager getLaunchTargetManager() { return targetManager; } - }; + } @Before public void setUp() throws Exception { diff --git a/tests/org.eclipse.launchbar.core.tests/src/org/eclipse/launchbar/core/internal/LaunchBarManagerTest.java b/tests/org.eclipse.launchbar.core.tests/src/org/eclipse/launchbar/core/internal/LaunchBarManagerTest.java index 0742b1711e9..cbcd097520c 100644 --- a/tests/org.eclipse.launchbar.core.tests/src/org/eclipse/launchbar/core/internal/LaunchBarManagerTest.java +++ b/tests/org.eclipse.launchbar.core.tests/src/org/eclipse/launchbar/core/internal/LaunchBarManagerTest.java @@ -16,9 +16,9 @@ package org.eclipse.launchbar.core.internal; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock;