Patch: 1.2 cleanups

Tom Tromey tromey@redhat.com
Wed Dec 6 13:14:00 GMT 2000


Here are a few more 1.2 cleanups.

2000-12-05  Tom Tromey  <tromey@redhat.com>

	* java/awt/GridBagConstraints.java: New file.

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

Tom

Index: java/util/BitSet.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/util/BitSet.java,v
retrieving revision 1.10
diff -u -r1.10 BitSet.java
--- BitSet.java	2000/10/30 01:51:34	1.10
+++ BitSet.java	2000/12/06 21:12:44
@@ -45,7 +45,7 @@
  * @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.
Index: java/util/Set.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/util/Set.java,v
retrieving revision 1.1
diff -u -r1.1 Set.java
--- Set.java	2000/08/19 18:19:42	1.1
+++ Set.java	2000/12/06 21:12:44
@@ -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.
 
Index: java/text/Collator.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/text/Collator.java,v
retrieving revision 1.7
diff -u -r1.7 Collator.java
--- Collator.java	2000/11/17 20:42:54	1.7
+++ Collator.java	2000/12/06 21:12:44
@@ -132,9 +132,9 @@
   }
 
   // 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;
 }
Index: java/text/DateFormatSymbols.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/text/DateFormatSymbols.java,v
retrieving revision 1.7
diff -u -r1.7 DateFormatSymbols.java
--- DateFormatSymbols.java	2000/11/28 20:11:46	1.7
+++ DateFormatSymbols.java	2000/12/06 21:12:44
@@ -265,7 +265,7 @@
   }
 
   /* 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;
Index: java/text/DecimalFormatSymbols.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/text/DecimalFormatSymbols.java,v
retrieving revision 1.5
diff -u -r1.5 DecimalFormatSymbols.java
--- DecimalFormatSymbols.java	2000/12/04 10:20:00	1.5
+++ DecimalFormatSymbols.java	2000/12/06 21:12:45
@@ -72,8 +72,8 @@
       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)


More information about the Java-patches mailing list