diff options
| author | Bryce McKinlay <bryce@gcc.gnu.org> | 2001-03-06 01:04:28 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2001-03-06 01:04:28 +0000 |
| commit | 5c409ad3d88f5d8fba3e15bd9b337a9a99886161 (patch) | |
| tree | 01665f375231499424faa1631a007154d43b46a6 /libjava/java/util | |
| parent | d97b75bee3fb323447411a7f2cad05535698d5ea (diff) | |
| download | gcc-5c409ad3d88f5d8fba3e15bd9b337a9a99886161.zip gcc-5c409ad3d88f5d8fba3e15bd9b337a9a99886161.tar.gz gcc-5c409ad3d88f5d8fba3e15bd9b337a9a99886161.tar.bz2 | |
TreeSet.java (writeObject): Use a for-loop instead of Iterator.hasNext().
2001-03-06 Bryce McKinlay <bryce@albatross.co.nz>
* java/util/TreeSet.java (writeObject): Use a for-loop instead of
Iterator.hasNext().
2001-03-05 Jochen Hoenicke <jochen@gnu.org>
* java/util/TreeMap.java (writeObject): Use defaultWriteObject()
instead of the new JDK1.2 API. This is simpler and makes
back-porting the classes to JDK1.1 trivial.
(readObject): likewise.
From-SVN: r40252
Diffstat (limited to 'libjava/java/util')
| -rw-r--r-- | libjava/java/util/TreeMap.java | 10 | ||||
| -rw-r--r-- | libjava/java/util/TreeSet.java | 7 |
2 files changed, 6 insertions, 11 deletions
diff --git a/libjava/java/util/TreeMap.java b/libjava/java/util/TreeMap.java index 26e3fd6..59d6079 100644 --- a/libjava/java/util/TreeMap.java +++ b/libjava/java/util/TreeMap.java @@ -39,7 +39,7 @@ import java.io.IOException; * Comparator object, or by the natural ordering of the keys. * * The algorithms are adopted from Corman, Leiserson, - * and Rivest's <i>Introduction to Algorithms.<i> In other words, + * and Rivest's <i>Introduction to Algorithms.</i> In other words, * I cribbed from the same pseudocode as Sun. <em>Any similarity * between my code and Sun's (if there is any -- I have never looked * at Sun's) is a result of this fact.</em> @@ -56,7 +56,6 @@ import java.io.IOException; * * @author Jon Zeppieri * @author Bryce McKinlay - * @modified $Id: TreeMap.java,v 1.3 2001/02/16 01:49:40 bryce Exp $ */ public class TreeMap extends AbstractMap implements SortedMap, Cloneable, Serializable @@ -777,9 +776,7 @@ public class TreeMap extends AbstractMap private void writeObject(ObjectOutputStream out) throws IOException { - ObjectOutputStream.PutField fields = out.putFields(); - fields.put("comparator", comparator); - out.writeFields(); + out.defaultWriteObject(); Node node = firstNode(); out.writeInt(size); @@ -795,8 +792,7 @@ public class TreeMap extends AbstractMap private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { - ObjectInputStream.GetField fields = in.readFields(); - comparator = (Comparator) fields.get("comparator", null); + in.defaultReadObject(); int size = in.readInt(); putFromObjStream(in, size, true); } diff --git a/libjava/java/util/TreeSet.java b/libjava/java/util/TreeSet.java index c6875b8..ba85213 100644 --- a/libjava/java/util/TreeSet.java +++ b/libjava/java/util/TreeSet.java @@ -44,8 +44,6 @@ import java.io.ObjectOutputStream; * TreeSet is a part of the JDK1.2 Collections API. * * @author Jon Zeppieri - * @version $Revision: 1.2 $ - * @modified $Id: TreeSet.java,v 1.2 2001/02/15 03:59:57 bryce Exp $ */ public class TreeSet extends AbstractSet @@ -269,11 +267,12 @@ public class TreeSet extends AbstractSet private void writeObject(ObjectOutputStream out) throws IOException { Iterator itr = map.keySet().iterator(); + int size = map.size(); out.writeObject(map.comparator()); - out.writeInt(map.size()); + out.writeInt(size); - while (itr.hasNext()) + for (int i = 0; i < size; i++) out.writeObject(itr.next()); } |