[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath

[Kaffe CVS]

PatchSet 4269 
Date: 2004/01/03 03:15:10
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath

2004-01-03  Dalibor Topic <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2003-12-27  Michael Koch  <konqueror at gmx.de>

        * java/io/ObjectStreamField.java
        (isShared): Documentation added.

Members: 
	ChangeLog:1.1856->1.1857 
	libraries/javalib/java/io/ObjectStreamField.java:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1856 kaffe/ChangeLog:1.1857
--- kaffe/ChangeLog:1.1856	Sat Jan  3 03:08:28 2004
+++ kaffe/ChangeLog	Sat Jan  3 03:15:10 2004
@@ -2,6 +2,15 @@
 
 	Resynced with GNU Classpath.
 
+	2003-12-27  Michael Koch  <konqueror at gmx.de>
+
+        * java/io/ObjectStreamField.java
+        (isShared): Documentation added.
+
+2004-01-03  Dalibor Topic <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2003-12-29 Guilhem Lavaux <guilhem at kaffe.org>
 
         * java/io/ObjectInputStream.java: Use if instead of catching
Index: kaffe/libraries/javalib/java/io/ObjectStreamField.java
diff -u kaffe/libraries/javalib/java/io/ObjectStreamField.java:1.4 kaffe/libraries/javalib/java/io/ObjectStreamField.java:1.5
--- kaffe/libraries/javalib/java/io/ObjectStreamField.java:1.4	Sun Dec 14 09:26:56 2003
+++ kaffe/libraries/javalib/java/io/ObjectStreamField.java	Sat Jan  3 03:15:11 2004
@@ -108,7 +108,7 @@
         type = Object.class; //FIXME: ???
       }
   }
-
+  
   /**
    * There are many cases you can not get java.lang.Class from typename 
    * if your context class loader cann not load it, then use typename to
@@ -206,6 +206,10 @@
   }
 
   /**
+   * This method returns whether the field represented by this object is
+   * unshared or not.
+   *
+   * @return Tells if this field is unshared or not.
    */
   public boolean isUnshared ()
   {
@@ -289,17 +293,6 @@
   boolean isToSet()
   {
     return toset;
-  }
-
-  /**
-   * This methods should only be used by {@link java.io.ObjectOutputStream#writeFields}
-   * as it changes the type on demand (which should never happen). However it seems
-   * that Sun's JDK has not a precise idea of the type of the field until we assign
-   * for the first time with {@link java.io.ObjectOutputStream.PutField#put}.
-   */
-  void setType(Class type)
-  {
-    this.type = type;
   }
 
   public String toString ()