java.util Classpath/libgcj merging

Mark Wielaard mark@klomp.org
Sun Feb 18 08:07:00 GMT 2001


Hi,

The following patch merges some of the simpler classes from java.util with
the Classpath versions. It removes some RCS keywords to make it simpler to
see that the files in Classpath CVS and gcc CVS are actually the same version.
It reindents some files so they have the same indenting as the Classpath
versions. And it merges some simple classes, interfaces and exceptions.

2001-02-18  Mark Wielaard <mark@klomp.org>

    * java/util/ArrayList.java: Remove RCS keywords from comments
    * java/util/BasicMapEntry.java: idem
    * java/util/Dictionary.java: idem
    * java/util/HashMap.java: idem
    * java/util/HashSet.java: idem
    * java/util/TreeMap.java: idem
    * java/util/TreeSet.java: idem
    
    * java/util/EventObject.java: reindent
    * java/util/Properties.java: idem
    * java/util/SortedMap.java: idem
    
    * java/util/ConcurrentModificationException.java: merge with Classpath
    * java/util/EmptyStackException.java: idem
    * java/util/Enumeration.java: idem
    * java/util/EventListener.java: idem
    * java/util/MissingResourceException.java: idem
    * java/util/NoSuchElementException.java: idem
    * java/util/Observable.java: idem
    * java/util/Observer.java: idem
    * java/util/Stack.java: idem
    * java/util/TooManyListenersException.java: idem

After this patch only the following classes from java.util need merging:

java/util/Calendar.java
java/util/Date.java
java/util/GregorianCalendar.java
java/util/ListResourceBundle.java
java/util/Locale.java
java/util/PropertyResourceBundle.java
java/util/Random.java
java/util/ResourceBundle.java
java/util/StringTokenizer.java
java/util/TimeZone.java

OK to commit to the head/branch?

Note that I currently cannot actually test these changes with gcj because
the head seems broken on i386 and the branch seems broken on powerpc. Sigh.

Cheers,

Mark

-- 
Stuff to read:
    < http://www.toad.com/gnu/whatswrong.html >
  What's Wrong with Copy Protection, by John Gilmore



More information about the Java-patches mailing list