Terminals: Reduce Terminal dependencies to depend on plain Eclipse

platform only

4 files changed, 9 insertions, 12 deletions

diff --git a/target_explorer/features/org.eclipse.tcf.te.terminals.rse.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.terminals.rse.feature/feature.xml
index 8e960c91e..4fab2752f 100644
--- a/target_explorer/features/org.eclipse.tcf.te.terminals.rse.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.terminals.rse.feature/feature.xml
@@ -27,18 +27,15 @@
    <requires>
       <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.services" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui.swt" version="1.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.rse.core" version="3.3.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.rse.subsystems.files.core" version="3.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.rse.ui" version="3.3.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.te.ui.terminals" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tm.terminal" version="3.2.300" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.forms" version="3.5.200" match="greaterOrEqual"/>
       <import feature="org.eclipse.tcf.te.terminals.feature" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.rse.core" version="3.3.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.rse.subsystems.files.core" version="3.3.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.rse.ui" version="3.3.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui.terminals.ssh" version="1.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.core.terminals" version="1.3.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.rse/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.rse/META-INF/MANIFEST.MF
index e652c77c9..2316f2fa2 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.rse/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.rse/META-INF/MANIFEST.MF
@@ -11,7 +11,6 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
  org.eclipse.rse.subsystems.files.core;bundle-version="3.3.1",
  org.eclipse.rse.ui;bundle-version="3.3.100",
  org.eclipse.tcf.te.core.terminals;bundle-version="1.3.0",
- org.eclipse.tcf.te.runtime;bundle-version="1.3.0",
  org.eclipse.tcf.te.ui.terminals;bundle-version="1.3.0",
  org.eclipse.tm.terminal;bundle-version="3.2.300",
  org.eclipse.ui;bundle-version="3.8.0",
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/activator/UIPlugin.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/activator/UIPlugin.java
index d42afab60..cfb7150e3 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/activator/UIPlugin.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/activator/UIPlugin.java
@@ -12,7 +12,7 @@ package org.eclipse.tcf.te.ui.terminals.rse.activator;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.tcf.te.runtime.tracing.TraceHandler;
+import org.eclipse.tcf.te.core.terminals.tracing.TraceHandler;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/internal/LaunchTerminalHandler.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/internal/LaunchTerminalHandler.java
index 5295f3883..a8d133664 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/internal/LaunchTerminalHandler.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/internal/LaunchTerminalHandler.java
@@ -9,6 +9,8 @@
  *******************************************************************************/
 package org.eclipse.tcf.te.ui.terminals.rse.internal;
 
+import java.util.Map;
+
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -24,7 +26,6 @@ import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants;
-import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
 import org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate;
 import org.eclipse.tcf.te.ui.terminals.internal.dialogs.LaunchTerminalSettingsDialog;
 import org.eclipse.tcf.te.ui.terminals.launcher.LauncherDelegateManager;
@@ -70,9 +71,9 @@ public class LaunchTerminalHandler extends AbstractHandler {
 
 					if (dialog.open() == Window.OK) {
 						// Get the terminal settings from the dialog
-						IPropertiesContainer properties = dialog.getSettings();
+						Map<String, Object> properties = dialog.getSettings();
 						if (properties != null) {
-							String delegateId = properties.getStringProperty(ITerminalsConnectorConstants.PROP_DELEGATE_ID);
+							String delegateId = (String)properties.get(ITerminalsConnectorConstants.PROP_DELEGATE_ID);
 							Assert.isNotNull(delegateId);
 							ILauncherDelegate delegate = LauncherDelegateManager.getInstance().getLauncherDelegate(delegateId, false);
 							Assert.isNotNull(delegateId);