[picocontainer-scm] [5608] java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors: source cleanups, @override sprinkling

Revision 5608
Author paul
Date 2010-02-12 17:09:46 -0600 (Fri, 12 Feb 2010)

Log Message

source cleanups, @override sprinkling

Modified Paths

- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AnnotatedFieldInjector.java

- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AnnotatedMethodInjector.java

- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/NamedFieldInjector.java

- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/NamedMethodInjector.java

- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/SetterInjector.java

- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/TypedFieldInjector.java

Diff

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AnnotatedFieldInjector.java (5607 => 5608)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AnnotatedFieldInjector.java 2010-02-12 22:36:44 UTC (rev 5607)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AnnotatedFieldInjector.java 2010-02-12 23:09:46 UTC (rev 5608)
@@ -10,9 +10,8 @@
package org.picocontainer.injectors;

import org.picocontainer.ComponentMonitor;
-import org.picocontainer.LifecycleStrategy;
+import org.picocontainer.NameBinding;
import org.picocontainer.Parameter;
-import org.picocontainer.NameBinding;
import org.picocontainer.annotations.Bind;

import java.lang.annotation.Annotation;
@@ -44,6 +43,7 @@
this.injectionAnnotation = injectionAnnotation;
}

+ @Override
protected void initializeInjectionMembersAndTypeLists() {
injectionMembers = new ArrayList<AccessibleObject>();
List<Annotation> bindingIds = new ArrayList<Annotation>();
@@ -94,10 +94,12 @@
return null;
}

+ @Override
public String getDescriptor() {
return "AnnotatedFieldInjector-";
}

