You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2009/04/23 00:12:59 UTC
svn commit: r767690 - in /labs/magma/trunk/foundation-beans/src:
main/java/org/apache/magma/beans/ main/java/org/apache/magma/conversion/
main/java/org/apache/magma/conversion/utils/ main/resources/
main/resources/META-INF/ test/java/org/apache/magma/c...
Author: simoneg
Date: Wed Apr 22 22:12:57 2009
New Revision: 767690
URL: http://svn.apache.org/viewvc?rev=767690&view=rev
Log:
LABS-351 : conversion inside foundation-beans, files moved
Added:
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/AddConversionInHandler.aj (props changed)
- copied unchanged from r765256, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/AddConversionInHandler.aj
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/AddConverterInPropertyInfo.aj (props changed)
- copied unchanged from r735585, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/AddConverterInPropertyInfo.aj
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/BaseConverter.java (props changed)
- copied unchanged from r735585, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/BaseConverter.java
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/BigDecimalConverter.java (props changed)
- copied unchanged from r735585, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/BigDecimalConverter.java
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/BigIntegerConverter.java (props changed)
- copied unchanged from r735585, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/BigIntegerConverter.java
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/BooleanConverter.java (props changed)
- copied unchanged from r735585, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/BooleanConverter.java
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/ByteConverter.java (props changed)
- copied unchanged from r735585, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/ByteConverter.java
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/ClassConverter.java (props changed)
- copied unchanged from r735585, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/ClassConverter.java
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/ConversionException.java (props changed)
- copied unchanged from r735585, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/ConversionException.java
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/Converter.java (props changed)
- copied unchanged from r735585, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/Converter.java
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/Converters.java (props changed)
- copied unchanged from r735585, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/Converters.java
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/DateConverter.java (props changed)
- copied unchanged from r735585, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/DateConverter.java
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/DoubleConverter.java (props changed)
- copied unchanged from r735585, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/DoubleConverter.java
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/EnumConverter.java (props changed)
- copied unchanged from r735585, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/EnumConverter.java
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/FloatConverter.java (props changed)
- copied unchanged from r735585, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/FloatConverter.java
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/HookConversionToHandler.aj (props changed)
- copied unchanged from r735585, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/HookConversionToHandler.aj
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/IntegerConverter.java (props changed)
- copied unchanged from r735585, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/IntegerConverter.java
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/LongConverter.java (props changed)
- copied unchanged from r735585, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/LongConverter.java
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/PrimitiveTypeConverter.java (props changed)
- copied unchanged from r735585, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/PrimitiveTypeConverter.java
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/ShortConverter.java (props changed)
- copied unchanged from r735585, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/ShortConverter.java
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/StringConverter.java (props changed)
- copied unchanged from r735585, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/StringConverter.java
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/utils/ (props changed)
- copied from r735585, labs/magma/trunk/foundation-conversion/src/main/java/org/apache/magma/conversion/utils/
labs/magma/trunk/foundation-beans/src/main/resources/
labs/magma/trunk/foundation-beans/src/main/resources/META-INF/ (props changed)
- copied from r735585, labs/magma/trunk/foundation-conversion/src/main/resources/META-INF/
labs/magma/trunk/foundation-beans/src/test/java/org/apache/magma/conversion/ (props changed)
- copied from r735585, labs/magma/trunk/foundation-conversion/src/test/java/org/apache/magma/conversion/
Modified:
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/beans/PropertyInfo.java
Modified: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/beans/PropertyInfo.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/beans/PropertyInfo.java?rev=767690&r1=767689&r2=767690&view=diff
==============================================================================
--- labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/beans/PropertyInfo.java (original)
+++ labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/beans/PropertyInfo.java Wed Apr 22 22:12:57 2009
@@ -17,6 +17,7 @@
package org.apache.magma.beans;
import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.Collection;
@@ -141,7 +142,18 @@
public void init(PropertyDescriptor descriptor, Class beanClass) {
this.beanClass = beanClass;
this.name = descriptor.getName();
- this.type = descriptor.getPropertyType();
+ Method readMethod = descriptor.getReadMethod();
+ Method writeMethod = descriptor.getWriteMethod();
+ Consider consider = null;
+ if (readMethod != null) consider = readMethod.getAnnotation(Consider.class);
+ if (consider == null && writeMethod != null) consider = writeMethod.getAnnotation(Consider.class);
+ if (consider != null) {
+
+ this.type = consider.value();
+ } else {
+ this.type = descriptor.getPropertyType();
+ }
+
this.readable = descriptor.getReadMethod() != null;
this.writeable = descriptor.getWriteMethod() != null;
if (this.type != null) {
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/AddConversionInHandler.aj
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/AddConverterInPropertyInfo.aj
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/BaseConverter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/BigDecimalConverter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/BigIntegerConverter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/BooleanConverter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/ByteConverter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/ClassConverter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/ConversionException.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/Converter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/Converters.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/DateConverter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/DoubleConverter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/EnumConverter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/FloatConverter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/HookConversionToHandler.aj
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/IntegerConverter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/LongConverter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/PrimitiveTypeConverter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/ShortConverter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/StringConverter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/utils/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/main/resources/META-INF/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: labs/magma/trunk/foundation-beans/src/test/java/org/apache/magma/conversion/
------------------------------------------------------------------------------
svn:mergeinfo =
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org