1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-02 05:45:58 +02:00

UI: Review view category names and view names

This commit is contained in:
Uwe Stieber 2015-05-07 08:54:55 +02:00
parent 95937ea537
commit a80476f557
37 changed files with 66 additions and 70 deletions

View file

@ -23,7 +23,7 @@ providerName=Eclipse.org - Target Management
updateSiteName=TM Terminal 4.0 Updates updateSiteName=TM Terminal 4.0 Updates
# "description" property - description of the feature # "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. 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" # "copyright" property - text of the "Feature Update Copyright"

View file

@ -23,7 +23,7 @@ providerName=Eclipse.org - Target Management
updateSiteName=TM Terminal 4.0 Updates updateSiteName=TM Terminal 4.0 Updates
# "description" property - description of the feature # "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. 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" # "copyright" property - text of the "Feature Update Copyright"

View file

@ -8,7 +8,7 @@
# Wind River Systems - initial API and implementation # Wind River Systems - initial API and implementation
################################################################################## ##################################################################################
pluginName = Terminals Local Connector pluginName = Terminal Local Connector
providerName = Eclipse.org - Target Management providerName = Eclipse.org - Target Management
# ----- Commands and Menu contributions ----- # ----- Commands and Menu contributions -----
@ -16,7 +16,7 @@ LocalLauncherDelegate.label=Local Terminal
command.launch.name=Open Local Terminal on Selection command.launch.name=Open Local Terminal on Selection
menu.showIn.localterminal.label = Terminals menu.showIn.localterminal.label = Terminal
# ----- Preference Pages ----- # ----- Preference Pages -----

View file

@ -12,7 +12,7 @@
name="%TerminalConnector.local"/> name="%TerminalConnector.local"/>
</extension> </extension>
<!-- Terminals launcher delegate contributions --> <!-- Terminal launcher delegate contributions -->
<extension point="org.eclipse.tm.terminal.view.ui.launcherDelegates"> <extension point="org.eclipse.tm.terminal.view.ui.launcherDelegates">
<delegate <delegate
class="org.eclipse.tm.terminal.connector.local.launcher.LocalLauncherDelegate" class="org.eclipse.tm.terminal.connector.local.launcher.LocalLauncherDelegate"

View file

