Index: lutinutil/src/java/org/codelutin/util/ZipUtil.java diff -u lutinutil/src/java/org/codelutin/util/ZipUtil.java:1.7 lutinutil/src/java/org/codelutin/util/ZipUtil.java:1.8 --- lutinutil/src/java/org/codelutin/util/ZipUtil.java:1.7 Sun Dec 9 19:09:11 2007 +++ lutinutil/src/java/org/codelutin/util/ZipUtil.java Sat Dec 15 13:48:54 2007 @@ -23,9 +23,9 @@ * Created: 24 août 2006 10:13:35 * * @author poussin - * @version $Revision: 1.7 $ + * @version $Revision: 1.8 $ * - * Last update: $Date: 2007-12-09 19:09:11 $ + * Last update: $Date: 2007-12-15 13:48:54 $ * by : $Author: tchemit $ */ @@ -296,6 +296,18 @@ } } + @SuppressWarnings({"unchecked"}) + public static List[] scanAndExplodeZip(File source, File root, FileFilter excludeFilter) throws IOException { + + List overwrittenFiles = new ArrayList(); + List newFiles = new ArrayList(); + + // obtain list of relative paths (to add or overwrite) + scan(source, root, newFiles, overwrittenFiles,excludeFilter,null,null); + + return new List[]{newFiles, overwrittenFiles}; + } + /** * uncompress zipped file in targetDir. *

@@ -361,6 +373,7 @@ return s + (isDir ? ZIP_SEP : ""); } + public static String convertToLocalEntryName(String txt) { String s = txt.replaceAll(ZIP_SEP_PATTERN, LOCAL_SEP_PATTERN); if (s.endsWith(ZIP_SEP)) { @@ -368,8 +381,6 @@ } return s; } - - }