Author: ivaynberg
Date: Fri May 2 20:56:12 2008
New Revision: 652993
URL: http://svn.apache.org/viewvc?rev=652993&view=rev
Log:
generics cleanup
Modified:
wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/ComponentInjector.java
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/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
Modified:
wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/ComponentInjector.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/ComponentInjector.java?rev=652993&r1=652992&r2=652993&view=diff
==============================================================================
---
wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/ComponentInjector.java
(original)
+++
wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/ComponentInjector.java
Fri May 2 20:56:12 2008
@@ -47,7 +47,7 @@
/**
* @see
org.apache.wicket.application.IComponentInstantiationListener#onInstantiation(org.apache.wicket.Component)
*/
- public void onInstantiation(Component component)
+ public void onInstantiation(Component< ? > component)
{
getInjector().inject(component);
}
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=652993&r1=652992&r2=652993&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
Fri May 2 20:56:12 2008
@@ -33,7 +33,7 @@
*/
public class CompoundFieldValueFactory implements IFieldValueFactory
{
- private List delegates = new ArrayList();
+ private final List<IFieldValueFactory> delegates = new
ArrayList<IFieldValueFactory>();
/**
* Constructor
@@ -58,7 +58,7 @@
*
* @param factories
*/
- public CompoundFieldValueFactory(List factories)
+ public CompoundFieldValueFactory(List<IFieldValueFactory> factories)
{
if (factories == null)
{
@@ -107,10 +107,10 @@
*/
public Object getFieldValue(Field field, Object fieldOwner)
{
- Iterator it = delegates.iterator();
+ Iterator<IFieldValueFactory> it = delegates.iterator();
while (it.hasNext())
{
- final IFieldValueFactory factory =
(IFieldValueFactory)it.next();
+ final IFieldValueFactory factory = it.next();
Object object = factory.getFieldValue(field,
fieldOwner);
if (object != null)
{
@@ -125,10 +125,10 @@
*/
public boolean supportsField(Field field)
{
- Iterator it = delegates.iterator();
+ Iterator<IFieldValueFactory> it = delegates.iterator();
while (it.hasNext())
{
- final IFieldValueFactory factory =
(IFieldValueFactory)it.next();
+ final IFieldValueFactory factory = it.next();
if (factory.supportsField(field))
{
return true;
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=652993&r1=652992&r2=652993&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
Fri May 2 20:56:12 2008
@@ -42,7 +42,7 @@
// FIXME: WICKET-625 - Wicket doesn't clean up properly when
hot-deploying;
// hangs onto Class references.
// We need some way to clean out this hashmap when we're done.
- private ConcurrentHashMap<Class, Field[]> classToFields = new
ConcurrentHashMap<Class, Field[]>();
+ private final ConcurrentHashMap<Class< ? >, Field[]> classToFields =
new ConcurrentHashMap<Class< ? >, Field[]>();
/**
* @return static instance of ProxyInjector
@@ -63,7 +63,7 @@
* class to be tested for being a boundary class
* @return true if the class is a boundary class, false otherwise
*/
- protected boolean isBoundaryClass(Class clazz)
+ protected boolean isBoundaryClass(Class< ? > clazz)
{
if (clazz.equals(WebPage.class) || clazz.equals(Page.class) ||
clazz.equals(Panel.class) ||
clazz.equals(MarkupContainer.class) ||
clazz.equals(Component.class))
@@ -83,8 +83,8 @@
*/
public Object inject(Object object, IFieldValueFactory factory)
{
- Class clazz = object.getClass();
- Field[] fields = (Field[])classToFields.get(clazz);
+ Class< ? > clazz = object.getClass();
+ Field[] fields = classToFields.get(clazz);
if (fields == null)
{
fields = findFields(clazz, factory);
@@ -135,9 +135,9 @@
* @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, IFieldValueFactory factory)
{
- List/* <Field> */matched = new ArrayList();
+ List<Field> matched = new ArrayList<Field>();
while (clazz != null && !isBoundaryClass(clazz))
{
@@ -154,7 +154,7 @@
clazz = clazz.getSuperclass();
}
- return (Field[])matched.toArray(new Field[matched.size()]);
+ return matched.toArray(new Field[matched.size()]);
}
}
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=652993&r1=652992&r2=652993&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
Fri May 2 20:56:12 2008
@@ -103,10 +103,10 @@
/**
* Primitive java types and their object wrappers
*/
- private static final List PRIMITIVES = Arrays.asList(new Class[] {
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 });
+ private static final List< ? > PRIMITIVES = Arrays.asList(new Class[] {
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
@@ -120,7 +120,7 @@
*
* @return lazily initializable proxy
*/
- public static Object createProxy(Class type, IProxyTargetLocator
locator)
+ public static Object createProxy(Class< ? > type, IProxyTargetLocator
locator)
{
if (PRIMITIVES.contains(type))
{
@@ -163,6 +163,7 @@
e.setCallback(handler);
e.setNamingPolicy(new DefaultNamingPolicy()
{
+ @Override
public String getClassName(final String prefix,
final String source,
final Object key, final Predicate names)
{
@@ -225,7 +226,7 @@
private Object readResolve() throws ObjectStreamException
{
- Class clazz;
+ Class< ? > clazz;
try
{
clazz = Class.forName(type);
@@ -271,7 +272,7 @@
* @param locator
* object locator used to locate the object this
proxy represents
*/
- public CGLibInterceptor(Class type, IProxyTargetLocator locator)
+ public CGLibInterceptor(Class< ? > type, IProxyTargetLocator
locator)
{
super();
typeName = type.getName();
@@ -366,12 +367,11 @@
* @param locator
* object locator used to locate the object this
proxy represents
*/
- public JdkHandler(Class type, IProxyTargetLocator locator)
+ public JdkHandler(Class< ? > type, IProxyTargetLocator locator)
{
super();
this.locator = locator;
typeName = type.getName();
-
}
/**
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=652993&r1=652992&r2=652993&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
Fri May 2 20:56:12 2008
@@ -36,10 +36,11 @@
private Field field;
- private MockControl[] ctrl = new MockControl[4];
+ private final MockControl[] ctrl = new MockControl[4];
- private IFieldValueFactory[] fact = new IFieldValueFactory[4];
+ private final IFieldValueFactory[] fact = new IFieldValueFactory[4];
+ @Override
protected void setUp() throws Exception
{
Field field =
CompoundFieldValueFactoryTest.class.getDeclaredField("testField");
@@ -96,14 +97,15 @@
public void testListConstructor()
{
prepare(4);
- List list = Arrays.asList(new IFieldValueFactory[] { fact[0],
fact[1], fact[2], fact[3] });
+ List<IFieldValueFactory> list = Arrays.asList(new
IFieldValueFactory[] { fact[0], fact[1],
+ fact[2], fact[3] });
CompoundFieldValueFactory f = new
CompoundFieldValueFactory(list);
f.getFieldValue(field, this);
verify(4);
try
{
- f = new CompoundFieldValueFactory((List)null);
+ f = new
CompoundFieldValueFactory((List<IFieldValueFactory>)null);
fail();
}
catch (IllegalArgumentException e)
@@ -153,7 +155,8 @@
ctrl[2].expectAndReturn(fact[2].getFieldValue(field, this), new
Object());
ctrl[2].replay();
ctrl[3].replay();
- List list = Arrays.asList(new IFieldValueFactory[] { fact[0],
fact[1], fact[2], fact[3] });
+ List<IFieldValueFactory> list = Arrays.asList(new
IFieldValueFactory[] { fact[0], fact[1],
+ fact[2], fact[3] });
CompoundFieldValueFactory f = new
CompoundFieldValueFactory(list);
f.getFieldValue(field, this);
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=652993&r1=652992&r2=652993&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
Fri May 2 20:56:12 2008
@@ -71,7 +71,8 @@
{
Injector injector = new Injector()
{
- protected boolean isBoundaryClass(Class clazz)
+ @Override
+ protected boolean isBoundaryClass(Class< ? > clazz)
{
return clazz.equals(InternalTestObject.class);
}
