Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2011-10-11 03:13:33 -0400
committerUwe Stieber2011-10-11 03:13:33 -0400
commitf4a745fed256a3203939ce27f177bd73a75d1ec9 (patch)
tree7afa5704677443892fe2d2273862856862c1f899
parentb8af17a2f9f309cc58d87b78eb1e33c95cc7de28 (diff)
downloadorg.eclipse.tcf-f4a745fed256a3203939ce27f177bd73a75d1ec9.tar.gz
org.eclipse.tcf-f4a745fed256a3203939ce27f177bd73a75d1ec9.tar.xz
org.eclipse.tcf-f4a745fed256a3203939ce27f177bd73a75d1ec9.zip
Target Explorer: Declare the CDT PTY dependency for the process terminal
connector implementation optional
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.terminals/META-INF/MANIFEST.MF2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.terminals/plugin.properties2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.terminals/plugin.xml9
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.terminals/src/org/eclipse/tm/te/ui/terminals/manager/ConnectorManager.java3
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.terminals/src/org/eclipse/tm/te/ui/terminals/process/ProcessConnector.java2
5 files changed, 9 insertions, 9 deletions
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.terminals/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tm.te.ui.terminals/META-INF/MANIFEST.MF
index dd35637dc..ebc10128d 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.terminals/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.terminals/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.tm.te.runtime;bundle-version="1.0.0",
org.eclipse.tm.te.ui;bundle-version="1.0.0",
org.eclipse.tm.te.ui.swt;bundle-version="1.0.0",
- org.eclipse.cdt.core;bundle-version="5.3.0"
+ org.eclipse.cdt.core;bundle-version="5.3.0";resolution:=optional
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.terminals/plugin.properties b/target_explorer/plugins/org.eclipse.tm.te.ui.terminals/plugin.properties
index faf90fdb0..4d753aa28 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.terminals/plugin.properties
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.terminals/plugin.properties
@@ -17,7 +17,7 @@ TerminalsView.name=Terminals
# ----- Terminal Connectors -----
-TerminalConnector.process=Process
+TerminalConnector.process=Process Connector (hidden)
TerminalConnector.streams=Streams Connector (hidden)
# ----- Commands and Menu contributions -----
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.terminals/plugin.xml b/target_explorer/plugins/org.eclipse.tm.te.ui.terminals/plugin.xml
index 31dc3d21b..680727b3b 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.terminals/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.terminals/plugin.xml
@@ -28,10 +28,11 @@
<!-- Terminal connector contributions -->
<extension point="org.eclipse.tm.terminal.terminalConnectors">
- <connector
- name="%TerminalConnector.process"
- id="org.eclipse.tm.te.ui.terminals.ProcessConnector"
- class="org.eclipse.tm.te.ui.terminals.process.ProcessConnector"/>
+ <connector
+ class="org.eclipse.tm.te.ui.terminals.process.ProcessConnector"
+ hidden="true"
+ id="org.eclipse.tm.te.ui.terminals.ProcessConnector"
+ name="%TerminalConnector.process"/>
<connector
name="%TerminalConnector.streams"
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.terminals/src/org/eclipse/tm/te/ui/terminals/manager/ConnectorManager.java b/target_explorer/plugins/org.eclipse.tm.te.ui.terminals/src/org/eclipse/tm/te/ui/terminals/manager/ConnectorManager.java
index 7c3842390..bebf8c355 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.terminals/src/org/eclipse/tm/te/ui/terminals/manager/ConnectorManager.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.terminals/src/org/eclipse/tm/te/ui/terminals/manager/ConnectorManager.java
@@ -12,7 +12,6 @@ package org.eclipse.tm.te.ui.terminals.manager;
import java.io.InputStream;
import java.io.OutputStream;
-import org.eclipse.cdt.utils.pty.PTY;
import org.eclipse.core.runtime.Assert;
import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
@@ -131,7 +130,7 @@ public class ConnectorManager {
*
* @return The terminal connector object instance or <code>null</code>.
*/
- public ITerminalConnector createProcessConnector(String connectorTypeId, final String image, final String arguments, final Process process, PTY pty, boolean localEcho) {
+ public ITerminalConnector createProcessConnector(String connectorTypeId, final String image, final String arguments, final Process process, org.eclipse.cdt.utils.pty.PTY pty, boolean localEcho) {
Assert.isTrue(image != null || process != null);
// Normalize the process connector id
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.terminals/src/org/eclipse/tm/te/ui/terminals/process/ProcessConnector.java b/target_explorer/plugins/org.eclipse.tm.te.ui.terminals/src/org/eclipse/tm/te/ui/terminals/process/ProcessConnector.java
index 906043c65..11e23be52 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.terminals/src/org/eclipse/tm/te/ui/terminals/process/ProcessConnector.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.terminals/src/org/eclipse/tm/te/ui/terminals/process/ProcessConnector.java
@@ -260,7 +260,7 @@ public class ProcessConnector extends AbstractStreamsConnector {
private static String[] getProcessEnvironment() {
Map<String, String> env = getNativeEnvironment();
- env.put("TERM", "vt100"); //$NON-NLS-1$ //$NON-NLS-2$
+ env.put("TERM", "ansi"); //$NON-NLS-1$ //$NON-NLS-2$
Iterator<Map.Entry<String, String>> iter = env.entrySet().iterator();
List<String> strings = new ArrayList<String>(env.size());

Back to the top