@ -10,7 +10,7 @@
package org.eclipse.tm.terminal.connector.local.showin.interfaces; package org.eclipse.tm.terminal.connector.local.showin.interfaces;
/** /**
* Terminals plug-in preference key definitions. * Terminal plug-in preference key definitions.
*/ */
public interface IPreferenceKeys { public interface IPreferenceKeys {
/** /**

View file

@ -74,7 +74,7 @@ import org.eclipse.ui.IWorkbenchPreferencePage;
import org.osgi.framework.Bundle; import org.osgi.framework.Bundle;
/** /**
* Terminals top preference page implementation. * Terminal top preference page implementation.
*/ */
public class PreferencePage extends org.eclipse.jface.preference.PreferencePage implements IWorkbenchPreferencePage { public class PreferencePage extends org.eclipse.jface.preference.PreferencePage implements IWorkbenchPreferencePage {
/* default */ TableViewer viewer; /* default */ TableViewer viewer;

View file

@ -15,7 +15,7 @@ import org.eclipse.tm.terminal.connector.local.showin.interfaces.IPreferenceKeys
import org.eclipse.tm.terminal.view.core.preferences.ScopedEclipsePreferences; import org.eclipse.tm.terminal.view.core.preferences.ScopedEclipsePreferences;
/** /**
* Terminals default preferences initializer. * Terminal default preferences initializer.
*/ */
public class PreferencesInitializer extends AbstractPreferenceInitializer { public class PreferencesInitializer extends AbstractPreferenceInitializer {

View file

@ -8,7 +8,7 @@
# Wind River Systems - initial API and implementation # Wind River Systems - initial API and implementation
################################################################################## ##################################################################################
pluginName = Terminals Process Connector pluginName = Terminal Process Connector
providerName = Eclipse.org - Target Management providerName = Eclipse.org - Target Management
# ----- Terminal Connectors ----- # ----- Terminal Connectors -----

View file

@ -11,7 +11,7 @@
name="%TerminalConnector.process"/> name="%TerminalConnector.process"/>
</extension> </extension>
<!-- Terminals launcher delegate contributions --> <!-- Terminal launcher delegate contributions -->
<extension point="org.eclipse.tm.terminal.view.ui.launcherDelegates"> <extension point="org.eclipse.tm.terminal.view.ui.launcherDelegates">
<delegate <delegate
class="org.eclipse.tm.terminal.connector.process.ProcessLauncherDelegate" class="org.eclipse.tm.terminal.connector.process.ProcessLauncherDelegate"

View file

@ -8,7 +8,7 @@
# Wind River Systems - initial API and implementation # Wind River Systems - initial API and implementation
################################################################################## ##################################################################################
pluginName = Terminals SSH Extensions pluginName = Terminal SSH Extensions
providerName = Eclipse.org - Target Management providerName = Eclipse.org - Target Management
# ----- Terminal Connector ----- # ----- Terminal Connector -----

View file

@ -10,7 +10,7 @@
class="org.eclipse.tm.terminal.connector.ssh.connector.SshConnector"/> class="org.eclipse.tm.terminal.connector.ssh.connector.SshConnector"/>
</extension> </extension>
<!-- Terminals launcher delegate contributions --> <!-- Terminal launcher delegate contributions -->
<extension point="org.eclipse.tm.terminal.view.ui.launcherDelegates"> <extension point="org.eclipse.tm.terminal.view.ui.launcherDelegates">
<delegate <delegate
class="org.eclipse.tm.terminal.connector.ssh.launcher.SshLauncherDelegate" class="org.eclipse.tm.terminal.connector.ssh.launcher.SshLauncherDelegate"

View file

@ -13,7 +13,7 @@ package org.eclipse.tm.terminal.connector.ssh.nls;
import org.eclipse.osgi.util.NLS; import org.eclipse.osgi.util.NLS;
/** /**
* Terminals extensions UI plug-in externalized strings management. * Externalized strings management.
*/ */
public class Messages extends NLS { public class Messages extends NLS {

View file

@ -8,7 +8,7 @@
# Wind River Systems - initial API and implementation # Wind River Systems - initial API and implementation
################################################################################## ##################################################################################
pluginName = Terminals Telnet Extensions pluginName = Terminal Telnet Extensions
providerName = Eclipse.org - Target Management providerName = Eclipse.org - Target Management
# ----- Terminal Connector ----- # ----- Terminal Connector -----

View file

@ -13,7 +13,7 @@ package org.eclipse.tm.terminal.connector.telnet.nls;
import org.eclipse.osgi.util.NLS; import org.eclipse.osgi.util.NLS;
/** /**
* Terminals extensions UI plug-in externalized strings management. * Externalized strings management.
*/ */
public class Messages extends NLS { public class Messages extends NLS {

View file

@ -14,7 +14,7 @@ import java.util.Map;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
/** /**
* Terminals service. * Terminal service.
*/ */
public interface ITerminalService { public interface ITerminalService {

View file

@ -68,7 +68,7 @@ public interface ITerminalsConnectorConstants {
public static final String PROP_FORCE_NEW = "terminal.forceNew"; //$NON-NLS-1$ public static final String PROP_FORCE_NEW = "terminal.forceNew"; //$NON-NLS-1$
/** /**
* Property: Terminals launcher delegate id. * Property: Terminal launcher delegate id.
* <p> * <p>
* Property Type: {@link String} * Property Type: {@link String}
*/ */

View file

@ -8,7 +8,7 @@
# Wind River Systems - initial API and implementation # Wind River Systems - initial API and implementation
################################################################################## ##################################################################################
pluginName = Terminals RSE Add-on pluginName = Terminal RSE Add-on
providerName = Eclipse.org - Target Management providerName = Eclipse.org - Target Management
# ----- Commands and Menu contributions ----- # ----- Commands and Menu contributions -----
@ -16,7 +16,3 @@ providerName = Eclipse.org - Target Management
command.launch.name=Open Terminal command.launch.name=Open Terminal
command.launch.label=Open Terminal... command.launch.label=Open Terminal...
command.launch.tooltip=Open a Terminal command.launch.tooltip=Open a Terminal
# ----- Terminal Launcher Delegates -----
SshLauncherDelegate.label=SSH Terminal

View file

@ -17,7 +17,7 @@
<perspectiveExtension targetID="org.eclipse.rse.ui.view.SystemPerspective"> <perspectiveExtension targetID="org.eclipse.rse.ui.view.SystemPerspective">
<!-- Register the view shortcuts --> <!-- Register the view shortcuts -->
<viewShortcut id="org.eclipse.tm.terminal.view.ui.TerminalsView"/> <viewShortcut id="org.eclipse.tm.terminal.view.ui.TerminalsView"/>
<!-- Place the Terminals view relative to the Task List view --> <!-- Place the Terminal view relative to the Task List view -->
<view <view
id="org.eclipse.tm.terminal.view.ui.TerminalsView" id="org.eclipse.tm.terminal.view.ui.TerminalsView"
minimized="false" minimized="false"

View file

@ -20,7 +20,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
/** /**
* Terminals RSE add-on property tester implementation. * Terminal RSE add-on property tester implementation.
*/ */
public class PropertyTester extends org.eclipse.core.expressions.PropertyTester { public class PropertyTester extends org.eclipse.core.expressions.PropertyTester {
// Supported system type id's // Supported system type id's

View file

@ -8,15 +8,15 @@
# Wind River Systems - initial API and implementation # Wind River Systems - initial API and implementation
################################################################################## ##################################################################################
pluginName = Terminals pluginName = Terminal View
providerName = Eclipse.org - Target Management providerName = Eclipse.org - Target Management
# ----- Terminals View ----- # ----- Terminal View -----
ViewCategory.name=Terminals ViewCategory.name=Terminal
TerminalsView.name=Terminals TerminalsView.name=Terminal
TerminalsView.context.name=In Terminals View TerminalsView.context.name=In Terminal View
TerminalsView.context.description=Show modified keyboard shortcuts in context menu TerminalsView.context.description=Show modified keyboard shortcuts in context menu
# ----- Terminal Connectors ----- # ----- Terminal Connectors -----
@ -28,9 +28,9 @@ TerminalConnector.streams=Streams Connector (hidden)
StreamsLauncherDelegate.label=Streams Terminal StreamsLauncherDelegate.label=Streams Terminal
# ----- Commands and Menu contributions ----- # ----- Commands and Menu contributions -----
command.category.name=Terminals Commands command.category.name=Terminal Commands
toolbar.terminal.label=Terminals toolbar.terminal.label=Terminal
command.launch.selection.name=Open Terminal on Selection command.launch.selection.name=Open Terminal on Selection
command.launch.name=Open Terminal command.launch.name=Open Terminal

View file

@ -27,7 +27,7 @@
<perspectiveExtension targetID="org.eclipse.tcf.te.ui.perspective"> <perspectiveExtension targetID="org.eclipse.tcf.te.ui.perspective">
<!-- Register the view shortcuts --> <!-- Register the view shortcuts -->
<viewShortcut id="org.eclipse.tm.terminal.view.ui.TerminalsView"/> <viewShortcut id="org.eclipse.tm.terminal.view.ui.TerminalsView"/>
<!-- Place the Terminals view relative to the Task List view --> <!-- Place the Terminal view relative to the Task List view -->
<view <view
id="org.eclipse.tm.terminal.view.ui.TerminalsView" id="org.eclipse.tm.terminal.view.ui.TerminalsView"
minimized="false" minimized="false"
@ -40,7 +40,7 @@
<perspectiveExtension targetID="org.eclipse.ui.resourcePerspective"> <perspectiveExtension targetID="org.eclipse.ui.resourcePerspective">
<!-- Register the view shortcuts --> <!-- Register the view shortcuts -->
<viewShortcut id="org.eclipse.tm.terminal.view.ui.TerminalsView"/> <viewShortcut id="org.eclipse.tm.terminal.view.ui.TerminalsView"/>
<!-- Place the Terminals view relative to the Task List view --> <!-- Place the Terminal view relative to the Task List view -->
<view <view
id="org.eclipse.tm.terminal.view.ui.TerminalsView" id="org.eclipse.tm.terminal.view.ui.TerminalsView"
minimized="false" minimized="false"
@ -53,7 +53,7 @@
<perspectiveExtension targetID="org.eclipse.debug.ui.DebugPerspective"> <perspectiveExtension targetID="org.eclipse.debug.ui.DebugPerspective">
<!-- Register the view shortcuts --> <!-- Register the view shortcuts -->
<viewShortcut id="org.eclipse.tm.terminal.view.ui.TerminalsView"/> <viewShortcut id="org.eclipse.tm.terminal.view.ui.TerminalsView"/>
<!-- Place the Terminals view relative to the Task List view --> <!-- Place the Terminal view relative to the Task List view -->
<view <view
id="org.eclipse.tm.terminal.view.ui.TerminalsView" id="org.eclipse.tm.terminal.view.ui.TerminalsView"
minimized="false" minimized="false"
@ -66,7 +66,7 @@
<perspectiveExtension targetID="org.eclipse.cdt.ui.CPerspective"> <perspectiveExtension targetID="org.eclipse.cdt.ui.CPerspective">
<!-- Register the view shortcuts --> <!-- Register the view shortcuts -->
<viewShortcut id="org.eclipse.tm.terminal.view.ui.TerminalsView"/> <viewShortcut id="org.eclipse.tm.terminal.view.ui.TerminalsView"/>
<!-- Place the Terminals view relative to the Task List view --> <!-- Place the Terminal view relative to the Task List view -->
<view <view
id="org.eclipse.tm.terminal.view.ui.TerminalsView" id="org.eclipse.tm.terminal.view.ui.TerminalsView"
minimized="false" minimized="false"
@ -79,7 +79,7 @@
<perspectiveExtension targetID="org.eclipse.jdt.ui.JavaPerspective"> <perspectiveExtension targetID="org.eclipse.jdt.ui.JavaPerspective">
<!-- Register the view shortcuts --> <!-- Register the view shortcuts -->
<viewShortcut id="org.eclipse.tm.terminal.view.ui.TerminalsView"/> <viewShortcut id="org.eclipse.tm.terminal.view.ui.TerminalsView"/>
<!-- Place the Terminals view relative to the Task List view --> <!-- Place the Terminal view relative to the Task List view -->
<view <view
id="org.eclipse.tm.terminal.view.ui.TerminalsView" id="org.eclipse.tm.terminal.view.ui.TerminalsView"
minimized="false" minimized="false"
@ -92,7 +92,7 @@
<perspectiveExtension targetID="org.eclipse.pde.ui.PDEPerspective"> <perspectiveExtension targetID="org.eclipse.pde.ui.PDEPerspective">
<!-- Register the view shortcuts --> <!-- Register the view shortcuts -->
<viewShortcut id="org.eclipse.tm.terminal.view.ui.TerminalsView"/> <viewShortcut id="org.eclipse.tm.terminal.view.ui.TerminalsView"/>
<!-- Place the Terminals view relative to the Task List view --> <!-- Place the Terminal view relative to the Task List view -->
<view <view
id="org.eclipse.tm.terminal.view.ui.TerminalsView" id="org.eclipse.tm.terminal.view.ui.TerminalsView"
minimized="false" minimized="false"
@ -133,7 +133,7 @@
</propertyTester> </propertyTester>
</extension> </extension>
<!-- Terminals launcher delegate contributions --> <!-- Terminal launcher delegate contributions -->
<extension point="org.eclipse.tm.terminal.view.ui.launcherDelegates"> <extension point="org.eclipse.tm.terminal.view.ui.launcherDelegates">
<delegate <delegate
class="org.eclipse.tm.terminal.view.ui.streams.StreamsLauncherDelegate" class="org.eclipse.tm.terminal.view.ui.streams.StreamsLauncherDelegate"

View file

@ -117,7 +117,7 @@ public class UIPlugin extends AbstractUIPlugin {
@Override @Override
public boolean preShutdown(IWorkbench workbench, boolean forced) { public boolean preShutdown(IWorkbench workbench, boolean forced) {
if (workbench != null && workbench.getActiveWorkbenchWindow() != null && workbench.getActiveWorkbenchWindow().getActivePage() != null) { if (workbench != null && workbench.getActiveWorkbenchWindow() != null && workbench.getActiveWorkbenchWindow().getActivePage() != null) {
// Find all "Terminals" views // Find all "Terminal" views
IViewReference[] refs = workbench.getActiveWorkbenchWindow().getActivePage().getViewReferences(); IViewReference[] refs = workbench.getActiveWorkbenchWindow().getActivePage().getViewReferences();
for (IViewReference ref : refs) { for (IViewReference ref : refs) {
IViewPart part = ref.getView(false); IViewPart part = ref.getView(false);

View file

@ -10,7 +10,7 @@
package org.eclipse.tm.terminal.view.ui.interfaces; package org.eclipse.tm.terminal.view.ui.interfaces;
/** /**
* Terminals plug-in preference key definitions. * Terminal plug-in preference key definitions.
*/ */
public interface IPreferenceKeys { public interface IPreferenceKeys {
/** /**

View file

@ -13,7 +13,7 @@ package org.eclipse.tm.terminal.view.ui.interfaces;
import org.eclipse.ui.IViewPart; import org.eclipse.ui.IViewPart;
/** /**
* Terminals view public interface. * Terminal view public interface.
*/ */
public interface ITerminalsView extends IViewPart { public interface ITerminalsView extends IViewPart {

View file

@ -10,7 +10,7 @@
package org.eclipse.tm.terminal.view.ui.interfaces; package org.eclipse.tm.terminal.view.ui.interfaces;
/** /**
* Terminals common UI constants. * Terminal common UI constants.
*/ */
public interface IUIConstants { public interface IUIConstants {
/** /**

View file

@ -15,7 +15,7 @@ import org.eclipse.tm.terminal.view.ui.activator.UIPlugin;
import org.eclipse.tm.terminal.view.ui.interfaces.IPreferenceKeys; import org.eclipse.tm.terminal.view.ui.interfaces.IPreferenceKeys;
/** /**
* Terminals default preferences initializer. * Terminal default preferences initializer.
*/ */
public class PreferencesInitializer extends AbstractPreferenceInitializer { public class PreferencesInitializer extends AbstractPreferenceInitializer {

View file

@ -20,7 +20,7 @@ import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager;
/** /**
* Terminals property tester implementation. * Terminal property tester implementation.
*/ */
@SuppressWarnings("restriction") @SuppressWarnings("restriction")
public class PropertyTester extends org.eclipse.core.expressions.PropertyTester { public class PropertyTester extends org.eclipse.core.expressions.PropertyTester {
@ -38,7 +38,7 @@ public class PropertyTester extends org.eclipse.core.expressions.PropertyTester
if ("canDisconnect".equals(property) && receiver instanceof ITerminalsView) { //$NON-NLS-1$ if ("canDisconnect".equals(property) && receiver instanceof ITerminalsView) { //$NON-NLS-1$
CTabItem tabItem = null; CTabItem tabItem = null;
TabFolderManager manager = (TabFolderManager) ((ITerminalsView)receiver).getAdapter(TabFolderManager.class); TabFolderManager manager = ((ITerminalsView)receiver).getAdapter(TabFolderManager.class);
if (manager != null) { if (manager != null) {
tabItem = manager.getActiveTabItem(); tabItem = manager.getActiveTabItem();
} }

View file

@ -43,7 +43,7 @@ import org.eclipse.ui.PerspectiveAdapter;
import org.eclipse.ui.PlatformUI; import org.eclipse.ui.PlatformUI;
/** /**
* Terminals console manager. * Terminal console manager.
*/ */
@SuppressWarnings("restriction") @SuppressWarnings("restriction")
public class ConsoleManager { public class ConsoleManager {
@ -440,7 +440,7 @@ public class ConsoleManager {
ITerminalsView view = (ITerminalsView)part; ITerminalsView view = (ITerminalsView)part;
// Get the tab folder manager associated with the view // Get the tab folder manager associated with the view
TabFolderManager manager = (TabFolderManager)view.getAdapter(TabFolderManager.class); TabFolderManager manager = view.getAdapter(TabFolderManager.class);
if (manager == null) return null; if (manager == null) return null;
// Lookup an existing console first // Lookup an existing console first
@ -506,7 +506,7 @@ public class ConsoleManager {
if (view == null) return null; if (view == null) return null;
// Get the tab folder manager associated with the view // Get the tab folder manager associated with the view
TabFolderManager manager = (TabFolderManager)view.getAdapter(TabFolderManager.class); TabFolderManager manager = view.getAdapter(TabFolderManager.class);
if (manager == null) return null; if (manager == null) return null;
return manager.findTabItem(title, connector, data); return manager.findTabItem(title, connector, data);
@ -532,7 +532,7 @@ public class ConsoleManager {
IViewReference ref = refs[i]; IViewReference ref = refs[i];
IViewPart part = ref != null ? ref.getView(false) : null; IViewPart part = ref != null ? ref.getView(false) : null;
if (part instanceof ITerminalsView) { if (part instanceof ITerminalsView) {
CTabFolder tabFolder = (CTabFolder) part.getAdapter(CTabFolder.class); CTabFolder tabFolder = part.getAdapter(CTabFolder.class);
if (tabFolder == null) continue; if (tabFolder == null) continue;
CTabItem[] candidates = tabFolder.getItems(); CTabItem[] candidates = tabFolder.getItems();
for (CTabItem candidate : candidates) { for (CTabItem candidate : candidates) {
@ -575,7 +575,7 @@ public class ConsoleManager {
IViewPart part = ref.getView(true); IViewPart part = ref.getView(true);
if (part instanceof ITerminalsView) { if (part instanceof ITerminalsView) {
// Get the tab folder manager associated with the view // Get the tab folder manager associated with the view
TabFolderManager manager = (TabFolderManager) part.getAdapter(TabFolderManager.class); TabFolderManager manager = part.getAdapter(TabFolderManager.class);
if (manager == null) { if (manager == null) {
continue; continue;
} }

View file

@ -15,7 +15,7 @@ import java.lang.reflect.Field;
import org.eclipse.osgi.util.NLS; import org.eclipse.osgi.util.NLS;
/** /**
* Terminals plug-in externalized strings management. * Terminal plug-in externalized strings management.
*/ */
public class Messages extends NLS { public class Messages extends NLS {

View file

@ -20,7 +20,7 @@ import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService;
import org.eclipse.tm.terminal.view.ui.services.TerminalService; import org.eclipse.tm.terminal.view.ui.services.TerminalService;
/** /**
* Terminals tab default dispose listener implementation. * Terminal tab default dispose listener implementation.
*/ */
public class TabDisposeListener implements DisposeListener { public class TabDisposeListener implements DisposeListener {
private final TabFolderManager parentTabFolderManager; private final TabFolderManager parentTabFolderManager;

View file

@ -57,7 +57,7 @@ import org.eclipse.tm.terminal.view.ui.nls.Messages;
import org.eclipse.ui.PlatformUI; import org.eclipse.ui.PlatformUI;
/** /**
* Terminals tab folder manager. * Terminal tab folder manager.
*/ */
@SuppressWarnings({ "restriction" }) @SuppressWarnings({ "restriction" })
public class TabFolderManager extends PlatformObject implements ISelectionProvider { public class TabFolderManager extends PlatformObject implements ISelectionProvider {
@ -201,7 +201,7 @@ public class TabFolderManager extends PlatformObject implements ISelectionProvid
* @return The tab folder or <code>null</code>. * @return The tab folder or <code>null</code>.
*/ */
protected final CTabFolder getTabFolder() { 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 // Set the context menu
TabFolderMenuHandler menuHandler = (TabFolderMenuHandler)getParentView().getAdapter(TabFolderMenuHandler.class); TabFolderMenuHandler menuHandler = getParentView().getAdapter(TabFolderMenuHandler.class);
if (menuHandler != null) { if (menuHandler != null) {
Menu menu = (Menu)menuHandler.getAdapter(Menu.class); Menu menu = (Menu)menuHandler.getAdapter(Menu.class);
if (menu != null) { if (menu != null) {
@ -408,7 +408,7 @@ public class TabFolderManager extends PlatformObject implements ISelectionProvid
} }
// Set the context menu // Set the context menu
TabFolderMenuHandler menuHandler = (TabFolderMenuHandler)getParentView().getAdapter(TabFolderMenuHandler.class); TabFolderMenuHandler menuHandler = getParentView().getAdapter(TabFolderMenuHandler.class);
if (menuHandler != null) { if (menuHandler != null) {
Menu menu = (Menu)menuHandler.getAdapter(Menu.class); Menu menu = (Menu)menuHandler.getAdapter(Menu.class);
if (menu != null) { if (menu != null) {

View file

@ -39,7 +39,7 @@ import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView;
import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.IWorkbenchActionConstants;
/** /**
* Terminals tab folder menu handler. * Terminal tab folder menu handler.
*/ */
@SuppressWarnings("restriction") @SuppressWarnings("restriction")
public class TabFolderMenuHandler extends PlatformObject { public class TabFolderMenuHandler extends PlatformObject {
@ -131,7 +131,7 @@ public class TabFolderMenuHandler extends PlatformObject {
* @return The tab folder or <code>null</code>. * @return The tab folder or <code>null</code>.
*/ */
protected final CTabFolder getTabFolder() { 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 // Determine if pasting to the active tab require backslash translation
boolean needsTranslation = false; boolean needsTranslation = false;
TabFolderManager manager = (TabFolderManager)getParentView().getAdapter(TabFolderManager.class); TabFolderManager manager = getParentView().getAdapter(TabFolderManager.class);
if (manager != null) { if (manager != null) {
// If we have the active tab item, we can get the active terminal control // If we have the active tab item, we can get the active terminal control
CTabItem activeTabItem = manager.getActiveTabItem(); CTabItem activeTabItem = manager.getActiveTabItem();
@ -293,7 +293,7 @@ public class TabFolderMenuHandler extends PlatformObject {
}); });
// Create and add the select encoding action // Create and add the select encoding action
add (new SelectEncodingAction((TabFolderManager)getParentView().getAdapter(TabFolderManager.class)) { add (new SelectEncodingAction(getParentView().getAdapter(TabFolderManager.class)) {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget()
*/ */
@ -313,7 +313,7 @@ public class TabFolderMenuHandler extends PlatformObject {
ITerminalViewControl terminal = null; ITerminalViewControl terminal = null;
// Get the active tab item from the tab folder manager // 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 (manager != null) {
// If we have the active tab item, we can get the active terminal control // If we have the active tab item, we can get the active terminal control
CTabItem activeTabItem = manager.getActiveTabItem(); CTabItem activeTabItem = manager.getActiveTabItem();

View file

@ -14,7 +14,7 @@ import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener; 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 { public class TabFolderSelectionListener implements SelectionListener {
private final TabFolderManager parentTabFolderManager; private final TabFolderManager parentTabFolderManager;

View file

@ -38,7 +38,7 @@ import org.eclipse.ui.IWorkbenchActionConstants;
/** /**
* Terminals tab folder toolbar handler. * Terminal tab folder toolbar handler.
*/ */
@SuppressWarnings("restriction") @SuppressWarnings("restriction")
public class TabFolderToolbarHandler extends PlatformObject { public class TabFolderToolbarHandler extends PlatformObject {
@ -102,7 +102,7 @@ public class TabFolderToolbarHandler extends PlatformObject {
* @return The tab folder or <code>null</code>. * @return The tab folder or <code>null</code>.
*/ */
protected final CTabFolder getTabFolder() { 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; ITerminalViewControl terminal = null;
// Get the active tab item from the tab folder manager // 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 (manager != null) {
// If we have the active tab item, we can get the active terminal control // If we have the active tab item, we can get the active terminal control
CTabItem activeTabItem = manager.getActiveTabItem(); CTabItem activeTabItem = manager.getActiveTabItem();

View file

@ -19,7 +19,7 @@ import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
import org.eclipse.tm.terminal.view.ui.nls.Messages; import org.eclipse.tm.terminal.view.ui.nls.Messages;
/** /**
* Terminals tab default terminal listener implementation. * Terminal tab default terminal listener implementation.
*/ */
@SuppressWarnings("restriction") @SuppressWarnings("restriction")
public class TabTerminalListener implements ITerminalListener { public class TabTerminalListener implements ITerminalListener {

View file

@ -70,7 +70,7 @@ import org.eclipse.ui.part.ViewPart;
import org.osgi.framework.Bundle; import org.osgi.framework.Bundle;
/** /**
* Terminals view. * Terminal view.
*/ */
public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTarget { 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 the selection is valid, fire the command to open the local terminal
if (isValid) { 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$ 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()) { if (command != null && command.isDefined() && command.isEnabled()) {
try { try {
ParameterizedCommand pCmd = ParameterizedCommand.generateCommand(command, null); ParameterizedCommand pCmd = ParameterizedCommand.generateCommand(command, null);
Assert.isNotNull(pCmd); Assert.isNotNull(pCmd);
IHandlerService handlerSvc = (IHandlerService)PlatformUI.getWorkbench().getService(IHandlerService.class); IHandlerService handlerSvc = PlatformUI.getWorkbench().getService(IHandlerService.class);
Assert.isNotNull(handlerSvc); Assert.isNotNull(handlerSvc);
IEvaluationContext ctx = handlerSvc.getCurrentState(); IEvaluationContext ctx = handlerSvc.getCurrentState();
ctx = new EvaluationContext(ctx, selection); ctx = new EvaluationContext(ctx, selection);

View file

@ -30,7 +30,7 @@ import org.eclipse.ui.IMemento;
import org.eclipse.ui.PlatformUI; 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 { public class TerminalsViewMementoHandler {
// The list of items to save. See the workbench listener implementation // The list of items to save. See the workbench listener implementation