+ @Override
protected NameBinding makeParameterNameImpl(final AccessibleObject member) {
return new NameBinding() {
public String getName() {

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AnnotatedMethodInjector.java (5607 => 5608)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AnnotatedMethodInjector.java 2010-02-12 22:36:44 UTC (rev 5607)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AnnotatedMethodInjector.java 2010-02-12 23:09:46 UTC (rev 5608)
@@ -9,14 +9,13 @@
*****************************************************************************/
package org.picocontainer.injectors;

+import org.picocontainer.ComponentMonitor;
import org.picocontainer.Parameter;
-import org.picocontainer.ComponentMonitor;
-import org.picocontainer.LifecycleStrategy;

import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;

@SuppressWarnings("serial")
public class AnnotatedMethodInjector extends SetterInjector {
@@ -27,22 +26,26 @@
Class<?> impl,
Parameter[] parameters,
ComponentMonitor monitor,
- Class<? extends Annotation> injectionAnnotation, boolean useNames) {
+ Class<? extends Annotation> injectionAnnotation,
+ boolean useNames) {
super(key, impl, parameters, monitor, "", useNames);
this.injectionAnnotation = injectionAnnotation;
}

+ @Override
protected Object injectIntoMember(AccessibleObject member, Object componentInstance, Object toInject)
throws IllegalAccessException, InvocationTargetException {
return ((Method)member).invoke(componentInstance, toInject);
}

+ @Override
protected final boolean isInjectorMethod(Method method) {
return method.getAnnotation(injectionAnnotation) != null;
}

- public String toString() {
- return "MethodInjection-" + super.toString();
+ @Override
+ public String getDescriptor() {
+ return "MethodInjection";
}

}

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/NamedFieldInjector.java (5607 => 5608)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/NamedFieldInjector.java 2010-02-12 22:36:44 UTC (rev 5607)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/NamedFieldInjector.java 2010-02-12 23:09:46 UTC (rev 5608)
@@ -9,6 +9,11 @@
*****************************************************************************/
package org.picocontainer.injectors;

+import org.picocontainer.ComponentMonitor;
+import org.picocontainer.NameBinding;
+import org.picocontainer.Parameter;
+import org.picocontainer.annotations.Bind;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
@@ -21,12 +26,6 @@
import java.util.Collections;
import java.util.List;

-import org.picocontainer.ComponentMonitor;
-import org.picocontainer.LifecycleStrategy;
-import org.picocontainer.NameBinding;
-import org.picocontainer.Parameter;
-import org.picocontainer.annotations.Bind;
-
/**
* Injection happens after instantiation, and fields are marked as
* injection points via a named field.
@@ -34,7 +33,6 @@
@SuppressWarnings("serial")
public class NamedFieldInjector extends IterativeInjector {

-
private final List<String> fieldNames;

public NamedFieldInjector(Object key,
@@ -47,6 +45,7 @@
this.fieldNames = Arrays.asList(fieldNames.trim().split(" "));
}

+ @Override
protected void initializeInjectionMembersAndTypeLists() {
injectionMembers = new ArrayList<AccessibleObject>();
List<Annotation> bindingIds = new ArrayList<Annotation>();
@@ -94,10 +93,12 @@
return null;
}

+ @Override
public String getDescriptor() {
return "NamedFieldInjector-";
}

+ @Override
protected NameBinding makeParameterNameImpl(final AccessibleObject member) {
return new NameBinding() {
public String getName() {

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/NamedMethodInjector.java (5607 => 5608)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/NamedMethodInjector.java 2010-02-12 22:36:44 UTC (rev 5607)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/NamedMethodInjector.java 2010-02-12 23:09:46 UTC (rev 5608)
@@ -74,8 +74,9 @@
}
}

- public String toString() {
- return "NamedMethodInjection-" + super.toString();
+ @Override
+ public String getDescriptor() {
+ return "NamedMethodInjection";
}

}
\ No newline at end of file

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/SetterInjector.java (5607 => 5608)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/SetterInjector.java 2010-02-12 22:36:44 UTC (rev 5607)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/SetterInjector.java 2010-02-12 23:09:46 UTC (rev 5608)
@@ -64,11 +64,13 @@
return member != null && ((Method)member).getReturnType()!=void.class ? lastReturn : instance;
}

+ @Override
protected Object injectIntoMember(AccessibleObject member, Object componentInstance, Object toInject)
throws IllegalAccessException, InvocationTargetException {
return ((Method)member).invoke(componentInstance, toInject);
}

+ @Override
protected boolean isInjectorMethod(Method method) {
String methodName = method.getName();
return methodName.length() >= getInjectorPrefix().length() + 1 && methodName.startsWith(getInjectorPrefix()) && Character.isUpperCase(methodName.charAt(getInjectorPrefix().length()));
@@ -78,6 +80,7 @@
return prefix;
}

+ @Override
public String getDescriptor() {
return "SetterInjector-";
}

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/TypedFieldInjector.java (5607 => 5608)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/TypedFieldInjector.java 2010-02-12 22:36:44 UTC (rev 5607)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/TypedFieldInjector.java 2010-02-12 23:09:46 UTC (rev 5608)
@@ -9,6 +9,11 @@
*****************************************************************************/
package org.picocontainer.injectors;

+import org.picocontainer.ComponentMonitor;
+import org.picocontainer.NameBinding;
+import org.picocontainer.Parameter;
+import org.picocontainer.annotations.Bind;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
@@ -21,12 +26,6 @@
import java.util.Collections;
import java.util.List;

-import org.picocontainer.ComponentMonitor;
-import org.picocontainer.LifecycleStrategy;
-import org.picocontainer.NameBinding;
-import org.picocontainer.Parameter;
-import org.picocontainer.annotations.Bind;
-
/**
* Injection happens after instantiation, and fields are marked as
* injection points via a field type.
@@ -34,10 +33,6 @@
@SuppressWarnings("serial")
public class TypedFieldInjector extends IterativeInjector {

- /**
- * Serialization UUID.
- */
-
private final List<String> classes;

public TypedFieldInjector(Object key,
@@ -45,11 +40,11 @@
Parameter[] parameters,
ComponentMonitor componentMonitor,
String classNames) {
-
super(key, impl, parameters, componentMonitor, true);
this.classes = Arrays.asList(classNames.trim().split(" "));
}

+ @Override
protected void initializeInjectionMembersAndTypeLists() {
injectionMembers = new ArrayList<AccessibleObject>();
List<Annotation> bindingIds = new ArrayList<Annotation>();
@@ -97,10 +92,12 @@
return null;
}

+ @Override
public String getDescriptor() {
return "TypedFieldInjector-";
}

+ @Override
protected NameBinding makeParameterNameImpl(final AccessibleObject member) {
return new NameBinding() {
public String getName() {

----------

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email