From cfb4e71bca353d09a40b9a082ba24025ab70945c Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Fri, 19 Dec 2008 14:38:02 +0000 Subject: [PATCH] [258631][api] ITerminalService should be public API --- .../TerminalServiceShellWriterThread.java | 20 +++++------ .../internal/services/terminals/package.html | 35 ------------------- .../rse/services/terminals/IBaseShell.java | 8 ----- .../META-INF/MANIFEST.MF | 4 +-- 4 files changed, 12 insertions(+), 55 deletions(-) delete mode 100644 rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/terminals/package.html diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/shells/TerminalServiceShellWriterThread.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/shells/TerminalServiceShellWriterThread.java index c1fca4d6d06..12767ff5c2e 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/shells/TerminalServiceShellWriterThread.java +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/shells/TerminalServiceShellWriterThread.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2006, 2008 Wind River Systems, Inc. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Martin Oberhuber (Wind River) - initial API and implementation + * Copyright (c) 2006, 2008 Wind River Systems, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Martin Oberhuber (Wind River) - initial API and implementation * Anna Dushistova (MontaVista) - adapted from SshShellWriterThread * Anna Dushistova (MontaVista) - [240523] [rseterminals] Provide a generic adapter factory that adapts any ITerminalService to an IShellService *******************************************************************************/ @@ -24,7 +24,7 @@ public class TerminalServiceShellWriterThread extends Thread { /** * constructor for terminal service shell writer thread - * + * * @param outputWriter * PrintWriter to write to in separate Thread */ @@ -47,7 +47,7 @@ public class TerminalServiceShellWriterThread extends Thread { /** * Write command to remote side. Wait until the thread takes the command (no * queuing). - * + * * @param command * to send * @return boolean true if command was sent ok diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/terminals/package.html b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/terminals/package.html deleted file mode 100644 index 94e835504e1..00000000000 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/terminals/package.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - Package-level Javadoc - - -Application programming interface for the RSE Base Shell and Terminal Services. -

-Package Specification

-

-The RSE Terminal Services packages provides interfaces and basic utility classes -for shell or terminal connections. The classes in this package are especially designed -to be extendable by means of the Decorator pattern as well as the Adapter -pattern: -

-The classes and interfaces in this package are designed to have only minimal -dependency into Eclipse core APIs, such that Services can eventually be re-used in -environments outside Eclipse. Especially -IBaseShell, along with -ProcessBaseShell and -BaseShellDecorator are usable in -any environment, provided that mock objects are provided for Eclipse -IAdaptable and PlatformObject. -

- - diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/terminals/IBaseShell.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/terminals/IBaseShell.java index b6f25c64288..542c83ecc6b 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/terminals/IBaseShell.java +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/terminals/IBaseShell.java @@ -18,8 +18,6 @@ import java.io.OutputStream; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.PlatformObject; -import org.eclipse.rse.internal.services.terminals.ProcessBaseShell; - /** * A basic shell, representing the connection to some process that may be * running local or remote. Clients may implement this interface. @@ -28,17 +26,11 @@ import org.eclipse.rse.internal.services.terminals.ProcessBaseShell; * {@link PlatformObject} for providing the {@link #getAdapter(Class)} * functionality. * - * A simple implementation of IBaseShell is the {@link ProcessBaseShell}, which - * wraps a Java {@link java.lang.Process} object in the IBaseShell interface to - * provide more convenient access to it through the {{@link #isActive()} and {{@link #waitFor(long)} - * methods, as well as making it adaptable. - * * The resulting IBaseShell can be decorated by clients with additional * functionality easily by instantiating their subclassed variant of * {@link BaseShellDecorator}. * * @see java.lang.Process - * @see org.eclipse.rse.internal.services.terminals.ProcessBaseShell * @see BaseShellDecorator * @since org.eclipse.rse.services 3.1 */ diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/META-INF/MANIFEST.MF index 2e32cdacc7f..635317e2eaa 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.subsystems.shells.telnet;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.eclipse.rse.internal.subsystems.shells.telnet.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.eclipse.rse.services;bundle-version="[3.0.0,4.0.0)", + org.eclipse.rse.services;bundle-version="[3.1.0,4.0.0)", org.eclipse.rse.connectorservice.telnet;bundle-version="[1.1.0,2.0.0)", org.eclipse.rse.services.telnet;bundle-version="[1.0.0,2.0.0)", org.eclipse.rse.subsystems.shells.core;bundle-version="[3.0.0,4.0.0)",