[picocontainer-scm] [5742] java/2.x/trunk/pico/container/src/test/org/picocontainer/adapters/SimpleNamedBindingAnnotationTestCase.java: ensure that __PARANAMER_DATA is not processed

Revision 5742
Author paul
Date 2010-08-30 21:16:03 -0500 (Mon, 30 Aug 2010)

Log Message

ensure that __PARANAMER_DATA is not processed

Modified Paths

- java/2.x/trunk/pico/container/src/test/org/picocontainer/adapters/SimpleNamedBindingAnnotationTestCase.java

Diff

Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/adapters/SimpleNamedBindingAnnotationTestCase.java (5741 => 5742)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/adapters/SimpleNamedBindingAnnotationTestCase.java 2010-08-30 12:45:58 UTC (rev 5741)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/adapters/SimpleNamedBindingAnnotationTestCase.java 2010-08-31 02:16:03 UTC (rev 5742)
@@ -1,15 +1,5 @@
package org.picocontainer.adapters;

-import static org.junit.Assert.assertEquals;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.reflect.Field;
-import java.lang.reflect.Type;
-import java.util.Properties;
-
import org.junit.Test;
import org.picocontainer.Characteristics;
import org.picocontainer.ComponentAdapter;
@@ -21,10 +11,21 @@
import org.picocontainer.PicoCompositionException;
import org.picocontainer.PicoContainer;
import org.picocontainer.behaviors.AbstractBehaviorFactory;
+import org.picocontainer.injectors.AbstractInjectionFactory;
import org.picocontainer.injectors.AbstractInjector;
-import org.picocontainer.injectors.AbstractInjectionFactory;

+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.reflect.Field;
+import java.lang.reflect.Type;
+import java.util.Properties;

+import static java.lang.reflect.Modifier.isStatic;
+import static org.junit.Assert.assertEquals;
+
+
/**
* @author Paul Hammant
* @author Jörg Schaible
@@ -132,15 +133,17 @@
inst = getComponentImplementation().newInstance();
Field[] declaredFields = getComponentImplementation().getDeclaredFields();
for (final Field field : declaredFields) {
- Named bindAnnotation = field.getAnnotation(Named.class);
- Object value;
- if (bindAnnotation != null) {
- value = container.getComponent(bindKey(field.getType(), bindAnnotation.value()));
- } else {
- value = container.getComponent(field.getType());
+ if (!isStatic(field.getModifiers())) {
+ Named bindAnnotation = field.getAnnotation(Named.class);
+ Object value;
+ if (bindAnnotation != null) {
+ value = container.getComponent(bindKey(field.getType(), bindAnnotation.value()));
+ } else {
+ value = container.getComponent(field.getType());
+ }
+ field.setAccessible(true);
+ field.set(inst, value);
}
- field.setAccessible(true);
- field.set(inst, value);
}

} catch (InstantiationException e) {

----------

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email