From d147deac134d0598663264fb4ec9d665fe484fd4 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Fri, 11 May 2007 11:21:47 +0000 Subject: [PATCH] [186128][api] Move progress monitor last for more methods of abstract base classes --- .../rse/internal/services/files/ftp/FTPService.java | 2 +- .../internal/services/local/files/LocalFileService.java | 2 +- .../rse/internal/services/ssh/files/SftpFileService.java | 2 +- .../eclipse/rse/services/files/AbstractFileService.java | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java b/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java index 1b9b7131c8c..ec4f1b48332 100644 --- a/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java +++ b/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java @@ -489,7 +489,7 @@ public class FTPService extends AbstractFileService implements IFileService, IFT * (non-Javadoc) * @see org.eclipse.rse.services.files.AbstractFileService#internalFetch(org.eclipse.core.runtime.IProgressMonitor, java.lang.String, java.lang.String, int) */ - protected IHostFile[] internalFetch(IProgressMonitor monitor, String parentPath, String fileFilter, int fileType) throws SystemMessageException + protected IHostFile[] internalFetch(String parentPath, String fileFilter, int fileType, IProgressMonitor monitor) throws SystemMessageException { if (monitor!=null){ if (monitor.isCanceled()) { diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java index 388181313c6..651b998db33 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java @@ -614,7 +614,7 @@ public class LocalFileService extends AbstractFileService implements IFileServic return true; } - protected IHostFile[] internalFetch(IProgressMonitor monitor, String remoteParent, String fileFilter, int type) { + protected IHostFile[] internalFetch(String remoteParent, String fileFilter, int type, IProgressMonitor monitor) { LocalFileNameFilter fFilter = new LocalFileNameFilter(fileFilter, type); File localParent = new File(remoteParent); // if the system type is Windows, we get the canonical path so that we have the correct case in the path diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java index d075340c048..4c8607f41c0 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java +++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java @@ -282,7 +282,7 @@ public class SftpFileService extends AbstractFileService implements IFileService return false; } - protected IHostFile[] internalFetch(IProgressMonitor monitor, String parentPath, String fileFilter, int fileType) throws SystemMessageException + protected IHostFile[] internalFetch(String parentPath, String fileFilter, int fileType, IProgressMonitor monitor) throws SystemMessageException { if (fileFilter == null) { fileFilter = "*"; //$NON-NLS-1$ diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/AbstractFileService.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/AbstractFileService.java index 34f6f858d3a..fb1405484fb 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/AbstractFileService.java +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/AbstractFileService.java @@ -34,20 +34,20 @@ public abstract class AbstractFileService implements IFileService public IHostFile[] getFiles(String remoteParent, String fileFilter, IProgressMonitor monitor) throws SystemMessageException { - return internalFetch(monitor, remoteParent, fileFilter, FILE_TYPE_FILES); + return internalFetch(remoteParent, fileFilter, FILE_TYPE_FILES, monitor); } public IHostFile[] getFolders(String remoteParent, String fileFilter, IProgressMonitor monitor) throws SystemMessageException { - return internalFetch(monitor, remoteParent, fileFilter, FILE_TYPE_FOLDERS); + return internalFetch(remoteParent, fileFilter, FILE_TYPE_FOLDERS, monitor); } public IHostFile[] getFilesAndFolders(String parentPath, String fileFilter, IProgressMonitor monitor) throws SystemMessageException { - return internalFetch(monitor, parentPath, fileFilter, FILE_TYPE_FILES_AND_FOLDERS); + return internalFetch(parentPath, fileFilter, FILE_TYPE_FILES_AND_FOLDERS, monitor); } - protected abstract IHostFile[] internalFetch(IProgressMonitor monitor, String parentPath, String fileFilter, int fileType) throws SystemMessageException; + protected abstract IHostFile[] internalFetch(String parentPath, String fileFilter, int fileType, IProgressMonitor monitor) throws SystemMessageException; protected boolean isRightType(int fileType, IHostFile node)