Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2014-05-19 07:16:12 -0400
committerUwe Stieber2014-05-19 09:11:48 -0400
commitbabdf1f44425b7f49ddac1c5cd81e5a923cf6b08 (patch)
treedcc094398be66aa9f2041787a48e5187a5748bdb
parent4c2fc4aa9598d16e219551c37790177491267ee9 (diff)
downloadorg.eclipse.tcf-babdf1f44425b7f49ddac1c5cd81e5a923cf6b08.tar.gz
org.eclipse.tcf-babdf1f44425b7f49ddac1c5cd81e5a923cf6b08.tar.xz
org.eclipse.tcf-babdf1f44425b7f49ddac1c5cd81e5a923cf6b08.zip
Target Explorer: Fix Bug 434940 - [TERMINALS] Cannot open multiple local
terminals - Part 1
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.launch.ui/plugin.properties8
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.properties6
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.properties4
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.console/plugin.properties2
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/launcher/LocalLauncherDelegate.java6
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/plugin.properties10
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/plugin.xml6
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.properties2
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui/plugin.properties2
9 files changed, 26 insertions, 20 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/plugin.properties b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/plugin.properties
index b5ef7144e..4a04d8924 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/plugin.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/plugin.properties
@@ -17,17 +17,17 @@ ExtensionPoint.tabs.name=Launch Configuration Tabs Extension Point
# ***** Command Contributions *****
-command.attach.name=Attach Context Command
+command.attach.name=Attach Context
command.attach.description=Attach to the selected Context
-command.detach.name=Detach Context Command
+command.detach.name=Detach Context
command.detach.description=Detach from the selected Context
-command.run.name=Launch in Run Mode Command
+command.run.name=Launch in Run Mode
command.run.label=Run
command.run.description=Launches the selected launch configuration in Run mode
-command.debug.name=Launch in Debug Mode Command
+command.debug.name=Launch in Debug Mode
command.debug.label=Debug
command.debug.description=Launches the selected launch configuration in Debug mode
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.properties b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.properties
index ab9eed8d6..fac3bc9c6 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.properties
@@ -19,7 +19,7 @@ SourceLookupEditorPage.name=Source Paths
# ***** Command contributions *****
-Command.showInDebugView.name=Show In Debug View Command
+Command.showInDebugView.name=Show In Debug View
Command.showInDebugView.description=Show the selection in the Debug View.
LauchTree.name=Launches
@@ -31,11 +31,11 @@ command.debug.name=Debug Remote Application
menu.diagnostics.label=Diagnostics
-command.runtests.name=Run Diagnostics Tests Command
+command.runtests.name=Run Diagnostics Tests
command.runtests.label=Run Tests
command.runtests.tooltip=Run Diagnostics Tests on the selected Peer
-command.runtestsloop.name=Run Diagnostics Tests Loop Command
+command.runtestsloop.name=Run Diagnostics Tests Loop
command.runtestsloop.label=Run Tests Loop
command.runtestsloop.tooltip=Run Diagnostics Tests in a loop on the selected Peer
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.properties b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.properties
index 78bce32e1..df475528a 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.properties
@@ -17,7 +17,7 @@ ProcessExplorerEditorPage.name=Processes
# ***** Command Contributions *****
-command.launch.name=Run Remote Process Command
+command.launch.name=Run Remote Process
command.launch.label=&Run Remote Process...
command.launch.tooltip=Execute the specified process image on the selected target.
@@ -42,7 +42,7 @@ command.stopPolling.tooltip = Stop Polling
command.configure.label = Configure Refresh Interval
command.configure.tooltip = Configure Refresh Interval
-command.configure.name = Configure Refresh Interval Command
+command.configure.name = Configure Refresh Interval
command.attach.label=&Attach
command.attach.tooltip=Attach to the selected Context
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.console/plugin.properties b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.console/plugin.properties
index ab321c59c..1a4880df7 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.console/plugin.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.console/plugin.properties
@@ -17,7 +17,7 @@ preference.page.name = Console
# ***** Command Contributions *****
-command.remove.name=Close Console Command
+command.remove.name=Close Console
# ***** Themes *****
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/launcher/LocalLauncherDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/launcher/LocalLauncherDelegate.java
index d1b7774cc..64ac4bb2c 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/launcher/LocalLauncherDelegate.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/launcher/LocalLauncherDelegate.java
@@ -73,6 +73,12 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate {
if (encoding != null && !"".equals(encoding)) properties.setProperty(ITerminalsConnectorConstants.PROP_ENCODING, encoding); //$NON-NLS-1$
}
+ // For local terminals, force a new terminal tab each time it is launched,
+ // if not set otherwise from outside
+ if (!properties.containsKey(ITerminalsConnectorConstants.PROP_FORCE_NEW)) {
+ properties.setProperty(ITerminalsConnectorConstants.PROP_FORCE_NEW, true);
+ }
+
// Get the terminal service
ITerminalService terminal = ServiceManager.getInstance().getService(ITerminalService.class);
// If not available, we cannot fulfill this request
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/plugin.properties b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/plugin.properties
index 2bd19e92c..c26408c26 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/plugin.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/plugin.properties
@@ -27,12 +27,12 @@ StreamsConnectorType.label=Streams Connector Type
toolbar.terminal.label=Terminals
-command.launch.name=Launch Terminal Command
-command.launch.label=Launch Terminal...
+command.launch.selection.name=Open Terminal on Selection
+command.launch.name=Open Terminal
+command.launch.label=Open Terminal...
+command.launch.tooltip=Open a Terminal
-command.launchWithoutSelection.tooltip=Open a Terminal
-
-command.disconnect.name=Disconnect Terminal Command
+command.disconnect.name=Disconnect Terminal
command.disconnect.label=Disconnect
command.disconnect.tooltip=Disconnect Terminal Connection
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/plugin.xml
index 4616c8cc3..7acbf9d44 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/plugin.xml
@@ -128,7 +128,7 @@
id="org.eclipse.tcf.te.ui.terminals.commands.launchToolbar"
label="%command.launch.label"
style="push"
- tooltip="%command.launchWithoutSelection.tooltip">
+ tooltip="%command.launch.tooltip">
</command>
</toolbar>
</menuContribution>
@@ -139,7 +139,7 @@
id="org.eclipse.tcf.te.ui.terminals.commands.launchToolbarTerminalsView"
label="%command.launch.label"
style="push"
- tooltip="%command.launchWithoutSelection.tooltip">
+ tooltip="%command.launch.tooltip">
</command>
<command
commandId="org.eclipse.tcf.te.ui.terminals.command.disconnect"
@@ -169,7 +169,7 @@
categoryId="org.eclipse.tcf.te.ui.commands.category"
helpContextId="org.eclipse.tcf.te.ui.terminals.command_Launch"
id="org.eclipse.tcf.te.ui.terminals.command.launch"
- name="%command.launch.name">
+ name="%command.launch.selection.name">
</command>
<command
categoryId="org.eclipse.tcf.te.ui.commands.category"
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.properties b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.properties
index 5ef52deb9..fc0f772fe 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.properties
@@ -41,7 +41,7 @@ category.mytargets.name=Connections
category.neighborhood.name=Neighborhood
# ***** Command and menu contributions *****
-command.open.name=Open Command
+command.open.name=Open
command.open.label=Open
command.open.mnemonic=O
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui/plugin.properties b/target_explorer/plugins/org.eclipse.tcf.te.ui/plugin.properties
index 94ea2cf58..8ce5847d7 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui/plugin.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui/plugin.properties
@@ -43,7 +43,7 @@ command.newWizards.description=Open the New Wizard
command.refresh.name=Refresh
command.refresh.description=Refresh the selected connection
-command.showConsoleView.name=Show Console View Command
+command.showConsoleView.name=Show Console View
command.showConsoleView.description=Shows the Console View
command.connect.name=Connect

Back to the top