Terminals: Remove unnecessary dependency to o.e.ui.forms

17 files changed, 37 insertions, 87 deletions

diff --git a/terminals/features/org.eclipse.tcf.te.terminals.feature/feature.xml b/terminals/features/org.eclipse.tcf.te.terminals.feature/feature.xml
index 05d5cef4d..216902dd4 100644
--- a/terminals/features/org.eclipse.tcf.te.terminals.feature/feature.xml
+++ b/terminals/features/org.eclipse.tcf.te.terminals.feature/feature.xml
@@ -30,7 +30,7 @@
       <import plugin="org.eclipse.tcf.te.core.terminals" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tm.terminal" version="3.3.1" 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 plugin="org.eclipse.core.variables" version="3.2.600" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.te.ui.terminals" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.te.ui.terminals.process" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.equinox.security" version="1.1.100" match="greaterOrEqual"/>
@@ -41,7 +41,6 @@
       <import feature="org.eclipse.tm.terminal.serial" version="3.7.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.tm.terminal.ssh" version="3.7.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.tm.terminal.telnet" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.variables" version="3.2.600" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/terminals/features/org.eclipse.tcf.te.terminals.rse.feature/feature.xml b/terminals/features/org.eclipse.tcf.te.terminals.rse.feature/feature.xml
index 1681e850e..43c91f160 100644
--- a/terminals/features/org.eclipse.tcf.te.terminals.rse.feature/feature.xml
+++ b/terminals/features/org.eclipse.tcf.te.terminals.rse.feature/feature.xml
@@ -30,12 +30,11 @@
       <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.core.terminals" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.te.ui.terminals" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tm.terminal" version="3.3.1" 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.tcf.te.core.terminals" version="1.3.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/terminals/plugins/org.eclipse.tcf.te.ui.terminals.local/META-INF/MANIFEST.MF b/terminals/plugins/org.eclipse.tcf.te.ui.terminals.local/META-INF/MANIFEST.MF
index d3b94a0fb..84f9ad6ac 100644
--- a/terminals/plugins/org.eclipse.tcf.te.ui.terminals.local/META-INF/MANIFEST.MF
+++ b/terminals/plugins/org.eclipse.tcf.te.ui.terminals.local/META-INF/MANIFEST.MF
@@ -16,8 +16,7 @@ Require-Bundle: org.eclipse.cdt.core;bundle-version="5.6";resolution:=optional,
  org.eclipse.tcf.te.ui.terminals;bundle-version="1.3.0",
  org.eclipse.tcf.te.ui.terminals.process;bundle-version="1.3.0",
  org.eclipse.tm.terminal;bundle-version="3.3.1",
- org.eclipse.ui;bundle-version="3.8.0",
- org.eclipse.ui.forms;bundle-version="3.5.200"
+ org.eclipse.ui;bundle-version="3.8.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/terminals/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/controls/LocalWizardConfigurationPanel.java b/terminals/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/controls/LocalWizardConfigurationPanel.java
index 9e13f0d43..63f452e9c 100644
--- a/terminals/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/controls/LocalWizardConfigurationPanel.java
+++ b/terminals/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/controls/LocalWizardConfigurationPanel.java
@@ -28,7 +28,6 @@ import org.eclipse.tcf.te.ui.terminals.panels.AbstractExtendedConfigurationPanel
 import org.eclipse.ui.ISelectionService;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.WorkbenchEncoding;
-import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.osgi.framework.Bundle;
 
 /**
@@ -48,10 +47,10 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration
     }
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.te.ui.controls.interfaces.IWizardConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite, org.eclipse.ui.forms.widgets.FormToolkit)
+	 * @see org.eclipse.tcf.te.ui.controls.interfaces.IWizardConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite)
 	 */
 	@Override
-    public void setupPanel(Composite parent, FormToolkit toolkit) {
+    public void setupPanel(Composite parent) {
     	Composite panel = new Composite(parent, SWT.NONE);
     	panel.setLayout(new GridLayout());
     	panel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
diff --git a/terminals/plugins/org.eclipse.tcf.te.ui.terminals.rse/META-INF/MANIFEST.MF b/terminals/plugins/org.eclipse.tcf.te.ui.terminals.rse/META-INF/MANIFEST.MF
index adb34a320..906a5890c 100644
--- a/terminals/plugins/org.eclipse.tcf.te.ui.terminals.rse/META-INF/MANIFEST.MF
+++ b/terminals/plugins/org.eclipse.tcf.te.ui.terminals.rse/META-INF/MANIFEST.MF
@@ -13,8 +13,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
  org.eclipse.tcf.te.core.terminals;bundle-version="1.3.0",
  org.eclipse.tcf.te.ui.terminals;bundle-version="1.3.0",
  org.eclipse.tm.terminal;bundle-version="3.3.1",
- org.eclipse.ui;bundle-version="3.8.0",
- org.eclipse.ui.forms;bundle-version="3.5.200"
+ org.eclipse.ui;bundle-version="3.8.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/terminals/plugins/org.eclipse.tcf.te.ui.terminals.serial/META-INF/MANIFEST.MF b/terminals/plugins/org.eclipse.tcf.te.ui.terminals.serial/META-INF/MANIFEST.MF
index 9969d9613..beca7769c 100644
--- a/terminals/plugins/org.eclipse.tcf.te.ui.terminals.serial/META-INF/MANIFEST.MF
+++ b/terminals/plugins/org.eclipse.tcf.te.ui.terminals.serial/META-INF/MANIFEST.MF
@@ -11,9 +11,8 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
  org.eclipse.tcf.te.core.terminals;bundle-version="1.3.0",
  org.eclipse.tcf.te.ui.terminals;bundle-version="1.3.0",
  org.eclipse.tm.terminal;bundle-version="3.3.1",
- 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"
+ org.eclipse.tm.terminal.serial;bundle-version="2.1.400",
+ org.eclipse.ui;bundle-version="3.8.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/terminals/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/controls/SerialConfigurationPanel.java b/terminals/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/controls/SerialConfigurationPanel.java
index d5aac3b96..8459fcf89 100644
--- a/terminals/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/controls/SerialConfigurationPanel.java
+++ b/terminals/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/controls/SerialConfigurationPanel.java
@@ -20,7 +20,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants;
 import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer;
 import org.eclipse.tcf.te.ui.terminals.panels.AbstractExtendedConfigurationPanel;
-import org.eclipse.ui.forms.widgets.FormToolkit;
 
 /**
  * Serial wizard configuration panel implementation.
@@ -39,10 +38,10 @@ public class SerialConfigurationPanel extends AbstractExtendedConfigurationPanel
     }
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite, org.eclipse.ui.forms.widgets.FormToolkit)
+	 * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite)
 	 */
 	@Override
-	public void setupPanel(Composite parent, FormToolkit toolkit) {
+	public void setupPanel(Composite parent) {
 		Composite panel = new Composite(parent, SWT.NONE);
 		panel.setLayout(new GridLayout());
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
@@ -52,7 +51,7 @@ public class SerialConfigurationPanel extends AbstractExtendedConfigurationPanel
 		if (isWithoutSelection()) createHostsUI(panel, true);
 
 		serialSettingsPage = new SerialLinePanel(getContainer());
-		serialSettingsPage.setupPanel(panel, toolkit);
+		serialSettingsPage.setupPanel(panel);
 
 		// Create the encoding selection combo
 		createEncodingUI(panel, true);
diff --git a/terminals/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/controls/SerialLinePanel.java b/terminals/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/controls/SerialLinePanel.java
index b5009244c..0e8feb62d 100644
--- a/terminals/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/controls/SerialLinePanel.java
+++ b/terminals/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/controls/SerialLinePanel.java
@@ -45,7 +45,6 @@ import org.eclipse.tcf.te.ui.terminals.serial.activator.UIPlugin;
 import org.eclipse.tcf.te.ui.terminals.serial.interfaces.ITraceIds;
 import org.eclipse.tcf.te.ui.terminals.serial.nls.Messages;
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.widgets.FormToolkit;
 
 /**
  * Serial line terminal launcher configuration panel implementation.
@@ -151,14 +150,13 @@ public class SerialLinePanel extends AbstractConfigurationPanel {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.te.ui.controls.interfaces.IWizardConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite, org.eclipse.ui.forms.widgets.FormToolkit)
+	 * @see org.eclipse.tcf.te.ui.controls.interfaces.IWizardConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite)
 	 */
 	@Override
-    public void setupPanel(Composite parent, FormToolkit toolkit) {
+    public void setupPanel(Composite parent) {
 		Assert.isNotNull(parent);
-		Assert.isNotNull(toolkit);
 
-		Composite panel = toolkit.createComposite(parent);
+		Composite panel = new Composite(parent, SWT.NONE);
 		GridLayout layout = new GridLayout();
 		layout.marginHeight = 0; layout.marginWidth = 0;
 		panel.setLayout(layout);
@@ -167,7 +165,7 @@ public class SerialLinePanel extends AbstractConfigurationPanel {
 
 		setControl(panel);
 
-		final Composite client = toolkit.createComposite(panel);
+		final Composite client = new Composite(parent, SWT.NONE);
 		Assert.isNotNull(client);
 		client.setLayout(new GridLayout(2, false));
 		client.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
diff --git a/terminals/plugins/org.eclipse.tcf.te.ui.terminals.ssh/META-INF/MANIFEST.MF b/terminals/plugins/org.eclipse.tcf.te.ui.terminals.ssh/META-INF/MANIFEST.MF
index d65015ab2..63f461c8f 100644
--- a/terminals/plugins/org.eclipse.tcf.te.ui.terminals.ssh/META-INF/MANIFEST.MF
+++ b/terminals/plugins/org.eclipse.tcf.te.ui.terminals.ssh/META-INF/MANIFEST.MF
@@ -11,9 +11,8 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
  org.eclipse.tcf.te.core.terminals;bundle-version="1.3.0",
  org.eclipse.tcf.te.ui.terminals;bundle-version="1.3.0",
  org.eclipse.tm.terminal;bundle-version="3.3.1",
- org.eclipse.tm.terminal.ssh;bundle-version="2.1.300",
- org.eclipse.ui;bundle-version="3.8.0",
- org.eclipse.ui.forms;bundle-version="3.5.200"
+ org.eclipse.tm.terminal.ssh;bundle-version="2.1.400",
+ org.eclipse.ui;bundle-version="3.8.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/terminals/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/controls/SshWizardConfigurationPanel.java b/terminals/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/controls/SshWizardConfigurationPanel.java
index 36f238e4d..04d525860 100644
--- a/terminals/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/controls/SshWizardConfigurationPanel.java
+++ b/terminals/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/controls/SshWizardConfigurationPanel.java
@@ -38,7 +38,6 @@ import org.eclipse.tm.internal.terminal.provisional.api.AbstractSettingsPage;
 import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage;
 import org.eclipse.tm.internal.terminal.ssh.SshConnector;
 import org.eclipse.tm.internal.terminal.ssh.SshSettings;
-import org.eclipse.ui.forms.widgets.FormToolkit;
 
 /**
  * SSH wizard configuration panel implementation.
@@ -64,10 +63,10 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
     }
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.te.ui.controls.interfaces.IWizardConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite, org.eclipse.ui.forms.widgets.FormToolkit)
+	 * @see org.eclipse.tcf.te.ui.controls.interfaces.IWizardConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite)
 	 */
 	@Override
-	public void setupPanel(Composite parent, FormToolkit toolkit) {
+	public void setupPanel(Composite parent) {
 		Composite panel = new Composite(parent, SWT.NONE);
 		panel.setLayout(new GridLayout());
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
diff --git a/terminals/plugins/org.eclipse.tcf.te.ui.terminals.telnet/META-INF/MANIFEST.MF b/terminals/plugins/org.eclipse.tcf.te.ui.terminals.telnet/META-INF/MANIFEST.MF
index 09a632d89..6c7042e33 100644
--- a/terminals/plugins/org.eclipse.tcf.te.ui.terminals.telnet/META-INF/MANIFEST.MF
+++ b/terminals/plugins/org.eclipse.tcf.te.ui.terminals.telnet/META-INF/MANIFEST.MF
@@ -11,9 +11,8 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
  org.eclipse.tcf.te.core.terminals;bundle-version="1.3.0",
  org.eclipse.tcf.te.ui.terminals;bundle-version="1.3.0",
  org.eclipse.tm.terminal;bundle-version="3.3.1",
- org.eclipse.tm.terminal.telnet;bundle-version="2.1.300",
- org.eclipse.ui;bundle-version="3.8.0",
- org.eclipse.ui.forms;bundle-version="3.5.200"
+ org.eclipse.tm.terminal.telnet;bundle-version="2.1.400",
+ org.eclipse.ui;bundle-version="3.8.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/terminals/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/controls/TelnetWizardConfigurationPanel.java b/terminals/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/controls/TelnetWizardConfigurationPanel.java
index 6a3e934e4..6d011eae7 100644
--- a/terminals/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/controls/TelnetWizardConfigurationPanel.java
+++ b/terminals/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/controls/TelnetWizardConfigurationPanel.java
@@ -27,7 +27,6 @@ import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage;
 import org.eclipse.tm.internal.terminal.telnet.NetworkPortMap;
 import org.eclipse.tm.internal.terminal.telnet.TelnetConnector;
 import org.eclipse.tm.internal.terminal.telnet.TelnetSettings;
-import org.eclipse.ui.forms.widgets.FormToolkit;
 
 /**
  * telnet wizard configuration panel implementation.
@@ -48,10 +47,10 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio
     }
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.te.ui.controls.interfaces.IWizardConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite, org.eclipse.ui.forms.widgets.FormToolkit)
+	 * @see org.eclipse.tcf.te.ui.controls.interfaces.IWizardConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite)
 	 */
 	@Override
-	public void setupPanel(Composite parent, FormToolkit toolkit) {
+	public void setupPanel(Composite parent) {
 		Composite panel = new Composite(parent, SWT.NONE);
 		panel.setLayout(new GridLayout());
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
diff --git a/terminals/plugins/org.eclipse.tcf.te.ui.terminals/META-INF/MANIFEST.MF b/terminals/plugins/org.eclipse.tcf.te.ui.terminals/META-INF/MANIFEST.MF
index ddba52fe3..c696e235b 100644
--- a/terminals/plugins/org.eclipse.tcf.te.ui.terminals/META-INF/MANIFEST.MF
+++ b/terminals/plugins/org.eclipse.tcf.te.ui.terminals/META-INF/MANIFEST.MF
@@ -10,8 +10,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
  org.eclipse.core.resources;bundle-version="3.8.1";resolution:=optional,
  org.eclipse.tcf.te.core.terminals;bundle-version="1.3.0",
  org.eclipse.tm.terminal;bundle-version="3.3.1",
- org.eclipse.ui;bundle-version="3.8.0",
- org.eclipse.ui.forms;bundle-version="3.5.200"
+ org.eclipse.ui;bundle-version="3.8.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/terminals/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/controls/ConfigurationPanelControl.java b/terminals/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/controls/ConfigurationPanelControl.java
index 118c4f12f..75de4de71 100644
--- a/terminals/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/controls/ConfigurationPanelControl.java
+++ b/terminals/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/controls/ConfigurationPanelControl.java
@@ -25,7 +25,6 @@ import org.eclipse.swt.widgets.Group;
 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.panels.AbstractConfigurationPanel;
-import org.eclipse.ui.forms.widgets.FormToolkit;
 
 /**
  * Base control to deal with wizard or property page controls
@@ -39,8 +38,6 @@ public class ConfigurationPanelControl implements IConfigurationPanelContainer,
 
 	private boolean isGroup;
 
-	private FormToolkit toolkit = null;
-
 	private Composite panel;
 	private StackLayout panelLayout;
 
@@ -64,10 +61,10 @@ public class ConfigurationPanelControl implements IConfigurationPanelContainer,
 	    }
 
 	    /* (non-Javadoc)
-	     * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite, org.eclipse.ui.forms.widgets.FormToolkit)
+	     * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite)
 	     */
         @Override
-	    public void setupPanel(Composite parent, FormToolkit toolkit) {
+	    public void setupPanel(Composite parent) {
 	    	Composite panel = new Composite(parent, SWT.NONE);
 	    	panel.setLayout(new GridLayout());
 	    	panel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
@@ -138,24 +135,6 @@ public class ConfigurationPanelControl implements IConfigurationPanelContainer,
 		return null;
 	}
 
-	/**
-	 * Sets the form toolkit to be used for creating the control widgets.
-	 *
-	 * @param toolkit The form toolkit instance or <code>null</code>.
-	 */
-	public final void setFormToolkit(FormToolkit toolkit) {
-		this.toolkit = toolkit;
-	}
-
-	/**
-	 * Returns the form toolkit used for creating the control widgets.
-	 *
-	 * @return The form toolkit instance or <code>null</code>.
-	 */
-	public final FormToolkit getFormToolkit() {
-		return toolkit;
-	}
-
 	/* (non-Javadoc)
 	 * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer#validate()
 	 */
@@ -167,13 +146,9 @@ public class ConfigurationPanelControl implements IConfigurationPanelContainer,
 	 * To be called from the embedding control to setup the controls UI elements.
 	 *
 	 * @param parent The parent control. Must not be <code>null</code>!
-	 * @param toolkit The form toolkit. Must not be <code>null</code>.
 	 */
-	public void setupPanel(Composite parent, String[] configurationPanelKeys, FormToolkit toolkit) {
+	public void setupPanel(Composite parent, String[] configurationPanelKeys) {
 		Assert.isNotNull(parent);
-		Assert.isNotNull(toolkit);
-
-		setFormToolkit(toolkit);
 
 		if (isPanelIsGroup()) {
 			panel = new Group(parent, SWT.NONE);
@@ -188,8 +163,8 @@ public class ConfigurationPanelControl implements IConfigurationPanelContainer,
 		panelLayout = new StackLayout();
 		panel.setLayout(panelLayout);
 
-		setupConfigurationPanels(panel, configurationPanelKeys, toolkit);
-		EMPTY_PANEL.setupPanel(panel, toolkit);
+		setupConfigurationPanels(panel, configurationPanelKeys);
+		EMPTY_PANEL.setupPanel(panel);
 	}
 
 	/**
@@ -255,17 +230,15 @@ public class ConfigurationPanelControl implements IConfigurationPanelContainer,
 	 *
 	 * @param parent The parent composite to use for the configuration panels. Must not be <code>null</code>!
 	 * @param configurationPanelKeys The list of configuration panels to initialize. Might be <code>null</code> or empty!
-	 * @param toolkit The form toolkit. Must not be <code>null</code>.
 	 */
-	public void setupConfigurationPanels(Composite parent, String[] configurationPanelKeys, FormToolkit toolkit) {
+	public void setupConfigurationPanels(Composite parent, String[] configurationPanelKeys) {
 		Assert.isNotNull(parent);
-		Assert.isNotNull(toolkit);
 
 		if (configurationPanelKeys != null) {
 			for (int i = 0; i < configurationPanelKeys.length; i++) {
 				IConfigurationPanel configPanel = getConfigurationPanel(configurationPanelKeys[i]);
 				Assert.isNotNull(configPanel);
-				configPanel.setupPanel(parent, toolkit);
+				configPanel.setupPanel(parent);
 			}
 		}
 	}
diff --git a/terminals/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/IConfigurationPanel.java b/terminals/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/IConfigurationPanel.java
index 60eb8d0d3..a39ad7ade 100644
--- a/terminals/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/IConfigurationPanel.java
+++ b/terminals/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/IConfigurationPanel.java
@@ -15,7 +15,6 @@ import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
 
 /**
  * Terminal launcher configuration panel.
@@ -37,9 +36,8 @@ public interface IConfigurationPanel extends IMessageProvider {
 	 * different panels if the selected terminal launcher changed.
 	 *
 	 * @param parent The parent composite to create the UI elements in. Must not be <code>null</code>.
-	 * @param toolkit The form toolkit. Must not be <code>null</code>.
 	 */
-	public void setupPanel(Composite parent, FormToolkit toolkit);
+	public void setupPanel(Composite parent);
 
 	/**
 	 * Cleanup all resources the wizard configuration panel might have been created.
diff --git a/terminals/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/EncodingSelectionDialog.java b/terminals/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/EncodingSelectionDialog.java
index 628d8902e..dc49648bd 100644
--- a/terminals/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/EncodingSelectionDialog.java
+++ b/terminals/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/EncodingSelectionDialog.java
@@ -23,7 +23,6 @@ import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer;
 import org.eclipse.tcf.te.ui.terminals.nls.Messages;
 import org.eclipse.tcf.te.ui.terminals.panels.AbstractExtendedConfigurationPanel;
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.widgets.FormToolkit;
 
 /**
  * Encoding selection dialog implementation.
@@ -52,10 +51,10 @@ public class EncodingSelectionDialog extends TrayDialog {
         }
 
 		/* (non-Javadoc)
-		 * @see org.eclipse.tcf.te.ui.controls.interfaces.IWizardConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite, org.eclipse.ui.forms.widgets.FormToolkit)
+		 * @see org.eclipse.tcf.te.ui.controls.interfaces.IWizardConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite)
 		 */
         @Override
-        public void setupPanel(Composite parent, FormToolkit toolkit) {
+        public void setupPanel(Composite parent) {
     		Composite panel = new Composite(parent, SWT.NONE);
     		panel.setLayout(new GridLayout());
     		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
@@ -179,7 +178,7 @@ public class EncodingSelectionDialog extends TrayDialog {
         panel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
 
         encodingPanel = new EncodingPanel(null);
-        encodingPanel.setupPanel(panel, null);
+        encodingPanel.setupPanel(panel);
 
         applyDialogFont(panel);
     }
diff --git a/terminals/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/LaunchTerminalSettingsDialog.java b/terminals/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/LaunchTerminalSettingsDialog.java
index e265264d6..cc9ae1b8f 100644
--- a/terminals/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/LaunchTerminalSettingsDialog.java
+++ b/terminals/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/LaunchTerminalSettingsDialog.java
@@ -46,7 +46,6 @@ import org.eclipse.tcf.te.ui.terminals.interfaces.tracing.ITraceIds;
 import org.eclipse.tcf.te.ui.terminals.launcher.LauncherDelegateManager;
 import org.eclipse.tcf.te.ui.terminals.nls.Messages;
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.widgets.FormToolkit;
 
 /**
  * Launch terminal settings dialog implementation.
@@ -61,8 +60,6 @@ public class LaunchTerminalSettingsDialog extends TrayDialog {
 	/* default */ Combo terminals;
 	/* default */ SettingsPanelControl settings;
 
-	private FormToolkit toolkit = null;
-
 	// Map the label added to the combo box to the corresponding launcher delegate.
 	/* default */ final Map<String, ILauncherDelegate> label2delegate = new HashMap<String, ILauncherDelegate>();
 
@@ -111,7 +108,7 @@ public class LaunchTerminalSettingsDialog extends TrayDialog {
                 	// Push the selection to the configuration panel
                 	configPanel.setSelection(getSelection());
                 	// Create the panel controls
-                	configPanel.setupPanel(getPanel(), getFormToolkit());
+                	configPanel.setupPanel(getPanel());
                 	// Restore widget values
                 	IDialogSettings dialogSettings = LaunchTerminalSettingsDialog.this.settings.getDialogSettings(LaunchTerminalSettingsDialog.this.getDialogSettings());
                 	IDialogSettings configPanelSettings = dialogSettings != null ? dialogSettings.getSection(key) : null;
@@ -189,7 +186,6 @@ public class LaunchTerminalSettingsDialog extends TrayDialog {
      */
     protected void dispose() {
     	if (settings != null) { settings.dispose(); settings = null; }
-    	if (toolkit != null) { toolkit.dispose(); toolkit = null; }
     	dialogSettings = null;
     }
 
@@ -342,10 +338,8 @@ public class LaunchTerminalSettingsDialog extends TrayDialog {
        		}
         }
 
-        // Create the toolkit
-        toolkit = new FormToolkit(panel.getDisplay());
 		// Setup the panel control
-		settings.setupPanel(panel, terminals.getItems(), toolkit);
+		settings.setupPanel(panel, terminals.getItems());
 		GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
 		layoutData.horizontalSpan = 2;
 		settings.getPanel().setLayoutData(layoutData);