From 272ef8b411ad2983a51e148b7a8581d2bb32537d Mon Sep 17 00:00:00 2001 From: Greg Watson Date: Thu, 8 Feb 2018 10:10:42 -0500 Subject: [PATCH] Add method to obtain a RemoteProcess. Fix version number. Change-Id: I62a02bccde02d665e1b7f0b58c48b8c30c0acbc0 Signed-off-by: Greg Watson --- bundles/org.eclipse.remote.core/META-INF/MANIFEST.MF | 2 +- bundles/org.eclipse.remote.core/pom.xml | 2 +- .../eclipse/remote/core/AbstractRemoteProcessBuilder.java | 8 ++++++++ .../eclipse/remote/core/RemoteConnectionChangeEvent.java | 2 +- .../remote/internal/jsch/core/JSchProcessBuilder.java | 3 +-- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bundles/org.eclipse.remote.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.core/META-INF/MANIFEST.MF index c896fa15561..0e48f78e1b6 100644 --- a/bundles/org.eclipse.remote.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.remote.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.remote.core;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.eclipse.remote.internal.core.RemoteCorePlugin Bundle-Vendor: %pluginProvider Bundle-ActivationPolicy: lazy diff --git a/bundles/org.eclipse.remote.core/pom.xml b/bundles/org.eclipse.remote.core/pom.xml index 2ad887966be..b2ce59e61c3 100644 --- a/bundles/org.eclipse.remote.core/pom.xml +++ b/bundles/org.eclipse.remote.core/pom.xml @@ -11,6 +11,6 @@ org.eclipse.remote.core - 3.0.0-SNAPSHOT + 4.0.0-SNAPSHOT eclipse-plugin diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/AbstractRemoteProcessBuilder.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/AbstractRemoteProcessBuilder.java index 1b208f3b218..5a0e041d3c5 100644 --- a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/AbstractRemoteProcessBuilder.java +++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/AbstractRemoteProcessBuilder.java @@ -16,6 +16,7 @@ import java.util.List; import java.util.Map; import org.eclipse.core.filesystem.IFileStore; +import org.eclipse.remote.internal.core.RemoteProcess; /** * Abstract base class for remote process builders. Implementors can use this class to provide a default implementation of a remote @@ -195,4 +196,11 @@ public abstract class AbstractRemoteProcessBuilder implements IRemoteProcessBuil public IRemoteConnection getRemoteConnection() { return fConnection; } + + /** + * @since 4.0 + */ + protected IRemoteProcess newRemoteProcess() { + return new RemoteProcess(getRemoteConnection(), this); + } } diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteConnectionChangeEvent.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteConnectionChangeEvent.java index 76b8b65d4d4..d4b8f22739f 100644 --- a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteConnectionChangeEvent.java +++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteConnectionChangeEvent.java @@ -53,7 +53,7 @@ public class RemoteConnectionChangeEvent { /** * Event indicating the connection attributes had changed. - * @since 3.0 + * @since 4.0 */ public static final int ATTRIBUTES_CHANGED = 1 << 6; diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchProcessBuilder.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchProcessBuilder.java index a2926e1e85e..a2b409709f4 100644 --- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchProcessBuilder.java +++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchProcessBuilder.java @@ -29,7 +29,6 @@ import org.eclipse.remote.core.IRemoteFileService; import org.eclipse.remote.core.IRemoteProcess; import org.eclipse.remote.core.exception.RemoteConnectionException; import org.eclipse.remote.internal.core.RemoteDebugOptions; -import org.eclipse.remote.internal.core.RemoteProcess; import org.eclipse.remote.internal.jsch.core.messages.Messages; import com.jcraft.jsch.Channel; @@ -182,7 +181,7 @@ public class JSchProcessBuilder extends AbstractRemoteProcessBuilder { } fChannel.setXForwarding((flags & FORWARD_X11) == FORWARD_X11); fChannel.connect(); - return new RemoteProcess(getRemoteConnection(), this); + return newRemoteProcess(); } catch (RemoteConnectionException e) { throw new IOException(e.getMessage()); } catch (JSchException e) {