From: Tom Tromey <tromey@redhat.com>
Date: Wed, 6 Dec 2000 21:14:14 +0000 (+0000)
Subject: Collator.java (decomposeCharacter, [...]): Now package-private, not protected.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=456ffe4c68688f709ac05dc08027bfb6c8cde7d8;p=gcc.git

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
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c8657850ea2..f870e1c7ad5 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 60da5312b4f..9a356c16541 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 9e8bc0c65c8..efe1d891e0d 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 d8b58b56df1..0f404a57235 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 fa0f3a13e88..41dfbae9f06 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 f1f836a0e8a..4eac12063e9 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.