mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-09 01:55:24 +02:00
Code Issues Wiki Activity

Bug 160397 - get filtering by file type to work properly in the local and dstore subsystems.

Browse source
This commit is contained in:
David Dykstal 2006-10-27 01:48:46 +00:00
parent 2cf0186dbd
commit edd4669f53
2 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/files/LocalFileService.java
View file

@ -32,6 +32,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.rse.services.clientserver.FileTypeMatcher;
import org.eclipse.rse.services.clientserver.IMatcher;
import org.eclipse.rse.services.clientserver.ISystemFileTypes; import org.eclipse.rse.services.clientserver.ISystemFileTypes;
import org.eclipse.rse.services.clientserver.NamePatternMatcher; import org.eclipse.rse.services.clientserver.NamePatternMatcher;
import org.eclipse.rse.services.clientserver.SystemEncodingUtil; import org.eclipse.rse.services.clientserver.SystemEncodingUtil;
@ -123,10 +125,15 @@ public class LocalFileService extends AbstractFileService implements IFileServic
public class LocalFileNameFilter implements FilenameFilter public class LocalFileNameFilter implements FilenameFilter
{ {
private NamePatternMatcher _matcher; private IMatcher _matcher;
public LocalFileNameFilter(String filter) public LocalFileNameFilter(String filter)
{ {
_matcher = new NamePatternMatcher(filter); if (filter.endsWith(",")) {
String[] types = filter.split(",");
_matcher = new FileTypeMatcher(types);
} else {
_matcher = new NamePatternMatcher(filter);
}
} }
public boolean accept(File dir, String name) public boolean accept(File dir, String name)
{ {
@ -134,7 +141,12 @@ public class LocalFileService extends AbstractFileService implements IFileServic
} }
public boolean isGeneric() public boolean isGeneric()
{ {
return _matcher.isGeneric(); boolean result = true;
if (_matcher instanceof NamePatternMatcher) {
NamePatternMatcher new_name = (NamePatternMatcher) _matcher;
result = new_name.isGeneric();
}
return result;
} }
} }

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

@ -894,9 +894,10 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
*/ */
public IRemoteFile[] listFiles(IRemoteFile parent, String fileNameFilter, IProgressMonitor monitor) throws SystemMessageException public IRemoteFile[] listFiles(IRemoteFile parent, String fileNameFilter, IProgressMonitor monitor) throws SystemMessageException
{ {
RemoteFileFilterString filterString = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration()); fileNameFilter = (fileNameFilter == null) ? "*" : fileNameFilter;
filterString.setPath(parent.getAbsolutePath()); String parentPath = parent.getAbsolutePath();
filterString.setFile((fileNameFilter == null) ? "*" : fileNameFilter); IRemoteFileSubSystemConfiguration config = getParentRemoteFileSubSystemConfiguration();
RemoteFileFilterString filterString = new RemoteFileFilterString(config, parentPath, fileNameFilter);
filterString.setShowFiles(true); filterString.setShowFiles(true);
filterString.setShowSubDirs(false); filterString.setShowSubDirs(false);
RemoteFileContext context = new RemoteFileContext(this, parent, filterString); RemoteFileContext context = new RemoteFileContext(this, parent, filterString);
@ -923,13 +924,10 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
*/ */
public IRemoteFile[] listFoldersAndFiles(IRemoteFile parent, String fileNameFilter, IProgressMonitor monitor) throws SystemMessageException public IRemoteFile[] listFoldersAndFiles(IRemoteFile parent, String fileNameFilter, IProgressMonitor monitor) throws SystemMessageException
{ {
String path = parent.getAbsolutePath();
fileNameFilter = (fileNameFilter == null) ? "*" : fileNameFilter;
RemoteFileFilterString filterString = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration()); IRemoteFileSubSystemConfiguration config = getParentRemoteFileSubSystemConfiguration();
filterString.setPath(parent.getAbsolutePath()); RemoteFileFilterString filterString = new RemoteFileFilterString(config, path, fileNameFilter);
if (fileNameFilter == null)
fileNameFilter = "*"; //$NON-NLS-1$
filterString.setFile(fileNameFilter);
filterString.setShowFiles(true); filterString.setShowFiles(true);
filterString.setShowSubDirs(true); filterString.setShowSubDirs(true);
RemoteFileContext context = new RemoteFileContext(this, parent, filterString); RemoteFileContext context = new RemoteFileContext(this, parent, filterString);