diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java index 5fa3d4aa5de..e8907d6fa64 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java @@ -435,7 +435,7 @@ public class UniversalFileTransferUtility } try { - srcFS.downloadMulti(sources, destinations, encodings, monitor); + srcFS.downloadMultiple(sources, destinations, encodings, monitor); } catch (SystemMessageException e){ resultSet.setMessage(e.getSystemMessage()); diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java index e32a9c8423b..6981988180c 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java @@ -24,6 +24,7 @@ * David McKnight (IBM) - [207178] changing list APIs for file service and subsystems * David McKnight (IBM) - [162195] new APIs for upload multi and download multi * David McKnight (IBM) - [209423] Fix for null pointer - filter attributes need unique ids + * David McKnight (IBM) - [209552] API changes to use multiple and getting rid of deprecated ********************************************************************************/ package org.eclipse.rse.internal.services.dstore.files; @@ -833,7 +834,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer /** * Default implementation - just iterate through each file */ - public boolean downloadMulti(String[] remoteParents, String[] remoteFiles, + public boolean downloadMultiple(String[] remoteParents, String[] remoteFiles, File[] localFiles, boolean[] isBinaries, String[] hostEncodings, IProgressMonitor monitor) throws SystemMessageException { @@ -1038,7 +1039,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer /** * Default implementation - just iterate through each file */ - public boolean uploadMulti(File[] localFiles, String[] remoteParents, + public boolean uploadMultiple(File[] localFiles, String[] remoteParents, String[] remoteFiles, boolean[] isBinaries, String[] srcEncodings, String[] hostEncodings, IProgressMonitor monitor) throws SystemMessageException 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 b8ed6a72122..493bc20e217 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 @@ -15,6 +15,7 @@ * David McKnight (IBM) - [207178] changing list APIs for file service and subsystems * David McKnight (IBM) - [162195] new APIs for upload multi and download multi * Xuan Chen (IBM) - [160775] [api] rename (at least within a zip) blocks UI thread + * David McKnight (IBM) - [209552] API changes to use multiple and getting rid of deprecated ********************************************************************************/ package org.eclipse.rse.services.files; @@ -141,7 +142,7 @@ public abstract class AbstractFileService implements IFileService /** * Default implementation - just iterate through each file */ - public boolean downloadMulti(String[] remoteParents, String[] remoteFiles, + public boolean downloadMultiple(String[] remoteParents, String[] remoteFiles, File[] localFiles, boolean[] isBinaries, String[] hostEncodings, IProgressMonitor monitor) throws SystemMessageException { @@ -161,7 +162,7 @@ public abstract class AbstractFileService implements IFileService /** * Default implementation - just iterate through each file */ - public boolean uploadMulti(File[] localFiles, String[] remoteParents, + public boolean uploadMultiple(File[] localFiles, String[] remoteParents, String[] remoteFiles, boolean[] isBinaries, String[] srcEncodings, String[] hostEncodings, IProgressMonitor monitor) throws SystemMessageException diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/IFileService.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/IFileService.java index 5095659cc35..ab6202de1ec 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/IFileService.java +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/IFileService.java @@ -17,6 +17,7 @@ * Martin Oberhuber (Wind River) - [204710] Update Javadoc to mention that getUserHome() may return null * David McKnight (IBM) - [207178] changing list APIs for file service and subsystems * David McKnight (IBM) - [162195] new APIs for upload multi and download multi + * David McKnight (IBM) - [209552] API changes to use multiple and getting rid of deprecated ********************************************************************************/ package org.eclipse.rse.services.files; @@ -94,7 +95,7 @@ public interface IFileService extends IService * Typically this would be one of those in the * {@link RemoteFileException} family. */ - public boolean uploadMulti(File[] localFiles, String[] remoteParents, String[] remoteFiles, boolean[] isBinary, String[] srcEncodings, String[] hostEncodings, IProgressMonitor monitor) throws SystemMessageException; + public boolean uploadMultiple(File[] localFiles, String[] remoteParents, String[] remoteFiles, boolean[] isBinary, String[] srcEncodings, String[] hostEncodings, IProgressMonitor monitor) throws SystemMessageException; /** @@ -127,7 +128,7 @@ public interface IFileService extends IService * Typically this would be one of those in the * {@link RemoteFileException} family. */ - public boolean downloadMulti(String[] remoteParents, String[] remoteFiles, File[] localFiles, boolean[] isBinary, String[] hostEncodings, IProgressMonitor monitor) throws SystemMessageException; + public boolean downloadMultiple(String[] remoteParents, String[] remoteFiles, File[] localFiles, boolean[] isBinary, String[] hostEncodings, IProgressMonitor monitor) throws SystemMessageException; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/SystemFileTransferModeRegistry.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/SystemFileTransferModeRegistry.java index 17f7dda8827..c68d70aa0ae 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/SystemFileTransferModeRegistry.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/SystemFileTransferModeRegistry.java @@ -138,12 +138,6 @@ public class SystemFileTransferModeRegistry implements ISystemFileTransferModeRe // add to list extTextList.add(extension); - - // create an editor mapping - // FileEditorMapping mapping = new FileEditorMapping("*", extension); - - // add to editor mapping list - // editorMappings.add(mapping); } } // add extension to list of binary types @@ -155,12 +149,6 @@ public class SystemFileTransferModeRegistry implements ISystemFileTransferModeRe // add to list extBinaryList.add(extension); - - // create an editor mapping - // FileEditorMapping mapping = new FileEditorMapping("*", extension); - - // add to editor mapping list - // editorMappings.add(mapping); } } else { diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java index 101f70a89ff..e79b1aa59db 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java @@ -23,7 +23,8 @@ * David McKnight (IBM) - [207100] fire event after upload and download * David McKnight (IBM) - [207178] changing list APIs for file service and subsystems * David McKnight (IBM) - [162195] new APIs for upload multi and download multi - * David McKnight (IBM) - [203114] don't treat XML files specially (no hidden prefs for bin vs text) + * David McKnight (IBM) - [203114] don't treat XML files specially (no hidden prefs for bin vs text) + * David McKnight (IBM) - [209552] API changes to use multiple and getting rid of deprecated *******************************************************************************/ package org.eclipse.rse.subsystems.files.core.servicesubsystem; @@ -576,7 +577,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I sr.fireEvent(new SystemRemoteChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_UPLOADED, destination, destination.getParentRemoteFile(), this)); } - public void uploadMulti(String[] sources, String[] srcEncodings, + public void uploadMultiple(String[] sources, String[] srcEncodings, String[] remotePaths, String[] rmtEncodings, IProgressMonitor monitor) throws SystemMessageException { @@ -612,7 +613,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I } // upload - getFileService().uploadMulti(sourceFiles, remoteParentPaths, remoteFileNames, isBinaries, srcEncodings, rmtEncodings, monitor); + getFileService().uploadMultiple(sourceFiles, remoteParentPaths, remoteFileNames, isBinaries, srcEncodings, rmtEncodings, monitor); // notification // notify that the file was uploaded @@ -625,7 +626,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I } } - public void uploadMulti(String[] sources, IRemoteFile[] destinations, + public void uploadMultiple(String[] sources, IRemoteFile[] destinations, String[] encodings, IProgressMonitor monitor) throws SystemMessageException { @@ -657,7 +658,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I } // upload - getFileService().uploadMulti(sourceFiles, remoteParentPaths, remoteFileNames, isBinaries, encodings, hostEncodings, monitor); + getFileService().uploadMultiple(sourceFiles, remoteParentPaths, remoteFileNames, isBinaries, encodings, hostEncodings, monitor); // notification // notify that the file was uploaded @@ -698,7 +699,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I } } - public void downloadMulti(IRemoteFile[] sources, String[] destinations, + public void downloadMultiple(IRemoteFile[] sources, String[] destinations, String[] encodings, IProgressMonitor monitor) throws SystemMessageException { @@ -722,7 +723,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I localFiles[i] = new File(destinations[i]); } - getFileService().downloadMulti(parentPaths, names, localFiles, isBinaries, encodings, monitor); + getFileService().downloadMultiple(parentPaths, names, localFiles, isBinaries, encodings, monitor); if (monitor.isCanceled()) { for (int d = 0; d < localFiles.length; d++) diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileSubsystemConsistencyTestCase.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileSubsystemConsistencyTestCase.java index 5234eab6307..c582c663736 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileSubsystemConsistencyTestCase.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileSubsystemConsistencyTestCase.java @@ -8,6 +8,7 @@ * Contributors: * David McKnight (IBM) - [207095] test case to compare same op between subsystems * David McKnight (IBM) - [162195] new APIs for upload multi and download multi + * David McKnight (IBM) - [209552] API changes to use multiple and getting rid of deprecated *******************************************************************************/ package org.eclipse.rse.tests.subsystems.files; @@ -475,7 +476,7 @@ public class FileSubsystemConsistencyTestCase extends RSEBaseConnectionTestCase System.out.println(systemType + ":Starting multi-file Download"); // transfer the files - ss.downloadMulti(files, destinations, encodings, monitor); + ss.downloadMultiple(files, destinations, encodings, monitor); } else // single file download {