You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by js...@apache.org on 2002/03/07 01:34:24 UTC
cvs commit: jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/io BeanCreateRule.java
jstrachan 02/03/06 16:34:24
Modified: betwixt/src/java/org/apache/commons/betwixt
XMLIntrospector.java
betwixt/src/java/org/apache/commons/betwixt/digester
XMLIntrospectorHelper.java
betwixt/src/java/org/apache/commons/betwixt/io
BeanCreateRule.java
Log:
Applied patch for better handling of primitive types in a consistent manner.
Revision Changes Path
1.20 +7 -17 jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/XMLIntrospector.java
Index: XMLIntrospector.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/XMLIntrospector.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XMLIntrospector.java 4 Mar 2002 03:15:54 -0000 1.19
+++ XMLIntrospector.java 7 Mar 2002 00:34:24 -0000 1.20
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/XMLIntrospector.java,v 1.19 2002/03/04 03:15:54 jstrachan Exp $
- * $Revision: 1.19 $
- * $Date: 2002/03/04 03:15:54 $
+ * $Header: /home/cvs/jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/XMLIntrospector.java,v 1.20 2002/03/07 00:34:24 jstrachan Exp $
+ * $Revision: 1.20 $
+ * $Date: 2002/03/07 00:34:24 $
*
* ====================================================================
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id: XMLIntrospector.java,v 1.19 2002/03/04 03:15:54 jstrachan Exp $
+ * $Id: XMLIntrospector.java,v 1.20 2002/03/07 00:34:24 jstrachan Exp $
*/
package org.apache.commons.betwixt;
@@ -100,7 +100,7 @@
* Later requests for the same class will return the cached value.</p>
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
- * @version $Revision: 1.19 $
+ * @version $Revision: 1.20 $
*/
public class XMLIntrospector {
@@ -433,22 +433,12 @@
/** Returns true if the type is a loop type */
public boolean isLoopType(Class type) {
- return type.isArray()
- || Map.class.isAssignableFrom( type )
- || Collection.class.isAssignableFrom( type )
- || Enumeration.class.isAssignableFrom( type )
- || Iterator.class.isAssignableFrom( type );
+ return XMLIntrospectorHelper.isLoopType(type);
}
/** Returns true for primitive types */
public boolean isPrimitiveType(Class type) {
- if ( type.equals( Object.class ) ) {
- return false;
- }
- return type.getName().startsWith( "java.lang." )
- || type.isAssignableFrom( Number.class )
- || type.isAssignableFrom( String.class )
- || type.isAssignableFrom( Date.class );
+ return XMLIntrospectorHelper.isPrimitiveType(type);
}
}
1.3 +9 -6 jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/digester/XMLIntrospectorHelper.java
Index: XMLIntrospectorHelper.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/digester/XMLIntrospectorHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLIntrospectorHelper.java 4 Mar 2002 03:15:54 -0000 1.2
+++ XMLIntrospectorHelper.java 7 Mar 2002 00:34:24 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/digester/XMLIntrospectorHelper.java,v 1.2 2002/03/04 03:15:54 jstrachan Exp $
- * $Revision: 1.2 $
- * $Date: 2002/03/04 03:15:54 $
+ * $Header: /home/cvs/jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/digester/XMLIntrospectorHelper.java,v 1.3 2002/03/07 00:34:24 jstrachan Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/03/07 00:34:24 $
*
* ====================================================================
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id: XMLIntrospectorHelper.java,v 1.2 2002/03/04 03:15:54 jstrachan Exp $
+ * $Id: XMLIntrospectorHelper.java,v 1.3 2002/03/07 00:34:24 jstrachan Exp $
*/
package org.apache.commons.betwixt.digester;
@@ -97,7 +97,7 @@
* common code shared between the digestor and introspector.</p>
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class XMLIntrospectorHelper {
@@ -369,7 +369,10 @@
/** Returns true for primitive types */
public static boolean isPrimitiveType(Class type) {
- if ( type.equals( Object.class ) ) {
+ if ( type.isPrimitive() ) {
+ return true;
+ }
+ else if ( type.equals( Object.class ) ) {
return false;
}
return type.getName().startsWith( "java.lang." )
1.5 +3 -3 jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/io/BeanCreateRule.java
Index: BeanCreateRule.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/io/BeanCreateRule.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BeanCreateRule.java 4 Mar 2002 03:15:54 -0000 1.4
+++ BeanCreateRule.java 7 Mar 2002 00:34:24 -0000 1.5
@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*
- * $Id: BeanCreateRule.java,v 1.4 2002/03/04 03:15:54 jstrachan Exp $
+ * $Id: BeanCreateRule.java,v 1.5 2002/03/07 00:34:24 jstrachan Exp $
*/
package org.apache.commons.betwixt.io;
@@ -33,7 +33,7 @@
* from the betwixt XML metadata.</p>
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class BeanCreateRule extends Rule {
@@ -258,7 +258,7 @@
else {
// maybe we are adding a primitve type to a collection/array
Class beanClass = descriptor.getSingularPropertyType();
- return beanClass.isPrimitive() || XMLIntrospectorHelper.isPrimitiveType( beanClass );
+ return XMLIntrospectorHelper.isPrimitiveType( beanClass );
}
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>