You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2004/11/01 03:06:29 UTC
cvs commit: jakarta-tapestry/framework/src/test/org/apache/tapestry/enhance TestJavaTypeUtils.java
hlship 2004/10/31 18:06:29
Modified: framework/src/java/org/apache/tapestry/param
ParameterManager.java
framework/src/java/org/apache/tapestry/enhance
EnhancementOperationImpl.java
Removed: framework/src/java/org/apache/tapestry/enhance
JavaTypeUtils.java
framework/src/test/org/apache/tapestry/enhance
TestJavaTypeUtils.java
Log:
Move some logic related to primitive Java types and arrays from Tapestry directly into HiveMind's DefaultClassResolver.
Revision Changes Path
1.5 +3 -47 jakarta-tapestry/framework/src/java/org/apache/tapestry/param/ParameterManager.java
Index: ParameterManager.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/param/ParameterManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ParameterManager.java 5 Oct 2004 17:28:55 -0000 1.4
+++ ParameterManager.java 1 Nov 2004 02:06:28 -0000 1.5
@@ -16,12 +16,8 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
-
-import ognl.PropertyAccessor;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -33,7 +29,6 @@
import org.apache.tapestry.IComponent;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.Tapestry;
-import org.apache.tapestry.enhance.JavaTypeUtils;
import org.apache.tapestry.spec.Direction;
import org.apache.tapestry.spec.IComponentSpecification;
import org.apache.tapestry.spec.IParameterSpecification;
@@ -49,38 +44,6 @@
{
private static final Log LOG = LogFactory.getLog(ParameterManager.class);
- /**
- * Special types that aren't resolved by class lookups, including scalars, arrays of scalars,
- * etc.
- * <p>
- * There's some overlap here with ComponentClassFactory.
- */
-
- private static final Map SPECIAL_TYPE_MAP = new HashMap();
-
- static
- {
- SPECIAL_TYPE_MAP.put("boolean", boolean.class);
- SPECIAL_TYPE_MAP.put("boolean[]", boolean[].class);
- SPECIAL_TYPE_MAP.put("byte", byte.class);
- SPECIAL_TYPE_MAP.put("byte[]", byte[].class);
- SPECIAL_TYPE_MAP.put("char", char.class);
- SPECIAL_TYPE_MAP.put("char[]", char[].class);
- SPECIAL_TYPE_MAP.put("short", short.class);
- SPECIAL_TYPE_MAP.put("short[]", short[].class);
- SPECIAL_TYPE_MAP.put("int", int.class);
- SPECIAL_TYPE_MAP.put("int[]", int[].class);
- SPECIAL_TYPE_MAP.put("long", long.class);
- SPECIAL_TYPE_MAP.put("long[]", long[].class);
- SPECIAL_TYPE_MAP.put("float", float.class);
- SPECIAL_TYPE_MAP.put("float[]", float[].class);
- SPECIAL_TYPE_MAP.put("double", double.class);
- SPECIAL_TYPE_MAP.put("double[]", double[].class);
-
- SPECIAL_TYPE_MAP.put("java.lang.Object[]", Object[].class);
- SPECIAL_TYPE_MAP.put("java.lang.String[]", String[].class);
- }
-
private IComponent _component;
private IParameterConnector[] _connectors;
@@ -300,18 +263,11 @@
return new ObjectParameterConnector(component, parameterName, binding, requiredType);
}
- private Class getType(String name, ClassResolver resolver)
+ private Class getType(String type, ClassResolver resolver)
{
- if (Tapestry.isBlank(name))
+ if (Tapestry.isBlank(type))
return null;
- Class result = (Class) SPECIAL_TYPE_MAP.get(name);
-
- if (result != null)
- return result;
-
- // Convert array references into the format needed by the resolver.
-
- return resolver.findClass(JavaTypeUtils.getJVMClassName(name));
+ return resolver.findClass(type);
}
}
1.3 +1 -6 jakarta-tapestry/framework/src/java/org/apache/tapestry/enhance/EnhancementOperationImpl.java
Index: EnhancementOperationImpl.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/enhance/EnhancementOperationImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EnhancementOperationImpl.java 31 Oct 2004 22:57:41 -0000 1.2
+++ EnhancementOperationImpl.java 1 Nov 2004 02:06:29 -0000 1.3
@@ -160,12 +160,7 @@
if (result == null)
{
- // This will shortly no longer be necesasry, when JavaTypeUtils' logic
- // is rolled into HiveMind's DefaultClassResolver.
-
- String jvmTypeName = JavaTypeUtils.getJVMClassName(type);
-
- result = _resolver.findClass(jvmTypeName);
+ result = _resolver.findClass(type);
_javaClassMapping.recordType(type, result);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org