diff options
author | Tom Tromey <tromey@redhat.com> | 2000-12-06 21:14:14 +0000 |
---|---|---|
committer | Tom Tromey <tromey@gcc.gnu.org> | 2000-12-06 21:14:14 +0000 |
commit | 456ffe4c68688f709ac05dc08027bfb6c8cde7d8 (patch) | |
tree | ac8c13d20233dae900d60a65bdb5d2da2c07daca /libjava | |
parent | f0bffd99210be302e85dee5d08acc71402db74b2 (diff) | |
download | gcc-456ffe4c68688f709ac05dc08027bfb6c8cde7d8.zip gcc-456ffe4c68688f709ac05dc08027bfb6c8cde7d8.tar.gz gcc-456ffe4c68688f709ac05dc08027bfb6c8cde7d8.tar.bz2 |
Collator.java (decomposeCharacter, [...]): Now package-private, not protected.
* java/text/Collator.java (decomposeCharacter, decmp, strength):
Now package-private, not protected.
* java/text/DateFormatSymbols.java (equals): Now private.
* java/text/DecimalFormatSymbols.java (safeGetChar): Now private.
* java/util/BitSet.java: Class no longer final.
* java/util/Set.java (toArray(Object[])): New method.
From-SVN: r38075
Diffstat (limited to 'libjava')
-rw-r--r-- | libjava/ChangeLog | 9 | ||||
-rw-r--r-- | libjava/java/text/Collator.java | 6 | ||||
-rw-r--r-- | libjava/java/text/DateFormatSymbols.java | 2 | ||||
-rw-r--r-- | libjava/java/text/DecimalFormatSymbols.java | 4 | ||||
-rw-r--r-- | libjava/java/util/BitSet.java | 2 | ||||
-rw-r--r-- | libjava/java/util/Set.java | 2 |
6 files changed, 17 insertions, 8 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c865785..f870e1c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,12 @@ +2000-12-05 Tom Tromey <tromey@redhat.com> + + * java/text/Collator.java (decomposeCharacter, decmp, strength): + Now package-private, not protected. + * java/text/DateFormatSymbols.java (equals): Now private. + * java/text/DecimalFormatSymbols.java (safeGetChar): Now private. + * java/util/BitSet.java: Class no longer final. + * java/util/Set.java (toArray(Object[])): New method. + 2000-12-04 Warren Levy <warrenl@redhat.com> * java/util/TimeZone.java (getAvailableIDs): Activated commented diff --git a/libjava/java/text/Collator.java b/libjava/java/text/Collator.java index 60da531..9a356c1 100644 --- a/libjava/java/text/Collator.java +++ b/libjava/java/text/Collator.java @@ -132,9 +132,9 @@ public abstract class Collator implements Comparator, Cloneable } // Decompose a single character and append results to the buffer. - protected native final void decomposeCharacter (char c, StringBuffer buf); + native final void decomposeCharacter (char c, StringBuffer buf); // These names are fixed by the serialization spec. - protected int decmp; - protected int strength; + int decmp; + int strength; } diff --git a/libjava/java/text/DateFormatSymbols.java b/libjava/java/text/DateFormatSymbols.java index 9e8bc0c..efe1d89 100644 --- a/libjava/java/text/DateFormatSymbols.java +++ b/libjava/java/text/DateFormatSymbols.java @@ -265,7 +265,7 @@ public class DateFormatSymbols extends Object } /* Does a "deep" equality test - recurses into arrays. */ - protected static boolean equals (Object x, Object y) + private static boolean equals (Object x, Object y) { if (x == y) return true; diff --git a/libjava/java/text/DecimalFormatSymbols.java b/libjava/java/text/DecimalFormatSymbols.java index d8b58b5..0f404a5 100644 --- a/libjava/java/text/DecimalFormatSymbols.java +++ b/libjava/java/text/DecimalFormatSymbols.java @@ -72,8 +72,8 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable return def; } - public final char safeGetChar (ResourceBundle bundle, - String name, char def) + private final char safeGetChar (ResourceBundle bundle, + String name, char def) { String r = null; if (bundle != null) diff --git a/libjava/java/util/BitSet.java b/libjava/java/util/BitSet.java index fa0f3a1..41dfbae 100644 --- a/libjava/java/util/BitSet.java +++ b/libjava/java/util/BitSet.java @@ -45,7 +45,7 @@ import java.io.Serializable; * @date October 23, 1998. * @status API complete to JDK 1.3. */ -public final class BitSet implements Cloneable, Serializable +public class BitSet implements Cloneable, Serializable { /** * Create a new empty bit set. diff --git a/libjava/java/util/Set.java b/libjava/java/util/Set.java index f1f836a..4eac120 100644 --- a/libjava/java/util/Set.java +++ b/libjava/java/util/Set.java @@ -1,5 +1,5 @@ /* Set.java -- A collection that prohibits duplicates - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2000 Free Software Foundation, Inc. This file is part of GNU Classpath. |