You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jc...@apache.org on 2008/05/04 20:24:04 UTC
svn commit: r653261 - in /wicket/trunk:
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/
wicket-extensions/src/main/java/org/apache...
Author: jcompagner
Date: Sun May 4 11:24:03 2008
New Revision: 653261
URL: http://svn.apache.org/viewvc?rev=653261&view=rev
Log:
generics
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/IConverterLocator.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/PackagedResourceReference.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractConverter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractDecimalConverter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractIntegerConverter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractNumberConverter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/BigDecimalConverter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/BooleanConverter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/ByteConverter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/CharacterConverter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/DateConverter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/DoubleConverter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/FloatConverter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/IntegerConverter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/LongConverter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/ShortConverter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/SqlDateConverter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/SqlTimeConverter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/SqlTimestampConverter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/ZeroPaddingIntegerConverter.java
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java Sun May 4 11:24:03 2008
@@ -213,7 +213,7 @@
* @see org.apache.wicket.Component#getConverter(java.lang.Class)
*/
@Override
- public <T> IConverter<T> getConverter(Class<T> type)
+ public IConverter<T> getConverter(Class<T> type)
{
return null;
}
@@ -286,7 +286,7 @@
private static final long serialVersionUID = 1L;
@Override
- public <T> IConverter<T> getConverter(Class<T> type)
+ public IConverter<T> getConverter(Class<T> type)
{
IConverter<T> c = AjaxEditableLabel.this.getConverter(type);
return c != null ? c : super.getConverter(type);
@@ -323,14 +323,15 @@
* The model
* @return The editor
*/
- protected WebComponent<T> newLabel(MarkupContainer parent, String componentId, IModel<T> model)
+ protected WebComponent<T> newLabel(MarkupContainer< ? > parent, String componentId,
+ IModel<T> model)
{
Label<T> label = new Label<T>(componentId, model)
{
private static final long serialVersionUID = 1L;
@Override
- public <T> IConverter<T> getConverter(Class<T> type)
+ public IConverter<T> getConverter(Class<T> type)
{
IConverter<T> c = AjaxEditableLabel.this.getConverter(type);
return c != null ? c : super.getConverter(type);
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java Sun May 4 11:24:03 2008
@@ -74,7 +74,8 @@
* java.lang.String, org.apache.wicket.model.IModel)
*/
@Override
- protected MultiLineLabel<T> newLabel(MarkupContainer parent, String componentId, IModel<T> model)
+ protected MultiLineLabel<T> newLabel(MarkupContainer< ? > parent, String componentId,
+ IModel<T> model)
{
MultiLineLabel<T> label = new MultiLineLabel<T>(componentId, model)
{
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java Sun May 4 11:24:03 2008
@@ -37,7 +37,7 @@
*
* @author Andrew Lombardi
*/
-public class UploadProgressBar extends Panel
+public class UploadProgressBar extends Panel<Void>
{
private static final Logger log = LoggerFactory.getLogger(UploadProgressBar.class);
@@ -79,7 +79,7 @@
* @param id
* @param form
*/
- public UploadProgressBar(String id, final Form form)
+ public UploadProgressBar(String id, final Form< ? > form)
{
super(id);
setOutputMarkupId(true);
@@ -93,11 +93,11 @@
add(HeaderContributor.forCss(css));
}
- final WebMarkupContainer barDiv = new WebMarkupContainer("bar");
+ final WebMarkupContainer<Void> barDiv = new WebMarkupContainer<Void>("bar");
barDiv.setOutputMarkupId(true);
add(barDiv);
- final WebMarkupContainer statusDiv = new WebMarkupContainer("status");
+ final WebMarkupContainer<Void> statusDiv = new WebMarkupContainer<Void>("status");
statusDiv.setOutputMarkupId(true);
add(statusDiv);
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java Sun May 4 11:24:03 2008
@@ -42,8 +42,12 @@
* @see NoRecordsToolbar
*
* @author Igor Vaynberg ( ivaynberg )
+ *
+ * @param <T>
+ * The model object type
+ *
*/
-public class AjaxFallbackDefaultDataTable extends DataTable
+public class AjaxFallbackDefaultDataTable<T> extends DataTable<T>
{
private static final long serialVersionUID = 1L;
@@ -59,10 +63,11 @@
* @param rowsPerPage
* number of rows per page
*/
- public AjaxFallbackDefaultDataTable(String id, final List/* <IColumn> */columns,
- ISortableDataProvider dataProvider, int rowsPerPage)
+ @SuppressWarnings("unchecked")
+ public AjaxFallbackDefaultDataTable(String id, final List<IColumn<T>> columns,
+ ISortableDataProvider<T> dataProvider, int rowsPerPage)
{
- this(id, (IColumn[])columns.toArray(new IColumn[columns.size()]), dataProvider, rowsPerPage);
+ this(id, columns.toArray(new IColumn[columns.size()]), dataProvider, rowsPerPage);
}
/**
@@ -77,8 +82,8 @@
* @param rowsPerPage
* number of rows per page
*/
- public AjaxFallbackDefaultDataTable(String id, final IColumn[] columns,
- ISortableDataProvider dataProvider, int rowsPerPage)
+ public AjaxFallbackDefaultDataTable(String id, final IColumn<T>[] columns,
+ ISortableDataProvider<T> dataProvider, int rowsPerPage)
{
super(id, columns, dataProvider, rowsPerPage);
setOutputMarkupId(true);
@@ -88,9 +93,10 @@
addBottomToolbar(new NoRecordsToolbar(this));
}
- protected Item newRowItem(String id, int index, IModel model)
+ @Override
+ protected Item<T> newRowItem(String id, int index, IModel<T> model)
{
- return new OddEvenItem(id, index, model);
+ return new OddEvenItem<T>(id, index, model);
}
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java Sun May 4 11:24:03 2008
@@ -67,6 +67,9 @@
*
* @author Igor Vaynberg (ivaynberg)
*
+ * @param <T>
+ * The model object type
+ *
*/
public class DataTable<T> extends Panel<T> implements IPageable
{
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=653261&r1=653260&r2=653261&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 Sun May 4 11:24:03 2008
@@ -202,7 +202,7 @@
* @param <T>
* Model object type
*/
-public abstract class Component<T> implements IClusterable, IConverterLocator
+public abstract class Component<T> implements IClusterable, IConverterLocator<T>
{
/**
* Change record of a model.
@@ -1323,7 +1323,7 @@
*
* @return The converter that should be used by this component
*/
- public <Z> IConverter<Z> getConverter(Class<Z> type)
+ public IConverter<T> getConverter(Class<T> type)
{
return getApplication().getConverterLocator().getConverter(type);
}
@@ -1644,7 +1644,13 @@
if (modelObject != null)
{
// Get converter
- final IConverter<T> converter = getConverter((Class<T>)modelObject.getClass());
+ final Class<T> objectClass = (Class<T>)modelObject.getClass();
+
+ final IConverter<T> converter = getConverter(objectClass);
+
+ if (!converter.getClass().isAssignableFrom(objectClass))
+ throw new IllegalArgumentException("converter can not convert " +
+ objectClass.getName() + " to string");
// Model string from property
final String modelString = converter.convertToString(modelObject, getLocale());
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/IConverterLocator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/IConverterLocator.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/IConverterLocator.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/IConverterLocator.java Sun May 4 11:24:03 2008
@@ -29,8 +29,11 @@
* @see IConverterLocatorFactory
*
* @author jcompagner
+ *
+ * @param <T>
+ * The converter object type
*/
-public interface IConverterLocator extends IClusterable
+public interface IConverterLocator<T> extends IClusterable
{
/**
@@ -39,5 +42,5 @@
* @param type
* @return The converter for the given type.
*/
- public<T> IConverter<T> getConverter(Class< T > type);
+ public IConverter<T> getConverter(Class<T> type);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java Sun May 4 11:24:03 2008
@@ -380,13 +380,19 @@
protected void appendOptionHtml(AppendingStringBuffer buffer, E choice, int index,
String selected)
{
- Object objectValue = renderer.getDisplayValue(choice);
- Class< ? extends Object> objectClass = objectValue == null ? null : objectValue.getClass();
+ T objectValue = (T)renderer.getDisplayValue(choice);
+ Class<T> objectClass = (Class<T>)(objectValue == null ? null : objectValue.getClass());
+
String displayValue = "";
if (objectClass != null && objectClass != String.class)
{
- displayValue = ((IConverter<Object>)this.getConverter(objectClass)).convertToString(
- objectValue, getLocale());
+ final IConverter<T> converter = this.getConverter(objectClass);
+
+ if (!converter.getClass().isAssignableFrom(objectClass))
+ throw new IllegalArgumentException("converter can not convert " +
+ objectClass.getName() + " to a string");
+
+ displayValue = converter.convertToString(objectValue, getLocale());
}
else if (objectValue != null)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java Sun May 4 11:24:03 2008
@@ -128,8 +128,7 @@
*
* @see org.apache.wicket.Component#getConverter(java.lang.Class)
*/
- @Override
- public <Z> IConverter<Z> getConverter(Class<Z> type)
+ public IConverter<Boolean> getConverter(Class<Boolean> type)
{
return BooleanConverter.INSTANCE;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java Sun May 4 11:24:03 2008
@@ -25,6 +25,7 @@
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.Strings;
+import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.version.undo.Change;
@@ -386,13 +387,20 @@
// Get next choice
final T choice = choices.get(index);
- Object displayValue = getChoiceRenderer().getDisplayValue(choice);
- Class objectClass = displayValue == null ? null : displayValue.getClass();
- // Get label for choice
+ Collection<T> displayValue = (Collection<T>) getChoiceRenderer().getDisplayValue(choice);
+
+ Class<?> objectClass = (displayValue == null ? null : displayValue.getClass());
+
+ // Get label for choice
String label = "";
if (objectClass != null && objectClass != String.class)
{
- label = getConverter(objectClass).convertToString(displayValue, getLocale());
+ final IConverter<Collection<T>> converter = getConverter((Class<Collection<T>>) objectClass);
+
+ if(!converter.getClass().isAssignableFrom(objectClass))
+ throw new IllegalArgumentException("converter can not convert class " + converter.getClass().getName() + " to string");
+
+ label = converter.convertToString(displayValue, getLocale());
}
else if (displayValue != null)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java Sun May 4 11:24:03 2008
@@ -1218,10 +1218,14 @@
}
else
{
- final IConverter converter = getConverter(getType());
- try
+ final IConverter<T> converter = getConverter(getType());
+
+ try
{
- convertedInput = (T)converter.convertToObject(getInput(), getLocale());
+ if(!getType().isAssignableFrom(converter.getClass()))
+ throw new IllegalStateException("converter can not convert string to " + getType());
+
+ convertedInput = converter.convertToObject(getInput(), getLocale());
}
catch (ConversionException e)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java Sun May 4 11:24:03 2008
@@ -25,6 +25,7 @@
import org.apache.wicket.protocol.http.portlet.PortletRequestContext;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.Strings;
+import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.version.undo.Change;
@@ -423,13 +424,20 @@
// Get next choice
final T choice = choices.get(index);
- Object displayValue = getChoiceRenderer().getDisplayValue(choice);
- Class objectClass = displayValue == null ? null : displayValue.getClass();
+ T displayValue = (T) getChoiceRenderer().getDisplayValue(choice);
+ Class<T> objectClass = (Class<T>) (displayValue == null ? null : displayValue.getClass());
+
// Get label for choice
String label = "";
+
if (objectClass != null && objectClass != String.class)
{
- label = getConverter(objectClass).convertToString(displayValue, getLocale());
+ final IConverter<T> converter = getConverter(objectClass);
+
+ if(!converter.getClass().isAssignableFrom(objectClass))
+ throw new IllegalArgumentException("converter can not convert " + objectClass.getName() + " to string");
+
+ label = converter.convertToString(displayValue, getLocale());
}
else if (displayValue != null)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/PackagedResourceReference.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/PackagedResourceReference.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/PackagedResourceReference.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/PackagedResourceReference.java Sun May 4 11:24:03 2008
@@ -28,7 +28,7 @@
*
* @author Eelco Hillenius
*/
-public class PackagedResourceReference extends WebMarkupContainer
+public class PackagedResourceReference extends WebMarkupContainer<String>
{
private static final long serialVersionUID = 1L;
@@ -47,7 +47,7 @@
public PackagedResourceReference(final String id, final Class referer, final String file,
final String attributeToReplace)
{
- this(id, referer, new Model(file), attributeToReplace);
+ this(id, referer, new Model<String>(file), attributeToReplace);
}
/**
@@ -63,7 +63,7 @@
* @param attributeToReplace
* the attribute to replace of the target tag
*/
- public PackagedResourceReference(final String id, final Class referer, final IModel file,
+ public PackagedResourceReference(final String id, final Class referer, final IModel<String> file,
final String attributeToReplace)
{
super(id);
@@ -88,16 +88,17 @@
@Override
public String getObject()
{
- Object o = file.getObject();
- if (o == null)
+ String str = file.getObject();
+ if (str == null)
{
throw new IllegalArgumentException("The model must provide a non-null object");
}
- if (!(o instanceof String))
+ // can this check be safely removed?
+ if (!(str instanceof String))
{
throw new IllegalArgumentException("The model must provide a string");
}
- String f = getConverter(String.class).convertToString(o, getLocale());
+ String f = getConverter(String.class).convertToString(str, getLocale());
ResourceReference ref = new ResourceReference(referer, f, getLocale(), getStyle());
CharSequence url = urlFor(ref);
return url != null ? url.toString() : null;
@@ -135,7 +136,7 @@
public PackagedResourceReference(final String id, final ResourceReference resourceReference,
final String attributeToReplace)
{
- this(id, new Model(resourceReference), attributeToReplace);
+ this(id, new Model<ResourceReference>(resourceReference), attributeToReplace);
}
/**
@@ -149,7 +150,7 @@
* @param attributeToReplace
* the attribute to replace of the target tag
*/
- public PackagedResourceReference(final String id, final IModel resourceReference,
+ public PackagedResourceReference(final String id, final IModel<ResourceReference> resourceReference,
final String attributeToReplace)
{
super(id);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java Sun May 4 11:24:03 2008
@@ -295,7 +295,7 @@
final Class< ? > paramClass = parameterClasses[0];
try
{
- final IConverter converter = Application.get().getConverterLocator().getConverter(
+ final IConverter<?> converter = Application.get().getConverterLocator().getConverter(
paramClass);
final Object param = converter.convertToObject(value, locale);
if (param == null)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java Sun May 4 11:24:03 2008
@@ -48,39 +48,45 @@
* @see IConverterLocator
* @author Eelco Hillenius
* @author Jonathan Locke
+ *
+ * @param <T>
+ * The converter object type
*/
-public class ConverterLocator implements IConverterLocator
+public class ConverterLocator<T> implements IConverterLocator<T>
{
/**
* CoverterLocator that is to be used when no registered converter is found.
+ *
+ * @param <X>
+ * The converter object type
*/
- private class DefaultConverter<T> implements IConverter<T>
+ private class DefaultConverter<X> implements IConverter<X>
{
private static final long serialVersionUID = 1L;
- private final WeakReference<Class<T>> type;
+ private final WeakReference<Class<X>> type;
/**
* Construct.
*
* @param type
*/
- private DefaultConverter(Class<T> type)
+ private DefaultConverter(Class<X> type)
{
- this.type = new WeakReference<Class<T>>(type);
+ this.type = new WeakReference<Class<X>>(type);
}
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,
* java.util.Locale)
*/
- public T convertToObject(String value, Locale locale)
+ public X convertToObject(String value, Locale locale)
{
if (value == null)
{
return null;
}
- Class<T> theType = type.get();
+ Class<X> theType = type.get();
if ("".equals(value))
{
if (theType.equals(String.class))
@@ -104,7 +110,7 @@
* @see org.apache.wicket.util.convert.IConverter#convertToString(java.lang.Object,
* java.util.Locale)
*/
- public String convertToString(T value, Locale locale)
+ public String convertToString(X value, Locale locale)
{
if (value == null || "".equals(value))
{
@@ -156,7 +162,8 @@
* @return The type converter that is registered for class c or null if no type converter was
* registered for class c
*/
- public final <T> IConverter<T> get(Class<T> c)
+ @SuppressWarnings("unchecked")
+ public final IConverter<T> get(Class<T> c)
{
return (IConverter<T>)classToConverter.get(c.getName());
}
@@ -171,7 +178,8 @@
*
* @see org.apache.wicket.util.convert.IConverter#convertToObject(String, java.util.Locale)
*/
- public final <T> IConverter<T> getConverter(Class<T> type)
+ @SuppressWarnings("unchecked")
+ public final IConverter<T> getConverter(Class<T> type)
{
// Null is always converted to null
if (type == null)
@@ -192,19 +200,25 @@
/**
* Removes the type converter currently registered for class c.
*
+ * @param <C>
+ * The type of the converter
* @param c
* The class for which the converter registration should be removed
* @return The converter that was registered for class c before removal or null if none was
* registered
*/
- public final <T> IConverter<T> remove(Class<T> c)
+ @SuppressWarnings("unchecked")
+ public final <C> IConverter<C> remove(Class<C> c)
{
- return (IConverter<T>)classToConverter.remove(c.getName());
+ return (IConverter<C>)classToConverter.remove(c.getName());
}
/**
* Registers a converter for use with class c.
*
+ * @param <C>
+ * The type of the converter
+ *
* @param converter
* The converter to add
* @param c
@@ -212,7 +226,8 @@
* @return The previous registered converter for class c or null if none was registered yet for
* class c
*/
- public final <T> IConverter<T> set(final Class<T> c, final IConverter<T> converter)
+ @SuppressWarnings("unchecked")
+ public final <C> IConverter<C> set(final Class<C> c, final IConverter<C> converter)
{
if (converter == null)
{
@@ -222,6 +237,6 @@
{
throw new IllegalArgumentException("Class cannot be null");
}
- return (IConverter<T>)classToConverter.put(c.getName(), converter);
+ return (IConverter<C>)classToConverter.put(c.getName(), converter);
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractConverter.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractConverter.java Sun May 4 11:24:03 2008
@@ -28,8 +28,11 @@
* Base class for locale aware type converters.
*
* @author Eelco Hillenius
+ *
+ * @param <T>
+ * The converter object type
*/
-public abstract class AbstractConverter implements IConverter
+public abstract class AbstractConverter<T> implements IConverter<T>
{
/**
*
@@ -57,7 +60,7 @@
if (position.getIndex() != stringValue.length())
{
throw newConversionException("Cannot parse '" + value + "' using format " + format,
- value, locale).setFormat(format);
+ value, locale).setFormat(format);
}
return result;
}
@@ -74,21 +77,23 @@
* @return The ConversionException
*/
protected ConversionException newConversionException(final String message, final Object value,
- Locale locale)
+ Locale locale)
{
return new ConversionException(message).setSourceValue(value)
- .setTargetType(getTargetType()).setConverter(this).setLocale(locale);
+ .setTargetType(getTargetType())
+ .setConverter(this)
+ .setLocale(locale);
}
/**
* @return The target type of this type converter
*/
- protected abstract Class getTargetType();
+ protected abstract Class<T> getTargetType();
/**
* @see org.apache.wicket.util.convert.IConverter#convertToString(java.lang.Object, Locale)
*/
- public String convertToString(Object value, Locale locale)
+ public String convertToString(T value, Locale locale)
{
if (value == null)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractDecimalConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractDecimalConverter.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractDecimalConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractDecimalConverter.java Sun May 4 11:24:03 2008
@@ -26,8 +26,11 @@
* Base class for all number converters.
*
* @author Jonathan Locke
+ *
+ * @param <T>
+ * The converter object type
*/
-public abstract class AbstractDecimalConverter extends AbstractNumberConverter
+public abstract class AbstractDecimalConverter<T extends Number> extends AbstractNumberConverter<T>
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractIntegerConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractIntegerConverter.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractIntegerConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractIntegerConverter.java Sun May 4 11:24:03 2008
@@ -25,8 +25,11 @@
* Base class for all number converters.
*
* @author Jonathan Locke
+ *
+ * @param <T>
+ * The converter object type
*/
-public abstract class AbstractIntegerConverter extends AbstractNumberConverter
+public abstract class AbstractIntegerConverter<T extends Number> extends AbstractNumberConverter<T>
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractNumberConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractNumberConverter.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractNumberConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractNumberConverter.java Sun May 4 11:24:03 2008
@@ -26,8 +26,12 @@
* Base class for all number converters.
*
* @author Jonathan Locke
+ *
+ * @param <T>
+ * The converter object type
+ *
*/
-public abstract class AbstractNumberConverter extends AbstractConverter
+public abstract class AbstractNumberConverter<T extends Number> extends AbstractConverter<T>
{
/**
*
@@ -101,7 +105,8 @@
/**
* @see org.apache.wicket.util.convert.IConverter#convertToString(java.lang.Object, Locale)
*/
- public String convertToString(final Object value, Locale locale)
+ @Override
+ public String convertToString(final T value, Locale locale)
{
NumberFormat fmt = getNumberFormat(locale);
if (fmt != null)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/BigDecimalConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/BigDecimalConverter.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/BigDecimalConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/BigDecimalConverter.java Sun May 4 11:24:03 2008
@@ -25,16 +25,17 @@
* see IConverter
*
*/
-public class BigDecimalConverter extends AbstractDecimalConverter
+public class BigDecimalConverter extends AbstractDecimalConverter<BigDecimal>
{
private static final long serialVersionUID = 1L;
- protected Class getTargetType()
+ @Override
+ protected Class<BigDecimal> getTargetType()
{
return BigDecimal.class;
}
- public Object convertToObject(String value, Locale locale)
+ public BigDecimal convertToObject(String value, Locale locale)
{
if (value == null || value.trim().equals(""))
return null;
@@ -42,7 +43,7 @@
final Number number = parse(value, -Double.MAX_VALUE, Double.MAX_VALUE, locale);
if (number instanceof BigDecimal)
{
- return number;
+ return (BigDecimal)number;
}
else if (number instanceof Double)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/BooleanConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/BooleanConverter.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/BooleanConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/BooleanConverter.java Sun May 4 11:24:03 2008
@@ -29,19 +29,19 @@
* @author Eelco Hillenius
* @author Jonathan Locke
*/
-public final class BooleanConverter extends AbstractConverter
+public final class BooleanConverter extends AbstractConverter<Boolean>
{
private static final long serialVersionUID = 1L;
/**
* The singleton instance for a boolean converter
*/
- public static final IConverter INSTANCE = new BooleanConverter();
+ public static final IConverter<Boolean> INSTANCE = new BooleanConverter();
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
- public Object convertToObject(final String value, Locale locale)
+ public Boolean convertToObject(final String value, Locale locale)
{
try
{
@@ -56,7 +56,8 @@
/**
* @see org.apache.wicket.util.convert.converters.AbstractConverter#getTargetType()
*/
- protected Class getTargetType()
+ @Override
+ protected Class<Boolean> getTargetType()
{
return Boolean.class;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/ByteConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/ByteConverter.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/ByteConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/ByteConverter.java Sun May 4 11:24:03 2008
@@ -27,19 +27,19 @@
* @author Eelco Hillenius
* @author Jonathan Locke
*/
-public final class ByteConverter extends AbstractIntegerConverter
+public final class ByteConverter extends AbstractIntegerConverter<Byte>
{
private static final long serialVersionUID = 1L;
/**
* The singleton instance for a byte converter
*/
- public static final IConverter INSTANCE = new ByteConverter();
+ public static final IConverter<Byte> INSTANCE = new ByteConverter();
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
- public Object convertToObject(final String value, Locale locale)
+ public Byte convertToObject(final String value, Locale locale)
{
final Number number = parse(value, Byte.MIN_VALUE, Byte.MAX_VALUE, locale);
@@ -54,7 +54,8 @@
/**
* @see org.apache.wicket.util.convert.converters.AbstractConverter#getTargetType()
*/
- protected Class getTargetType()
+ @Override
+ protected Class<Byte> getTargetType()
{
return Byte.class;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/CharacterConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/CharacterConverter.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/CharacterConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/CharacterConverter.java Sun May 4 11:24:03 2008
@@ -27,19 +27,19 @@
* @author Eelco Hillenius
* @author Jonathan Locke
*/
-public final class CharacterConverter extends AbstractConverter
+public final class CharacterConverter extends AbstractConverter<Character>
{
private static final long serialVersionUID = 1L;
/**
* The singleton instance for a character converter
*/
- public static final IConverter INSTANCE = new CharacterConverter();
+ public static final IConverter<Character> INSTANCE = new CharacterConverter();
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
- public Object convertToObject(final String value, Locale locale)
+ public Character convertToObject(final String value, Locale locale)
{
int length = value.length();
if (length == 0)
@@ -56,7 +56,8 @@
/**
* @see org.apache.wicket.util.convert.converters.AbstractConverter#getTargetType()
*/
- protected Class getTargetType()
+ @Override
+ protected Class<Character> getTargetType()
{
return Character.class;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/DateConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/DateConverter.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/DateConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/DateConverter.java Sun May 4 11:24:03 2008
@@ -27,14 +27,14 @@
*
* @author Eelco Hillenius
*/
-public class DateConverter extends AbstractConverter
+public class DateConverter extends AbstractConverter<Date>
{
private static final long serialVersionUID = 1L;
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
- public Object convertToObject(final String value, Locale locale)
+ public Date convertToObject(final String value, Locale locale)
{
if (value == null || Strings.isEmpty(value))
{
@@ -42,14 +42,15 @@
}
else
{
- return parse(getDateFormat(locale), value, locale);
+ return (Date)parse(getDateFormat(locale), value, locale);
}
}
/**
* @see org.apache.wicket.util.convert.IConverter#convertToString(Object, java.util.Locale)
*/
- public String convertToString(final Object value, Locale locale)
+ @Override
+ public String convertToString(final Date value, Locale locale)
{
final DateFormat dateFormat = getDateFormat(locale);
if (dateFormat != null)
@@ -77,7 +78,8 @@
/**
* @see org.apache.wicket.util.convert.converters.AbstractConverter#getTargetType()
*/
- protected Class getTargetType()
+ @Override
+ protected Class<Date> getTargetType()
{
return Date.class;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/DoubleConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/DoubleConverter.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/DoubleConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/DoubleConverter.java Sun May 4 11:24:03 2008
@@ -27,19 +27,19 @@
* @author Eelco Hillenius
* @author Jonathan Locke
*/
-public final class DoubleConverter extends AbstractDecimalConverter
+public final class DoubleConverter extends AbstractDecimalConverter<Double>
{
private static final long serialVersionUID = 1L;
/**
* The singleton instance for a double converter
*/
- public static final IConverter INSTANCE = new DoubleConverter();
+ public static final IConverter<Double> INSTANCE = new DoubleConverter();
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(String, java.util.Locale)
*/
- public Object convertToObject(final String value, Locale locale)
+ public Double convertToObject(final String value, Locale locale)
{
final Number number = parse(value, -Double.MAX_VALUE, Double.MAX_VALUE, locale);
// Double.MIN is the smallest nonzero positive number, not the largest
@@ -56,7 +56,8 @@
/**
* @see org.apache.wicket.util.convert.converters.AbstractConverter#getTargetType()
*/
- protected Class getTargetType()
+ @Override
+ protected Class<Double> getTargetType()
{
return Double.class;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/FloatConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/FloatConverter.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/FloatConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/FloatConverter.java Sun May 4 11:24:03 2008
@@ -27,19 +27,19 @@
* @author Eelco Hillenius
* @author Jonathan Locke
*/
-public final class FloatConverter extends AbstractDecimalConverter
+public final class FloatConverter extends AbstractDecimalConverter<Float>
{
private static final long serialVersionUID = 1L;
/**
* The singleton instance for a float converter
*/
- public static final IConverter INSTANCE = new FloatConverter();
+ public static final IConverter<Float> INSTANCE = new FloatConverter();
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
- public Object convertToObject(final String value, Locale locale)
+ public Float convertToObject(final String value, Locale locale)
{
final Number number = parse(value, -Float.MAX_VALUE, Float.MAX_VALUE, locale);
@@ -54,7 +54,8 @@
/**
* @see org.apache.wicket.util.convert.converters.AbstractConverter#getTargetType()
*/
- protected Class getTargetType()
+ @Override
+ protected Class<Float> getTargetType()
{
return Float.class;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/IntegerConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/IntegerConverter.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/IntegerConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/IntegerConverter.java Sun May 4 11:24:03 2008
@@ -27,19 +27,19 @@
* @author Eelco Hillenius
* @author Jonathan Locke
*/
-public final class IntegerConverter extends AbstractIntegerConverter
+public final class IntegerConverter extends AbstractIntegerConverter<Integer>
{
private static final long serialVersionUID = 1L;
/**
* The singleton instance for a integer converter
*/
- public static final IConverter INSTANCE = new IntegerConverter();
+ public static final IConverter<Integer> INSTANCE = new IntegerConverter();
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
- public Object convertToObject(final String value, Locale locale)
+ public Integer convertToObject(final String value, Locale locale)
{
final Number number = parse(value, Integer.MIN_VALUE, Integer.MAX_VALUE, locale);
@@ -54,7 +54,8 @@
/**
* @see org.apache.wicket.util.convert.converters.AbstractConverter#getTargetType()
*/
- protected Class getTargetType()
+ @Override
+ protected Class<Integer> getTargetType()
{
return Integer.class;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/LongConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/LongConverter.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/LongConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/LongConverter.java Sun May 4 11:24:03 2008
@@ -27,19 +27,19 @@
* @author Eelco Hillenius
* @author Jonathan Locke
*/
-public final class LongConverter extends AbstractIntegerConverter
+public final class LongConverter extends AbstractIntegerConverter<Long>
{
private static final long serialVersionUID = 1L;
/**
* The singleton instance for a long converter
*/
- public static final IConverter INSTANCE = new LongConverter();
+ public static final IConverter<Long> INSTANCE = new LongConverter();
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
- public Object convertToObject(final String value, Locale locale)
+ public Long convertToObject(final String value, Locale locale)
{
final Number number = parse(value, Long.MIN_VALUE, Long.MAX_VALUE, locale);
@@ -54,7 +54,8 @@
/**
* @see org.apache.wicket.util.convert.converters.AbstractConverter#getTargetType()
*/
- protected Class getTargetType()
+ @Override
+ protected Class<Long> getTargetType()
{
return Long.class;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/ShortConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/ShortConverter.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/ShortConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/ShortConverter.java Sun May 4 11:24:03 2008
@@ -27,19 +27,19 @@
* @author Eelco Hillenius
* @author Jonathan Locke
*/
-public final class ShortConverter extends AbstractIntegerConverter
+public final class ShortConverter extends AbstractIntegerConverter<Short>
{
private static final long serialVersionUID = 1L;
/**
* The singleton instance for a short converter
*/
- public static final IConverter INSTANCE = new ShortConverter();
+ public static final IConverter<Short> INSTANCE = new ShortConverter();
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
- public Object convertToObject(final String value, Locale locale)
+ public Short convertToObject(final String value, Locale locale)
{
final Number number = parse(value, Short.MIN_VALUE, Short.MAX_VALUE, locale);
@@ -54,7 +54,8 @@
/**
* @see org.apache.wicket.util.convert.converters.AbstractConverter#getTargetType()
*/
- protected Class getTargetType()
+ @Override
+ protected Class<Short> getTargetType()
{
return Short.class;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/SqlDateConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/SqlDateConverter.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/SqlDateConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/SqlDateConverter.java Sun May 4 11:24:03 2008
@@ -16,31 +16,67 @@
*/
package org.apache.wicket.util.convert.converters;
-import java.util.Date;
+import java.sql.Date;
+import java.text.DateFormat;
import java.util.Locale;
+import org.apache.wicket.util.string.Strings;
+
/**
* Converts to {@link java.sql.Date}.
*/
-public class SqlDateConverter extends DateConverter
+public class SqlDateConverter extends AbstractConverter<Date>
{
private static final long serialVersionUID = 1L;
/**
+ * @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
+ */
+ public Date convertToObject(final String value, Locale locale)
+ {
+ if (value == null || Strings.isEmpty(value))
+ {
+ return null;
+ }
+ else
+ {
+ return (Date)parse(getDateFormat(locale), value, locale);
+ }
+ }
+
+ /**
* @see org.apache.wicket.util.convert.converters.DateConverter#convertToObject(java.lang.String,
* java.util.Locale)
*/
- public Object convertToObject(String value, Locale locale)
+ @Override
+ public String convertToString(final Date value, Locale locale)
{
- return new java.sql.Date(((Date)super.convertToObject(value, locale)).getTime());
+ final DateFormat dateFormat = getDateFormat(locale);
+ if (dateFormat != null)
+ {
+ return dateFormat.format(value);
+ }
+ return value.toString();
}
+
/**
- * @see org.apache.wicket.util.convert.converters.DateConverter#getTargetType()
+ * @param locale
+ * @return Returns the date format.
*/
- protected Class getTargetType()
+ public DateFormat getDateFormat(Locale locale)
{
- return java.sql.Date.class;
+ if (locale == null)
+ {
+ locale = Locale.getDefault();
+ }
+
+ return DateFormat.getDateInstance(DateFormat.SHORT, locale);
}
+ @Override
+ protected Class<Date> getTargetType()
+ {
+ return Date.class;
+ }
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/SqlTimeConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/SqlTimeConverter.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/SqlTimeConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/SqlTimeConverter.java Sun May 4 11:24:03 2008
@@ -27,13 +27,13 @@
/**
* Converts to {@link Time}.
*/
-public class SqlTimeConverter extends DateConverter
+public class SqlTimeConverter extends AbstractConverter<Time>
{
private static final long serialVersionUID = 1L;
/** @see org.apache.wicket.util.convert.converters.DateConverter#convertToObject(java.lang.String,java.util.Locale) */
- public Object convertToObject(String value, Locale locale)
+ public Time convertToObject(String value, Locale locale)
{
if (value == null)
return null;
@@ -47,24 +47,28 @@
}
catch (ParseException e)
{
- throw new ConversionException("Cannot parse '" + value + "' using format " + format)
- .setSourceValue(value).setTargetType(getTargetType()).setConverter(this)
- .setLocale(locale);
+ throw new ConversionException("Cannot parse '" + value + "' using format " + format).setSourceValue(
+ value)
+ .setTargetType(getTargetType())
+ .setConverter(this)
+ .setLocale(locale);
}
}
- public String convertToString(final Object value, Locale locale)
+ @Override
+ public String convertToString(final Time value, Locale locale)
{
if (value == null)
return null;
if (locale == null)
locale = Locale.getDefault();
- Time time = (Time)value;
+ Time time = value;
DateFormat format = DateFormat.getTimeInstance(DateFormat.SHORT, locale);
return format.format(time);
}
- protected Class getTargetType()
+ @Override
+ protected Class<Time> getTargetType()
{
return Time.class;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/SqlTimestampConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/SqlTimestampConverter.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/SqlTimestampConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/SqlTimestampConverter.java Sun May 4 11:24:03 2008
@@ -23,19 +23,18 @@
import java.util.Locale;
import org.apache.wicket.util.convert.ConversionException;
-import org.apache.wicket.util.convert.IConverter;
/**
* Converts to {@link Timestamp}.
*
* @author eelcohillenius
*/
-public class SqlTimestampConverter implements IConverter
+public class SqlTimestampConverter extends AbstractConverter<Timestamp>
{
private static final long serialVersionUID = 1L;
/** @see org.apache.wicket.util.convert.converters.DateConverter#convertToObject(java.lang.String,java.util.Locale) */
- public Object convertToObject(String value, Locale locale)
+ public Timestamp convertToObject(String value, Locale locale)
{
if (value == null)
return null;
@@ -49,24 +48,28 @@
}
catch (ParseException e)
{
- throw new ConversionException("Cannot parse '" + value + "' using format " + format)
- .setSourceValue(value).setTargetType(getTargetType()).setConverter(this)
- .setLocale(locale);
+ throw new ConversionException("Cannot parse '" + value + "' using format " + format).setSourceValue(
+ value)
+ .setTargetType(getTargetType())
+ .setConverter(this)
+ .setLocale(locale);
}
}
- public String convertToString(final Object value, Locale locale)
+ @Override
+ public String convertToString(final Timestamp value, Locale locale)
{
if (value == null)
return null;
if (locale == null)
locale = Locale.getDefault();
- Timestamp timestamp = (Timestamp)value;
+ Timestamp timestamp = value;
DateFormat format = DateFormat.getTimeInstance(DateFormat.SHORT, locale);
return format.format(timestamp);
}
- protected Class getTargetType()
+ @Override
+ protected Class<Timestamp> getTargetType()
{
return Timestamp.class;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/ZeroPaddingIntegerConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/ZeroPaddingIntegerConverter.java?rev=653261&r1=653260&r2=653261&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/ZeroPaddingIntegerConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/ZeroPaddingIntegerConverter.java Sun May 4 11:24:03 2008
@@ -25,7 +25,7 @@
* @author Jonathan Locke
* @author Al Maw
*/
-public final class ZeroPaddingIntegerConverter extends AbstractIntegerConverter
+public final class ZeroPaddingIntegerConverter extends AbstractIntegerConverter<Integer>
{
private static final long serialVersionUID = 1L;
@@ -46,7 +46,8 @@
* @see org.apache.wicket.util.convert.converters.AbstractNumberConverter#convertToString(java.lang.Object,
* java.util.Locale)
*/
- public String convertToString(Object value, Locale locale)
+ @Override
+ public String convertToString(Integer value, Locale locale)
{
String result = super.convertToString(value, locale);
@@ -61,7 +62,7 @@
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
- public Object convertToObject(final String value, Locale locale)
+ public Integer convertToObject(final String value, Locale locale)
{
final Number number = parse(value, Integer.MIN_VALUE, Integer.MAX_VALUE, locale);
@@ -76,7 +77,8 @@
/**
* @see org.apache.wicket.util.convert.converters.AbstractConverter#getTargetType()
*/
- protected Class getTargetType()
+ @Override
+ protected Class<Integer> getTargetType()
{
return Integer.class;
}