Commit e6ab8dc2 by Jeroen Frijters Committed by Michael Koch

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
parent 049930c8
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> 2004-09-23 Michael Koch <konqueror@gmx.de>
* java/applet/AppletContext.java, * java/applet/AppletContext.java,
......
...@@ -77,7 +77,7 @@ public class StackTraceElement implements Serializable ...@@ -77,7 +77,7 @@ public class StackTraceElement implements Serializable
* *
* @serial the enclosing class, if known * @serial the enclosing class, if known
*/ */
private final String className; private final String declaringClass;
/** /**
* The method name in the class, null if unknown. * The method name in the class, null if unknown.
...@@ -106,7 +106,7 @@ public class StackTraceElement implements Serializable ...@@ -106,7 +106,7 @@ public class StackTraceElement implements Serializable
{ {
this.fileName = fileName; this.fileName = fileName;
this.lineNumber = lineNumber; this.lineNumber = lineNumber;
this.className = className; this.declaringClass = className;
this.methodName = methodName; this.methodName = methodName;
this.isNative = isNative; this.isNative = isNative;
} }
...@@ -142,7 +142,7 @@ public class StackTraceElement implements Serializable ...@@ -142,7 +142,7 @@ public class StackTraceElement implements Serializable
*/ */
public String getClassName() public String getClassName()
{ {
return className; return declaringClass;
} }
/** /**
...@@ -183,9 +183,9 @@ public class StackTraceElement implements Serializable ...@@ -183,9 +183,9 @@ public class StackTraceElement implements Serializable
public String toString() public String toString()
{ {
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
if (className != null) if (declaringClass != null)
{ {
sb.append(className); sb.append(declaringClass);
if (methodName != null) if (methodName != null)
sb.append('.'); sb.append('.');
} }
...@@ -217,7 +217,7 @@ public class StackTraceElement implements Serializable ...@@ -217,7 +217,7 @@ public class StackTraceElement implements Serializable
StackTraceElement e = (StackTraceElement) o; StackTraceElement e = (StackTraceElement) o;
return equals(fileName, e.fileName) return equals(fileName, e.fileName)
&& lineNumber == e.lineNumber && lineNumber == e.lineNumber
&& equals(className, e.className) && equals(declaringClass, e.declaringClass)
&& equals(methodName, e.methodName); && equals(methodName, e.methodName);
} }
...@@ -230,7 +230,7 @@ public class StackTraceElement implements Serializable ...@@ -230,7 +230,7 @@ public class StackTraceElement implements Serializable
*/ */
public int hashCode() public int hashCode()
{ {
return hashCode(fileName) ^ lineNumber ^ hashCode(className) return hashCode(fileName) ^ lineNumber ^ hashCode(declaringClass)
^ hashCode(methodName); ^ hashCode(methodName);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment