Attachment 74169 Details for Bug 192724 – Patch to filter folders if fileType==FILE_TYPE_FOLDERS

[patch] Patch to filter folders if fileType==FILE_TYPE_FOLDERS

ftpFilterPatch.diff.txt (text/plain), 2.89 KB, created by Martin Oberhuber

on 2007-07-19 13:24:50 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Oberhuber

Created: 2007-07-19 13:24:50 EDT

Size: 2.89 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.services.ssh
>Index: src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java,v
>retrieving revision 1.14
>diff -u -r1.14 SftpFileService.java
>--- src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java	6 Jun 2007 10:03:33 -0000	1.14
>+++ src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java	19 Jul 2007 17:22:42 -0000
>@@ -307,7 +307,8 @@
> 			    			//don't show the trivial names
> 			    			continue;
> 			    		}
>-			    		if (filematcher.matches(fileName) || lsEntry.getAttrs().isDir()) {
>+			    		if (filematcher.matches(fileName) || (lsEntry.getAttrs().isDir() && fileType!=FILE_TYPE_FOLDERS)) {
>+							//get ALL directory names (unless looking for folders only)
> 			    			SftpHostFile node = makeHostFile(parentPath, fileName, lsEntry.getAttrs());
> 			    			if (isRightType(fileType, node)) {
> 			    				results.add(node);
>#P org.eclipse.rse.services.files.ftp
>Index: src/org/eclipse/rse/internal/services/files/ftp/FTPService.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java,v
>retrieving revision 1.24
>diff -u -r1.24 FTPService.java
>--- src/org/eclipse/rse/internal/services/files/ftp/FTPService.java	17 Jul 2007 15:53:12 -0000	1.24
>+++ src/org/eclipse/rse/internal/services/files/ftp/FTPService.java	19 Jul 2007 17:22:44 -0000
>@@ -497,26 +497,17 @@
> 				for(int i=0; i<_ftpFiles.length; i++)
> 				{
> 					FTPHostFile f = new FTPHostFile(parentPath, _ftpFiles[i]);
>-	
>-					if((filematcher.matches(f.getName()) || f.isDirectory()) && !(f.getName().equals(".") || f.getName().equals(".."))) //$NON-NLS-1$ //$NON-NLS-2$
>-					{
>-						switch(fileType)
>-						{
>-							case FILE_TYPE_FOLDERS:
>-								if(f.isDirectory())
>-								{
>-									results.add(f);	
>-								}
>-								break;
>-							case FILE_TYPE_FILES:
>-								if(f.isFile())
>-								{
>-									results.add(f);	
>-								}
>-								break;
>-							case FILE_TYPE_FILES_AND_FOLDERS:
>-								results.add(f);	
>-								break;
>+					if (isRightType(fileType,f)) {
>+						String name = f.getName();
>+						if (name.equals(".") || name.equals("..")) { //$NON-NLS-1$ //$NON-NLS-2$
>+							//Never return the default directory names
>+							continue;
>+						} else if (f.isDirectory() && fileType!=FILE_TYPE_FOLDERS) {
>+							//get ALL directory names (unless looking for folders only)
>+							results.add(f);
>+						} else if (filematcher.matches(name)) { 
>+							//filter all others by name.
>+							results.add(f);
> 						}
> 					}
> 				}

Actions: View | Diff

Attachments on bug 192724: 71596 | 74162 | 74169