1.1 --- a/emul/mini/src/main/java/java/util/zip/ZipEntry.java Wed Jan 30 14:00:17 2013 +0100
1.2 +++ b/emul/mini/src/main/java/java/util/zip/ZipEntry.java Mon Feb 25 19:00:08 2013 +0100
1.3 @@ -25,8 +25,6 @@
1.4
1.5 package java.util.zip;
1.6
1.7 -import java.util.Date;
1.8 -
1.9 /**
1.10 * This class is used to represent a ZIP file entry.
1.11 *
1.12 @@ -281,6 +279,8 @@
1.13 * Converts DOS time to Java time (number of milliseconds since epoch).
1.14 */
1.15 private static long dosToJavaTime(long dtime) {
1.16 + return dtime;
1.17 + /* XXX:
1.18 Date d = new Date((int)(((dtime >> 25) & 0x7f) + 80),
1.19 (int)(((dtime >> 21) & 0x0f) - 1),
1.20 (int)((dtime >> 16) & 0x1f),
1.21 @@ -288,12 +288,15 @@
1.22 (int)((dtime >> 5) & 0x3f),
1.23 (int)((dtime << 1) & 0x3e));
1.24 return d.getTime();
1.25 + */
1.26 }
1.27
1.28 /*
1.29 * Converts Java time to DOS time.
1.30 */
1.31 private static long javaToDosTime(long time) {
1.32 + return time;
1.33 + /* XXX:
1.34 Date d = new Date(time);
1.35 int year = d.getYear() + 1900;
1.36 if (year < 1980) {
1.37 @@ -302,6 +305,7 @@
1.38 return (year - 1980) << 25 | (d.getMonth() + 1) << 21 |
1.39 d.getDate() << 16 | d.getHours() << 11 | d.getMinutes() << 5 |
1.40 d.getSeconds() >> 1;
1.41 + */
1.42 }
1.43
1.44 /**
1.45 @@ -321,7 +325,7 @@
1.46 return e;
1.47 } catch (CloneNotSupportedException e) {
1.48 // This should never happen, since we are Cloneable
1.49 - throw new InternalError();
1.50 + throw new IllegalStateException();
1.51 }
1.52 }
1.53 }