[eclipse-jbosstools] Update trueziputil patch
Gerard Ryan
galileo at fedoraproject.org
Fri Jan 18 19:12:05 UTC 2013
commit 64d87ecaede33d8b2bdbb30c9a0d5caa7b6f9e4b
Author: Gerard Ryan <gerard at ryan.lt>
Date: Thu Jan 17 18:48:17 2013 +0000
Update trueziputil patch
...bosstools-archives-core-trueziputil-4.0.0.patch | 69 ++++++++++++++++---
1 files changed, 58 insertions(+), 11 deletions(-)
---
diff --git a/eclipse-jbosstools-archives-core-trueziputil-4.0.0.patch b/eclipse-jbosstools-archives-core-trueziputil-4.0.0.patch
index b31c26c..24cd725 100644
--- a/eclipse-jbosstools-archives-core-trueziputil-4.0.0.patch
+++ b/eclipse-jbosstools-archives-core-trueziputil-4.0.0.patch
@@ -1,6 +1,6 @@
---- archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java.orig 2012-10-06 23:38:32.312365099 +0100
-+++ archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java 2012-10-07 19:57:56.716224298 +0100
-@@ -14,11 +14,12 @@
+--- server/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java.orig 2013-01-17 17:43:33.445625858 +0000
++++ server/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java 2013-01-17 18:06:43.168973253 +0000
+@@ -14,11 +14,11 @@
import org.eclipse.core.runtime.IPath;
@@ -9,7 +9,6 @@
-import de.schlichtherle.io.ArchiveException;
-import de.schlichtherle.io.archive.spi.ArchiveDriver;
-import de.schlichtherle.io.archive.zip.Zip32Driver;
-+//import de.schlichtherle.truezip.file.AbstractArchiveDetector;
+import de.schlichtherle.truezip.file.TFile;
+import de.schlichtherle.truezip.file.TArchiveDetector;
+import de.schlichtherle.truezip.fs.FsSyncException;
@@ -18,7 +17,7 @@
/**
* Accesses raw files with the truezip filesystem
-@@ -27,17 +28,17 @@
+@@ -27,17 +27,17 @@
*/
public class TrueZipUtil {
@@ -41,7 +40,7 @@
return file.exists();
}
-@@ -46,7 +47,7 @@
+@@ -46,7 +46,7 @@
return getTimestamp( getFile(path));
}
@@ -50,7 +49,7 @@
return file.lastModified();
}
-@@ -55,28 +56,32 @@
+@@ -55,28 +55,32 @@
return copyFile(source, getFile(dest), true);
}
@@ -90,7 +89,7 @@
}
public static boolean deleteEmptyChildren(java.io.File file) {
-@@ -102,14 +107,14 @@
+@@ -102,14 +106,14 @@
public static boolean createFolder(IPath parent, String folderName) {
@@ -107,8 +106,44 @@
return b && updateParentTimestamps(parent.append(folderName));
}
public static boolean createArchive(IPath path) {
-@@ -117,8 +122,8 @@
+@@ -127,17 +131,17 @@
+ * @return
+ */
+ public static boolean createArchive(java.io.File parentFile, IPath relative) {
+- de.schlichtherle.io.File archive = getRelativeArchiveFile(parentFile, relative);
++ de.schlichtherle.truezip.file.TFile archive = getRelativeArchiveFile(parentFile, relative);
+ boolean b = archive.mkdirs();
+ return b && updateParentTimestamps(archive);
}
+
+- public static de.schlichtherle.io.File getRelativeArchiveFile(java.io.File parentFile, IPath relative) {
+- de.schlichtherle.io.File working = null;
+- if( parentFile instanceof de.schlichtherle.io.File)
+- working = (de.schlichtherle.io.File)parentFile;
++ public static de.schlichtherle.truezip.file.TFile getRelativeArchiveFile(java.io.File parentFile, IPath relative) {
++ de.schlichtherle.truezip.file.TFile working = null;
++ if( parentFile instanceof de.schlichtherle.truezip.file.TFile)
++ working = (de.schlichtherle.truezip.file.TFile)parentFile;
+ else
+- working = new de.schlichtherle.io.File(parentFile);
++ working = new de.schlichtherle.truezip.file.TFile(parentFile);
+
+ // IF the path is 0 length, just return now
+ if( relative.segmentCount() == 0)
+@@ -146,9 +150,9 @@
+ // the path of the final file's parent relative to the passed in root
+ IPath finalFileRelativeLocationPath = relative.removeLastSegments(1);
+ // the parent of the object to be returned
+- de.schlichtherle.io.File finalFileLocation = getFileInArchive(working, finalFileRelativeLocationPath);
++ de.schlichtherle.truezip.file.TFile finalFileLocation = getFileInArchive(working, finalFileRelativeLocationPath);
+
+- de.schlichtherle.io.File retval = new de.schlichtherle.io.File(finalFileLocation,
++ de.schlichtherle.truezip.file.TFile retval = new de.schlichtherle.truezip.file.TFile(finalFileLocation,
+ relative.lastSegment(), getJarArchiveDetector());
+ return retval;
+ }
+@@ -157,8 +161,8 @@
+
public static void umount() {
try {
- de.schlichtherle.io.File.umount();
@@ -118,7 +153,7 @@
}
}
-@@ -143,9 +148,9 @@
+@@ -183,9 +187,9 @@
}
// Update only the PARENT timestamps.
@@ -130,7 +165,7 @@
boolean b = true;
while( parent != null ) {
b &= parent.setLastModified(time);
-@@ -155,21 +160,22 @@
+@@ -195,21 +199,22 @@
}
@@ -160,3 +195,15 @@
public static boolean javaIODeleteDir(java.io.File dir) {
if (dir.isDirectory()) {
+@@ -226,9 +231,9 @@
+ return dir.delete();
+ }
+
+- public static de.schlichtherle.io.File getFileInArchive(de.schlichtherle.io.File root, IPath relative) {
++ public static de.schlichtherle.truezip.file.TFile getFileInArchive(de.schlichtherle.truezip.file.TFile root, IPath relative) {
+ while(relative.segmentCount() > 0 ) {
+- root = new de.schlichtherle.io.File(root,
++ root = new de.schlichtherle.truezip.file.TFile(root,
+ relative.segment(0), ArchiveDetector.NULL);
+ relative = relative.removeFirstSegments(1);
+ }
More information about the scm-commits
mailing list