mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-31 21:05:37 +02:00
Code Issues Wiki Activity

Terminal: Fix connector and launcher delegate ids

Browse source
This commit is contained in:
Uwe Stieber 2015-04-17 12:39:30 +02:00
parent 14f991795d
commit 0a2f67ae84
9 changed files with 16 additions and 12 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/controls/LocalWizardConfigurationPanel.java
View file

@ -100,7 +100,7 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration
@Override @Override
public void extractData(Map<String, Object> data) { public void extractData(Map<String, Object> data) {
// set the terminal connector id for local terminal // set the terminal connector id for local terminal
data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID, "org.eclipse.tm.terminal.view.ui.local.LocalConnector"); //$NON-NLS-1$ data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID, "org.eclipse.tm.terminal.connector.local.LocalConnector"); //$NON-NLS-1$
// Store the encoding // Store the encoding
data.put(ITerminalsConnectorConstants.PROP_ENCODING, getEncoding()); data.put(ITerminalsConnectorConstants.PROP_ENCODING, getEncoding());

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

@ -278,7 +278,7 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate {
// Check for the terminal connector id // Check for the terminal connector id
String connectorId = (String)properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID); String connectorId = (String)properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID);
if (connectorId == null) connectorId = "org.eclipse.tm.terminal.view.ui.local.LocalConnector"; //$NON-NLS-1$ if (connectorId == null) connectorId = "org.eclipse.tm.terminal.connector.local.LocalConnector"; //$NON-NLS-1$
// Extract the process properties using defaults // Extract the process properties using defaults
String image; String image;

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

@ -71,7 +71,7 @@ public class ProcessLauncherDelegate extends AbstractLauncherDelegate {
// Check for the terminal connector id // Check for the terminal connector id
String connectorId = (String)properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID); String connectorId = (String)properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID);
if (connectorId == null) connectorId = "org.eclipse.tm.terminal.view.ui.ProcessConnector"; //$NON-NLS-1$ if (connectorId == null) connectorId = "org.eclipse.tm.terminal.connector.process.ProcessConnector"; //$NON-NLS-1$
// Extract the process properties // Extract the process properties
String image = (String)properties.get(ITerminalsConnectorConstants.PROP_PROCESS_PATH); String image = (String)properties.get(ITerminalsConnectorConstants.PROP_PROCESS_PATH);

2
plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/controls/SshWizardConfigurationPanel.java
View file

@ -164,7 +164,7 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
if (data == null) return; if (data == null) return;
// set the terminal connector id for ssh // set the terminal connector id for ssh
data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID, "org.eclipse.tm.internal.terminal.ssh.SshConnector"); //$NON-NLS-1$ data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID, "org.eclipse.tm.terminal.connector.ssh.connector.SshConnector"); //$NON-NLS-1$
sshSettingsPage.saveSettings(); sshSettingsPage.saveSettings();
data.put(ITerminalsConnectorConstants.PROP_IP_HOST,sshSettings.getHost()); data.put(ITerminalsConnectorConstants.PROP_IP_HOST,sshSettings.getHost());

6
plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/launcher/SshLauncherDelegate.java
View file

@ -121,7 +121,7 @@ public class SshLauncherDelegate extends AbstractLauncherDelegate {
// Check for the terminal connector id // Check for the terminal connector id
String connectorId = (String)properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID); String connectorId = (String)properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID);
if (connectorId == null) connectorId = "org.eclipse.tm.internal.terminal.ssh.SshConnector"; //$NON-NLS-1$ if (connectorId == null) connectorId = "org.eclipse.tm.terminal.connector.ssh.connector.SshConnector"; //$NON-NLS-1$
// Extract the ssh properties // Extract the ssh properties
String host = (String)properties.get(ITerminalsConnectorConstants.PROP_IP_HOST); String host = (String)properties.get(ITerminalsConnectorConstants.PROP_IP_HOST);
@ -141,7 +141,9 @@ public class SshLauncherDelegate extends AbstractLauncherDelegate {
} }
// The real port to connect to is port + portOffset // The real port to connect to is port + portOffset
port = Integer.toString(Integer.decode(port).intValue() + portOffset); if (port != null) {
port = Integer.toString(Integer.decode(port).intValue() + portOffset);
}
// Construct the ssh settings store // Construct the ssh settings store
ISettingsStore store = new SettingsStore(); ISettingsStore store = new SettingsStore();

