From a0fe3f1cf251fe205e3e81bacbf7a68e8dd2caff Mon Sep 17 00:00:00 2001 From: Greg Watson Date: Thu, 8 Feb 2018 14:13:07 -0500 Subject: [PATCH] Update plugin version number per API tooling. Change-Id: I312102ed73b8da22bf780b709899400cb647ab65 Signed-off-by: Greg Watson --- bundles/org.eclipse.remote.console/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- bundles/org.eclipse.remote.console/META-INF/MANIFEST.MF | 2 +- bundles/org.eclipse.remote.console/pom.xml | 2 +- .../src/org/eclipse/remote/console/ITerminalConsole.java | 3 +++ .../eclipse/remote/internal/console/ConsoleMessages.java | 1 + .../remote/internal/console/ConsoleMessages.properties | 1 + .../remote/internal/console/TerminalConsoleConnector.java | 5 +++++ 8 files changed, 16 insertions(+), 6 deletions(-) diff --git a/bundles/org.eclipse.remote.console/.classpath b/bundles/org.eclipse.remote.console/.classpath index eca7bdba8f0..098194ca4b7 100644 --- a/bundles/org.eclipse.remote.console/.classpath +++ b/bundles/org.eclipse.remote.console/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/org.eclipse.remote.console/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.remote.console/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca8..f42de363afa 100644 --- a/bundles/org.eclipse.remote.console/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.remote.console/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/bundles/org.eclipse.remote.console/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.console/META-INF/MANIFEST.MF index 581674f3964..53980e8d133 100644 --- a/bundles/org.eclipse.remote.console/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.remote.console/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.remote.console;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.eclipse.remote.internal.console.Activator Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/bundles/org.eclipse.remote.console/pom.xml b/bundles/org.eclipse.remote.console/pom.xml index 446a83e104f..fd240fbc7af 100644 --- a/bundles/org.eclipse.remote.console/pom.xml +++ b/bundles/org.eclipse.remote.console/pom.xml @@ -12,5 +12,5 @@ org.eclipse.remote.console eclipse-plugin -1.1.0-SNAPSHOT +1.2.0-SNAPSHOT diff --git a/bundles/org.eclipse.remote.console/src/org/eclipse/remote/console/ITerminalConsole.java b/bundles/org.eclipse.remote.console/src/org/eclipse/remote/console/ITerminalConsole.java index 338d330cf54..9a1a5c89402 100644 --- a/bundles/org.eclipse.remote.console/src/org/eclipse/remote/console/ITerminalConsole.java +++ b/bundles/org.eclipse.remote.console/src/org/eclipse/remote/console/ITerminalConsole.java @@ -2,6 +2,9 @@ package org.eclipse.remote.console; import org.eclipse.remote.core.IRemoteConnection; +/** + * @since 1.2 + */ public interface ITerminalConsole { /** diff --git a/bundles/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/ConsoleMessages.java b/bundles/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/ConsoleMessages.java index 83fe6198c6d..a47d98bd9db 100644 --- a/bundles/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/ConsoleMessages.java +++ b/bundles/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/ConsoleMessages.java @@ -31,4 +31,5 @@ public class ConsoleMessages extends NLS { public static String OPENNING_TERMINAL; public static String MAKING_CONNECTION; public static String DISCONNECTING; + public static String TerminalConsoleConnector_0; } diff --git a/bundles/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/ConsoleMessages.properties b/bundles/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/ConsoleMessages.properties index e07f47400e2..3ea9b5a26a8 100644 --- a/bundles/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/ConsoleMessages.properties +++ b/bundles/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/ConsoleMessages.properties @@ -22,3 +22,4 @@ CONNECTING_TO_TERMINAL = Connecting to Command Shell OPENNING_TERMINAL = Openning Command Shell MAKING_CONNECTION = Making Connection DISCONNECTING = Disconnecting +TerminalConsoleConnector_0=Command shell not supported on this connection diff --git a/bundles/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/TerminalConsoleConnector.java b/bundles/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/TerminalConsoleConnector.java index e524e4bcb4e..76366a39575 100644 --- a/bundles/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/TerminalConsoleConnector.java +++ b/bundles/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/TerminalConsoleConnector.java @@ -140,6 +140,11 @@ public class TerminalConsoleConnector { return new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getLocalizedMessage(), e); } } + + if (remoteProcess == null) { + disconnect(); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, ConsoleMessages.TerminalConsoleConnector_0); + } if (width > 0 || height > 0) { IRemoteProcessTerminalService termService = remoteProcess.getService(IRemoteProcessTerminalService.class);