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,6 +169,8 @@ public class SubSystemServiceWizardPage extends AbstractSystemNewConnectionWizar
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
ServiceElement el = _serviceElements[i];
|
ServiceElement el = _serviceElements[i];
|
||||||
|
if(el.isSelected())
|
||||||
|
{
|
||||||
ServiceElement[] children = el.getChildren();
|
ServiceElement[] children = el.getChildren();
|
||||||
if (children != null)
|
if (children != null)
|
||||||
{
|
{
|
||||||
|
@ -190,6 +193,7 @@ public class SubSystemServiceWizardPage extends AbstractSystemNewConnectionWizar
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return (ServerLauncherPropertiesServiceElement[])results.toArray(new ServerLauncherPropertiesServiceElement[results.size()]);
|
return (ServerLauncherPropertiesServiceElement[])results.toArray(new ServerLauncherPropertiesServiceElement[results.size()]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -242,9 +246,12 @@ 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.isSelected())
|
||||||
|
{
|
||||||
if (root instanceof ConnectorServiceElement) {
|
if (root instanceof ConnectorServiceElement) {
|
||||||
result.add(root);
|
result.add(root);
|
||||||
}
|
}
|
||||||
|
|
||||||
ServiceElement[] children = root.getChildren();
|
ServiceElement[] children = root.getChildren();
|
||||||
if (children != null) {
|
if (children != null) {
|
||||||
for (int i = 0; i < children.length; i++) {
|
for (int i = 0; i < children.length; i++) {
|
||||||
|
@ -252,6 +259,7 @@ public class SubSystemServiceWizardPage extends AbstractSystemNewConnectionWizar
|
||||||
result.addAll(getConnectorServiceElements(child));
|
result.addAll(getConnectorServiceElements(child));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue