Attachment 75066 Details for Bug 196632 – updated patch

[patch] updated patch

patch.txt (text/plain), 3.96 KB, created by David McKnight

on 2007-07-31 14:01:37 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2007-07-31 14:01:37 EDT

Size: 3.96 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.subsystems.files.ftp
>Index: src/org/eclipse/rse/internal/subsystems/files/ftp/connectorservice/FTPConnectorService.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/connectorservice/FTPConnectorService.java,v
>retrieving revision 1.15
>diff -u -r1.15 FTPConnectorService.java
>--- src/org/eclipse/rse/internal/subsystems/files/ftp/connectorservice/FTPConnectorService.java	31 May 2007 14:16:51 -0000	1.15
>+++ src/org/eclipse/rse/internal/subsystems/files/ftp/connectorservice/FTPConnectorService.java	31 Jul 2007 18:02:04 -0000
>@@ -19,6 +19,7 @@
>  * Javier Montalvo Orus (Symbian) - Fixing 176216 - [api] FTP sould provide API to allow clients register their own FTPListingParser
>  * Javier Montalvo Orus (Symbian) - [187531] Improve exception thrown when Login Failed on FTP
>  * David Dykstal (IBM) - added RESID_FTP_SETTINGS_LABEL
>+ * David McKnight       (IBM)     - [196632] [ftp] Passive mode setting does not work
>  ********************************************************************************/
> 
> package org.eclipse.rse.internal.subsystems.files.ftp.connectorservice;
>@@ -48,21 +49,25 @@
> public class FTPConnectorService extends StandardConnectorService 
> {
> 	protected FTPService _ftpService;
>-	private IPropertySet _propertySet;
>+	//private IPropertySet _propertySet;
> 	
> 	public FTPConnectorService(IHost host, int port)
> 	{		
> 		super(FTPSubsystemResources.RESID_FTP_CONNECTORSERVICE_NAME,FTPSubsystemResources.RESID_FTP_CONNECTORSERVICE_DESCRIPTION, host, port);
> 		_ftpService = new FTPService();
>-			
>-		_propertySet = getPropertySet("FTP Settings"); //$NON-NLS-1$
>+		getPropertySet();
>+	}
>+	
>+	private IPropertySet getPropertySet()
>+	{
>+		IPropertySet propertySet = getPropertySet("FTP Settings"); //$NON-NLS-1$
> 		
>-		if(_propertySet==null)
>+		if(propertySet==null)
> 		{
> 			
> 			//Active - passive mode
>-			_propertySet = createPropertySet("FTP Settings"); //$NON-NLS-1$
>-			_propertySet.addProperty("passive","false",PropertyType.getEnumPropertyType(new String[]{"true","false"})); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
>+			propertySet = createPropertySet("FTP Settings"); //$NON-NLS-1$
>+			propertySet.addProperty("passive","false",PropertyType.getEnumPropertyType(new String[]{"true","false"})); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
> 			
> 			// FTP List parser
> 			String[] keys = FTPClientConfigFactory.getParserFactory().getKeySet();
>@@ -74,13 +79,14 @@
> 			
> 			Arrays.sort(keysArray);
> 			
>-			_propertySet.addProperty("parser","AUTO",PropertyType.getEnumPropertyType(keysArray)); //$NON-NLS-1$ //$NON-NLS-2$
>+			propertySet.addProperty("parser","AUTO",PropertyType.getEnumPropertyType(keysArray)); //$NON-NLS-1$ //$NON-NLS-2$
> 		}
>-		if (_propertySet instanceof ILabeledObject) {
>+		if (propertySet instanceof ILabeledObject) {
> 			String label = FTPSubsystemResources.RESID_FTP_SETTINGS_LABEL;
>-			((ILabeledObject)_propertySet).setLabel(label);
>+			((ILabeledObject)propertySet).setLabel(label);
> 		}
>-	} 
>+		return propertySet;
>+	}
> 	
> 	protected void internalConnect(IProgressMonitor monitor)  throws RemoteFileException, IOException
> 	{
>@@ -89,14 +95,14 @@
> 
> 	private void internalConnect() throws RemoteFileException, IOException
> 	{
>-
>+		IPropertySet propertySet = getPropertySet();
> 		SystemSignonInformation info = getSignonInformation();
> 		_ftpService.setHostName(info.getHostname());
> 		_ftpService.setUserId(info.getUserId());
> 		_ftpService.setPassword(info.getPassword());
> 		_ftpService.setPortNumber(getPort());
> 		_ftpService.setLoggingStream(getLoggingStream(info.getHostname(),getPort()));
>-		_ftpService.setPropertySet(_propertySet);
>+		_ftpService.setPropertySet(propertySet);
> 		_ftpService.setFTPClientConfigFactory(FTPClientConfigFactory.getParserFactory());
> 		
>

Actions: View | Diff

Attachments on bug 196632: 75052 | 75066 | 75077