You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2011/01/23 10:58:10 UTC
svn commit: r1062355 - in /wicket/trunk/wicket-ioc/src:
main/java/org/apache/wicket/injection/ main/java/org/apache/wicket/proxy/
test/java/org/apache/wicket/injection/
test/java/org/apache/wicket/injection/util/
test/java/org/apache/wicket/proxy/util/
Author: jdonnerstag
Date: Sun Jan 23 09:58:09 2011
New Revision: 1062355
URL: http://svn.apache.org/viewvc?rev=1062355&view=rev
Log:
let eclipse do a final cleanup. No functional change
Modified:
wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/CompoundFieldValueFactory.java
wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java
wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/NoopFieldValueFactory.java
wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/util/InternalTestObject.java
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/util/MockDependency.java
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/util/TestObject.java
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/ConcreteObject.java
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/InterfaceObject.java
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/MockObjectLocator.java
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/ObjectMethodTester.java
Modified: wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/CompoundFieldValueFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/CompoundFieldValueFactory.java?rev=1062355&r1=1062354&r2=1062355&view=diff
==============================================================================
--- wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/CompoundFieldValueFactory.java (original)
+++ wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/CompoundFieldValueFactory.java Sun Jan 23 09:58:09 2011
@@ -40,7 +40,7 @@ public class CompoundFieldValueFactory i
*
* @param factories
*/
- public CompoundFieldValueFactory(IFieldValueFactory[] factories)
+ public CompoundFieldValueFactory(final IFieldValueFactory[] factories)
{
if (factories == null)
{
@@ -55,7 +55,7 @@ public class CompoundFieldValueFactory i
*
* @param factories
*/
- public CompoundFieldValueFactory(List<IFieldValueFactory> factories)
+ public CompoundFieldValueFactory(final List<IFieldValueFactory> factories)
{
if (factories == null)
{
@@ -70,7 +70,7 @@ public class CompoundFieldValueFactory i
* @param f1
* @param f2
*/
- public CompoundFieldValueFactory(IFieldValueFactory f1, IFieldValueFactory f2)
+ public CompoundFieldValueFactory(final IFieldValueFactory f1, final IFieldValueFactory f2)
{
if (f1 == null)
{
@@ -89,7 +89,7 @@ public class CompoundFieldValueFactory i
*
* @param factory
*/
- public void addFactory(IFieldValueFactory factory)
+ public void addFactory(final IFieldValueFactory factory)
{
if (factory == null)
{
@@ -102,7 +102,7 @@ public class CompoundFieldValueFactory i
* @see org.apache.wicket.injection.IFieldValueFactory#getFieldValue(java.lang.reflect.Field,
* java.lang.Object)
*/
- public Object getFieldValue(Field field, Object fieldOwner)
+ public Object getFieldValue(final Field field, final Object fieldOwner)
{
for (IFieldValueFactory factory : delegates)
{
@@ -118,7 +118,7 @@ public class CompoundFieldValueFactory i
/**
* @see org.apache.wicket.injection.IFieldValueFactory#supportsField(java.lang.reflect.Field)
*/
- public boolean supportsField(Field field)
+ public boolean supportsField(final Field field)
{
for (IFieldValueFactory factory : delegates)
{
Modified: wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java?rev=1062355&r1=1062354&r2=1062355&view=diff
==============================================================================
--- wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java (original)
+++ wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java Sun Jan 23 09:58:09 2011
@@ -48,7 +48,7 @@ public abstract class Injector
*
* @param application
*/
- public void bind(Application application)
+ public void bind(final Application application)
{
application.setMetaData(KEY, this);
}
@@ -78,7 +78,7 @@ public abstract class Injector
* @param object
* @param factory
*/
- protected void inject(Object object, IFieldValueFactory factory)
+ protected void inject(final Object object, final IFieldValueFactory factory)
{
final Class<?> clazz = object.getClass();
@@ -136,7 +136,7 @@ public abstract class Injector
* @param factory
* @return an array of fields that can be injected using the given field value factory
*/
- private Field[] findFields(Class<?> clazz, IFieldValueFactory factory)
+ private Field[] findFields(Class<?> clazz, final IFieldValueFactory factory)
{
List<Field> matched = new ArrayList<Field>();
Modified: wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/NoopFieldValueFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/NoopFieldValueFactory.java?rev=1062355&r1=1062354&r2=1062355&view=diff
==============================================================================
--- wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/NoopFieldValueFactory.java (original)
+++ wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/NoopFieldValueFactory.java Sun Jan 23 09:58:09 2011
@@ -31,7 +31,7 @@ public class NoopFieldValueFactory imple
* @see org.apache.wicket.injection.IFieldValueFactory#getFieldValue(java.lang.reflect.Field,
* java.lang.Object)
*/
- public Object getFieldValue(Field field, Object fieldOwner)
+ public Object getFieldValue(final Field field, final Object fieldOwner)
{
return null;
}
@@ -39,7 +39,7 @@ public class NoopFieldValueFactory imple
/**
* @see org.apache.wicket.injection.IFieldValueFactory#supportsField(java.lang.reflect.Field)
*/
- public boolean supportsField(Field field)
+ public boolean supportsField(final Field field)
{
return false;
}
Modified: wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java?rev=1062355&r1=1062354&r2=1062355&view=diff
==============================================================================
--- wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java (original)
+++ wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java Sun Jan 23 09:58:09 2011
@@ -103,10 +103,11 @@ public class LazyInitProxyFactory
/**
* Primitive java types and their object wrappers
*/
- private static final List<?> PRIMITIVES = Arrays.asList(String.class, byte.class,
- Byte.class, short.class, Short.class, int.class, Integer.class, long.class, Long.class,
- float.class, Float.class, double.class, Double.class, char.class, Character.class,
- boolean.class, Boolean.class);
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ private static final List PRIMITIVES = Arrays.asList(String.class, byte.class, Byte.class,
+ short.class, Short.class, int.class, Integer.class, long.class, Long.class, float.class,
+ Float.class, double.class, Double.class, char.class, Character.class, boolean.class,
+ Boolean.class);
/**
* Create a lazy init proxy for the specified type. The target object will be located using the
@@ -218,7 +219,7 @@ public class LazyInitProxyFactory
* @param type
* @param locator
*/
- public ProxyReplacement(String type, IProxyTargetLocator locator)
+ public ProxyReplacement(final String type, final IProxyTargetLocator locator)
{
this.type = type;
this.locator = locator;
@@ -272,7 +273,7 @@ public class LazyInitProxyFactory
* @param locator
* object locator used to locate the object this proxy represents
*/
- public CGLibInterceptor(Class<?> type, IProxyTargetLocator locator)
+ public CGLibInterceptor(final Class<?> type, final IProxyTargetLocator locator)
{
super();
typeName = type.getName();
@@ -283,8 +284,8 @@ public class LazyInitProxyFactory
* @see net.sf.cglib.proxy.MethodInterceptor#intercept(java.lang.Object,
* java.lang.reflect.Method, java.lang.Object[], net.sf.cglib.proxy.MethodProxy)
*/
- public Object intercept(Object object, Method method, Object[] args, MethodProxy proxy)
- throws Throwable
+ public Object intercept(final Object object, final Method method, final Object[] args,
+ final MethodProxy proxy) throws Throwable
{
if (isFinalizeMethod(method))
{
@@ -367,7 +368,7 @@ public class LazyInitProxyFactory
* @param locator
* object locator used to locate the object this proxy represents
*/
- public JdkHandler(Class<?> type, IProxyTargetLocator locator)
+ public JdkHandler(final Class<?> type, final IProxyTargetLocator locator)
{
super();
this.locator = locator;
@@ -378,7 +379,8 @@ public class LazyInitProxyFactory
* @see java.lang.reflect.InvocationHandler#invoke(java.lang.Object,
* java.lang.reflect.Method, java.lang.Object[])
*/
- 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 (isFinalizeMethod(method))
{
@@ -445,10 +447,11 @@ public class LazyInitProxyFactory
* method being tested
* @return true if the method is derived from Object.equals(), false otherwise
*/
- protected static boolean isEqualsMethod(Method method)
+ protected static boolean isEqualsMethod(final Method method)
{
- return method.getReturnType() == boolean.class && method.getParameterTypes().length == 1 &&
- method.getParameterTypes()[0] == Object.class && method.getName().equals("equals");
+ return (method.getReturnType() == boolean.class) &&
+ (method.getParameterTypes().length == 1) &&
+ (method.getParameterTypes()[0] == Object.class) && method.getName().equals("equals");
}
/**
@@ -458,9 +461,9 @@ public class LazyInitProxyFactory
* method being tested
* @return true if the method is defined from Object.hashCode(), false otherwise
*/
- protected static boolean isHashCodeMethod(Method method)
+ protected static boolean isHashCodeMethod(final Method method)
{
- return method.getReturnType() == int.class && method.getParameterTypes().length == 0 &&
+ return (method.getReturnType() == int.class) && (method.getParameterTypes().length == 0) &&
method.getName().equals("hashCode");
}
@@ -471,10 +474,10 @@ public class LazyInitProxyFactory
* method being tested
* @return true if the method is defined from Object.toString(), false otherwise
*/
- protected static boolean isToStringMethod(Method method)
+ protected static boolean isToStringMethod(final Method method)
{
- return method.getReturnType() == String.class && method.getParameterTypes().length == 0 &&
- method.getName().equals("toString");
+ return (method.getReturnType() == String.class) &&
+ (method.getParameterTypes().length == 0) && method.getName().equals("toString");
}
/**
@@ -484,9 +487,9 @@ public class LazyInitProxyFactory
* method being tested
* @return true if the method is defined from Object.finalize(), false otherwise
*/
- protected static boolean isFinalizeMethod(Method method)
+ protected static boolean isFinalizeMethod(final Method method)
{
- return method.getReturnType() == void.class && method.getParameterTypes().length == 0 &&
+ return (method.getReturnType() == void.class) && (method.getParameterTypes().length == 0) &&
method.getName().equals("finalize");
}
@@ -497,9 +500,9 @@ public class LazyInitProxyFactory
* method being tested
* @return true if the method is the writeReplace method, false otherwise
*/
- protected static boolean isWriteReplaceMethod(Method method)
+ protected static boolean isWriteReplaceMethod(final Method method)
{
- return method.getReturnType() == Object.class && method.getParameterTypes().length == 0 &&
- method.getName().equals("writeReplace");
+ return (method.getReturnType() == Object.class) &&
+ (method.getParameterTypes().length == 0) && method.getName().equals("writeReplace");
}
}
Modified: wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java?rev=1062355&r1=1062354&r2=1062355&view=diff
==============================================================================
--- wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java (original)
+++ wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java Sun Jan 23 09:58:09 2011
@@ -32,8 +32,6 @@ import org.easymock.MockControl;
*/
public class CompoundFieldValueFactoryTest extends TestCase
{
- private Integer testField;
-
private Field field;
private final MockControl[] ctrl = new MockControl[4];
@@ -43,7 +41,7 @@ public class CompoundFieldValueFactoryTe
@Override
protected void setUp() throws Exception
{
- Field field = CompoundFieldValueFactoryTest.class.getDeclaredField("testField");
+ CompoundFieldValueFactoryTest.class.getDeclaredField("testField");
for (int i = 0; i < 4; i++)
{
@@ -52,7 +50,7 @@ public class CompoundFieldValueFactoryTe
}
}
- protected void prepare(int cnt)
+ protected void prepare(final int cnt)
{
for (int i = 0; i < cnt; i++)
{
@@ -61,7 +59,7 @@ public class CompoundFieldValueFactoryTe
}
}
- protected void verify(int cnt)
+ protected void verify(final int cnt)
{
for (int i = 0; i < cnt; i++)
{
Modified: wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java?rev=1062355&r1=1062354&r2=1062355&view=diff
==============================================================================
--- wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java (original)
+++ wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java Sun Jan 23 09:58:09 2011
@@ -36,12 +36,12 @@ public class InjectorTest extends TestCa
private static IFieldValueFactory factory = new IFieldValueFactory()
{
- public Object getFieldValue(Field field, Object fieldOwner)
+ public Object getFieldValue(final Field field, final Object fieldOwner)
{
return dependency;
}
- public boolean supportsField(Field field)
+ public boolean supportsField(final Field field)
{
return true;
}
@@ -52,7 +52,7 @@ public class InjectorTest extends TestCa
{
@Override
- public void inject(Object object)
+ public void inject(final Object object)
{
inject(object, factory);
}
Modified: wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java?rev=1062355&r1=1062354&r2=1062355&view=diff
==============================================================================
--- wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java (original)
+++ wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java Sun Jan 23 09:58:09 2011
@@ -28,14 +28,12 @@ import junit.framework.TestCase;
*/
public class NoopFieldValueFactoryTest extends TestCase
{
- private Integer testField;
-
private Field field;
@Override
protected void setUp() throws Exception
{
- Field field = NoopFieldValueFactoryTest.class.getDeclaredField("testField");
+ NoopFieldValueFactoryTest.class.getDeclaredField("testField");
}
/**
Modified: wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/util/InternalTestObject.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/util/InternalTestObject.java?rev=1062355&r1=1062354&r2=1062355&view=diff
==============================================================================
--- wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/util/InternalTestObject.java (original)
+++ wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/util/InternalTestObject.java Sun Jan 23 09:58:09 2011
@@ -27,7 +27,7 @@ public class InternalTestObject
{
private MockDependency dependency1;
- private MockDependency dependency2 = new MockDependency("dont-inject");
+ private final MockDependency dependency2 = new MockDependency("dont-inject");
/**
* @return dependency1
Modified: wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/util/MockDependency.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/util/MockDependency.java?rev=1062355&r1=1062354&r2=1062355&view=diff
==============================================================================
--- wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/util/MockDependency.java (original)
+++ wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/util/MockDependency.java Sun Jan 23 09:58:09 2011
@@ -39,7 +39,7 @@ public class MockDependency
*
* @param message
*/
- public MockDependency(String message)
+ public MockDependency(final String message)
{
this.message = message;
}
Modified: wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/util/TestObject.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/util/TestObject.java?rev=1062355&r1=1062354&r2=1062355&view=diff
==============================================================================
--- wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/util/TestObject.java (original)
+++ wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/util/TestObject.java Sun Jan 23 09:58:09 2011
@@ -25,7 +25,7 @@ package org.apache.wicket.injection.util
*/
public class TestObject extends InternalTestObject
{
- private MockDependency dependency3 = new MockDependency("dont-inject");
+ private final MockDependency dependency3 = new MockDependency("dont-inject");
private MockDependency dependency4;
Modified: wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/ConcreteObject.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/ConcreteObject.java?rev=1062355&r1=1062354&r2=1062355&view=diff
==============================================================================
--- wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/ConcreteObject.java (original)
+++ wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/ConcreteObject.java Sun Jan 23 09:58:09 2011
@@ -39,7 +39,7 @@ public class ConcreteObject
*
* @param message
*/
- public ConcreteObject(String message)
+ public ConcreteObject(final String message)
{
this.message = message;
}
Modified: wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/InterfaceObject.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/InterfaceObject.java?rev=1062355&r1=1062354&r2=1062355&view=diff
==============================================================================
--- wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/InterfaceObject.java (original)
+++ wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/InterfaceObject.java Sun Jan 23 09:58:09 2011
@@ -24,12 +24,12 @@ package org.apache.wicket.proxy.util;
*/
public class InterfaceObject implements IInterface
{
- private String message;
+ private final String message;
/**
* @param message
*/
- public InterfaceObject(String message)
+ public InterfaceObject(final String message)
{
this.message = message;
}
Modified: wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/MockObjectLocator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/MockObjectLocator.java?rev=1062355&r1=1062354&r2=1062355&view=diff
==============================================================================
--- wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/MockObjectLocator.java (original)
+++ wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/MockObjectLocator.java Sun Jan 23 09:58:09 2011
@@ -27,12 +27,12 @@ import org.apache.wicket.proxy.IProxyTar
public class MockObjectLocator implements IProxyTargetLocator
{
private static final long serialVersionUID = 1L;
- private Object object;
+ private final Object object;
/**
* @param object
*/
- public MockObjectLocator(Object object)
+ public MockObjectLocator(final Object object)
{
this.object = object;
}
Modified: wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/ObjectMethodTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/ObjectMethodTester.java?rev=1062355&r1=1062354&r2=1062355&view=diff
==============================================================================
--- wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/ObjectMethodTester.java (original)
+++ wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/ObjectMethodTester.java Sun Jan 23 09:58:09 2011
@@ -53,7 +53,8 @@ public class ObjectMethodTester implemen
/**
* @see org.apache.wicket.proxy.util.IObjectMethodTester#equals(java.lang.Object)
*/
- public boolean equals(Object obj)
+ @Override
+ public boolean equals(final Object obj)
{
valid = false;
return super.equals(obj);
@@ -62,6 +63,7 @@ public class ObjectMethodTester implemen
/**
* @see org.apache.wicket.proxy.util.IObjectMethodTester#hashCode()
*/
+ @Override
public int hashCode()
{
valid = false;
@@ -71,6 +73,7 @@ public class ObjectMethodTester implemen
/**
* @see org.apache.wicket.proxy.util.IObjectMethodTester#toString()
*/
+ @Override
public String toString()
{
valid = false;