Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/interfaces/ITerminalServiceOutputStreamMonitorListener.java27
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/types/LocalConnectorType.java6
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessConnectorType.java6
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessSettings.java18
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/AbstractStreamsConnector.java13
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/OutputStreamMonitor.java26
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsSettings.java17
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/types/StreamsConnectorType.java6
8 files changed, 66 insertions, 53 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/interfaces/ITerminalServiceOutputStreamMonitorListener.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/interfaces/ITerminalServiceOutputStreamMonitorListener.java
new file mode 100644
index 000000000..003c475f5
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/interfaces/ITerminalServiceOutputStreamMonitorListener.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2014 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:
+ * Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.tcf.te.runtime.services.interfaces;
+
+/**
+ * An interface to be implemented by listeners who want to listen
+ * to the streams data without interfering with the original data receiver.
+ * <p>
+ * Listeners are invoked within the monitor processing thread.
+ */
+public interface ITerminalServiceOutputStreamMonitorListener {
+
+ /**
+ * Signals that some content has been read from the monitored stream.
+ *
+ * @param byteBuffer The byte stream. Must not be <code>null</code>.
+ * @param bytesRead The number of bytes that were read into the read buffer.
+ */
+ public void onContentReadFromStream(byte[] byteBuffer, int bytesRead);
+}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/types/LocalConnectorType.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/types/LocalConnectorType.java
index 429488605..909da7aa9 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/types/LocalConnectorType.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/types/LocalConnectorType.java
@@ -14,12 +14,12 @@ import java.io.File;
import org.eclipse.cdt.utils.pty.PTY;
import org.eclipse.core.runtime.Assert;
import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
+import org.eclipse.tcf.te.runtime.services.interfaces.ITerminalServiceOutputStreamMonitorListener;
import org.eclipse.tcf.te.runtime.services.interfaces.constants.ILineSeparatorConstants;
import org.eclipse.tcf.te.runtime.services.interfaces.constants.ITerminalsConnectorConstants;
import org.eclipse.tcf.te.runtime.utils.Host;
import org.eclipse.tcf.te.ui.terminals.internal.SettingsStore;
import org.eclipse.tcf.te.ui.terminals.process.ProcessSettings;
-import org.eclipse.tcf.te.ui.terminals.streams.OutputStreamMonitor;
import org.eclipse.tcf.te.ui.terminals.types.AbstractConnectorType;
import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
@@ -85,8 +85,8 @@ public class LocalConnectorType extends AbstractConnectorType {
String arguments = properties.getStringProperty(ITerminalsConnectorConstants.PROP_PROCESS_ARGS);
Process process = (Process)properties.getProperty(ITerminalsConnectorConstants.PROP_PROCESS_OBJ);
PTY pty = (PTY)properties.getProperty(ITerminalsConnectorConstants.PROP_PTY_OBJ);
- OutputStreamMonitor.Listener[] stdoutListeners = (OutputStreamMonitor.Listener[])properties.getProperty(ITerminalsConnectorConstants.PROP_STDOUT_LISTENERS);
- OutputStreamMonitor.Listener[] stderrListeners = (OutputStreamMonitor.Listener[])properties.getProperty(ITerminalsConnectorConstants.PROP_STDERR_LISTENERS);
+ ITerminalServiceOutputStreamMonitorListener[] stdoutListeners = (ITerminalServiceOutputStreamMonitorListener[])properties.getProperty(ITerminalsConnectorConstants.PROP_STDOUT_LISTENERS);
+ ITerminalServiceOutputStreamMonitorListener[] stderrListeners = (ITerminalServiceOutputStreamMonitorListener[])properties.getProperty(ITerminalsConnectorConstants.PROP_STDERR_LISTENERS);
String workingDir = properties.getStringProperty(ITerminalsConnectorConstants.PROP_PROCESS_WORKING_DIR);
String[] envp = null;
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessConnectorType.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessConnectorType.java
index 2e61b91ca..75ee60229 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessConnectorType.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessConnectorType.java
@@ -12,9 +12,9 @@ package org.eclipse.tcf.te.ui.terminals.process;
import org.eclipse.cdt.utils.pty.PTY;
import org.eclipse.core.runtime.Assert;
import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
+import org.eclipse.tcf.te.runtime.services.interfaces.ITerminalServiceOutputStreamMonitorListener;
import org.eclipse.tcf.te.runtime.services.interfaces.constants.ITerminalsConnectorConstants;
import org.eclipse.tcf.te.ui.terminals.internal.SettingsStore;
-import org.eclipse.tcf.te.ui.terminals.streams.OutputStreamMonitor;
import org.eclipse.tcf.te.ui.terminals.types.AbstractConnectorType;
import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
@@ -44,8 +44,8 @@ public class ProcessConnectorType extends AbstractConnectorType {
PTY pty = (PTY)properties.getProperty(ITerminalsConnectorConstants.PROP_PTY_OBJ);
boolean localEcho = properties.getBooleanProperty(ITerminalsConnectorConstants.PROP_LOCAL_ECHO);
String lineSeparator = properties.getStringProperty(ITerminalsConnectorConstants.PROP_LINE_SEPARATOR);
- OutputStreamMonitor.Listener[] stdoutListeners = (OutputStreamMonitor.Listener[])properties.getProperty(ITerminalsConnectorConstants.PROP_STDOUT_LISTENERS);
- OutputStreamMonitor.Listener[] stderrListeners = (OutputStreamMonitor.Listener[])properties.getProperty(ITerminalsConnectorConstants.PROP_STDERR_LISTENERS);
+ ITerminalServiceOutputStreamMonitorListener[] stdoutListeners = (ITerminalServiceOutputStreamMonitorListener[])properties.getProperty(ITerminalsConnectorConstants.PROP_STDOUT_LISTENERS);
+ ITerminalServiceOutputStreamMonitorListener[] stderrListeners = (ITerminalServiceOutputStreamMonitorListener[])properties.getProperty(ITerminalsConnectorConstants.PROP_STDERR_LISTENERS);
String workingDir = properties.getStringProperty(ITerminalsConnectorConstants.PROP_PROCESS_WORKING_DIR);
String[] envp = null;
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessSettings.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessSettings.java
index 005cf8372..76c1b0380 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessSettings.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessSettings.java
@@ -12,7 +12,7 @@ package org.eclipse.tcf.te.ui.terminals.process;
import org.eclipse.cdt.utils.pty.PTY;
import org.eclipse.core.runtime.Assert;
import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
-import org.eclipse.tcf.te.ui.terminals.streams.OutputStreamMonitor;
+import org.eclipse.tcf.te.runtime.services.interfaces.ITerminalServiceOutputStreamMonitorListener;
import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
/**
@@ -34,9 +34,9 @@ public class ProcessSettings {
// The line separator setting
private String lineSeparator = null;
// The list of stdout output listeners
- private OutputStreamMonitor.Listener[] stdoutListeners = null;
+ private ITerminalServiceOutputStreamMonitorListener[] stdoutListeners = null;
// The list of stderr output listeners
- private OutputStreamMonitor.Listener[] stderrListeners = null;
+ private ITerminalServiceOutputStreamMonitorListener[] stderrListeners = null;
// working directory for process
private String workingDir;
// environment
@@ -162,7 +162,7 @@ public class ProcessSettings {
*
* @param listeners The list of stdout listeners or <code>null</code>.
*/
- public void setStdOutListeners(OutputStreamMonitor.Listener[] listeners) {
+ public void setStdOutListeners(ITerminalServiceOutputStreamMonitorListener[] listeners) {
this.stdoutListeners = listeners;
}
@@ -171,7 +171,7 @@ public class ProcessSettings {
*
* @return The list of stdout listeners or <code>null</code>.
*/
- public OutputStreamMonitor.Listener[] getStdOutListeners() {
+ public ITerminalServiceOutputStreamMonitorListener[] getStdOutListeners() {
return stdoutListeners;
}
@@ -180,7 +180,7 @@ public class ProcessSettings {
*
* @param listeners The list of stderr listeners or <code>null</code>.
*/
- public void setStdErrListeners(OutputStreamMonitor.Listener[] listeners) {
+ public void setStdErrListeners(ITerminalServiceOutputStreamMonitorListener[] listeners) {
this.stderrListeners = listeners;
}
@@ -189,7 +189,7 @@ public class ProcessSettings {
*
* @return The list of stderr listeners or <code>null</code>.
*/
- public OutputStreamMonitor.Listener[] getStdErrListeners() {
+ public ITerminalServiceOutputStreamMonitorListener[] getStdErrListeners() {
return stderrListeners;
}
@@ -244,8 +244,8 @@ public class ProcessSettings {
if (store instanceof IPropertiesContainer) {
process = (Process)((IPropertiesContainer)store).getProperty("Process"); //$NON-NLS-1$
pty = (PTY)((IPropertiesContainer)store).getProperty("PTY"); //$NON-NLS-1$
- stdoutListeners = (OutputStreamMonitor.Listener[])((IPropertiesContainer)store).getProperty("StdOutListeners"); //$NON-NLS-1$
- stderrListeners = (OutputStreamMonitor.Listener[])((IPropertiesContainer)store).getProperty("StdErrListeners"); //$NON-NLS-1$
+ stdoutListeners = (ITerminalServiceOutputStreamMonitorListener[])((IPropertiesContainer)store).getProperty("StdOutListeners"); //$NON-NLS-1$
+ stderrListeners = (ITerminalServiceOutputStreamMonitorListener[])((IPropertiesContainer)store).getProperty("StdErrListeners"); //$NON-NLS-1$
environment = (String[])((IPropertiesContainer)store).getProperty("Environment"); //$NON-NLS-1$
}
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/AbstractStreamsConnector.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/AbstractStreamsConnector.java
index 54290d3f7..94fd405ef 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/AbstractStreamsConnector.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/AbstractStreamsConnector.java
@@ -14,6 +14,7 @@ import java.io.OutputStream;
import org.eclipse.core.runtime.Assert;
import org.eclipse.tcf.te.runtime.interfaces.IDisposable;
+import org.eclipse.tcf.te.runtime.services.interfaces.ITerminalServiceOutputStreamMonitorListener;
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
import org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl;
@@ -30,16 +31,16 @@ public abstract class AbstractStreamsConnector extends TerminalConnectorImpl {
private OutputStreamMonitor stdErrMonitor;
// Reference to the list of stdout output listeners
- private OutputStreamMonitor.Listener[] stdoutListeners = null;
+ private ITerminalServiceOutputStreamMonitorListener[] stdoutListeners = null;
// Reference to the list of stderr output listeners
- private OutputStreamMonitor.Listener[] stderrListeners = null;
+ private ITerminalServiceOutputStreamMonitorListener[] stderrListeners = null;
/**
* Set the list of stdout listeners.
*
* @param listeners The list of stdout listeners or <code>null</code>.
*/
- protected final void setStdoutListeners(OutputStreamMonitor.Listener[] listeners) {
+ protected final void setStdoutListeners(ITerminalServiceOutputStreamMonitorListener[] listeners) {
this.stdoutListeners = listeners;
}
@@ -48,7 +49,7 @@ public abstract class AbstractStreamsConnector extends TerminalConnectorImpl {
*
* @param listeners The list of stderr listeners or <code>null</code>.
*/
- protected final void setStderrListeners(OutputStreamMonitor.Listener[] listeners) {
+ protected final void setStderrListeners(ITerminalServiceOutputStreamMonitorListener[] listeners) {
this.stderrListeners = listeners;
}
@@ -82,7 +83,7 @@ public abstract class AbstractStreamsConnector extends TerminalConnectorImpl {
if (this instanceof IDisposable) stdOutMonitor.addDisposable((IDisposable)this);
// Register the listeners
if (stdoutListeners != null) {
- for (OutputStreamMonitor.Listener l : stdoutListeners) {
+ for (ITerminalServiceOutputStreamMonitorListener l : stdoutListeners) {
stdOutMonitor.addListener(l);
}
}
@@ -97,7 +98,7 @@ public abstract class AbstractStreamsConnector extends TerminalConnectorImpl {
if (stdout == null && this instanceof IDisposable) stdErrMonitor.addDisposable((IDisposable)this);
// Register the listeners
if (stderrListeners != null) {
- for (OutputStreamMonitor.Listener l : stderrListeners) {
+ for (ITerminalServiceOutputStreamMonitorListener l : stderrListeners) {
stdErrMonitor.addListener(l);
}
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/OutputStreamMonitor.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/OutputStreamMonitor.java
index 8829a2c26..29c2980ba 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/OutputStreamMonitor.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/OutputStreamMonitor.java
@@ -21,6 +21,7 @@ import org.eclipse.core.runtime.ListenerList;
import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.util.NLS;
import org.eclipse.tcf.te.runtime.interfaces.IDisposable;
+import org.eclipse.tcf.te.runtime.services.interfaces.ITerminalServiceOutputStreamMonitorListener;
import org.eclipse.tcf.te.runtime.services.interfaces.constants.ILineSeparatorConstants;
import org.eclipse.tcf.te.ui.terminals.activator.UIPlugin;
import org.eclipse.tcf.te.ui.terminals.interfaces.tracing.ITraceIds;
@@ -61,23 +62,6 @@ public class OutputStreamMonitor implements IDisposable {
// The list of registered listener
private final ListenerList listeners;
- /**
- * An interface to be implemented by listeners who want to listen
- * to the streams data without interfering with the original data receiver.
- * <p>
- * Listeners are invoked within the monitor processing thread.
- */
- public static interface Listener {
-
- /**
- * Signals that some content has been read from the monitored stream.
- *
- * @param byteBuffer The byte stream. Must not be <code>null</code>.
- * @param bytesRead The number of bytes that were read into the read buffer.
- */
- public void onContentReadFromStream(byte[] byteBuffer, int bytesRead);
- }
-
/**
* Constructor.
*
@@ -103,7 +87,7 @@ public class OutputStreamMonitor implements IDisposable {
*
* @param listener The listener. Must not be <code>null</code>.
*/
- public final void addListener(Listener listener) {
+ public final void addListener(ITerminalServiceOutputStreamMonitorListener listener) {
Assert.isNotNull(listener);
listeners.add(listener);
}
@@ -113,7 +97,7 @@ public class OutputStreamMonitor implements IDisposable {
*
* @param listener The listener. Must not be <code>null</code>.
*/
- public final void removeListener(Listener listener) {
+ public final void removeListener(ITerminalServiceOutputStreamMonitorListener listener) {
Assert.isNotNull(listener);
listeners.remove(listener);
}
@@ -305,8 +289,8 @@ public class OutputStreamMonitor implements IDisposable {
// If listeners are registered, invoke the listeners now.
if (listeners.size() > 0) {
for (Object candidate : listeners.getListeners()) {
- if (!(candidate instanceof Listener)) continue;
- ((Listener)candidate).onContentReadFromStream(byteBuffer, bytesRead);
+ if (!(candidate instanceof ITerminalServiceOutputStreamMonitorListener)) continue;
+ ((ITerminalServiceOutputStreamMonitorListener)candidate).onContentReadFromStream(byteBuffer, bytesRead);
}
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsSettings.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsSettings.java
index 4e7da1dc0..a91667ccd 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsSettings.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsSettings.java
@@ -14,6 +14,7 @@ import java.io.OutputStream;
import org.eclipse.core.runtime.Assert;
import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
+import org.eclipse.tcf.te.runtime.services.interfaces.ITerminalServiceOutputStreamMonitorListener;
import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
/**
@@ -32,9 +33,9 @@ public class StreamsSettings {
// The line separator setting
private String lineSeparator = null;
// The list of stdout output listeners
- private OutputStreamMonitor.Listener[] stdoutListeners = null;
+ private ITerminalServiceOutputStreamMonitorListener[] stdoutListeners = null;
// The list of stderr output listeners
- private OutputStreamMonitor.Listener[] stderrListeners = null;
+ private ITerminalServiceOutputStreamMonitorListener[] stderrListeners = null;
/**
* Sets the stdin stream instance.
@@ -132,7 +133,7 @@ public class StreamsSettings {
*
* @param listeners The list of stdout listeners or <code>null</code>.
*/
- public void setStdOutListeners(OutputStreamMonitor.Listener[] listeners) {
+ public void setStdOutListeners(ITerminalServiceOutputStreamMonitorListener[] listeners) {
this.stdoutListeners = listeners;
}
@@ -141,7 +142,7 @@ public class StreamsSettings {
*
* @return The list of stdout listeners or <code>null</code>.
*/
- public OutputStreamMonitor.Listener[] getStdOutListeners() {
+ public ITerminalServiceOutputStreamMonitorListener[] getStdOutListeners() {
return stdoutListeners;
}
@@ -150,7 +151,7 @@ public class StreamsSettings {
*
* @param listeners The list of stderr listeners or <code>null</code>.
*/
- public void setStdErrListeners(OutputStreamMonitor.Listener[] listeners) {
+ public void setStdErrListeners(ITerminalServiceOutputStreamMonitorListener[] listeners) {
this.stderrListeners = listeners;
}
@@ -159,7 +160,7 @@ public class StreamsSettings {
*
* @return The list of stderr listeners or <code>null</code>.
*/
- public OutputStreamMonitor.Listener[] getStdErrListeners() {
+ public ITerminalServiceOutputStreamMonitorListener[] getStdErrListeners() {
return stderrListeners;
}
@@ -176,8 +177,8 @@ public class StreamsSettings {
stdin = (OutputStream)((IPropertiesContainer)store).getProperty("stdin"); //$NON-NLS-1$
stdout = (InputStream)((IPropertiesContainer)store).getProperty("stdout"); //$NON-NLS-1$
stderr = (InputStream)((IPropertiesContainer)store).getProperty("stderr"); //$NON-NLS-1$
- stdoutListeners = (OutputStreamMonitor.Listener[])((IPropertiesContainer)store).getProperty("StdOutListeners"); //$NON-NLS-1$
- stderrListeners = (OutputStreamMonitor.Listener[])((IPropertiesContainer)store).getProperty("StdErrListeners"); //$NON-NLS-1$
+ stdoutListeners = (ITerminalServiceOutputStreamMonitorListener[])((IPropertiesContainer)store).getProperty("StdOutListeners"); //$NON-NLS-1$
+ stderrListeners = (ITerminalServiceOutputStreamMonitorListener[])((IPropertiesContainer)store).getProperty("StdErrListeners"); //$NON-NLS-1$
}
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/types/StreamsConnectorType.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/types/StreamsConnectorType.java
index dcffaf4c1..b2830df00 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/types/StreamsConnectorType.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/types/StreamsConnectorType.java
@@ -14,9 +14,9 @@ import java.io.OutputStream;
import org.eclipse.core.runtime.Assert;
import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
+import org.eclipse.tcf.te.runtime.services.interfaces.ITerminalServiceOutputStreamMonitorListener;
import org.eclipse.tcf.te.runtime.services.interfaces.constants.ITerminalsConnectorConstants;
import org.eclipse.tcf.te.ui.terminals.internal.SettingsStore;
-import org.eclipse.tcf.te.ui.terminals.streams.OutputStreamMonitor;
import org.eclipse.tcf.te.ui.terminals.streams.StreamsSettings;
import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
@@ -45,8 +45,8 @@ public class StreamsConnectorType extends AbstractConnectorType {
InputStream stderr = (InputStream)properties.getProperty(ITerminalsConnectorConstants.PROP_STREAMS_STDERR);
boolean localEcho = properties.getBooleanProperty(ITerminalsConnectorConstants.PROP_LOCAL_ECHO);
String lineSeparator = properties.getStringProperty(ITerminalsConnectorConstants.PROP_LINE_SEPARATOR);
- OutputStreamMonitor.Listener[] stdoutListeners = (OutputStreamMonitor.Listener[])properties.getProperty(ITerminalsConnectorConstants.PROP_STDOUT_LISTENERS);
- OutputStreamMonitor.Listener[] stderrListeners = (OutputStreamMonitor.Listener[])properties.getProperty(ITerminalsConnectorConstants.PROP_STDERR_LISTENERS);
+ ITerminalServiceOutputStreamMonitorListener[] stdoutListeners = (ITerminalServiceOutputStreamMonitorListener[])properties.getProperty(ITerminalsConnectorConstants.PROP_STDOUT_LISTENERS);
+ ITerminalServiceOutputStreamMonitorListener[] stderrListeners = (ITerminalServiceOutputStreamMonitorListener[])properties.getProperty(ITerminalsConnectorConstants.PROP_STDERR_LISTENERS);
// Construct the terminal settings store
ISettingsStore store = new SettingsStore();

Back to the top