mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-08 10:16:03 +02:00
Terminal: Fix connector id references
This commit is contained in:
Uwe Stieber
parent
51b6685321
commit
42df31be0e
14 changed files with 14 additions and 14 deletions
|
|
@ -50,7 +50,7 @@ public class UIPlugin extends AbstractUIPlugin {
|
|||
if (getDefault() != null && getDefault().getBundle() != null) {
|
||||
return getDefault().getBundle().getSymbolicName();
|
||||
}
|
||||
return "org.eclipse.tm.terminal.view.ui.local"; //$NON-NLS-1$
|
||||
return "org.eclipse.tm.terminal.connector.local"; //$NON-NLS-1$
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ public class LocalLauncherHandler extends AbstractHandler {
|
|||
// Find the local terminal launcher delegate
|
||||
ILauncherDelegate delegate = null;
|
||||
for (ILauncherDelegate candidate : delegates) {
|
||||
if ("org.eclipse.tm.terminal.view.ui.local.launcher.local".equals(candidate.getId())) { //$NON-NLS-1$
|
||||
if ("org.eclipse.tm.terminal.connector.local.launcher.local".equals(candidate.getId())) { //$NON-NLS-1$
|
||||
delegate = candidate;
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS;
|
|||
public class Messages extends NLS {
|
||||
|
||||
// The plug-in resource bundle name
|
||||
private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.view.ui.local.nls.Messages"; //$NON-NLS-1$
|
||||
private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.connector.local.nls.Messages"; //$NON-NLS-1$
|
||||
|
||||
/**
|
||||
* Static constructor.
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ public class DynamicContributionItems extends CompoundContributionItem implement
|
|||
this.serviceLocator = serviceLocator;
|
||||
|
||||
// Get the local terminal launcher delegate
|
||||
delegate = LauncherDelegateManager.getInstance().getLauncherDelegate("org.eclipse.tm.terminal.view.ui.local.launcher.local", false); //$NON-NLS-1$
|
||||
delegate = LauncherDelegateManager.getInstance().getLauncherDelegate("org.eclipse.tm.terminal.connector.local.launcher.local", false); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ public class UIPlugin extends AbstractUIPlugin {
|
|||
if (getDefault() != null && getDefault().getBundle() != null) {
|
||||
return getDefault().getBundle().getSymbolicName();
|
||||
}
|
||||
return "org.eclipse.tm.terminal.view.ui.process"; //$NON-NLS-1$
|
||||
return "org.eclipse.tm.terminal.connector.process"; //$NON-NLS-1$
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS;
|
|||
public class Messages extends NLS {
|
||||
|
||||
// The plug-in resource bundle name
|
||||
private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.view.ui.process.nls.Messages"; //$NON-NLS-1$
|
||||
private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.connector.process.nls.Messages"; //$NON-NLS-1$
|
||||
|
||||
/**
|
||||
* Static constructor.
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ public class UIPlugin extends AbstractUIPlugin {
|
|||
if (getDefault() != null && getDefault().getBundle() != null) {
|
||||
return getDefault().getBundle().getSymbolicName();
|
||||
}
|
||||
return "org.eclipse.tm.terminal.view.ui.serial"; //$NON-NLS-1$
|
||||
return "org.eclipse.tm.terminal.connector.serial"; //$NON-NLS-1$
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS;
|
|||
public class Messages extends NLS {
|
||||
|
||||
// The plug-in resource bundle name
|
||||
private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.view.ui.serial.nls.Messages"; //$NON-NLS-1$
|
||||
private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.connector.serial.nls.Messages"; //$NON-NLS-1$
|
||||
|
||||
/**
|
||||
* Static constructor.
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ public class UIPlugin extends AbstractUIPlugin {
|
|||
if (getDefault() != null && getDefault().getBundle() != null) {
|
||||
return getDefault().getBundle().getSymbolicName();
|
||||
}
|
||||
return "org.eclipse.tm.terminal.view.ui.ssh"; //$NON-NLS-1$
|
||||
return "org.eclipse.tm.terminal.connector.ssh"; //$NON-NLS-1$
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ import org.eclipse.osgi.util.NLS;
|
|||
public class Messages extends NLS {
|
||||
|
||||
// The plug-in resource bundle name
|
||||
private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.view.ui.ssh.nls.Messages"; //$NON-NLS-1$
|
||||
private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.connector.ssh.nls.Messages"; //$NON-NLS-1$
|
||||
|
||||
/**
|
||||
* Static constructor.
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ public class UIPlugin extends AbstractUIPlugin {
|
|||
if (getDefault() != null && getDefault().getBundle() != null) {
|
||||
return getDefault().getBundle().getSymbolicName();
|
||||
}
|
||||
return "org.eclipse.tm.terminal.view.ui.telnet"; //$NON-NLS-1$
|
||||
return "org.eclipse.tm.terminal.connector.telnet"; //$NON-NLS-1$
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ import org.eclipse.osgi.util.NLS;
|
|||
public class Messages extends NLS {
|
||||
|
||||
// The plug-in resource bundle name
|
||||
private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.view.ui.telnet.nls.Messages"; //$NON-NLS-1$
|
||||
private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.connector.telnet.nls.Messages"; //$NON-NLS-1$
|
||||
|
||||
/**
|
||||
* Static constructor.
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ public class LaunchTerminalHandler extends AbstractHandler {
|
|||
@Override
|
||||
protected boolean isFiltered(ISelection selection, ILauncherDelegate delegate) {
|
||||
Assert.isNotNull(delegate);
|
||||
return !"org.eclipse.tm.terminal.view.ui.ssh.launcher.ssh".equals(delegate.getId()); //$NON-NLS-1$
|
||||
return !"org.eclipse.tm.terminal.connector.ssh.launcher.ssh".equals(delegate.getId()); //$NON-NLS-1$
|
||||
}
|
||||
};
|
||||
dialog.setSelection(new StructuredSelection(host));
|
||||
|
|
|
|||
|
|
@ -696,7 +696,7 @@ public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTa
|
|||
// If the selection is valid, fire the command to open the local terminal
|
||||
if (isValid) {
|
||||
ICommandService service = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class);
|
||||
Command command = service != null ? service.getCommand("org.eclipse.tm.terminal.view.ui.local.command.launch") : null; //$NON-NLS-1$
|
||||
Command command = service != null ? service.getCommand("org.eclipse.tm.terminal.connector.local.command.launch") : null; //$NON-NLS-1$
|
||||
if (command != null && command.isDefined() && command.isEnabled()) {
|
||||
try {
|
||||
ParameterizedCommand pCmd = ParameterizedCommand.generateCommand(command, null);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue