Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Leherbauer2016-06-29 13:26:18 +0000
committerAnton Leherbauer2016-06-30 07:23:45 +0000
commite1989aeda2b63c0e54432a1be7a8ad4b4e383241 (patch)
tree4883aac1097303ede984b5d0a832ed215a096bdf /target_explorer/plugins/org.eclipse.tcf.te.tcf.ui
parent9f5abdf29e7e13c39b9f5447a4782a40aa04b8e5 (diff)
downloadorg.eclipse.tcf-e1989aeda2b63c0e54432a1be7a8ad4b4e383241.tar.gz
org.eclipse.tcf-e1989aeda2b63c0e54432a1be7a8ad4b4e383241.tar.xz
org.eclipse.tcf-e1989aeda2b63c0e54432a1be7a8ad4b4e383241.zip
Target Explorer: Propagate FormToolkit to child controls
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.tcf.ui')
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/controls/CustomTransportPanel.java3
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/controls/PipeTransportPanel.java3
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/TcpTransportSection.java5
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/pages/NewTargetWizardPage.java2
4 files changed, 10 insertions, 3 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/controls/CustomTransportPanel.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/controls/CustomTransportPanel.java
index 54170464c..92d6b0097 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/controls/CustomTransportPanel.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/controls/CustomTransportPanel.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2013 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2016 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
@@ -144,6 +144,7 @@ public class CustomTransportPanel extends AbstractWizardConfigurationPanel imple
setControl(panel);
customTransportNameControl = doCreateCustomTransportNameControl(getParentControl().getParentPage());
+ customTransportNameControl.setFormToolkit(toolkit);
customTransportNameControl.setupPanel(panel);
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/controls/PipeTransportPanel.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/controls/PipeTransportPanel.java
index 1cb541d94..63d71e576 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/controls/PipeTransportPanel.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/controls/PipeTransportPanel.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2014 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2016 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
@@ -143,6 +143,7 @@ public class PipeTransportPanel extends AbstractWizardConfigurationPanel impleme
setControl(panel);
pipeNameControl = doCreatePipeNameControl(getParentControl().getParentPage());
+ pipeNameControl.setFormToolkit(toolkit);
pipeNameControl.setupPanel(panel);
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/TcpTransportSection.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/TcpTransportSection.java
index 8c51dbb3b..7d4eb4a65 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/TcpTransportSection.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/TcpTransportSection.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2014 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2016 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
@@ -274,6 +274,7 @@ public class TcpTransportSection extends AbstractSection implements IDataExchang
section.setClient(client);
proxyControl = new BaseEditBrowseTextControl(null);
+ proxyControl.setFormToolkit(toolkit);
proxyControl.setParentControlIsInnerPanel(true);
proxyControl.setEditFieldLabel(Messages.TcpTransportSection_proxies_label);
proxyControl.setReadOnly(true);
@@ -283,10 +284,12 @@ public class TcpTransportSection extends AbstractSection implements IDataExchang
SWTControlUtil.setEnabled(proxyControl.getEditFieldControl(), false);
addressControl = new MyRemoteHostAddressControl();
+ addressControl.setFormToolkit(toolkit);
addressControl.setupPanel(client);
addressControl.getEditFieldControl().setFocus();
portControl = new MyRemoteHostPortControl();
+ portControl.setFormToolkit(toolkit);
portControl.setParentControlIsInnerPanel(true);
portControl.setupPanel(addressControl.getInnerPanelComposite());
portControl.setEditFieldControlText(getDefaultPort());
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/pages/NewTargetWizardPage.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/pages/NewTargetWizardPage.java
index 60c2489a6..6ea01dc96 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/pages/NewTargetWizardPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/pages/NewTargetWizardPage.java
@@ -338,6 +338,7 @@ public class NewTargetWizardPage extends AbstractValidatingWizardPage implements
createEmptySpace(client, 5, 2, toolkit);
proxyControl = new BaseEditBrowseTextControl(null);
+ proxyControl.setFormToolkit(toolkit);
proxyControl.setParentControlIsInnerPanel(false);
proxyControl.setHideBrowseButton(true);
proxyControl.setReadOnly(true);
@@ -373,6 +374,7 @@ public class NewTargetWizardPage extends AbstractValidatingWizardPage implements
// Create and add the panels
TcpTransportPanel tcpTransportPanel = new TcpTransportPanel(transportTypePanelControl);
+ transportTypePanelControl.setFormToolkit(toolkit);
transportTypePanelControl.addConfigurationPanel(ITransportTypes.TRANSPORT_TYPE_TCP, tcpTransportPanel);
transportTypePanelControl.addConfigurationPanel(ITransportTypes.TRANSPORT_TYPE_SSL, tcpTransportPanel);
transportTypePanelControl.addConfigurationPanel(ITransportTypes.TRANSPORT_TYPE_PIPE, new PipeTransportPanel(transportTypePanelControl));

Back to the top