[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: serialization fix for StackTraceElement

[Kaffe CVS]

PatchSet 5195 
Date: 2004/09/21 12:22:08
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: serialization fix for StackTraceElement

2004-09-21  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/lang/StackTraceElement.java:
        Resynced with GNU Classpath.

        2004-09-20  Jeroen Frijters  <jeroen at frijters.net>

        * java/lang/StackTraceElement.java
        (className): Renamed field to declaringClass to be compatible
        with Sun serialization format.

Members: 
	ChangeLog:1.2750->1.2751 
	libraries/javalib/java/lang/StackTraceElement.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2750 kaffe/ChangeLog:1.2751
--- kaffe/ChangeLog:1.2750	Tue Sep 21 12:05:10 2004
+++ kaffe/ChangeLog	Tue Sep 21 12:22:08 2004
@@ -1,5 +1,16 @@
 2004-09-21  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/lang/StackTraceElement.java:
+	Resynced with GNU Classpath.
+
+	2004-09-20  Jeroen Frijters  <jeroen at frijters.net>
+
+        * java/lang/StackTraceElement.java
+        (className): Renamed field to declaringClass to be compatible
+        with Sun serialization format.
+
+2004-09-21  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/gnu/java/rmi/server/UnicastServer.java,
 	libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java:
         Resynced with GNU Classpath.
Index: kaffe/libraries/javalib/java/lang/StackTraceElement.java
diff -u kaffe/libraries/javalib/java/lang/StackTraceElement.java:1.1 kaffe/libraries/javalib/java/lang/StackTraceElement.java:1.2
--- kaffe/libraries/javalib/java/lang/StackTraceElement.java:1.1	Wed Nov  6 11:52:25 2002
+++ kaffe/libraries/javalib/java/lang/StackTraceElement.java	Tue Sep 21 12:22:11 2004
@@ -77,7 +77,7 @@
    *
    * @serial the enclosing class, if known
    */
-  private final String className;
+  private final String declaringClass;
 
   /**
    * The method name in the class, null if unknown.
@@ -106,7 +106,7 @@
   {
     this.fileName = fileName;
     this.lineNumber = lineNumber;
-    this.className = className;
+    this.declaringClass = className;
     this.methodName = methodName;
     this.isNative = isNative;
   }
@@ -142,7 +142,7 @@
    */
   public String getClassName()
   {
-    return className;
+    return declaringClass;
   }
 
   /**
@@ -183,9 +183,9 @@
   public String toString()
   {
     StringBuffer sb = new StringBuffer();
-    if (className != null)
+    if (declaringClass != null)
       {
-        sb.append(className);
+        sb.append(declaringClass);
         if (methodName != null)
           sb.append('.');
       }
@@ -217,7 +217,7 @@
     StackTraceElement e = (StackTraceElement) o;
     return equals(fileName, e.fileName)
       && lineNumber == e.lineNumber
-      && equals(className, e.className)
+      && equals(declaringClass, e.declaringClass)
       && equals(methodName, e.methodName);
   }
 
@@ -230,7 +230,7 @@
    */
   public int hashCode()
   {
-    return hashCode(fileName) ^ lineNumber ^ hashCode(className)
+    return hashCode(fileName) ^ lineNumber ^ hashCode(declaringClass)
       ^ hashCode(methodName);
   }