You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mb...@apache.org on 2014/02/25 09:17:29 UTC
svn commit: r1571611 [3/3] - in /commons/proper/weaver/trunk: ./ ant/lib/
ant/lib/src/main/java/org/apache/commons/weaver/ant/
build-tools/src/main/resources/org/apache/commons/weaver/ maven-plugin/
maven-plugin/src/main/java/org/apache/commons/weaver/...
Modified: commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/ScanResult.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/ScanResult.java?rev=1571611&r1=1571610&r2=1571611&view=diff
==============================================================================
--- commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/ScanResult.java (original)
+++ commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/ScanResult.java Tue Feb 25 08:17:27 2014
@@ -59,7 +59,7 @@ public class ScanResult {
AnnotatedElements<CHILD> {
private final Iterable<PARENT> parents;
- Projection(Iterable<PARENT> parents) {
+ Projection(final Iterable<PARENT> parents) {
super();
this.parents = parents;
}
@@ -98,7 +98,7 @@ public class ScanResult {
private Iterator<CHILD> nextChildren() {
while (parentIterator.hasNext()) {
- Iterator<CHILD> prospect = childrenOf(parentIterator.next()).iterator();
+ final Iterator<CHILD> prospect = childrenOf(parentIterator.next()).iterator();
if (prospect.hasNext()) {
return prospect;
}
@@ -109,7 +109,7 @@ public class ScanResult {
}
@Override
- public AnnotatedElements<CHILD> with(Class<? extends Annotation> annotationType) {
+ public AnnotatedElements<CHILD> with(final Class<? extends Annotation> annotationType) {
return new AnnotatedWith<CHILD>(this, annotationType);
}
}
@@ -118,7 +118,7 @@ public class ScanResult {
final Iterable<W> wrapped;
final Class<? extends Annotation> annotationType;
- AnnotatedWith(Iterable<W> wrapped, Class<? extends Annotation> annotationType) {
+ AnnotatedWith(final Iterable<W> wrapped, final Class<? extends Annotation> annotationType) {
super();
this.wrapped = wrapped;
this.annotationType = annotationType;
@@ -132,9 +132,9 @@ public class ScanResult {
private W read() {
while (iter.hasNext()) {
- W t = iter.next();
- if (t.isAnnotationPresent(annotationType)) {
- return t;
+ final W element = iter.next();
+ if (element.isAnnotationPresent(annotationType)) {
+ return element;
}
}
return null;
@@ -165,7 +165,7 @@ public class ScanResult {
}
@Override
- public AnnotatedElements<W> with(Class<? extends Annotation> annotationType) {
+ public AnnotatedElements<W> with(final Class<? extends Annotation> annotationType) {
return new AnnotatedWith<W>(this, annotationType);
}
@@ -179,7 +179,7 @@ public class ScanResult {
* @param pkg to wrap
* @return {@link WeavablePackage}
*/
- public WeavablePackage getWeavable(Package pkg) {
+ public WeavablePackage getWeavable(final Package pkg) {
final String key = pkg.getName();
if (packages.containsKey(key)) {
return packages.get(key);
@@ -195,7 +195,7 @@ public class ScanResult {
* @param <T> type
* @return {@link WeavableClass}
*/
- public <T> WeavableClass<T> getWeavable(Class<T> cls) {
+ public <T> WeavableClass<T> getWeavable(final Class<T> cls) {
return getWeavable(cls.getPackage()).getWeavable(cls);
}
@@ -204,17 +204,17 @@ public class ScanResult {
* @param fld to wrap
* @return {@link WeavableField}
*/
- public WeavableField<?> getWeavable(Field fld) {
+ public WeavableField<?> getWeavable(final Field fld) {
return getWeavable(fld.getDeclaringClass()).getWeavable(fld);
}
/**
* Public for use by {@link WeaveProcessor}.
- * @param mt to wrap
+ * @param methd to wrap
* @return {@link WeavableMethod}
*/
- public WeavableMethod<?> getWeavable(Method mt) {
- return getWeavable(mt.getDeclaringClass()).getWeavable(mt);
+ public WeavableMethod<?> getWeavable(final Method methd) {
+ return getWeavable(methd.getDeclaringClass()).getWeavable(methd);
}
/**
@@ -223,7 +223,7 @@ public class ScanResult {
* @param <T> type
* @return {@link WeavableConstructor}
*/
- public <T> WeavableConstructor<T> getWeavable(Constructor<T> ctor) {
+ public <T> WeavableConstructor<T> getWeavable(final Constructor<T> ctor) {
return getWeavable(ctor.getDeclaringClass()).getWeavable(ctor);
}
@@ -240,7 +240,7 @@ public class ScanResult {
}
@Override
- public AnnotatedElements<WeavablePackage> with(Class<? extends Annotation> annotationType) {
+ public AnnotatedElements<WeavablePackage> with(final Class<? extends Annotation> annotationType) {
return new AnnotatedWith<WeavablePackage>(packages.values(), annotationType);
}
};
@@ -254,7 +254,7 @@ public class ScanResult {
return new Projection<WeavablePackage, WeavableClass<?>>(getPackages()) {
@Override
- protected Iterable<WeavableClass<?>> childrenOf(WeavablePackage parent) {
+ protected Iterable<WeavableClass<?>> childrenOf(final WeavablePackage parent) {
return parent.getClasses();
}
};
@@ -271,7 +271,7 @@ public class ScanResult {
return new Projection<WeavablePackage, WeavableClass<?>>(getPackages()) {
@Override
- protected Iterable<WeavableClass<?>> childrenOf(WeavablePackage parent) {
+ protected Iterable<WeavableClass<?>> childrenOf(final WeavablePackage parent) {
return parent.getClasses();
}
@@ -327,7 +327,7 @@ public class ScanResult {
return new Projection<WeavableClass<?>, WeavableField<?>>(getClasses()) {
@Override
- protected Iterable<WeavableField<?>> childrenOf(WeavableClass<?> parent) {
+ protected Iterable<WeavableField<?>> childrenOf(final WeavableClass<?> parent) {
@SuppressWarnings({ "unchecked", "rawtypes" })
final Iterable<WeavableField<?>> result = ((WeavableClass) parent).getFields();
return result;
@@ -343,7 +343,7 @@ public class ScanResult {
return new Projection<WeavableClass<?>, WeavableConstructor<?>>(getClasses()) {
@Override
- protected Iterable<WeavableConstructor<?>> childrenOf(WeavableClass<?> parent) {
+ protected Iterable<WeavableConstructor<?>> childrenOf(final WeavableClass<?> parent) {
@SuppressWarnings({ "unchecked", "rawtypes" })
final Iterable<WeavableConstructor<?>> result = ((WeavableClass) parent).getConstructors();
return result;
@@ -359,7 +359,7 @@ public class ScanResult {
return new Projection<WeavableClass<?>, WeavableMethod<?>>(getClasses()) {
@Override
- protected Iterable<WeavableMethod<?>> childrenOf(WeavableClass<?> parent) {
+ protected Iterable<WeavableMethod<?>> childrenOf(final WeavableClass<?> parent) {
@SuppressWarnings({ "unchecked", "rawtypes" })
final Iterable<WeavableMethod<?>> result = ((WeavableClass) parent).getMethods();
return result;
@@ -375,7 +375,7 @@ public class ScanResult {
return new Projection<WeavableMethod<?>, WeavableMethodParameter<?>>(getMethods()) {
@Override
- protected Iterable<WeavableMethodParameter<?>> childrenOf(WeavableMethod<?> parent) {
+ protected Iterable<WeavableMethodParameter<?>> childrenOf(final WeavableMethod<?> parent) {
@SuppressWarnings({ "unchecked", "rawtypes" })
final Iterable<WeavableMethodParameter<?>> result = ((WeavableMethod) parent).getParameters();
return result;
@@ -392,7 +392,7 @@ public class ScanResult {
return new Projection<WeavableConstructor<?>, WeavableConstructorParameter<?>>(getConstructors()) {
@Override
- protected Iterable<WeavableConstructorParameter<?>> childrenOf(WeavableConstructor<?> parent) {
+ protected Iterable<WeavableConstructorParameter<?>> childrenOf(final WeavableConstructor<?> parent) {
@SuppressWarnings({ "unchecked", "rawtypes" })
final Iterable<WeavableConstructorParameter<?>> result = ((WeavableConstructor) parent).getParameters();
return result;
Modified: commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/Weavable.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/Weavable.java?rev=1571611&r1=1571610&r2=1571611&view=diff
==============================================================================
--- commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/Weavable.java (original)
+++ commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/Weavable.java Tue Feb 25 08:17:27 2014
@@ -45,7 +45,7 @@ public abstract class Weavable<SELF exte
* Create a new {@link Weavable} instance.
* @param target {@code TARGET}
*/
- protected Weavable(TARGET target) {
+ protected Weavable(final TARGET target) {
this.target = target;
if (target instanceof AnnotatedElement) {
addAnnotations(((AnnotatedElement) target).getAnnotations());
@@ -57,7 +57,7 @@ public abstract class Weavable<SELF exte
* @param toAdd {@link Annotation}[]
* @return whether any change was made
*/
- public boolean addAnnotations(Annotation... toAdd) {
+ public final boolean addAnnotations(final Annotation... toAdd) {
Validate.noNullElements(toAdd);
return addAnnotations(Arrays.asList(toAdd));
}
@@ -67,7 +67,7 @@ public abstract class Weavable<SELF exte
* @param toAdd {@link Iterable} of {@link Annotation}
* @return whether any change was made
*/
- public boolean addAnnotations(Iterable<Annotation> toAdd) {
+ public final boolean addAnnotations(final Iterable<Annotation> toAdd) {
if (toAdd == null) {
return false;
}
@@ -77,8 +77,8 @@ public abstract class Weavable<SELF exte
}
}
boolean result = false;
- for (Annotation a : toAdd) {
- result = a != null && annotations.add(a) || result;
+ for (final Annotation ann : toAdd) {
+ result = ann != null && annotations.add(ann) || result;
}
return result;
}
@@ -99,10 +99,10 @@ public abstract class Weavable<SELF exte
public final Annotation[] getAnnotations() {
synchronized (this) {
if (annotations == null) {
- return EMPTY_ANNOTATION_ARRAY;
+ return EMPTY_ANNOTATION_ARRAY; //NOPMD - no problem sharing zero-length array
}
}
- return annotations.toArray(EMPTY_ANNOTATION_ARRAY);
+ return annotations.toArray(new Annotation[annotations.size()]);
}
/**
@@ -112,11 +112,11 @@ public abstract class Weavable<SELF exte
* @return {@code T} instance if available, else {@code null}
*/
@Override
- public synchronized <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
+ public synchronized <T extends Annotation> T getAnnotation(final Class<T> annotationClass) {
if (annotations == null) {
return null;
}
- for (Annotation prospect : annotations) {
+ for (final Annotation prospect : annotations) {
if (annotationClass.equals(prospect.annotationType())) {
@SuppressWarnings("unchecked")
final T result = (T) prospect;
@@ -141,7 +141,7 @@ public abstract class Weavable<SELF exte
* @return {@code boolean}
*/
@Override
- public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
+ public boolean isAnnotationPresent(final Class<? extends Annotation> annotationClass) {
return getAnnotation(annotationClass) != null;
}
Modified: commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableClass.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableClass.java?rev=1571611&r1=1571610&r2=1571611&view=diff
==============================================================================
--- commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableClass.java (original)
+++ commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableClass.java Tue Feb 25 08:17:27 2014
@@ -41,8 +41,8 @@ public class WeavableClass<T> extends Ne
new ConcurrentSkipListMap<Constructor<T>, WeavableConstructor<T>>(new Comparator<Constructor<?>>() {
@Override
- public int compare(Constructor<?> o1, Constructor<?> o2) {
- return Args.compare(o1.getParameterTypes(), o2.getParameterTypes());
+ public int compare(final Constructor<?> ctor1, final Constructor<?> ctor2) {
+ return Args.compare(ctor1.getParameterTypes(), ctor2.getParameterTypes());
}
});
@@ -50,9 +50,9 @@ public class WeavableClass<T> extends Ne
new ConcurrentSkipListMap<Method, WeavableMethod<T>>(new Comparator<Method>() {
@Override
- public int compare(Method o1, Method o2) {
- int result = o1.getName().compareTo(o2.getName());
- return result == 0 ? Args.compare(o1.getParameterTypes(), o2.getParameterTypes()) : result;
+ public int compare(final Method methd1, final Method methd2) {
+ final int result = methd1.getName().compareTo(methd2.getName());
+ return result == 0 ? Args.compare(methd1.getParameterTypes(), methd2.getParameterTypes()) : result;
}
});
@@ -61,7 +61,7 @@ public class WeavableClass<T> extends Ne
* @param target {@link Class}
* @param parent {@link WeavablePackage} enclosing
*/
- public WeavableClass(Class<T> target, WeavablePackage parent) {
+ public WeavableClass(final Class<T> target, final WeavablePackage parent) {
super(target, parent);
}
@@ -70,29 +70,29 @@ public class WeavableClass<T> extends Ne
* @param fld to wrap
* @return {@link WeavableField}
*/
- public WeavableField<T> getWeavable(Field fld) {
+ public WeavableField<T> getWeavable(final Field fld) {
final String key = fld.getName();
if (fields.containsKey(key)) {
- final WeavableField<T> result = (WeavableField<T>) fields.get(key);
+ final WeavableField<T> result = fields.get(key);
return result;
}
final WeavableField<T> result = new WeavableField<T>(fld, this);
- final WeavableField<T> faster = (WeavableField<T>) fields.putIfAbsent(key, result);
+ final WeavableField<T> faster = fields.putIfAbsent(key, result);
return faster == null ? result : faster;
}
/**
* Get a {@link WeavableMethod} representing {@code mt}.
- * @param mt to wrap
+ * @param methd to wrap
* @return {@link WeavableMethod}
*/
- public WeavableMethod<T> getWeavable(Method mt) {
- if (methods.containsKey(mt)) {
- final WeavableMethod<T> result = (WeavableMethod<T>) methods.get(mt);
+ public WeavableMethod<T> getWeavable(final Method methd) {
+ if (methods.containsKey(methd)) {
+ final WeavableMethod<T> result = methods.get(methd);
return result;
}
- final WeavableMethod<T> result = (WeavableMethod<T>) new WeavableMethod<T>(mt, this);
- final WeavableMethod<T> faster = (WeavableMethod<T>) methods.putIfAbsent(mt, result);
+ final WeavableMethod<T> result = new WeavableMethod<T>(methd, this);
+ final WeavableMethod<T> faster = methods.putIfAbsent(methd, result);
return faster == null ? result : faster;
}
@@ -101,13 +101,13 @@ public class WeavableClass<T> extends Ne
* @param ctor to wrap
* @return {@link WeavableConstructor}
*/
- public WeavableConstructor<T> getWeavable(Constructor<T> ctor) {
+ public WeavableConstructor<T> getWeavable(final Constructor<T> ctor) {
if (ctors.containsKey(ctor)) {
- final WeavableConstructor<T> result = (WeavableConstructor<T>) ctors.get(ctor);
+ final WeavableConstructor<T> result = ctors.get(ctor);
return result;
}
- final WeavableConstructor<T> result = (WeavableConstructor<T>) new WeavableConstructor<T>(ctor, this);
- final WeavableConstructor<T> faster = (WeavableConstructor<T>) ctors.putIfAbsent(ctor, result);
+ final WeavableConstructor<T> result = new WeavableConstructor<T>(ctor, this);
+ final WeavableConstructor<T> faster = ctors.putIfAbsent(ctor, result);
return faster == null ? result : faster;
}
@@ -139,7 +139,7 @@ public class WeavableClass<T> extends Ne
* {@inheritDoc}
*/
@Override
- protected int localCompareTo(WeavableClass<T> o) {
- return getTarget().getName().compareTo(o.getTarget().getName());
+ protected int localCompareTo(final WeavableClass<T> obj) {
+ return getTarget().getName().compareTo(obj.getTarget().getName());
}
}
Modified: commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableConstructor.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableConstructor.java?rev=1571611&r1=1571610&r2=1571611&view=diff
==============================================================================
--- commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableConstructor.java (original)
+++ commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableConstructor.java Tue Feb 25 08:17:27 2014
@@ -33,7 +33,7 @@ public class WeavableConstructor<T> exte
* @param target {@link Constructor}
* @param parent enclosing {@link WeavableClass}
*/
- public WeavableConstructor(Constructor<T> target, WeavableClass<T> parent) {
+ public WeavableConstructor(final Constructor<T> target, final WeavableClass<T> parent) {
super(target, parent);
}
@@ -49,7 +49,7 @@ public class WeavableConstructor<T> exte
* {@inheritDoc}
*/
@Override
- protected WeavableConstructorParameter<T> createParameter(int index) {
+ protected WeavableConstructorParameter<T> createParameter(final int index) {
return new WeavableConstructorParameter<T>(Integer.valueOf(index), this);
}
Modified: commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableConstructorParameter.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableConstructorParameter.java?rev=1571611&r1=1571610&r2=1571611&view=diff
==============================================================================
--- commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableConstructorParameter.java (original)
+++ commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableConstructorParameter.java Tue Feb 25 08:17:27 2014
@@ -33,7 +33,7 @@ public class WeavableConstructorParamete
* @param target parameter index
* @param parent declaring {@link WeavableConstructor}
*/
- public WeavableConstructorParameter(Integer target, WeavableConstructor<T> parent) {
+ public WeavableConstructorParameter(final Integer target, final WeavableConstructor<T> parent) {
super(target, parent);
}
Modified: commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableExecutable.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableExecutable.java?rev=1571611&r1=1571610&r2=1571611&view=diff
==============================================================================
--- commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableExecutable.java (original)
+++ commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableExecutable.java Tue Feb 25 08:17:27 2014
@@ -47,10 +47,11 @@ public abstract class WeavableExecutable
* @param target executable
* @param parent enclosing {@link WeavableClass}
*/
- protected WeavableExecutable(TARGET target, WeavableClass<T> parent) {
+ protected WeavableExecutable(final TARGET target, final WeavableClass<T> parent) {
super(target, parent);
final List<P> params = new ArrayList<P>();
- for (int i = 0, sz = getParameterTypes().length; i < sz; i++) {
+ final int paramCount = getParameterTypes().length;
+ for (int i = 0; i < paramCount; i++) {
params.add(createParameter(i));
}
parameters = Collections.unmodifiableList(params);
@@ -73,8 +74,8 @@ public abstract class WeavableExecutable
* {@inheritDoc}
*/
@Override
- protected int localCompareTo(SELF o) {
- return Args.compare(getParameterTypes(), o.getParameterTypes());
+ protected int localCompareTo(final SELF obj) {
+ return Args.compare(getParameterTypes(), obj.getParameterTypes());
}
/**
@@ -82,7 +83,7 @@ public abstract class WeavableExecutable
* @param index {@code int}
* @return {@code P}
*/
- public P getWeavableParameter(int index) {
+ public P getWeavableParameter(final int index) {
return parameters.get(index);
}
Modified: commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableField.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableField.java?rev=1571611&r1=1571610&r2=1571611&view=diff
==============================================================================
--- commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableField.java (original)
+++ commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableField.java Tue Feb 25 08:17:27 2014
@@ -32,7 +32,7 @@ public class WeavableField<T> extends Ne
* @param target field
* @param parent enclosing {@link WeavableClass}
*/
- public WeavableField(Field target, WeavableClass<T> parent) {
+ public WeavableField(final Field target, final WeavableClass<T> parent) {
super(target, parent);
}
@@ -40,7 +40,7 @@ public class WeavableField<T> extends Ne
* {@inheritDoc}
*/
@Override
- protected int localCompareTo(WeavableField<T> o) {
- return getTarget().getName().compareTo(o.getTarget().getName());
+ protected int localCompareTo(final WeavableField<T> obj) {
+ return getTarget().getName().compareTo(obj.getTarget().getName());
}
}
Modified: commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableMethod.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableMethod.java?rev=1571611&r1=1571610&r2=1571611&view=diff
==============================================================================
--- commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableMethod.java (original)
+++ commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableMethod.java Tue Feb 25 08:17:27 2014
@@ -32,7 +32,7 @@ public class WeavableMethod<T> extends W
* @param target method
* @param parent enclosing {@link WeavableClass}
*/
- public WeavableMethod(Method target, WeavableClass<T> parent) {
+ public WeavableMethod(final Method target, final WeavableClass<T> parent) {
super(target, parent);
}
@@ -48,16 +48,16 @@ public class WeavableMethod<T> extends W
* {@inheritDoc}
*/
@Override
- protected int localCompareTo(WeavableMethod<T> o) {
- int result = getTarget().getName().compareTo(o.getTarget().getName());
- return result == 0 ? super.localCompareTo(o) : result;
+ protected int localCompareTo(final WeavableMethod<T> obj) {
+ final int result = getTarget().getName().compareTo(obj.getTarget().getName());
+ return result == 0 ? super.localCompareTo(obj) : result;
}
/**
* {@inheritDoc}
*/
@Override
- protected WeavableMethodParameter<T> createParameter(int index) {
+ protected WeavableMethodParameter<T> createParameter(final int index) {
return new WeavableMethodParameter<T>(Integer.valueOf(index), this);
}
}
Modified: commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableMethodParameter.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableMethodParameter.java?rev=1571611&r1=1571610&r2=1571611&view=diff
==============================================================================
--- commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableMethodParameter.java (original)
+++ commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableMethodParameter.java Tue Feb 25 08:17:27 2014
@@ -33,7 +33,7 @@ public class WeavableMethodParameter<T>
* @param target index
* @param parent declaring {@link WeavableMethod}
*/
- public WeavableMethodParameter(Integer target, WeavableMethod<T> parent) {
+ public WeavableMethodParameter(final Integer target, final WeavableMethod<T> parent) {
super(target, parent);
}
Modified: commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavablePackage.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavablePackage.java?rev=1571611&r1=1571610&r2=1571611&view=diff
==============================================================================
--- commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavablePackage.java (original)
+++ commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavablePackage.java Tue Feb 25 08:17:27 2014
@@ -34,7 +34,7 @@ public class WeavablePackage extends Wea
* Create a new {@link WeavablePackage} instance.
* @param target package
*/
- public WeavablePackage(Package target) {
+ public WeavablePackage(final Package target) {
super(target);
}
@@ -44,7 +44,7 @@ public class WeavablePackage extends Wea
* @param <T> generic type of {@code cls}
* @return {@link WeavableClass}
*/
- public synchronized <T> WeavableClass<T> getWeavable(Class<T> cls) {
+ public synchronized <T> WeavableClass<T> getWeavable(final Class<T> cls) {
final String key = cls.getName();
if (clazzes.containsKey(key)) {
@SuppressWarnings("unchecked")
@@ -71,7 +71,7 @@ public class WeavablePackage extends Wea
* @return int per {@link Comparable#compareTo(Object)} contract
*/
@Override
- public int compareTo(WeavablePackage arg0) {
+ public int compareTo(final WeavablePackage arg0) {
return getTarget().getName().compareTo(arg0.getTarget().getName());
}
}
Modified: commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableParameter.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableParameter.java?rev=1571611&r1=1571610&r2=1571611&view=diff
==============================================================================
--- commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableParameter.java (original)
+++ commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeavableParameter.java Tue Feb 25 08:17:27 2014
@@ -40,7 +40,7 @@ public abstract class WeavableParameter
* @param target index
* @param parent executable
*/
- protected WeavableParameter(Integer target, PARENT parent) {
+ protected WeavableParameter(final Integer target, final PARENT parent) {
super(target, parent);
}
@@ -48,7 +48,7 @@ public abstract class WeavableParameter
* {@inheritDoc}
*/
@Override
- protected int localCompareTo(SELF o) {
+ protected int localCompareTo(final SELF obj) {
return getTarget().compareTo(getTarget());
}
Modified: commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeaveEnvironment.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeaveEnvironment.java?rev=1571611&r1=1571610&r2=1571611&view=diff
==============================================================================
--- commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeaveEnvironment.java (original)
+++ commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeaveEnvironment.java Tue Feb 25 08:17:27 2014
@@ -39,7 +39,7 @@ public abstract class WeaveEnvironment {
private class Resource implements DataSource {
private final String name;
- Resource(String name) {
+ Resource(final String name) {
this.name = name;
}
@@ -98,7 +98,7 @@ public abstract class WeaveEnvironment {
* @param config property
* @param log property
*/
- protected WeaveEnvironment(ClassLoader classLoader, Properties config, Logger log) {
+ protected WeaveEnvironment(final ClassLoader classLoader, final Properties config, final Logger log) {
super();
this.classLoader = classLoader;
this.config = (Properties) Validate.notNull(config, "config").clone();
@@ -111,7 +111,7 @@ public abstract class WeaveEnvironment {
* @param args format
* @see String#format(String, Object...)
*/
- public void debug(String message, Object... args) {
+ public void debug(final String message, final Object... args) {
log.fine(String.format(message, args));
}
@@ -121,7 +121,7 @@ public abstract class WeaveEnvironment {
* @param args format
* @see String#format(String, Object...)
*/
- public void verbose(String message, Object... args) {
+ public void verbose(final String message, final Object... args) {
log.fine(String.format(message, args));
}
@@ -131,7 +131,7 @@ public abstract class WeaveEnvironment {
* @param args format
* @see String#format(String, Object...)
*/
- public void warn(String message, Object... args) {
+ public void warn(final String message, final Object... args) {
log.warning(String.format(message, args));
}
@@ -141,7 +141,7 @@ public abstract class WeaveEnvironment {
* @param args format
* @see String#format(String, Object...)
*/
- public void info(String message, Object... args) {
+ public void info(final String message, final Object... args) {
log.info(String.format(message, args));
}
@@ -151,7 +151,7 @@ public abstract class WeaveEnvironment {
* @param args format
* @see String#format(String, Object...)
*/
- public void error(String message, Object... args) {
+ public void error(final String message, final Object... args) {
log.severe(String.format(message, args));
}
@@ -160,7 +160,7 @@ public abstract class WeaveEnvironment {
* @param cls type
* @return {@link DataSource}
*/
- public final DataSource getClassfile(Class<?> cls) {
+ public final DataSource getClassfile(final Class<?> cls) {
return getClassfile(cls.getName());
}
@@ -169,7 +169,7 @@ public abstract class WeaveEnvironment {
* @param classname of type
* @return {@link DataSource}
*/
- public final DataSource getClassfile(String classname) {
+ public final DataSource getClassfile(final String classname) {
return getResource(getResourceName(classname));
}
@@ -178,7 +178,7 @@ public abstract class WeaveEnvironment {
* @param name of resource
* @return {@link DataSource}
*/
- public final DataSource getResource(String name) {
+ public final DataSource getResource(final String name) {
return new Resource(name);
}
@@ -187,7 +187,7 @@ public abstract class WeaveEnvironment {
* @param cls type
* @return whether successful
*/
- public final boolean deleteClassfile(Class<?> cls) {
+ public final boolean deleteClassfile(final Class<?> cls) {
return deleteClassfile(cls.getName());
}
@@ -196,7 +196,7 @@ public abstract class WeaveEnvironment {
* @param classname of type
* @return whether successful
*/
- public final boolean deleteClassfile(String classname) {
+ public final boolean deleteClassfile(final String classname) {
return deleteResource(getResourceName(classname));
}
@@ -220,7 +220,7 @@ public abstract class WeaveEnvironment {
* @param classname to convert
* @return String
*/
- protected static String getResourceName(String classname) {
+ protected static String getResourceName(final String classname) {
return classname.replace('.', '/') + ".class";
}
}
Modified: commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeaveInterest.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeaveInterest.java?rev=1571611&r1=1571610&r2=1571611&view=diff
==============================================================================
--- commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeaveInterest.java (original)
+++ commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeaveInterest.java Tue Feb 25 08:17:27 2014
@@ -37,7 +37,7 @@ public final class WeaveInterest {
*/
public final ElementType target;
- private WeaveInterest(Class<? extends Annotation> annotationType, ElementType target) {
+ private WeaveInterest(final Class<? extends Annotation> annotationType, final ElementType target) {
super();
this.annotationType = annotationType;
this.target = target;
@@ -49,7 +49,7 @@ public final class WeaveInterest {
* @param target attached element type
* @return {@link WeaveInterest}
*/
- public static WeaveInterest of(Class<? extends Annotation> annotationType, ElementType target) {
+ public static WeaveInterest of(final Class<? extends Annotation> annotationType, final ElementType target) {
return new WeaveInterest(annotationType, target);
}
}
Modified: commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/utils/Annotations.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/utils/Annotations.java?rev=1571611&r1=1571610&r2=1571611&view=diff
==============================================================================
--- commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/utils/Annotations.java (original)
+++ commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/utils/Annotations.java Tue Feb 25 08:17:27 2014
@@ -47,7 +47,7 @@ public final class Annotations {
final InvocationHandler invocationHandler = new InvocationHandler() {
@Override
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
if (method.getDeclaringClass().equals(annotationType)) {
if (elements.containsKey(method.getName())) {
return elements.get(method.getName());
Modified: commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/utils/Args.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/utils/Args.java?rev=1571611&r1=1571610&r2=1571611&view=diff
==============================================================================
--- commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/utils/Args.java (original)
+++ commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/utils/Args.java Tue Feb 25 08:17:27 2014
@@ -33,13 +33,13 @@ public final class Args {
* @return {@code int} as specified by
* {@link java.util.Comparator#compare(Object, Object)}
*/
- public static int compare(Class<?>[] paramTypes1, Class<?>[] paramTypes2) {
- int i = 0;
- while (i < paramTypes1.length) {
- if (i >= paramTypes2.length) {
+ public static int compare(final Class<?>[] paramTypes1, final Class<?>[] paramTypes2) {
+ final int param = 0;
+ while (param < paramTypes1.length) {
+ if (param >= paramTypes2.length) {
return 1;
}
- final int test = paramTypes1[i].getName().compareTo(paramTypes2[i].getName());
+ final int test = paramTypes1[param].getName().compareTo(paramTypes2[param].getName());
if (test == 0) {
continue;
}
Modified: commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/utils/URLArray.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/utils/URLArray.java?rev=1571611&r1=1571610&r2=1571611&view=diff
==============================================================================
--- commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/utils/URLArray.java (original)
+++ commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/utils/URLArray.java Tue Feb 25 08:17:27 2014
@@ -39,19 +39,23 @@ public final class URLArray {
public static URL[] fromPaths(final Iterable<String> files) {
return fromFiles(new Iterable<File>() {
+ @Override
public Iterator<File> iterator() {
final Iterator<String> path = files.iterator();
return new Iterator<File>() {
+ @Override
public boolean hasNext() {
return path.hasNext();
}
+ @Override
public File next() {
- final String p = path.next();
- return p == null ? null : new File(p);
+ final String element = path.next();
+ return element == null ? null : new File(element);
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
@@ -65,16 +69,16 @@ public final class URLArray {
* @param files to convert
* @return URL[]
*/
- public static URL[] fromFiles(Iterable<File> files) {
+ public static URL[] fromFiles(final Iterable<File> files) {
final ArrayList<URL> result = new ArrayList<URL>();
- for (File f : files) {
- if (f == null) {
+ for (final File file : files) {
+ if (file == null) {
result.add(null);
continue;
}
try {
- result.add(f.toURI().toURL());
- } catch (MalformedURLException e) {
+ result.add(file.toURI().toURL());
+ } catch (final MalformedURLException e) {
// this shouldn't happen
throw new RuntimeException(e);
}