You are viewing a plain text version of this content. The canonical link for it is here.
Posted to bcel-dev@jakarta.apache.org by db...@apache.org on 2005/02/10 07:18:41 UTC
svn commit: r153170 - in jakarta/bcel/trunk/src/java/org/apache/bcel:
generic/ verifier/ verifier/structurals/
Author: dbrosius
Date: Wed Feb 9 22:18:38 2005
New Revision: 153170
URL: http://svn.apache.org/viewcvs?view=rev&rev=153170
Log:
Apply Patch 33018 add missing hashCode methods for those classes that implement .equals(Object) and fix the capitalization of wrongly defined hashcode methods.
Modified:
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ArrayType.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/BasicType.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LocalVariableGen.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ReturnaddressType.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/VerificationResult.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/Frame.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/LocalVariables.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/OperandStack.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/UninitializedObjectType.java
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ArrayType.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ArrayType.java?view=diff&r1=153169&r2=153170
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ArrayType.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ArrayType.java Wed Feb 9 22:18:38 2005
@@ -105,7 +105,7 @@
/** @return a hash code value for the object.
*/
- public int hashcode() { return basic_type.hashCode() ^ dimensions; }
+ public int hashCode() { return basic_type.hashCode() ^ dimensions; }
/** @return true if both type objects refer to the same array type.
*/
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/generic/BasicType.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/generic/BasicType.java?view=diff&r1=153169&r2=153170
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/generic/BasicType.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/generic/BasicType.java Wed Feb 9 22:18:38 2005
@@ -55,6 +55,10 @@
}
}
+ /** @return a hash code value for the object.
+ */
+ public int hashCode() { return (int)type; }
+
/** @return true if both type objects refer to the same type
*/
public boolean equals(Object type) {
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LocalVariableGen.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LocalVariableGen.java?view=diff&r1=153169&r2=153170
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LocalVariableGen.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LocalVariableGen.java Wed Feb 9 22:18:38 2005
@@ -139,6 +139,10 @@
return (start == ih) || (end == ih);
}
+ /** @return a hash code value for the object.
+ */
+ public int hashCode() { return index ^ start.hashCode() ^ end.hashCode(); }
+
/**
* We consider to local variables to be equal, if the use the same index and
* are valid in the same range.
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ReturnaddressType.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ReturnaddressType.java?view=diff&r1=153169&r2=153170
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ReturnaddressType.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ReturnaddressType.java Wed Feb 9 22:18:38 2005
@@ -46,6 +46,10 @@
this.returnTarget = returnTarget;
}
+ /** @return a hash code value for the object.
+ */
+ public int hashCode() { return returnTarget.hashCode(); }
+
/**
* Returns if the two Returnaddresses refer to the same target.
*/
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/VerificationResult.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/VerificationResult.java?view=diff&r1=153169&r2=153170
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/VerificationResult.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/VerificationResult.java Wed Feb 9 22:18:38 2005
@@ -75,6 +75,10 @@
return detailMessage;
}
+ /** @return a hash code value for the object.
+ */
+ public int hashCode() { return numeric ^ detailMessage.hashCode(); }
+
/**
* Returns if two VerificationResult instances are equal.
*/
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/Frame.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/Frame.java?view=diff&r1=153169&r2=153170
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/Frame.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/Frame.java Wed Feb 9 22:18:38 2005
@@ -91,6 +91,10 @@
return stack;
}
+ /** @return a hash code value for the object.
+ */
+ public int hashCode() { return stack.hashCode() ^ locals.hashCode(); }
+
/**
*
*/
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/LocalVariables.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/LocalVariables.java?view=diff&r1=153169&r2=153170
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/LocalVariables.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/LocalVariables.java Wed Feb 9 22:18:38 2005
@@ -88,6 +88,10 @@
locals[i] = type;
}
+ /** @return a hash code value for the object.
+ */
+ public int hashCode() { return locals.length; }
+
/*
* Fulfills the general contract of Object.equals().
*/
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/OperandStack.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/OperandStack.java?view=diff&r1=153169&r2=153170
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/OperandStack.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/OperandStack.java Wed Feb 9 22:18:38 2005
@@ -70,6 +70,10 @@
stack = new ArrayList();
}
+ /** @return a hash code value for the object.
+ */
+ public int hashCode() { return stack.hashCode(); }
+
/**
* Returns true if and only if this OperandStack
* equals another, meaning equal lengths and equal
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/UninitializedObjectType.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/UninitializedObjectType.java?view=diff&r1=153169&r2=153170
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/UninitializedObjectType.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/UninitializedObjectType.java Wed Feb 9 22:18:38 2005
@@ -47,6 +47,10 @@
return initialized;
}
+ /** @return a hash code value for the object.
+ */
+ public int hashCode() { return initialized.hashCode(); }
+
/**
* Returns true on equality of this and o.
* Equality means the ObjectType instances of "initialized"
---------------------------------------------------------------------
To unsubscribe, e-mail: bcel-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: bcel-dev-help@jakarta.apache.org