[kaffe] CVS kaffe (robilad): Reswynced with GNU Classpath: swing, awt and serialzation fixes

[Kaffe CVS]

PatchSet 6827 
Date: 2005/08/14 17:06:50
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Reswynced with GNU Classpath: swing, awt and serialzation fixes

2005-08-14  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-08-13  Mark Wielaard  <mark at klomp.org>

        * gnu/java/awt/peer/gtk/GtkComponentPeer.java (repaintTimer): Make
        field final.

        2005-08-14  Sven de Marothy  <sven at physto.se>

        * java/awt/Container.java
        (addImpl): Call addNotify() only if the container has a peer.

        2005-08-13  Jeroen Frijters  <jeroen at frijters.net>

        * java/io/ObjectInputStream.java
        (readClassDescriptor): Don't cache caller's class loader.
        (resolveClass): Don't cache caller's class loader and support
        primitive types. Fixes bug #23377.

Members: 
	ChangeLog:1.4351->1.4352 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkComponentPeer.java:1.20->1.21 
	libraries/javalib/java/awt/Container.java:1.39->1.40 
	libraries/javalib/java/io/ObjectInputStream.java:1.56->1.57 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4351 kaffe/ChangeLog:1.4352
--- kaffe/ChangeLog:1.4351	Sun Aug 14 16:06:15 2005
+++ kaffe/ChangeLog	Sun Aug 14 17:06:50 2005
@@ -1,5 +1,26 @@
 2005-08-14  Dalibor Topic  <robilad at kaffe.org>
 
+	Resynced with GNU Classpath.
+
+	2005-08-13  Mark Wielaard  <mark at klomp.org>
+
+        * gnu/java/awt/peer/gtk/GtkComponentPeer.java (repaintTimer): Make
+        field final.
+
+	2005-08-14  Sven de Marothy  <sven at physto.se>
+
+        * java/awt/Container.java
+        (addImpl): Call addNotify() only if the container has a peer.
+
+	2005-08-13  Jeroen Frijters  <jeroen at frijters.net>
+
+        * java/io/ObjectInputStream.java
+        (readClassDescriptor): Don't cache caller's class loader.
+        (resolveClass): Don't cache caller's class loader and support
+        primitive types. Fixes bug #23377.
+
+2005-08-14  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/clib/awt/classpath-qt/Makefile.am
 	(libqtpeer_la_MOC) Renamed generated moc cpp file to
 	a header file to avoid having it compiled twice.
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkComponentPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkComponentPeer.java:1.20 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkComponentPeer.java:1.21
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkComponentPeer.java:1.20	Sat Aug 13 21:45:47 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkComponentPeer.java	Sun Aug 14 17:06:53 2005
@@ -85,7 +85,7 @@
 
   boolean isInRepaint;
 
-  Timer repaintTimer = new Timer (true);
+  static final Timer repaintTimer = new Timer (true);
 
   /* this isEnabled differs from Component.isEnabled, in that it
      knows if a parent is disabled.  In that case Component.isEnabled 
Index: kaffe/libraries/javalib/java/awt/Container.java
diff -u kaffe/libraries/javalib/java/awt/Container.java:1.39 kaffe/libraries/javalib/java/awt/Container.java:1.40
--- kaffe/libraries/javalib/java/awt/Container.java:1.39	Sat Aug 13 21:45:49 2005
+++ kaffe/libraries/javalib/java/awt/Container.java	Sun Aug 14 17:06:53 2005
@@ -341,11 +341,11 @@
           comp.parent.remove(comp);
         comp.parent = this;
 
-        // Notify the component that it has a new parent.
-        comp.addNotify();
-
         if (peer != null)
           {
+	    // Notify the component that it has a new parent.
+	    comp.addNotify();
+
             if (comp.isLightweight ())
 	      {
 		enableEvents (comp.eventMask);
Index: kaffe/libraries/javalib/java/io/ObjectInputStream.java
diff -u kaffe/libraries/javalib/java/io/ObjectInputStream.java:1.56 kaffe/libraries/javalib/java/io/ObjectInputStream.java:1.57
--- kaffe/libraries/javalib/java/io/ObjectInputStream.java:1.56	Mon Aug  8 02:52:24 2005
+++ kaffe/libraries/javalib/java/io/ObjectInputStream.java	Sun Aug 14 17:06:53 2005
@@ -501,8 +501,7 @@
 						  flags, fields);
     assignNewHandle(osc);
 
-    if (callersClassLoader == null)
-      callersClassLoader = currentLoader();
+    ClassLoader callersClassLoader = currentLoader();
 	      
     for (int i = 0; i < field_count; i++)
       {
@@ -741,16 +740,34 @@
   protected Class resolveClass(ObjectStreamClass osc)
     throws ClassNotFoundException, IOException
   {
-    if (callersClassLoader == null)
+    String name = osc.getName();
+    try
       {
-	callersClassLoader = currentLoader ();
-	if (DEBUG && dump)
-	  {
-	    dumpElementln ("CallersClassLoader = " + callersClassLoader);
-	  }
+        return Class.forName(name, true, currentLoader());
+      }
+    catch(ClassNotFoundException x)
+      {
+        if (name.equals("void"))
+          return Void.TYPE;
+        else if (name.equals("boolean"))
+          return Boolean.TYPE;
+        else if (name.equals("byte"))
+          return Byte.TYPE;
+        else if (name.equals("char"))
+          return Character.TYPE;
+        else if (name.equals("short"))
+          return Short.TYPE;
+        else if (name.equals("int"))
+          return Integer.TYPE;
+        else if (name.equals("long"))
+          return Long.TYPE;
+        else if (name.equals("float"))
+          return Float.TYPE;
+        else if (name.equals("double"))
+          return Double.TYPE;
+        else
+          throw x;
       }
-
-    return Class.forName(osc.getName(), true, callersClassLoader);
   }
 
   /**
@@ -1871,7 +1888,6 @@
   private Hashtable classLookupTable;
   private GetField prereadFields;
 
-  private ClassLoader callersClassLoader;
   private static boolean dump;
 
   // The nesting depth for debugging output