You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2009/07/23 17:59:40 UTC
svn commit: r797121 - in
/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container:
BeanRecipe.java GenericType.java
Author: gawor
Date: Thu Jul 23 15:59:40 2009
New Revision: 797121
URL: http://svn.apache.org/viewvc?rev=797121&view=rev
Log:
fix argument reordering
Modified:
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BeanRecipe.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/GenericType.java
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BeanRecipe.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BeanRecipe.java?rev=797121&r1=797120&r2=797121&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BeanRecipe.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BeanRecipe.java Thu Jul 23 15:59:40 2009
@@ -686,7 +686,7 @@
continue;
}
if (forcedType != null) {
- if (forcedType != entry.type) {
+ if (!forcedType.equals(entry.type)) {
continue;
}
} else if (arg != null) {
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/GenericType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/GenericType.java?rev=797121&r1=797120&r2=797121&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/GenericType.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/GenericType.java Thu Jul 23 15:59:40 2009
@@ -142,6 +142,32 @@
return cl.getName();
}
+ public boolean equals(Object object) {
+ if (!(object instanceof GenericType)) {
+ return false;
+ }
+ GenericType other = (GenericType) object;
+ if (getRawClass() != other.getRawClass()) {
+ return false;
+ }
+ if (parameters == null) {
+ return (other.parameters == null);
+ } else {
+ if (other.parameters == null) {
+ return false;
+ }
+ if (parameters.length != other.parameters.length) {
+ return false;
+ }
+ for (int i = 0; i < parameters.length; i++) {
+ if (!parameters[i].equals(other.parameters[i])) {
+ return false;
+ }
+ }
+ return true;
+ }
+ }
+
static GenericType[] parametersOf(Type type) {
if (type instanceof Class) {
Class clazz = (Class) type;