2
plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/controls/TelnetWizardConfigurationPanel.java
View file

@ -118,7 +118,7 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio
if (data == null) return; if (data == null) return;
// set the terminal connector id for ssh // set the terminal connector id for ssh
data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID, "org.eclipse.tm.internal.terminal.telnet.TelnetConnector"); //$NON-NLS-1$ data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID, "org.eclipse.tm.terminal.connector.telnet.TelnetConnector"); //$NON-NLS-1$
telnetSettingsPage.saveSettings(); telnetSettingsPage.saveSettings();
data.put(ITerminalsConnectorConstants.PROP_IP_HOST,telnetSettings.getHost()); data.put(ITerminalsConnectorConstants.PROP_IP_HOST,telnetSettings.getHost());

6
plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetLauncherDelegate.java
View file

@ -120,7 +120,7 @@ public class TelnetLauncherDelegate extends AbstractLauncherDelegate {
// Check for the terminal connector id // Check for the terminal connector id
String connectorId = (String)properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID); String connectorId = (String)properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID);
if (connectorId == null) connectorId = "org.eclipse.tm.internal.terminal.telnet.TelnetConnector"; //$NON-NLS-1$ if (connectorId == null) connectorId = "org.eclipse.tm.terminal.connector.telnet.TelnetConnector"; //$NON-NLS-1$
// Extract the telnet properties // Extract the telnet properties
String host = (String)properties.get(ITerminalsConnectorConstants.PROP_IP_HOST); String host = (String)properties.get(ITerminalsConnectorConstants.PROP_IP_HOST);
@ -136,7 +136,9 @@ public class TelnetLauncherDelegate extends AbstractLauncherDelegate {
} }
// The real port to connect to is port + portOffset // The real port to connect to is port + portOffset
port = Integer.toString(Integer.decode(port).intValue() + portOffset); if (port != null) {
port = Integer.toString(Integer.decode(port).intValue() + portOffset);
}
// Construct the terminal settings store // Construct the terminal settings store
ISettingsStore store = new SettingsStore(); ISettingsStore store = new SettingsStore();

4
plugins/org.eclipse.tm.terminal.view.ui/plugin.xml
View file

@ -112,7 +112,7 @@
<extension point="org.eclipse.tm.terminal.control.connectors"> <extension point="org.eclipse.tm.terminal.control.connectors">
<connector <connector
name="%TerminalConnector.streams" name="%TerminalConnector.streams"
id="org.eclipse.tm.terminal.view.ui.StreamsConnector" id="org.eclipse.tm.terminal.connector.streams.StreamsConnector"
hidden="true" hidden="true"
class="org.eclipse.tm.terminal.view.ui.streams.StreamsConnector"/> class="org.eclipse.tm.terminal.view.ui.streams.StreamsConnector"/>
</extension> </extension>
@ -138,7 +138,7 @@
<delegate <delegate
class="org.eclipse.tm.terminal.view.ui.streams.StreamsLauncherDelegate" class="org.eclipse.tm.terminal.view.ui.streams.StreamsLauncherDelegate"
hidden="true" hidden="true"
id="org.eclipse.tm.terminal.view.ui.launcher.streams" id="org.eclipse.tm.terminal.connector.streams.launcher.streams"
label="%StreamsLauncherDelegate.label"> label="%StreamsLauncherDelegate.label">
</delegate> </delegate>
</extension> </extension>

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

@ -72,7 +72,7 @@ public class StreamsLauncherDelegate extends AbstractLauncherDelegate {
// Check for the terminal connector id // Check for the terminal connector id
String connectorId = (String)properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID); String connectorId = (String)properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID);
if (connectorId == null) connectorId = "org.eclipse.tm.terminal.view.ui.StreamsConnector"; //$NON-NLS-1$ if (connectorId == null) connectorId = "org.eclipse.tm.terminal.connector.streams.StreamsConnector"; //$NON-NLS-1$
// Extract the streams properties // Extract the streams properties
OutputStream stdin = (OutputStream)properties.get(ITerminalsConnectorConstants.PROP_STREAMS_STDIN); OutputStream stdin = (OutputStream)properties.get(ITerminalsConnectorConstants.PROP_STREAMS_STDIN);