Author: ivaynberg
Date: Mon May 19 23:02:19 2008
New Revision: 658114
URL: http://svn.apache.org/viewvc?rev=658114&view=rev
Log:
more generics cleanup, will it ever end?
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/IPageFactory.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/AddDelta.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/ChangeDelta.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/DeleteDelta.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Delta.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Diff.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Revision.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/ToString.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ClassStreamHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Generics.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/value/IntValue.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/value/LongValue.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=658114&r1=658113&r2=658114&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Mon May
19 23:02:19 2008
@@ -2178,7 +2178,7 @@
* The class of page to create
* @return The new page
*/
- public final Page newPage(final Class<? extends Page> c)
+ public final Page<?> newPage(final Class<? extends Page<?>> c)
{
return getPageFactory().newPage(c);
}
@@ -2192,7 +2192,7 @@
* Any parameters to pass to the constructor
* @return The new page
*/
- public final Page newPage(final Class<? extends Page> c, final
PageParameters parameters)
+ public final Page<?> newPage(final Class<? extends Page<?>> c, final
PageParameters parameters)
{
return getPageFactory().newPage(c, parameters);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/IPageFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/IPageFactory.java?rev=658114&r1=658113&r2=658114&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/IPageFactory.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/IPageFactory.java Mon
May 19 23:02:19 2008
@@ -43,7 +43,7 @@
* @throws WicketRuntimeException
* Thrown if the page cannot be constructed
*/
- Page newPage(final Class< ? extends Page> pageClass);
+ Page<?> newPage(final Class<? extends Page<?>> pageClass);
/**
* Creates a new Page, passing PageParameters to the Page constructor
if such a constructor
@@ -58,5 +58,5 @@
* @throws WicketRuntimeException
* Thrown if the page cannot be constructed
*/
- Page newPage(final Class< ? extends Page> pageClass, final
PageParameters parameters);
+ Page<?> newPage(final Class<? extends Page<?>> pageClass, final
PageParameters parameters);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java?rev=658114&r1=658113&r2=658114&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java
Mon May 19 23:02:19 2008
@@ -38,7 +38,7 @@
* @param componentClass
* The unauthorized component class
*/
- public UnauthorizedInstantiationException(final Class< ? extends
Component> componentClass)
+ public UnauthorizedInstantiationException(final Class<? extends
Component> componentClass)
{
super("Not authorized to instantiate class " +
componentClass.getName());
componentClassName = componentClass.getName();
@@ -47,7 +47,7 @@
/**
* @return The component class that could not be instantiated
*/
- public Class< ? extends Component< ? >> getComponentClass()
+ public Class<? extends Component<?>> getComponentClass()
{
return Classes.resolveClass(componentClassName);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java?rev=658114&r1=658113&r2=658114&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
Mon May 19 23:02:19 2008
@@ -19,7 +19,6 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import org.apache.wicket.AbortException;
import org.apache.wicket.IPageFactory;
@@ -28,6 +27,7 @@
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.authorization.AuthorizationException;
import org.apache.wicket.markup.MarkupException;
+import org.apache.wicket.util.lang.Generics;
/**
@@ -42,25 +42,25 @@
public final class DefaultPageFactory implements IPageFactory
{
/** Map of Constructors for Page subclasses */
- private final Map<Class, Constructor> constructorForClass = new
ConcurrentHashMap<Class, Constructor>();
+ private final Map<Class<?>, Constructor<?>> constructorForClass =
Generics.newConcurrentHashMap();
/**
* @see IPageFactory#newPage(Class)
*/
- public final Page newPage(final Class pageClass)
+ public final Page<?> newPage(final Class<? extends Page<?>> pageClass)
{
try
{
// throw an exception in case default constructor is
missing
// => improved error message
- final Constructor constructor =
pageClass.getConstructor((Class[])null);
+ final Constructor<? extends Page<?>> constructor =
pageClass.getConstructor((Class[])null);
return newPage(constructor, null);
}
catch (NoSuchMethodException e)
{
// a bit of a hack here..
- Constructor constructor = constructor(pageClass,
PageParameters.class);
+ Constructor<?> constructor = constructor(pageClass,
PageParameters.class);
if (constructor != null)
{
return newPage(constructor, new
PageParameters());
@@ -76,10 +76,11 @@
/**
* @see IPageFactory#newPage(Class, PageParameters)
*/
- public final Page newPage(final Class pageClass, final PageParameters
parameters)
+ public final Page<?> newPage(final Class<? extends Page<?>> pageClass,
+ final PageParameters parameters)
{
// Try to get constructor that takes PageParameters
- Constructor constructor = constructor(pageClass,
PageParameters.class);
+ Constructor<?> constructor = constructor(pageClass,
PageParameters.class);
// If we got a PageParameters constructor
if (constructor != null)
@@ -102,10 +103,11 @@
* @return The page constructor, or null if no one-arg constructor can
be found taking the given
* argument type.
*/
- private final Constructor constructor(final Class pageClass, final
Class<PageParameters> argumentType)
+ private final Constructor<?> constructor(final Class<? extends Page<?>>
pageClass,
+ final Class<PageParameters> argumentType)
{
// Get constructor for page class from cache
- Constructor constructor = constructorForClass.get(pageClass);
+ Constructor<?> constructor = constructorForClass.get(pageClass);
// Need to look up?
if (constructor == null)
@@ -139,14 +141,14 @@
* Thrown if the Page cannot be instantiated using the
given constructor and
* argument.
*/
- private final Page newPage(final Constructor constructor, final Object
argument)
+ private final Page<?> newPage(final Constructor<?> constructor, final
Object argument)
{
try
{
if (argument != null)
- return (Page)constructor.newInstance(new
Object[] { argument });
+ return (Page<?>)constructor.newInstance(new
Object[] { argument });
else
- return (Page)constructor.newInstance(new
Object[] {});
+ return (Page<?>)constructor.newInstance(new
Object[] {});
}
catch (InstantiationException e)
{
@@ -169,7 +171,7 @@
}
}
- private String createDescription(Constructor constructor, Object
argument)
+ private String createDescription(Constructor<?> constructor, Object
argument)
{
if (argument != null)
return "Can't instantiate page using constructor " +
constructor + " and argument " +
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/AddDelta.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/AddDelta.java?rev=658114&r1=658113&r2=658114&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/AddDelta.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/AddDelta.java
Mon May 19 23:02:19 2008
@@ -84,7 +84,8 @@
/**
* @see org.apache.wicket.util.diff.Delta#verify(java.util.List)
*/
- public void verify(List target) throws PatchFailedException
+ @Override
+ public void verify(List<Object> target) throws PatchFailedException
{
if (original.first() > target.size())
{
@@ -95,7 +96,8 @@
/**
* @see org.apache.wicket.util.diff.Delta#applyTo(java.util.List)
*/
- public void applyTo(List target)
+ @Override
+ public void applyTo(List<Object> target)
{
revised.applyAdd(original.first(), target);
}
@@ -103,6 +105,7 @@
/**
* @see
org.apache.wicket.util.diff.Delta#toString(java.lang.StringBuffer)
*/
+ @Override
public void toString(StringBuffer s)
{
s.append(original.anchor());
@@ -115,6 +118,7 @@
/**
* @see
org.apache.wicket.util.diff.Delta#toRCSString(java.lang.StringBuffer,
java.lang.String)
*/
+ @Override
public void toRCSString(StringBuffer s, String EOL)
{
s.append("a");
@@ -128,6 +132,7 @@
/**
* @see
org.apache.wicket.util.diff.Delta#accept(org.apache.wicket.util.diff.RevisionVisitor)
*/
+ @Override
public void accept(RevisionVisitor visitor)
{
visitor.visit(this);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/ChangeDelta.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/ChangeDelta.java?rev=658114&r1=658113&r2=658114&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/ChangeDelta.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/ChangeDelta.java
Mon May 19 23:02:19 2008
@@ -90,7 +90,8 @@
/**
* @see org.apache.wicket.util.diff.Delta#verify(java.util.List)
*/
- public void verify(List target) throws PatchFailedException
+ @Override
+ public void verify(List<Object> target) throws PatchFailedException
{
if (!original.verify(target))
{
@@ -105,7 +106,8 @@
/**
* @see org.apache.wicket.util.diff.Delta#applyTo(java.util.List)
*/
- public void applyTo(List target)
+ @Override
+ public void applyTo(List<Object> target)
{
original.applyDelete(target);
revised.applyAdd(original.first(), target);
@@ -114,6 +116,7 @@
/**
* @see
org.apache.wicket.util.diff.Delta#toString(java.lang.StringBuffer)
*/
+ @Override
public void toString(StringBuffer s)
{
original.rangeString(s);
@@ -129,6 +132,7 @@
/**
* @see
org.apache.wicket.util.diff.Delta#toRCSString(java.lang.StringBuffer,
java.lang.String)
*/
+ @Override
public void toRCSString(StringBuffer s, String EOL)
{
s.append("d");
@@ -147,6 +151,7 @@
/**
* @see
org.apache.wicket.util.diff.Delta#accept(org.apache.wicket.util.diff.RevisionVisitor)
*/
+ @Override
public void accept(RevisionVisitor visitor)
{
visitor.visit(this);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/DeleteDelta.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/DeleteDelta.java?rev=658114&r1=658113&r2=658114&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/DeleteDelta.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/DeleteDelta.java
Mon May 19 23:02:19 2008
@@ -83,7 +83,8 @@
/**
* @see org.apache.wicket.util.diff.Delta#verify(java.util.List)
*/
- public void verify(List target) throws PatchFailedException
+ @Override
+ public void verify(List<Object> target) throws PatchFailedException
{
if (!original.verify(target))
{
@@ -94,7 +95,8 @@
/**
* @see org.apache.wicket.util.diff.Delta#applyTo(java.util.List)
*/
- public void applyTo(List target)
+ @Override
+ public void applyTo(List<Object> target)
{
original.applyDelete(target);
}
@@ -102,6 +104,7 @@
/**
* @see
org.apache.wicket.util.diff.Delta#toString(java.lang.StringBuffer)
*/
+ @Override
public void toString(StringBuffer s)
{
s.append(original.rangeString());
@@ -114,6 +117,7 @@
/**
* @see
org.apache.wicket.util.diff.Delta#toRCSString(java.lang.StringBuffer,
java.lang.String)
*/
+ @Override
public void toRCSString(StringBuffer s, String EOL)
{
s.append("d");
@@ -126,6 +130,7 @@
/**
* @see
org.apache.wicket.util.diff.Delta#accept(org.apache.wicket.util.diff.RevisionVisitor)
*/
+ @Override
public void accept(RevisionVisitor visitor)
{
visitor.visit(this);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Delta.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Delta.java?rev=658114&r1=658113&r2=658114&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Delta.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Delta.java
Mon May 19 23:02:19 2008
@@ -84,7 +84,7 @@
protected Chunk revised;
- static Class[][] DeltaClass;
+ static Class<?>[][] DeltaClass;
static
{
@@ -114,7 +114,7 @@
*/
public static Delta newDelta(Chunk orig, Chunk rev)
{
- Class c = DeltaClass[orig.size() > 0 ? 1 : 0][rev.size() > 0 ?
1 : 0];
+ Class<?> c = DeltaClass[orig.size() > 0 ? 1 : 0][rev.size() > 0
? 1 : 0];
Delta result;
try
{
@@ -166,7 +166,7 @@
* @throws PatchFailedException
* if the patch cannot be applied.
*/
- public abstract void verify(List target) throws PatchFailedException;
+ public abstract void verify(List<Object> target) throws
PatchFailedException;
/**
* Applies this delta as a patch to the given text.
@@ -176,7 +176,7 @@
* @throws PatchFailedException
* if the patch cannot be applied.
*/
- public final void patch(List target) throws PatchFailedException
+ public final void patch(List<Object> target) throws PatchFailedException
{
verify(target);
try
@@ -197,7 +197,7 @@
* @throws PatchFailedException
* if the patch cannot be applied.
*/
- public abstract void applyTo(List target);
+ public abstract void applyTo(List<Object> target);
/**
* Converts this delta into its Unix diff style string representation.
@@ -206,6 +206,7 @@
* a [EMAIL PROTECTED] StringBuffer StringBuffer} to which
the string representation will be
* appended.
*/
+ @Override
public void toString(StringBuffer s)
{
original.rangeString(s);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Diff.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Diff.java?rev=658114&r1=658113&r2=658114&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Diff.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Diff.java Mon
May 19 23:02:19 2008
@@ -191,7 +191,7 @@
* @throws DifferentiationFailedException
*/
public static Revision diff(Object[] orig, Object[] rev, DiffAlgorithm
algorithm)
- throws DifferentiationFailedException
+ throws DifferentiationFailedException
{
if (orig == null || rev == null)
{
@@ -305,7 +305,7 @@
*/
public static Object[] randomEdit(Object[] text, long seed)
{
- List result = new ArrayList(Arrays.asList(text));
+ List<Object> result = new
ArrayList<Object>(Arrays.asList(text));
Random r = new Random(seed);
int nops = r.nextInt(10);
for (int i = 0; i < nops; i++)
@@ -351,7 +351,7 @@
*/
public static Object[] shuffle(Object[] text, long seed)
{
- List result = new ArrayList(Arrays.asList(text));
+ List<Object> result = new
ArrayList<Object>(Arrays.asList(text));
Collections.shuffle(result);
return result.toArray();
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java?rev=658114&r1=658113&r2=658114&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java
Mon May 19 23:02:19 2008
@@ -57,8 +57,8 @@
* The name of the expected result file to be created
* @throws IOException
*/
- public final static void replaceExpectedResultFile(final String
document, final Class clazz,
- final String file) throws IOException
+ public final static void replaceExpectedResultFile(final String
document, final Class<?> clazz,
+ final String file) throws IOException
{
String filename = clazz.getPackage().getName();
filename = filename.replace('.', '/');
@@ -86,8 +86,8 @@
* @return true, if equal
* @throws IOException
*/
- public static final boolean validatePage(String document, final Class
clazz, final String file,
- boolean failWithAssert) throws IOException
+ public static final boolean validatePage(String document, final
Class<?> clazz,
+ final String file, boolean failWithAssert) throws IOException
{
String filename = clazz.getPackage().getName();
filename = filename.replace('.', '/');
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Revision.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Revision.java?rev=658114&r1=658113&r2=658114&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Revision.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Revision.java
Mon May 19 23:02:19 2008
@@ -85,7 +85,7 @@
public class Revision extends ToString
{
- List deltas_ = new LinkedList();
+ List<Delta> deltas_ = new LinkedList<Delta>();
/**
* Creates an empty Revision.
@@ -133,7 +133,7 @@
*/
public Delta getDelta(int i)
{
- return (Delta)deltas_.get(i);
+ return deltas_.get(i);
}
/**
@@ -157,7 +157,7 @@
*/
public Object[] patch(Object[] src) throws PatchFailedException
{
- List target = new ArrayList(Arrays.asList(src));
+ List<Object> target = new ArrayList<Object>(Arrays.asList(src));
applyTo(target);
return target.toArray();
}
@@ -170,12 +170,12 @@
* @throws PatchFailedException
* if any of the patches cannot be applied.
*/
- public synchronized void applyTo(List target) throws
PatchFailedException
+ public synchronized void applyTo(List<Object> target) throws
PatchFailedException
{
- ListIterator i = deltas_.listIterator(deltas_.size());
+ ListIterator<Delta> i = deltas_.listIterator(deltas_.size());
while (i.hasPrevious())
{
- Delta delta = (Delta)i.previous();
+ Delta delta = i.previous();
delta.patch(target);
}
}
@@ -187,12 +187,13 @@
* a [EMAIL PROTECTED] StringBuffer StringBuffer} to which
the string representation will be
* appended.
*/
+ @Override
public synchronized void toString(StringBuffer s)
{
- Iterator i = deltas_.iterator();
+ Iterator<Delta> i = deltas_.iterator();
while (i.hasNext())
{
- ((Delta)i.next()).toString(s);
+ (i.next()).toString(s);
}
}
@@ -207,10 +208,10 @@
*/
public synchronized void toRCSString(StringBuffer s, String EOL)
{
- Iterator i = deltas_.iterator();
+ Iterator<Delta> i = deltas_.iterator();
while (i.hasNext())
{
- ((Delta)i.next()).toRCSString(s, EOL);
+ (i.next()).toRCSString(s, EOL);
}
}
@@ -260,10 +261,10 @@
public void accept(RevisionVisitor visitor)
{
visitor.visit(this);
- Iterator iter = deltas_.iterator();
+ Iterator<Delta> iter = deltas_.iterator();
while (iter.hasNext())
{
- ((Delta)iter.next()).accept(visitor);
+ (iter.next()).accept(visitor);
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/ToString.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/ToString.java?rev=658114&r1=658113&r2=658114&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/ToString.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/ToString.java
Mon May 19 23:02:19 2008
@@ -76,6 +76,7 @@
*
* @return String
*/
+ @Override
public String toString()
{
StringBuffer s = new StringBuffer();
@@ -105,7 +106,7 @@
public static String[] stringToArray(String value)
{
BufferedReader reader = new BufferedReader(new
StringReader(value));
- List l = new LinkedList();
+ List<String> l = new LinkedList<String>();
String s;
try
{
@@ -117,7 +118,7 @@
catch (java.io.IOException e)
{
}
- return (String[])l.toArray(new String[l.size()]);
+ return l.toArray(new String[l.size()]);
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ClassStreamHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ClassStreamHandler.java?rev=658114&r1=658113&r2=658114&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ClassStreamHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ClassStreamHandler.java
Mon May 19 23:02:19 2008
@@ -30,11 +30,11 @@
import java.lang.reflect.Modifier;
import java.lang.reflect.Proxy;
import java.security.AccessController;
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.wicket.util.lang.Generics;
+
import sun.misc.Unsafe;
import sun.reflect.ReflectionFactory;
@@ -55,7 +55,7 @@
{
try
{
- Class[] classes =
ObjectStreamClass.class.getDeclaredClasses();
+ Class<?>[] classes =
ObjectStreamClass.class.getDeclaredClasses();
for (int i = 0; i < classes.length; i++)
{
if
(classes[i].getName().equals("java.io.ObjectStreamClass$FieldReflector"))
@@ -74,11 +74,11 @@
}
}
- private static final ReflectionFactory reflFactory =
(ReflectionFactory)AccessController
- .doPrivileged(new
ReflectionFactory.GetReflectionFactoryAction());
+ @SuppressWarnings("unchecked")
+ private static final ReflectionFactory reflFactory =
(ReflectionFactory)AccessController.doPrivileged(new
ReflectionFactory.GetReflectionFactoryAction());
- private static Map handlesClasses = new HashMap();
+ private static Map<Object, ClassStreamHandler> handlesClasses =
Generics.newHashMap();
private static short classCounter = 0;
@@ -112,9 +112,9 @@
*/
public static final int CLASS = 5;
- static ClassStreamHandler lookup(Class cls) throws
NotSerializableException
+ static ClassStreamHandler lookup(Class<?> cls) throws
NotSerializableException
{
- ClassStreamHandler classHandler =
(ClassStreamHandler)handlesClasses.get(cls.getName());
+ ClassStreamHandler classHandler =
handlesClasses.get(cls.getName());
if (classHandler == null)
{
classHandler = new ClassStreamHandler(cls);
@@ -126,7 +126,7 @@
static ClassStreamHandler lookup(short s)
{
- ClassStreamHandler classHandler =
(ClassStreamHandler)handlesClasses.get(new Short(s));
+ ClassStreamHandler classHandler = handlesClasses.get(new
Short(s));
if (classHandler == null)
{
throw new RuntimeException("class not found for: " + s);
@@ -137,18 +137,18 @@
/**
*
*/
- private final Class clz;
- private final List fields;
+ private final Class<?> clz;
+ private final List<FieldAndIndex> fields;
private final short classId;
- private final Constructor cons;
+ private final Constructor<?> cons;
private final Method writeReplaceMethod;
private final Method readResolveMethod;
- private final List writeObjectMethods;
+ private final List<Method> writeObjectMethods;
- private final List readObjectMethods;
+ private final List<Method> readObjectMethods;
private final PrimitiveArray primitiveArray;
@@ -161,10 +161,10 @@
* TODO
* @throws WicketSerializeableException
*/
- private ClassStreamHandler(Class cls) throws
WicketSerializeableException
+ private ClassStreamHandler(Class<?> cls) throws
WicketSerializeableException
{
- this.classId = classCounter++;
- this.clz = cls;
+ classId = classCounter++;
+ clz = cls;
if (cls.isPrimitive())
{
fields = null;
@@ -234,10 +234,10 @@
}
else
{
- fields = new ArrayList();
+ fields = Generics.newArrayList();
primitiveArray = null;
- writeObjectMethods = new ArrayList(2);
- readObjectMethods = new ArrayList(2);
+ writeObjectMethods = Generics.newArrayList(2);
+ readObjectMethods = Generics.newArrayList(2);
writeReplaceMethod = getInheritableMethod(clz,
"writeReplace", null, Object.class);
readResolveMethod = getInheritableMethod(clz,
"readResolve", null, Object.class);
@@ -247,7 +247,7 @@
if (cons == null)
{
throw new WicketSerializeableException(
- "No Serializable
constructor found for " + cls);
+ "No Serializable constructor
found for " + cls);
}
}
else
@@ -255,17 +255,17 @@
cons = getSerializableConstructor(clz);
}
- Class parent = cls;
+ Class<?> parent = cls;
while (parent != Object.class)
{
Method method = getPrivateMethod(parent,
"writeObject",
- new Class[] {
ObjectOutputStream.class }, Void.TYPE);
+ new Class[] { ObjectOutputStream.class
}, Void.TYPE);
if (method != null)
{
writeObjectMethods.add(method);
}
method = getPrivateMethod(parent, "readObject",
- new Class[] {
ObjectInputStream.class }, Void.TYPE);
+ new Class[] { ObjectInputStream.class
}, Void.TYPE);
if (method != null)
{
readObjectMethods.add(method);
@@ -278,15 +278,15 @@
}
/**
- * @return
+ * @return stream class
*/
- public Class getStreamClass()
+ public Class<?> getStreamClass()
{
return clz;
}
/**
- * @return
+ * @return class id
*/
public short getClassId()
{
@@ -294,22 +294,22 @@
}
/**
- * @return
+ * @return new instance of class
* @throws InvocationTargetException
* @throws IllegalAccessException
* @throws InstantiationException
* @throws IllegalArgumentException
*/
public Object createObject() throws IllegalArgumentException,
InstantiationException,
- IllegalAccessException, InvocationTargetException
+ IllegalAccessException, InvocationTargetException
{
- return cons.newInstance(null);
+ return cons.newInstance((Object[])null);
}
/**
* @param cls
*/
- private void fillFields(Class cls)
+ private void fillFields(Class<?> cls)
{
if (cls == null)
{
@@ -321,10 +321,10 @@
Field field = fields[i];
field.setAccessible(true);
if (!Modifier.isStatic(field.getModifiers()) &&
-
!Modifier.isTransient(field.getModifiers()))
+ !Modifier.isTransient(field.getModifiers()))
{
FieldAndIndex fai = null;
- Class clz = field.getType();
+ Class<?> clz = field.getType();
long offset = unsafe.objectFieldOffset(field);
if (clz == boolean.class)
{
@@ -379,14 +379,14 @@
* @throws WicketSerializeableException
*/
public void writeFields(WicketObjectOutputStream woos, Object obj)
- throws WicketSerializeableException
+ throws WicketSerializeableException
{
FieldAndIndex fai = null;
try
{
for (int i = 0; fields != null && i < fields.size();
i++)
{
- fai = (FieldAndIndex)fields.get(i);
+ fai = fields.get(i);
fai.writeField(obj, woos);
}
}
@@ -406,17 +406,18 @@
/**
* @param wois
+ * @param object
* @throws WicketSerializeableException
*/
public void readFields(WicketObjectInputStream wois, Object object)
- throws WicketSerializeableException
+ throws WicketSerializeableException
{
FieldAndIndex fai = null;
try
{
for (int i = 0; i < fields.size(); i++)
{
- fai = (FieldAndIndex)fields.get(i);
+ fai = fields.get(i);
fai.readField(object, wois);
}
}
@@ -428,15 +429,25 @@
catch (Exception ex)
{
throw new WicketSerializeableException("Error reading
field: " + fai.field.getName() +
- " for object class: " +
object.getClass(), ex);
+ " for object class: " + object.getClass(), ex);
}
}
+ /**
+ * @param obj
+ * @param wois
+ * @throws IOException
+ */
public void writeArray(Object obj, WicketObjectOutputStream wois)
throws IOException
{
primitiveArray.writeArray(obj, wois);
}
+ /**
+ * @param wois
+ * @return array
+ * @throws IOException
+ */
public Object readArray(WicketObjectInputStream wois) throws IOException
{
return primitiveArray.readArray(wois);
@@ -445,7 +456,7 @@
/**
* @param woos
* @param obj
- * @return
+ * @return true if method was invoked, false otherwise
* @throws InvocationTargetException
* @throws IllegalAccessException
* @throws IllegalArgumentException
@@ -456,7 +467,7 @@
{
for (int i = writeObjectMethods.size(); --i >= 0;)
{
- Method method =
(Method)writeObjectMethods.get(i);
+ Method method = writeObjectMethods.get(i);
try
{
@@ -482,7 +493,8 @@
/**
* @param wois
- * @return
+ * @param obj
+ * @return if read method was invoked
*/
public boolean invokeReadMethod(WicketObjectInputStream wois, Object
obj)
{
@@ -490,7 +502,7 @@
{
for (int i = readObjectMethods.size(); --i >= 0;)
{
- Method method =
(Method)readObjectMethods.get(i);
+ Method method = readObjectMethods.get(i);
try
{
method.invoke(obj, new Object[] { wois
});
@@ -513,9 +525,10 @@
return false;
}
- private static Constructor getSerializableConstructor(Class cl)
+ @SuppressWarnings( { "unchecked" })
+ private static <T> Constructor<? super T>
getSerializableConstructor(Class<T> cl)
{
- Class initCl = cl;
+ Class<? super T> initCl = cl;
while (Serializable.class.isAssignableFrom(initCl))
{
if ((initCl = initCl.getSuperclass()) == null)
@@ -525,11 +538,10 @@
}
try
{
- Constructor cons =
initCl.getDeclaredConstructor((Class[])null);
+ Constructor<? super T> cons =
initCl.getDeclaredConstructor((Class[])null);
int mods = cons.getModifiers();
if ((mods & Modifier.PRIVATE) != 0 ||
- ((mods & (Modifier.PUBLIC |
Modifier.PROTECTED)) == 0 && !packageEquals(cl,
- initCl)))
+ ((mods & (Modifier.PUBLIC |
Modifier.PROTECTED)) == 0 && !packageEquals(cl, initCl)))
{
return null;
}
@@ -546,8 +558,15 @@
/**
* Returns non-static private method with given signature defined by
given class, or null if
* none found. Access checks are disabled on the returned method (if
any).
+ *
+ * @param cl
+ * @param name
+ * @param argTypes
+ * @param returnType
+ * @return private method or null if none
*/
- private static Method getPrivateMethod(Class cl, String name, Class[]
argTypes, Class returnType)
+ private static Method getPrivateMethod(Class<?> cl, String name,
Class<?>[] argTypes,
+ Class<?> returnType)
{
try
{
@@ -555,8 +574,7 @@
meth.setAccessible(true);
int mods = meth.getModifiers();
return ((meth.getReturnType() == returnType) && ((mods
& Modifier.STATIC) == 0) && ((mods & Modifier.PRIVATE) != 0))
- ? meth
- : null;
+ ? meth : null;
}
catch (NoSuchMethodException ex)
{
@@ -568,12 +586,18 @@
* Returns non-static, non-abstract method with given signature
provided it is defined by or
* accessible (via inheritance) by the given class, or null if no match
found. Access checks are
* disabled on the returned method (if any).
+ *
+ * @param cl
+ * @param name
+ * @param argTypes
+ * @param returnType
+ * @return inheritable method or null if none
*/
- private static Method getInheritableMethod(Class cl, String name,
Class[] argTypes,
- Class returnType)
+ private static Method getInheritableMethod(Class<?> cl, String name,
Class<?>[] argTypes,
+ Class<?> returnType)
{
Method meth = null;
- Class defCl = cl;
+ Class<?> defCl = cl;
while (defCl != null)
{
try
@@ -611,16 +635,19 @@
}
}
- private static boolean packageEquals(Class cl1, Class cl2)
+ private static boolean packageEquals(Class<?> cl1, Class<?> cl2)
{
return (cl1.getClassLoader() == cl2.getClassLoader() &&
getPackageName(cl1).equals(
- getPackageName(cl2)));
+ getPackageName(cl2)));
}
/**
* Returns package name of given class.
+ *
+ * @param cl
+ * @return package name
*/
- private static String getPackageName(Class cl)
+ private static String getPackageName(Class<?> cl)
{
String s = cl.getName();
int i = s.lastIndexOf('[');
@@ -640,14 +667,14 @@
FieldAndIndex(Field field)
{
this.field = field;
- this.index = unsafe.objectFieldOffset(field);
+ index = unsafe.objectFieldOffset(field);
}
public abstract void writeField(Object object,
WicketObjectOutputStream dos)
- throws IOException;
+ throws IOException;
public abstract void readField(Object object,
WicketObjectInputStream dos)
- throws IOException, ClassNotFoundException;
+ throws IOException, ClassNotFoundException;
}
private final class BooleanFieldAndIndex extends FieldAndIndex
@@ -662,6 +689,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.FieldAndIndex#writeField(Object,
* WicketObjectOutputStream)
*/
+ @Override
public void writeField(Object object, WicketObjectOutputStream
dos) throws IOException
{
dos.writeBoolean(unsafe.getBoolean(object, index));
@@ -671,6 +699,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.FieldAndIndex#readField(Object,
* WicketObjectInputStream)
*/
+ @Override
public void readField(Object object, WicketObjectInputStream
dos) throws IOException
{
unsafe.putBoolean(object, index, dos.readBoolean());
@@ -689,6 +718,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.FieldAndIndex#writeField(Object,
* WicketObjectOutputStream)
*/
+ @Override
public void writeField(Object object, WicketObjectOutputStream
dos) throws IOException
{
dos.writeByte(unsafe.getByte(object, index));
@@ -698,6 +728,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.FieldAndIndex#readField(Object,
* WicketObjectInputStream)
*/
+ @Override
public void readField(Object object, WicketObjectInputStream
dos) throws IOException
{
unsafe.putByte(object, index, dos.readByte());
@@ -716,6 +747,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.FieldAndIndex#writeField(Object,
* WicketObjectOutputStream)
*/
+ @Override
public void writeField(Object object, WicketObjectOutputStream
dos) throws IOException
{
dos.writeShort(unsafe.getShort(object, index));
@@ -725,6 +757,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.FieldAndIndex#readField(Object,
* WicketObjectInputStream)
*/
+ @Override
public void readField(Object object, WicketObjectInputStream
dos) throws IOException
{
unsafe.putShort(object, index, dos.readShort());
@@ -743,6 +776,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.FieldAndIndex#writeField(Object,
* WicketObjectOutputStream)
*/
+ @Override
public void writeField(Object object, WicketObjectOutputStream
dos) throws IOException
{
dos.writeChar(unsafe.getChar(object, index));
@@ -752,6 +786,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.FieldAndIndex#readField(java.lang.Object,
* WicketObjectInputStream)
*/
+ @Override
public void readField(Object object, WicketObjectInputStream
dos) throws IOException
{
unsafe.putChar(object, index, dos.readChar());
@@ -770,6 +805,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.FieldAndIndex#writeField(Object,
* WicketObjectOutputStream)
*/
+ @Override
public void writeField(Object object, WicketObjectOutputStream
dos) throws IOException
{
dos.writeInt(unsafe.getInt(object, index));
@@ -779,6 +815,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.FieldAndIndex#readField(java.lang.Object,
* WicketObjectInputStream)
*/
+ @Override
public void readField(Object object, WicketObjectInputStream
dos) throws IOException
{
unsafe.putInt(object, index, dos.readInt());
@@ -797,6 +834,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.FieldAndIndex#writeField(Object,
* WicketObjectOutputStream)
*/
+ @Override
public void writeField(Object object, WicketObjectOutputStream
dos) throws IOException
{
dos.writeLong(unsafe.getLong(object, index));
@@ -806,6 +844,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.FieldAndIndex#readField(java.lang.Object,
* WicketObjectInputStream)
*/
+ @Override
public void readField(Object object, WicketObjectInputStream
dos) throws IOException
{
unsafe.putLong(object, index, dos.readLong());
@@ -824,6 +863,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.FieldAndIndex#writeField(Object,
* WicketObjectOutputStream)
*/
+ @Override
public void writeField(Object object, WicketObjectOutputStream
dos) throws IOException
{
dos.writeFloat(unsafe.getFloat(object, index));
@@ -833,6 +873,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.FieldAndIndex#readField(java.lang.Object,
* WicketObjectInputStream)
*/
+ @Override
public void readField(Object object, WicketObjectInputStream
dos) throws IOException
{
unsafe.putFloat(object, index, dos.readFloat());
@@ -851,6 +892,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.FieldAndIndex#writeField(Object,
* WicketObjectOutputStream)
*/
+ @Override
public void writeField(Object object, WicketObjectOutputStream
dos) throws IOException
{
dos.writeDouble(unsafe.getDouble(object, index));
@@ -860,6 +902,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.FieldAndIndex#readField(java.lang.Object,
* WicketObjectInputStream)
*/
+ @Override
public void readField(Object object, WicketObjectInputStream
dos) throws IOException
{
unsafe.putDouble(object, index, dos.readDouble());
@@ -878,6 +921,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.FieldAndIndex#writeField(Object,
* WicketObjectOutputStream)
*/
+ @Override
public void writeField(Object object, WicketObjectOutputStream
dos) throws IOException
{
dos.writeObject(unsafe.getObject(object, index));
@@ -888,8 +932,9 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.FieldAndIndex#readField(java.lang.Object,
* WicketObjectInputStream)
*/
+ @Override
public void readField(Object object, WicketObjectInputStream
dos) throws IOException,
- ClassNotFoundException
+ ClassNotFoundException
{
unsafe.putObject(object, index, dos.readObject());
}
@@ -899,7 +944,7 @@
private abstract class PrimitiveArray
{
public abstract void writeArray(Object object,
WicketObjectOutputStream dos)
- throws IOException;
+ throws IOException;
public abstract Object readArray(WicketObjectInputStream dos)
throws IOException;
}
@@ -911,6 +956,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.PrimitiveArray#writeArray(Object,
* WicketObjectOutputStream)
*/
+ @Override
public void writeArray(Object object, WicketObjectOutputStream
dos) throws IOException
{
int length = Array.getLength(object);
@@ -924,6 +970,7 @@
/**
* @see
org.apache.wicket.util.io.ClassStreamHandler.PrimitiveArray#readArray(WicketObjectInputStream)
*/
+ @Override
public Object readArray(WicketObjectInputStream dos) throws
IOException
{
int length = dos.readInt();
@@ -943,6 +990,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.PrimitiveArray#writeArray(Object,
* WicketObjectOutputStream)
*/
+ @Override
public void writeArray(Object object, WicketObjectOutputStream
dos) throws IOException
{
int length = Array.getLength(object);
@@ -956,6 +1004,7 @@
/**
* @see
org.apache.wicket.util.io.ClassStreamHandler.PrimitiveArray#readArray(WicketObjectInputStream)
*/
+ @Override
public Object readArray(WicketObjectInputStream dos) throws
IOException
{
int length = dos.readInt();
@@ -975,6 +1024,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.PrimitiveArray#writeArray(Object,
* WicketObjectOutputStream)
*/
+ @Override
public void writeArray(Object object, WicketObjectOutputStream
dos) throws IOException
{
int length = Array.getLength(object);
@@ -988,6 +1038,7 @@
/**
* @see
org.apache.wicket.util.io.ClassStreamHandler.PrimitiveArray#readArray(WicketObjectInputStream)
*/
+ @Override
public Object readArray(WicketObjectInputStream dos) throws
IOException
{
int length = dos.readInt();
@@ -1008,6 +1059,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.PrimitiveArray#writeArray(Object,
* WicketObjectOutputStream)
*/
+ @Override
public void writeArray(Object object, WicketObjectOutputStream
dos) throws IOException
{
int length = Array.getLength(object);
@@ -1021,6 +1073,7 @@
/**
* @see
org.apache.wicket.util.io.ClassStreamHandler.PrimitiveArray#readArray(WicketObjectInputStream)
*/
+ @Override
public Object readArray(WicketObjectInputStream dos) throws
IOException
{
int length = dos.readInt();
@@ -1040,6 +1093,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.PrimitiveArray#writeArray(Object,
* WicketObjectOutputStream)
*/
+ @Override
public void writeArray(Object object, WicketObjectOutputStream
dos) throws IOException
{
int length = Array.getLength(object);
@@ -1053,6 +1107,7 @@
/**
* @see
org.apache.wicket.util.io.ClassStreamHandler.PrimitiveArray#readArray(WicketObjectInputStream)
*/
+ @Override
public Object readArray(WicketObjectInputStream dos) throws
IOException
{
int length = dos.readInt();
@@ -1072,6 +1127,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.PrimitiveArray#writeArray(Object,
* WicketObjectOutputStream)
*/
+ @Override
public void writeArray(Object object, WicketObjectOutputStream
dos) throws IOException
{
int length = Array.getLength(object);
@@ -1085,6 +1141,7 @@
/**
* @see
org.apache.wicket.util.io.ClassStreamHandler.PrimitiveArray#readArray(WicketObjectInputStream)
*/
+ @Override
public Object readArray(WicketObjectInputStream dos) throws
IOException
{
int length = dos.readInt();
@@ -1104,6 +1161,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.PrimitiveArray#writeArray(Object,
* WicketObjectOutputStream)
*/
+ @Override
public void writeArray(Object object, WicketObjectOutputStream
dos) throws IOException
{
int length = Array.getLength(object);
@@ -1117,6 +1175,7 @@
/**
* @see
org.apache.wicket.util.io.ClassStreamHandler.PrimitiveArray#readArray(WicketObjectInputStream)
*/
+ @Override
public Object readArray(WicketObjectInputStream dos) throws
IOException
{
int length = dos.readInt();
@@ -1136,6 +1195,7 @@
* @see
org.apache.wicket.util.io.ClassStreamHandler.PrimitiveArray#writeArray(Object,
* WicketObjectOutputStream)
*/
+ @Override
public void writeArray(Object object, WicketObjectOutputStream
dos) throws IOException
{
int length = Array.getLength(object);
@@ -1149,6 +1209,7 @@
/**
* @see
org.apache.wicket.util.io.ClassStreamHandler.PrimitiveArray#readArray(WicketObjectInputStream)
*/
+ @Override
public Object readArray(WicketObjectInputStream dos) throws
IOException
{
int length = dos.readInt();
@@ -1162,7 +1223,8 @@
}
/**
- * @return
+ * @param o
+ * @return replacement object
* @throws NotSerializableException
*/
public Object writeReplace(Object o) throws NotSerializableException
@@ -1171,7 +1233,7 @@
{
try
{
- return writeReplaceMethod.invoke(o, null);
+ return writeReplaceMethod.invoke(o,
(Object[])null);
}
catch (Exception ex)
{
@@ -1181,13 +1243,18 @@
return null;
}
+ /**
+ * @param o
+ * @return resolved object
+ * @throws NotSerializableException
+ */
public Object readResolve(Object o) throws NotSerializableException
{
if (readResolveMethod != null)
{
try
{
- return readResolveMethod.invoke(o, null);
+ return readResolveMethod.invoke(o,
(Object[])null);
}
catch (Exception ex)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Generics.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Generics.java?rev=658114&r1=658113&r2=658114&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Generics.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Generics.java
Mon May 19 23:02:19 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.util.lang;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.concurrent.ConcurrentHashMap;
@@ -87,6 +88,29 @@
return new HashMap<K, V>(capacity);
}
+ /**
+ * Creates a new ArrayList
+ *
+ * @param <T>
+ * @param capacity
+ * initial capacity
+ * @return array list
+ */
+ public static <T> ArrayList<T> newArrayList(int capacity)
+ {
+ return new ArrayList<T>(capacity);
+ }
+
+ /**
+ * Creates a new ArrayList
+ *
+ * @param <T>
+ * @return array list
+ */
+ public static <T> ArrayList<T> newArrayList()
+ {
+ return new ArrayList<T>();
+ }
/**
* Creates a new ConcurrentHashMap
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java?rev=658114&r1=658113&r2=658114&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
Mon May 19 23:02:19 2008
@@ -558,6 +558,7 @@
* if the objects are both non-numeric yet of incompatible
types or do not implement
* Comparable.
*/
+ @SuppressWarnings("unchecked")
public static int compareWithConversion(Object v1, Object v2)
{
int result;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/value/IntValue.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/value/IntValue.java?rev=658114&r1=658113&r2=658114&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/value/IntValue.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/value/IntValue.java
Mon May 19 23:02:19 2008
@@ -29,7 +29,7 @@
* @author Jonathan Locke
* @since 1.2.6
*/
-public class IntValue implements Comparable, Serializable
+public class IntValue implements Comparable<IntValue>, Serializable
{
private static final long serialVersionUID = 1L;
@@ -52,10 +52,8 @@
* The object to compare with
* @return 0 if equal, -1 if less than or 1 if greater than
*/
- public final int compareTo(final Object object)
+ public final int compareTo(final IntValue that)
{
- final IntValue that = (IntValue)object;
-
if (value < that.value)
{
return -1;
@@ -77,6 +75,7 @@
* @return 0 if equal, -1 if less than the given <code>Object</code>'s
value, or 1 if greater
* than given <code>Object</code>'s value
*/
+ @Override
public final boolean equals(final Object that)
{
if (that instanceof IntValue)
@@ -118,6 +117,7 @@
*
* @return hash code for this <code>Object</code>
*/
+ @Override
public final int hashCode()
{
return Primitives.hashCode(value);
@@ -154,6 +154,7 @@
*
* @return a <code>String</code> representation of this
<code>LongValue</code>
*/
+ @Override
public String toString()
{
return String.valueOf(value);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/value/LongValue.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/value/LongValue.java?rev=658114&r1=658113&r2=658114&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/value/LongValue.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/value/LongValue.java
Mon May 19 23:02:19 2008
@@ -29,7 +29,7 @@
* @author Jonathan Locke
* @since 1.2.6
*/
-public class LongValue implements Comparable, Serializable
+public class LongValue implements Comparable<LongValue>, Serializable
{
private static final long serialVersionUID = 1L;
@@ -55,16 +55,14 @@
* @return 0 if equal, -1 if less than the given <code>Object</code>'s
value, or 1 if greater
* than given <code>Object</code>'s value
*/
- public final int compareTo(final Object object)
+ public final int compareTo(final LongValue that)
{
- final LongValue that = (LongValue)object;
-
- if (this.value < that.value)
+ if (value < that.value)
{
return -1;
}
- if (this.value > that.value)
+ if (value > that.value)
{
return 1;
}
@@ -80,11 +78,12 @@
* @return <code>true</code> if this <code>Object</code>'s value is
equal to the given
* <code>Object</code>'s value
*/
+ @Override
public final boolean equals(final Object that)
{
if (that instanceof LongValue)
{
- return this.value == ((LongValue)that).value;
+ return value == ((LongValue)that).value;
}
return false;
@@ -113,7 +112,7 @@
*/
public final boolean greaterThan(final LongValue that)
{
- return this.value > that.value;
+ return value > that.value;
}
/**
@@ -121,6 +120,7 @@
*
* @return hash code for this <code>Object</code>
*/
+ @Override
public final int hashCode()
{
return Primitives.hashCode(value);
@@ -136,7 +136,7 @@
*/
public final boolean lessThan(final long that)
{
- return this.value < that;
+ return value < that;
}
/**
@@ -149,7 +149,7 @@
*/
public final boolean lessThan(final LongValue that)
{
- return this.value < that.value;
+ return value < that.value;
}
/**
@@ -157,6 +157,7 @@
*
* @return a <code>String</code> representation of this
<code>LongValue</code>
*/
+ @Override
public String toString()
{
return String.valueOf(value);
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java?rev=658114&r1=658113&r2=658114&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java
(original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java
Mon May 19 23:02:19 2008
@@ -37,6 +37,7 @@
super(message);
}
+ @Override
protected void setUp() throws Exception
{
super.setUp();
@@ -69,8 +70,8 @@
e = ex;
}
assertNotNull(
- "MyPage3 should have thrown an exception as it
does not have a default or no constructor",
- e);
+ "MyPage3 should have thrown an exception as it does not
have a default or no constructor",
+ e);
// MyPage4: Illegal String parameter constructor only
e = null;
@@ -83,24 +84,13 @@
e = ex;
}
assertNotNull(
- "MyPage4 should have thrown an exception as it
does not have a default or no constructor",
- e);
+ "MyPage4 should have thrown an exception as it does not
have a default or no constructor",
+ e);
// MyPage5: PageParameter and default constructor
assertEquals(MyPage5.class,
factory.newPage(MyPage5.class).getClass());
- // String: Illegal String parameter constructor only
- e = null;
- try
- {
- factory.newPage(String.class).getClass();
- }
- catch (ClassCastException ex)
- {
- e = ex;
- }
- assertNotNull("String does not extend Page. Should habe thrown
an exception", e);
}
/**
@@ -130,8 +120,8 @@
e = ex;
}
assertNotNull(
- "MyPage4 should have thrown an exception as it
does not have a default or no constructor",
- e);
+ "MyPage4 should have thrown an exception as it does not
have a default or no constructor",
+ e);
// MyPage4: Illegal String parameter constructor only
e = null;
@@ -144,23 +134,12 @@
e = ex;
}
assertNotNull(
- "MyPage4 should have thrown an exception as it
does not have a default or no constructor",
- e);
+ "MyPage4 should have thrown an exception as it does not
have a default or no constructor",
+ e);
// MyPage5: PageParameter and default constructor
assertEquals(MyPage5.class, factory.newPage(MyPage5.class, new
PageParameters()).getClass());
- // String: Illegal String parameter constructor only
- e = null;
- try
- {
- factory.newPage(String.class, new
PageParameters()).getClass();
- }
- catch (ClassCastException ex)
- {
- e = ex;
- }
- assertNotNull("String does not extend Page. Should have thrown
an exception", e);
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java?rev=658114&r1=658113&r2=658114&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java
Mon May 19 23:02:19 2008
@@ -34,7 +34,7 @@
/**
* @author ivaynberg
*/
- public static class AbortAndRespondPage1 extends Page
+ public static class AbortAndRespondPage1 extends Page<Void>
{
private static final long serialVersionUID = 1L;
@@ -58,7 +58,7 @@
/**
* @author ivaynberg
*/
- public static class AbortAndRespondPage2 extends Page
+ public static class AbortAndRespondPage2 extends Page<Void>
{
private static final long serialVersionUID = 1L;
@@ -85,7 +85,7 @@
/**
* @author ivaynberg
*/
- public static class AbortAndRespondPage3 extends Page
+ public static class AbortAndRespondPage3 extends Page<Void>
{
private static final long serialVersionUID = 1L;
@@ -125,7 +125,7 @@
}
- public static class PageThrowingCheckedException extends Page
+ public static class PageThrowingCheckedException extends Page<Void>
{
private static final long serialVersionUID = 1L;
