diff options
author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-02-12 23:52:39 +0000 |
---|---|---|
committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-02-12 23:52:39 +0000 |
commit | c3c147306bab7d0e29422e18cc8ab58a031fd4ad (patch) | |
tree | e330b8e9a136b5340488dc4c338504cc6b870e5b /libjava/classpath/java/util/Collections.java | |
parent | 6321eb6cec78b9c2b185a97afd1fc64c5b92a70a (diff) | |
download | ppe42-gcc-c3c147306bab7d0e29422e18cc8ab58a031fd4ad.tar.gz ppe42-gcc-c3c147306bab7d0e29422e18cc8ab58a031fd4ad.zip |
libjava/classpath
* java/util/Collections.java (UnmodifiableMap.toArray): Imported
changes from Classpath.
libjava
* sources.am, Makefile.in: Rebuilt.
* java/lang/Socket.java: Removed override.
* java/lang/DatagramSocket.java: Removed override.
* gnu/java/net/PlainSocketImpl.java (localSocketAddress): New
field.
(getLocalAddress): New method.
* gnu/java/net/PlainDatagramSocketImpl.java
(PlainDatagramSocketImpl): Throws IOException.
* gnu/java/net/natPlainSocketImplPosix.cc (write): Remove
'sizeof'.
(read): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121866 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/java/util/Collections.java')
-rw-r--r-- | libjava/classpath/java/util/Collections.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libjava/classpath/java/util/Collections.java b/libjava/classpath/java/util/Collections.java index c15fa092bb2..77ff6ed8fa0 100644 --- a/libjava/classpath/java/util/Collections.java +++ b/libjava/classpath/java/util/Collections.java @@ -5115,7 +5115,7 @@ public class Collections // Map.Entry public Map.Entry<K,V>[] toArray() { - Map.Entry<K,V>[] mapEntryResult = (Map.Entry<K,V>[]) super.toArray(); + Object[] mapEntryResult = super.toArray(); UnmodifiableMapEntry<K,V> result[] = null; if (mapEntryResult != null) @@ -5123,21 +5123,21 @@ public class Collections result = (UnmodifiableMapEntry<K,V>[]) new UnmodifiableMapEntry[mapEntryResult.length]; for (int i = 0; i < mapEntryResult.length; ++i) - result[i] = new UnmodifiableMapEntry(mapEntryResult[i]); + result[i] = new UnmodifiableMapEntry<K,V>((Map.Entry<K,V>)mapEntryResult[i]); } return result; } // The array returned is an array of UnmodifiableMapEntry instead of // Map.Entry - public Map.Entry<K,V>[] toArray(Map.Entry<K,V>[] array) + public <S> S[] toArray(S[] array) { - super.toArray(array); + S[] result = super.toArray(array); - if (array != null) - for (int i = 0; i < array.length; i++) + if (result != null) + for (int i = 0; i < result.length; i++) array[i] = - new UnmodifiableMapEntry<K,V>(array[i]); + (S) new UnmodifiableMapEntry<K,V>((Map.Entry<K,V>) result[i]); return array; } |