Commit 648b6075 by Jerry Quinn Committed by Jerry Quinn

ZipEntry.java (setTime): Remove scaling.

2004-06-06  Jerry Quinn  <jlquinn@optonline.net>

	* java/util/zip/ZipEntry.java (setTime): Remove scaling.

From-SVN: r82674
parent 37f40c9c
2004-06-06 Jerry Quinn <jlquinn@optonline.net>
* java/util/zip/ZipEntry.java (setTime): Remove scaling.
2004-06-05 Michael Koch <konqueror@gmx.de> 2004-06-05 Michael Koch <konqueror@gmx.de>
* javax/swing/SwingConstants.java * javax/swing/SwingConstants.java
......
/* java.util.zip.ZipEntry /* java.util.zip.ZipEntry
Copyright (C) 2001, 2002 Free Software Foundation, Inc. Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
...@@ -168,7 +168,7 @@ public class ZipEntry implements ZipConstants, Cloneable ...@@ -168,7 +168,7 @@ public class ZipEntry implements ZipConstants, Cloneable
Calendar cal = getCalendar(); Calendar cal = getCalendar();
synchronized (cal) synchronized (cal)
{ {
cal.setTime(new Date(time*1000L)); cal.setTime(new Date(time));
dostime = (cal.get(Calendar.YEAR) - 1980 & 0x7f) << 25 dostime = (cal.get(Calendar.YEAR) - 1980 & 0x7f) << 25
| (cal.get(Calendar.MONTH) + 1) << 21 | (cal.get(Calendar.MONTH) + 1) << 21
| (cal.get(Calendar.DAY_OF_MONTH)) << 16 | (cal.get(Calendar.DAY_OF_MONTH)) << 16
...@@ -176,7 +176,6 @@ public class ZipEntry implements ZipConstants, Cloneable ...@@ -176,7 +176,6 @@ public class ZipEntry implements ZipConstants, Cloneable
| (cal.get(Calendar.MINUTE)) << 5 | (cal.get(Calendar.MINUTE)) << 5
| (cal.get(Calendar.SECOND)) >> 1; | (cal.get(Calendar.SECOND)) >> 1;
} }
dostime = (int) (dostime / 1000L);
this.known |= KNOWN_TIME; this.known |= KNOWN_TIME;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment