mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 14:55:41 +02:00
Code Issues Wiki Activity

[198046] fix cannot copy a folder into an archive file

Browse source
This commit is contained in:
Xuan Chen 2007-08-04 15:47:28 +00:00
parent 3942b1f006
commit 7f4ceccfea
1 changed files with 44 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java
View file

@ -19,6 +19,7 @@
* Xuan Chen (IBM) - [191280] [dstore] Expand fails for folder "/folk" with 3361 children * Xuan Chen (IBM) - [191280] [dstore] Expand fails for folder "/folk" with 3361 children
* Kevin Doyle (IBM) - [195709] Windows Copying doesn't work when path contains space * Kevin Doyle (IBM) - [195709] Windows Copying doesn't work when path contains space
* Kevin Doyle (IBM) - [196211] DStore Move tries rename if that fails copy/delete * Kevin Doyle (IBM) - [196211] DStore Move tries rename if that fails copy/delete
* Xuan Chen (IBM) - [198046] [dstore] Cannot copy a folder into an archive file
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.dstore.universal.miners; package org.eclipse.rse.dstore.universal.miners;
@ -26,6 +27,7 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.ServerSocket; import java.net.ServerSocket;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -228,6 +230,7 @@ public class UniversalFileSystemMiner extends Miner {
// if target is virtual or an archive, insert into an archive // if target is virtual or an archive, insert into an archive
AbsoluteVirtualPath vpath = getAbsoluteVirtualPath(targetFolder); AbsoluteVirtualPath vpath = getAbsoluteVirtualPath(targetFolder);
ISystemArchiveHandler handler = getArchiveHandlerFor(vpath.getContainingArchiveString()); ISystemArchiveHandler handler = getArchiveHandlerFor(vpath.getContainingArchiveString());
boolean result = true;
if (handler == null) if (handler == null)
{ {
@ -237,6 +240,15 @@ public class UniversalFileSystemMiner extends Miner {
File[] srcFiles = new File[numOfSources]; File[] srcFiles = new File[numOfSources];
String[] names = new String[numOfSources]; String[] names = new String[numOfSources];
ArrayList nonDirectoryArrayList = new ArrayList();
ArrayList nonDirectoryNamesArrayList = new ArrayList();
String virtualContainer = ""; //$NON-NLS-1$
if (targetType.equals(IUniversalDataStoreConstants.UNIVERSAL_VIRTUAL_FOLDER_DESCRIPTOR))
{
virtualContainer = vpath.getVirtualPart();
}
for (int i = 0; i < numOfSources; i++) for (int i = 0; i < numOfSources; i++)
{ {
@ -263,20 +275,45 @@ public class UniversalFileSystemMiner extends Miner {
VirtualChild child = shandler.getVirtualFile(svpath.getVirtualPart()); VirtualChild child = shandler.getVirtualFile(svpath.getVirtualPart());
srcFiles[i] = child.getExtractedFile(); srcFiles[i] = child.getExtractedFile();
} }
}
String virtualContainer = ""; //$NON-NLS-1$
if (targetType.equals(IUniversalDataStoreConstants.UNIVERSAL_VIRTUAL_FOLDER_DESCRIPTOR)) //If this source file object is directory, we will call ISystemArchiveHandler#add(File ...) method to
//it and all its descendants into the archive file.
//If this source file object is not a directory, we will add it into a list, and then
//call ISystemArchiveHandler#add(File[] ...) to add them in batch.
if (srcFiles[i].isDirectory())
{
result = handler.add(srcFiles[i], virtualContainer, names[i]);
if (result == false) {
status.setAttribute(DE.A_SOURCE, IServiceConstants.FAILED);
return statusDone(status);
}
}
else
{
nonDirectoryArrayList.add(srcFiles[i]);
nonDirectoryNamesArrayList.add(names[i]);
}
}
if (nonDirectoryArrayList.size() > 0)
{ {
virtualContainer = vpath.getVirtualPart(); File[] resultFiles = new File[nonDirectoryArrayList.size()];
String[] resultNames = new String[nonDirectoryNamesArrayList.size()];
for (int i=0; i<nonDirectoryArrayList.size(); i++)
{
resultFiles[i] = (File)nonDirectoryArrayList.get(i);
resultNames[i] = (String)nonDirectoryNamesArrayList.get(i);
}
//we need to add those files into the archive file as well.
result = handler.add(resultFiles, virtualContainer, resultNames);
} }
boolean result = handler.add(srcFiles, virtualContainer, names); if (true == result)
{
if (result) {
status.setAttribute(DE.A_SOURCE, IServiceConstants.SUCCESS); status.setAttribute(DE.A_SOURCE, IServiceConstants.SUCCESS);
} }
else { else
{
status.setAttribute(DE.A_SOURCE, IServiceConstants.FAILED); status.setAttribute(DE.A_SOURCE, IServiceConstants.FAILED);
} }
return statusDone(status); return statusDone(status);