mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-31 12:13:34 +02:00
Code Issues Wiki Activity

[192741] Fix extract (copy, move) from archive if more than 1 level deep

Browse source
This commit is contained in:
Martin Oberhuber 2007-07-05 08:11:40 +00:00
parent dce2ff6b5d
commit fd3a307707
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.rse.services;singleton:=true Bundle-SymbolicName: org.eclipse.rse.services;singleton:=true
Bundle-Version: 2.0.0.qualifier Bundle-Version: 2.0.1.qualifier
Bundle-Activator: org.eclipse.rse.internal.services.Activator Bundle-Activator: org.eclipse.rse.internal.services.Activator
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-Localization: plugin Bundle-Localization: plugin

13
rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemZipHandler.java
View file

@ -13,6 +13,7 @@
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * {Name} (company) - description of contribution.
* Xuan Chen (IBM) - [192741] [Archives] Move a folder from within an Archive doesn't work if > 1 level deep
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.services.clientserver.archiveutils; package org.eclipse.rse.services.clientserver.archiveutils;
@ -712,7 +713,17 @@ public class SystemZipHandler implements ISystemArchiveHandler
File topFile = destination; File topFile = destination;
String topFilePath = topFile.getAbsolutePath().replace('\\', '/'); String topFilePath = topFile.getAbsolutePath().replace('\\', '/');
//if (!dir.equals(topFile.getName())) //if (!dir.equals(topFile.getName()))
if (!topFilePath.endsWith(dir)) String lastPortionOfDir = null;
int lastSlashIndex = dir.lastIndexOf('/');
if (-1 == lastSlashIndex)
{
lastPortionOfDir = dir;
}
else
{
lastPortionOfDir = dir.substring(lastSlashIndex + 1);
}
if (!topFilePath.endsWith(lastPortionOfDir))
{ {
rename(dir, topFile.getName()); rename(dir, topFile.getName());
dir = topFile.getName(); dir = topFile.getName();