tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svkr...@apache.org
Subject svn commit: r502331 - /incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/AbstractPropertyProcessor.java
Date Thu, 01 Feb 2007 19:46:07 GMT
Author: svkrish
Date: Thu Feb  1 11:46:07 2007
New Revision: 502331

URL: http://svn.apache.org/viewvc?view=rev&rev=502331
Log:
changes to fix broken build

Modified:
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/AbstractPropertyProcessor.java

Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/AbstractPropertyProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/AbstractPropertyProcessor.java?view=diff&rev=502331&r1=502330&r2=502331
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/AbstractPropertyProcessor.java
(original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/AbstractPropertyProcessor.java
Thu Feb  1 11:46:07 2007
@@ -141,40 +141,27 @@
         for (int i = 0; i < params.length; i++) {
             Class<?> param = params[i];
             Annotation[] paramAnnotations = annotations[i];
-            JavaMappedProperty<?> property = null;
-            DataType propertyDataBinding = null;
-            A monitorAnnot = null;
-            String name = null;
             for (Annotation annotation : paramAnnotations) {
                 if (annotation.annotationType().equals(annotationClass)) {
                     if (definition == null) {
                         definition = new ConstructorDefinition<T>(constructor);
                         type.setConstructorDefinition(definition);
                     }
-                    monitorAnnot = annotationClass.cast(annotation);
-                    name = getName(monitorAnnot);
+                    A monitorAnnot = annotationClass.cast(annotation);
+                    String name = getName(monitorAnnot);
                     if (name == null || name.length() == 0) {
                         name = param.getName();
                     }
                     
                     Class<?> baseType = getBaseType(param, constructor.getGenericParameterTypes()[i]);
-                    property = createProperty(name, baseType, constructor);
+                    JavaMappedProperty<?> property = createProperty(name, baseType,
constructor);
                     if (param.isArray() || Collection.class.isAssignableFrom(param)) {
                         property.setMany(true);
                     }
-                } else if (annotation.annotationType().equals(DataType.class)) {
-                    propertyDataBinding = DataType.class.cast(annotation);
+                    initProperty(property, monitorAnnot, parent, context);
+                    properties.put(name, property);
+                    service.addName(definition.getInjectionNames(), i, name);
                 }
-            }
-            //if there has been a databinding annotation along with a property annotation
then 
-            //add that information to the property
-            if (property != null && propertyDataBinding != null) {
-                if (propertyDataBinding != null) {
-                    property.getExtensions().put(DataBinding.class.getName(), propertyDataBinding.name());
-                }
-                initProperty(property, monitorAnnot, parent, context);
-                properties.put(name, property);
-                service.addName(definition.getInjectionNames(), i, name);
             }
         }
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message