diff options
Diffstat (limited to 'target_explorer/plugins')
8 files changed, 37 insertions, 38 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/META-INF/MANIFEST.MF index 459983b0c..c9363b42a 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/META-INF/MANIFEST.MF @@ -5,10 +5,8 @@ Bundle-SymbolicName: org.eclipse.tcf.te.tcf.terminals.ui;singleton:=true Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.tcf.te.tcf.terminals.ui.activator.UIPlugin Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", - org.eclipse.core.expressions;bundle-version="3.4.400", - org.eclipse.ui;bundle-version="3.8.0", - org.eclipse.ui.forms;bundle-version="3.5.200", +Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", + org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.tcf.te.runtime;bundle-version="1.1.0", org.eclipse.tcf.te.runtime.model;bundle-version="1.1.0", org.eclipse.tcf.te.runtime.services;bundle-version="1.1.0", @@ -18,7 +16,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.tcf.te.ui;bundle-version="1.1.0", org.eclipse.tcf.te.ui.terminals;bundle-version="1.1.0", org.eclipse.tcf.te.ui.controls;bundle-version="1.1.0", - org.eclipse.tm.terminal;bundle-version="3.2.0" + org.eclipse.tm.terminal;bundle-version="3.2.2", + org.eclipse.ui;bundle-version="3.8.0", + org.eclipse.ui.forms;bundle-version="3.5.200" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/META-INF/MANIFEST.MF index 0b96ba255..973930374 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/META-INF/MANIFEST.MF @@ -5,15 +5,15 @@ Bundle-SymbolicName: org.eclipse.tcf.te.ui.terminals.process;singleton:=true Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.tcf.te.ui.terminals.process.activator.UIPlugin Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", +Require-Bundle: org.eclipse.cdt.core;bundle-version="5.4.1", org.eclipse.core.resources;bundle-version="3.8.1";resolution:=optional, - org.eclipse.ui;bundle-version="3.8.0", - org.eclipse.cdt.core;bundle-version="5.4.1", + org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.tcf.te.runtime;bundle-version="1.1.0", org.eclipse.tcf.te.runtime.services;bundle-version="1.1.0", org.eclipse.tcf.te.ui.terminals;bundle-version="1.1.0", org.eclipse.tcf.te.ui.swt;bundle-version="1.1.0", - org.eclipse.tm.terminal;bundle-version="3.2.0" + org.eclipse.tm.terminal;bundle-version="3.2.2", + org.eclipse.ui;bundle-version="3.8.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessSettingsPage.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessSettingsPage.java index cb28ff1f3..1066944e8 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessSettingsPage.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessSettingsPage.java @@ -25,9 +25,9 @@ import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage; import org.eclipse.tcf.te.ui.swt.SWTControlUtil; import org.eclipse.tcf.te.ui.terminals.nls.Messages; +import org.eclipse.tm.internal.terminal.provisional.api.AbstractSettingsPage; import org.eclipse.ui.PlatformUI; import org.osgi.framework.Bundle; @@ -35,7 +35,7 @@ import org.osgi.framework.Bundle; * Process connector settings page implementation. */ @SuppressWarnings("restriction") -public class ProcessSettingsPage implements ISettingsPage { +public class ProcessSettingsPage extends AbstractSettingsPage { private Text processImageSelectorControl; private Button processImageSelectorControlButton; private Text processArgumentsControl; diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.serial/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.serial/META-INF/MANIFEST.MF index b1089d42d..bea74ea5e 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.serial/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.serial/META-INF/MANIFEST.MF @@ -5,19 +5,19 @@ Bundle-SymbolicName: org.eclipse.tcf.te.ui.terminals.serial;singleton:=true Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.tcf.te.ui.terminals.serial.activator.UIPlugin Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.equinox.security;bundle-version="1.1.100", +Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.core.runtime;bundle-version="3.8.0", - org.eclipse.core.expressions;bundle-version="3.4.400", - org.eclipse.ui;bundle-version="3.8.0", - org.eclipse.ui.forms;bundle-version="3.5.200", + org.eclipse.equinox.security;bundle-version="1.1.100", org.eclipse.tcf.te.runtime;bundle-version="1.1.0", org.eclipse.tcf.te.runtime.services;bundle-version="1.1.0", org.eclipse.tcf.te.ui;bundle-version="1.1.0", org.eclipse.tcf.te.ui.controls;bundle-version="1.1.0", org.eclipse.tcf.te.ui.swt;bundle-version="1.1.0", org.eclipse.tcf.te.ui.terminals;bundle-version="1.1.0", - org.eclipse.tm.terminal;bundle-version="3.2.0", - org.eclipse.tm.terminal.serial;bundle-version="2.1.100" + org.eclipse.tm.terminal;bundle-version="3.2.2", + org.eclipse.tm.terminal.serial;bundle-version="2.1.200", + org.eclipse.ui;bundle-version="3.8.0", + org.eclipse.ui.forms;bundle-version="3.5.200" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/META-INF/MANIFEST.MF index a3a46280c..33e2c02b0 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/META-INF/MANIFEST.MF @@ -5,19 +5,19 @@ Bundle-SymbolicName: org.eclipse.tcf.te.ui.terminals.ssh;singleton:=true Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.tcf.te.ui.terminals.ssh.activator.UIPlugin Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.equinox.security;bundle-version="1.1.100", +Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.core.runtime;bundle-version="3.8.0", - org.eclipse.core.expressions;bundle-version="3.4.400", - org.eclipse.ui;bundle-version="3.8.0", - org.eclipse.ui.forms;bundle-version="3.5.200", + org.eclipse.equinox.security;bundle-version="1.1.100", org.eclipse.tcf.te.runtime;bundle-version="1.1.0", org.eclipse.tcf.te.runtime.services;bundle-version="1.1.0", org.eclipse.tcf.te.ui;bundle-version="1.1.0", org.eclipse.tcf.te.ui.terminals;bundle-version="1.1.0", org.eclipse.tcf.te.ui.controls;bundle-version="1.1.0", org.eclipse.tcf.te.ui.swt;bundle-version="1.1.0", - org.eclipse.tm.terminal;bundle-version="3.2.0", - org.eclipse.tm.terminal.ssh;bundle-version="2.1.100" + org.eclipse.tm.terminal;bundle-version="3.2.2", + org.eclipse.tm.terminal.ssh;bundle-version="2.1.200", + org.eclipse.ui;bundle-version="3.8.0", + org.eclipse.ui.forms;bundle-version="3.5.200" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/META-INF/MANIFEST.MF index ff740aba3..a0e1ee7b6 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/META-INF/MANIFEST.MF @@ -5,19 +5,19 @@ Bundle-SymbolicName: org.eclipse.tcf.te.ui.terminals.telnet;singleton:=true Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.tcf.te.ui.terminals.telnet.activator.UIPlugin Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.equinox.security;bundle-version="1.1.100", +Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.core.runtime;bundle-version="3.8.0", - org.eclipse.core.expressions;bundle-version="3.4.400", - org.eclipse.ui;bundle-version="3.8.0", - org.eclipse.ui.forms;bundle-version="3.5.200", + org.eclipse.equinox.security;bundle-version="1.1.100", org.eclipse.tcf.te.runtime;bundle-version="1.1.0", org.eclipse.tcf.te.runtime.services;bundle-version="1.1.0", org.eclipse.tcf.te.ui;bundle-version="1.1.0", org.eclipse.tcf.te.ui.terminals;bundle-version="1.1.0", org.eclipse.tcf.te.ui.controls;bundle-version="1.1.0", org.eclipse.tcf.te.ui.swt;bundle-version="1.1.0", - org.eclipse.tm.terminal;bundle-version="3.2.0", - org.eclipse.tm.terminal.telnet;bundle-version="2.1.100" + org.eclipse.tm.terminal;bundle-version="3.2.2", + org.eclipse.tm.terminal.telnet;bundle-version="2.1.200", + org.eclipse.ui;bundle-version="3.8.0", + org.eclipse.ui.forms;bundle-version="3.5.200" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/META-INF/MANIFEST.MF index c7bc5156b..a871f1bfa 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/META-INF/MANIFEST.MF @@ -5,19 +5,19 @@ Bundle-SymbolicName: org.eclipse.tcf.te.ui.terminals;singleton:=true Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.tcf.te.ui.terminals.activator.UIPlugin Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", - org.eclipse.core.expressions;bundle-version="3.4.400", +Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", + org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.core.resources;bundle-version="3.8.1";resolution:=optional, - org.eclipse.ui;bundle-version="3.8.0", - org.eclipse.ui.ide;bundle-version="3.8.1", - org.eclipse.ui.forms;bundle-version="3.5.200", - org.eclipse.tm.terminal;bundle-version="3.2.0", org.eclipse.tcf.te.core;bundle-version="1.1.0", org.eclipse.tcf.te.runtime;bundle-version="1.1.0", org.eclipse.tcf.te.runtime.services;bundle-version="1.1.0", org.eclipse.tcf.te.ui;bundle-version="1.1.0", org.eclipse.tcf.te.ui.controls;bundle-version="1.1.0", - org.eclipse.tcf.te.ui.swt;bundle-version="1.1.0" + org.eclipse.tcf.te.ui.swt;bundle-version="1.1.0", + org.eclipse.tm.terminal;bundle-version="3.2.2", + org.eclipse.ui;bundle-version="3.8.0", + org.eclipse.ui.forms;bundle-version="3.5.200", + org.eclipse.ui.ide;bundle-version="3.8.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/LaunchTerminalSettingsDialog.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/LaunchTerminalSettingsDialog.java index 20a26b5c1..a493c5a7f 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/LaunchTerminalSettingsDialog.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/LaunchTerminalSettingsDialog.java @@ -426,9 +426,8 @@ public class LaunchTerminalSettingsDialog extends CustomTrayDialog { IWizardConfigurationPanel panel = this.settings.getConfigurationPanel(terminals.getText()); if(!panel.isValid()){ - String strTitle = Messages.LaunchTerminalSettingsDialog_error_title; MessageBox mb = new MessageBox(getShell(), SWT.ICON_ERROR | SWT.OK); - mb.setText(strTitle); + mb.setText(Messages.LaunchTerminalSettingsDialog_error_title); mb.setMessage(Messages.LaunchTerminalSettingsDialog_error_invalidSettings); mb.open(); return; |