mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 18:26:01 +02:00
Code Issues Wiki Activity

Terminal: Fix connector id references

Browse source
This commit is contained in:
Uwe Stieber 2015-04-17 15:58:33 +02:00
parent 51b6685321
commit 42df31be0e
14 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/activator/UIPlugin.java
View file

@ -50,7 +50,7 @@ public class UIPlugin extends AbstractUIPlugin {
if (getDefault() != null && getDefault().getBundle() != null) { if (getDefault() != null && getDefault().getBundle() != null) {
return getDefault().getBundle().getSymbolicName(); 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$
} }
/** /**

2
plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherHandler.java
View file

@ -57,7 +57,7 @@ public class LocalLauncherHandler extends AbstractHandler {
// Find the local terminal launcher delegate // Find the local terminal launcher delegate
ILauncherDelegate delegate = null; ILauncherDelegate delegate = null;
for (ILauncherDelegate candidate : delegates) { 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; delegate = candidate;
break; break;
} }

2
plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/nls/Messages.java
View file

@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS;
public class Messages extends NLS { public class Messages extends NLS {
// The plug-in resource bundle name // 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. * Static constructor.

2
plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/DynamicContributionItems.java
View file

@ -49,7 +49,7 @@ public class DynamicContributionItems extends CompoundContributionItem implement
this.serviceLocator = serviceLocator; this.serviceLocator = serviceLocator;
// Get the local terminal launcher delegate // 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) /* (non-Javadoc)

2
plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/activator/UIPlugin.java
View file

@ -48,7 +48,7 @@ public class UIPlugin extends AbstractUIPlugin {
if (getDefault() != null && getDefault().getBundle() != null) { if (getDefault() != null && getDefault().getBundle() != null) {
return getDefault().getBundle().getSymbolicName(); 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$
} }
/** /**

2
plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/nls/Messages.java
View file

@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS;
public class Messages extends NLS { public class Messages extends NLS {
// The plug-in resource bundle name // 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. * Static constructor.

2
plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/activator/UIPlugin.java
View file

@ -47,7 +47,7 @@ public class UIPlugin extends AbstractUIPlugin {
if (getDefault() != null && getDefault().getBundle() != null) { if (getDefault() != null && getDefault().getBundle() != null) {
return getDefault().getBundle().getSymbolicName(); 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$
} }
/** /**

2
plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/nls/Messages.java
View file

@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS;
public class Messages extends NLS { public class Messages extends NLS {
// The plug-in resource bundle name // 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. * Static constructor.

2
plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/activator/UIPlugin.java
View file

@ -53,7 +53,7 @@ public class UIPlugin extends AbstractUIPlugin {
if (getDefault() != null && getDefault().getBundle() != null) { if (getDefault() != null && getDefault().getBundle() != null) {
return getDefault().getBundle().getSymbolicName(); 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$
} }
/** /**

2
plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/nls/Messages.java
View file

@ -18,7 +18,7 @@ import org.eclipse.osgi.util.NLS;
public class Messages extends NLS { public class Messages extends NLS {
// The plug-in resource bundle name // 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. * Static constructor.

2
plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/activator/UIPlugin.java
View file

@ -48,7 +48,7 @@ public class UIPlugin extends AbstractUIPlugin {
if (getDefault() != null && getDefault().getBundle() != null) { if (getDefault() != null && getDefault().getBundle() != null) {
return getDefault().getBundle().getSymbolicName(); 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$
} }
/** /**

2
plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/nls/Messages.java
View file

@ -18,7 +18,7 @@ import org.eclipse.osgi.util.NLS;
public class Messages extends NLS { public class Messages extends NLS {
// The plug-in resource bundle name // 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. * Static constructor.

2
plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/internal/LaunchTerminalHandler.java
View file

@ -64,7 +64,7 @@ public class LaunchTerminalHandler extends AbstractHandler {
@Override @Override
protected boolean isFiltered(ISelection selection, ILauncherDelegate delegate) { protected boolean isFiltered(ISelection selection, ILauncherDelegate delegate) {
Assert.isNotNull(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)); dialog.setSelection(new StructuredSelection(host));

2
plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java
View file

@ -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 the selection is valid, fire the command to open the local terminal
if (isValid) { if (isValid) {
ICommandService service = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class); 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()) { if (command != null && command.isDefined() && command.isEnabled()) {
try { try {
ParameterizedCommand pCmd = ParameterizedCommand.generateCommand(command, null); ParameterizedCommand pCmd = ParameterizedCommand.generateCommand(command, null);