[jboss-svn-commits] JBoss Common SVN: r3258 - jzipfile/trunk/src/main/java/org/jboss/jzipfile.

[jboss-svn-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2009-06-15 15:02:02 -0400 (Mon, 15 Jun 2009)
New Revision: 3258

Modified:
   jzipfile/trunk/src/main/java/org/jboss/jzipfile/ZipCatalogBuilder.java
Log:
Use absracted timestamp calc

Modified: jzipfile/trunk/src/main/java/org/jboss/jzipfile/ZipCatalogBuilder.java
===================================================================
--- jzipfile/trunk/src/main/java/org/jboss/jzipfile/ZipCatalogBuilder.java	2009-06-15 19:01:51 UTC (rev 3257)
+++ jzipfile/trunk/src/main/java/org/jboss/jzipfile/ZipCatalogBuilder.java	2009-06-15 19:02:02 UTC (rev 3258)
@@ -28,12 +28,9 @@
 import java.util.LinkedHashMap;
 import java.util.Collections;
 import java.util.Collection;
-import java.util.GregorianCalendar;
 import java.util.zip.ZipException;
 import java.io.InputStream;
 import java.io.IOException;
-import static java.lang.Math.max;
-import static java.lang.Math.min;
 
 final class ZipCatalogBuilder {
     private final Map<String, ZipEntry> entryMap = new LinkedHashMap<String, ZipEntry>();
@@ -67,20 +64,8 @@
                 final ZipCompressionMethod method = ZipCompressionMethod.getMethod(is.readUnsignedShort());
                 final int modTimeRaw = is.readUnsignedShort();
                 final int modDateRaw = is.readUnsignedShort();
+                final long modTime = Zip.getTimestamp(modTimeRaw, modDateRaw);
 
-                final int hour = min(modTimeRaw >> 11, 23);
-                final int minute = min(modTimeRaw >> 5 & 0x3f, 59);
-                final int second = min(modTimeRaw & 0x1f, 59);
-
-                final int year = 1980 + (modDateRaw >> 9);
-                // Months are from 1-12
-                final int month = max(1, min(12, modDateRaw >> 5 & 0x0f));
-                // Days might roll over; if so, let the calendar deal with it
-                final int day = modDateRaw & 0x1f;
-
-                // convert to millis
-                final long modTime = new GregorianCalendar(year, month - 1, day, hour, minute, second).getTimeInMillis();
-
                 int crc32 = is.readInt();
                 int compSize = is.readInt();
                 int uncompSize = is.readInt();