Changes to Merge
----------------

1) svn current trunk - svn belanger/sandbox

Completely done.

*** Classes ***

java/lang/reflect/Method.java: indentation
build.xml: not done, version number

*** Native ***

My versions our out of date with the trunk:
include/jni_system_specific.h
fdlibm/ieeefp.h



2) svn CVS->svn trunk - current trunk

Done except changes to get it to compile under FreeBSD and Mac OS X.


*** Classes ***

java/lang/reflect/Method.java: Done.

build.xml: no longer relevant

*** Native ***

configure.ac: no longer relevant

include/jni_system_specific.h: not sure if relevant to Classpath

src/java-io/java_nio.c: Not done.  Small fix to get it to compile on Mac OS X.  Don't know if still needed.

src/java-io/java_io_File.c: the 2 bugs have already been fixed.


src/fdlibm/ieeefp.h: already done.

src/fdlibm/mprec.h: Not done.  Small changes to get it to work on FreeBSD and Mac OS X.  Don't know how to detect FreeBSD.




3) Classpath CVS - Sablepath CVS

Current status: Mostly done.




Legend:
- done (all change done)
- bug seems to be fixed (code reimplemented - bug may have been fixed but not
  verify)
- lib to rename (native lib not renamed)
- indent only (change only in indentation, was not done)

*** Classes ***

gnu/java/awt/image/GdkPixbufDecoder.java
gnu/java/awt/peer/gtk/GtkToolkit.java
  (libname to change)

gnu/java/io/encode/EncoderUTF8.java: already done

gnu/java/lang/SystemClassLoader.java: done
gnu/java/math/MPN.java: indent only
java/awt/datatransfer/DataFlavor.java: indent only
java/io/File.java:
  - bug fix done
  - lib not renamed
java/io/FileDescriptor.java: lib to rename
java/io/FileInputStream.java: lib to rename, bug seems fixed.
java/io/FileOutputStream.java: lib to rename
java/io/LineNumberReader.java: bug seems fixed.
java/io/ObjectInputStream.java: bug fixed, but lib not renamed
java/io/ObjectOutputStream.java: lib to rename
java/io/ObjectStreamClass.java: lib to rename
java/io/RandomAccessFile.java: lib to rename




>>> java/lang/Class.java: most changes done but not reflection.  Integrated as much as possible with VMClass.


java/lang/ClassLoader.java: in progress


java/lang/Double.java:
java/lang/Float.java:



java/lang/Integer.java:


java/lang/Object.java: done

java/lang/Runtime.java: done

java/lang/SecurityManager.java: done

java/lang/StackTraceElement.java: done

java/lang/String.java: done

java/lang/System.java: lib to rename, other changes done



java/lang/Thread: done

java/lang/Throwable.java: done

java/lang/VMClassLoader: done

java/lang/reflect/Array.java: done


// Done need to check
java/lang/reflect/Constructor.java
java/lang/reflect/Method.java
java/lang/reflect/Field.java



java/net/InetAddress.java: lib to rename
java/net/PlainDatagramSocketImpl.java: lib to rename
java/net/PlainSocketImpl.java: lib to rename
java/util/TimeZone.java: lib to rename

java/util/prefs/AbstractPreferences.java: indentation
java/util/prefs/Preferences.java: indentation
javax/naming/NamingException.java: indentation
javax/swing/BorderFactory.java: indentation
javax/swing/JComponent.java: indentation


*** Native libs ***

Note: Etienne added GNU Classpath copyright to the Makefile.am from Classpath.  I didn't do these change as I am assuming GNU Classpath would add them if they want to add them.

Note: I did not change the Makefile.am.  I am assuming they have been fixed or
the changes were only relevant to Sablepath.

classpath/jcl.c: fix already done

java-io/java_io_File.c: done (bug fix)

>>> src/java-io/java_io_ObjectInputStream.c: it was changed, don't know if it is okay or not.

java-io/javaio.c: fix already done


===============








----- end -----




==================