mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-09-07 02:23:18 +02:00
Bug 553231: Apply all cleanups
Change-Id: Icc2bbbd8c9b1e5c8999cf5fdada0aa01113231c6
This commit is contained in:
parent
c0ea43a435
commit
43e7fa1726
9 changed files with 15 additions and 13 deletions
|
@ -32,6 +32,7 @@ public class Activator extends Plugin {
|
||||||
private static LaunchTargetManager launchTargetManager;
|
private static LaunchTargetManager launchTargetManager;
|
||||||
private static LaunchBarManager launchBarManager;
|
private static LaunchBarManager launchBarManager;
|
||||||
|
|
||||||
|
@Override
|
||||||
public void start(BundleContext bundleContext) throws Exception {
|
public void start(BundleContext bundleContext) throws Exception {
|
||||||
super.start(bundleContext);
|
super.start(bundleContext);
|
||||||
plugin = this;
|
plugin = this;
|
||||||
|
@ -43,6 +44,7 @@ public class Activator extends Plugin {
|
||||||
bundleContext.registerService(ILaunchBarManager.class, launchBarManager, null);
|
bundleContext.registerService(ILaunchBarManager.class, launchBarManager, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public void stop(BundleContext bundleContext) throws Exception {
|
public void stop(BundleContext bundleContext) throws Exception {
|
||||||
super.stop(bundleContext);
|
super.stop(bundleContext);
|
||||||
plugin = null;
|
plugin = null;
|
||||||
|
|
|
@ -189,7 +189,7 @@ public class ConfigSelector extends CSelector {
|
||||||
} catch (CoreException e) {
|
} catch (CoreException e) {
|
||||||
return e.getStatus();
|
return e.getStatus();
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
}.schedule();
|
}.schedule();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -165,7 +165,7 @@ public class LaunchBarControl implements ILaunchBarListener {
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
Activator.log(ex);
|
Activator.log(ex);
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
button.addDisposeListener(e -> image.dispose());
|
button.addDisposeListener(e -> image.dispose());
|
||||||
return button;
|
return button;
|
||||||
|
|
|
@ -142,7 +142,7 @@ public class BuildActiveCommandHandler extends AbstractHandler {
|
||||||
}.schedule();
|
}.schedule();
|
||||||
|
|
||||||
return Status.OK_STATUS;
|
return Status.OK_STATUS;
|
||||||
};
|
}
|
||||||
}.schedule();
|
}.schedule();
|
||||||
|
|
||||||
} catch (CoreException e) {
|
} catch (CoreException e) {
|
||||||
|
|
|
@ -77,7 +77,7 @@ public class StopActiveCommandHandler extends AbstractHandler {
|
||||||
} catch (CoreException e) {
|
} catch (CoreException e) {
|
||||||
return e.getStatus();
|
return e.getStatus();
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
}.schedule();
|
}.schedule();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -207,7 +207,7 @@ public class NewLaunchConfigEditPage extends WizardPage implements IPageChanging
|
||||||
public ILaunchConfigurationWorkingCopy getWorkingCopy() {
|
public ILaunchConfigurationWorkingCopy getWorkingCopy() {
|
||||||
return super.getWorkingCopy();
|
return super.getWorkingCopy();
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
public LaunchGroupExtension getLaunchGroup() {
|
public LaunchGroupExtension getLaunchGroup() {
|
||||||
if (workingCopy == null)
|
if (workingCopy == null)
|
||||||
|
|
|
@ -146,7 +146,7 @@ public class PerTargetLaunchConfigProviderTest {
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testPopulateLaunchConfiguration() throws CoreException {
|
public void testPopulateLaunchConfiguration() throws CoreException {
|
||||||
|
|
|
@ -19,9 +19,9 @@ import static org.junit.Assert.assertNotNull;
|
||||||
import static org.junit.Assert.assertNull;
|
import static org.junit.Assert.assertNull;
|
||||||
import static org.junit.Assert.assertTrue;
|
import static org.junit.Assert.assertTrue;
|
||||||
import static org.junit.Assert.fail;
|
import static org.junit.Assert.fail;
|
||||||
import static org.mockito.Matchers.any;
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
import static org.mockito.Matchers.anyString;
|
import static org.mockito.ArgumentMatchers.anyString;
|
||||||
import static org.mockito.Matchers.eq;
|
import static org.mockito.ArgumentMatchers.eq;
|
||||||
import static org.mockito.Mockito.doReturn;
|
import static org.mockito.Mockito.doReturn;
|
||||||
import static org.mockito.Mockito.doThrow;
|
import static org.mockito.Mockito.doThrow;
|
||||||
import static org.mockito.Mockito.mock;
|
import static org.mockito.Mockito.mock;
|
||||||
|
@ -113,7 +113,7 @@ public class LaunchBarManager2Test {
|
||||||
ILaunchTargetManager getLaunchTargetManager() {
|
ILaunchTargetManager getLaunchTargetManager() {
|
||||||
return targetManager;
|
return targetManager;
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setUp() throws Exception {
|
public void setUp() throws Exception {
|
||||||
|
|
|
@ -16,9 +16,9 @@ package org.eclipse.launchbar.core.internal;
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
import static org.junit.Assert.assertNotNull;
|
import static org.junit.Assert.assertNotNull;
|
||||||
import static org.junit.Assert.assertNull;
|
import static org.junit.Assert.assertNull;
|
||||||
import static org.mockito.Matchers.any;
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
import static org.mockito.Matchers.anyString;
|
import static org.mockito.ArgumentMatchers.anyString;
|
||||||
import static org.mockito.Matchers.eq;
|
import static org.mockito.ArgumentMatchers.eq;
|
||||||
import static org.mockito.Mockito.doAnswer;
|
import static org.mockito.Mockito.doAnswer;
|
||||||
import static org.mockito.Mockito.doReturn;
|
import static org.mockito.Mockito.doReturn;
|
||||||
import static org.mockito.Mockito.mock;
|
import static org.mockito.Mockito.mock;
|
||||||
|
|
Loading…
Add table
Reference in a new issue