diff options
author | Uwe Stieber | 2015-02-16 10:03:04 +0000 |
---|---|---|
committer | Uwe Stieber | 2015-02-16 10:03:04 +0000 |
commit | c41b7b8179f75c0e09474e2d8bcfa0e8f5766640 (patch) | |
tree | 024aa7032dd8ac61f95a5d09852fe85ab30200ff | |
parent | 98a6719eacd34bfc8a75e9b3c0945dcf35b8ba08 (diff) | |
download | org.eclipse.tcf-tm_terminal_4.0_adaption.tar.gz org.eclipse.tcf-tm_terminal_4.0_adaption.tar.xz org.eclipse.tcf-tm_terminal_4.0_adaption.zip |
Terminals: Adopt TM 4.0 API changestm_terminal_4.0_adaption
14 files changed, 42 insertions, 42 deletions
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFConsole.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFConsole.java index fa12f903a..4b1eecdd7 100644 --- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFConsole.java +++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFConsole.java @@ -32,7 +32,7 @@ import org.eclipse.tm.internal.terminal.control.ITerminalListener; import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; import org.eclipse.tm.internal.terminal.control.TerminalViewControlFactory; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.tm.internal.terminal.provisional.api.ISettings; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; @@ -216,7 +216,7 @@ class TCFConsole extends AbstractConsole { } @Override - public void save(ISettingsStore store) { + public void save(ISettings store) { } @Override @@ -225,7 +225,7 @@ class TCFConsole extends AbstractConsole { } @Override - public void load(ISettingsStore store) { + public void load(ISettings store) { } @Override diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/connector/TerminalsConnector.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/connector/TerminalsConnector.java index 1c3708a84..fc86dc75c 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/connector/TerminalsConnector.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/connector/TerminalsConnector.java @@ -16,7 +16,7 @@ import org.eclipse.tcf.services.ITerminals; import org.eclipse.tcf.te.runtime.interfaces.IDisposable; import org.eclipse.tcf.te.tcf.terminals.core.launcher.TerminalsLauncher; import org.eclipse.tcf.te.ui.terminals.streams.AbstractStreamsConnector; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.tm.internal.terminal.provisional.api.ISettings; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; @@ -136,7 +136,7 @@ public class TerminalsConnector extends AbstractStreamsConnector implements IDis * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#load(org.eclipse.tcf.internal.terminal.provisional.api.ISettingsStore) */ @Override - public void load(ISettingsStore store) { + public void load(ISettings store) { settings.load(store); } @@ -144,7 +144,7 @@ public class TerminalsConnector extends AbstractStreamsConnector implements IDis * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#save(org.eclipse.tcf.internal.terminal.provisional.api.ISettingsStore) */ @Override - public void save(ISettingsStore store) { + public void save(ISettings store) { settings.save(store); } } diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/connector/TerminalsSettings.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/connector/TerminalsSettings.java index 6c7ee4e90..b2cadc15c 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/connector/TerminalsSettings.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/connector/TerminalsSettings.java @@ -14,7 +14,7 @@ import java.io.OutputStream; import org.eclipse.core.runtime.Assert; import org.eclipse.tcf.te.tcf.terminals.core.interfaces.launcher.ITerminalsLauncher; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.tm.internal.terminal.provisional.api.ISettings; /** * Terminals connector settings implementation. @@ -148,7 +148,7 @@ public class TerminalsSettings { * * @param store The settings store. Must not be <code>null</code>. */ - public void load(ISettingsStore store) { + public void load(ISettings store) { Assert.isNotNull(store); localEcho = store.getBooleanProperty("LocalEcho"); //$NON-NLS-1$ lineSeparator = store.getStringProperty("LineSeparator"); //$NON-NLS-1$ @@ -163,7 +163,7 @@ public class TerminalsSettings { * * @param store The settings store. Must not be <code>null</code>. */ - public void save(ISettingsStore store) { + public void save(ISettings store) { Assert.isNotNull(store); store.setProperty("LocalEcho", localEcho); //$NON-NLS-1$ store.setProperty("LineSeparator", lineSeparator); //$NON-NLS-1$ diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/launcher/TerminalsLauncherDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/launcher/TerminalsLauncherDelegate.java index a1bcbf6e3..ce54f1bd1 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/launcher/TerminalsLauncherDelegate.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/launcher/TerminalsLauncherDelegate.java @@ -34,9 +34,9 @@ import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel; import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer; import org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler; import org.eclipse.tcf.te.ui.terminals.launcher.AbstractLauncherDelegate; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.tm.internal.terminal.provisional.api.ISettings; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; -import org.eclipse.tm.internal.terminal.provisional.api.SettingsStore; +import org.eclipse.tm.internal.terminal.provisional.api.Settings; import org.eclipse.tm.internal.terminal.provisional.api.TerminalConnectorExtension; /** @@ -136,7 +136,7 @@ public class TerminalsLauncherDelegate extends AbstractLauncherDelegate { ITerminalsLauncher launcher = (ITerminalsLauncher)properties.get(ITerminalsConnectorConstants.PROP_DATA); // Construct the terminal settings store - ISettingsStore store = new SettingsStore(); + ISettings store = new Settings(); // Construct the terminals settings TerminalsSettings terminalsSettings = new TerminalsSettings(); diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/launcher/LocalLauncherDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/launcher/LocalLauncherDelegate.java index fad02da55..c6a229bce 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/launcher/LocalLauncherDelegate.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/launcher/LocalLauncherDelegate.java @@ -43,9 +43,9 @@ import org.eclipse.tcf.te.ui.terminals.local.activator.UIPlugin; import org.eclipse.tcf.te.ui.terminals.local.controls.LocalWizardConfigurationPanel; import org.eclipse.tcf.te.ui.terminals.local.showin.interfaces.IPreferenceKeys; import org.eclipse.tcf.te.ui.terminals.process.ProcessSettings; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.tm.internal.terminal.provisional.api.ISettings; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; -import org.eclipse.tm.internal.terminal.provisional.api.SettingsStore; +import org.eclipse.tm.internal.terminal.provisional.api.Settings; import org.eclipse.tm.internal.terminal.provisional.api.TerminalConnectorExtension; import org.eclipse.ui.ISelectionService; import org.eclipse.ui.PlatformUI; @@ -337,7 +337,7 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate { Assert.isTrue(image != null || process != null); // Construct the terminal settings store - ISettingsStore store = new SettingsStore(); + ISettings store = new Settings(); // Construct the process settings ProcessSettings processSettings = new ProcessSettings(); diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessConnector.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessConnector.java index 9a8c8fba1..167944b9f 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessConnector.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessConnector.java @@ -31,7 +31,7 @@ import org.eclipse.tcf.te.ui.terminals.streams.AbstractStreamsConnector; import org.eclipse.tm.internal.terminal.emulator.VT100Emulator; import org.eclipse.tm.internal.terminal.emulator.VT100TerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.tm.internal.terminal.provisional.api.ISettings; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; @@ -272,7 +272,7 @@ public class ProcessConnector extends AbstractStreamsConnector { * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#load(org.eclipse.tcf.internal.terminal.provisional.api.ISettingsStore) */ @Override - public void load(ISettingsStore store) { + public void load(ISettings store) { settings.load(store); } @@ -280,7 +280,7 @@ public class ProcessConnector extends AbstractStreamsConnector { * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#save(org.eclipse.tcf.internal.terminal.provisional.api.ISettingsStore) */ @Override - public void save(ISettingsStore store) { + public void save(ISettings store) { settings.save(store); } diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessLauncherDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessLauncherDelegate.java index ef5796421..47b373714 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessLauncherDelegate.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessLauncherDelegate.java @@ -21,9 +21,9 @@ import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnecto import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel; import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer; import org.eclipse.tcf.te.ui.terminals.launcher.AbstractLauncherDelegate; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.tm.internal.terminal.provisional.api.ISettings; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; -import org.eclipse.tm.internal.terminal.provisional.api.SettingsStore; +import org.eclipse.tm.internal.terminal.provisional.api.Settings; import org.eclipse.tm.internal.terminal.provisional.api.TerminalConnectorExtension; /** @@ -96,7 +96,7 @@ public class ProcessLauncherDelegate extends AbstractLauncherDelegate { Assert.isTrue(image != null || process != null); // Construct the terminal settings store - ISettingsStore store = new SettingsStore(); + ISettings store = new Settings(); // Construct the process settings ProcessSettings processSettings = new ProcessSettings(); 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 6be8344f1..7e43af514 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.core.terminals.interfaces.ITerminalServiceOutputStreamMonitorListener; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.tm.internal.terminal.provisional.api.ISettings; /** * Process connector settings implementation. @@ -257,7 +257,7 @@ public class ProcessSettings { * * @param store The settings store. Must not be <code>null</code>. */ - public void load(ISettingsStore store) { + public void load(ISettings store) { Assert.isNotNull(store); image = store.getStringProperty("Path");//$NON-NLS-1$ arguments = store.getStringProperty("Arguments"); //$NON-NLS-1$ @@ -277,7 +277,7 @@ public class ProcessSettings { * * @param store The settings store. Must not be <code>null</code>. */ - public void save(ISettingsStore store) { + public void save(ISettings store) { Assert.isNotNull(store); store.setProperty("Path", image);//$NON-NLS-1$ store.setProperty("Arguments", arguments); //$NON-NLS-1$ diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/launcher/SerialLauncherDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/launcher/SerialLauncherDelegate.java index 29a051b62..12129f804 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/launcher/SerialLauncherDelegate.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/launcher/SerialLauncherDelegate.java @@ -25,9 +25,9 @@ import org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler; import org.eclipse.tcf.te.ui.terminals.launcher.AbstractLauncherDelegate; import org.eclipse.tcf.te.ui.terminals.serial.controls.SerialConfigurationPanel; import org.eclipse.tcf.te.ui.terminals.serial.nls.Messages; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.tm.internal.terminal.provisional.api.ISettings; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; -import org.eclipse.tm.internal.terminal.provisional.api.SettingsStore; +import org.eclipse.tm.internal.terminal.provisional.api.Settings; import org.eclipse.tm.internal.terminal.provisional.api.TerminalConnectorExtension; import org.eclipse.tm.internal.terminal.serial.SerialSettings; @@ -131,7 +131,7 @@ public class SerialLauncherDelegate extends AbstractLauncherDelegate { String flowcontrol = (String)properties.get(ITerminalsConnectorConstants.PROP_SERIAL_FLOW_CONTROL); // Construct the terminal settings store - ISettingsStore store = new SettingsStore(); + ISettings store = new Settings(); // Construct the serial settings SerialSettings serialSettings = new SerialSettings(); diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/launcher/SshLauncherDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/launcher/SshLauncherDelegate.java index c294ef381..7d6d903b5 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/launcher/SshLauncherDelegate.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/launcher/SshLauncherDelegate.java @@ -26,9 +26,9 @@ import org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler; import org.eclipse.tcf.te.ui.terminals.launcher.AbstractLauncherDelegate; import org.eclipse.tcf.te.ui.terminals.ssh.controls.SshWizardConfigurationPanel; import org.eclipse.tcf.te.ui.terminals.ssh.nls.Messages; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.tm.internal.terminal.provisional.api.ISettings; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; -import org.eclipse.tm.internal.terminal.provisional.api.SettingsStore; +import org.eclipse.tm.internal.terminal.provisional.api.Settings; import org.eclipse.tm.internal.terminal.provisional.api.TerminalConnectorExtension; import org.eclipse.tm.internal.terminal.ssh.SshSettings; @@ -150,7 +150,7 @@ public class SshLauncherDelegate extends AbstractLauncherDelegate { port = Integer.toString(Integer.decode(port).intValue() + portOffset); // Construct the ssh settings store - ISettingsStore store = new SettingsStore(); + ISettings store = new Settings(); // Construct the telnet settings SshSettings sshSettings = new SshSettings(); diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/launcher/TelnetLauncherDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/launcher/TelnetLauncherDelegate.java index dceec53fc..946cacfa4 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/launcher/TelnetLauncherDelegate.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/launcher/TelnetLauncherDelegate.java @@ -26,9 +26,9 @@ import org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler; import org.eclipse.tcf.te.ui.terminals.launcher.AbstractLauncherDelegate; import org.eclipse.tcf.te.ui.terminals.telnet.controls.TelnetWizardConfigurationPanel; import org.eclipse.tcf.te.ui.terminals.telnet.nls.Messages; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.tm.internal.terminal.provisional.api.ISettings; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; -import org.eclipse.tm.internal.terminal.provisional.api.SettingsStore; +import org.eclipse.tm.internal.terminal.provisional.api.Settings; import org.eclipse.tm.internal.terminal.provisional.api.TerminalConnectorExtension; import org.eclipse.tm.internal.terminal.telnet.TelnetSettings; @@ -145,7 +145,7 @@ public class TelnetLauncherDelegate extends AbstractLauncherDelegate { port = Integer.toString(Integer.decode(port).intValue() + portOffset); // Construct the terminal settings store - ISettingsStore store = new SettingsStore(); + ISettings store = new Settings(); // Construct the telnet settings TelnetSettings telnetSettings = new TelnetSettings(); diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsConnector.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsConnector.java index b9780be51..268a43c12 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsConnector.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsConnector.java @@ -10,7 +10,7 @@ package org.eclipse.tcf.te.ui.terminals.streams; import org.eclipse.core.runtime.Assert; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.tm.internal.terminal.provisional.api.ISettings; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; import org.eclipse.ui.services.IDisposable; @@ -103,7 +103,7 @@ public class StreamsConnector extends AbstractStreamsConnector implements IDispo * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#load(org.eclipse.tcf.internal.terminal.provisional.api.ISettingsStore) */ @Override - public void load(ISettingsStore store) { + public void load(ISettings store) { settings.load(store); } @@ -111,7 +111,7 @@ public class StreamsConnector extends AbstractStreamsConnector implements IDispo * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#save(org.eclipse.tcf.internal.terminal.provisional.api.ISettingsStore) */ @Override - public void save(ISettingsStore store) { + public void save(ISettings store) { settings.save(store); } } diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsLauncherDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsLauncherDelegate.java index 038c34b4c..df83c4639 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsLauncherDelegate.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsLauncherDelegate.java @@ -22,9 +22,9 @@ import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnecto import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel; import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer; import org.eclipse.tcf.te.ui.terminals.launcher.AbstractLauncherDelegate; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.tm.internal.terminal.provisional.api.ISettings; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; -import org.eclipse.tm.internal.terminal.provisional.api.SettingsStore; +import org.eclipse.tm.internal.terminal.provisional.api.Settings; import org.eclipse.tm.internal.terminal.provisional.api.TerminalConnectorExtension; /** @@ -86,7 +86,7 @@ public class StreamsLauncherDelegate extends AbstractLauncherDelegate { ITerminalServiceOutputStreamMonitorListener[] stderrListeners = (ITerminalServiceOutputStreamMonitorListener[])properties.get(ITerminalsConnectorConstants.PROP_STDERR_LISTENERS); // Construct the terminal settings store - ISettingsStore store = new SettingsStore(); + ISettings store = new Settings(); // Construct the streams settings StreamsSettings streamsSettings = new StreamsSettings(); 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 f94083a50..ba9af0e71 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,7 +14,7 @@ import java.io.OutputStream; import org.eclipse.core.runtime.Assert; import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalServiceOutputStreamMonitorListener; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.tm.internal.terminal.provisional.api.ISettings; /** * Streams connector settings implementation. @@ -168,7 +168,7 @@ public class StreamsSettings { * * @param store The settings store. Must not be <code>null</code>. */ - public void load(ISettingsStore store) { + public void load(ISettings store) { Assert.isNotNull(store); localEcho = store.getBooleanProperty("LocalEcho"); //$NON-NLS-1$ lineSeparator = store.getStringProperty("LineSeparator"); //$NON-NLS-1$ @@ -184,7 +184,7 @@ public class StreamsSettings { * * @param store The settings store. Must not be <code>null</code>. */ - public void save(ISettingsStore store) { + public void save(ISettings store) { Assert.isNotNull(store); store.setProperty("LocalEcho", localEcho); //$NON-NLS-1$ store.setProperty("LineSeparator", lineSeparator); //$NON-NLS-1$ |