mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-20 06:35:50 +02:00
[188146] Incorrect "FTP Settings" node in Property Sheet for Linux connection
This commit is contained in:
parent
11d0a26ff4
commit
7fef0e5980
1 changed files with 26 additions and 18 deletions
|
@ -15,6 +15,7 @@
|
||||||
* Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType
|
* Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType
|
||||||
* Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
|
* Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
|
||||||
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
|
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
|
||||||
|
* Javier Montalvo Orus (Symbian) - [188146] Incorrect "FTP Settings" node in Property Sheet for Linux connection
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.rse.ui.wizards;
|
package org.eclipse.rse.ui.wizards;
|
||||||
|
@ -168,21 +169,24 @@ public class SubSystemServiceWizardPage extends AbstractSystemNewConnectionWizar
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
ServiceElement el = _serviceElements[i];
|
ServiceElement el = _serviceElements[i];
|
||||||
ServiceElement[] children = el.getChildren();
|
if(el.isSelected())
|
||||||
if (children != null)
|
|
||||||
{
|
{
|
||||||
for (int c = 0; c < children.length; c++)
|
ServiceElement[] children = el.getChildren();
|
||||||
|
if (children != null)
|
||||||
{
|
{
|
||||||
ServiceElement child = children[c];
|
for (int c = 0; c < children.length; c++)
|
||||||
if (child instanceof ConnectorServiceElement)
|
|
||||||
{
|
{
|
||||||
ServiceElement[] cch = child.getChildren();
|
ServiceElement child = children[c];
|
||||||
if (cch != null && cch.length > 0)
|
if (child instanceof ConnectorServiceElement)
|
||||||
{
|
{
|
||||||
if(cch[0] instanceof ServerLauncherPropertiesServiceElement)
|
ServiceElement[] cch = child.getChildren();
|
||||||
|
if (cch != null && cch.length > 0)
|
||||||
{
|
{
|
||||||
ServerLauncherPropertiesServiceElement result = (ServerLauncherPropertiesServiceElement)cch[0];
|
if(cch[0] instanceof ServerLauncherPropertiesServiceElement)
|
||||||
results.add(result);
|
{
|
||||||
|
ServerLauncherPropertiesServiceElement result = (ServerLauncherPropertiesServiceElement)cch[0];
|
||||||
|
results.add(result);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -242,14 +246,18 @@ public class SubSystemServiceWizardPage extends AbstractSystemNewConnectionWizar
|
||||||
*/
|
*/
|
||||||
private List getConnectorServiceElements(ServiceElement root) {
|
private List getConnectorServiceElements(ServiceElement root) {
|
||||||
List result = new ArrayList(10);
|
List result = new ArrayList(10);
|
||||||
if (root instanceof ConnectorServiceElement) {
|
if(root.isSelected())
|
||||||
result.add(root);
|
{
|
||||||
}
|
if (root instanceof ConnectorServiceElement) {
|
||||||
ServiceElement[] children = root.getChildren();
|
result.add(root);
|
||||||
if (children != null) {
|
}
|
||||||
for (int i = 0; i < children.length; i++) {
|
|
||||||
ServiceElement child = children[i];
|
ServiceElement[] children = root.getChildren();
|
||||||
result.addAll(getConnectorServiceElements(child));
|
if (children != null) {
|
||||||
|
for (int i = 0; i < children.length; i++) {
|
||||||
|
ServiceElement child = children[i];
|
||||||
|
result.addAll(getConnectorServiceElements(child));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
|
|
Loading…
Add table
Reference in a new issue