You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/06/21 15:50:31 UTC
[12/20] git commit: Java 7 diamonds for wicket-datetime
Java 7 diamonds for wicket-datetime
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f022876f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f022876f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f022876f
Branch: refs/heads/master
Commit: f022876f40649328efb6b7ccaa6d8bf894ab27b1
Parents: f1c8153
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 15:04:38 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:38 2013 +0200
----------------------------------------------------------------------
.../apache/wicket/extensions/yui/calendar/DatePicker.java | 2 +-
.../apache/wicket/extensions/yui/calendar/DateTimeField.java | 8 ++++----
.../apache/wicket/extensions/yui/calendar/DatesPage1.java | 6 +++---
.../apache/wicket/extensions/yui/calendar/DatesPage2.java | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f022876f/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
index 05397a3..6696201 100644
--- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
+++ b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
@@ -415,7 +415,7 @@ public class DatePicker extends Behavior
return null;
}
- List<String> list = new ArrayList<String>(stringArray.length);
+ List<String> list = new ArrayList<>(stringArray.length);
for (String string : stringArray)
{
if (!Strings.isEmpty(string))
http://git-wip-us.apache.org/repos/asf/wicket/blob/f022876f/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
index 13b9cb8..f3ddb87 100644
--- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
+++ b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
@@ -136,7 +136,7 @@ public class DateTimeField extends FormComponentPanel<Date>
setType(Date.class);
// Create and add the date TextField
- PropertyModel<Date> dateFieldModel = new PropertyModel<Date>(this, DATE);
+ PropertyModel<Date> dateFieldModel = new PropertyModel<>(this, DATE);
add(dateField = newDateTextField(DATE, dateFieldModel));
// Add a date picker to the date TextField
@@ -146,7 +146,7 @@ public class DateTimeField extends FormComponentPanel<Date>
add(hoursField = new TextField<Integer>(HOURS, new PropertyModel<Integer>(this, HOURS),
Integer.class));
hoursField.add(new HoursValidator());
- hoursField.setLabel(new Model<String>(HOURS));
+ hoursField.setLabel(new Model<>(HOURS));
// Create and add the "minutes" TextField
add(minutesField = new TextField<Integer>(MINUTES,
@@ -168,8 +168,8 @@ public class DateTimeField extends FormComponentPanel<Date>
}
}
});
- minutesField.add(new RangeValidator<Integer>(0, 59));
- minutesField.setLabel(new Model<String>(MINUTES));
+ minutesField.add(new RangeValidator<>(0, 59));
+ minutesField.setLabel(new Model<>(MINUTES));
// Create and add the "AM/PM" Listbox
add(amOrPmChoice = new DropDownChoice<AM_PM>(AM_OR_PM_CHOICE, new PropertyModel<AM_PM>(
http://git-wip-us.apache.org/repos/asf/wicket/blob/f022876f/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1.java
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1.java b/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1.java
index 72e20c1..51e643d 100644
--- a/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1.java
+++ b/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1.java
@@ -94,7 +94,7 @@ public class DatesPage1 extends WebPage
public List<Locale> getObject()
{
getSelectedLocale();
- List<Locale> locales = new ArrayList<Locale>(LOCALES);
+ List<Locale> locales = new ArrayList<>(LOCALES);
Collections.sort(locales, new Comparator<Locale>()
{
@Override
@@ -108,7 +108,7 @@ public class DatesPage1 extends WebPage
}
});
setChoiceRenderer(new LocaleChoiceRenderer());
- setDefaultModel(new PropertyModel<Locale>(DatesPage1.this, "selectedLocale"));
+ setDefaultModel(new PropertyModel<>(DatesPage1.this, "selectedLocale"));
}
@Override
@@ -157,7 +157,7 @@ public class DatesPage1 extends WebPage
public DatesPage1()
{
selectedLocale = Session.get().getLocale();
- Form<?> localeForm = new Form<Void>("localeForm");
+ Form<?> localeForm = new Form<>("localeForm");
localeForm.add(new LocaleDropDownChoice("localeSelect"));
localeForm.add(new Link<Void>("localeUSLink")
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/f022876f/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage2.java
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage2.java b/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage2.java
index a7fec1b..827d10d 100644
--- a/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage2.java
+++ b/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage2.java
@@ -43,7 +43,7 @@ public class DatesPage2 extends WebPage
*/
public DatesPage2()
{
- Form<?> form = new Form<Void>("form");
+ Form<?> form = new Form<>("form");
add(form);
form.add(new DateTimeField("dateTimeField", new PropertyModel<Date>(this, "dateTime")));