[Schmitzm-commits] r1828 - in trunk/schmitzm-core/src: main/java/de/schmitzm/io test/java/de/schmitzm/io

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2012-01-15 23:59:12 +0100 (Sun, 15 Jan 2012)
New Revision: 1828

Modified:
   trunk/schmitzm-core/src/main/java/de/schmitzm/io/IOUtil.java
   trunk/schmitzm-core/src/test/java/de/schmitzm/io/IOUtilTest.java
Log:
zip funktion in IOUtil hatte einen ungenutzen und irref?\195?\188hrenden parameter. wo jetzt compile-fehler sind, einfach den dritten parameter entfenen

Modified: trunk/schmitzm-core/src/main/java/de/schmitzm/io/IOUtil.java
===================================================================
--- trunk/schmitzm-core/src/main/java/de/schmitzm/io/IOUtil.java	2012-01-15 09:54:28 UTC (rev 1827)
+++ trunk/schmitzm-core/src/main/java/de/schmitzm/io/IOUtil.java	2012-01-15 22:59:12 UTC (rev 1828)
@@ -1410,24 +1410,43 @@
 		fis.close();
 	}
 
-	public static void zipDir(File zipMe, ZipOutputStream zos, File insertRelTo)
+	public static void zipDir(File zipMe, ZipOutputStream zos)
 			throws IOException {
 		zipFile(zipMe, zos, zipMe.getAbsolutePath().length());
 
 	}
 
-	public static void zipDir(File zipMe, File zipFile, File insertRelTo)
+	public static void zipDir(File zipMe, File zipFile)
 			throws IOException {
 		ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile));
 
 		try {
-			zipDir(zipMe, zos, insertRelTo);
+			zipDir(zipMe, zos);
 		} finally {
 			zos.finish();
 
 		}
 
 	}
+	
+//	public static void zipDir(File zipMe, ZipOutputStream zos, File insertRelTo)
+//			throws IOException {
+//		zipFile(zipMe, zos, zipMe.getAbsolutePath().length());
+//		
+//	}
+//	
+//	public static void zipDir(File zipMe, File zipFile, File insertRelTo)
+//			throws IOException {
+//		ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile));
+//		
+//		try {
+//			zipDir(zipMe, zos, insertRelTo);
+//		} finally {
+//			zos.finish();
+//			
+//		}
+//		
+//	}
 
 	/**
 	 * @return the "Filename" of an {@link URL}. e.g.

Modified: trunk/schmitzm-core/src/test/java/de/schmitzm/io/IOUtilTest.java
===================================================================
--- trunk/schmitzm-core/src/test/java/de/schmitzm/io/IOUtilTest.java	2012-01-15 09:54:28 UTC (rev 1827)
+++ trunk/schmitzm-core/src/test/java/de/schmitzm/io/IOUtilTest.java	2012-01-15 22:59:12 UTC (rev 1828)
@@ -34,7 +34,7 @@
 		assertTrue(f1.length() > 0l);
 
 		File zipFile = File.createTempFile("test", ".zip");
-		IOUtil.zipDir(d0, zipFile, d0);
+		IOUtil.zipDir(d0, zipFile);
 
 		System.out.println(d0);
 		System.out.println(f1);