View | Details | Raw Unified | Return to bug 196632 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/rse/internal/subsystems/files/ftp/connectorservice/FTPConnectorService.java (-2 / +9 lines)
Lines 19-24 Link Here
19
 * Javier Montalvo Orus (Symbian) - Fixing 176216 - [api] FTP sould provide API to allow clients register their own FTPListingParser
19
 * Javier Montalvo Orus (Symbian) - Fixing 176216 - [api] FTP sould provide API to allow clients register their own FTPListingParser
20
 * Javier Montalvo Orus (Symbian) - [187531] Improve exception thrown when Login Failed on FTP
20
 * Javier Montalvo Orus (Symbian) - [187531] Improve exception thrown when Login Failed on FTP
21
 * David Dykstal (IBM) - added RESID_FTP_SETTINGS_LABEL
21
 * David Dykstal (IBM) - added RESID_FTP_SETTINGS_LABEL
22
 * David McKnight       (IBM)     - [196632] [ftp] Passive mode setting does not work
22
 ********************************************************************************/
23
 ********************************************************************************/
23
24
24
package org.eclipse.rse.internal.subsystems.files.ftp.connectorservice;
25
package org.eclipse.rse.internal.subsystems.files.ftp.connectorservice;
Lines 55-60 Link Here
55
		super(FTPSubsystemResources.RESID_FTP_CONNECTORSERVICE_NAME,FTPSubsystemResources.RESID_FTP_CONNECTORSERVICE_DESCRIPTION, host, port);
56
		super(FTPSubsystemResources.RESID_FTP_CONNECTORSERVICE_NAME,FTPSubsystemResources.RESID_FTP_CONNECTORSERVICE_DESCRIPTION, host, port);
56
		_ftpService = new FTPService();
57
		_ftpService = new FTPService();
57
			
58
			
59
		
60
	}
61
	
62
	private IPropertySet getPropertySet()
63
	{
58
		_propertySet = getPropertySet("FTP Settings"); //$NON-NLS-1$
64
		_propertySet = getPropertySet("FTP Settings"); //$NON-NLS-1$
59
		
65
		
60
		if(_propertySet==null)
66
		if(_propertySet==null)
Lines 80-86 Link Here
80
			String label = FTPSubsystemResources.RESID_FTP_SETTINGS_LABEL;
86
			String label = FTPSubsystemResources.RESID_FTP_SETTINGS_LABEL;
81
			((ILabeledObject)_propertySet).setLabel(label);
87
			((ILabeledObject)_propertySet).setLabel(label);
82
		}
88
		}
83
	} 
89
		return _propertySet;
90
	}
84
	
91
	
85
	protected void internalConnect(IProgressMonitor monitor)  throws RemoteFileException, IOException
92
	protected void internalConnect(IProgressMonitor monitor)  throws RemoteFileException, IOException
86
	{
93
	{
Lines 89-95 Link Here
89
96
90
	private void internalConnect() throws RemoteFileException, IOException
97
	private void internalConnect() throws RemoteFileException, IOException
91
	{
98
	{
92
99
		getPropertySet();
93
		SystemSignonInformation info = getSignonInformation();
100
		SystemSignonInformation info = getSignonInformation();
94
		_ftpService.setHostName(info.getHostname());
101
		_ftpService.setHostName(info.getHostname());
95
		_ftpService.setUserId(info.getUserId());
102
		_ftpService.setUserId(info.getUserId());

Return to bug 196632