Skip to content

Commit dc45f3a

Browse files
committed
Rename ILaunchDelegateManager to ILauncherDelegateManager
Since this type is all about `ILauncherDelegate` and not about `ILaunchDelegate` from Debug subsystem, I believe it is better to rename it and avoid confusion.
1 parent 5a019ec commit dc45f3a

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

terminal/bundles/org.eclipse.terminal.connector.local/src/org/eclipse/terminal/connector/local/activator/UIPlugin.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.eclipse.swt.graphics.Image;
1717
import org.eclipse.terminal.view.core.utils.ScopedEclipsePreferences;
1818
import org.eclipse.terminal.view.core.utils.TraceHandler;
19-
import org.eclipse.terminal.view.ui.launcher.ILaunchDelegateManager;
19+
import org.eclipse.terminal.view.ui.launcher.ILauncherDelegateManager;
2020
import org.eclipse.ui.plugin.AbstractUIPlugin;
2121
import org.osgi.framework.BundleContext;
2222
import org.osgi.util.tracker.ServiceTracker;
@@ -32,7 +32,7 @@ public class UIPlugin extends AbstractUIPlugin {
3232
// The trace handler instance
3333
private static volatile TraceHandler traceHandler;
3434

35-
private ServiceTracker<ILaunchDelegateManager, ILaunchDelegateManager> launchDelegateServiceTracker;
35+
private ServiceTracker<ILauncherDelegateManager, ILauncherDelegateManager> launchDelegateServiceTracker;
3636

3737
/**
3838
* Returns the shared instance
@@ -78,7 +78,7 @@ public static TraceHandler getTraceHandler() {
7878
@Override
7979
public void start(BundleContext context) throws Exception {
8080
super.start(context);
81-
launchDelegateServiceTracker = new ServiceTracker<>(context, ILaunchDelegateManager.class, null);
81+
launchDelegateServiceTracker = new ServiceTracker<>(context, ILauncherDelegateManager.class, null);
8282
launchDelegateServiceTracker.open();
8383
plugin = this;
8484
}
@@ -118,7 +118,7 @@ public static ImageDescriptor getImageDescriptor(String key) {
118118
return getDefault().getImageRegistry().getDescriptor(key);
119119
}
120120

121-
public static synchronized ILaunchDelegateManager getLaunchDelegateManager() {
121+
public static synchronized ILauncherDelegateManager getLaunchDelegateManager() {
122122
UIPlugin plugin = getDefault();
123123
if (plugin == null) {
124124
return null;

terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/LauncherDelegateManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import org.eclipse.core.runtime.Status;
4040
import org.eclipse.jface.viewers.ISelection;
4141
import org.eclipse.osgi.util.NLS;
42-
import org.eclipse.terminal.view.ui.launcher.ILaunchDelegateManager;
42+
import org.eclipse.terminal.view.ui.launcher.ILauncherDelegateManager;
4343
import org.eclipse.terminal.view.ui.launcher.ILauncherDelegate;
4444
import org.eclipse.ui.ISources;
4545
import org.eclipse.ui.PlatformUI;
@@ -49,8 +49,8 @@
4949
/**
5050
* Terminal launcher delegate manager implementation.
5151
*/
52-
@Component(service = ILaunchDelegateManager.class)
53-
public class LauncherDelegateManager implements ILaunchDelegateManager {
52+
@Component(service = ILauncherDelegateManager.class)
53+
public class LauncherDelegateManager implements ILauncherDelegateManager {
5454
// Flag to mark the extension point manager initialized (extensions loaded).
5555
private boolean initialized = false;
5656

terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/TerminalService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.eclipse.terminal.view.core.ITerminalsConnectorConstants;
3232
import org.eclipse.terminal.view.ui.IUIConstants;
3333
import org.eclipse.terminal.view.ui.TerminalViewId;
34-
import org.eclipse.terminal.view.ui.launcher.ILaunchDelegateManager;
34+
import org.eclipse.terminal.view.ui.launcher.ILauncherDelegateManager;
3535
import org.eclipse.terminal.view.ui.launcher.ITerminalConsoleViewManager;
3636
import org.eclipse.ui.PlatformUI;
3737
import org.osgi.service.component.annotations.Activate;
@@ -62,7 +62,7 @@ public class TerminalService implements ITerminalService {
6262

6363
private final ITerminalConsoleViewManager consoleViewManager;
6464

65-
private ILaunchDelegateManager launchDelegateManager;
65+
private ILauncherDelegateManager launchDelegateManager;
6666

6767
/**
6868
* Common terminal service runnable implementation.
@@ -96,7 +96,7 @@ public boolean isExecuteAsync() {
9696

9797
@Activate
9898
public TerminalService(@Reference ITerminalConsoleViewManager consoleViewManager,
99-
@Reference ILaunchDelegateManager launchDelegateManager) {
99+
@Reference ILauncherDelegateManager launchDelegateManager) {
100100
this.consoleViewManager = consoleViewManager;
101101
this.launchDelegateManager = launchDelegateManager;
102102
}

terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/UIPlugin.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.eclipse.terminal.view.ui.internal.listeners.WorkbenchWindowListener;
3535
import org.eclipse.terminal.view.ui.internal.view.TerminalsView;
3636
import org.eclipse.terminal.view.ui.internal.view.TerminalsViewMementoHandler;
37-
import org.eclipse.terminal.view.ui.launcher.ILaunchDelegateManager;
37+
import org.eclipse.terminal.view.ui.launcher.ILauncherDelegateManager;
3838
import org.eclipse.terminal.view.ui.launcher.ITerminalConsoleViewManager;
3939
import org.eclipse.ui.IViewPart;
4040
import org.eclipse.ui.IViewReference;
@@ -64,7 +64,7 @@ public class UIPlugin extends AbstractUIPlugin {
6464
private IWindowListener windowListener;
6565

6666
private ServiceTracker<ITerminalService, ITerminalService> terminalServiceTracker;
67-
private ServiceTracker<ILaunchDelegateManager, ILaunchDelegateManager> launchDelegateServiceTracker;
67+
private ServiceTracker<ILauncherDelegateManager, ILauncherDelegateManager> launchDelegateServiceTracker;
6868
private ServiceTracker<ITerminalConsoleViewManager, ITerminalConsoleViewManager> consoleManagerTracker;
6969

7070
/**
@@ -113,7 +113,7 @@ public void start(BundleContext context) throws Exception {
113113
super.start(context);
114114
terminalServiceTracker = new ServiceTracker<>(context, ITerminalService.class, null);
115115
terminalServiceTracker.open();
116-
launchDelegateServiceTracker = new ServiceTracker<>(context, ILaunchDelegateManager.class, null);
116+
launchDelegateServiceTracker = new ServiceTracker<>(context, ILauncherDelegateManager.class, null);
117117
launchDelegateServiceTracker.open();
118118
consoleManagerTracker = new ServiceTracker<>(context, ITerminalConsoleViewManager.class, null);
119119
consoleManagerTracker.open();
@@ -296,7 +296,7 @@ public static ITerminalService getTerminalService() {
296296
return plugin.terminalServiceTracker.getService();
297297
}
298298

299-
public static synchronized ILaunchDelegateManager getLaunchDelegateManager() {
299+
public static synchronized ILauncherDelegateManager getLaunchDelegateManager() {
300300
UIPlugin plugin = getDefault();
301301
if (plugin == null) {
302302
return null;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import org.eclipse.jface.viewers.ISelection;
2020

21-
public interface ILaunchDelegateManager {
21+
public interface ILauncherDelegateManager {
2222

2323
/**
2424
* Returns all contributed terminal launcher delegates.

0 commit comments

Comments
 (0)