diff options
| author | Tobias Schwarz | 2014-03-28 07:02:31 +0000 |
|---|---|---|
| committer | Tobias Schwarz | 2014-03-28 07:02:31 +0000 |
| commit | 2640f854dcba7370f90f6a5af29c54cfa3480877 (patch) | |
| tree | ff87fafca94eb9695ec2b98b949036b9950981da /target_explorer | |
| parent | 37cc607c9ba69c6b2c377f5df66971acb19cdaaf (diff) | |
| download | org.eclipse.tcf-2640f854dcba7370f90f6a5af29c54cfa3480877.tar.gz org.eclipse.tcf-2640f854dcba7370f90f6a5af29c54cfa3480877.tar.xz org.eclipse.tcf-2640f854dcba7370f90f6a5af29c54cfa3480877.zip | |
Target Explorer: avoid reconnect on hitting enter in closed terminals
Diffstat (limited to 'target_explorer')
4 files changed, 6 insertions, 7 deletions
diff --git a/target_explorer/features/org.eclipse.tcf.te.terminals.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.terminals.feature/feature.xml index f58c29d15..34447f2b8 100644 --- a/target_explorer/features/org.eclipse.tcf.te.terminals.feature/feature.xml +++ b/target_explorer/features/org.eclipse.tcf.te.terminals.feature/feature.xml @@ -32,7 +32,7 @@ <import plugin="org.eclipse.tcf.te.ui" version="1.3.0" match="greaterOrEqual"/> <import plugin="org.eclipse.tcf.te.ui.controls" version="1.3.0" match="greaterOrEqual"/> <import plugin="org.eclipse.tcf.te.ui.swt" version="1.3.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.tm.terminal" version="3.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.tm.terminal" version="3.2.300" match="greaterOrEqual"/> <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/> <import plugin="org.eclipse.ui.forms" version="3.5.200" match="greaterOrEqual"/> <import plugin="org.eclipse.ui.ide" version="3.8.1" match="greaterOrEqual"/> @@ -42,7 +42,7 @@ <import plugin="org.eclipse.tm.terminal.serial" version="2.1.200" match="greaterOrEqual"/> <import plugin="org.eclipse.tm.terminal.ssh" version="2.1.300" match="greaterOrEqual"/> <import plugin="org.eclipse.tm.terminal.telnet" version="2.1.300" match="greaterOrEqual"/> - <import feature="org.eclipse.tm.terminal" version="3.2.100" match="greaterOrEqual"/> + <import feature="org.eclipse.tm.terminal" version="3.2.300" match="greaterOrEqual"/> <import feature="org.eclipse.tm.terminal.serial" version="2.1.300" match="greaterOrEqual"/> <import feature="org.eclipse.tm.terminal.ssh" version="2.1.300" match="greaterOrEqual"/> <import feature="org.eclipse.tm.terminal.telnet" version="2.1.300" match="greaterOrEqual"/> diff --git a/target_explorer/features/org.eclipse.tcf.te.terminals.sdk.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.terminals.sdk.feature/feature.xml index afb3d00c5..b542f8de6 100644 --- a/target_explorer/features/org.eclipse.tcf.te.terminals.sdk.feature/feature.xml +++ b/target_explorer/features/org.eclipse.tcf.te.terminals.sdk.feature/feature.xml @@ -22,7 +22,7 @@ </url> <requires> - <import feature="org.eclipse.tm.terminal.core.sdk" version="3.3.100" match="greaterOrEqual"/> + <import feature="org.eclipse.tm.terminal.core.sdk" version="3.3.300" match="greaterOrEqual"/> <import feature="org.eclipse.tcf.te.terminals.feature" version="1.3.0" match="greaterOrEqual"/> </requires> diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/META-INF/MANIFEST.MF index 04bd1d6ed..013a11fcf 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.tcf.te.ui;bundle-version="1.3.0", org.eclipse.tcf.te.ui.controls;bundle-version="1.3.0", org.eclipse.tcf.te.ui.swt;bundle-version="1.3.0", - org.eclipse.tm.terminal;bundle-version="3.2.100", + org.eclipse.tm.terminal;bundle-version="3.2.300", org.eclipse.ui;bundle-version="3.8.0", org.eclipse.ui.forms;bundle-version="3.5.200", org.eclipse.ui.ide;bundle-version="3.8.1" diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderManager.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderManager.java index d426ad05b..0a073507e 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderManager.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderManager.java @@ -341,10 +341,9 @@ public class TabFolderManager extends PlatformObject implements ISelectionProvid // Create the terminal control ITerminalViewControl terminal = TerminalViewControlFactory.makeControl(doCreateTerminalTabTerminalListener(this, item), composite, new ITerminalConnector[] { connector }, true); - if (data instanceof IPropertiesContainer) { + if (terminal instanceof ITerminalControl && data instanceof IPropertiesContainer) { boolean noReconnect = ((IPropertiesContainer)data).getBooleanProperty(ITerminalsConnectorConstants.PROP_DATA_NO_RECONNECT); - //TODO: set the flag in the control - // terminal.setConnectOnEnterIfClosed(!noReconnect); + ((ITerminalControl)terminal).setConnectOnEnterIfClosed(!noReconnect); } // Add the "selection" listener to the terminal control |