Author: gseitz
Date: Tue May 6 11:30:24 2008
New Revision: 653874
URL: http://svn.apache.org/viewvc?rev=653874&view=rev
Log:
generics
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/ConversionException.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/MaskConverter.java
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java?rev=653874&r1=653873&r2=653874&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
Tue May 6 11:30:24 2008
@@ -78,7 +78,7 @@
add(new LocaleDropDownChoice("localeSelect"));
// Link to return to default locale
- add(new Link("defaultLocaleLink")
+ add(new Link<Void>("defaultLocaleLink")
{
@Override
public void onClick()
@@ -102,54 +102,54 @@
add(new CheckBox("booleanProperty"));
add(new Multiply("multiply"));
// display the multiply result
- Label multiplyLabel = new Label("multiplyLabel", new
PropertyModel(getModel(),
- "multiply"));
+ Label<Integer> multiplyLabel = new
Label<Integer>("multiplyLabel",
+ new PropertyModel<Integer>(getModel(),
"multiply"));
// just for fun, add a border so that our result will
be displayed
// as '[ x ]'
multiplyLabel.setComponentBorder(new
BeforeAndAfterBorder());
add(multiplyLabel);
- RadioChoice rc = new RadioChoice("numberRadioChoice",
NUMBERS).setSuffix("");
- rc.setLabel(new Model("number"));
+ RadioChoice<String> rc = new
RadioChoice<String>("numberRadioChoice", NUMBERS).setSuffix("");
+ rc.setLabel(new Model<String>("number"));
rc.setRequired(true);
add(rc);
- RadioGroup group = new RadioGroup("numbersGroup");
+ RadioGroup<String> group = new
RadioGroup<String>("numbersGroup");
add(group);
- ListView persons = new ListView("numbers", NUMBERS)
+ ListView<String> persons = new
ListView<String>("numbers", NUMBERS)
{
@Override
- protected void populateItem(ListItem item)
+ protected void populateItem(ListItem<String>
item)
{
- item.add(new Radio("radio",
item.getModel()));
- item.add(new Label("number",
item.getModelObjectAsString()));
+ item.add(new Radio<String>("radio",
item.getModel()));
+ item.add(new Label<String>("number",
item.getModelObjectAsString()));
};
}.setReuseItems(true);
group.add(persons);
- CheckGroup checks = new CheckGroup("numbersCheckGroup");
+ CheckGroup<String> checks = new
CheckGroup<String>("numbersCheckGroup");
add(checks);
- ListView checksList = new ListView("numbers", NUMBERS)
+ ListView<String> checksList = new
ListView<String>("numbers", NUMBERS)
{
@Override
- protected void populateItem(ListItem item)
+ protected void populateItem(ListItem<String>
item)
{
- item.add(new Check("check",
item.getModel()));
- item.add(new Label("number",
item.getModelObjectAsString()));
+ item.add(new Check<String>("check",
item.getModel()));
+ item.add(new Label<String>("number",
item.getModelObjectAsString()));
};
}.setReuseItems(true);
checks.add(checksList);
- add(new ListMultipleChoice("siteSelection", SITES));
+ add(new ListMultipleChoice<String>("siteSelection",
SITES));
// TextField using a custom converter.
- add(new TextField("urlProperty", URL.class)
+ add(new TextField<URL>("urlProperty", URL.class)
{
@Override
- public IConverter getConverter(final Class type)
+ public IConverter<URL> getConverter(final
Class<URL> type)
{
- return new IConverter()
+ return new IConverter<URL>()
{
- public Object
convertToObject(String value, Locale locale)
+ public URL
convertToObject(String value, Locale locale)
{
try
{
@@ -161,7 +161,7 @@
}
}
- public String
convertToString(Object value, Locale locale)
+ public String
convertToString(URL value, Locale locale)
{
return value != null ?
value.toString() : null;
}
@@ -170,22 +170,22 @@
});
// TextField using a mask converter
- add(new TextField("phoneNumberUS", UsPhoneNumber.class)
+ add(new TextField<UsPhoneNumber>("phoneNumberUS",
UsPhoneNumber.class)
{
@Override
- public IConverter getConverter(final Class/*
<?> */type)
+ public IConverter<UsPhoneNumber>
getConverter(final Class<UsPhoneNumber> type)
{
// US telephone number mask
- return new MaskConverter("(###)
###-####", UsPhoneNumber.class);
+ return new
MaskConverter<UsPhoneNumber>("(###) ###-####", UsPhoneNumber.class);
}
});
// and this is to show we can nest ListViews in Forms
too
add(new LinesListView("lines"));
- add(new Button("saveButton"));
+ add(new Button<Void>("saveButton"));
- add(new Button("resetButton")
+ add(new Button<Void>("resetButton")
{
@Override
public void onSubmit()
@@ -274,7 +274,7 @@
// set the model that gets the current locale, and that
is used for
// updating the current locale to property 'locale' of
FormInput
- setModel(new PropertyModel(FormInput.this, "locale"));
+ setModel(new PropertyModel<Locale>(FormInput.this,
"locale"));
}
/**
@@ -305,11 +305,11 @@
}
/** available sites for the multiple select. */
- private static final List SITES = Arrays.asList(new String[] { "The
Server Side", "Java Lobby",
- "Java.Net" });
+ private static final List<String> SITES = Arrays.asList(new String[] {
"The Server Side",
+ "Java Lobby", "Java.Net" });
/** available numbers for the radio selection. */
- static final List NUMBERS = Arrays.asList(new String[] { "1", "2", "3"
});
+ static final List<String> NUMBERS = Arrays.asList(new String[] { "1",
"2", "3" });
/**
* Constructor
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java?rev=653874&r1=653873&r2=653874&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java
Tue May 6 11:30:24 2008
@@ -39,7 +39,7 @@
public class FormInputApplication extends WicketExampleApplication
{
/** Relevant locales wrapped in a list. */
- public static final List LOCALES = Arrays.asList(new Locale[] {
Locale.ENGLISH,
+ public static final List<Locale> LOCALES = Arrays.asList(new Locale[] {
Locale.ENGLISH,
new Locale("nl", "NL"), Locale.GERMAN,
Locale.SIMPLIFIED_CHINESE, Locale.JAPANESE,
new Locale("pt", "BR"), new Locale("fa", "IR"), new
Locale("da", "DK"),
new Locale("th", "TH"), new Locale("ru"), new
Locale("ko", "KR") });
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java?rev=653874&r1=653873&r2=653874&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java
Tue May 6 11:30:24 2008
@@ -74,6 +74,7 @@
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
return text;
@@ -84,14 +85,14 @@
private Double doubleProperty = 20.5;
private Integer integerInRangeProperty = 50;
private Integer integerProperty = 100;
- private List lines = new ArrayList();
+ private List<Line> lines = new ArrayList<Line>();
private Integer multiply = 0;
- private String numberRadioChoice = (String)FormInput.NUMBERS.get(0);
- private List numbersCheckGroup = new ArrayList();
+ private String numberRadioChoice = FormInput.NUMBERS.get(0);
+ private final List<String> numbersCheckGroup = new ArrayList<String>();
private String numbersGroup;
/** US phone number with mask '(###) ###-####'. */
private UsPhoneNumber phoneNumberUS = new UsPhoneNumber("(123)
456-1234");
- private Set siteSelection = new HashSet();
+ private Set<String> siteSelection = new HashSet<String>();
private String stringProperty = "test";
private URL urlProperty;
@@ -158,7 +159,7 @@
*
* @return lines
*/
- public List getLines()
+ public List<Line> getLines()
{
return lines;
}
@@ -184,7 +185,7 @@
/**
* @return the numbers list
*/
- public List getNumbersCheckGroup()
+ public List<String> getNumbersCheckGroup()
{
return numbersCheckGroup;
}
@@ -194,7 +195,7 @@
*/
public String getNumbersGroup()
{
- return this.numbersGroup;
+ return numbersGroup;
}
/**
@@ -210,7 +211,7 @@
*
* @return selectedSites
*/
- public Set getSiteSelection()
+ public Set<String> getSiteSelection()
{
return siteSelection;
}
@@ -285,7 +286,7 @@
* @param lines
* lines
*/
- public void setLines(List lines)
+ public void setLines(List<Line> lines)
{
this.lines = lines;
}
@@ -307,7 +308,7 @@
*/
public void setNumberRadioChoice(String favoriteColor)
{
- this.numberRadioChoice = favoriteColor;
+ numberRadioChoice = favoriteColor;
}
/**
@@ -318,7 +319,7 @@
*/
public void setNumbersGroup(String group)
{
- this.numbersGroup = group;
+ numbersGroup = group;
}
/**
@@ -336,9 +337,9 @@
* @param selectedSites
* selectedSites
*/
- public void setSiteSelection(Set selectedSites)
+ public void setSiteSelection(Set<String> selectedSites)
{
- this.siteSelection = selectedSites;
+ siteSelection = selectedSites;
}
/**
@@ -366,19 +367,32 @@
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
StringBuffer b = new StringBuffer();
- b.append("[TestInputObject stringProperty =
'").append(stringProperty).append(
- "', integerProperty =
").append(integerProperty).append(", doubleProperty = ")
- .append(doubleProperty).append(",
booleanProperty = ").append(booleanProperty)
- .append(", integerInRangeProperty =
").append(integerInRangeProperty).append(
- ", urlProperty =
").append(urlProperty).append(", phoneNumberUS = ")
- .append(phoneNumberUS).append(",
numberRadioChoice = ").append(numberRadioChoice)
- .append(", numbersCheckgroup
").append(numbersCheckGroup).append(
- ", numberRadioGroup=
").append(numbersGroup);
+ b.append("[TestInputObject stringProperty = '")
+ .append(stringProperty)
+ .append("', integerProperty = ")
+ .append(integerProperty)
+ .append(", doubleProperty = ")
+ .append(doubleProperty)
+ .append(", booleanProperty = ")
+ .append(booleanProperty)
+ .append(", integerInRangeProperty = ")
+ .append(integerInRangeProperty)
+ .append(", urlProperty = ")
+ .append(urlProperty)
+ .append(", phoneNumberUS = ")
+ .append(phoneNumberUS)
+ .append(", numberRadioChoice = ")
+ .append(numberRadioChoice)
+ .append(", numbersCheckgroup ")
+ .append(numbersCheckGroup)
+ .append(", numberRadioGroup= ")
+ .append(numbersGroup);
b.append(", selected sites {");
- for (Iterator i = siteSelection.iterator(); i.hasNext();)
+ for (Iterator<String> i = siteSelection.iterator();
i.hasNext();)
{
b.append(i.next());
if (i.hasNext())
@@ -388,7 +402,7 @@
}
b.append("]");
b.append(", lines [");
- for (Iterator i = lines.iterator(); i.hasNext();)
+ for (Iterator<Line> i = lines.iterator(); i.hasNext();)
{
b.append(i.next());
if (i.hasNext())
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/ConversionException.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/ConversionException.java?rev=653874&r1=653873&r2=653874&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/ConversionException.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/ConversionException.java
Tue May 6 11:30:24 2008
@@ -35,7 +35,7 @@
private static final long serialVersionUID = 1L;
/** The converter that was used. */
- private IConverter converter;
+ private IConverter< ? > converter;
/** Pattern that was used for conversion. */
private Format format;
@@ -53,7 +53,7 @@
private String resourceKey;
/** Variable map to use in variable substitution */
- private Map vars;
+ private Map<String, Object> vars;
/**
* Construct exception with message.
@@ -95,7 +95,7 @@
*
* @return the used converter.
*/
- public final IConverter getConverter()
+ public final IConverter< ? > getConverter()
{
return converter;
}
@@ -135,7 +135,7 @@
*
* @return the target property type.
*/
- public final Class/* <?> */getTargetType()
+ public final Class< ? > getTargetType()
{
return Classes.resolveClass(targetTypeName);
}
@@ -147,7 +147,7 @@
* the converter.
* @return This
*/
- public final ConversionException setConverter(IConverter converter)
+ public final ConversionException setConverter(IConverter< ? > converter)
{
this.converter = converter;
return this;
@@ -199,9 +199,9 @@
* sets the target property type
* @return This
*/
- public final ConversionException setTargetType(Class/* ? */targetType)
+ public final ConversionException setTargetType(Class< ? > targetType)
{
- this.targetTypeName = targetType.getName();
+ targetTypeName = targetType.getName();
return this;
}
@@ -242,17 +242,17 @@
if (name == null || name.trim().length() == 0)
{
throw new IllegalArgumentException(
- "Argument [[name]] cannot be null or an
empty string");
+ "Argument [[name]] cannot be null or an empty
string");
}
if (value == null)
{
throw new IllegalArgumentException(
- "Argument [[value]] cannot be null or
an empty string");
+ "Argument [[value]] cannot be null or an empty
string");
}
if (vars == null)
{
- vars = new HashMap(2);
+ vars = new HashMap<String, Object>(2);
}
vars.put(name, value);
@@ -264,7 +264,7 @@
*
* @return map of variables for this exception (or null if no variables
were defined)
*/
- public Map getVariables()
+ public Map<String, Object> getVariables()
{
return vars;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/MaskConverter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/MaskConverter.java?rev=653874&r1=653873&r2=653874&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/MaskConverter.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/MaskConverter.java
Tue May 6 11:30:24 2008
@@ -84,11 +84,13 @@
* mask is on a per character basis, and will thus adjust to fit as many chars
as are needed.
* </p>
*
+ * @param <T>
+ * The converter object type
* @see MaskFormatter
*
* @author Eelco Hillenius
*/
-public class MaskConverter implements IConverter
+public class MaskConverter<T> implements IConverter<T>
{
private static final long serialVersionUID = 1L;
@@ -132,7 +134,7 @@
* The type to convert string values to.
* @see MaskFormatter
*/
- public MaskConverter(String mask, Class/* <?> */type)
+ public MaskConverter(String mask, Class< ? > type)
{
try
{
@@ -152,11 +154,12 @@
*
* @see
org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,
Locale)
*/
- public Object convertToObject(String value, Locale locale)
+ @SuppressWarnings("unchecked")
+ public T convertToObject(String value, Locale locale)
{
try
{
- return maskFormatter.stringToValue(value);
+ return (T)maskFormatter.stringToValue(value);
}
catch (ParseException e)
{
@@ -169,7 +172,7 @@
*
* @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)
{
try
{
