OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Jeroen Frijters 2004-09-24 05:58:28 +00:00 committed by Michael Koch
parent 049930c8dd
commit e6ab8dc2e7
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -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,

14
libjava/java/lang/StackTraceElement.java
View File

@ -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);
}