From c23c855f38f4287ce82018ca40892379bcdbf715 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 11 Apr 2000 20:02:48 +0000 Subject: [PATCH] Vector.java (VectorEnumeration): Now `final'. * java/util/Vector.java (VectorEnumeration): Now `final'. * java/util/Hashtable.java (HashtableEntry): Now `final'. (HashtableEnumeration): Likewise. * java/util/zip/ZipFile.java (ZipEnumeration): Now `final'. * java/text/RuleBasedCollator.java (RBCElement): Now `final'. From-SVN: r33083 --- libjava/ChangeLog | 8 ++++++++ libjava/java/text/RuleBasedCollator.java | 4 ++-- libjava/java/util/Hashtable.java | 6 +++--- libjava/java/util/Vector.java | 4 ++-- libjava/java/util/zip/ZipFile.java | 4 ++-- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d4bd1d857c0..ebb56edf887 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2000-04-11 Tom Tromey + + * java/util/Vector.java (VectorEnumeration): Now `final'. + * java/util/Hashtable.java (HashtableEntry): Now `final'. + (HashtableEnumeration): Likewise. + * java/util/zip/ZipFile.java (ZipEnumeration): Now `final'. + * java/text/RuleBasedCollator.java (RBCElement): Now `final'. + 2000-04-10 Warren Levy * java/io/ObjectStreamException.java: New file. diff --git a/libjava/java/text/RuleBasedCollator.java b/libjava/java/text/RuleBasedCollator.java index c70dbcefe44..2fb667ef838 100644 --- a/libjava/java/text/RuleBasedCollator.java +++ b/libjava/java/text/RuleBasedCollator.java @@ -1,6 +1,6 @@ // RuleBasedCollator.java - Concrete class for locale-based string compare. -/* Copyright (C) 1999 Free Software Foundation +/* Copyright (C) 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -23,7 +23,7 @@ import java.util.Vector; * Status: Believed complete and correct */ -class RBCElement +final class RBCElement { String key; char relation; diff --git a/libjava/java/util/Hashtable.java b/libjava/java/util/Hashtable.java index 5d5284469db..62866b08265 100644 --- a/libjava/java/util/Hashtable.java +++ b/libjava/java/util/Hashtable.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -20,7 +20,7 @@ import java.io.Serializable; * Status: Believed complete and correct */ -class HashtableEntry +final class HashtableEntry { public Object key; public Object value; @@ -33,7 +33,7 @@ class HashtableEntry } } -class HashtableEnumeration implements Enumeration +final class HashtableEnumeration implements Enumeration { // TBD: Enumeration is not safe if new elements are put in the table as // this could cause a rehash and we'd completely lose our place. Even diff --git a/libjava/java/util/Vector.java b/libjava/java/util/Vector.java index d98068082ad..b49f482e560 100644 --- a/libjava/java/util/Vector.java +++ b/libjava/java/util/Vector.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -20,7 +20,7 @@ import java.io.Serializable; * Status: Believed complete and correct */ -class VectorEnumeration implements Enumeration +final class VectorEnumeration implements Enumeration { private int enumIndex; private Vector enumVec; diff --git a/libjava/java/util/zip/ZipFile.java b/libjava/java/util/zip/ZipFile.java index f6e576a5222..5e01d57923b 100644 --- a/libjava/java/util/zip/ZipFile.java +++ b/libjava/java/util/zip/ZipFile.java @@ -1,6 +1,6 @@ // ZipFile.java - Read contents of a ZIP file. -/* Copyright (C) 1999 Free Software Foundation +/* Copyright (C) 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -166,7 +166,7 @@ public class ZipFile implements ZipConstants String name; } -class ZipEnumeration implements java.util.Enumeration +final class ZipEnumeration implements java.util.Enumeration { ZipEntry entry; -- 2.30.2