Remove dependency on tm.terminal.view
Change-Id: I17ff2a643715f774a3dd8ad21ae24449910ac9fd
Signed-off-by: Greg Watson <g.watson@computer.org>
diff --git a/core/org.eclipse.ptp.remote.terminal/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.remote.terminal/META-INF/MANIFEST.MF
index 4f4c7f4..a5820da 100644
--- a/core/org.eclipse.ptp.remote.terminal/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.ptp.remote.terminal/META-INF/MANIFEST.MF
@@ -7,15 +7,14 @@
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.tm.terminal,
org.eclipse.remote.core,
org.eclipse.remote.ui,
+ org.eclipse.remote.terminal,
org.eclipse.core.resources,
- org.eclipse.tm.terminal.view,
org.eclipse.swt,
org.eclipse.jface,
- org.eclipse.tm.terminal.remote,
- org.eclipse.equinox.preferences
+ org.eclipse.equinox.preferences,
+ org.eclipse.tm.terminal
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.ptp.internal.remote.terminal;x-internal:=true
Bundle-Activator: org.eclipse.ptp.internal.remote.terminal.Activator
diff --git a/core/org.eclipse.ptp.remote.terminal/src/org/eclipse/ptp/internal/remote/terminal/HashSettingsStore.java b/core/org.eclipse.ptp.remote.terminal/src/org/eclipse/ptp/internal/remote/terminal/HashSettingsStore.java
index 11f5b23..0698905 100644
--- a/core/org.eclipse.ptp.remote.terminal/src/org/eclipse/ptp/internal/remote/terminal/HashSettingsStore.java
+++ b/core/org.eclipse.ptp.remote.terminal/src/org/eclipse/ptp/internal/remote/terminal/HashSettingsStore.java
@@ -12,8 +12,8 @@
import java.util.HashMap;
import java.util.Map;
+import org.eclipse.remote.internal.terminal.settings.RemoteSettings;
import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
-import org.eclipse.tm.internal.terminal.remote.RemoteSettings;
/**
* Utility class for inserting/extracting data from the
diff --git a/core/org.eclipse.ptp.remote.terminal/src/org/eclipse/ptp/internal/remote/terminal/RemoteTerminalParser.java b/core/org.eclipse.ptp.remote.terminal/src/org/eclipse/ptp/internal/remote/terminal/RemoteTerminalParser.java
index 2fc3d65..a87f310 100644
--- a/core/org.eclipse.ptp.remote.terminal/src/org/eclipse/ptp/internal/remote/terminal/RemoteTerminalParser.java
+++ b/core/org.eclipse.ptp.remote.terminal/src/org/eclipse/ptp/internal/remote/terminal/RemoteTerminalParser.java
@@ -31,6 +31,7 @@
import org.eclipse.remote.core.IRemoteProcess;
import org.eclipse.remote.core.IRemoteProcessBuilder;
import org.eclipse.remote.core.IRemoteProcessService;
+import org.eclipse.remote.terminal.IRemoteTerminalParser;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Button;
@@ -39,7 +40,6 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.tm.terminal.remote.IRemoteTerminalParser;
import org.eclipse.ui.IEditorDescriptor;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
@@ -55,7 +55,7 @@
return display;
}
- final static Pattern pattern = Pattern.compile("~~EPTP:(\\w*)~~(?:EDID=([\\w\\.]+)~~)?(.*)"); //$NON-NLS-1$
+ final static Pattern pattern = Pattern.compile("~~EPTP:(\\w*)~~(?:EDID=([\\w\\.]+)~~)?(.*)"); //$NON-NLS-1$
private IRemoteConnection fRemoteConnection;
private IRemoteProcess fProcess;
@@ -66,13 +66,13 @@
* @param type
* @param str
*/
- private void doAction(String type, final String str,final String arg) {
+ private void doAction(String type, final String str, final String arg) {
if (type.equals("Radio")) { //$NON-NLS-1$
doRadioAction(str);
} else if (type.equals("Choice")) { //$NON-NLS-1$
- doChoiceAction(str,arg);
+ doChoiceAction(str, arg);
} else if (type.equals("OpenFile")) { // open file //$NON-NLS-1$
- openFile(str,arg);
+ openFile(str, arg);
}
}
@@ -84,7 +84,7 @@
*
* @param str
*/
- private void doChoiceAction(final String str,final String arg) {
+ private void doChoiceAction(final String str, final String arg) {
final String[] choices = str.split("\\s*~~\\s*"); //$NON-NLS-1$
getStandardDisplay().asyncExec(new Runnable() {
@@ -100,7 +100,7 @@
public void buttonPressed(int buttonId) {
int n = combo.getSelectionIndex();
if (buttonId == 0 && n >= 0 && n < comboChoices.length) {
- openFile(comboChoices[n],arg);
+ openFile(comboChoices[n], arg);
}
close();
}
@@ -238,7 +238,8 @@
MachineManager.setOutputStream(hostSvc.getHostname(), outputStream);
IEclipsePreferences defaultPrefs = InstanceScope.INSTANCE.getNode(Activator.getUniqueIdentifier());
- String startup = defaultPrefs.get(TerminalPrefsInitializer.SHELL_STARTUP_COMMAND, TerminalPrefsInitializer.SHELL_STARTUP_DEFAULT);
+ String startup = defaultPrefs.get(TerminalPrefsInitializer.SHELL_STARTUP_COMMAND,
+ TerminalPrefsInitializer.SHELL_STARTUP_DEFAULT);
if (minfo != null) {
if (minfo.isCsh) {
@@ -268,7 +269,7 @@
* @param file
* - the file to open
*/
- public void openFile(final String file,final String suffix) {
+ public void openFile(final String file, final String suffix) {
IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
for (final IProject prj : projects) {
final URI remoteURI = Util.getLocationURI(prj);
@@ -303,23 +304,21 @@
URI uri = fileSvc.toURI(file);
String autoEditorId = editorDesc.getId();
String editorId = autoEditorId;
- if(suffix != null) {
- IEditorDescriptor suffixDesc =
- IDE.getEditorDescriptor("file."+suffix); //$NON-NLS-1$
- if(suffixDesc != null) {
+ if (suffix != null) {
+ IEditorDescriptor suffixDesc = IDE.getEditorDescriptor("file." + suffix); //$NON-NLS-1$
+ if (suffixDesc != null) {
editorId = suffixDesc.getId();
}
}
try {
IDE.openEditor(page, uri, editorId, true);
- } catch(Exception e) {
+ } catch (Exception e) {
// Some editors are not supported remotely. Default to text editor.
- IEditorDescriptor suffixDesc =
- IDE.getEditorDescriptor("file.txt"); //$NON-NLS-1$
- if(suffixDesc != null) {
+ IEditorDescriptor suffixDesc = IDE.getEditorDescriptor("file.txt"); //$NON-NLS-1$
+ if (suffixDesc != null) {
editorId = suffixDesc.getId();
}
- IDE.openEditor(page, uri, editorId, true);
+ IDE.openEditor(page, uri, editorId, true);
}
} catch (PartInitException e) {
Activator.log(e);
@@ -337,14 +336,14 @@
@Override
public boolean parse(byte[] buf) {
// support advanced option, editor id
- String str = new String(buf);
+ String str = new String(buf);
Matcher match = pattern.matcher(str);
if (match.find()) {
String cmd = match.group(1);
- if(match.groupCount() == 3) {
+ if (match.groupCount() == 3) {
String location = match.group(3);
String suffix = match.group(2);
-
+
doAction(cmd, location, suffix);
} else {
String location = match.group(2);
diff --git a/core/org.eclipse.ptp.remote.terminal/src/org/eclipse/ptp/internal/remote/terminal/TerminalCommandHandler.java b/core/org.eclipse.ptp.remote.terminal/src/org/eclipse/ptp/internal/remote/terminal/TerminalCommandHandler.java
index 7552b9b..1a268d3 100644
--- a/core/org.eclipse.ptp.remote.terminal/src/org/eclipse/ptp/internal/remote/terminal/TerminalCommandHandler.java
+++ b/core/org.eclipse.ptp.remote.terminal/src/org/eclipse/ptp/internal/remote/terminal/TerminalCommandHandler.java
@@ -21,12 +21,12 @@
import org.eclipse.remote.core.IRemoteConnection;
import org.eclipse.remote.core.IRemoteConnectionHostService;
import org.eclipse.remote.core.exception.RemoteConnectionException;
+import org.eclipse.remote.internal.terminal.view.ITerminalView;
+import org.eclipse.remote.internal.terminal.view.TerminalView;
+import org.eclipse.remote.terminal.IRemoteSettings;
import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
import org.eclipse.tm.internal.terminal.provisional.api.TerminalConnectorExtension;
-import org.eclipse.tm.internal.terminal.view.ITerminalView;
-import org.eclipse.tm.internal.terminal.view.TerminalView;
-import org.eclipse.tm.terminal.remote.IRemoteSettings;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.handlers.HandlerUtil;
