From ec23b12ef23b130b3f0b426122f847550731179e Mon Sep 17 00:00:00 2001 From: Martin Oberhuber Date: Thu, 10 Sep 2015 14:52:06 +0200 Subject: [PATCH] Cleanup: Fix various API Markup Issues This fixes API related issues and warnings by adding appropriate markup where it had been forgotten. This is formally breaking binary compatibility in some cases, but we are OK releasing as 4.1 since it just codifies the original intent of the API. 1. org.eclipse.tm.terminal.control/MANIFEST.MF: - Replace unintuitive "x-friends" with more obvious "x-internal". - Update the terminal.test/.classpath instead for giving access. - Add @noimplement keywords on interfaces where appropriate. 2. org.eclipse.tm.terminal.view.ui: - Add missing @since tags, and mark the view.showin package as "x-internal", since it was never meant to be API. - Add @noimplement keywords on interfaces where appropriate. 3. Generally, remove unnecessary @suppress("restriction") warnings and fix one "Type Safety (ArrayList)" warning. Change-Id: I75f8b0fb3a5ff0383bff3bc0a4a8d9fd07b71ac9 Signed-off-by: Martin Oberhuber --- .../tm/terminal/connector/process/ProcessMonitor.java | 1 - .../META-INF/MANIFEST.MF | 10 +++++----- .../terminal/control/ITerminalViewControl.java | 1 + plugins/org.eclipse.tm.terminal.test/.classpath | 6 +++++- .../terminal/model/TerminalTextDataWindowTest.java | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../view/ui/actions/NewTerminalViewAction.java | 2 ++ .../terminal/view/ui/actions/SelectEncodingAction.java | 1 - .../terminal/view/ui/actions/TabScrollLockAction.java | 1 - .../view/ui/actions/ToggleCommandFieldAction.java | 1 - .../tm/terminal/view/ui/activator/UIPlugin.java | 1 - .../terminal/view/ui/interfaces/ILauncherDelegate.java | 1 - .../terminal/view/ui/interfaces/IPreferenceKeys.java | 3 +++ .../tm/terminal/view/ui/interfaces/ImageConsts.java | 6 ++++++ .../tm/terminal/view/ui/internal/PropertyTester.java | 1 - .../tm/terminal/view/ui/internal/SettingsStore.java | 1 - .../tm/terminal/view/ui/manager/ConsoleManager.java | 2 +- .../view/ui/streams/AbstractStreamsConnector.java | 1 - .../terminal/view/ui/streams/InputStreamMonitor.java | 1 - .../terminal/view/ui/streams/OutputStreamMonitor.java | 1 - .../tm/terminal/view/ui/streams/StreamsConnector.java | 1 - .../view/ui/streams/StreamsLauncherDelegate.java | 1 - .../tm/terminal/view/ui/streams/StreamsSettings.java | 1 - .../tm/terminal/view/ui/tabs/TabFolderManager.java | 1 - .../tm/terminal/view/ui/tabs/TabFolderMenuHandler.java | 1 - .../terminal/view/ui/tabs/TabFolderToolbarHandler.java | 1 - .../tm/terminal/view/ui/tabs/TabTerminalListener.java | 4 ++-- 27 files changed, 28 insertions(+), 29 deletions(-) diff --git a/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessMonitor.java b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessMonitor.java index 98ae8d0cc1c..5c4ed3fabad 100644 --- a/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessMonitor.java +++ b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessMonitor.java @@ -87,7 +87,6 @@ public class ProcessMonitor { * Monitors the associated system process, waiting for it to terminate, * and notifies the associated process monitor's. */ - @SuppressWarnings("restriction") public void monitorProcess() { // If already disposed -> return immediately if (disposed) return; diff --git a/plugins/org.eclipse.tm.terminal.control/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.control/META-INF/MANIFEST.MF index 99aabb4e350..18b8f157de4 100644 --- a/plugins/org.eclipse.tm.terminal.control/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.terminal.control/META-INF/MANIFEST.MF @@ -12,14 +12,14 @@ Bundle-ActivationPolicy: lazy Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: . -Export-Package: org.eclipse.tm.internal.terminal.connector;x-friends:="org.eclipse.tm.terminal.test", +Export-Package: org.eclipse.tm.internal.terminal.connector;x-internal:=true, org.eclipse.tm.internal.terminal.control, org.eclipse.tm.internal.terminal.control.actions, - org.eclipse.tm.internal.terminal.control.impl;x-friends:="org.eclipse.tm.terminal.test", - org.eclipse.tm.internal.terminal.emulator;x-friends:="org.eclipse.tm.terminal.test", - org.eclipse.tm.internal.terminal.model;x-friends:="org.eclipse.tm.terminal.test", + org.eclipse.tm.internal.terminal.control.impl;x-internal:=true, + org.eclipse.tm.internal.terminal.emulator;x-internal:=true, + org.eclipse.tm.internal.terminal.model;x-internal:=true, org.eclipse.tm.internal.terminal.preferences, org.eclipse.tm.internal.terminal.provisional.api, org.eclipse.tm.internal.terminal.provisional.api.provider, - org.eclipse.tm.internal.terminal.textcanvas;x-friends:="org.eclipse.tm.terminal.test", + org.eclipse.tm.internal.terminal.textcanvas;x-internal:=true, org.eclipse.tm.terminal.model diff --git a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java index fe2755ed183..a943e3c4dc8 100644 --- a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java +++ b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java @@ -26,6 +26,7 @@ import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; /** * @author Michael Scharf * + * @noimplement This interface is not intended to be implemented by clients. */ public interface ITerminalViewControl { /** diff --git a/plugins/org.eclipse.tm.terminal.test/.classpath b/plugins/org.eclipse.tm.terminal.test/.classpath index ad32c83a788..9c8ffa9fe2c 100644 --- a/plugins/org.eclipse.tm.terminal.test/.classpath +++ b/plugins/org.eclipse.tm.terminal.test/.classpath @@ -1,7 +1,11 @@ - + + + + + diff --git a/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindowTest.java b/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindowTest.java index 752c8b06056..ab9ccfdb5b9 100644 --- a/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindowTest.java +++ b/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindowTest.java @@ -42,7 +42,7 @@ public class TerminalTextDataWindowTest extends AbstractITerminalTextDataTest { StringBuffer b=new StringBuffer(); // String[] lines=s.split("\n"); // - ArrayList l = new ArrayList(); + ArrayList l = new ArrayList(); int j = 0; for (int k = 0; k < s.length(); k++) { if (s.charAt(k) == '\n') { @@ -56,7 +56,7 @@ public class TerminalTextDataWindowTest extends AbstractITerminalTextDataTest { } String[] lines = new String[j + 1]; while (j >= 0) { - lines[j] = (String) l.get(j); + lines[j] = l.get(j); j--; } // diff --git a/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF index d69ff828704..7a1718a7fc8 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF @@ -33,4 +33,4 @@ Export-Package: org.eclipse.tm.terminal.view.ui.actions, org.eclipse.tm.terminal.view.ui.streams, org.eclipse.tm.terminal.view.ui.tabs, org.eclipse.tm.terminal.view.ui.view, - org.eclipse.tm.terminal.view.ui.view.showin + org.eclipse.tm.terminal.view.ui.view.showin;x-internal:=true diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/NewTerminalViewAction.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/NewTerminalViewAction.java index 9a9c731244f..5cb005bab39 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/NewTerminalViewAction.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/NewTerminalViewAction.java @@ -20,6 +20,8 @@ import org.eclipse.tm.terminal.view.ui.nls.Messages; /** * Opens a new terminal view with a new secondary view ID. + * + * @since 4.1 */ public class NewTerminalViewAction extends AbstractTerminalAction { diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/SelectEncodingAction.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/SelectEncodingAction.java index 0f7037c57f4..1d8513af4e0 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/SelectEncodingAction.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/SelectEncodingAction.java @@ -25,7 +25,6 @@ import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager; /** * Terminal control select encoding action implementation. */ -@SuppressWarnings("restriction") public class SelectEncodingAction extends AbstractTerminalAction { // Reference to the parent tab folder manager private final TabFolderManager tabFolderManager; diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/TabScrollLockAction.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/TabScrollLockAction.java index 246e9895174..b9645a111a0 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/TabScrollLockAction.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/TabScrollLockAction.java @@ -20,7 +20,6 @@ import org.eclipse.tm.terminal.view.ui.nls.Messages; /** * Terminal console tab scroll lock action. */ -@SuppressWarnings("restriction") public class TabScrollLockAction extends AbstractTerminalAction { /** diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/ToggleCommandFieldAction.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/ToggleCommandFieldAction.java index f44f267cd04..dcdbbe9b7cb 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/ToggleCommandFieldAction.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/ToggleCommandFieldAction.java @@ -24,7 +24,6 @@ import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager; /** * Toggle command input field. */ -@SuppressWarnings("restriction") public class ToggleCommandFieldAction extends AbstractTerminalAction { private ITerminalsView view = null; diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java index 793431af415..ac6b57d3270 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java @@ -43,7 +43,6 @@ import org.osgi.framework.BundleContext; /** * The activator class controls the plug-in life cycle */ -@SuppressWarnings("restriction") public class UIPlugin extends AbstractUIPlugin { // The shared instance private static UIPlugin plugin; diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ILauncherDelegate.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ILauncherDelegate.java index 5989ce02ec9..7c5dae861d1 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ILauncherDelegate.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ILauncherDelegate.java @@ -20,7 +20,6 @@ import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; /** * Terminal launcher delegate. */ -@SuppressWarnings("restriction") public interface ILauncherDelegate extends IExecutableExtension, IAdaptable { /** diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IPreferenceKeys.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IPreferenceKeys.java index 0a7ff86cf62..557f7c22468 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IPreferenceKeys.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IPreferenceKeys.java @@ -11,6 +11,9 @@ package org.eclipse.tm.terminal.view.ui.interfaces; /** * Terminal plug-in preference key definitions. + * + * @noextend This interface is not intended to be extended by clients. + * @noimplement This interface is not intended to be implemented by clients. */ public interface IPreferenceKeys { /** diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ImageConsts.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ImageConsts.java index b3d3d0cdb31..dd43cb769e9 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ImageConsts.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ImageConsts.java @@ -12,6 +12,9 @@ package org.eclipse.tm.terminal.view.ui.interfaces; /** * Image registry constants. + * + * @noextend This interface is not intended to be extended by clients. + * @noimplement This interface is not intended to be implemented by clients. */ public interface ImageConsts { /** @@ -66,16 +69,19 @@ public interface ImageConsts { /** * The key to access the new terminal view action image (enabled). + * @since 4.1 */ public static final String ACTION_NewTerminalView_Enabled = "NewTerminalViewAction_enabled"; //$NON-NLS-1$ /** * The key to access the new terminal view action image (disabled). + * @since 4.1 */ public static final String ACTION_NewTerminalView_Disabled = "NewTerminalViewAction_disabled"; //$NON-NLS-1$ /** * The key to access the new terminal view action image (hover). + * @since 4.1 */ public static final String ACTION_NewTerminalView_Hover = "NewTerminalViewAction_hover"; //$NON-NLS-1$ diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PropertyTester.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PropertyTester.java index c9730bf9f15..ea404117d7e 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PropertyTester.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PropertyTester.java @@ -22,7 +22,6 @@ import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager; /** * Terminal property tester implementation. */ -@SuppressWarnings("restriction") public class PropertyTester extends org.eclipse.core.expressions.PropertyTester { /* (non-Javadoc) diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/SettingsStore.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/SettingsStore.java index 5a11c168899..3d92a2a6e03 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/SettingsStore.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/SettingsStore.java @@ -19,7 +19,6 @@ import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; * Simple default Terminal settings store implementation keeping the settings * within memory. */ -@SuppressWarnings("restriction") public class SettingsStore implements ISettingsStore { private final Map settings = new HashMap(); diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/manager/ConsoleManager.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/manager/ConsoleManager.java index f9fbcf39474..bc277efefcd 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/manager/ConsoleManager.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/manager/ConsoleManager.java @@ -49,7 +49,6 @@ import org.eclipse.ui.PlatformUI; /** * Terminal console manager. */ -@SuppressWarnings("restriction") public class ConsoleManager { // Constant to indicate any secondary id is acceptable @@ -283,6 +282,7 @@ public class ConsoleManager { * * @param id The terminals console view id. Must not be null. * @return The next secondary id, or null if it is the first one + * @since 4.1 */ public String getNextTerminalSecondaryId(String id) { Assert.isNotNull(id); diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/AbstractStreamsConnector.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/AbstractStreamsConnector.java index 89fdfbcf67d..53ec98796c6 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/AbstractStreamsConnector.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/AbstractStreamsConnector.java @@ -21,7 +21,6 @@ import org.eclipse.ui.services.IDisposable; /** * Streams connector implementation. */ -@SuppressWarnings("restriction") public abstract class AbstractStreamsConnector extends TerminalConnectorImpl { // Reference to the stdin monitor private InputStreamMonitor stdInMonitor; diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/InputStreamMonitor.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/InputStreamMonitor.java index 5a18a691b2b..45394e09798 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/InputStreamMonitor.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/InputStreamMonitor.java @@ -32,7 +32,6 @@ import org.eclipse.ui.services.IDisposable; * Note: The input is coming from the terminal. Therefore, the input * stream monitor is attached to the stdin stream of the monitored (remote) process. */ -@SuppressWarnings("restriction") public class InputStreamMonitor extends OutputStream implements IDisposable { // Reference to the parent terminal control private final ITerminalControl terminalControl; diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/OutputStreamMonitor.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/OutputStreamMonitor.java index 07983df66ca..b9222103072 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/OutputStreamMonitor.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/OutputStreamMonitor.java @@ -35,7 +35,6 @@ import org.eclipse.ui.services.IDisposable; * stream monitor is attached to the stdout and/or stderr stream of the monitored * (remote) process. */ -@SuppressWarnings("restriction") public class OutputStreamMonitor implements IDisposable { // The default buffer size to use private static final int BUFFER_SIZE = 8192; diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsConnector.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsConnector.java index 99291a27c23..299ee0c762c 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsConnector.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsConnector.java @@ -19,7 +19,6 @@ import org.eclipse.ui.services.IDisposable; /** * Streams connector implementation. */ -@SuppressWarnings("restriction") public class StreamsConnector extends AbstractStreamsConnector implements IDisposable { // Reference to the streams settings private final StreamsSettings settings; diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsLauncherDelegate.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsLauncherDelegate.java index 9d4ada9a0b2..d9febb5dd1f 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsLauncherDelegate.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsLauncherDelegate.java @@ -29,7 +29,6 @@ import org.eclipse.tm.terminal.view.ui.launcher.AbstractLauncherDelegate; /** * Streams launcher delegate implementation. */ -@SuppressWarnings("restriction") public class StreamsLauncherDelegate extends AbstractLauncherDelegate { /* (non-Javadoc) diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsSettings.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsSettings.java index 5ad03d888ad..f794ef505b8 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsSettings.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsSettings.java @@ -20,7 +20,6 @@ import org.eclipse.tm.terminal.view.ui.internal.SettingsStore; /** * Streams connector settings implementation. */ -@SuppressWarnings("restriction") public class StreamsSettings { // Reference to the stdin stream private OutputStream stdin; diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderManager.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderManager.java index 28f63760730..41e120becec 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderManager.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderManager.java @@ -59,7 +59,6 @@ import org.eclipse.ui.PlatformUI; /** * Terminal tab folder manager. */ -@SuppressWarnings({ "restriction" }) public class TabFolderManager extends PlatformObject implements ISelectionProvider { // Reference to the parent terminal consoles view private final ITerminalsView parentView; 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 2e08efd6cfd..973594cf0ae 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 @@ -41,7 +41,6 @@ import org.eclipse.ui.IWorkbenchActionConstants; /** * Terminal tab folder menu handler. */ -@SuppressWarnings("restriction") public class TabFolderMenuHandler extends PlatformObject { // Reference to the parent terminals console view private final ITerminalsView parentView; 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 7c55befd7da..9a972ccd630 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 @@ -40,7 +40,6 @@ import org.eclipse.ui.IWorkbenchActionConstants; /** * Terminal tab folder toolbar handler. */ -@SuppressWarnings("restriction") public class TabFolderToolbarHandler extends PlatformObject { // Reference to the parent terminals console view private final ITerminalsView parentView; 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 d70b0a270ae..2b711bebb77 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 @@ -21,7 +21,6 @@ import org.eclipse.tm.terminal.view.ui.nls.Messages; /** * Terminal tab default terminal listener implementation. */ -@SuppressWarnings("restriction") public class TabTerminalListener implements ITerminalListener2 { private static final String TAB_TERMINAL_LISTENER = "TabTerminalListener"; //$NON-NLS-1$ /* default */ final TabFolderManager tabFolderManager; @@ -150,8 +149,9 @@ public class TabTerminalListener implements ITerminalListener2 { public void setTerminalTitle(String title) { } - /* (non-Javadoc) + /** * @see org.eclipse.tm.internal.terminal.control.ITerminalListener2#setTerminalSelectionChanged() + * @since 4.1 */ @Override public void setTerminalSelectionChanged() {