mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-02 21:23:37 +02:00
Code Issues Wiki Activity

[204307] listFolders now deals with a null parameter for fileNameFilter preventing NPE

Browse source
This commit is contained in:
David McKnight 2007-10-26 19:13:43 +00:00
parent 1fb22d2108
commit 256b6765a2
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java
View file

@ -19,6 +19,7 @@
* Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes * Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
* David McKnight (IBM) - [196664] prevent unnecessary query on the parent * David McKnight (IBM) - [196664] prevent unnecessary query on the parent
* Rupen Mardirossian (IBM) - [204307] listFolders now deals with a null parameter for fileNameFilter preventing NPE
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.subsystems.files.core.subsystems; package org.eclipse.rse.subsystems.files.core.subsystems;
@ -878,18 +879,19 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
/** /**
* Return a full list of remote folders in the given parent folder on the remote system. * Return a full list of remote folders in the given parent folder on the remote system.
* @param parent The parent folder to list folders in * @param parent The parent folder to list folders in
* @param fileNameFilter The name pattern for subsetting the file list when this folder is subsequently expanded * @param fileNameFilter The name pattern for subsetting the file list when this folder is subsequently expanded, or null to return all folders.
*/ */
public IRemoteFile[] listFolders(IRemoteFile parent, String fileNameFilter, IProgressMonitor monitor) throws SystemMessageException public IRemoteFile[] listFolders(IRemoteFile parent, String fileNameFilter, IProgressMonitor monitor) throws SystemMessageException
{ {
fileNameFilter = (fileNameFilter == null) ? "*" : fileNameFilter; //$NON-NLS-1$
RemoteFileFilterString filterString = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration()); RemoteFileFilterString filterString = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration());
filterString.setPath(parent.getAbsolutePath()); filterString.setPath(parent.getAbsolutePath());
filterString.setFile((fileNameFilter == null) ? "*" : fileNameFilter); //$NON-NLS-1$ filterString.setFile(fileNameFilter);
filterString.setShowFiles(false); filterString.setShowFiles(false);
filterString.setShowSubDirs(true); filterString.setShowSubDirs(true);
RemoteFileContext context = new RemoteFileContext(this, parent, filterString); RemoteFileContext context = new RemoteFileContext(this, parent, filterString);
//return listFolders(parent, fileNameFilter, context); //return listFolders(parent, fileNameFilter, context);
return listFolders(parent, null, context, monitor); return listFolders(parent, fileNameFilter, context, monitor);
} }