diff options
Diffstat (limited to 'libjava/java/util')
| -rw-r--r-- | libjava/java/util/Arrays.java | 4 | ||||
| -rw-r--r-- | libjava/java/util/zip/ZipEntry.java | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libjava/java/util/Arrays.java b/libjava/java/util/Arrays.java index 080b4b9..cc32d15 100644 --- a/libjava/java/util/Arrays.java +++ b/libjava/java/util/Arrays.java @@ -2400,7 +2400,7 @@ public class Arrays { int size = a.length; for (int i = 0; i < size; i++) - if (this.equals(o, a[i])) + if (ArrayList.equals(o, a[i])) return i; return -1; } @@ -2409,7 +2409,7 @@ public class Arrays { int i = a.length; while (--i >= 0) - if (this.equals(o, a[i])) + if (ArrayList.equals(o, a[i])) return i; return -1; } diff --git a/libjava/java/util/zip/ZipEntry.java b/libjava/java/util/zip/ZipEntry.java index e226281..3f7f643 100644 --- a/libjava/java/util/zip/ZipEntry.java +++ b/libjava/java/util/zip/ZipEntry.java @@ -169,12 +169,12 @@ public class ZipEntry implements ZipConstants, Cloneable synchronized (cal) { cal.setTime(new Date(time*1000L)); - dostime = (cal.get(cal.YEAR) - 1980 & 0x7f) << 25 - | (cal.get(cal.MONTH) + 1) << 21 - | (cal.get(cal.DAY_OF_MONTH)) << 16 - | (cal.get(cal.HOUR_OF_DAY)) << 11 - | (cal.get(cal.MINUTE)) << 5 - | (cal.get(cal.SECOND)) >> 1; + dostime = (cal.get(Calendar.YEAR) - 1980 & 0x7f) << 25 + | (cal.get(Calendar.MONTH) + 1) << 21 + | (cal.get(Calendar.DAY_OF_MONTH)) << 16 + | (cal.get(Calendar.HOUR_OF_DAY)) << 11 + | (cal.get(Calendar.MINUTE)) << 5 + | (cal.get(Calendar.SECOND)) >> 1; } dostime = (int) (dostime / 1000L); this.known |= KNOWN_TIME; |