2004-09-24 Jeroen Frijters <jeroen@frijters.net>

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

From-SVN: r88012

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index acc03bfb717e7b19aaf3d027eb4537da79aac749..c48fea108bb8830163d06dfcf353c5217b1fd084 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-24  Jeroen Frijters  <jeroen@frijters.net>
+
+       * java/lang/StackTraceElement.java
+       (className): Renamed field to declaringClass to be compatible
+       with Sun serialization format.
+
 2004-09-23  Michael Koch  <konqueror@gmx.de>
 
        * java/applet/AppletContext.java,

diff --git a/libjava/java/lang/StackTraceElement.java b/libjava/java/lang/StackTraceElement.java
index d9e8a31b72483778df90dde4398c7339d0685f06..e1e07f3fb2d7d97cdb782727ec5bfb8510b54a68 100644 (file)
--- a/libjava/java/lang/StackTraceElement.java
+++ b/libjava/java/lang/StackTraceElement.java
@@ -77,7 +77,7 @@ public class StackTraceElement implements Serializable
    *
    * @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 @@ public class StackTraceElement implements Serializable
   {
     this.fileName = fileName;
     this.lineNumber = lineNumber;
-    this.className = className;
+    this.declaringClass = className;
     this.methodName = methodName;
     this.isNative = isNative;
   }
@@ -142,7 +142,7 @@ public class StackTraceElement implements Serializable
    */
   public String getClassName()
   {
-    return className;
+    return declaringClass;
   }
 
   /**
@@ -183,9 +183,9 @@ public class StackTraceElement implements Serializable
   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 @@ public class StackTraceElement implements Serializable
     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 class StackTraceElement implements Serializable
    */
   public int hashCode()
   {
-    return hashCode(fileName) ^ lineNumber ^ hashCode(className)
+    return hashCode(fileName) ^ lineNumber ^ hashCode(declaringClass)
       ^ hashCode(methodName);
   }