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

[209552] API changes to use multiple and getting rid of deprecated

Browse source
This commit is contained in:
David McKnight 2007-11-15 19:08:42 +00:00
parent a1e17ba244
commit 712e981fcc
7 changed files with 20 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java
View file

@ -435,7 +435,7 @@ public class UniversalFileTransferUtility
} }
try { try {
srcFS.downloadMulti(sources, destinations, encodings, monitor); srcFS.downloadMultiple(sources, destinations, encodings, monitor);
} }
catch (SystemMessageException e){ catch (SystemMessageException e){
resultSet.setMessage(e.getSystemMessage()); resultSet.setMessage(e.getSystemMessage());

5
rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java
View file

@ -24,6 +24,7 @@
* David McKnight (IBM) - [207178] changing list APIs for file service and subsystems * 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) - [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) - [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; 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 * 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, File[] localFiles, boolean[] isBinaries, String[] hostEncodings,
IProgressMonitor monitor) throws SystemMessageException IProgressMonitor monitor) throws SystemMessageException
{ {
@ -1038,7 +1039,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
/** /**
* Default implementation - just iterate through each file * 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[] remoteFiles, boolean[] isBinaries, String[] srcEncodings,
String[] hostEncodings, IProgressMonitor monitor) String[] hostEncodings, IProgressMonitor monitor)
throws SystemMessageException throws SystemMessageException

5
rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/AbstractFileService.java
View file

@ -15,6 +15,7 @@
* David McKnight (IBM) - [207178] changing list APIs for file service and subsystems * 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) - [162195] new APIs for upload multi and download multi
* Xuan Chen (IBM) - [160775] [api] rename (at least within a zip) blocks UI thread * 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; package org.eclipse.rse.services.files;
@ -141,7 +142,7 @@ public abstract class AbstractFileService implements IFileService
/** /**
* Default implementation - just iterate through each file * 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, File[] localFiles, boolean[] isBinaries, String[] hostEncodings,
IProgressMonitor monitor) throws SystemMessageException IProgressMonitor monitor) throws SystemMessageException
{ {
@ -161,7 +162,7 @@ public abstract class AbstractFileService implements IFileService
/** /**
* Default implementation - just iterate through each file * 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[] remoteFiles, boolean[] isBinaries, String[] srcEncodings,
String[] hostEncodings, IProgressMonitor monitor) String[] hostEncodings, IProgressMonitor monitor)
throws SystemMessageException throws SystemMessageException

5
rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/IFileService.java
View file

@ -17,6 +17,7 @@
* Martin Oberhuber (Wind River) - [204710] Update Javadoc to mention that getUserHome() may return null * 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) - [207178] changing list APIs for file service and subsystems
* David McKnight (IBM) - [162195] new APIs for upload multi and download multi * 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; package org.eclipse.rse.services.files;
@ -94,7 +95,7 @@ public interface IFileService extends IService
* Typically this would be one of those in the * Typically this would be one of those in the
* {@link RemoteFileException} family. * {@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 * Typically this would be one of those in the
* {@link RemoteFileException} family. * {@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;

12
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/SystemFileTransferModeRegistry.java
View file

@ -138,12 +138,6 @@ public class SystemFileTransferModeRegistry implements ISystemFileTransferModeRe
// add to list // add to list
extTextList.add(extension); 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 // add extension to list of binary types
@ -155,12 +149,6 @@ public class SystemFileTransferModeRegistry implements ISystemFileTransferModeRe
// add to list // add to list
extBinaryList.add(extension); extBinaryList.add(extension);
// create an editor mapping
// FileEditorMapping mapping = new FileEditorMapping("*", extension);
// add to editor mapping list
// editorMappings.add(mapping);
} }
} }
else { else {

13
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java
View file

@ -24,6 +24,7 @@
* David McKnight (IBM) - [207178] changing list APIs for file service and subsystems * 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) - [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; 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)); 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, String[] remotePaths, String[] rmtEncodings,
IProgressMonitor monitor) throws SystemMessageException IProgressMonitor monitor) throws SystemMessageException
{ {
@ -612,7 +613,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
} }
// upload // upload
getFileService().uploadMulti(sourceFiles, remoteParentPaths, remoteFileNames, isBinaries, srcEncodings, rmtEncodings, monitor); getFileService().uploadMultiple(sourceFiles, remoteParentPaths, remoteFileNames, isBinaries, srcEncodings, rmtEncodings, monitor);
// notification // notification
// notify that the file was uploaded // 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) String[] encodings, IProgressMonitor monitor)
throws SystemMessageException throws SystemMessageException
{ {
@ -657,7 +658,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
} }
// upload // upload
getFileService().uploadMulti(sourceFiles, remoteParentPaths, remoteFileNames, isBinaries, encodings, hostEncodings, monitor); getFileService().uploadMultiple(sourceFiles, remoteParentPaths, remoteFileNames, isBinaries, encodings, hostEncodings, monitor);
// notification // notification
// notify that the file was uploaded // 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) String[] encodings, IProgressMonitor monitor)
throws SystemMessageException throws SystemMessageException
{ {
@ -722,7 +723,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
localFiles[i] = new File(destinations[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()) if (monitor.isCanceled())
{ {
for (int d = 0; d < localFiles.length; d++) for (int d = 0; d < localFiles.length; d++)

3
rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileSubsystemConsistencyTestCase.java
View file

@ -8,6 +8,7 @@
* Contributors: * Contributors:
* David McKnight (IBM) - [207095] test case to compare same op between subsystems * 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) - [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; package org.eclipse.rse.tests.subsystems.files;
@ -475,7 +476,7 @@ public class FileSubsystemConsistencyTestCase extends RSEBaseConnectionTestCase
System.out.println(systemType + ":Starting multi-file Download"); System.out.println(systemType + ":Starting multi-file Download");
// transfer the files // transfer the files
ss.downloadMulti(files, destinations, encodings, monitor); ss.downloadMultiple(files, destinations, encodings, monitor);
} }
else // single file download else // single file download
{ {