diff --git a/features/org.eclipse.tm.terminal.view.rse.feature/feature.properties b/features/org.eclipse.tm.terminal.view.rse.feature/feature.properties
index db6bbc0ea6c..05b855b9884 100644
--- a/features/org.eclipse.tm.terminal.view.rse.feature/feature.properties
+++ b/features/org.eclipse.tm.terminal.view.rse.feature/feature.properties
@@ -23,7 +23,7 @@ providerName=Eclipse.org - Target Management
updateSiteName=TM Terminal 4.0 Updates
# "description" property - description of the feature
-description=Integrates the Terminals view into the Remote System Explorer. \
+description=Integrates the Terminal view into the Remote System Explorer. \
Works on Windows, Linux, Mac and Solaris. Requires Eclipse 3.8.2 or newer and a Java 7 or newer JRE.
# "copyright" property - text of the "Feature Update Copyright"
diff --git a/features/org.eclipse.tm.terminal.view.rse.sdk.feature/feature.properties b/features/org.eclipse.tm.terminal.view.rse.sdk.feature/feature.properties
index 9411bc138d6..e783df36b9b 100644
--- a/features/org.eclipse.tm.terminal.view.rse.sdk.feature/feature.properties
+++ b/features/org.eclipse.tm.terminal.view.rse.sdk.feature/feature.properties
@@ -23,7 +23,7 @@ providerName=Eclipse.org - Target Management
updateSiteName=TM Terminal 4.0 Updates
# "description" property - description of the feature
-description=Integrates the Terminals view into the Remote System Explorer. \
+description=Integrates the Terminal view into the Remote System Explorer. \
Works on Windows, Linux, Mac and Solaris. Requires Eclipse 3.8.2 or newer and a Java 7 or newer JRE.
# "copyright" property - text of the "Feature Update Copyright"
diff --git a/plugins/org.eclipse.tm.terminal.connector.local/plugin.properties b/plugins/org.eclipse.tm.terminal.connector.local/plugin.properties
index 2f6756aa4c3..0c8b643c535 100644
--- a/plugins/org.eclipse.tm.terminal.connector.local/plugin.properties
+++ b/plugins/org.eclipse.tm.terminal.connector.local/plugin.properties
@@ -8,7 +8,7 @@
# Wind River Systems - initial API and implementation
##################################################################################
-pluginName = Terminals Local Connector
+pluginName = Terminal Local Connector
providerName = Eclipse.org - Target Management
# ----- Commands and Menu contributions -----
@@ -16,7 +16,7 @@ LocalLauncherDelegate.label=Local Terminal
command.launch.name=Open Local Terminal on Selection
-menu.showIn.localterminal.label = Terminals
+menu.showIn.localterminal.label = Terminal
# ----- Preference Pages -----
diff --git a/plugins/org.eclipse.tm.terminal.connector.local/plugin.xml b/plugins/org.eclipse.tm.terminal.connector.local/plugin.xml
index ef4cb5d65f1..c58c478472e 100644
--- a/plugins/org.eclipse.tm.terminal.connector.local/plugin.xml
+++ b/plugins/org.eclipse.tm.terminal.connector.local/plugin.xml
@@ -12,7 +12,7 @@
name="%TerminalConnector.local"/>
-
+
-
+
-
+
* Property Type: {@link String}
*/
diff --git a/plugins/org.eclipse.tm.terminal.view.ui.rse/plugin.properties b/plugins/org.eclipse.tm.terminal.view.ui.rse/plugin.properties
index 43b7848b280..1feec0d1941 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui.rse/plugin.properties
+++ b/plugins/org.eclipse.tm.terminal.view.ui.rse/plugin.properties
@@ -8,7 +8,7 @@
# Wind River Systems - initial API and implementation
##################################################################################
-pluginName = Terminals RSE Add-on
+pluginName = Terminal RSE Add-on
providerName = Eclipse.org - Target Management
# ----- Commands and Menu contributions -----
@@ -16,7 +16,3 @@ providerName = Eclipse.org - Target Management
command.launch.name=Open Terminal
command.launch.label=Open Terminal...
command.launch.tooltip=Open a Terminal
-
-# ----- Terminal Launcher Delegates -----
-
-SshLauncherDelegate.label=SSH Terminal
diff --git a/plugins/org.eclipse.tm.terminal.view.ui.rse/plugin.xml b/plugins/org.eclipse.tm.terminal.view.ui.rse/plugin.xml
index c07bfae014c..145f3ea4c94 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui.rse/plugin.xml
+++ b/plugins/org.eclipse.tm.terminal.view.ui.rse/plugin.xml
@@ -17,7 +17,7 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
null.
*/
protected final CTabFolder getTabFolder() {
- return (CTabFolder)getParentView().getAdapter(CTabFolder.class);
+ return getParentView().getAdapter(CTabFolder.class);
}
/**
@@ -296,7 +296,7 @@ public class TabFolderManager extends PlatformObject implements ISelectionProvid
}
// Set the context menu
- TabFolderMenuHandler menuHandler = (TabFolderMenuHandler)getParentView().getAdapter(TabFolderMenuHandler.class);
+ TabFolderMenuHandler menuHandler = getParentView().getAdapter(TabFolderMenuHandler.class);
if (menuHandler != null) {
Menu menu = (Menu)menuHandler.getAdapter(Menu.class);
if (menu != null) {
@@ -408,7 +408,7 @@ public class TabFolderManager extends PlatformObject implements ISelectionProvid
}
// Set the context menu
- TabFolderMenuHandler menuHandler = (TabFolderMenuHandler)getParentView().getAdapter(TabFolderMenuHandler.class);
+ TabFolderMenuHandler menuHandler = getParentView().getAdapter(TabFolderMenuHandler.class);
if (menuHandler != null) {
Menu menu = (Menu)menuHandler.getAdapter(Menu.class);
if (menu != null) {
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderMenuHandler.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderMenuHandler.java
index 11af9b37906..241a827ecba 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderMenuHandler.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderMenuHandler.java
@@ -39,7 +39,7 @@ import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView;
import org.eclipse.ui.IWorkbenchActionConstants;
/**
- * Terminals tab folder menu handler.
+ * Terminal tab folder menu handler.
*/
@SuppressWarnings("restriction")
public class TabFolderMenuHandler extends PlatformObject {
@@ -131,7 +131,7 @@ public class TabFolderMenuHandler extends PlatformObject {
* @return The tab folder or null.
*/
protected final CTabFolder getTabFolder() {
- return (CTabFolder)getParentView().getAdapter(CTabFolder.class);
+ return getParentView().getAdapter(CTabFolder.class);
}
/**
@@ -221,7 +221,7 @@ public class TabFolderMenuHandler extends PlatformObject {
// Determine if pasting to the active tab require backslash translation
boolean needsTranslation = false;
- TabFolderManager manager = (TabFolderManager)getParentView().getAdapter(TabFolderManager.class);
+ TabFolderManager manager = getParentView().getAdapter(TabFolderManager.class);
if (manager != null) {
// If we have the active tab item, we can get the active terminal control
CTabItem activeTabItem = manager.getActiveTabItem();
@@ -293,7 +293,7 @@ public class TabFolderMenuHandler extends PlatformObject {
});
// Create and add the select encoding action
- add (new SelectEncodingAction((TabFolderManager)getParentView().getAdapter(TabFolderManager.class)) {
+ add (new SelectEncodingAction(getParentView().getAdapter(TabFolderManager.class)) {
/* (non-Javadoc)
* @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget()
*/
@@ -313,7 +313,7 @@ public class TabFolderMenuHandler extends PlatformObject {
ITerminalViewControl terminal = null;
// Get the active tab item from the tab folder manager
- TabFolderManager manager = (TabFolderManager)getParentView().getAdapter(TabFolderManager.class);
+ TabFolderManager manager = getParentView().getAdapter(TabFolderManager.class);
if (manager != null) {
// If we have the active tab item, we can get the active terminal control
CTabItem activeTabItem = manager.getActiveTabItem();
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderSelectionListener.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderSelectionListener.java
index 3544fcd6267..54ba5d9b20e 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderSelectionListener.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderSelectionListener.java
@@ -14,7 +14,7 @@ import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
/**
- * Terminals tab folder default selection listener implementation.
+ * Terminal tab folder default selection listener implementation.
*/
public class TabFolderSelectionListener implements SelectionListener {
private final TabFolderManager parentTabFolderManager;
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java
index eebcd85e4af..5cc2bcd0335 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java
@@ -38,7 +38,7 @@ import org.eclipse.ui.IWorkbenchActionConstants;
/**
- * Terminals tab folder toolbar handler.
+ * Terminal tab folder toolbar handler.
*/
@SuppressWarnings("restriction")
public class TabFolderToolbarHandler extends PlatformObject {
@@ -102,7 +102,7 @@ public class TabFolderToolbarHandler extends PlatformObject {
* @return The tab folder or null.
*/
protected final CTabFolder getTabFolder() {
- return (CTabFolder)getParentView().getAdapter(CTabFolder.class);
+ return getParentView().getAdapter(CTabFolder.class);
}
/**
@@ -114,7 +114,7 @@ public class TabFolderToolbarHandler extends PlatformObject {
ITerminalViewControl terminal = null;
// Get the active tab item from the tab folder manager
- TabFolderManager manager = (TabFolderManager)getParentView().getAdapter(TabFolderManager.class);
+ TabFolderManager manager = getParentView().getAdapter(TabFolderManager.class);
if (manager != null) {
// If we have the active tab item, we can get the active terminal control
CTabItem activeTabItem = manager.getActiveTabItem();
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabTerminalListener.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabTerminalListener.java
index c65f3e0fcda..7c67100fb77 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabTerminalListener.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabTerminalListener.java
@@ -19,7 +19,7 @@ import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
import org.eclipse.tm.terminal.view.ui.nls.Messages;
/**
- * Terminals tab default terminal listener implementation.
+ * Terminal tab default terminal listener implementation.
*/
@SuppressWarnings("restriction")
public class TabTerminalListener implements ITerminalListener {
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java
index 2e319c6d7e8..183133e45d1 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java
@@ -70,7 +70,7 @@ import org.eclipse.ui.part.ViewPart;
import org.osgi.framework.Bundle;
/**
- * Terminals view.
+ * Terminal view.
*/
public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTarget {
@@ -695,13 +695,13 @@ public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTa
// If the selection is valid, fire the command to open the local terminal
if (isValid) {
- ICommandService service = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class);
+ ICommandService service = PlatformUI.getWorkbench().getService(ICommandService.class);
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()) {
try {
ParameterizedCommand pCmd = ParameterizedCommand.generateCommand(command, null);
Assert.isNotNull(pCmd);
- IHandlerService handlerSvc = (IHandlerService)PlatformUI.getWorkbench().getService(IHandlerService.class);
+ IHandlerService handlerSvc = PlatformUI.getWorkbench().getService(IHandlerService.class);
Assert.isNotNull(handlerSvc);
IEvaluationContext ctx = handlerSvc.getCurrentState();
ctx = new EvaluationContext(ctx, selection);
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsViewMementoHandler.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsViewMementoHandler.java
index b8e6486213e..06699a52d23 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsViewMementoHandler.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsViewMementoHandler.java
@@ -30,7 +30,7 @@ import org.eclipse.ui.IMemento;
import org.eclipse.ui.PlatformUI;
/**
- * Take care of the persisted state handling of the "Terminals" view.
+ * Take care of the persisted state handling of the "Terminal" view.
*/
public class TerminalsViewMementoHandler {
// The list of items to save. See the workbench listener implementation