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:20 UTC
[01/20] git commit: Java 7 diamonds for wicket-velocity
Updated Branches:
refs/heads/master 44a4132fc -> eaa22123f
Java 7 diamonds for wicket-velocity
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0576c4a4
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0576c4a4
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0576c4a4
Branch: refs/heads/master
Commit: 0576c4a48feee71defd3f85c9b127e455eb5e57f
Parents: c1a28ab
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 15:39:47 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:38 2013 +0200
----------------------------------------------------------------------
.../apache/wicket/contrib/markup/html/velocity/VelocityPage.java | 4 ++--
.../markup/html/velocity/VelocityWithMarkupParsingPage.java | 2 +-
.../apache/wicket/contrib/velocity/VelocityJavaScriptPage.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/0576c4a4/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java
----------------------------------------------------------------------
diff --git a/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java b/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java
index 8da0c80..44c8f52 100644
--- a/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java
+++ b/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java
@@ -38,9 +38,9 @@ public class VelocityPage extends WebPage
*/
public VelocityPage()
{
- HashMap<String, String> values = new HashMap<String, String>();
+ HashMap<String, String> values = new HashMap<>();
values.put("message", TEST_STRING);
- add(VelocityPanel.forTemplateResource("velocityPanel", new Model<HashMap<String, String>>(
+ add(VelocityPanel.forTemplateResource("velocityPanel", new Model<>(
values), new UrlResourceStream(this.getClass().getResource("test.html"))));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0576c4a4/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java
----------------------------------------------------------------------
diff --git a/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java b/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java
index b8f0b0e..850fda9 100644
--- a/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java
+++ b/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java
@@ -40,7 +40,7 @@ public class VelocityWithMarkupParsingPage extends WebPage
*/
public VelocityWithMarkupParsingPage()
{
- HashMap<String, String> values = new HashMap<String, String>();
+ HashMap<String, String> values = new HashMap<>();
values.put("labelId", "message");
VelocityPanel velocityPanel = new VelocityPanel("velocityPanel",
new Model<HashMap<String, String>>(values))
http://git-wip-us.apache.org/repos/asf/wicket/blob/0576c4a4/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java
----------------------------------------------------------------------
diff --git a/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java b/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java
index 5bdf3a2..7c4fc57 100644
--- a/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java
+++ b/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java
@@ -50,7 +50,7 @@ public class VelocityJavaScriptPage extends WebPage
@Override
public MiniMap<String, String> getObject()
{
- MiniMap<String, String> map = new MiniMap<String, String>(2);
+ MiniMap<String, String> map = new MiniMap<>(2);
map.put("msg1", MSG1);
map.put("msg2", "Stooopid test 2");
return map;
[04/20] git commit: Java 7 diamonds for wicket-guice
Posted by mg...@apache.org.
Java 7 diamonds for wicket-guice
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ae1a1265
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ae1a1265
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ae1a1265
Branch: refs/heads/master
Commit: ae1a12653f66a775c922e124ff206077e447f479
Parents: a9ca7e4
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 14:56:03 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:38 2013 +0200
----------------------------------------------------------------------
.../src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ae1a1265/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java b/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
index f0c0573..7ba0bb7 100644
--- a/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
+++ b/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
@@ -76,7 +76,7 @@ public class GuiceInjectorTest extends Assert
@Override
public Map<String, String> get()
{
- Map<String, String> strings = new HashMap<String, String>();
+ Map<String, String> strings = new HashMap<>();
strings.put(ITestService.RESULT, ITestService.RESULT);
[12/20] git commit: Java 7 diamonds for wicket-datetime
Posted by mg...@apache.org.
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")));
[08/20] git commit: Java 7 diamonds for wicket-auth-roles
Posted by mg...@apache.org.
Java 7 diamonds for wicket-auth-roles
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cf2c3af7
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cf2c3af7
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cf2c3af7
Branch: refs/heads/master
Commit: cf2c3af7348dd9e8726656d66e77cccb27a5d47c
Parents: 6510f10
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 15:01:16 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:38 2013 +0200
----------------------------------------------------------------------
.../wicket/authroles/authentication/panel/SignInPanel.java | 4 ++--
.../strategies/role/metadata/ActionPermissions.java | 2 +-
.../strategies/role/metadata/InstantiationPermissions.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/cf2c3af7/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.java
----------------------------------------------------------------------
diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.java b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.java
index 14a3e18..78ee0a1 100644
--- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.java
+++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.java
@@ -284,10 +284,10 @@ public class SignInPanel extends Panel
{
super(id);
- setModel(new CompoundPropertyModel<SignInPanel>(SignInPanel.this));
+ setModel(new CompoundPropertyModel<>(SignInPanel.this));
// Attach textfields for username and password
- add(new TextField<String>("username"));
+ add(new TextField<>("username"));
add(new PasswordTextField("password"));
// MarkupContainer row for remember me checkbox
http://git-wip-us.apache.org/repos/asf/wicket/blob/cf2c3af7/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/ActionPermissions.java
----------------------------------------------------------------------
diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/ActionPermissions.java b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/ActionPermissions.java
index 6393b1e..45fabb1 100644
--- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/ActionPermissions.java
+++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/ActionPermissions.java
@@ -37,7 +37,7 @@ public final class ActionPermissions implements IClusterable
private static final long serialVersionUID = 1L;
/** Map from an action to a set of role strings */
- private final Map<Action, Roles> rolesForAction = new HashMap<Action, Roles>();
+ private final Map<Action, Roles> rolesForAction = new HashMap<>();
/**
* Gives permission for the given roles to perform the given action
http://git-wip-us.apache.org/repos/asf/wicket/blob/cf2c3af7/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/InstantiationPermissions.java
----------------------------------------------------------------------
diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/InstantiationPermissions.java b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/InstantiationPermissions.java
index 47c2082..d449090 100644
--- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/InstantiationPermissions.java
+++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/InstantiationPermissions.java
@@ -39,7 +39,7 @@ public class InstantiationPermissions implements IClusterable
private static final long serialVersionUID = 1L;
/** Holds roles objects for component classes */
- private final Map<Class<? extends Component>, Roles> rolesForComponentClass = new HashMap<Class<? extends Component>, Roles>();
+ private final Map<Class<? extends Component>, Roles> rolesForComponentClass = new HashMap<>();
/**
* Gives the given role permission to instantiate the given class.
[07/20] git commit: Java 7 diamonds for wicket-request module
Posted by mg...@apache.org.
Java 7 diamonds for wicket-request module
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5aba89bc
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5aba89bc
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5aba89bc
Branch: refs/heads/master
Commit: 5aba89bc8c2c8eb8ecef93ea641061e484d38a41
Parents: 1d6d597
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 14:54:22 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:38 2013 +0200
----------------------------------------------------------------------
.../apache/wicket/request/HttpHeaderCollection.java | 6 +++---
.../apache/wicket/request/RequestHandlerStack.java | 4 ++--
.../main/java/org/apache/wicket/request/Url.java | 10 +++++-----
.../java/org/apache/wicket/request/UrlRenderer.java | 6 +++---
.../request/mapper/CompoundRequestMapper.java | 6 +++---
.../request/mapper/mount/MountParameters.java | 2 +-
.../request/mapper/parameter/PageParameters.java | 16 ++++++++--------
.../parameter/UrlRequestParametersAdapter.java | 4 ++--
8 files changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/5aba89bc/wicket-request/src/main/java/org/apache/wicket/request/HttpHeaderCollection.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/HttpHeaderCollection.java b/wicket-request/src/main/java/org/apache/wicket/request/HttpHeaderCollection.java
index 080c7fe..e3a922c 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/HttpHeaderCollection.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/HttpHeaderCollection.java
@@ -46,7 +46,7 @@ public class HttpHeaderCollection
public HttpHeaderCollection()
{
- headers = new HashMap<HeaderKey, List<Object>>();
+ headers = new HashMap<>();
}
/**
@@ -65,7 +65,7 @@ public class HttpHeaderCollection
if (values == null)
{
- values = new ArrayList<Object>();
+ values = new ArrayList<>();
headers.put(key, values);
}
values.add(object);
@@ -202,7 +202,7 @@ public class HttpHeaderCollection
return Collections.emptySet();
}
- final Set<String> names = new HashSet<String>(headers.size());
+ final Set<String> names = new HashSet<>(headers.size());
for (HeaderKey key : headers.keySet())
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/5aba89bc/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java b/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
index 4267888..2d79893 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
@@ -36,9 +36,9 @@ public abstract class RequestHandlerStack
private static final Logger log = LoggerFactory.getLogger(RequestHandlerStack.class);
// we need both Queue and List interfaces
- private final LinkedList<IRequestHandler> requestHandlers = new LinkedList<IRequestHandler>();
+ private final LinkedList<IRequestHandler> requestHandlers = new LinkedList<>();
- private final List<IRequestHandler> inactiveRequestHandlers = new ArrayList<IRequestHandler>();
+ private final List<IRequestHandler> inactiveRequestHandlers = new ArrayList<>();
private IRequestHandler scheduledAfterCurrent = null;
http://git-wip-us.apache.org/repos/asf/wicket/blob/5aba89bc/wicket-request/src/main/java/org/apache/wicket/request/Url.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/Url.java b/wicket-request/src/main/java/org/apache/wicket/request/Url.java
index 7f85f1b..b9769e8 100755
--- a/wicket-request/src/main/java/org/apache/wicket/request/Url.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/Url.java
@@ -134,8 +134,8 @@ public class Url implements Serializable
protocol = url.protocol;
host = url.host;
port = url.port;
- segments = new ArrayList<String>(url.segments);
- parameters = new ArrayList<QueryParameter>(url.parameters);
+ segments = new ArrayList<>(url.segments);
+ parameters = new ArrayList<>(url.parameters);
charsetName = url.charsetName;
_charset = url._charset;
}
@@ -175,8 +175,8 @@ public class Url implements Serializable
Args.notNull(segments, "segments");
Args.notNull(parameters, "parameters");
- this.segments = new ArrayList<String>(segments);
- this.parameters = new ArrayList<QueryParameter>(parameters);
+ this.segments = new ArrayList<>(segments);
+ this.parameters = new ArrayList<>(parameters);
setCharset(charset);
}
@@ -798,7 +798,7 @@ public class Url implements Serializable
if (!isAtLeastOneSegmentReal(segments) && !isLastSegmentEmpty(segments))
{
- segments = new ArrayList<String>(segments);
+ segments = new ArrayList<>(segments);
segments.add("");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/5aba89bc/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java b/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
index f78d301..cfed30b 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
@@ -41,7 +41,7 @@ public class UrlRenderer
{
private static final Logger LOG = LoggerFactory.getLogger(UrlRenderer.class);
- private static final Map<String, Integer> PROTO_TO_PORT = new HashMap<String, Integer>();
+ private static final Map<String, Integer> PROTO_TO_PORT = new HashMap<>();
static
{
PROTO_TO_PORT.put("http", 80);
@@ -235,12 +235,12 @@ public class UrlRenderer
}
List<String> baseUrlSegments = getBaseUrl().getSegments();
- List<String> urlSegments = new ArrayList<String>(url.getSegments());
+ List<String> urlSegments = new ArrayList<>(url.getSegments());
removeCommonPrefixes(request, baseUrlSegments);
removeCommonPrefixes(request, urlSegments);
- List<String> newSegments = new ArrayList<String>();
+ List<String> newSegments = new ArrayList<>();
int common = 0;
http://git-wip-us.apache.org/repos/asf/wicket/blob/5aba89bc/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java
index ae13ac2..1dc0e5b 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java
@@ -100,7 +100,7 @@ public class CompoundRequestMapper implements ICompoundRequestMapper
}
}
- private final List<IRequestMapper> mappers = new CopyOnWriteArrayList<IRequestMapper>();
+ private final List<IRequestMapper> mappers = new CopyOnWriteArrayList<>();
@Override
public CompoundRequestMapper add(final IRequestMapper mapper)
@@ -131,7 +131,7 @@ public class CompoundRequestMapper implements ICompoundRequestMapper
@Override
public IRequestHandler mapRequest(final Request request)
{
- List<MapperWithScore> list = new ArrayList<MapperWithScore>(mappers.size());
+ List<MapperWithScore> list = new ArrayList<>(mappers.size());
for (IRequestMapper mapper : mappers)
{
@@ -169,7 +169,7 @@ public class CompoundRequestMapper implements ICompoundRequestMapper
*/
private void logMappers(final List<MapperWithScore> mappersWithScores, final String url)
{
- final List<MapperWithScore> compatibleMappers = new ArrayList<MapperWithScore>();
+ final List<MapperWithScore> compatibleMappers = new ArrayList<>();
for (MapperWithScore mapperWithScore : mappersWithScores)
{
if (mapperWithScore.compatibilityScore > 0)
http://git-wip-us.apache.org/repos/asf/wicket/blob/5aba89bc/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java
index 4d471aa..f5c0795 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java
@@ -30,7 +30,7 @@ import org.apache.wicket.util.string.StringValue;
*/
public class MountParameters
{
- private final Map<String, String> map = new HashMap<String, String>();
+ private final Map<String, String> map = new HashMap<>();
/**
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/5aba89bc/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
index 956ea75..dac0571 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
@@ -116,12 +116,12 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
{
if (copy.indexedParameters != null)
{
- indexedParameters = new ArrayList<String>(copy.indexedParameters);
+ indexedParameters = new ArrayList<>(copy.indexedParameters);
}
if (copy.namedParameters != null)
{
- namedParameters = new ArrayList<Entry>(copy.namedParameters);
+ namedParameters = new ArrayList<>(copy.namedParameters);
}
}
}
@@ -142,7 +142,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
{
if (indexedParameters == null)
{
- indexedParameters = new ArrayList<String>(index);
+ indexedParameters = new ArrayList<>(index);
}
for (int i = indexedParameters.size(); i <= index; ++i)
@@ -196,7 +196,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
{
return Collections.emptySet();
}
- Set<String> set = new TreeSet<String>();
+ Set<String> set = new TreeSet<>();
for (Entry entry : namedParameters)
{
set.add(entry.key);
@@ -235,7 +235,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
if (namedParameters != null)
{
- List<StringValue> result = new ArrayList<StringValue>();
+ List<StringValue> result = new ArrayList<>();
for (Entry entry : namedParameters)
{
if (entry.key.equals(name))
@@ -257,7 +257,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
@Override
public List<NamedPair> getAllNamed()
{
- List<NamedPair> res = new ArrayList<NamedPair>();
+ List<NamedPair> res = new ArrayList<>();
if (namedParameters != null)
{
for (Entry e : namedParameters)
@@ -350,10 +350,10 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
if (namedParameters == null)
{
- namedParameters = new ArrayList<Entry>(1);
+ namedParameters = new ArrayList<>(1);
}
- List<String> values = new ArrayList<String>();
+ List<String> values = new ArrayList<>();
if (value instanceof String[])
{
values.addAll(Arrays.asList((String[])value));
http://git-wip-us.apache.org/repos/asf/wicket/blob/5aba89bc/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java b/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java
index d40becc..632dac0 100755
--- a/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java
@@ -56,7 +56,7 @@ public class UrlRequestParametersAdapter implements IRequestParameters
@Override
public Set<String> getParameterNames()
{
- Set<String> result = new LinkedHashSet<String>();
+ Set<String> result = new LinkedHashSet<>();
for (QueryParameter parameter : url.getQueryParameters())
{
result.add(parameter.getName());
@@ -86,7 +86,7 @@ public class UrlRequestParametersAdapter implements IRequestParameters
{
if (values == null)
{
- values = new ArrayList<StringValue>();
+ values = new ArrayList<>();
}
values.add(StringValue.valueOf(parameter.getValue()));
}
[13/20] git commit: Java 7 diamonds for wicket-common-tests
Posted by mg...@apache.org.
Java 7 diamonds for wicket-common-tests
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f1c8153b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f1c8153b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f1c8153b
Branch: refs/heads/master
Commit: f1c8153bcb3ab49d0ef3ca8624d0035580d07cfe
Parents: cf2c3af
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 15:02:27 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:38 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f1c8153b/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
----------------------------------------------------------------------
diff --git a/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java b/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
index 8e335a6..993c8d4 100644
--- a/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
+++ b/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
@@ -34,7 +34,7 @@ public class OsgiClashingPackagesTest extends Assert
String[] dependencies = Strings.split(classpath, pathSeparator);
// packageName -> projects containing a package with this name
- Map<String, List<Project>> projectBuckets = new HashMap<String, List<Project>>();
+ Map<String, List<Project>> projectBuckets = new HashMap<>();
for (String dependency : dependencies)
{
@@ -87,7 +87,7 @@ public class OsgiClashingPackagesTest extends Assert
private static class Project {
// a set with all package names in a dependency
- private final Set<String> packagesWithContent = new TreeSet<String>();
+ private final Set<String> packagesWithContent = new TreeSet<>();
// the name of the dependency
private final String name;
@@ -105,7 +105,7 @@ public class OsgiClashingPackagesTest extends Assert
public void addTo(Map<String, List<Project>> projectBuckets) {
for (String packageWithContent : packagesWithContent) {
if (!projectBuckets.containsKey(packageWithContent)) {
- projectBuckets.put(packageWithContent, new ArrayList<OsgiClashingPackagesTest.Project>());
+ projectBuckets.put(packageWithContent, new ArrayList<Project>());
}
projectBuckets.get(packageWithContent).add(this);
}
[14/20] git commit: Java 7 diamonds for wicket-devutils
Posted by mg...@apache.org.
Java 7 diamonds for wicket-devutils
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ed71768c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ed71768c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ed71768c
Branch: refs/heads/master
Commit: ed71768c0539ca005a35465b587d51f27083f47e
Parents: f022876
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 15:07:49 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:38 2013 +0200
----------------------------------------------------------------------
.../devutils/debugbar/InspectorDebugPanel.java | 2 +-
.../devutils/debugbar/StandardDebugPanel.java | 2 +-
.../devutils/diskstore/DebugDiskDataStore.java | 2 +-
.../diskstore/browser/BrowserPanel.java | 2 +-
.../diskstore/browser/PageWindowProvider.java | 6 ++---
.../browser/SessionsProviderModel.java | 2 +-
.../devutils/inspector/EnhancedPageView.java | 16 ++++++------
.../devutils/inspector/InspectorPage.java | 2 +-
.../devutils/inspector/LiveSessionsPage.java | 8 +++---
.../wicket/devutils/inspector/RequestsPage.java | 26 ++++++++++----------
10 files changed, 34 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed71768c/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
index bdf95a1..eed4d93 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
@@ -72,7 +72,7 @@ public class InspectorDebugPanel extends StandardDebugPanel
@Override
protected IModel<String> getDataModel()
{
- return new Model<String>("Inspector");
+ return new Model<>("Inspector");
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed71768c/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java
index 143146b..c88499e 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java
@@ -66,7 +66,7 @@ public abstract class StandardDebugPanel extends DevUtilsPanel
protected BookmarkablePageLink<Void> createLink(final String id)
{
- return new BookmarkablePageLink<Void>(id, getLinkPageClass(), getLinkPageParameters());
+ return new BookmarkablePageLink<>(id, getLinkPageClass(), getLinkPageParameters());
}
protected abstract IModel<String> getDataModel();
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed71768c/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/DebugDiskDataStore.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/DebugDiskDataStore.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/DebugDiskDataStore.java
index 1a23151..9c3d882 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/DebugDiskDataStore.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/DebugDiskDataStore.java
@@ -66,7 +66,7 @@ public class DebugDiskDataStore extends DiskDataStore
*/
public List<PageWindow> getLastPageWindows(String sessionId, int count)
{
- List<PageWindow> pageWindows = new ArrayList<PageWindowManager.PageWindow>();
+ List<PageWindow> pageWindows = new ArrayList<>();
SessionEntry sessionEntry = getSessionEntry(sessionId, false);
if (sessionEntry != null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed71768c/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/BrowserPanel.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/BrowserPanel.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/BrowserPanel.java
index accc825..25358cc 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/BrowserPanel.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/BrowserPanel.java
@@ -116,7 +116,7 @@ public class BrowserPanel extends Panel
{
PageWindowProvider provider = new PageWindowProvider(sessionId);
- List<IColumn<PageWindowDescription, String>> columns = new ArrayList<IColumn<PageWindowDescription, String>>();
+ List<IColumn<PageWindowDescription, String>> columns = new ArrayList<>();
PageWindowColumn pageIdColumn = new PageWindowColumn(Model.of("Id"), "id");
columns.add(pageIdColumn);
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed71768c/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PageWindowProvider.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PageWindowProvider.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PageWindowProvider.java
index 3ae9f04..dd8397c 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PageWindowProvider.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PageWindowProvider.java
@@ -50,7 +50,7 @@ class PageWindowProvider implements ISortableDataProvider<PageWindowDescription,
{
List<PageWindow> lastPageWindows = getPageWindows();
List<PageWindow> subList = lastPageWindows.subList((int)first, (int)(first + count));
- List<PageWindowDescription> pageDescriptions = new ArrayList<PageWindowDescription>();
+ List<PageWindowDescription> pageDescriptions = new ArrayList<>();
for (PageWindow pw : subList)
{
pageDescriptions.add(new PageWindowDescription(pw, sessionId.getObject()));
@@ -61,7 +61,7 @@ class PageWindowProvider implements ISortableDataProvider<PageWindowDescription,
private List<PageWindow> getPageWindows()
{
- List<PageWindow> lastPageWindows = new ArrayList<PageWindow>();
+ List<PageWindow> lastPageWindows = new ArrayList<>();
if (sessionId != null && sessionId.getObject() != null)
{
String sessId = sessionId.getObject();
@@ -86,7 +86,7 @@ class PageWindowProvider implements ISortableDataProvider<PageWindowDescription,
@Override
public IModel<PageWindowDescription> model(PageWindowDescription description)
{
- return new Model<PageWindowDescription>(description);
+ return new Model<>(description);
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed71768c/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/SessionsProviderModel.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/SessionsProviderModel.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/SessionsProviderModel.java
index 1af7c11..6638303 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/SessionsProviderModel.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/SessionsProviderModel.java
@@ -34,7 +34,7 @@ public class SessionsProviderModel extends LoadableDetachableModel<List<String>>
@Override
protected List<String> load()
{
- List<String> sessionIds = new ArrayList<String>();
+ List<String> sessionIds = new ArrayList<>();
if (Application.exists())
{
DebugDiskDataStore dataStore = DataStoreHelper.getDataStore();
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed71768c/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java
index f7208b9..6398ce6 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java
@@ -126,7 +126,7 @@ public final class EnhancedPageView extends GenericPanel<Page>
showStatefulAndParentsOnly = false;
showBehaviors = true;
allColumns = allColumns();
- visibleColumns = new ArrayList<IColumn<TreeNode, Void>>(allColumns);
+ visibleColumns = new ArrayList<>(allColumns);
// Name of page
add(new Label("info", new Model<String>()
@@ -169,7 +169,7 @@ public final class EnhancedPageView extends GenericPanel<Page>
private List<IColumn<TreeNode, Void>> allColumns()
{
- List<IColumn<TreeNode, Void>> columns = new ArrayList<IColumn<TreeNode, Void>>();
+ List<IColumn<TreeNode, Void>> columns = new ArrayList<>();
columns.add(new PropertyColumn<TreeNode, Void>(Model.of("Path"), "path")
{
@@ -281,12 +281,12 @@ public final class EnhancedPageView extends GenericPanel<Page>
private void addTreeControls()
{
- Form<Void> form = new Form<Void>("form");
+ Form<Void> form = new Form<>("form");
add(form);
form.add(new CheckBox("showStateless", new PropertyModel<Boolean>(this,
"showStatefulAndParentsOnly")));
form.add(new CheckBox("showBehaviors", new PropertyModel<Boolean>(this, "showBehaviors")));
- form.add(new CheckBoxMultipleChoice<IColumn<TreeNode, Void>>("visibleColumns",
+ form.add(new CheckBoxMultipleChoice<>("visibleColumns",
new PropertyModel<List<IColumn<TreeNode, Void>>>(this, "visibleColumns"), allColumns).setSuffix(" "));
form.add(new AjaxFallbackButton("submit", form)
{
@@ -350,7 +350,7 @@ public final class EnhancedPageView extends GenericPanel<Page>
@Override
protected Item<TreeNode> newRowItem(String id, int index, IModel<TreeNode> model)
{
- return new OddEvenItem<TreeNode>(id, index, model);
+ return new OddEvenItem<>(id, index, model);
}
};
tree.setOutputMarkupId(true);
@@ -371,7 +371,7 @@ public final class EnhancedPageView extends GenericPanel<Page>
{
this.node = node;
this.parent = parent;
- children = new ArrayList<TreeNode>();
+ children = new ArrayList<>();
if (!(node instanceof Component) && !(node instanceof Behavior))
throw new IllegalArgumentException("Only accepts Components and Behaviors");
}
@@ -387,7 +387,7 @@ public final class EnhancedPageView extends GenericPanel<Page>
*/
public List<Integer> getPathIndexes()
{
- List<Integer> path = new ArrayList<Integer>();
+ List<Integer> path = new ArrayList<>();
TreeNode nextChild = this;
TreeNode parent;
while ((parent = nextChild.parent) != null)
@@ -706,7 +706,7 @@ public final class EnhancedPageView extends GenericPanel<Page>
{
private static final long serialVersionUID = 1L;
- private HashSet<List<Integer>> set = new HashSet<List<Integer>>();
+ private HashSet<List<Integer>> set = new HashSet<>();
private boolean reversed = false;
public void expandAll()
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed71768c/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java
index 69d8d50..023583d 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java
@@ -65,7 +65,7 @@ public final class InspectorPage extends DevUtilsPage
}
add(new EnhancedPageView("page", (Page)page));
add(new Image("bug", new PackageResourceReference(InspectorPage.class, "bug.png")));
- add(new BookmarkablePageLink<Void>("allsessions", LiveSessionsPage.class));
+ add(new BookmarkablePageLink<>("allsessions", LiveSessionsPage.class));
add(new Label("wicketVersion", getApplication().getFrameworkSettings().getVersion()));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed71768c/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java
index 63631ea..6ff3cce 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java
@@ -154,14 +154,14 @@ public class LiveSessionsPage extends DevUtilsPage
setResponsePage(new RequestsPage(sd));
}
};
- link.add(new Label("id", new Model<String>(sd.getSessionId())));
+ link.add(new Label("id", new Model<>(sd.getSessionId())));
item.add(link);
item.add(new Label("lastRequestTime", new Model<String>(
sdf.format(sd.getLastActive()))));
- item.add(new Label("requestCount", new Model<Long>(sd.getNumberOfRequests())));
- item.add(new Label("requestsTime", new Model<Long>(sd.getTotalTimeTaken())));
+ item.add(new Label("requestCount", new Model<>(sd.getNumberOfRequests())));
+ item.add(new Label("requestsTime", new Model<>(sd.getTotalTimeTaken())));
item.add(new Label("sessionSize",
- new Model<Bytes>(Bytes.bytes(sd.getSessionSize()))));
+ new Model<>(Bytes.bytes(sd.getSessionSize()))));
}
};
add(listView);
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed71768c/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java
index 2c829fa..a44c5f1 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java
@@ -68,15 +68,15 @@ public class RequestsPage extends DevUtilsPage
}
else
{
- add(new Label("id", new Model<String>(sessionData.getSessionId())));
+ add(new Label("id", new Model<>(sessionData.getSessionId())));
add(new Label("sessionInfo", new Model<Serializable>(
(Serializable)sessionData.getSessionInfo())));
- add(new Label("startDate", new Model<String>(sdf.format(sessionData.getStartDate()))));
+ add(new Label("startDate", new Model<>(sdf.format(sessionData.getStartDate()))));
add(new Label("lastRequestTime", new Model<String>(
sdf.format(sessionData.getLastActive()))));
- add(new Label("numberOfRequests", new Model<Long>(sessionData.getNumberOfRequests())));
- add(new Label("totalTimeTaken", new Model<Long>(sessionData.getTotalTimeTaken())));
- add(new Label("size", new Model<Bytes>(Bytes.bytes(sessionData.getSessionSize()))));
+ add(new Label("numberOfRequests", new Model<>(sessionData.getNumberOfRequests())));
+ add(new Label("totalTimeTaken", new Model<>(sessionData.getTotalTimeTaken())));
+ add(new Label("size", new Model<>(Bytes.bytes(sessionData.getSessionSize()))));
add(new WebMarkupContainer("sessionid").setVisible(false));
}
@@ -90,7 +90,7 @@ public class RequestsPage extends DevUtilsPage
List<RequestData> requests = getRequestLogger().getRequests();
if (sessionData != null)
{
- ArrayList<RequestData> returnValues = new ArrayList<RequestData>();
+ ArrayList<RequestData> returnValues = new ArrayList<>();
for (RequestData data : requests)
{
if (sessionData.getSessionId().equals(data.getSessionId()))
@@ -100,7 +100,7 @@ public class RequestsPage extends DevUtilsPage
}
return returnValues;
}
- return new ArrayList<RequestData>(requests);
+ return new ArrayList<>(requests);
}
};
PageableListView<RequestData> listView = new PageableListView<RequestData>("requests",
@@ -112,18 +112,18 @@ public class RequestsPage extends DevUtilsPage
protected void populateItem(final ListItem<RequestData> item)
{
RequestData rd = item.getModelObject();
- item.add(new Label("id", new Model<String>(rd.getSessionId())).setVisible(sessionData == null));
- item.add(new Label("startDate", new Model<String>(sdf.format(rd.getStartDate()))));
- item.add(new Label("timeTaken", new Model<Long>(rd.getTimeTaken())));
+ item.add(new Label("id", new Model<>(rd.getSessionId())).setVisible(sessionData == null));
+ item.add(new Label("startDate", new Model<>(sdf.format(rd.getStartDate()))));
+ item.add(new Label("timeTaken", new Model<>(rd.getTimeTaken())));
String eventTarget = rd.getEventTarget() != null ? rd.getEventTarget()
.getClass()
.getName() : "";
- item.add(new Label("eventTarget", new Model<String>(eventTarget)));
+ item.add(new Label("eventTarget", new Model<>(eventTarget)));
String responseTarget = rd.getResponseTarget() != null ? rd.getResponseTarget()
.getClass()
.getName() : "";
- item.add(new Label("responseTarget", new Model<String>(responseTarget)));
- item.add(new Label("alteredObjects", new Model<String>(rd.getAlteredObjects())).setEscapeModelStrings(false));
+ item.add(new Label("responseTarget", new Model<>(responseTarget)));
+ item.add(new Label("alteredObjects", new Model<>(rd.getAlteredObjects())).setEscapeModelStrings(false));
item.add(new Label("sessionSize", new Model<Bytes>(Bytes.bytes(rd.getSessionSize()
.longValue()))));
}
[02/20] git commit: Java 7 diamonds for wicket-jmx
Posted by mg...@apache.org.
Java 7 diamonds for wicket-jmx
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c1a28ab4
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c1a28ab4
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c1a28ab4
Branch: refs/heads/master
Commit: c1a28ab497a575e744e7257dfade862ea85fd7a3
Parents: 732c909
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 15:38:54 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:38 2013 +0200
----------------------------------------------------------------------
wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/c1a28ab4/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java
----------------------------------------------------------------------
diff --git a/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java b/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java
index 14ae09a..77aaa2d 100644
--- a/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java
+++ b/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java
@@ -60,7 +60,7 @@ public class Initializer implements IInitializer
/**
* List of registered names
*/
- private final List<ObjectName> registered = new ArrayList<ObjectName>();
+ private final List<ObjectName> registered = new ArrayList<>();
/**
* @see org.apache.wicket.IInitializer#destroy(org.apache.wicket.Application)
[15/20] git commit: Java 7 diamonds for wicket-ioc
Posted by mg...@apache.org.
Java 7 diamonds for wicket-ioc
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a9ca7e44
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a9ca7e44
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a9ca7e44
Branch: refs/heads/master
Commit: a9ca7e443b5d42c4ab7daa2fb87c5eb198428904
Parents: 5aba89b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 14:55:14 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:38 2013 +0200
----------------------------------------------------------------------
.../org/apache/wicket/injection/CompoundFieldValueFactory.java | 2 +-
.../src/main/java/org/apache/wicket/injection/Injector.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/a9ca7e44/wicket-ioc/src/main/java/org/apache/wicket/injection/CompoundFieldValueFactory.java
----------------------------------------------------------------------
diff --git a/wicket-ioc/src/main/java/org/apache/wicket/injection/CompoundFieldValueFactory.java b/wicket-ioc/src/main/java/org/apache/wicket/injection/CompoundFieldValueFactory.java
index bfbd8f2..b32eb05 100644
--- a/wicket-ioc/src/main/java/org/apache/wicket/injection/CompoundFieldValueFactory.java
+++ b/wicket-ioc/src/main/java/org/apache/wicket/injection/CompoundFieldValueFactory.java
@@ -35,7 +35,7 @@ import org.apache.wicket.util.lang.Args;
*/
public class CompoundFieldValueFactory implements IFieldValueFactory
{
- private final List<IFieldValueFactory> delegates = new ArrayList<IFieldValueFactory>();
+ private final List<IFieldValueFactory> delegates = new ArrayList<>();
/**
* Constructor
http://git-wip-us.apache.org/repos/asf/wicket/blob/a9ca7e44/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java
----------------------------------------------------------------------
diff --git a/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java b/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java
index e173ce9..ebac9c2 100644
--- a/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java
+++ b/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java
@@ -39,7 +39,7 @@ public abstract class Injector
private static final long serialVersionUID = 1L;
};
- private final ClassMetaCache<Field[]> cache = new ClassMetaCache<Field[]>();
+ private final ClassMetaCache<Field[]> cache = new ClassMetaCache<>();
/**
* Binds current instance of the injector to the Application. After this method is called this
@@ -138,7 +138,7 @@ public abstract class Injector
*/
private Field[] findFields(Class<?> clazz, final IFieldValueFactory factory)
{
- List<Field> matched = new ArrayList<Field>();
+ List<Field> matched = new ArrayList<>();
while (clazz != null)
{
[11/20] git commit: Java 7 diamonds for wicket-examples
Posted by mg...@apache.org.
Java 7 diamonds for wicket-examples
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/46651a45
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/46651a45
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/46651a45
Branch: refs/heads/master
Commit: 46651a4521167e786ca2b41523588fe5a1d21075
Parents: ed71768
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 15:27:42 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:38 2013 +0200
----------------------------------------------------------------------
.../examples/ajax/builtin/AutoCompletePage.java | 4 +--
.../wicket/examples/ajax/builtin/BasePage.java | 2 +-
.../examples/ajax/builtin/ChoicePage.java | 8 +++---
.../ajax/builtin/EditableLabelPage.java | 2 +-
.../examples/ajax/builtin/EffectsPage.java | 4 +--
.../examples/ajax/builtin/FileUploadPage.java | 2 +-
.../wicket/examples/ajax/builtin/FormPage.java | 4 +--
.../wicket/examples/ajax/builtin/GuestBook.java | 8 +++---
.../wicket/examples/ajax/builtin/LinksPage.java | 6 ++--
.../ajax/builtin/OnChangeAjaxBehaviorPage.java | 6 ++--
.../examples/ajax/builtin/RatingsPage.java | 4 +--
.../examples/ajax/builtin/TabbedPanelPage.java | 2 +-
.../wicket/examples/ajax/builtin/TodoList.java | 8 +++---
.../ajax/builtin/modal/ModalWindowPage.java | 2 +-
.../wicket/examples/ajax/prototype/Index.java | 2 +-
.../wicket/examples/asemail/MailTemplate.java | 4 +--
.../wicket/examples/atmosphere/HomePage.java | 6 ++--
.../wicket/examples/authentication1/SignIn.java | 2 +-
.../wicket/examples/authorization/Index.java | 10 +++----
.../bean/validation/BeanValidationPage.java | 10 +++----
.../apache/wicket/examples/captcha/Captcha.java | 2 +-
.../wicket/examples/cdi/ConversationPage2.java | 2 +-
.../examples/compref/BookmarkablePage.java | 2 +-
.../compref/BookmarkablePageLinkPage.java | 6 ++--
.../compref/CheckBoxMultipleChoicePage.java | 6 ++--
.../wicket/examples/compref/CheckBoxPage.java | 2 +-
.../examples/compref/CheckBoxSelectorPage.java | 10 +++----
.../wicket/examples/compref/CheckGroupPage.java | 6 ++--
.../examples/compref/CheckGroupPage2.java | 10 +++----
.../compref/ComponentReferenceApplication.java | 2 +-
.../examples/compref/DropDownChoicePage.java | 4 +--
.../wicket/examples/compref/LinkPage.java | 2 +-
.../wicket/examples/compref/ListChoicePage.java | 4 +--
.../compref/ListMultipleChoicePage.java | 8 +++---
.../apache/wicket/examples/compref/MyPanel.java | 6 ++--
.../wicket/examples/compref/PalettePage.java | 4 +--
.../examples/compref/RadioChoicePage.java | 4 +--
.../wicket/examples/compref/RadioGroupPage.java | 6 ++--
.../examples/compref/RadioGroupPage2.java | 10 +++----
.../wicket/examples/compref/SelectPage.java | 20 ++++++-------
.../examples/compref/TabbedPanelPage.java | 6 ++--
.../wicket/examples/compref/TextAreaPage.java | 4 +--
.../wicket/examples/compref/TextFieldPage.java | 6 ++--
.../examples/customresourceloading/Index.java | 2 +-
.../apache/wicket/examples/dates/DatesPage.java | 6 ++--
.../org/apache/wicket/examples/echo/Echo.java | 4 +--
.../apache/wicket/examples/events/BasePage.java | 2 +-
.../events/DecoupledAjaxUpdatePage.java | 4 +--
.../wicket/examples/forminput/FormInput.java | 30 ++++++++++----------
.../examples/forminput/FormInputModel.java | 6 ++--
.../wicket/examples/forminput/Multiply.java | 4 +--
.../wicket/examples/frames/LeftFrame.java | 2 +-
.../wicket/examples/guestbook/GuestBook.java | 8 +++---
.../apache/wicket/examples/hangman/Game.java | 2 +-
.../apache/wicket/examples/hangman/Guess.java | 2 +-
.../apache/wicket/examples/hangman/Home.java | 2 +-
.../apache/wicket/examples/hangman/Word.java | 2 +-
.../org/apache/wicket/examples/images/Home.java | 4 +--
.../apache/wicket/examples/library/Book.java | 4 +--
.../wicket/examples/library/BookDetails.java | 2 +-
.../wicket/examples/library/EditBook.java | 12 ++++----
.../apache/wicket/examples/library/Home.java | 4 +--
.../apache/wicket/examples/library/User.java | 2 +-
.../apache/wicket/examples/linkomatic/Home.java | 14 ++++-----
.../apache/wicket/examples/niceurl/Home.java | 14 ++++-----
.../apache/wicket/examples/niceurl/Page1.java | 2 +-
.../apache/wicket/examples/niceurl/Page2.java | 4 +--
.../wicket/examples/niceurl/mounted/Page3.java | 2 +-
.../wicket/examples/niceurl/mounted/Page4.java | 2 +-
.../wicket/examples/niceurl/mounted/Page5.java | 4 +--
.../org/apache/wicket/examples/pub/Home.java | 2 +-
.../org/apache/wicket/examples/pub2/Home.java | 2 +-
.../wicket/examples/repeater/BasePage.java | 2 +-
.../wicket/examples/repeater/DataGridPage.java | 4 +--
.../wicket/examples/repeater/DataTablePage.java | 16 +++++------
.../wicket/examples/repeater/FormPage.java | 14 ++++-----
.../wicket/examples/repeater/OIRPage.java | 2 +-
.../examples/repeater/RefreshingPage.java | 2 +-
.../examples/requestmapper/LocalizedPage.java | 2 +-
.../packageMount/PackageMountedPage.java | 2 +-
.../wicket/examples/source/SourcesPage.java | 2 +-
.../examples/spring/common/web/BasePage.java | 2 +-
.../spring/common/web/ContactsDisplayPage.java | 12 ++++----
.../examples/spring/common/web/HomePage.java | 2 +-
.../apache/wicket/examples/stateless/Index.java | 8 +++---
.../wicket/examples/stateless/StatefulPage.java | 4 +--
.../examples/stateless/StatelessPage.java | 4 +--
.../examples/stateless/StatelessPage1.java | 4 +--
.../examples/stateless/StatelessPage2.java | 6 ++--
.../examples/stateless/StatelessPage3.java | 6 ++--
.../examples/stockquote/StockQuoteLabel.java | 2 +-
.../examples/stockquote/StockQuotePage.java | 4 +--
.../wicket/examples/template/border/Page1.java | 2 +-
.../template/border/TemplateBorder.java | 4 +--
.../template/pageinheritance/TemplatePage.java | 6 ++--
.../wicket/examples/tree/AdvancedTreePage.java | 6 ++--
.../org/apache/wicket/examples/tree/Foo.java | 2 +-
.../wicket/examples/tree/FooExpansion.java | 2 +-
.../apache/wicket/examples/tree/FooPanel.java | 6 ++--
.../wicket/examples/tree/TableTreePage.java | 6 ++--
.../wicket/examples/tree/TreeApplication.java | 2 +-
.../tree/content/BookmarkableFolderContent.java | 2 +-
.../tree/content/CheckedFolderContent.java | 2 +-
.../content/CheckedSelectableFolderContent.java | 2 +-
.../examples/tree/content/FolderContent.java | 2 +-
.../examples/tree/content/MixedContent.java | 2 +-
.../content/MultiSelectableFolderContent.java | 2 +-
.../unicodeconverter/UnicodeConverter.java | 8 +++---
.../wicket/examples/upload/MultiUploadPage.java | 2 +-
.../wicket/examples/velocity/DynamicPage.java | 4 +--
.../wicket/examples/velocity/TemplatePage.java | 6 ++--
.../velocity/VelocityTemplateApplication.java | 4 +--
.../wicket/examples/wizard/NewUserWizard.java | 22 +++++++-------
.../org/apache/wicket/examples/wizard/User.java | 2 +-
.../examples/guestbook/GuestbookTest.java | 2 +-
.../examples/hangman/WordGeneratorTest.java | 2 +-
116 files changed, 289 insertions(+), 289 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
index f5ab863..beab5e5 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
@@ -47,7 +47,7 @@ public class AutoCompletePage extends BasePage
*/
public AutoCompletePage()
{
- Form<Void> form = new Form<Void>("form");
+ Form<Void> form = new Form<>("form");
add(form);
final IModel<String> model = new IModel<String>()
@@ -86,7 +86,7 @@ public class AutoCompletePage extends BasePage
return emptyList.iterator();
}
- List<String> choices = new ArrayList<String>(10);
+ List<String> choices = new ArrayList<>(10);
Locale[] locales = Locale.getAvailableLocales();
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java
index f22a03e..bac53a3 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java
@@ -30,6 +30,6 @@ public class BasePage extends WicketExamplePage
*/
public BasePage()
{
- add(new BookmarkablePageLink<Void>("back", Index.class).setAutoEnable(true));
+ add(new BookmarkablePageLink<>("back", Index.class).setAutoEnable(true));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java
index d612cb0..b6a773b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java
@@ -41,7 +41,7 @@ public class ChoicePage extends BasePage
{
private String selectedMake;
- private final Map<String, List<String>> modelsMap = new HashMap<String, List<String>>(); // map:company->model
+ private final Map<String, List<String>> modelsMap = new HashMap<>(); // map:company->model
/**
* @return Currently selected make
@@ -74,7 +74,7 @@ public class ChoicePage extends BasePage
@Override
public List<String> getObject()
{
- return new ArrayList<String>(modelsMap.keySet());
+ return new ArrayList<>(modelsMap.keySet());
}
};
@@ -97,10 +97,10 @@ public class ChoicePage extends BasePage
Form<?> form = new Form("form");
add(form);
- final DropDownChoice<String> makes = new DropDownChoice<String>("makes",
+ final DropDownChoice<String> makes = new DropDownChoice<>("makes",
new PropertyModel<String>(this, "selectedMake"), makeChoices);
- final DropDownChoice<String> models = new DropDownChoice<String>("models",
+ final DropDownChoice<String> models = new DropDownChoice<>("models",
new Model<String>(), modelChoices);
models.setOutputMarkupId(true);
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.java
index 8073cb7..ec1652e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.java
@@ -50,7 +50,7 @@ public class EditableLabelPage extends BasePage
*/
public EditableLabelPage()
{
- Form form = new Form("form", new CompoundPropertyModel<EditableLabelPage>(this));
+ Form form = new Form("form", new CompoundPropertyModel<>(this));
add(form);
form.add(new AjaxEditableLabel("text1"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java
index c926347..f7a8d9b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java
@@ -74,11 +74,11 @@ public class EffectsPage extends BasePage
*/
public EffectsPage()
{
- final Label c1 = new Label("c1", new PropertyModel<Integer>(this, "counter1"));
+ final Label c1 = new Label("c1", new PropertyModel<>(this, "counter1"));
c1.setOutputMarkupId(true);
add(c1);
- final Label c2 = new Label("c2", new PropertyModel<Integer>(this, "counter2"));
+ final Label c2 = new Label("c2", new PropertyModel<>(this, "counter2"));
c2.setOutputMarkupId(true);
add(c2);
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java
index bd4c6b9..1d1c69b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java
@@ -82,7 +82,7 @@ public class FileUploadPage extends BasePage
add(form);
// create a textfield to demo non-file content
- form.add(text = new TextField<String>("text", new Model<String>()));
+ form.add(text = new TextField<>("text", new Model<String>()));
text.add(StringValidator.minimumLength(2));
// create the file upload field
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.java
index 6c85e80..e17561b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.java
@@ -60,14 +60,14 @@ public class FormPage extends BasePage
// add form components to the form as usual
- fc = new RequiredTextField<String>("name");
+ fc = new RequiredTextField<>("name");
fc.add(new StringValidator(4, null));
fc.setLabel(new ResourceModel("label.name"));
form.add(fc);
form.add(new SimpleFormComponentLabel("name-label", fc));
- fc = new RequiredTextField<String>("email");
+ fc = new RequiredTextField<>("email");
fc.add(EmailAddressValidator.getInstance());
fc.setLabel(new ResourceModel("label.email"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.java
index 64d6c6a..91b8616 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.java
@@ -44,7 +44,7 @@ import org.apache.wicket.model.PropertyModel;
public class GuestBook extends BasePage
{
/** A global list of all comments from all users across all sessions */
- public static final List<Comment> commentList = new ArrayList<Comment>();
+ public static final List<Comment> commentList = new ArrayList<>();
/** The list view that shows comments */
private final ListView<Comment> commentListView;
@@ -75,7 +75,7 @@ public class GuestBook extends BasePage
public void populateItem(final ListItem<Comment> listItem)
{
final Comment comment = listItem.getModelObject();
- listItem.add(new Label("date", new Model<Date>(comment.getDate())));
+ listItem.add(new Label("date", new Model<>(comment.getDate())));
listItem.add(new MultiLineLabel("text", comment.getText()));
}
});
@@ -128,10 +128,10 @@ public class GuestBook extends BasePage
public CommentForm(final String id)
{
// Construct form with no validation listener
- super(id, new CompoundPropertyModel<Comment>(new Comment()));
+ super(id, new CompoundPropertyModel<>(new Comment()));
// Add text entry widget
- text = new TextArea<String>("text").setOutputMarkupId(true);
+ text = new TextArea<>("text").setOutputMarkupId(true);
add(text);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LinksPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LinksPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LinksPage.java
index e15635c..61b7a79 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LinksPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LinksPage.java
@@ -72,15 +72,15 @@ public class LinksPage extends BasePage
*/
public LinksPage()
{
- final Label c1 = new Label("c1", new PropertyModel<Integer>(this, "counter1"));
+ final Label c1 = new Label("c1", new PropertyModel<>(this, "counter1"));
c1.setOutputMarkupId(true);
add(c1);
- final Label c2 = new Label("c2", new PropertyModel<Integer>(this, "counter2"));
+ final Label c2 = new Label("c2", new PropertyModel<>(this, "counter2"));
c2.setOutputMarkupId(true);
add(c2);
- final Label c3 = new Label("c3", new PropertyModel<Integer>(this, "counter3"));
+ final Label c3 = new Label("c3", new PropertyModel<>(this, "counter3"));
c3.setOutputMarkupId(true);
add(c3);
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java
index c708751..28a8f34 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java
@@ -62,13 +62,13 @@ public class OnChangeAjaxBehaviorPage extends BasePage
*/
public OnChangeAjaxBehaviorPage()
{
- Form<Void> form = new Form<Void>("form");
+ Form<Void> form = new Form<>("form");
add(form);
- final TextField<String> field = new TextField<String>("field", new Model<String>(""));
+ final TextField<String> field = new TextField<String>("field", new Model<>(""));
form.add(field);
- final Label label = new Label("selectedValue", new Model<String>(""));
+ final Label label = new Label("selectedValue", new Model<>(""));
label.setOutputMarkupId(true);
form.add(label);
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java
index 1d0fecd..6ad0b40 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java
@@ -219,8 +219,8 @@ public class RatingsPage extends BasePage
RatingsPage.rating2.addRating(rating);
}
});
- add(new ResetRatingLink("reset1", new Model<RatingModel>(rating1)));
- add(new ResetRatingLink("reset2", new Model<RatingModel>(rating2)));
+ add(new ResetRatingLink("reset1", new Model<>(rating1)));
+ add(new ResetRatingLink("reset2", new Model<>(rating2)));
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TabbedPanelPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TabbedPanelPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TabbedPanelPage.java
index 74e6c24..a55b18f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TabbedPanelPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TabbedPanelPage.java
@@ -39,7 +39,7 @@ public class TabbedPanelPage extends BasePage
public TabbedPanelPage()
{
// create a list of ITab objects used to feed the tabbed panel
- List<ITab> tabs = new ArrayList<ITab>();
+ List<ITab> tabs = new ArrayList<>();
tabs.add(new AbstractTab(new Model<String>("first tab"))
{
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
index 6f47194..9c37a48 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
@@ -250,9 +250,9 @@ public class TodoList extends BasePage
*/
public AddTodoForm(String id)
{
- super(id, new CompoundPropertyModel<TodoItem>(new TodoItem()));
+ super(id, new CompoundPropertyModel<>(new TodoItem()));
setOutputMarkupId(true);
- add(new TextField<String>("text"));
+ add(new TextField<>("text"));
add(new AjaxButton("add", this)
{
@Override
@@ -332,7 +332,7 @@ public class TodoList extends BasePage
void onRemoveCompletedTodos(AjaxRequestTarget target)
{
- List<TodoItem> ready = new ArrayList<TodoItem>();
+ List<TodoItem> ready = new ArrayList<>();
for (TodoItem todo : items)
{
if (todo.isChecked())
@@ -400,7 +400,7 @@ public class TodoList extends BasePage
/**
* The list of todo items.
*/
- final List<TodoItem> items = new ArrayList<TodoItem>();
+ final List<TodoItem> items = new ArrayList<>();
/**
* Constructor.
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalWindowPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalWindowPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalWindowPage.java
index aebe38a..ed40cb5 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalWindowPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalWindowPage.java
@@ -36,7 +36,7 @@ public class ModalWindowPage extends BasePage
public ModalWindowPage()
{
final Label result;
- add(result = new Label("result", new PropertyModel<String>(this, "result")));
+ add(result = new Label("result", new PropertyModel<>(this, "result")));
result.setOutputMarkupId(true);
/*
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java
index 7d9af81..a85429e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java
@@ -92,7 +92,7 @@ public class Index extends WicketExamplePage
});
// Add the label
- add(counter = new Label("counter", new PropertyModel<Integer>(this, "count")));
+ add(counter = new Label("counter", new PropertyModel<>(this, "count")));
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java
index 4d3503b..65f5835 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java
@@ -66,7 +66,7 @@ public class MailTemplate extends WicketExamplePage
feedback.setOutputMarkupId(true);
add(feedback);
- final Form<Void> form = new Form<Void>("form");
+ final Form<Void> form = new Form<>("form");
add(form);
TextField<String> nameTextField = new TextField<String>("name", new PropertyModel<String>(
@@ -74,7 +74,7 @@ public class MailTemplate extends WicketExamplePage
nameTextField.setOutputMarkupId(true);
form.add(nameTextField);
- final MultiLineLabel result = new MultiLineLabel("result", new Model<String>());
+ final MultiLineLabel result = new MultiLineLabel("result", new Model<>());
result.setOutputMarkupId(true);
add(result);
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/HomePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/HomePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/HomePage.java
index f475d29..29e38b7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/HomePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/HomePage.java
@@ -46,10 +46,10 @@ public class HomePage extends WicketExamplePage
add(timeLabel = new Label("time", Model.of("start")).setOutputMarkupId(true));
add(messageLabel = new Label("message", Model.of("-")).setOutputMarkupId(true));
- Form<Void> form = new Form<Void>("form");
+ Form<Void> form = new Form<>("form");
add(form);
- form.add(receiver = new TextField<String>("receiver", Model.of("")));
- form.add(input = new TextField<String>("input", Model.of("")));
+ form.add(receiver = new TextField<>("receiver", Model.of("")));
+ form.add(input = new TextField<>("input", Model.of("")));
form.add(new AjaxSubmitLink("send", form)
{
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.java b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.java
index 3447729..5b4446d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.java
@@ -68,7 +68,7 @@ public final class SignIn extends WicketExamplePage
super(id);
// Attach textfield components that edit properties map model
- add(new TextField<String>(USERNAME, new PropertyModel<String>(properties, USERNAME)));
+ add(new TextField<>(USERNAME, new PropertyModel<String>(properties, USERNAME)));
add(new PasswordTextField(PASSWORD, new PropertyModel<String>(properties, PASSWORD)));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java
index b2ae6a8..74a9a15 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java
@@ -43,7 +43,7 @@ public class Index extends BasePage
*/
public Index()
{
- add(new Label("currentUser", new PropertyModel<User>(this, "session.user")));
+ add(new Label("currentUser", new PropertyModel<>(this, "session.user")));
add(new ListView<User>("users", RolesApplication.USERS)
{
@Override
@@ -58,12 +58,12 @@ public class Index extends BasePage
RolesSession session = (RolesSession)Session.get();
session.setUser(user);
}
- }.add(new Label("userId", new Model<User>(user))));
+ }.add(new Label("userId", new Model<>(user))));
}
});
// pages that are protected using wicket meta data
- add(new BookmarkablePageLink<Void>("adminBookmarkableLink", AdminBookmarkablePage.class));
+ add(new BookmarkablePageLink<>("adminBookmarkableLink", AdminBookmarkablePage.class));
add(new Link("adminInternalLink")
{
@Override
@@ -72,7 +72,7 @@ public class Index extends BasePage
setResponsePage(new AdminInternalPage("foo"));
}
});
- add(new BookmarkablePageLink<Void>("panelsPageLink", PanelsPage.class));
+ add(new BookmarkablePageLink<>("panelsPageLink", PanelsPage.class));
// pages that are protected using annotations
add(new BookmarkablePageLink<Void>("adminAnnotBookmarkableLink",
@@ -85,6 +85,6 @@ public class Index extends BasePage
setResponsePage(new AdminAnnotationsInternalPage("bar"));
}
});
- add(new BookmarkablePageLink<Void>("panelsAnnotPageLink", AnnotationsPanelsPage.class));
+ add(new BookmarkablePageLink<>("panelsAnnotPageLink", AnnotationsPanelsPage.class));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.java
index 8560738..8618b1b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.java
@@ -36,14 +36,14 @@ public class BeanValidationPage extends WicketExamplePage
{
add(new FeedbackPanel("feedback"));
- Form<?> form = new Form<Void>("form");
+ Form<?> form = new Form<>("form");
add(form);
- form.add(new TextField<String>("name", new PropertyModel<String>(this, "person.name")).add(new PropertyValidator<String>()));
- form.add(new TextField<String>("phone", new PropertyModel<String>(this, "person.phone")).add(new PropertyValidator<String>()));
- form.add(new TextField<String>("email", new PropertyModel<String>(this, "person.email")).add(new PropertyValidator<String>()));
+ form.add(new TextField<String>("name", new PropertyModel<String>(this, "person.name")).add(new PropertyValidator<>()));
+ form.add(new TextField<String>("phone", new PropertyModel<String>(this, "person.phone")).add(new PropertyValidator<>()));
+ form.add(new TextField<String>("email", new PropertyModel<String>(this, "person.email")).add(new PropertyValidator<>()));
form.add(new DateTextField("birthdate", new PropertyModel<Date>(this, "person.birthdate"),
- new StyleDateConverter("S-", true)).add(new PropertyValidator<String>()));
+ new StyleDateConverter("S-", true)).add(new PropertyValidator<>()));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java b/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java
index 1b3eb5a..1b8e044 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java
@@ -116,7 +116,7 @@ public class Captcha extends WicketExamplePage
{
final FeedbackPanel feedback = new FeedbackPanel("feedback");
add(feedback);
- add(new CaptchaForm<Void>("captchaForm"));
+ add(new CaptchaForm<>("captchaForm"));
}
private String getPassword()
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage2.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage2.java b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage2.java
index df175f8..b7e6363 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage2.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage2.java
@@ -34,7 +34,7 @@ public class ConversationPage2 extends CdiExamplePage
add(new IncrementLink("increment"));
- add(new BookmarkablePageLink<Void>("next", ConversationPage3.class));
+ add(new BookmarkablePageLink<>("next", ConversationPage3.class));
}
private class IncrementLink extends Link<Void> {
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java
index df11056..8133b41 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java
@@ -77,6 +77,6 @@ public class BookmarkablePage extends WebPage
// Add a link back. We did not hold any important instance data in
// BookMarkabelPageLinkPage,
// so navigating to a new instance is just fine
- add(new BookmarkablePageLink<Void>("navigateBackLink", BookmarkablePageLinkPage.class));
+ add(new BookmarkablePageLink<>("navigateBackLink", BookmarkablePageLinkPage.class));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java
index 7bd6e40..48287c7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java
@@ -39,7 +39,7 @@ public class BookmarkablePageLinkPage extends WicketExamplePage
// Here, we add a link to a bookmarkable page without passing any
// parameters
- add(new BookmarkablePageLink<Void>("pageLinkNoArgs", BookmarkablePage.class));
+ add(new BookmarkablePageLink<>("pageLinkNoArgs", BookmarkablePage.class));
// And here, we add a link to a bookmarkable page with passing a
// parameter that holds
@@ -49,7 +49,7 @@ public class BookmarkablePageLinkPage extends WicketExamplePage
PageParameters parameters = new PageParameters();
parameters.set("message",
"This message was passed as a page parameter argument");
- add(new BookmarkablePageLink<Void>("pageLinkWithArgs", BookmarkablePage.class, parameters));
+ add(new BookmarkablePageLink<>("pageLinkWithArgs", BookmarkablePage.class, parameters));
}
/**
@@ -62,7 +62,7 @@ public class BookmarkablePageLinkPage extends WicketExamplePage
String code = " // Note that any arguments are passed as request parameters, and should thus be strings\n"
+ " PageParameters parameters = new PageParameters();\n"
+ " parameters.put(\"message\", \"This message was passed as a page parameter argument\");\n"
- + " add(new BookmarkablePageLink<Void>(\"pageLinkWithArgs\", BookmarkablePage.class, parameters));";
+ + " add(new BookmarkablePageLink<>(\"pageLinkWithArgs\", BookmarkablePage.class, parameters));";
add(new ExplainPanel(html, code));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.java
index 6f0d2be..1b20884 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.java
@@ -50,7 +50,7 @@ public class CheckBoxMultipleChoicePage extends WicketExamplePage
public CheckBoxMultipleChoicePage()
{
final Input input = new Input();
- setDefaultModel(new CompoundPropertyModel<Input>(input));
+ setDefaultModel(new CompoundPropertyModel<>(input));
// Add a FeedbackPanel for displaying our messages
FeedbackPanel feedbackPanel = new FeedbackPanel("feedback");
@@ -82,10 +82,10 @@ public class CheckBoxMultipleChoicePage extends WicketExamplePage
private static class Input implements IClusterable
{
/** the selected sites. */
- public List<String> sites = new ArrayList<String>();
+ public List<String> sites = new ArrayList<>();
/** the selected choices. */
- public List<String> choices = new ArrayList<String>();
+ public List<String> choices = new ArrayList<>();
/** adds pre-selected items to the choices list */
public Input()
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.java
index 83f6fc8..ebfbc55 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.java
@@ -37,7 +37,7 @@ public class CheckBoxPage extends WicketExamplePage
public CheckBoxPage()
{
final Input input = new Input();
- setDefaultModel(new CompoundPropertyModel<Input>(input));
+ setDefaultModel(new CompoundPropertyModel<>(input));
// Add a FeedbackPanel for displaying our messages
FeedbackPanel feedbackPanel = new FeedbackPanel("feedback");
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.java
index 8a78289..d0427f4 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.java
@@ -48,15 +48,15 @@ public class CheckBoxSelectorPage extends WicketExamplePage
{
super(parameters);
- final Form<?> form = new Form<Void>("form");
+ final Form<?> form = new Form<>("form");
add(form);
final CheckGroup<Integer> checkgroup = new CheckGroup<Integer>("checkgroup", Arrays.asList(
1, 2, 3, 4));
form.add(checkgroup);
- checkgroup.add(new Check<Integer>("check1", Model.of(1)));
- checkgroup.add(new Check<Integer>("check2", Model.of(2)));
- checkgroup.add(new Check<Integer>("check3", Model.of(3)));
- checkgroup.add(new Check<Integer>("check4", Model.of(4)));
+ checkgroup.add(new Check<>("check1", Model.of(1)));
+ checkgroup.add(new Check<>("check2", Model.of(2)));
+ checkgroup.add(new Check<>("check3", Model.of(3)));
+ checkgroup.add(new Check<>("check4", Model.of(4)));
// one selector inside the checkgroup...
checkgroup.add(new CheckGroupSelector("groupSelector")
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.java
index 83eec71..7da2851 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.java
@@ -42,7 +42,7 @@ public class CheckGroupPage extends WicketExamplePage
*/
public CheckGroupPage()
{
- final CheckGroup<Person> group = new CheckGroup<Person>("group", new ArrayList<Person>());
+ final CheckGroup<Person> group = new CheckGroup<>("group", new ArrayList<Person>());
Form<?> form = new Form("form")
{
@Override
@@ -64,9 +64,9 @@ public class CheckGroupPage extends WicketExamplePage
@Override
protected void populateItem(ListItem<Person> item)
{
- item.add(new Check<Person>("checkbox", item.getModel()));
+ item.add(new Check<>("checkbox", item.getModel()));
item.add(new Label("name",
- new PropertyModel<String>(item.getDefaultModel(), "name")));
+ new PropertyModel<>(item.getDefaultModel(), "name")));
item.add(new Label("lastName", new PropertyModel<String>(item.getDefaultModel(),
"lastName")));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.java
index 3d8d132..f098b87 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.java
@@ -42,8 +42,8 @@ public class CheckGroupPage2 extends WicketExamplePage
*/
public CheckGroupPage2()
{
- final CheckGroup<Person> group = new CheckGroup<Person>("group", new ArrayList<Person>());
- final CheckGroup<Person> group2 = new CheckGroup<Person>("group2", new ArrayList<Person>());
+ final CheckGroup<Person> group = new CheckGroup<>("group", new ArrayList<Person>());
+ final CheckGroup<Person> group2 = new CheckGroup<>("group2", new ArrayList<Person>());
Form<?> form = new Form<Void>("form")
{
@Override
@@ -67,10 +67,10 @@ public class CheckGroupPage2 extends WicketExamplePage
@Override
protected void populateItem(ListItem<Person> item)
{
- item.add(new Check<Person>("checkbox", item.getModel(), group));
- item.add(new Check<Person>("checkbox2", item.getModel(), group2));
+ item.add(new Check<>("checkbox", item.getModel(), group));
+ item.add(new Check<>("checkbox2", item.getModel(), group2));
item.add(new Label("name",
- new PropertyModel<String>(item.getDefaultModel(), "name")));
+ new PropertyModel<>(item.getDefaultModel(), "name")));
item.add(new Label("lastName", new PropertyModel<String>(item.getDefaultModel(),
"lastName")));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ComponentReferenceApplication.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ComponentReferenceApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ComponentReferenceApplication.java
index a09b30f..4694650 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ComponentReferenceApplication.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ComponentReferenceApplication.java
@@ -33,7 +33,7 @@ public class ComponentReferenceApplication extends WicketExampleApplication
private static final List<Person> personsDB;
static
{
- personsDB = new ArrayList<Person>();
+ personsDB = new ArrayList<>();
personsDB.add(new Person("Fritz", "Fritzel"));
personsDB.add(new Person("Ghan", "Phariounimn"));
personsDB.add(new Person("Jan", "Klaasen"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
index f2c4e81..e581ae9 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
@@ -47,7 +47,7 @@ public class DropDownChoicePage extends WicketExamplePage
public DropDownChoicePage()
{
final Input input = new Input();
- setDefaultModel(new CompoundPropertyModel<Input>(input));
+ setDefaultModel(new CompoundPropertyModel<>(input));
// Add a FeedbackPanel for displaying our messages
FeedbackPanel feedbackPanel = new FeedbackPanel("feedback");
@@ -73,7 +73,7 @@ public class DropDownChoicePage extends WicketExamplePage
// represent this null with key: "id + '.null'". In this case, this is
// 'site.null'
// which can be found in DropDownChoicePage.properties
- form.add(new DropDownChoice<String>("site", SITES));
+ form.add(new DropDownChoice<>("site", SITES));
// Allthough the default behavior of displaying the string
// representations of the choices
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.java
index 40a88fd..c88de72 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.java
@@ -77,7 +77,7 @@ public class LinkPage extends WicketExamplePage
}
};
add(linkWithStateChange);
- linkWithStateChange.add(new Label("label", new PropertyModel<Integer>(count2, "count")));
+ linkWithStateChange.add(new Label("label", new PropertyModel<>(count2, "count")));
// we can attach Link components to any HTML tag we want. If it is an anchor (<a href...),
// the url to this component is put in the href attribute. For other components, a onclick
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.java
index 506c57e..cd563c7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.java
@@ -43,7 +43,7 @@ public class ListChoicePage extends WicketExamplePage
public ListChoicePage()
{
final Input input = new Input();
- setDefaultModel(new CompoundPropertyModel<Input>(input));
+ setDefaultModel(new CompoundPropertyModel<>(input));
// Add a FeedbackPanel for displaying our messages
FeedbackPanel feedbackPanel = new FeedbackPanel("feedback");
@@ -64,7 +64,7 @@ public class ListChoicePage extends WicketExamplePage
// designate the
// current selection, and that uses the SITES list for the available
// options.
- ListChoice<String> listChoice = new ListChoice<String>("site", SITES);
+ ListChoice<String> listChoice = new ListChoice<>("site", SITES);
listChoice.setMaxRows(4);
form.add(listChoice);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.java
index 6a5421c..550c20a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.java
@@ -49,7 +49,7 @@ public class ListMultipleChoicePage extends WicketExamplePage
public ListMultipleChoicePage()
{
final Input input = new Input();
- setDefaultModel(new CompoundPropertyModel<Input>(input));
+ setDefaultModel(new CompoundPropertyModel<>(input));
// Add a FeedbackPanel for displaying our messages
FeedbackPanel feedbackPanel = new FeedbackPanel("feedback");
@@ -72,7 +72,7 @@ public class ListMultipleChoicePage extends WicketExamplePage
// list for the available options.
// Note that our model here holds a Collection, as we need to store
// multiple values too
- ListMultipleChoice<String> listChoice = new ListMultipleChoice<String>("sites", SITES);
+ ListMultipleChoice<String> listChoice = new ListMultipleChoice<>("sites", SITES);
form.add(listChoice);
listChoice = new ListMultipleChoice<String>("choices", MANY_CHOICES)
@@ -93,10 +93,10 @@ public class ListMultipleChoicePage extends WicketExamplePage
private static class Input implements IClusterable
{
/** the selected sites. */
- public List<String> sites = new ArrayList<String>();
+ public List<String> sites = new ArrayList<>();
/** the selected choices. */
- public List<String> choices = new ArrayList<String>();
+ public List<String> choices = new ArrayList<>();
/** adds pre-selected items to the choices list */
public Input()
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MyPanel.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MyPanel.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MyPanel.java
index 2cdba26..0b7c495 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MyPanel.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MyPanel.java
@@ -42,14 +42,14 @@ class MyPanel extends Panel
add(new AnotherPanel("otherPanel"));
// create a list with sublists
- List<Object> l1 = new ArrayList<Object>();
+ List<Object> l1 = new ArrayList<>();
l1.add("test 1.1");
l1.add("test 1.2");
- List<Object> l2 = new ArrayList<Object>();
+ List<Object> l2 = new ArrayList<>();
l2.add("test 2.1");
l2.add("test 2.2");
l2.add("test 2.3");
- List<String> l3 = new ArrayList<String>();
+ List<String> l3 = new ArrayList<>();
l3.add("test 3.1");
l2.add(l3);
l2.add("test 2.4");
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.java
index 655bb25..cc5e081 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.java
@@ -44,10 +44,10 @@ public class PalettePage extends WicketExamplePage
public PalettePage()
{
List<Person> persons = ComponentReferenceApplication.getPersons();
- IChoiceRenderer<Person> renderer = new ChoiceRenderer<Person>("fullName", "fullName");
+ IChoiceRenderer<Person> renderer = new ChoiceRenderer<>("fullName", "fullName");
final Palette<Person> palette = new Palette<Person>("palette", new ListModel<Person>(
- new ArrayList<Person>()), new CollectionModel<Person>(persons), renderer, 10, true);
+ new ArrayList<Person>()), new CollectionModel<>(persons), renderer, 10, true);
Form<Void> form = new Form<Void>("form")
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.java
index 7ac408c..96945f2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.java
@@ -45,7 +45,7 @@ public class RadioChoicePage extends WicketExamplePage
public RadioChoicePage()
{
final Input input = new Input();
- setDefaultModel(new CompoundPropertyModel<Input>(input));
+ setDefaultModel(new CompoundPropertyModel<>(input));
// Add a FeedbackPanel for displaying our messages
final FeedbackPanel feedbackPanel = new FeedbackPanel("feedback");
@@ -67,7 +67,7 @@ public class RadioChoicePage extends WicketExamplePage
// designate the
// current selection, and that uses the SITES list for the available
// options.
- RadioChoice<String> sites = new RadioChoice<String>("site", SITES);
+ RadioChoice<String> sites = new RadioChoice<>("site", SITES);
sites.add(new AjaxFormChoiceComponentUpdatingBehavior()
{
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.java
index 47832ad..d88fe5e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.java
@@ -41,7 +41,7 @@ public class RadioGroupPage extends WicketExamplePage
public RadioGroupPage()
{
- final RadioGroup<Person> group = new RadioGroup<Person>("group", new Model<Person>());
+ final RadioGroup<Person> group = new RadioGroup<>("group", new Model<Person>());
Form<?> form = new Form("form")
{
@Override
@@ -61,9 +61,9 @@ public class RadioGroupPage extends WicketExamplePage
@Override
protected void populateItem(ListItem<Person> item)
{
- item.add(new Radio<Person>("radio", item.getModel()));
+ item.add(new Radio<>("radio", item.getModel()));
item.add(new Label("name",
- new PropertyModel<String>(item.getDefaultModel(), "name")));
+ new PropertyModel<>(item.getDefaultModel(), "name")));
item.add(new Label("lastName", new PropertyModel<String>(item.getDefaultModel(),
"lastName")));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.java
index 7320846..526a639 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.java
@@ -41,8 +41,8 @@ public class RadioGroupPage2 extends WicketExamplePage
public RadioGroupPage2()
{
- final RadioGroup<Person> group = new RadioGroup<Person>("group", new Model<Person>());
- final RadioGroup<Person> group2 = new RadioGroup<Person>("group2", new Model<Person>());
+ final RadioGroup<Person> group = new RadioGroup<>("group", new Model<Person>());
+ final RadioGroup<Person> group2 = new RadioGroup<>("group2", new Model<Person>());
Form<?> form = new Form<Void>("form")
{
@Override
@@ -64,10 +64,10 @@ public class RadioGroupPage2 extends WicketExamplePage
@Override
protected void populateItem(ListItem<Person> item)
{
- item.add(new Radio<Person>("radio", item.getModel(), group));
- item.add(new Radio<Person>("radio2", item.getModel(), group2));
+ item.add(new Radio<>("radio", item.getModel(), group));
+ item.add(new Radio<>("radio2", item.getModel(), group2));
item.add(new Label("name",
- new PropertyModel<String>(item.getDefaultModel(), "name")));
+ new PropertyModel<>(item.getDefaultModel(), "name")));
item.add(new Label("lastName", new PropertyModel<String>(item.getDefaultModel(),
"lastName")));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java
index 7ddb746..09edec3 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java
@@ -58,7 +58,7 @@ public class SelectPage extends WicketExamplePage
public SelectPage()
{
final Input input = new Input();
- setDefaultModel(new CompoundPropertyModel<Input>(input));
+ setDefaultModel(new CompoundPropertyModel<>(input));
// Add a FeedbackPanel for displaying our messages
FeedbackPanel feedbackPanel = new FeedbackPanel("feedback");
@@ -77,14 +77,14 @@ public class SelectPage extends WicketExamplePage
};
add(form);
- Select<String> site = new Select<String>("site");
+ Select<String> site = new Select<>("site");
form.add(site);
- site.add(new SelectOption<String>("site1", new Model<String>("tss")));
- site.add(new SelectOption<String>("site2", new Model<String>("jl")));
- site.add(new SelectOption<String>("site3", new Model<String>("sd")));
- site.add(new SelectOption<String>("site4", new Model<String>("bn")));
+ site.add(new SelectOption<>("site1", new Model<>("tss")));
+ site.add(new SelectOption<>("site2", new Model<>("jl")));
+ site.add(new SelectOption<>("site3", new Model<>("sd")));
+ site.add(new SelectOption<>("site4", new Model<>("bn")));
- Select<List<String>> choices = new Select<List<String>>("choices");
+ Select<List<String>> choices = new Select<>("choices");
form.add(choices);
IOptionRenderer<String> renderer = new IOptionRenderer<String>()
{
@@ -99,13 +99,13 @@ public class SelectPage extends WicketExamplePage
@Override
public IModel<String> getModel(String value)
{
- return new Model<String>(value);
+ return new Model<>(value);
}
};
IModel<Collection<? extends String>> model = new WildcardCollectionModel<String>(
MANY_CHOICES);
- choices.add(new SelectOptions<String>("manychoices", model, renderer));
+ choices.add(new SelectOptions<>("manychoices", model, renderer));
}
@@ -118,7 +118,7 @@ public class SelectPage extends WicketExamplePage
public String site = "sd";
/** the selected choices. */
- public List<String> choices = new ArrayList<String>();
+ public List<String> choices = new ArrayList<>();
/** adds pre-selected items to the choices list */
public Input()
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.java
index 23111d7..8baf818 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.java
@@ -46,13 +46,13 @@ public class TabbedPanelPage extends WicketExamplePage
*/
public TabbedPanelPage()
{
- setDefaultModel(new Model<String>("tabpanel"));
+ setDefaultModel(new Model<>("tabpanel"));
// create links used to switch between css variations
addCssSwitchingLinks();
// create a list of ITab objects used to feed the tabbed panel
- final List<ITab> tabs = new ArrayList<ITab>();
+ final List<ITab> tabs = new ArrayList<>();
tabs.add(new AbstractTab(new Model<String>("first tab"))
{
private static final long serialVersionUID = 1L;
@@ -91,7 +91,7 @@ public class TabbedPanelPage extends WicketExamplePage
// add the new tabbed panel, attribute modifier only used to switch
// between different css variations
- final TabbedPanel<ITab> tabbedPanel = new TabbedPanel<ITab>("tabs", tabs);
+ final TabbedPanel<ITab> tabbedPanel = new TabbedPanel<>("tabs", tabs);
tabbedPanel.add(AttributeModifier.replace("class", TabbedPanelPage.this.getDefaultModel()));
add(tabbedPanel);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.java
index 7f62045..9549844 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.java
@@ -37,7 +37,7 @@ public class TextAreaPage extends WicketExamplePage
public TextAreaPage()
{
final Input input = new Input();
- setDefaultModel(new CompoundPropertyModel<Input>(input));
+ setDefaultModel(new CompoundPropertyModel<>(input));
// Add a FeedbackPanel for displaying our messages
FeedbackPanel feedbackPanel = new FeedbackPanel("feedback");
@@ -55,7 +55,7 @@ public class TextAreaPage extends WicketExamplePage
add(form);
// add a text area component that uses Input's 'text' property.
- form.add(new TextArea<String>("text"));
+ form.add(new TextArea<>("text"));
}
/** Simple data class that acts as a model for the input fields. */
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java
index da1c2c3..3ed2bf7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java
@@ -50,7 +50,7 @@ public class TextFieldPage extends WicketExamplePage
// property model's actual object is an instance of 'Input', it will map
// to
// Input's 'text' property.
- setDefaultModel(new CompoundPropertyModel<Input>(input));
+ setDefaultModel(new CompoundPropertyModel<>(input));
// Add a FeedbackPanel for displaying our messages
FeedbackPanel feedbackPanel = new FeedbackPanel("feedback");
@@ -69,7 +69,7 @@ public class TextFieldPage extends WicketExamplePage
// add a simple text field that uses Input's 'text' property. Nothing
// can go wrong here
- form.add(new TextField<String>("text"));
+ form.add(new TextField<>("text"));
// here we add a text field that uses Input's 'integer' property.
// Something could go
@@ -94,7 +94,7 @@ public class TextFieldPage extends WicketExamplePage
// with key 'form.integer.IConverter'. Read more about how this works
// in the javadocs
// of AbstractValidator
- form.add(new TextField<Integer>("integer", Integer.class));
+ form.add(new TextField<>("integer", Integer.class));
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.java b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.java
index f61f4ee..97662cb 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.java
@@ -35,6 +35,6 @@ public class Index extends WicketExamplePage
// normal link instead of an autolink as it looks a bit weird to refer
// to PageWithCustomLoading.html while the template has got a very
// different name (CustomLoadedTemplate.html)
- add(new BookmarkablePageLink<Void>("customLoadingPageLink", PageWithCustomLoading.class));
+ add(new BookmarkablePageLink<>("customLoadingPageLink", PageWithCustomLoading.class));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java
index ad7bf26..b2b7edf 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java
@@ -88,7 +88,7 @@ public class DatesPage extends WicketExamplePage
@Override
public List<Locale> getObject()
{
- List<Locale> locales = new ArrayList<Locale>(LOCALES);
+ List<Locale> locales = new ArrayList<>(LOCALES);
Collections.sort(locales, new Comparator<Locale>()
{
@Override
@@ -102,7 +102,7 @@ public class DatesPage extends WicketExamplePage
}
});
setChoiceRenderer(new LocaleChoiceRenderer());
- setDefaultModel(new PropertyModel<Locale>(DatesPage.this, "selectedLocale"));
+ setDefaultModel(new PropertyModel<>(DatesPage.this, "selectedLocale"));
}
/**
@@ -148,7 +148,7 @@ public class DatesPage extends WicketExamplePage
public DatesPage()
{
selectedLocale = Session.get().getLocale();
- Form<?> localeForm = new Form<Void>("localeForm");
+ Form<?> localeForm = new Form<>("localeForm");
localeForm.add(new LocaleDropDownChoice("localeSelect"));
localeForm.add(new Link("localeUSLink")
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.java b/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.java
index f21e2de..bdb837c 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.java
@@ -39,7 +39,7 @@ public class Echo extends WicketExamplePage
{
// This model references the page's message property and is
// shared by the label and form component
- PropertyModel<String> messageModel = new PropertyModel<String>(this, "message");
+ PropertyModel<String> messageModel = new PropertyModel<>(this, "message");
// The label displays the currently set message
add(new Label("msg", messageModel));
@@ -48,7 +48,7 @@ public class Echo extends WicketExamplePage
// else with this form as the shared model is automatically updated
// on form submits
Form<?> form = new Form("form");
- form.add(new TextField<String>("msgInput", messageModel));
+ form.add(new TextField<>("msgInput", messageModel));
add(form);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.java
index 8183b51..839f3b2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.java
@@ -30,6 +30,6 @@ public abstract class BasePage extends WicketExamplePage
*/
public BasePage()
{
- add(new BookmarkablePageLink<Void>("back", IndexPage.class).setAutoEnable(true));
+ add(new BookmarkablePageLink<>("back", IndexPage.class).setAutoEnable(true));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/events/DecoupledAjaxUpdatePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/events/DecoupledAjaxUpdatePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/events/DecoupledAjaxUpdatePage.java
index fb704ba..5e2e4b5 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/events/DecoupledAjaxUpdatePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/events/DecoupledAjaxUpdatePage.java
@@ -48,7 +48,7 @@ public class DecoupledAjaxUpdatePage extends BasePage
container.add(new CounterLabel("label2"));
// add a form
- Form<?> form = new Form<Void>("form");
+ Form<?> form = new Form<>("form");
add(form);
// add the textfield that will update the counter value
@@ -113,7 +113,7 @@ public class DecoupledAjaxUpdatePage extends BasePage
*/
public CounterLabel(String id)
{
- super(id, new PropertyModel<Integer>(DecoupledAjaxUpdatePage.this, "counter"));
+ super(id, new PropertyModel<>(DecoupledAjaxUpdatePage.this, "counter"));
setOutputMarkupId(true);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
index aed65e0..9cbc294 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
@@ -73,7 +73,7 @@ public class FormInput extends WicketExamplePage
@SuppressWarnings("serial")
public InputForm(String name)
{
- super(name, new CompoundPropertyModel<FormInputModel>(new FormInputModel()));
+ super(name, new CompoundPropertyModel<>(new FormInputModel()));
// Dropdown for selecting locale
add(new LocaleDropDownChoice("localeSelect"));
@@ -90,15 +90,15 @@ public class FormInput extends WicketExamplePage
});
add(new TextField<String>("stringProperty").setRequired(true).setLabel(
- new Model<String>("String")));
+ new Model<>("String")));
- add(new TextField<Integer>("integerProperty", Integer.class).setRequired(true).add(
- new RangeValidator<Integer>(1, Integer.MAX_VALUE)));
+ add(new TextField<>("integerProperty", Integer.class).setRequired(true).add(
+ new RangeValidator<>(1, Integer.MAX_VALUE)));
- add(new TextField<Double>("doubleProperty", Double.class).setRequired(true));
+ add(new TextField<>("doubleProperty", Double.class).setRequired(true));
add(new TextField<Integer>("integerInRangeProperty").setRequired(true).add(
- new RangeValidator<Integer>(0, 100)));
+ new RangeValidator<>(0, 100)));
add(new CheckBox("booleanProperty"));
add(new Multiply("multiply"));
@@ -108,19 +108,19 @@ public class FormInput extends WicketExamplePage
// just for fun, add a border so that our result will be displayed as '[ x ]'
multiplyLabel.add(new BeforeAndAfterBorder());
add(multiplyLabel);
- RadioChoice<String> rc = new RadioChoice<String>("numberRadioChoice", NUMBERS).setSuffix("");
- rc.setLabel(new Model<String>("number"));
+ RadioChoice<String> rc = new RadioChoice<>("numberRadioChoice", NUMBERS).setSuffix("");
+ rc.setLabel(new Model<>("number"));
rc.setRequired(true);
add(rc);
- RadioGroup<String> group = new RadioGroup<String>("numbersGroup");
+ RadioGroup<String> group = new RadioGroup<>("numbersGroup");
add(group);
ListView<String> persons = new ListView<String>("numbers", NUMBERS)
{
@Override
protected void populateItem(ListItem<String> item)
{
- Radio<String> radio = new Radio<String>("radio", item.getModel());
+ Radio<String> radio = new Radio<>("radio", item.getModel());
radio.setLabel(item.getModel());
item.add(radio);
item.add(new SimpleFormComponentLabel("number", radio));
@@ -128,14 +128,14 @@ public class FormInput extends WicketExamplePage
}.setReuseItems(true);
group.add(persons);
- CheckGroup<String> checks = new CheckGroup<String>("numbersCheckGroup");
+ CheckGroup<String> checks = new CheckGroup<>("numbersCheckGroup");
add(checks);
ListView<String> checksList = new ListView<String>("numbers", NUMBERS)
{
@Override
protected void populateItem(ListItem<String> item)
{
- Check<String> check = new Check<String>("check", item.getModel());
+ Check<String> check = new Check<>("check", item.getModel());
check.setLabel(item.getModel());
item.add(check);
item.add(new SimpleFormComponentLabel("number", check));
@@ -143,7 +143,7 @@ public class FormInput extends WicketExamplePage
}.setReuseItems(true);
checks.add(checksList);
- add(new ListMultipleChoice<String>("siteSelection", SITES));
+ add(new ListMultipleChoice<>("siteSelection", SITES));
// TextField using a custom converter.
add(new TextField<URL>("urlProperty", URL.class)
@@ -173,7 +173,7 @@ public class FormInput extends WicketExamplePage
if (UsPhoneNumber.class.isAssignableFrom(type))
{
// US telephone number mask
- return new MaskConverter<C>("(###) ###-####", UsPhoneNumber.class);
+ return new MaskConverter<>("(###) ###-####", UsPhoneNumber.class);
}
else
{
@@ -231,7 +231,7 @@ public class FormInput extends WicketExamplePage
// add a text field that works on each list item model (returns
// objects of
// type FormInputModel.Line) using property text.
- item.add(new TextField<String>("lineEdit", new PropertyModel<String>(
+ item.add(new TextField<>("lineEdit", new PropertyModel<String>(
item.getDefaultModel(), "text")));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java
index 7c06da3..621ff12 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java
@@ -85,14 +85,14 @@ public final class FormInputModel implements IClusterable
private Double doubleProperty = 20.5;
private Integer integerInRangeProperty = 50;
private Integer integerProperty = 100;
- private List<Line> lines = new ArrayList<Line>();
+ private List<Line> lines = new ArrayList<>();
private Integer multiply = 0;
private String numberRadioChoice = FormInput.NUMBERS.get(0);
- private final List<String> numbersCheckGroup = new ArrayList<String>();
+ private final List<String> numbersCheckGroup = new ArrayList<>();
private String numbersGroup;
/** US phone number with mask '(###) ###-####'. */
private UsPhoneNumber phoneNumberUS = new UsPhoneNumber("(123) 456-1234");
- private Set<String> siteSelection = new HashSet<String>();
+ private Set<String> siteSelection = new HashSet<>();
private String stringProperty = "test";
private URL urlProperty;
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/Multiply.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/Multiply.java b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/Multiply.java
index 25f85a0..7b180af 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/Multiply.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/Multiply.java
@@ -104,8 +104,8 @@ public class Multiply extends FormComponentPanel<Integer>
private void init()
{
- add(left = new TextField<Integer>("left", new PropertyModel<Integer>(this, "lhs")));
- add(right = new TextField<Integer>("right", new PropertyModel<Integer>(this, "rhs")));
+ add(left = new TextField<>("left", new PropertyModel<Integer>(this, "lhs")));
+ add(right = new TextField<>("right", new PropertyModel<Integer>(this, "rhs")));
left.setRequired(true);
right.setRequired(true);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java
index fd5ee55..afac0a6 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java
@@ -93,7 +93,7 @@ public class LeftFrame extends WebPage
{
add(new ChangeFramePageLink("linkToPage1", index, Page1.class));
add(new ChangeFramePageLink("linkToPage2", index, Page2.class));
- BookmarkablePageLink<?> link = new BookmarkablePageLink<Void>("directLink", Home.class);
+ BookmarkablePageLink<?> link = new BookmarkablePageLink<>("directLink", Home.class);
add(link);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java b/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java
index 9340203..a83342b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java
@@ -45,7 +45,7 @@ import org.apache.wicket.util.value.ValueMap;
public final class GuestBook extends WicketExamplePage
{
/** A global list of all comments from all users across all sessions */
- private static final List<Comment> commentList = new ArrayList<Comment>();
+ private static final List<Comment> commentList = new ArrayList<>();
/**
* Constructor that is invoked when page is invoked without a session.
@@ -83,16 +83,16 @@ public final class GuestBook extends WicketExamplePage
public CommentForm(final String id)
{
// Construct form with no validation listener
- super(id, new CompoundPropertyModel<ValueMap>(new ValueMap()));
+ super(id, new CompoundPropertyModel<>(new ValueMap()));
// this is just to make the unit test happy
setMarkupId("commentForm");
// Add text entry widget
- add(new TextArea<String>("text").setType(String.class));
+ add(new TextArea<>("text").setType(String.class));
// Add simple automated spam prevention measure.
- add(new TextField<String>("comment").setType(String.class));
+ add(new TextField<>("comment").setType(String.class));
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Game.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Game.java b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Game.java
index 799ec25..fdd85ad 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Game.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Game.java
@@ -39,7 +39,7 @@ public class Game implements IClusterable
private int guessesRemaining;
/** The letters */
- private final List<Letter> letters = new ArrayList<Letter>();
+ private final List<Letter> letters = new ArrayList<>();
/** The word being guessed by the user */
private Word word;
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java
index 8ce9dee..47cdfc3 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java
@@ -40,7 +40,7 @@ public class Guess extends HangmanPage
public Guess()
{
// Components for displaying the guesses remaining & the hangman
- add(new Label("guessesRemaining", new PropertyModel<Integer>(getGame(), "guessesRemaining")));
+ add(new Label("guessesRemaining", new PropertyModel<>(getGame(), "guessesRemaining")));
// Components for displaying the current word
add(new Label("word", new Model<String>()
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java
index 258cda5..519d0c2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java
@@ -46,6 +46,6 @@ public class Home extends HangmanPage
{
getGame().newGame(5, new WordGenerator(new String[] { word }));
}
- add(new BookmarkablePageLink<Void>("start", Guess.class));
+ add(new BookmarkablePageLink<>("start", Guess.class));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Word.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Word.java b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Word.java
index d78ae92..a46ae78 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Word.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Word.java
@@ -30,7 +30,7 @@ import org.apache.wicket.util.io.IClusterable;
public class Word implements IClusterable
{
/** The word */
- final List<Letter> letters = new ArrayList<Letter>();
+ final List<Letter> letters = new ArrayList<>();
/**
* Constructor
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java
index 670cc48..d21f242 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java
@@ -76,7 +76,7 @@ public final class Home extends WicketExamplePage
add(new Image("image3", new CircleDynamicImageResource(100, 100)));
// Simple model
- add(new Image("image4", new Model<String>("Image2.gif")));
+ add(new Image("image4", new Model<>("Image2.gif")));
// Dynamically created buffered image
add(new Image("image5", getImage5Resource()));
@@ -88,7 +88,7 @@ public final class Home extends WicketExamplePage
add(new Image("cancelButton", new SharedResourceReference("cancelButton")));
// image loaded as resource ref via model.
- add(new Image("imageModelResourceReference", new Model<ResourceReference>(RESOURCE_REF)));
+ add(new Image("imageModelResourceReference", new Model<>(RESOURCE_REF)));
// image loaded as resource via model.
add(new Image("imageModelResource", new Model<CircleDynamicImageResource>(
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java b/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java
index c5a30df..fcd2788 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java
@@ -53,7 +53,7 @@ public final class Book implements IClusterable
public static final WritingStyle BAD = new WritingStyle("bad");
private static long nextId = 0;
- private static final Map<Long, Book> idToBook = new HashMap<Long, Book>();
+ private static final Map<Long, Book> idToBook = new HashMap<>();
static
{
@@ -68,7 +68,7 @@ public final class Book implements IClusterable
private Book companionBook;
private Book relatedBook;
private boolean isFiction;
- private List<WritingStyle> writingStyles = new ArrayList<WritingStyle>();
+ private List<WritingStyle> writingStyles = new ArrayList<>();
/**
* Constructor
[06/20] git commit: Java 7 diamonds for wicket-spring
Posted by mg...@apache.org.
Java 7 diamonds for wicket-spring
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/747f933e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/747f933e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/747f933e
Branch: refs/heads/master
Commit: 747f933ee4eb0630654c3e0678635c8c0be1ef97
Parents: ae1a126
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 14:57:20 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:38 2013 +0200
----------------------------------------------------------------------
.../spring/injection/annot/AnnotProxyFieldValueFactory.java | 2 +-
.../apache/wicket/spring/test/ApplicationContextMock.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/747f933e/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
index 3d219da..648d2c7 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
@@ -241,7 +241,7 @@ public class AnnotProxyFieldValueFactory implements IFieldValueFactory
{
if (ctx instanceof AbstractApplicationContext)
{
- List<String> primaries = new ArrayList<String>();
+ List<String> primaries = new ArrayList<>();
for (String name : names)
{
BeanDefinition beanDef = getBeanDefinition(
http://git-wip-us.apache.org/repos/asf/wicket/blob/747f933e/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java b/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
index fb26d2e..a38c18b 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
@@ -54,7 +54,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
{
private static final long serialVersionUID = 1L;
- private final Map<String, Object> beans = new HashMap<String, Object>();
+ private final Map<String, Object> beans = new HashMap<>();
/**
* puts bean with the given name into the context
@@ -118,7 +118,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
@SuppressWarnings({ "unchecked" })
public <T> Map<String, T> getBeansOfType(Class<T> type) throws BeansException
{
- final Map<String, T> found = new HashMap<String, T>();
+ final Map<String, T> found = new HashMap<>();
for (Entry<String, Object> entry : beans.entrySet())
{
@@ -155,7 +155,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
public Map<String, Object> getBeansWithAnnotation(Class<? extends Annotation> annotationType)
throws BeansException
{
- final Map<String, Object> found = new HashMap<String, Object>();
+ final Map<String, Object> found = new HashMap<>();
for (Entry<String, Object> entry : beans.entrySet())
{
@@ -273,7 +273,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
@SuppressWarnings({ "unchecked" })
public String[] getBeanNamesForType(final Class type)
{
- ArrayList<String> names = new ArrayList<String>();
+ ArrayList<String> names = new ArrayList<>();
for (Entry<String, Object> entry : beans.entrySet())
{
Object bean = entry.getValue();
[16/20] git commit: Java 7 diamonds in wicket-util
Posted by mg...@apache.org.
Java 7 diamonds in wicket-util
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1d6d597c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1d6d597c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1d6d597c
Branch: refs/heads/master
Commit: 1d6d597c1aa57ca27b0b4d9b337ad4849b093ab1
Parents: b59bb76
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 14:47:19 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:38 2013 +0200
----------------------------------------------------------------------
.../main/java/org/apache/wicket/util/ValueProvider.java | 2 +-
.../apache/wicket/util/collections/ClassMetaCache.java | 2 +-
.../wicket/util/collections/ConcurrentHashSet.java | 10 +++++-----
.../org/apache/wicket/util/collections/IntHashMap.java | 4 ++--
.../org/apache/wicket/util/collections/MultiMap.java | 2 +-
.../convert/converter/AbstractDecimalConverter.java | 2 +-
.../convert/converter/AbstractIntegerConverter.java | 2 +-
.../main/java/org/apache/wicket/util/diff/Chunk.java | 4 ++--
.../src/main/java/org/apache/wicket/util/diff/Diff.java | 4 ++--
.../main/java/org/apache/wicket/util/diff/Revision.java | 4 ++--
.../main/java/org/apache/wicket/util/diff/ToString.java | 2 +-
.../main/java/org/apache/wicket/util/file/Folder.java | 2 +-
.../java/org/apache/wicket/util/file/WebXmlFile.java | 6 +++---
.../apache/wicket/util/io/ByteArrayOutputStream.java | 2 +-
.../org/apache/wicket/util/lang/EnumeratedType.java | 2 +-
.../java/org/apache/wicket/util/lang/Exceptions.java | 2 +-
.../main/java/org/apache/wicket/util/lang/Generics.java | 12 ++++++------
.../main/java/org/apache/wicket/util/lang/Threads.java | 2 +-
.../util/license/ApacheLicenseHeaderTestCase.java | 4 ++--
.../apache/wicket/util/listener/ListenerCollection.java | 4 ++--
.../wicket/util/markup/xhtml/WellFormedXmlTestCase.java | 2 +-
.../util/parse/metapattern/parsers/ListParser.java | 2 +-
.../apache/wicket/util/string/AbstractStringList.java | 2 +-
.../java/org/apache/wicket/util/string/StringList.java | 4 ++--
.../java/org/apache/wicket/util/string/Strings.java | 4 ++--
.../main/java/org/apache/wicket/util/time/TimeMap.java | 2 +-
.../org/apache/wicket/util/upload/ParameterParser.java | 10 +++++-----
.../main/java/org/apache/wicket/util/visit/Visits.java | 8 ++++----
.../apache/wicket/util/xml/CustomEntityResolver.java | 2 +-
.../java/org/apache/wicket/util/LongEncoderTest.java | 2 +-
.../apache/wicket/util/collections/MicroMapTest.java | 2 +-
.../org/apache/wicket/util/collections/MiniMapTest.java | 2 +-
.../util/collections/MostRecentlyUsedMapTest.java | 2 +-
.../util/collections/ReverseListIteratorTest.java | 2 +-
.../org/apache/wicket/util/string/StringListTest.java | 4 ++--
.../string/interpolator/VariableInterpolatorTest.java | 8 ++++----
36 files changed, 66 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/ValueProvider.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/ValueProvider.java b/wicket-util/src/main/java/org/apache/wicket/util/ValueProvider.java
index cefd47a..c49662f 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/ValueProvider.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/ValueProvider.java
@@ -55,6 +55,6 @@ public class ValueProvider<T> implements IProvider<T>
*/
public static <T> ValueProvider<T> of(final T value)
{
- return new ValueProvider<T>(value);
+ return new ValueProvider<>(value);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/collections/ClassMetaCache.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/collections/ClassMetaCache.java b/wicket-util/src/main/java/org/apache/wicket/util/collections/ClassMetaCache.java
index 230f5b1..25da5a3 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/collections/ClassMetaCache.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/collections/ClassMetaCache.java
@@ -92,7 +92,7 @@ public class ClassMetaCache<T>
container = cache.get(classLoader);
if (container == null)
{
- container = new ConcurrentHashMap<String, T>();
+ container = new ConcurrentHashMap<>();
/*
* don't write to current cache, copy instead
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java b/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java
index 3bc1e6c..c0e7578 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java
@@ -50,7 +50,7 @@ public class ConcurrentHashSet<E> extends AbstractSet<E>
*/
public ConcurrentHashSet()
{
- map = new ConcurrentHashMap<E, Object>();
+ map = new ConcurrentHashMap<>();
}
/**
@@ -65,7 +65,7 @@ public class ConcurrentHashSet<E> extends AbstractSet<E>
*/
public ConcurrentHashSet(final Collection<? extends E> c)
{
- map = new ConcurrentHashMap<E, Object>(Math.max((int)(c.size() / .75f) + 1, 16));
+ map = new ConcurrentHashMap<>(Math.max((int)(c.size() / .75f) + 1, 16));
addAll(c);
}
@@ -82,7 +82,7 @@ public class ConcurrentHashSet<E> extends AbstractSet<E>
*/
public ConcurrentHashSet(final int initialCapacity, final float loadFactor)
{
- map = new ConcurrentHashMap<E, Object>(initialCapacity, loadFactor, 16);
+ map = new ConcurrentHashMap<>(initialCapacity, loadFactor, 16);
}
/**
@@ -96,7 +96,7 @@ public class ConcurrentHashSet<E> extends AbstractSet<E>
*/
public ConcurrentHashSet(final int initialCapacity)
{
- map = new ConcurrentHashMap<E, Object>(initialCapacity);
+ map = new ConcurrentHashMap<>(initialCapacity);
}
/**
@@ -210,7 +210,7 @@ public class ConcurrentHashSet<E> extends AbstractSet<E>
{
inputStream.defaultReadObject();
- map = new ConcurrentHashMap<E, Object>();
+ map = new ConcurrentHashMap<>();
int size = inputStream.readInt();
for (int i = 0; i < size; i++)
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java b/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
index 299936a..139c814 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
@@ -740,7 +740,7 @@ public class IntHashMap<V> implements Cloneable, Serializable
*/
void addEntry(final int key, final V value, final int bucketIndex)
{
- table[bucketIndex] = new Entry<V>(key, value, table[bucketIndex]);
+ table[bucketIndex] = new Entry<>(key, value, table[bucketIndex]);
if (size++ >= threshold)
{
resize(2 * table.length);
@@ -760,7 +760,7 @@ public class IntHashMap<V> implements Cloneable, Serializable
*/
void createEntry(final int key, final V value, final int bucketIndex)
{
- table[bucketIndex] = new Entry<V>(key, value, table[bucketIndex]);
+ table[bucketIndex] = new Entry<>(key, value, table[bucketIndex]);
size++;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/collections/MultiMap.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/collections/MultiMap.java b/wicket-util/src/main/java/org/apache/wicket/util/collections/MultiMap.java
index ee7bd00..fe4d51b 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/collections/MultiMap.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/collections/MultiMap.java
@@ -89,7 +89,7 @@ public class MultiMap<K, V> extends HashMap<K, List<V>>
List<V> list = get(key);
if (list == null)
{
- list = new ArrayList<V>(1);
+ list = new ArrayList<>(1);
put(key, list);
}
list.add(value);
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDecimalConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDecimalConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDecimalConverter.java
index 50c1a0e..09485fa 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDecimalConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDecimalConverter.java
@@ -33,7 +33,7 @@ public abstract class AbstractDecimalConverter<N extends Number> extends Abstrac
private static final long serialVersionUID = 1L;
/** The date format to use */
- private final Map<Locale, NumberFormat> numberFormats = new ConcurrentHashMap<Locale, NumberFormat>();
+ private final Map<Locale, NumberFormat> numberFormats = new ConcurrentHashMap<>();
/**
* @param locale
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractIntegerConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractIntegerConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractIntegerConverter.java
index 5b3d864..88639c0 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractIntegerConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractIntegerConverter.java
@@ -31,7 +31,7 @@ public abstract class AbstractIntegerConverter<I extends Number> extends Abstrac
private static final long serialVersionUID = 1L;
/** The date format to use */
- private final ConcurrentHashMap<Locale, NumberFormat> numberFormats = new ConcurrentHashMap<Locale, NumberFormat>();
+ private final ConcurrentHashMap<Locale, NumberFormat> numberFormats = new ConcurrentHashMap<>();
/**
* @param locale
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/diff/Chunk.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/diff/Chunk.java b/wicket-util/src/main/java/org/apache/wicket/util/diff/Chunk.java
index f74d18e..f88f007 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/diff/Chunk.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/diff/Chunk.java
@@ -336,11 +336,11 @@ public class Chunk extends ToString
{
if (count <= 0)
{
- return new ArrayList<T>();
+ return new ArrayList<>();
}
else
{
- return new ArrayList<T>(seq.subList(pos, pos + count));
+ return new ArrayList<>(seq.subList(pos, pos + count));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/diff/Diff.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/diff/Diff.java b/wicket-util/src/main/java/org/apache/wicket/util/diff/Diff.java
index 049cfe4..75d983f 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/diff/Diff.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/diff/Diff.java
@@ -303,7 +303,7 @@ public class Diff extends ToString
*/
public static Object[] randomEdit(final Object[] text, final long seed)
{
- List<Object> result = new ArrayList<Object>(Arrays.asList(text));
+ List<Object> result = new ArrayList<>(Arrays.asList(text));
Random r = new Random(seed);
int nops = r.nextInt(10);
for (int i = 0; i < nops; i++)
@@ -349,7 +349,7 @@ public class Diff extends ToString
*/
public static Object[] shuffle(final Object[] text, final long seed)
{
- List<Object> result = new ArrayList<Object>(Arrays.asList(text));
+ List<Object> result = new ArrayList<>(Arrays.asList(text));
Collections.shuffle(result);
return result.toArray();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java b/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java
index 0de20c1..82d8662 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java
@@ -82,7 +82,7 @@ import java.util.ListIterator;
public class Revision extends ToString
{
- List<Delta> deltas_ = new LinkedList<Delta>();
+ List<Delta> deltas_ = new LinkedList<>();
/**
* Creates an empty Revision.
@@ -154,7 +154,7 @@ public class Revision extends ToString
*/
public Object[] patch(final Object[] src) throws PatchFailedException
{
- List<Object> target = new ArrayList<Object>(Arrays.asList(src));
+ List<Object> target = new ArrayList<>(Arrays.asList(src));
applyTo(target);
return target.toArray();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/diff/ToString.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/diff/ToString.java b/wicket-util/src/main/java/org/apache/wicket/util/diff/ToString.java
index d05ea14..994c0f2 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/diff/ToString.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/diff/ToString.java
@@ -106,7 +106,7 @@ public class ToString
public static String[] stringToArray(final String value)
{
BufferedReader reader = new BufferedReader(new StringReader(value));
- List<String> l = new LinkedList<String>();
+ List<String> l = new LinkedList<>();
String s;
try
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/file/Folder.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/file/Folder.java b/wicket-util/src/main/java/org/apache/wicket/util/file/Folder.java
index fccfac0..e8dfee6 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/file/Folder.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/file/Folder.java
@@ -193,7 +193,7 @@ public class Folder extends File
*/
public File[] getNestedFiles(final FileFilter filter)
{
- final List<File> files = new ArrayList<File>();
+ final List<File> files = new ArrayList<>();
files.addAll(Arrays.asList(getFiles(filter)));
final Folder[] folders = getFolders();
for (Folder folder : folders)
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/file/WebXmlFile.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/file/WebXmlFile.java b/wicket-util/src/main/java/org/apache/wicket/util/file/WebXmlFile.java
index 191dc02..2b73980 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/file/WebXmlFile.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/file/WebXmlFile.java
@@ -242,7 +242,7 @@ public class WebXmlFile
}
log.info(msg.toString());
}
- Set<String> stripped = new HashSet<String>(urlPatterns.size());
+ Set<String> stripped = new HashSet<>(urlPatterns.size());
for (String urlPattern : urlPatterns)
{
@@ -262,7 +262,7 @@ public class WebXmlFile
*/
private Set<String> getFilterPaths(final String filterName, final String name, final Node node)
{
- Set<String> paths = new HashSet<String>();
+ Set<String> paths = new HashSet<>();
String foundUrlPattern = null;
String foundFilterName = null;
@@ -309,7 +309,7 @@ public class WebXmlFile
private Set<String> getFilterPaths(final String filterName, final String mapping,
final String name, final NodeList nodeList)
{
- Set<String> paths = new HashSet<String>(1);
+ Set<String> paths = new HashSet<>(1);
for (int i = 0; i < nodeList.getLength(); ++i)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/io/ByteArrayOutputStream.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/io/ByteArrayOutputStream.java b/wicket-util/src/main/java/org/apache/wicket/util/io/ByteArrayOutputStream.java
index 22eb940..228c910 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/io/ByteArrayOutputStream.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/io/ByteArrayOutputStream.java
@@ -42,7 +42,7 @@ import java.util.List;
*/
public class ByteArrayOutputStream extends OutputStream
{
- private final List<byte[]> buffers = new java.util.ArrayList<byte[]>();
+ private final List<byte[]> buffers = new java.util.ArrayList<>();
private int count;
private byte[] currentBuffer;
private int currentBufferIndex;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java b/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java
index 01d7897..578ac40 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java
@@ -71,7 +71,7 @@ public abstract class EnumeratedType extends StringValue
if (valueList == null)
{
// create lazily
- valueList = new ArrayList<EnumeratedType>();
+ valueList = new ArrayList<>();
valueListByClass.put(c.getName(), valueList);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java b/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java
index 76c2235..cc67505 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java
@@ -125,7 +125,7 @@ public class Exceptions
*/
public static <T> T visit(final Throwable throwable, final IThrowableVisitor<T> visitor)
{
- Visit<T> visit = new Visit<T>();
+ Visit<T> visit = new Visit<>();
Throwable cursor = throwable;
while (cursor != null)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/lang/Generics.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/lang/Generics.java b/wicket-util/src/main/java/org/apache/wicket/util/lang/Generics.java
index 80f1c13..c3fb483 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/lang/Generics.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/lang/Generics.java
@@ -55,7 +55,7 @@ public class Generics
*/
public static <K, V> HashMap<K, V> newHashMap()
{
- return new HashMap<K, V>();
+ return new HashMap<>();
}
/**
@@ -69,7 +69,7 @@ public class Generics
*/
public static <K, V> HashMap<K, V> newHashMap(final int capacity)
{
- return new HashMap<K, V>(capacity);
+ return new HashMap<>(capacity);
}
/**
@@ -82,7 +82,7 @@ public class Generics
*/
public static <T> ArrayList<T> newArrayList(final int capacity)
{
- return new ArrayList<T>(capacity);
+ return new ArrayList<>(capacity);
}
/**
@@ -93,7 +93,7 @@ public class Generics
*/
public static <T> ArrayList<T> newArrayList()
{
- return new ArrayList<T>();
+ return new ArrayList<>();
}
/**
@@ -105,7 +105,7 @@ public class Generics
*/
public static <K, V> ConcurrentHashMap<K, V> newConcurrentHashMap()
{
- return new ConcurrentHashMap<K, V>();
+ return new ConcurrentHashMap<>();
}
/**
@@ -119,7 +119,7 @@ public class Generics
*/
public static <K, V> ConcurrentHashMap<K, V> newConcurrentHashMap(final int initialCapacity)
{
- return new ConcurrentHashMap<K, V>(initialCapacity);
+ return new ConcurrentHashMap<>(initialCapacity);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/lang/Threads.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/lang/Threads.java b/wicket-util/src/main/java/org/apache/wicket/util/lang/Threads.java
index fb5ddba..7f0ffdc 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/lang/Threads.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/lang/Threads.java
@@ -102,7 +102,7 @@ public class Threads
private static void dumpSingleThread(Logger logger, Thread thread, StackTraceElement[] trace)
{
- Map<CharSequence, Object> variables = new HashMap<CharSequence, Object>();
+ Map<CharSequence, Object> variables = new HashMap<>();
variables.put("name", thread.getName());
variables.put("isDaemon", thread.isDaemon() ? " daemon" : "");
variables.put("priority", thread.getPriority());
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java b/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
index 5d2c37d..45271c8 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
@@ -268,7 +268,7 @@ public abstract class ApacheLicenseHeaderTestCase extends Assert
new XmlPrologHeaderHandler(xmlPrologIgnore),
new CssLicenseHeaderHandler(cssIgnore), };
- final Map<ILicenseHeaderHandler, List<File>> badFiles = new HashMap<ILicenseHeaderHandler, List<File>>();
+ final Map<ILicenseHeaderHandler, List<File>> badFiles = new HashMap<>();
for (final ILicenseHeaderHandler licenseHeaderHandler : licenseHeaderHandlers)
{
@@ -287,7 +287,7 @@ public abstract class ApacheLicenseHeaderTestCase extends Assert
if (files == null)
{
- files = new ArrayList<File>();
+ files = new ArrayList<>();
badFiles.put(licenseHeaderHandler, files);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/listener/ListenerCollection.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/listener/ListenerCollection.java b/wicket-util/src/main/java/org/apache/wicket/util/listener/ListenerCollection.java
index 582dd0c..0d476bc 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/listener/ListenerCollection.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/listener/ListenerCollection.java
@@ -44,7 +44,7 @@ public abstract class ListenerCollection<T> implements Serializable, Iterable<T>
private static final Logger logger = LoggerFactory.getLogger(ListenerCollection.class);
/** list of listeners */
- private final List<T> listeners = new CopyOnWriteArrayList<T>();
+ private final List<T> listeners = new CopyOnWriteArrayList<>();
/**
* Adds a listener to this set of listeners.
@@ -137,7 +137,7 @@ public abstract class ListenerCollection<T> implements Serializable, Iterable<T>
*/
protected void reversedNotify(final INotifier<T> notifier)
{
- Iterator<T> it = new ReverseListIterator<T>(listeners);
+ Iterator<T> it = new ReverseListIterator<>(listeners);
while (it.hasNext())
{
T listener = it.next();
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java b/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
index 91f332f..ecdc856 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
@@ -136,7 +136,7 @@ public class WellFormedXmlTestCase
private static final EntityResolver entityResolver = new EntityResolver()
{
- private final Map<String, String> systemIdToUri = new HashMap<String, String>();
+ private final Map<String, String> systemIdToUri = new HashMap<>();
{
systemIdToUri.put("http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd",
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/ListParser.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/ListParser.java b/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/ListParser.java
index 653a649..9ffec85 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/ListParser.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/ListParser.java
@@ -39,7 +39,7 @@ public class ListParser extends MetaPatternParser
private final MetaPattern separatorPattern;
/** The list elements parsed */
- private final List<String> values = new ArrayList<String>();
+ private final List<String> values = new ArrayList<>();
/**
* Constructs a list parser from an entry MetaPattern, a separator MetaPattern and an input
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/string/AbstractStringList.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/AbstractStringList.java b/wicket-util/src/main/java/org/apache/wicket/util/string/AbstractStringList.java
index 00762f5..7725ca4 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/string/AbstractStringList.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/string/AbstractStringList.java
@@ -102,7 +102,7 @@ public abstract class AbstractStringList implements IStringSequence, Serializabl
final int size = size();
// Allocate list of exactly the right size
- final List<String> strings = new ArrayList<String>(size);
+ final List<String> strings = new ArrayList<>(size);
// Add strings to list
for (int i = 0; i < size; i++)
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/string/StringList.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/StringList.java b/wicket-util/src/main/java/org/apache/wicket/util/string/StringList.java
index 127f9e8..bc20076 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/string/StringList.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/string/StringList.java
@@ -209,7 +209,7 @@ public final class StringList extends AbstractStringList
*/
public StringList()
{
- strings = new ArrayList<String>();
+ strings = new ArrayList<>();
}
/**
@@ -220,7 +220,7 @@ public final class StringList extends AbstractStringList
*/
public StringList(final int size)
{
- strings = new ArrayList<String>(size);
+ strings = new ArrayList<>(size);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java b/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
index 81e96da..ddee80f 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
@@ -849,7 +849,7 @@ public final class Strings
{
return NO_STRINGS;
}
- final List<String> strings = new ArrayList<String>();
+ final List<String> strings = new ArrayList<>();
int pos = 0;
while (true)
{
@@ -1181,7 +1181,7 @@ public final class Strings
{
if (throwable != null)
{
- List<Throwable> al = new ArrayList<Throwable>();
+ List<Throwable> al = new ArrayList<>();
Throwable cause = throwable;
al.add(cause);
while ((cause.getCause() != null) && (cause != cause.getCause()))
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/time/TimeMap.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/time/TimeMap.java b/wicket-util/src/main/java/org/apache/wicket/util/time/TimeMap.java
index f667a59..0de939c 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/time/TimeMap.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/time/TimeMap.java
@@ -44,7 +44,7 @@ public final class TimeMap implements Serializable
* <code>Map</code> from <code>ITimeFrameSource</code> implementing objects to
* <code>Object</code> values.
*/
- private final Map<ITimeFrameSource, Object> sources = new ConcurrentHashMap<ITimeFrameSource, Object>();
+ private final Map<ITimeFrameSource, Object> sources = new ConcurrentHashMap<>();
/**
* Retrieves an <code>Object</code> for the current <code>Time</code> value.
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/upload/ParameterParser.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/upload/ParameterParser.java b/wicket-util/src/main/java/org/apache/wicket/util/upload/ParameterParser.java
index 215a6e8..c3b2163 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/upload/ParameterParser.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/upload/ParameterParser.java
@@ -244,7 +244,7 @@ public class ParameterParser
{
if ((separators == null) || (separators.length == 0))
{
- return new HashMap<String, String>();
+ return new HashMap<>();
}
char separator = separators[0];
if (str != null)
@@ -280,7 +280,7 @@ public class ParameterParser
{
if (str == null)
{
- return new HashMap<String, String>();
+ return new HashMap<>();
}
return parse(str.toCharArray(), separator);
}
@@ -300,7 +300,7 @@ public class ParameterParser
{
if (chars == null)
{
- return new HashMap<String, String>();
+ return new HashMap<>();
}
return parse(chars, 0, chars.length, separator);
}
@@ -326,9 +326,9 @@ public class ParameterParser
if (chars == null)
{
- return new HashMap<String, String>();
+ return new HashMap<>();
}
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
this.chars = chars;
pos = offset;
len = length;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java b/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
index 474d451..a3f7c7a 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
@@ -119,7 +119,7 @@ public class Visits
public static final <S, R> R visitChildren(final Iterable<? super S> container,
final IVisitor<S, R> visitor, final IVisitFilter filter)
{
- Visit<R> visit = new Visit<R>();
+ Visit<R> visit = new Visit<>();
visitChildren(container, visitor, filter, visit);
return visit.getResult();
}
@@ -137,7 +137,7 @@ public class Visits
// Is the child of the correct class (or was no class specified)?
if (filter.visitObject(child))
{
- Visit<R> childTraversal = new Visit<R>();
+ Visit<R> childTraversal = new Visit<>();
// Call visitor
S s = (S)child;
@@ -241,7 +241,7 @@ public class Visits
{
Args.notNull(visitor, "visitor");
- Visit<R> visit = new Visit<R>();
+ Visit<R> visit = new Visit<>();
visitPostOrderHelper(root, visitor, filter, visit);
return visit.getResult();
}
@@ -256,7 +256,7 @@ public class Visits
final Iterable<?> container = (Iterable<?>)component;
if (filter.visitChildren(container))
{
- Visit<R> childTraversal = new Visit<R>();
+ Visit<R> childTraversal = new Visit<>();
for (final Object child : ((Iterable<?>)component))
{
visitPostOrderHelper(child, visitor, filter, childTraversal);
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java b/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java
index 1d6b2c4..cb6f33d 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java
@@ -36,7 +36,7 @@ import org.xml.sax.SAXException;
*/
public class CustomEntityResolver implements EntityResolver
{
- private final Map<EntityKey, EntityLocator> entities = new HashMap<EntityKey, EntityLocator>(3);
+ private final Map<EntityKey, EntityLocator> entities = new HashMap<>(3);
/**
* get default instances of custom entity resolver with preloaded well-known entities
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/test/java/org/apache/wicket/util/LongEncoderTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/LongEncoderTest.java b/wicket-util/src/test/java/org/apache/wicket/util/LongEncoderTest.java
index 3819bed..c3731bb 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/LongEncoderTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/LongEncoderTest.java
@@ -35,7 +35,7 @@ public class LongEncoderTest
@Test
public void defaultAlphabet()
{
- Set<String> encoded = new HashSet<String>();
+ Set<String> encoded = new HashSet<>();
for (int i = -10000; i < 10000; i++)
{
String enc = LongEncoder.encode(i);
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/test/java/org/apache/wicket/util/collections/MicroMapTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/collections/MicroMapTest.java b/wicket-util/src/test/java/org/apache/wicket/util/collections/MicroMapTest.java
index 4618fd2..a26919b 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/collections/MicroMapTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/collections/MicroMapTest.java
@@ -40,7 +40,7 @@ public class MicroMapTest extends Assert
@Test
public void microMap()
{
- MicroMap<Object, Object> m = new MicroMap<Object, Object>();
+ MicroMap<Object, Object> m = new MicroMap<>();
m.put(FOO, BAR);
// Test .keySet();
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/test/java/org/apache/wicket/util/collections/MiniMapTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/collections/MiniMapTest.java b/wicket-util/src/test/java/org/apache/wicket/util/collections/MiniMapTest.java
index eea941d..ab0896d 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/collections/MiniMapTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/collections/MiniMapTest.java
@@ -40,7 +40,7 @@ public class MiniMapTest extends Assert
@Test
public void miniMap()
{
- MiniMap<Object, Object> m = new MiniMap<Object, Object>(3);
+ MiniMap<Object, Object> m = new MiniMap<>(3);
m.put(FOO, BAR);
// Test .keySet();
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/test/java/org/apache/wicket/util/collections/MostRecentlyUsedMapTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/collections/MostRecentlyUsedMapTest.java b/wicket-util/src/test/java/org/apache/wicket/util/collections/MostRecentlyUsedMapTest.java
index fbd3a07..8a95d73 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/collections/MostRecentlyUsedMapTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/collections/MostRecentlyUsedMapTest.java
@@ -34,7 +34,7 @@ public class MostRecentlyUsedMapTest
@Test
public void max2Entries()
{
- MostRecentlyUsedMap<String, String> map = new MostRecentlyUsedMap<String, String>(2);
+ MostRecentlyUsedMap<String, String> map = new MostRecentlyUsedMap<>(2);
assertEquals(0, map.size());
map.put("1", "one");
assertEquals(1, map.size());
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/test/java/org/apache/wicket/util/collections/ReverseListIteratorTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/collections/ReverseListIteratorTest.java b/wicket-util/src/test/java/org/apache/wicket/util/collections/ReverseListIteratorTest.java
index 2899cd4..4fa5695 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/collections/ReverseListIteratorTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/collections/ReverseListIteratorTest.java
@@ -34,7 +34,7 @@ public class ReverseListIteratorTest extends Assert
@Test
public void reverse()
{
- List<Integer> list = new ArrayList<Integer>();
+ List<Integer> list = new ArrayList<>();
for (int i = 0; i < 10; i++)
{
list.add(i);
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/test/java/org/apache/wicket/util/string/StringListTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/string/StringListTest.java b/wicket-util/src/test/java/org/apache/wicket/util/string/StringListTest.java
index a64ccb4..dfe46ab 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/string/StringListTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/string/StringListTest.java
@@ -42,7 +42,7 @@ public class StringListTest extends Assert
*/
private void checkValueOf(String[] inputs, int expectedNumber, String expectedString)
{
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
Object[] objects = new Object[inputs.length];
for (int i = 0; i < inputs.length; i++)
{
@@ -183,7 +183,7 @@ public class StringListTest extends Assert
isEmptyList(StringList.valueOf((String)null));
isEmptyList(StringList.valueOf((Object[])null));
isEmptyList(StringList.valueOf((String[])null));
- isEmptyList(StringList.valueOf(new ArrayList<Object>()));
+ isEmptyList(StringList.valueOf(new ArrayList<>()));
isEmptyList(StringList.valueOf(new Object[0]));
isEmptyList(StringList.valueOf(new String[0]));
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/test/java/org/apache/wicket/util/string/interpolator/VariableInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/string/interpolator/VariableInterpolatorTest.java b/wicket-util/src/test/java/org/apache/wicket/util/string/interpolator/VariableInterpolatorTest.java
index 412952d..67e4cf8 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/string/interpolator/VariableInterpolatorTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/string/interpolator/VariableInterpolatorTest.java
@@ -35,7 +35,7 @@ public class VariableInterpolatorTest extends Assert
@Test
public void withValue()
{
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
params.put("key", "value");
MapVariableInterpolator in = new MapVariableInterpolator("${key}", params);
assertEquals("value", in.toString());
@@ -47,7 +47,7 @@ public class VariableInterpolatorTest extends Assert
@Test
public void withoutValue()
{
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
MapVariableInterpolator in = new MapVariableInterpolator("${key}", params);
assertEquals("${key}", in.toString());
}
@@ -58,7 +58,7 @@ public class VariableInterpolatorTest extends Assert
@Test
public void withoutValueAndException()
{
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
MapVariableInterpolator in = new MapVariableInterpolator("${key}", params, true);
try
{
@@ -77,7 +77,7 @@ public class VariableInterpolatorTest extends Assert
@Test
public void literal()
{
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
params.put("key", "value");
MapVariableInterpolator in = new MapVariableInterpolator("aaa $${key} bbb", params);
assertEquals("aaa ${key} bbb", in.toString());
[20/20] git commit: Non functional changes
Posted by mg...@apache.org.
Non functional changes
fix typo
java 7 diamonds
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/eaa22123
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/eaa22123
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/eaa22123
Branch: refs/heads/master
Commit: eaa22123f6e169febff568d57cebf922dc08b7e4
Parents: ee53883
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 15:44:39 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:39 2013 +0200
----------------------------------------------------------------------
wicket-core/src/main/java/org/apache/wicket/Page.java | 2 +-
.../src/main/java/org/apache/wicket/markup/html/WebPage.java | 2 +-
.../src/main/java/org/apache/wicket/markup/html/form/Form.java | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/eaa22123/wicket-core/src/main/java/org/apache/wicket/Page.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Page.java b/wicket-core/src/main/java/org/apache/wicket/Page.java
index 1c811aa..10de44f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Page.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Page.java
@@ -975,7 +975,7 @@ public abstract class Page extends MarkupContainer implements IRedirectListener,
}
/**
- * Sets the flag that determins whether or not this page was created using one of its
+ * Sets the flag that determines whether or not this page was created using one of its
* bookmarkable constructors
*
* @param wasCreatedBookmarkable
http://git-wip-us.apache.org/repos/asf/wicket/blob/eaa22123/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
index 743e327..d1aeea2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
@@ -306,7 +306,7 @@ public class WebPage extends Page
*/
protected final BookmarkablePageLink<Void> homePageLink(final String id)
{
- return new BookmarkablePageLink<Void>(id, getApplication().getHomePage());
+ return new BookmarkablePageLink<>(id, getApplication().getHomePage());
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/eaa22123/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
index fdaec59..2162b44 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
@@ -499,7 +499,7 @@ public class Form<T> extends WebMarkupContainer
*/
public final Collection<IFormValidator> getFormValidators()
{
- List<IFormValidator> validators = new ArrayList<IFormValidator>();
+ List<IFormValidator> validators = new ArrayList<>();
for (Behavior behavior : getBehaviors())
{
@@ -1374,7 +1374,7 @@ public class Form<T> extends WebMarkupContainer
catch (final FileUploadException fux)
{
// Create model with exception and maximum size values
- final Map<String, Object> model = new HashMap<String, Object>();
+ final Map<String, Object> model = new HashMap<>();
model.put("exception", fux);
model.put("maxSize", getMaxSize());
@@ -2087,6 +2087,6 @@ public class Form<T> extends WebMarkupContainer
/**
* Abort processing.
*/
- ABORT;
+ ABORT
}
}
[19/20] git commit: Java 7 diamonds for wicket-atmosphere
Posted by mg...@apache.org.
Java 7 diamonds for wicket-atmosphere
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ee538839
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ee538839
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ee538839
Branch: refs/heads/master
Commit: ee538839ba18b3d984bdb42b59cea8714567df21
Parents: ea90eec
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 15:44:10 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:39 2013 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/atmosphere/EventBus.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ee538839/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java
index 65af1c6..a5e8008 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java
@@ -100,7 +100,7 @@ public class EventBus implements UnboundListener
private Map<String, PageKey> trackedPages = Maps.newHashMap();
- private List<ResourceRegistrationListener> registrationListeners = new CopyOnWriteArrayList<ResourceRegistrationListener>();
+ private List<ResourceRegistrationListener> registrationListeners = new CopyOnWriteArrayList<>();
private AtmosphereParameters parameters = new AtmosphereParameters();
[17/20] git commit: Java 7 diamonds for native websocket
Posted by mg...@apache.org.
Java 7 diamonds for native websocket
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/04d87b9e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/04d87b9e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/04d87b9e
Branch: refs/heads/master
Commit: 04d87b9e538776a7bfb57b8daae5d873c1aecd56
Parents: 0576c4a
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 15:41:32 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:39 2013 +0200
----------------------------------------------------------------------
.../org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java | 2 +-
.../org/apache/wicket/protocol/ws/api/HttpSessionCopy.java | 2 +-
.../org/apache/wicket/protocol/ws/api/ServletRequestCopy.java | 6 +++---
.../protocol/ws/api/SimpleWebSocketConnectionRegistry.java | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/04d87b9e/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java
index 8a80738..18ca772 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java
@@ -158,7 +158,7 @@ public class AbstractUpgradeFilter extends WicketFilter
*/
protected List<String> getTokensFromHeader(HttpServletRequest req, String headerName)
{
- List<String> result = new ArrayList<String>();
+ List<String> result = new ArrayList<>();
Enumeration<String> headers = req.getHeaders(headerName);
while (headers.hasMoreElements()) {
http://git-wip-us.apache.org/repos/asf/wicket/blob/04d87b9e/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/HttpSessionCopy.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/HttpSessionCopy.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/HttpSessionCopy.java
index 2d5fed1..fc878c2 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/HttpSessionCopy.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/HttpSessionCopy.java
@@ -42,7 +42,7 @@ public class HttpSessionCopy implements HttpSession
this.servletContext = originalSession.getServletContext();
this.creationTime = originalSession.getCreationTime();
- this.attributes = new ConcurrentHashMap<String, Object>();
+ this.attributes = new ConcurrentHashMap<>();
Enumeration<String> attributeNames = originalSession.getAttributeNames();
while (attributeNames.hasMoreElements())
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/04d87b9e/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/ServletRequestCopy.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/ServletRequestCopy.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/ServletRequestCopy.java
index 8d07d75..e1515e6 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/ServletRequestCopy.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/ServletRequestCopy.java
@@ -57,9 +57,9 @@ public class ServletRequestCopy implements HttpServletRequest
private final String requestUri;
private final HttpSessionCopy httpSession;
private final StringBuffer requestURL;
- private final Map<String, Object> attributes = new HashMap<String, Object>();
- private final Map<String, String> headers = new HashMap<String, String>();
- private final Map<String, String[]> parameters = new HashMap<String, String[]>();
+ private final Map<String, Object> attributes = new HashMap<>();
+ private final Map<String, String> headers = new HashMap<>();
+ private final Map<String, String[]> parameters = new HashMap<>();
private final String method;
private final String serverName;
private final int serverPort;
http://git-wip-us.apache.org/repos/asf/wicket/blob/04d87b9e/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/SimpleWebSocketConnectionRegistry.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/SimpleWebSocketConnectionRegistry.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/SimpleWebSocketConnectionRegistry.java
index 97c590f..8a180f9 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/SimpleWebSocketConnectionRegistry.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/SimpleWebSocketConnectionRegistry.java
@@ -70,7 +70,7 @@ public class SimpleWebSocketConnectionRegistry implements IWebSocketConnectionRe
{
Args.notNull(application, "application");
- Collection<IWebSocketConnection> connections = new ArrayList<IWebSocketConnection>();
+ Collection<IWebSocketConnection> connections = new ArrayList<>();
ConcurrentMap<String, ConcurrentMap<Integer, IWebSocketConnection>> connectionsBySession = application.getMetaData(KEY);
if (connectionsBySession != null)
{
[10/20] Java 7 diamonds for wicket-examples
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java b/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java
index fc17657..8d057fa 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java
@@ -118,7 +118,7 @@ public final class BookDetails extends AuthenticatedWebPage
if (book != null)
{
link.getPageParameters().add("id", book.getId());
- link.add(new Label("title", new Model<Book>(book)));
+ link.add(new Label("title", new Model<>(book)));
}
else
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java b/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java
index bb7ae99..f237b50 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java
@@ -100,11 +100,11 @@ public final class EditBook extends AuthenticatedWebPage
*/
public EditBookForm(final String id, final Book book)
{
- super(id, new CompoundPropertyModel<Book>(book));
+ super(id, new CompoundPropertyModel<>(book));
// Create a required text field with a max length of 30 characters
// that edits the book's title
- final TextField<String> title = new TextField<String>("title");
+ final TextField<String> title = new TextField<>("title");
title.setRequired(true);
title.add(new StringValidator(null, 30));
@@ -113,7 +113,7 @@ public final class EditBook extends AuthenticatedWebPage
titleFeedback.add(title);
// Create a required text field that edits the book's author
- final TextField<String> author = new TextField<String>("author");
+ final TextField<String> author = new TextField<>("author");
author.setRequired(true);
final MarkupContainer authorFeedback = new FormComponentFeedbackBorder("authorFeedback");
add(authorFeedback);
@@ -123,15 +123,15 @@ public final class EditBook extends AuthenticatedWebPage
add(new CheckBox("fiction"));
// Books is everything but otherBook
- List<Book> books = new ArrayList<Book>();
+ List<Book> books = new ArrayList<>();
books.addAll(Book.getBooks());
books.remove(otherBook);
// Add companion book choice
- add(new DropDownChoice<Book>("companionBook", books));
+ add(new DropDownChoice<>("companionBook", books));
// Add radio choice test
- final RadioChoice<Book> relatedBook = new RadioChoice<Book>("relatedBook", books);
+ final RadioChoice<Book> relatedBook = new RadioChoice<>("relatedBook", books);
add(relatedBook);
// Multi-select among writing styles
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java
index ef78e6b..3d7577f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java
@@ -53,7 +53,7 @@ public final class Home extends AuthenticatedWebPage
final Book book = listItem.getModelObject();
listItem.add(BookDetails.link("details", book, getLocalizer().getString(
"noBookTitle", this)));
- listItem.add(new Label("author", new Model<Book>(book)));
+ listItem.add(new Label("author", new Model<>(book)));
listItem.add(moveUpLink("moveUp", listItem));
listItem.add(moveDownLink("moveDown", listItem));
listItem.add(removeLink("remove", listItem));
@@ -76,7 +76,7 @@ public final class Home extends AuthenticatedWebPage
User user = getLibrarySession().getUser();
if (user == null)
{
- return new ArrayList<Book>();
+ return new ArrayList<>();
}
return user.getBooks();
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/library/User.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/User.java b/wicket-examples/src/main/java/org/apache/wicket/examples/library/User.java
index f0ad14d..7504244 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/User.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/User.java
@@ -33,7 +33,7 @@ public final class User implements IClusterable
private String name;
// The user's personal book list
- private List<Book> books = new ArrayList<Book>();
+ private List<Book> books = new ArrayList<>();
/**
* @return User name
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java
index 4dbb982..b9fe147 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java
@@ -93,11 +93,11 @@ public class Home extends WicketExamplePage
"onClickLinkClickCount")));
// Link to Page1 is a simple external page link
- add(new BookmarkablePageLink<Void>("page1Link", Page1.class));
+ add(new BookmarkablePageLink<>("page1Link", Page1.class));
// Link to Page2 is automaticLink, so no code
// Link to Page3 is an external link which takes a parameter
- BookmarkablePageLink<Void> page3Link = new BookmarkablePageLink<Void>("page3Link", Page3.class);
+ BookmarkablePageLink<Void> page3Link = new BookmarkablePageLink<>("page3Link", Page3.class);
page3Link.getPageParameters()
.add("bookmarkparameter", "3++2 & 5 � >< space + �");
add(page3Link);
@@ -136,10 +136,10 @@ public class Home extends WicketExamplePage
// Popup example
PopupSettings popupSettings = new PopupSettings("popuppagemap").setHeight(500)
.setWidth(500);
- add(new BookmarkablePageLink<Void>("popupLink", Popup.class).setPopupSettings(popupSettings));
+ add(new BookmarkablePageLink<>("popupLink", Popup.class).setPopupSettings(popupSettings));
// Popup example
- add(new BookmarkablePageLink<Void>("popupButtonLink", Popup.class).setPopupSettings(popupSettings));
+ add(new BookmarkablePageLink<>("popupButtonLink", Popup.class).setPopupSettings(popupSettings));
// External site link
add(new ExternalLink("google", "http://www.google.com", "Click this link to go to Google"));
@@ -151,7 +151,7 @@ public class Home extends WicketExamplePage
"Click this link to go to Google in a popup").setPopupSettings(googlePopupSettings));
// Shared resource link
- add(new ResourceLink<Void>("cancelButtonLink", new SharedResourceReference("cancelButton")));
+ add(new ResourceLink<>("cancelButtonLink", new SharedResourceReference("cancelButton")));
add(new DownloadLink("downloadLink", new AbstractReadOnlyModel<File>()
{
@@ -233,8 +233,8 @@ public class Home extends WicketExamplePage
public RedirectForm(String id)
{
super(id);
- setDefaultModel(new CompoundPropertyModel<RedirectForm>(this));
- add(new TextField<String>("redirectUrl"));
+ setDefaultModel(new CompoundPropertyModel<>(this));
+ add(new TextField<>("redirectUrl"));
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java
index c1936fa..83a5602 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java
@@ -36,15 +36,15 @@ public class Home extends WicketExamplePage
public Home()
{
// references to single mounts
- add(new BookmarkablePageLink<Void>("page1Link", Page1.class));
- add(new BookmarkablePageLink<Void>("page2Link", Page2.class));
- add(new BookmarkablePageLink<Void>("page2LinkPp", Page2PP.class));
- add(new BookmarkablePageLink<Void>("page2LinkUp", Page2UP.class));
+ add(new BookmarkablePageLink<>("page1Link", Page1.class));
+ add(new BookmarkablePageLink<>("page2Link", Page2.class));
+ add(new BookmarkablePageLink<>("page2LinkPp", Page2PP.class));
+ add(new BookmarkablePageLink<>("page2LinkUp", Page2UP.class));
// references to package mounts
- add(new BookmarkablePageLink<Void>("page3Link", Page3.class));
- add(new BookmarkablePageLink<Void>("page4Link", Page4.class));
- add(new BookmarkablePageLink<Void>("page5Link", Page5.class));
+ add(new BookmarkablePageLink<>("page3Link", Page3.class));
+ add(new BookmarkablePageLink<>("page4Link", Page4.class));
+ add(new BookmarkablePageLink<>("page5Link", Page5.class));
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java
index d8b5f62..3117780 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java
@@ -35,6 +35,6 @@ public class Page1 extends WicketExamplePage
*/
public Page1(PageParameters parameters)
{
- add(new BookmarkablePageLink<Void>("homeLink", Home.class));
+ add(new BookmarkablePageLink<>("homeLink", Home.class));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java
index d587f6f..d856113 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java
@@ -52,9 +52,9 @@ public class Page2 extends WicketExamplePage
params.set("param1", newP1 + " " + newP2);
params.set("param2", newP2 + " " + newP1);
- BookmarkablePageLink<?> link = new BookmarkablePageLink<Void>("refreshLink", getClass(), params);
+ BookmarkablePageLink<?> link = new BookmarkablePageLink<>("refreshLink", getClass(), params);
add(link);
- add(new BookmarkablePageLink<Void>("homeLink", Home.class));
+ add(new BookmarkablePageLink<>("homeLink", Home.class));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java
index 2450e36..b159b34 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java
@@ -36,6 +36,6 @@ public class Page3 extends WicketExamplePage
*/
public Page3(PageParameters parameters)
{
- add(new BookmarkablePageLink<Void>("homeLink", Home.class));
+ add(new BookmarkablePageLink<>("homeLink", Home.class));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java
index 72f57f4..9b4f8f5 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java
@@ -36,6 +36,6 @@ public class Page4 extends WicketExamplePage
*/
public Page4(PageParameters parameters)
{
- add(new BookmarkablePageLink<Void>("homeLink", Home.class));
+ add(new BookmarkablePageLink<>("homeLink", Home.class));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
index 5dd316e..88cd076 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
@@ -63,9 +63,9 @@ public class Page5 extends WicketExamplePage
params.set("param1", newP1);
params.set("param2", newP2);
- BookmarkablePageLink<?> link = new BookmarkablePageLink<Void>("refreshLink", Page5.class, params);
+ BookmarkablePageLink<?> link = new BookmarkablePageLink<>("refreshLink", Page5.class, params);
add(link);
- add(new BookmarkablePageLink<Void>("homeLink", Home.class));
+ add(new BookmarkablePageLink<>("homeLink", Home.class));
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java
index 31dace5..7e1230c 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java
@@ -59,7 +59,7 @@ public final class Home extends WicketExamplePage
// be substituted with the given model (the wrapped map). Hence,
// ${user} will be replaced by map.get('user'), which is 'Jonathan'.
StringResourceModel labelModel = new StringResourceModel("salutation", this,
- new Model<ValueMap>(map));
+ new Model<>(map));
// Add the label with the dynamic model
add(new Label("salutation", labelModel));
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java
index d22a547..c65460f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java
@@ -55,7 +55,7 @@ public final class Home extends WicketExamplePage
// be substituted with the given model (the wrapped map). Hence,
// ${user} will be replaced by map.get('user'), which is 'Jonathan'.
StringResourceModel labelModel = new StringResourceModel("salutation", this,
- new Model<ValueMap>(map));
+ new Model<>(map));
// Add the label with the dynamic model
add(new Label("salutation", labelModel));
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java
index 73901f1..344c715 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java
@@ -37,7 +37,7 @@ public class BasePage extends ExamplePage
*/
public BasePage()
{
- add(new Label("selectedLabel", new PropertyModel<String>(this, "selectedContactLabel")));
+ add(new Label("selectedLabel", new PropertyModel<>(this, "selectedContactLabel")));
add(new FeedbackPanel("feedback"));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.java
index bfd74c5..10b3ce6 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.java
@@ -37,7 +37,7 @@ public class DataGridPage extends BasePage
*/
public DataGridPage()
{
- List<ICellPopulator<Contact>> columns = new ArrayList<ICellPopulator<Contact>>();
+ List<ICellPopulator<Contact>> columns = new ArrayList<>();
columns.add(new PropertyPopulator<Contact>("id"));
columns.add(new PropertyPopulator<Contact>("firstName"));
@@ -45,6 +45,6 @@ public class DataGridPage extends BasePage
columns.add(new PropertyPopulator<Contact>("homePhone"));
columns.add(new PropertyPopulator<Contact>("cellPhone"));
- add(new DataGridView<Contact>("rows", columns, new SortableContactDataProvider()));
+ add(new DataGridView<>("rows", columns, new SortableContactDataProvider()));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.java
index cf42767..8640299 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.java
@@ -46,9 +46,9 @@ public class DataTablePage extends BasePage
*/
public DataTablePage()
{
- List<IColumn<Contact, String>> columns = new ArrayList<IColumn<Contact, String>>();
+ List<IColumn<Contact, String>> columns = new ArrayList<>();
- columns.add(new AbstractColumn<Contact, String>(new Model<String>("Actions"))
+ columns.add(new AbstractColumn<Contact, String>(new Model<>("Actions"))
{
@Override
public void populateItem(Item<ICellPopulator<Contact>> cellItem, String componentId,
@@ -58,7 +58,7 @@ public class DataTablePage extends BasePage
}
});
- columns.add(new PropertyColumn<Contact, String>(new Model<String>("ID"), "id")
+ columns.add(new PropertyColumn<Contact, String>(new Model<>("ID"), "id")
{
@Override
public String getCssClass()
@@ -67,9 +67,9 @@ public class DataTablePage extends BasePage
}
});
- columns.add(new PropertyColumn<Contact, String>(new Model<String>("First Name"), "firstName", "firstName"));
+ columns.add(new PropertyColumn<Contact, String>(new Model<>("First Name"), "firstName", "firstName"));
- columns.add(new PropertyColumn<Contact, String>(new Model<String>("Last Name"), "lastName", "lastName")
+ columns.add(new PropertyColumn<Contact, String>(new Model<>("Last Name"), "lastName", "lastName")
{
@Override
public String getCssClass()
@@ -78,10 +78,10 @@ public class DataTablePage extends BasePage
}
});
- columns.add(new PropertyColumn<Contact, String>(new Model<String>("Home Phone"), "homePhone"));
- columns.add(new PropertyColumn<Contact, String>(new Model<String>("Cell Phone"), "cellPhone"));
+ columns.add(new PropertyColumn<Contact, String>(new Model<>("Home Phone"), "homePhone"));
+ columns.add(new PropertyColumn<Contact, String>(new Model<>("Cell Phone"), "cellPhone"));
- DataTable dataTable = new DefaultDataTable<Contact, String>("table", columns,
+ DataTable dataTable = new DefaultDataTable<>("table", columns,
new SortableContactDataProvider(), 8);
dataTable.addBottomToolbar(new ExportToolbar(dataTable).addDataExporter(new CSVDataExporter()));
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java
index dcd1e82..581b415 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java
@@ -57,7 +57,7 @@ public class FormPage extends BasePage
protected Iterator<IModel<Contact>> getItemModels()
{
// for simplicity we only show the first 10 contacts
- SortParam<String> sort = new SortParam<String>("firstName", true);
+ SortParam<String> sort = new SortParam<>("firstName", true);
Iterator<Contact> contacts = DatabaseLocator.getDatabase()
.find(0, 10, sort)
.iterator();
@@ -85,11 +85,11 @@ public class FormPage extends BasePage
// populate the row of the repeater
IModel<Contact> contact = item.getModel();
item.add(new ActionPanel("actions", contact));
- item.add(new TextField<Long>("id"));
- item.add(new TextField<String>("firstName"));
- item.add(new TextField<String>("lastName"));
- item.add(new TextField<String>("homePhone"));
- item.add(new TextField<String>("cellPhone"));
+ item.add(new TextField<>("id"));
+ item.add(new TextField<>("firstName"));
+ item.add(new TextField<>("lastName"));
+ item.add(new TextField<>("homePhone"));
+ item.add(new TextField<>("cellPhone"));
}
@Override
@@ -97,7 +97,7 @@ public class FormPage extends BasePage
{
// this item sets markup class attribute to either 'odd' or
// 'even' for decoration
- return new OddEvenItem<Contact>(id, index, model);
+ return new OddEvenItem<>(id, index, model);
}
};
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java
index 011e68b..1639c59 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java
@@ -122,7 +122,7 @@ public class OIRPage extends BasePage
@Override
protected Item<Contact> newItem(String id, int index, IModel<Contact> model)
{
- return new HighlitableDataItem<Contact>(id, index, model);
+ return new HighlitableDataItem<>(id, index, model);
}
};
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java
index 9d6d21a..1c5d2f7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java
@@ -45,7 +45,7 @@ public class RefreshingPage extends BasePage
*/
public RefreshingPage()
{
- final List<IModel<Contact>> contacts = new ArrayList<IModel<Contact>>(10);
+ final List<IModel<Contact>> contacts = new ArrayList<>(10);
// populate list of contacts to be displayed
ContactDataProvider dp = new ContactDataProvider();
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocalizedPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocalizedPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocalizedPage.java
index 20905e2..460d126 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocalizedPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocalizedPage.java
@@ -35,7 +35,7 @@ public class LocalizedPage extends WicketExamplePage
*/
public LocalizedPage(final PageParameters pageParameters)
{
- add(new BookmarkablePageLink<Void>("back", RequestMapperHomePage.class).setAutoEnable(true));
+ add(new BookmarkablePageLink<>("back", RequestMapperHomePage.class).setAutoEnable(true));
add(new Label("localizedLabel", new ResourceModel("localizedLabel")));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/packageMount/PackageMountedPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/packageMount/PackageMountedPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/packageMount/PackageMountedPage.java
index 95fd413..749cc9f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/packageMount/PackageMountedPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/packageMount/PackageMountedPage.java
@@ -32,7 +32,7 @@ public class PackageMountedPage extends WicketExamplePage
*/
public PackageMountedPage(final PageParameters pageParameters)
{
- add(new BookmarkablePageLink<Void>("back", RequestMapperHomePage.class).setAutoEnable(true));
+ add(new BookmarkablePageLink<>("back", RequestMapperHomePage.class).setAutoEnable(true));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
index c839c24..8d2d85d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
@@ -151,7 +151,7 @@ public class SourcesPage extends WebPage
*/
public class PackagedResourcesModel extends AbstractReadOnlyModel<List<String>>
{
- private final List<String> resources = new ArrayList<String>();
+ private final List<String> resources = new ArrayList<>();
/**
* Constructor.
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.java
index 7b8a1d6..8332f5f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.java
@@ -31,6 +31,6 @@ public class BasePage extends WicketExamplePage
*/
public BasePage()
{
- add(new BookmarkablePageLink<Void>("home-link", HomePage.class));
+ add(new BookmarkablePageLink<>("home-link", HomePage.class));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactsDisplayPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactsDisplayPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactsDisplayPage.java
index 1a67f13..88677f8 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactsDisplayPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactsDisplayPage.java
@@ -39,13 +39,13 @@ public abstract class ContactsDisplayPage extends BasePage
*/
public ContactsDisplayPage()
{
- List<IColumn<Contact, String>> cols = new ArrayList<IColumn<Contact, String>>(4);
- cols.add(new PropertyColumn<Contact, String>(new Model<String>("first name"), "firstName", "firstName"));
- cols.add(new PropertyColumn<Contact, String>(new Model<String>("last name"), "lastName", "lastName"));
- cols.add(new PropertyColumn<Contact, String>(new Model<String>("home phone"), "homePhone"));
- cols.add(new PropertyColumn<Contact, String>(new Model<String>("cell phone"), "cellPhone"));
+ List<IColumn<Contact, String>> cols = new ArrayList<>(4);
+ cols.add(new PropertyColumn<Contact, String>(new Model<>("first name"), "firstName", "firstName"));
+ cols.add(new PropertyColumn<Contact, String>(new Model<>("last name"), "lastName", "lastName"));
+ cols.add(new PropertyColumn<Contact, String>(new Model<>("home phone"), "homePhone"));
+ cols.add(new PropertyColumn<Contact, String>(new Model<>("cell phone"), "cellPhone"));
- add(new DefaultDataTable<Contact, String>("contacts", cols, getDataProvider(), 5));
+ add(new DefaultDataTable<>("contacts", cols, getDataProvider(), 5));
}
protected abstract ContactDataProvider getDataProvider();
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.java
index e65b8c8..39d7051 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.java
@@ -32,6 +32,6 @@ public class HomePage extends BasePage
*/
public HomePage()
{
- add(new BookmarkablePageLink<Void>("annot-link", AnnotPage.class));
+ add(new BookmarkablePageLink<>("annot-link", AnnotPage.class));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java
index f302c5d..5b86437 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java
@@ -42,10 +42,10 @@ public class Index extends WicketExamplePage
setStatelessHint(true);
add(new Label("message", new SessionModel()));
// First a normal bookmarkable link (which is stateless by default)
- add(new BookmarkablePageLink<Void>("linkToStatelessPage", StatelessPage.class));
- add(new BookmarkablePageLink<Void>("linkToStatelessPage1", StatelessPage1.class));
- add(new BookmarkablePageLink<Void>("linkToStatelessPage2", StatelessPage2.class));
- add(new BookmarkablePageLink<Void>("linkToStatelessPage3", StatelessPage3.class));
+ add(new BookmarkablePageLink<>("linkToStatelessPage", StatelessPage.class));
+ add(new BookmarkablePageLink<>("linkToStatelessPage1", StatelessPage1.class));
+ add(new BookmarkablePageLink<>("linkToStatelessPage2", StatelessPage2.class));
+ add(new BookmarkablePageLink<>("linkToStatelessPage3", StatelessPage3.class));
// The second with a stateless link, so the onclick will be called but
// on a stateless page.
add(new StatelessLink<Void>("linkToStatefulPage")
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java
index 9e22e8b..d1b0c33 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java
@@ -47,7 +47,7 @@ public class StatefulPage extends WicketExamplePage
public StatefulPage()
{
add(new Label("message", new SessionModel()));
- add(new BookmarkablePageLink<Void>("indexLink", Index.class));
+ add(new BookmarkablePageLink<>("indexLink", Index.class));
// Action link counts link clicks
final Link actionLink = new Link("actionLink")
@@ -62,7 +62,7 @@ public class StatefulPage extends WicketExamplePage
actionLink.add(new Label("linkClickCount", new PropertyModel<Integer>(this,
"linkClickCount")));
- final TextField<String> field = new TextField<String>("textfield", new Model<String>());
+ final TextField<String> field = new TextField<>("textfield", new Model<String>());
StatelessForm<?> statelessForm = new StatelessForm("statelessform")
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java
index 173cde8..317a59e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java
@@ -46,10 +46,10 @@ public class StatelessPage extends WicketExamplePage
{
setStatelessHint(true);
add(new Label("message", new SessionModel()));
- add(new BookmarkablePageLink<Void>("indexLink", Index.class));
+ add(new BookmarkablePageLink<>("indexLink", Index.class));
final TextField<Integer> field = new TextField<Integer>("textfield",
new PropertyModel<Integer>(this, "number"));
- field.add(new RangeValidator<Integer>(null, 20));
+ field.add(new RangeValidator<>(null, 20));
field.setRequired(true);
StatelessForm<?> statelessForm = new StatelessForm<Void>("statelessform")
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java
index c6fe0fc..eae6646 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java
@@ -46,10 +46,10 @@ public class StatelessPage1 extends WicketExamplePage
{
setStatelessHint(true);
add(new Label("message", new SessionModel()));
- add(new BookmarkablePageLink<Void>("indexLink", Index.class));
+ add(new BookmarkablePageLink<>("indexLink", Index.class));
final TextField<Integer> field = new TextField<Integer>("textfield",
new PropertyModel<Integer>(this, "number"));
- field.add(new RangeValidator<Integer>(null, 20));
+ field.add(new RangeValidator<>(null, 20));
field.setRequired(true);
StatelessForm<?> statelessForm = new StatelessForm("statelessform")
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java
index ad722ec..db807bd 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java
@@ -46,10 +46,10 @@ public class StatelessPage2 extends WicketExamplePage
{
setStatelessHint(true);
add(new Label("message", new SessionModel()));
- add(new BookmarkablePageLink<Void>("indexLink", Index.class));
- final TextField<Integer> field = new TextField<Integer>("textfield",
+ add(new BookmarkablePageLink<>("indexLink", Index.class));
+ final TextField<Integer> field = new TextField<>("textfield",
new PropertyModel<Integer>(this, "number"));
- field.add(new RangeValidator<Integer>(0, 20));
+ field.add(new RangeValidator<>(0, 20));
field.setRequired(true);
StatelessForm<?> statelessForm = new StatelessForm("statelessform")
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java
index 311764f..80f1121 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java
@@ -61,10 +61,10 @@ public class StatelessPage3 extends WicketExamplePage
{
setStatelessHint(true);
add(new Label("message", new SessionModel()));
- add(new BookmarkablePageLink<Void>("indexLink", Index.class));
- final TextField<Integer> field = new TextField<Integer>("textfield",
+ add(new BookmarkablePageLink<>("indexLink", Index.class));
+ final TextField<Integer> field = new TextField<>("textfield",
new PropertyModel<Integer>(this, "number"));
- field.add(new RangeValidator<Integer>(0, 20));
+ field.add(new RangeValidator<>(0, 20));
field.setRequired(true);
StatelessForm<?> statelessForm = new StatelessForm("statelessform")
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java
index 078ecfc..dd9d1e0 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java
@@ -58,7 +58,7 @@ public class StockQuoteLabel extends WebComponent
*/
public StockQuoteLabel(String id, String symbol)
{
- super(id, new Model<String>(symbol));
+ super(id, new Model<>(symbol));
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java
index 3c131ff..a82b86d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java
@@ -49,12 +49,12 @@ public class StockQuotePage extends WicketExamplePage
// shared model to get and set the symbol property on the
// quote instance
- final IModel<String> model = new PropertyModel<String>(quote, "symbol");
+ final IModel<String> model = new PropertyModel<>(quote, "symbol");
// form holding the input field.
final Form<?> form = new Form("form");
add(form);
- form.add(new TextField<String>("symbol", model));
+ form.add(new TextField<>("symbol", model));
// labels for displaying the chosen symbol
add(new Label("symbol", model));
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java
index 0f2fc17..243b321 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java
@@ -33,7 +33,7 @@ public class Page1 extends WicketExamplePage
*/
public Page1()
{
- add(new Label("title", new Model<String>("Template example, page 1 - border")));
+ add(new Label("title", new Model<>("Template example, page 1 - border")));
add(new TemplateBorder("border"));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java
index 84028f7..fcaf85c 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java
@@ -60,7 +60,7 @@ public class TemplateBorder extends Border
}
}
});
- addToBorder(new BookmarkablePageLink<Void>("page1Link", Page1.class));
- addToBorder(new BookmarkablePageLink<Void>("page2Link", Page2.class));
+ addToBorder(new BookmarkablePageLink<>("page1Link", Page1.class));
+ addToBorder(new BookmarkablePageLink<>("page2Link", Page2.class));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java
index 2748cda..4a705e7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java
@@ -44,7 +44,7 @@ public abstract class TemplatePage extends WicketExamplePage
*/
public TemplatePage()
{
- add(new Label("title", new PropertyModel<String>(this, "pageTitle")));
+ add(new Label("title", new PropertyModel<>(this, "pageTitle")));
add(currentBanner = new Banner1("ad"));
add(new Link("changeAdLink")
{
@@ -64,8 +64,8 @@ public abstract class TemplatePage extends WicketExamplePage
}
}
});
- add(new BookmarkablePageLink<Void>("page1Link", Page1.class));
- add(new BookmarkablePageLink<Void>("page2Link", Page2.class));
+ add(new BookmarkablePageLink<>("page1Link", Page1.class));
+ add(new BookmarkablePageLink<>("page2Link", Page2.class));
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AdvancedTreePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AdvancedTreePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AdvancedTreePage.java
index de55bde..7018b1f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AdvancedTreePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AdvancedTreePage.java
@@ -75,7 +75,7 @@ public abstract class AdvancedTreePage extends AbstractTreePage
{
content = new CheckedFolderContent(provider);
- Form<Void> form = new Form<Void>("form");
+ Form<Void> form = new Form<>("form");
add(form);
tree = createTree(provider, new FooExpansionModel());
@@ -159,7 +159,7 @@ public abstract class AdvancedTreePage extends AbstractTreePage
private List<Content> initContents()
{
- contents = new ArrayList<Content>();
+ contents = new ArrayList<>();
contents.add(new BookmarkableFolderContent(tree));
contents.add(new LabelContent());
@@ -180,7 +180,7 @@ public abstract class AdvancedTreePage extends AbstractTreePage
private List<Behavior> initThemes()
{
- themes = new ArrayList<Behavior>();
+ themes = new ArrayList<>();
themes.add(new WindowsTheme());
themes.add(new HumanTheme());
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/tree/Foo.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/Foo.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/Foo.java
index 77b3bd8..7cd8b54 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/Foo.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/Foo.java
@@ -40,7 +40,7 @@ public class Foo
private Foo parent;
- private List<Foo> foos = new ArrayList<Foo>();
+ private List<Foo> foos = new ArrayList<>();
public Foo(String id)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooExpansion.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooExpansion.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooExpansion.java
index adbe4d7..09ee939 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooExpansion.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooExpansion.java
@@ -44,7 +44,7 @@ public class FooExpansion implements Set<Foo>, Serializable
private static final long serialVersionUID = 1L;
};
- private Set<String> ids = new HashSet<String>();
+ private Set<String> ids = new HashSet<>();
private boolean inverse;
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooPanel.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooPanel.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooPanel.java
index 46308d5..38eb651 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooPanel.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooPanel.java
@@ -31,10 +31,10 @@ public class FooPanel extends Panel
public FooPanel(String id, IModel<Foo> foo)
{
- super(id, new CompoundPropertyModel<Foo>(foo));
+ super(id, new CompoundPropertyModel<>(foo));
- add(new TextField<String>("bar"));
- add(new TextField<String>("baz"));
+ add(new TextField<>("bar"));
+ add(new TextField<>("baz"));
add(new CheckBox("quux"));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.java
index b8deef3..b50d109 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.java
@@ -63,17 +63,17 @@ public class TableTreePage extends AdvancedTreePage
@Override
protected Item<Foo> newRowItem(String id, int index, IModel<Foo> model)
{
- return new OddEvenItem<Foo>(id, index, model);
+ return new OddEvenItem<>(id, index, model);
}
};
- tree.getTable().addTopToolbar(new HeadersToolbar<String>(tree.getTable(), null));
+ tree.getTable().addTopToolbar(new HeadersToolbar<>(tree.getTable(), null));
tree.getTable().addBottomToolbar(new NoRecordsToolbar(tree.getTable()));
return tree;
}
private List<IColumn<Foo, String>> createColumns()
{
- List<IColumn<Foo, String>> columns = new ArrayList<IColumn<Foo, String>>();
+ List<IColumn<Foo, String>> columns = new ArrayList<>();
columns.add(new PropertyColumn<Foo, String>(Model.of("ID"), "id"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TreeApplication.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TreeApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TreeApplication.java
index 88d2e61..6d99ce0 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TreeApplication.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TreeApplication.java
@@ -33,7 +33,7 @@ public class TreeApplication extends WebApplication
/**
* All root {@link Foo}s.
*/
- public List<Foo> foos = new ArrayList<Foo>();
+ public List<Foo> foos = new ArrayList<>();
/**
* Constructor.
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/BookmarkableFolderContent.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/BookmarkableFolderContent.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/BookmarkableFolderContent.java
index 816dfdf..80a7c6f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/BookmarkableFolderContent.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/BookmarkableFolderContent.java
@@ -69,7 +69,7 @@ public class BookmarkableFolderContent extends Content
PageParameters parameters = new PageParameters();
parameters.add("foo", foo.getId());
- return new BookmarkablePageLink<Void>(id, tree.getPage().getClass(), parameters);
+ return new BookmarkablePageLink<>(id, tree.getPage().getClass(), parameters);
}
}
};
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedFolderContent.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedFolderContent.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedFolderContent.java
index d041bc3..5360964 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedFolderContent.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedFolderContent.java
@@ -36,7 +36,7 @@ public class CheckedFolderContent extends Content
public CheckedFolderContent(ITreeProvider<Foo> provider)
{
- checked = new ProviderSubset<Foo>(provider, false);
+ checked = new ProviderSubset<>(provider, false);
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedSelectableFolderContent.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedSelectableFolderContent.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedSelectableFolderContent.java
index 820fcff..0fab470 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedSelectableFolderContent.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedSelectableFolderContent.java
@@ -48,7 +48,7 @@ public class CheckedSelectableFolderContent extends SelectableFolderContent
@Override
protected IModel<Boolean> newCheckBoxModel(final IModel<Foo> model)
{
- return new PropertyModel<Boolean>(model, "quux");
+ return new PropertyModel<>(model, "quux");
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/FolderContent.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/FolderContent.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/FolderContent.java
index 2fdc867..7dadba1 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/FolderContent.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/FolderContent.java
@@ -33,6 +33,6 @@ public class FolderContent extends Content
@Override
public Component newContentComponent(String id, final AbstractTree<Foo> tree, IModel<Foo> model)
{
- return new Folder<Foo>(id, tree, model);
+ return new Folder<>(id, tree, model);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/MixedContent.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/MixedContent.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/MixedContent.java
index f9a35e7..688077f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/MixedContent.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/MixedContent.java
@@ -36,7 +36,7 @@ public class MixedContent extends Content
public MixedContent(List<Content> contents)
{
- this.contents = new ArrayList<Content>(contents);
+ this.contents = new ArrayList<>(contents);
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/MultiSelectableFolderContent.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/MultiSelectableFolderContent.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/MultiSelectableFolderContent.java
index af99373..0c36fa5 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/MultiSelectableFolderContent.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/MultiSelectableFolderContent.java
@@ -37,7 +37,7 @@ public class MultiSelectableFolderContent extends Content
public MultiSelectableFolderContent(ITreeProvider<Foo> provider)
{
- selected = new ProviderSubset<Foo>(provider, false);
+ selected = new ProviderSubset<>(provider, false);
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java b/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java
index f661a90..7f5c7f1 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java
@@ -97,10 +97,10 @@ public class UnicodeConverter extends WicketExamplePage
public UnicodeConverter()
{
Form<UnicodeConverter> form = new Form<UnicodeConverter>("form",
- new CompoundPropertyModel<UnicodeConverter>(this));
- form.add(new TextArea<String>("source"));
- form.add(new DropDownChoice<String>("translationType", translationTypes));
- form.add(new TextArea<String>("target", new ConverterModel()));
+ new CompoundPropertyModel<>(this));
+ form.add(new TextArea<>("source"));
+ form.add(new DropDownChoice<>("translationType", translationTypes));
+ form.add(new TextArea<>("target", new ConverterModel()));
add(form);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
index 8debc65..dbac3c3 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
@@ -94,7 +94,7 @@ public class MultiUploadPage extends WicketExamplePage
private class FileUploadForm extends Form<Void>
{
// collection that will hold uploaded FileUpload objects
- private final Collection<FileUpload> uploads = new ArrayList<FileUpload>();
+ private final Collection<FileUpload> uploads = new ArrayList<>();
/**
* TODO
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
index fa2ff82..a915d11 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
@@ -46,7 +46,7 @@ public class DynamicPage extends WicketExamplePage
final IResourceStream template = new PackageResourceStream(DynamicPage.class,
"fields.vm");
- Map<String, List<Field>> map = new HashMap<String, List<Field>>();
+ Map<String, List<Field>> map = new HashMap<>();
List<Field> fields = VelocityTemplateApplication.getFields();
map.put("fields", fields);
@@ -67,7 +67,7 @@ public class DynamicPage extends WicketExamplePage
});
for (Field field : fields)
{
- panel.add(new TextField<Object>(field.getFieldName()));
+ panel.add(new TextField<>(field.getFieldName()));
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
index 01ee728..02b553f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
@@ -58,9 +58,9 @@ public class TemplatePage extends WicketExamplePage
public TemplateForm(String name)
{
super(name);
- add(templateTextArea = new TextArea<IStringResourceStream>("templateInput",
+ add(templateTextArea = new TextArea<>("templateInput",
new PropertyModel<IStringResourceStream>(
- new Model<TemplatePage>(TemplatePage.this), "template")));
+ new Model<>(TemplatePage.this), "template")));
}
/**
@@ -86,7 +86,7 @@ public class TemplatePage extends WicketExamplePage
*/
public TemplatePage(final PageParameters parameters)
{
- Map<String, List<Person>> map = new HashMap<String, List<Person>>();
+ Map<String, List<Person>> map = new HashMap<>();
map.put("persons", VelocityTemplateApplication.getPersons());
templateContext = Model.ofMap(map);
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.java
index 7f84d86..611801d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.java
@@ -33,10 +33,10 @@ import org.apache.wicket.protocol.http.WebApplication;
*/
public class VelocityTemplateApplication extends WebApplication
{
- private static List<Field> fields = new ArrayList<Field>();
+ private static List<Field> fields = new ArrayList<>();
/** simple persons db. */
- private static List<Person> persons = new ArrayList<Person>();
+ private static List<Person> persons = new ArrayList<>();
static
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java
index c40e157..7478899 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java
@@ -62,7 +62,7 @@ public class NewUserWizard extends Wizard
public ConfirmationStep()
{
super(true);
- IModel<User> userModel = new Model<User>(user);
+ IModel<User> userModel = new Model<>(user);
setTitleModel(new ResourceModel("confirmation.title"));
setSummaryModel(new StringResourceModel("confirmation.summary", this, userModel));
setContentModel(new StringResourceModel("confirmation.content", this, userModel));
@@ -80,11 +80,11 @@ public class NewUserWizard extends Wizard
public UserDetailsStep()
{
setTitleModel(new ResourceModel("confirmation.title"));
- setSummaryModel(new StringResourceModel("userdetails.summary", this, new Model<User>(
+ setSummaryModel(new StringResourceModel("userdetails.summary", this, new Model<>(
user)));
- add(new RequiredTextField<String>("user.firstName"));
- add(new RequiredTextField<String>("user.lastName"));
- add(new TextField<String>("user.department"));
+ add(new RequiredTextField<>("user.firstName"));
+ add(new RequiredTextField<>("user.lastName"));
+ add(new TextField<>("user.department"));
add(new CheckBox("assignRoles"));
}
}
@@ -101,12 +101,12 @@ public class NewUserWizard extends Wizard
{
super(new ResourceModel("username.title"), new ResourceModel("username.summary"));
- add(new RequiredTextField<String>("user.userName"));
+ add(new RequiredTextField<>("user.userName"));
FormComponent<String> email = new RequiredTextField<String>("user.email").add(EmailAddressValidator.getInstance());
add(email);
- TextField<String> emailRepeat = new TextField<String>("emailRepeat",
+ TextField<String> emailRepeat = new TextField<>("emailRepeat",
new Model<String>());
add(emailRepeat);
@@ -126,11 +126,11 @@ public class NewUserWizard extends Wizard
{
super(new ResourceModel("userroles.title"), null);
setSummaryModel(new StringResourceModel("userroles.summary", this,
- new Model<User>(user)));
- final ListMultipleChoice<String> rolesChoiceField = new ListMultipleChoice<String>(
+ new Model<>(user)));
+ final ListMultipleChoice<String> rolesChoiceField = new ListMultipleChoice<>(
"user.roles", allRoles);
add(rolesChoiceField);
- final TextField<String> rolesSetNameField = new TextField<String>("user.rolesSetName");
+ final TextField<String> rolesSetNameField = new TextField<>("user.rolesSetName");
add(rolesSetNameField);
add(new AbstractFormValidator()
{
@@ -190,7 +190,7 @@ public class NewUserWizard extends Wizard
// create a blank user
user = new User();
- setDefaultModel(new CompoundPropertyModel<NewUserWizard>(this));
+ setDefaultModel(new CompoundPropertyModel<>(this));
WizardModel model = new WizardModel();
model.add(new UserNameStep());
model.add(new UserDetailsStep());
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/User.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/User.java b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/User.java
index add6916..46bca9d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/User.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/User.java
@@ -35,7 +35,7 @@ public final class User implements IClusterable
private String firstName;
private String lastName;
- private Set<String> roles = new HashSet<String>();
+ private Set<String> roles = new HashSet<>();
private String rolesSetName;
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java
index b3d5e63..f5c9db6 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java
@@ -51,7 +51,7 @@ public class GuestbookTest extends WicketTestCase
tester.assertContains("Wicket Examples - guestbook");
// check if the list of comments is empty
- tester.assertListView("comments", new ArrayList<Comment>());
+ tester.assertListView("comments", new ArrayList<>());
tester.assertComponent("commentForm", Form.class);
FormTester formTester = tester.newFormTester("commentForm");
formTester.setValue("text", "test-1");
http://git-wip-us.apache.org/repos/asf/wicket/blob/46651a45/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java
index ec20bff..e838dd4 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java
@@ -44,7 +44,7 @@ public class WordGeneratorTest extends WicketTestCase
{
WordGenerator wg = new WordGenerator();
int wordCount = wg.size();
- Set<Word> words = new HashSet<Word>();
+ Set<Word> words = new HashSet<>();
log.info("First iteration...");
for (int i = 0; i < wordCount; i++)
{
[09/20] git commit: Java 7 diamonds for wicket-cdi
Posted by mg...@apache.org.
Java 7 diamonds for wicket-cdi
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6510f107
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6510f107
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6510f107
Branch: refs/heads/master
Commit: 6510f10793b25ab9e048c7a490b8597cc7cb2f85
Parents: 747f933
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 15:00:01 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:38 2013 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/cdi/NonContextual.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6510f107/wicket-cdi/src/main/java/org/apache/wicket/cdi/NonContextual.java
----------------------------------------------------------------------
diff --git a/wicket-cdi/src/main/java/org/apache/wicket/cdi/NonContextual.java b/wicket-cdi/src/main/java/org/apache/wicket/cdi/NonContextual.java
index 2af8641..c2392e1 100644
--- a/wicket-cdi/src/main/java/org/apache/wicket/cdi/NonContextual.java
+++ b/wicket-cdi/src/main/java/org/apache/wicket/cdi/NonContextual.java
@@ -56,7 +56,7 @@ public class NonContextual<T>
synchronized (lock)
{
// copy-on-write the cache
- Map<BeanManager, ClassMetaCache<NonContextual<?>>> newCache = new WeakHashMap<BeanManager, ClassMetaCache<NonContextual<?>>>(
+ Map<BeanManager, ClassMetaCache<NonContextual<?>>> newCache = new WeakHashMap<>(
cache);
newCache.remove(beanManager);
cache = Collections.unmodifiableMap(newCache);
@@ -81,7 +81,7 @@ public class NonContextual<T>
if (nc == null)
{
- nc = new NonContextual<T>(manager, clazz);
+ nc = new NonContextual<>(manager, clazz);
meta.put(clazz, nc);
}
return nc;
@@ -97,10 +97,10 @@ public class NonContextual<T>
meta = cache.get(manager);
if (meta == null)
{
- meta = new ClassMetaCache<NonContextual<?>>();
+ meta = new ClassMetaCache<>();
// copy-on-write the cache
- Map<BeanManager, ClassMetaCache<NonContextual<?>>> newCache = new WeakHashMap<BeanManager, ClassMetaCache<NonContextual<?>>>(
+ Map<BeanManager, ClassMetaCache<NonContextual<?>>> newCache = new WeakHashMap<>(
cache);
newCache.put(manager, meta);
cache = Collections.unmodifiableMap(newCache);
[18/20] git commit: Java 7 diamonds for bean-validator
Posted by mg...@apache.org.
Java 7 diamonds for bean-validator
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ea90eecb
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ea90eecb
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ea90eecb
Branch: refs/heads/master
Commit: ea90eecb5f7fe28e5948a643026732aa1aa5b900
Parents: 04d87b9
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 15:43:21 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:39 2013 +0200
----------------------------------------------------------------------
.../wicket/bean/validation/BeanValidationConfiguration.java | 4 ++--
.../org/apache/wicket/bean/validation/ConstraintIterator.java | 2 +-
.../main/java/org/apache/wicket/bean/validation/GroupsModel.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ea90eecb/wicket-experimental/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/BeanValidationConfiguration.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/BeanValidationConfiguration.java b/wicket-experimental/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/BeanValidationConfiguration.java
index 8de367c..be0752c 100644
--- a/wicket-experimental/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/BeanValidationConfiguration.java
+++ b/wicket-experimental/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/BeanValidationConfiguration.java
@@ -31,9 +31,9 @@ public class BeanValidationConfiguration implements BeanValidationContext
private IViolationTranslator violationTranslator = new DefaultViolationTranslator();
- private List<IPropertyResolver> propertyResolvers = new CopyOnWriteArrayList<IPropertyResolver>();
+ private List<IPropertyResolver> propertyResolvers = new CopyOnWriteArrayList<>();
- private Map<Class<?>, ITagModifier<? extends Annotation>> tagModifiers = new ConcurrentHashMap<Class<?>, ITagModifier<? extends Annotation>>();
+ private Map<Class<?>, ITagModifier<? extends Annotation>> tagModifiers = new ConcurrentHashMap<>();
public BeanValidationConfiguration()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/ea90eecb/wicket-experimental/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/ConstraintIterator.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/ConstraintIterator.java b/wicket-experimental/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/ConstraintIterator.java
index 4284f1c..3110bb8 100644
--- a/wicket-experimental/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/ConstraintIterator.java
+++ b/wicket-experimental/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/ConstraintIterator.java
@@ -20,7 +20,7 @@ class ConstraintIterator implements Iterator<ConstraintDescriptor<?>>
{
private ConstraintDescriptor<?> next;
- private List<Iterator<ConstraintDescriptor<?>>> stack = new ArrayList<Iterator<ConstraintDescriptor<?>>>();
+ private List<Iterator<ConstraintDescriptor<?>>> stack = new ArrayList<>();
public ConstraintIterator(Validator validator, Property property, Class<?>... groups)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/ea90eecb/wicket-experimental/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/GroupsModel.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/GroupsModel.java b/wicket-experimental/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/GroupsModel.java
index 6abaa60..ff97980 100644
--- a/wicket-experimental/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/GroupsModel.java
+++ b/wicket-experimental/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/GroupsModel.java
@@ -31,7 +31,7 @@ public class GroupsModel extends LoadableDetachableModel<Class<?>[]>
}
else
{
- this.groups = new ArrayList<ClassReference<?>>();
+ this.groups = new ArrayList<>();
for (Class<?> group : groups)
{
this.groups.add(ClassReference.of(group));
[03/20] git commit: Java 7 diamonds for wicket-extensions
Posted by mg...@apache.org.
Java 7 diamonds for wicket-extensions
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/732c9090
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/732c9090
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/732c9090
Branch: refs/heads/master
Commit: 732c9090355d637a9695c3617ebdb2e7d37ebdd6
Parents: 46651a4
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 15:37:48 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:38 2013 +0200
----------------------------------------------------------------------
.../ajax/markup/html/modal/ModalWindow.java | 2 +-
.../data/sort/AjaxFallbackOrderByBorder.java | 2 +-
.../data/table/AjaxFallbackDefaultDataTable.java | 2 +-
.../breadcrumb/DefaultBreadCrumbsModel.java | 2 +-
.../captcha/kittens/KittenCaptchaPanel.java | 12 ++++++------
.../extensions/captcha/kittens/OpaqueRegion.java | 6 +++---
.../extensions/markup/html/basic/LinkParser.java | 2 +-
.../markup/html/basic/SmartLinkLabel.java | 2 +-
.../html/basic/SmartLinkMultiLineLabel.java | 2 +-
.../markup/html/captcha/CaptchaImageResource.java | 8 ++++----
.../html/form/palette/component/Recorder.java | 10 +++++-----
.../markup/html/form/select/SelectOptions.java | 4 ++--
.../repeater/data/grid/AbstractDataGridView.java | 6 +++---
.../repeater/data/grid/PropertyPopulator.java | 2 +-
.../html/repeater/data/sort/OrderByBorder.java | 2 +-
.../html/repeater/data/table/DataTable.java | 4 ++--
.../repeater/data/table/DefaultDataTable.java | 4 ++--
.../repeater/data/table/HeaderlessColumn.java | 2 +-
.../html/repeater/data/table/HeadersToolbar.java | 2 +-
.../html/repeater/data/table/NavigatorLabel.java | 2 +-
.../html/repeater/data/table/PropertyColumn.java | 2 +-
.../repeater/data/table/export/ExportToolbar.java | 4 ++--
.../repeater/data/table/filter/ChoiceFilter.java | 2 +-
.../filter/ChoiceFilteredPropertyColumn.java | 2 +-
.../repeater/data/table/filter/FilterForm.java | 2 +-
.../repeater/data/table/filter/FilterToolbar.java | 2 +-
.../repeater/data/table/filter/TextFilter.java | 2 +-
.../table/filter/TextFilteredPropertyColumn.java | 4 ++--
.../markup/html/repeater/tree/AbstractTree.java | 2 +-
.../html/repeater/tree/DefaultNestedTree.java | 2 +-
.../html/repeater/tree/DefaultTableTree.java | 6 +++---
.../markup/html/repeater/tree/NestedTree.java | 2 +-
.../markup/html/repeater/tree/TableTree.java | 2 +-
.../html/repeater/tree/content/CheckFolder.java | 2 +-
.../markup/html/repeater/tree/nested/Subtree.java | 2 +-
.../repeater/tree/table/TreeDataProvider.java | 6 +++---
.../markup/html/repeater/util/ProviderSubset.java | 2 +-
.../html/repeater/util/SingleSortState.java | 2 +-
.../html/repeater/util/SortableDataProvider.java | 2 +-
.../html/repeater/util/SortableTreeProvider.java | 4 ++--
.../html/repeater/util/TreeModelProvider.java | 4 ++--
.../extensions/markup/html/tabs/TabbedPanel.java | 2 +-
.../wicket/extensions/rating/RatingPanel.java | 6 +++---
.../extensions/util/encoding/CharSetMap.java | 8 ++++----
.../extensions/wizard/StaticContentStep.java | 6 +++---
.../apache/wicket/extensions/wizard/Wizard.java | 2 +-
.../wicket/extensions/wizard/WizardModel.java | 6 +++---
.../wicket/extensions/wizard/WizardStep.java | 8 ++++----
.../ajax/markup/html/AjaxEditableLabelPage.java | 2 +-
.../markup/html/form/palette/PaletteTest.java | 18 +++++++++---------
.../markup/html/form/palette/PaletteTestPage.java | 4 ++--
.../markup/html/form/select/SelectTestPage.java | 2 +-
.../markup/html/form/select/SelectTestPage2.java | 4 ++--
.../html/repeater/data/table/DataTablePage.java | 14 +++++++-------
.../html/repeater/data/table/DataTableTest.java | 4 ++--
.../repeater/tree/table/TreeDataProviderTest.java | 2 +-
.../html/repeater/util/ProviderSubsetTest.java | 6 +++---
.../markup/html/tabs/AjaxTabbedPanelTest.java | 2 +-
.../markup/html/tabs/TabbedPanelTest.java | 4 ++--
.../html/tabs/TabbedPanelVisibilityTestPage.java | 2 +-
.../validator/RfcCompliantEmailValidatorTest.java | 4 ++--
61 files changed, 121 insertions(+), 121 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
index 317a5b5..c9f4ed4 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
@@ -741,7 +741,7 @@ public class ModalWindow extends Panel
*/
public ModalWindow setTitle(final String title)
{
- this.title = new Model<String>(title);
+ this.title = new Model<>(title);
return this;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.java
index 2160e7e..7b2f9b2 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.java
@@ -119,7 +119,7 @@ public abstract class AjaxFallbackOrderByBorder<S> extends Border
}
};
addToBorder(link);
- add(new AjaxFallbackOrderByLink.CssModifier<S>(link, cssProvider));
+ add(new AjaxFallbackOrderByLink.CssModifier<>(link, cssProvider));
link.add(getBodyContainer());
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java
index 3efc392..0cf9af3 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java
@@ -79,7 +79,7 @@ public class AjaxFallbackDefaultDataTable<T, S> extends DataTable<T, S>
@Override
protected Item<T> newRowItem(final String id, final int index, final IModel<T> model)
{
- return new OddEvenItem<T>(id, index, model);
+ return new OddEvenItem<>(id, index, model);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/DefaultBreadCrumbsModel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/DefaultBreadCrumbsModel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/DefaultBreadCrumbsModel.java
index ef59fe5..468cbf4 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/DefaultBreadCrumbsModel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/DefaultBreadCrumbsModel.java
@@ -32,7 +32,7 @@ public class DefaultBreadCrumbsModel implements IBreadCrumbModel
private IBreadCrumbParticipant activeParticipant = null;
/** Holds the current list of crumbs. */
- private final List<IBreadCrumbParticipant> crumbs = new ArrayList<IBreadCrumbParticipant>();
+ private final List<IBreadCrumbParticipant> crumbs = new ArrayList<>();
/** listeners utility. */
private final BreadCrumbModelListenerSupport listenerSupport = new BreadCrumbModelListenerSupport();
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
index 67cb4bc..7663cd9 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
@@ -68,8 +68,8 @@ public class KittenCaptchaPanel extends Panel
private static BufferedImage grass = load("images/grass.png");
// The kittens and other animals
- private static final List<Animal> kittens = new ArrayList<Animal>();
- private static final List<Animal> nonKittens = new ArrayList<Animal>();
+ private static final List<Animal> kittens = new ArrayList<>();
+ private static final List<Animal> nonKittens = new ArrayList<>();
// Random number generator
private static Random random = new Random(-1);
@@ -440,7 +440,7 @@ public class KittenCaptchaPanel extends Panel
{
// Create the image and turn it into data
final BufferedImage composedImage = animals.createImage();
- data = new SoftReference<byte[]>(toImageData(composedImage));
+ data = new SoftReference<>(toImageData(composedImage));
}
// Return image data
@@ -632,7 +632,7 @@ public class KittenCaptchaPanel extends Panel
/**
* List of placed animals
*/
- private final List<PlacedAnimal> animals = new ArrayList<PlacedAnimal>();
+ private final List<PlacedAnimal> animals = new ArrayList<>();
/**
* Arrange random animals and kittens
@@ -668,7 +668,7 @@ public class KittenCaptchaPanel extends Panel
Collections.shuffle(animals);
// Ensure kittens are visible enough
- List<PlacedAnimal> strayKittens = new ArrayList<PlacedAnimal>();
+ List<PlacedAnimal> strayKittens = new ArrayList<>();
for (final PlacedAnimal animal : animals)
{
// If it's a kitten
@@ -718,7 +718,7 @@ public class KittenCaptchaPanel extends Panel
private PlacedAnimal atLocation(final Point location)
{
// Reverse list for z-ordered hit-testing
- final List<PlacedAnimal> reversedAnimals = new ArrayList<PlacedAnimal>(animals);
+ final List<PlacedAnimal> reversedAnimals = new ArrayList<>(animals);
Collections.reverse(reversedAnimals);
// Return any animal at the given location
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/OpaqueRegion.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/OpaqueRegion.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/OpaqueRegion.java
index 83ff678..26df139 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/OpaqueRegion.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/OpaqueRegion.java
@@ -54,7 +54,7 @@ class OpaqueRegion
}
// Initialize rectangle list
- rectangles = new ArrayList<Rectangle>();
+ rectangles = new ArrayList<>();
// Get color model for image
final ColorModel colorModel = image.getColorModel();
@@ -181,7 +181,7 @@ class OpaqueRegion
OpaqueRegion subtract(final OpaqueRegion removeRegion, final Point offset)
{
// Create new rectangle list
- final List<Rectangle> newRectangles = new ArrayList<Rectangle>();
+ final List<Rectangle> newRectangles = new ArrayList<>();
// For each rectangle
for (final Rectangle rectangle : rectangles)
@@ -190,7 +190,7 @@ class OpaqueRegion
final int y = rectangle.y;
// Work list starts with the current rectangle in this opaque region
- final List<Rectangle> workList = new ArrayList<Rectangle>();
+ final List<Rectangle> workList = new ArrayList<>();
workList.add(new Rectangle(rectangle));
// For each rectangle in the region to remove
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/LinkParser.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/LinkParser.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/LinkParser.java
index 1a101f3..1b68468 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/LinkParser.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/LinkParser.java
@@ -32,7 +32,7 @@ import org.apache.wicket.util.string.Strings;
*/
public class LinkParser implements ILinkParser
{
- private final Map<String, ILinkRenderStrategy> renderStrategies = new HashMap<String, ILinkRenderStrategy>();
+ private final Map<String, ILinkRenderStrategy> renderStrategies = new HashMap<>();
/**
* Adds a render strategy to the parser.
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java
index 9d616c5..b58ba2f 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java
@@ -45,7 +45,7 @@ public class SmartLinkLabel extends Label
*/
public SmartLinkLabel(final String name, final String label)
{
- this(name, new Model<String>(label));
+ this(name, new Model<>(label));
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java
index 95a97f2..74cb1ae 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java
@@ -45,7 +45,7 @@ public class SmartLinkMultiLineLabel extends MultiLineLabel
*/
public SmartLinkMultiLineLabel(final String id, final String label)
{
- this(id, new Model<String>(label));
+ this(id, new Model<>(label));
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java
index 3817c8e..6dec0b9 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java
@@ -150,7 +150,7 @@ public final class CaptchaImageResource extends DynamicImageResource
*/
public CaptchaImageResource(final String challengeId)
{
- this(new Model<String>(challengeId));
+ this(new Model<>(challengeId));
}
/**
@@ -197,7 +197,7 @@ public final class CaptchaImageResource extends DynamicImageResource
*/
public CaptchaImageResource(final String challengeId, final int fontSize, final int margin)
{
- this(new Model<String>(challengeId), fontSize, margin);
+ this(new Model<>(challengeId), fontSize, margin);
}
/**
@@ -240,7 +240,7 @@ public final class CaptchaImageResource extends DynamicImageResource
if (data == null)
{
data = render();
- imageData = new SoftReference<byte[]>(data);
+ imageData = new SoftReference<>(data);
setLastModifiedTime(Time.now());
}
return data;
@@ -261,7 +261,7 @@ public final class CaptchaImageResource extends DynamicImageResource
int width = margin * 2;
int height = margin * 2;
char[] chars = challengeId.getObject().toCharArray();
- List<CharAttributes> charAttsList = new ArrayList<CharAttributes>();
+ List<CharAttributes> charAttsList = new ArrayList<>();
TextLayout text;
AffineTransform textAt;
Shape shape;
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java
index 544e69b..f6aa137 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java
@@ -82,8 +82,8 @@ public class Recorder<T> extends HiddenField<Object>
{
super(id);
this.palette = palette;
- this.selectedIds = new ArrayList<String>();
- setDefaultModel(new Model<Serializable>());
+ this.selectedIds = new ArrayList<>();
+ setDefaultModel(new Model<>());
setOutputMarkupId(true);
}
@@ -132,7 +132,7 @@ public class Recorder<T> extends HiddenField<Object>
// set model and update ids array
String modelString = modelStringBuffer.toString();
- setDefaultModel(new Model<String>(modelString));
+ setDefaultModel(new Model<>(modelString));
updateIds(modelString);
}
@@ -158,9 +158,9 @@ public class Recorder<T> extends HiddenField<Object>
}
final IChoiceRenderer<T> renderer = getPalette().getChoiceRenderer();
- final List<T> selected = new ArrayList<T>(getSelectedIds().size());
+ final List<T> selected = new ArrayList<>(getSelectedIds().size());
final Collection<? extends T> choices = getPalette().getChoices();
- final Map<T, String> idForChoice = new HashMap<T, String>(choices.size());
+ final Map<T, String> idForChoice = new HashMap<>(choices.size());
// reduce number of method calls by building a lookup table
for (final T choice : choices)
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
index d5c2324..9bd18fd 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
@@ -74,7 +74,7 @@ public class SelectOptions<T> extends RepeatingView
public SelectOptions(final String id, final Collection<? extends T> elements,
final IOptionRenderer<T> renderer)
{
- this(id, new WildcardCollectionModel<T>(elements), renderer);
+ this(id, new WildcardCollectionModel<>(elements), renderer);
}
/**
@@ -131,7 +131,7 @@ public class SelectOptions<T> extends RepeatingView
*/
protected SelectOption<T> newOption(final String text, final IModel<T> model)
{
- return new SimpleSelectOption<T>("option", model, text);
+ return new SimpleSelectOption<>("option", model, text);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java
index 1b18e98..0ff6d5a 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java
@@ -90,7 +90,7 @@ public abstract class AbstractDataGridView<T> extends DataViewBase<T>
protected Item<ICellPopulator<T>> newCellItem(final String id, final int index,
final IModel<ICellPopulator<T>> model)
{
- return new Item<ICellPopulator<T>>(id, index, model);
+ return new Item<>(id, index, model);
}
@Override
@@ -116,7 +116,7 @@ public abstract class AbstractDataGridView<T> extends DataViewBase<T>
*/
protected Item<T> newRowItem(final String id, final int index, final IModel<T> model)
{
- return new Item<T>(id, index, model);
+ return new Item<>(id, index, model);
}
@@ -149,7 +149,7 @@ public abstract class AbstractDataGridView<T> extends DataViewBase<T>
for (int i = 0; i < populatorsNumber; i++)
{
ICellPopulator<T> populator = populators.get(i);
- IModel<ICellPopulator<T>> populatorModel = new Model<ICellPopulator<T>>(populator);
+ IModel<ICellPopulator<T>> populatorModel = new Model<>(populator);
Item<ICellPopulator<T>> cellItem = newCellItem(cells.newChildId(), i, populatorModel);
cells.add(cellItem);
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/PropertyPopulator.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/PropertyPopulator.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/PropertyPopulator.java
index a4fa5d8..145eb69 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/PropertyPopulator.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/PropertyPopulator.java
@@ -72,6 +72,6 @@ public class PropertyPopulator<T> implements ICellPopulator<T>
public void populateItem(final Item<ICellPopulator<T>> cellItem, final String componentId,
final IModel<T> rowModel)
{
- cellItem.add(new Label(componentId, new PropertyModel<T>(rowModel, property)));
+ cellItem.add(new Label(componentId, new PropertyModel<>(rowModel, property)));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java
index e8ddcee..0b2f5da 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java
@@ -57,7 +57,7 @@ public class OrderByBorder<S> extends Border
OrderByLink<S> link = newOrderByLink("orderByLink", property, stateLocator);
addToBorder(link);
- add(new OrderByLink.CssModifier<S>(link, cssProvider));
+ add(new OrderByLink.CssModifier<>(link, cssProvider));
link.add(getBodyContainer());
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
index 6c77f65..4eab5a8 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
@@ -392,7 +392,7 @@ public class DataTable<T, S> extends Panel implements IPageableItems
protected Item<IColumn<T, S>> newCellItem(final String id, final int index,
final IModel<IColumn<T, S>> model)
{
- return new Item<IColumn<T, S>>(id, index, model);
+ return new Item<>(id, index, model);
}
/**
@@ -411,7 +411,7 @@ public class DataTable<T, S> extends Panel implements IPageableItems
*/
protected Item<T> newRowItem(final String id, final int index, final IModel<T> model)
{
- return new Item<T>(id, index, model);
+ return new Item<>(id, index, model);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java
index d29d6b7..ced25e4 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java
@@ -63,14 +63,14 @@ public class DefaultDataTable<T, S> extends DataTable<T, S>
super(id, columns, dataProvider, rowsPerPage);
addTopToolbar(new NavigationToolbar(this));
- addTopToolbar(new HeadersToolbar<S>(this, dataProvider));
+ addTopToolbar(new HeadersToolbar<>(this, dataProvider));
addBottomToolbar(new NoRecordsToolbar(this));
}
@Override
protected Item<T> newRowItem(final String id, final int index, final IModel<T> model)
{
- return new OddEvenItem<T>(id, index, model);
+ return new OddEvenItem<>(id, index, model);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.java
index 6790435..400e5bb 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.java
@@ -36,7 +36,7 @@ public abstract class HeaderlessColumn<T, S> extends AbstractColumn<T, S>
*/
public HeaderlessColumn()
{
- super(new Model<String>(" "));
+ super(new Model<>(" "));
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java
index 54aa820..998a9a8 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java
@@ -66,7 +66,7 @@ public class HeadersToolbar<S> extends AbstractToolbar
@Override
protected Iterator<IModel<IColumn<T, S>>> getItemModels()
{
- List<IModel<IColumn<T, S>>> columnsModels = new LinkedList<IModel<IColumn<T, S>>>();
+ List<IModel<IColumn<T, S>>> columnsModels = new LinkedList<>();
for (IColumn<T, S> column : table.getColumns())
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
index 02e605d..283118e 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
@@ -47,7 +47,7 @@ public class NavigatorLabel extends Label
{
super(id);
setDefaultModel(new StringResourceModel("NavigatorLabel", this,
- new Model<LabelModelObject>(new LabelModelObject(pageable))));
+ new Model<>(new LabelModelObject(pageable))));
}
private static class LabelModelObject implements IClusterable
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java
index 93f5a09..beed589 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java
@@ -115,7 +115,7 @@ public class PropertyColumn<T, S> extends AbstractColumn<T, S> implements IExpor
@Override
public IModel<Object> getDataModel(IModel<T> rowModel)
{
- PropertyModel<Object> propertyModel = new PropertyModel<Object>(rowModel, propertyExpression);
+ PropertyModel<Object> propertyModel = new PropertyModel<>(rowModel, propertyExpression);
return propertyModel;
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.java
index d239ebd..7f1a070 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.java
@@ -58,7 +58,7 @@ public class ExportToolbar extends AbstractToolbar
private static final IModel<String> DEFAULT_FILE_NAME_MODEL = new ResourceModel(
"datatable.export-file-name");
- private final List<IDataExporter> dataExporters = new LinkedList<IDataExporter>();
+ private final List<IDataExporter> dataExporters = new LinkedList<>();
private IModel<String> messageModel;
@@ -332,7 +332,7 @@ public class ExportToolbar extends AbstractToolbar
throws IOException
{
IDataProvider<T> dataProvider = dataTable.getDataProvider();
- List<IExportableColumn<T, ?, ?>> exportableColumns = new LinkedList<IExportableColumn<T, ?, ?>>();
+ List<IExportableColumn<T, ?, ?>> exportableColumns = new LinkedList<>();
for (IColumn<T, S> col : dataTable.getColumns())
{
if (col instanceof IExportableColumn)
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java
index cb932e4..7917bd5 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java
@@ -129,7 +129,7 @@ public class ChoiceFilter<T> extends AbstractFilter
protected DropDownChoice<T> newDropDownChoice(final String id, final IModel<T> model,
final IModel<List<? extends T>> choices, final IChoiceRenderer<T> renderer)
{
- DropDownChoice<T> dropDownChoice = new DropDownChoice<T>(id, model, choices, renderer);
+ DropDownChoice<T> dropDownChoice = new DropDownChoice<>(id, model, choices, renderer);
dropDownChoice.setNullValid(true);
return dropDownChoice;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java
index bd383ea..2b227f7 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java
@@ -111,7 +111,7 @@ public class ChoiceFilteredPropertyColumn<T, Y, S> extends FilteredPropertyColum
*/
protected IModel<Y> getFilterModel(final FilterForm<?> form)
{
- return new PropertyModel<Y>(form.getDefaultModel(), getPropertyExpression());
+ return new PropertyModel<>(form.getDefaultModel(), getPropertyExpression());
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
index 39bae7a..ea355fd 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
@@ -61,7 +61,7 @@ public class FilterForm<T> extends Form<T>
*/
public FilterForm(final String id, final IFilterStateLocator<T> locator)
{
- super(id, new FilterStateModel<T>(locator));
+ super(id, new FilterStateModel<>(locator));
this.locator = locator;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java
index b7e3a3f..4e5d6ff 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java
@@ -72,7 +72,7 @@ public class FilterToolbar extends AbstractToolbar
@Override
public List<IColumn<T, S>> getObject() {
- List<IColumn<T, S>> columnsModels = new LinkedList<IColumn<T, S>>();
+ List<IColumn<T, S>> columnsModels = new LinkedList<>();
for (IColumn<T, S> column : table.getColumns())
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilter.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilter.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilter.java
index a27d565..cfcb865 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilter.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilter.java
@@ -46,7 +46,7 @@ public class TextFilter<T> extends AbstractFilter
public TextFilter(final String id, final IModel<T> model, final FilterForm<?> form)
{
super(id, form);
- filter = new TextField<T>("filter", model);
+ filter = new TextField<>("filter", model);
enableFocusTracking(filter);
add(filter);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java
index c3139d8..22f3cd2 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java
@@ -67,7 +67,7 @@ public class TextFilteredPropertyColumn<T, F, S> extends FilteredPropertyColumn<
@Override
public Component getFilter(final String componentId, final FilterForm<?> form)
{
- return new TextFilter<F>(componentId, getFilterModel(form), form);
+ return new TextFilter<>(componentId, getFilterModel(form), form);
}
/**
@@ -80,7 +80,7 @@ public class TextFilteredPropertyColumn<T, F, S> extends FilteredPropertyColumn<
*/
protected IModel<F> getFilterModel(final FilterForm<?> form)
{
- return new PropertyModel<F>(form.getDefaultModel(), getPropertyExpression());
+ return new PropertyModel<>(form.getDefaultModel(), getPropertyExpression());
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree.java
index f1430c2..b637f99 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree.java
@@ -134,7 +134,7 @@ public abstract class AbstractTree<T> extends Panel implements IGenericComponent
*/
protected IModel<Set<T>> newModel()
{
- return new ProviderSubset<T>(provider).createModel();
+ return new ProviderSubset<>(provider).createModel();
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultNestedTree.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultNestedTree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultNestedTree.java
index 2901ff3..6c98695 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultNestedTree.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultNestedTree.java
@@ -76,6 +76,6 @@ public class DefaultNestedTree<T> extends NestedTree<T>
@Override
protected Component newContentComponent(String id, IModel<T> node)
{
- return new Folder<T>(id, this, node);
+ return new Folder<>(id, this, node);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultTableTree.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultTableTree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultTableTree.java
index 039b324..eb729ea 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultTableTree.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/DefaultTableTree.java
@@ -84,7 +84,7 @@ public class DefaultTableTree<T, S> extends TableTree<T, S>
super(id, columns, provider, rowsPerPage, state);
getTable().addTopToolbar(new NavigationToolbar(getTable()));
- getTable().addTopToolbar(new HeadersToolbar<S>(getTable(), provider));
+ getTable().addTopToolbar(new HeadersToolbar<>(getTable(), provider));
getTable().addBottomToolbar(new NoRecordsToolbar(getTable()));
add(new WindowsTheme());
@@ -101,7 +101,7 @@ public class DefaultTableTree<T, S> extends TableTree<T, S>
@Override
protected Component newContentComponent(String id, IModel<T> model)
{
- return new Folder<T>(id, this, model);
+ return new Folder<>(id, this, model);
}
/**
@@ -115,6 +115,6 @@ public class DefaultTableTree<T, S> extends TableTree<T, S>
@Override
protected Item<T> newRowItem(String id, int index, IModel<T> node)
{
- return new OddEvenItem<T>(id, index, node);
+ return new OddEvenItem<>(id, index, node);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.java
index 6406a89..9619d90 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.java
@@ -82,7 +82,7 @@ public abstract class NestedTree<T> extends AbstractTree<T>
*/
public Component newSubtree(String id, IModel<T> model)
{
- return new Subtree<T>(id, this, model);
+ return new Subtree<>(id, this, model);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java
index c0bfe5a..f12c7af 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java
@@ -243,7 +243,7 @@ public abstract class TableTree<T, S> extends AbstractTree<T>
*/
protected Item<T> newRowItem(String id, int index, IModel<T> model)
{
- Item<T> item = new Item<T>(id, index, model);
+ Item<T> item = new Item<>(id, index, model);
return item;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/content/CheckFolder.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/content/CheckFolder.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/content/CheckFolder.java
index 6a61593..3dd5c18 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/content/CheckFolder.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/content/CheckFolder.java
@@ -35,6 +35,6 @@ public class CheckFolder<T> extends Folder<T>
{
super(id, tree, model);
- add(new Check<T>("check", model));
+ add(new Check<>("check", model));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/nested/Subtree.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/nested/Subtree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/nested/Subtree.java
index f2cba45..fdf07b5 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/nested/Subtree.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/nested/Subtree.java
@@ -119,7 +119,7 @@ public class Subtree<T> extends Panel
protected BranchItem<T> newBranchItem(String id, int index, IModel<T> model)
{
- return new BranchItem<T>(id, index, model);
+ return new BranchItem<>(id, index, model);
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProvider.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProvider.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProvider.java
index 519b1f4..d803918 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProvider.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProvider.java
@@ -73,7 +73,7 @@ public abstract class TreeDataProvider<T> implements ITreeDataProvider<T>
@Override
public Iterator<? extends T> iterator(long first, long count)
{
- currentBranch = new Branch<T>(null, provider.getRoots());
+ currentBranch = new Branch<>(null, provider.getRoots());
Iterator<T> iterator = new Iterator<T>()
{
@@ -106,7 +106,7 @@ public abstract class TreeDataProvider<T> implements ITreeDataProvider<T>
if (iterateChildren(next))
{
- currentBranch = new Branch<T>(previousBranch, provider.getChildren(next));
+ currentBranch = new Branch<>(previousBranch, provider.getChildren(next));
}
return next;
@@ -175,7 +175,7 @@ public abstract class TreeDataProvider<T> implements ITreeDataProvider<T>
branch = branch.parent;
}
- return new NodeModel<T>(model, branches);
+ return new NodeModel<>(model, branches);
}
public int getDepth()
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubset.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubset.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubset.java
index f5ec011..912901b 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubset.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubset.java
@@ -43,7 +43,7 @@ public class ProviderSubset<T> implements Set<T>, IDetachable
private ITreeProvider<T> provider;
- private Set<IModel<T>> models = new HashSet<IModel<T>>();
+ private Set<IModel<T>> models = new HashSet<>();
/**
* Create an empty subset.
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java
index caf2d47..5039ca7 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java
@@ -50,7 +50,7 @@ public class SingleSortState<T> implements ISortState<T>, IClusterable
}
else
{
- param = new SortParam<T>(property, order == SortOrder.ASCENDING);
+ param = new SortParam<>(property, order == SortOrder.ASCENDING);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java
index 8671169..aba3b00 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java
@@ -40,7 +40,7 @@ public abstract class SortableDataProvider<T, S> implements ISortableDataProvide
*/
private static final long serialVersionUID = 1L;
- private final SingleSortState<S> state = new SingleSortState<S>();
+ private final SingleSortState<S> state = new SingleSortState<>();
/**
* @see ISortableDataProvider#getSortState()
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableTreeProvider.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableTreeProvider.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableTreeProvider.java
index c3058f6..fae4a7e 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableTreeProvider.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableTreeProvider.java
@@ -33,7 +33,7 @@ public abstract class SortableTreeProvider<T, S> implements ISortableTreeProvide
{
private static final long serialVersionUID = 1L;
- private final SingleSortState<S> state = new SingleSortState<S>();
+ private final SingleSortState<S> state = new SingleSortState<>();
/**
* @see ISortableDataProvider#getSortState()
@@ -75,7 +75,7 @@ public abstract class SortableTreeProvider<T, S> implements ISortableTreeProvide
*/
public void setSort(S property, boolean ascending)
{
- setSort(new SortParam<S>(property, ascending));
+ setSort(new SortParam<>(property, ascending));
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProvider.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProvider.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProvider.java
index f210000..15a9251 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProvider.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProvider.java
@@ -209,7 +209,7 @@ public abstract class TreeModelProvider<T> implements ITreeProvider<T>
{
if (nodeUpdates == null)
{
- nodeUpdates = new ArrayList<T>();
+ nodeUpdates = new ArrayList<>();
}
for (Object node : nodes)
@@ -222,7 +222,7 @@ public abstract class TreeModelProvider<T> implements ITreeProvider<T>
{
if (branchUpdates == null)
{
- branchUpdates = new ArrayList<T>();
+ branchUpdates = new ArrayList<>();
}
branchUpdates.add(cast(branch));
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
index f70ef2b..94cb909 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
@@ -165,7 +165,7 @@ public class TabbedPanel<T extends ITab> extends Panel
@Override
protected IModel<?> initModel()
{
- return new Model<Integer>(-1);
+ return new Model<>(-1);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java
index 6b06a9f..127a386 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java
@@ -172,7 +172,7 @@ public abstract class RatingPanel extends Panel
/**
* The number of stars that need to be shown, should result in an Integer object.
*/
- private IModel<Integer> nrOfStars = new Model<Integer>(5);
+ private IModel<Integer> nrOfStars = new Model<>(5);
/**
* The number of votes that have been cast, should result in an Integer object.
@@ -213,7 +213,7 @@ public abstract class RatingPanel extends Panel
*/
public RatingPanel(final String id, final IModel<? extends Number> rating)
{
- this(id, rating, new Model<Integer>(5), null, new Model<Boolean>(Boolean.FALSE), true);
+ this(id, rating, new Model<Integer>(5), null, new Model<>(Boolean.FALSE), true);
}
/**
@@ -270,7 +270,7 @@ public abstract class RatingPanel extends Panel
final IModel<Integer> nrOfVotes, final boolean addDefaultCssStyle)
{
this(id, rating, new Model<Integer>(nrOfStars), nrOfVotes,
- new Model<Boolean>(Boolean.FALSE), addDefaultCssStyle);
+ new Model<>(Boolean.FALSE), addDefaultCssStyle);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetMap.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetMap.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetMap.java
index 5f204cc..e0ca3b5 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetMap.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetMap.java
@@ -64,7 +64,7 @@ public final class CharSetMap
/**
* A common charset mapper for languages.
*/
- private static final Map<String, String> commonMapper = new HashMap<String, String>();
+ private static final Map<String, String> commonMapper = new HashMap<>();
static
{
@@ -112,7 +112,7 @@ public final class CharSetMap
/**
* A collection of available charset mappers.
*/
- private final List<Map<String, String>> mappers = new ArrayList<Map<String, String>>();
+ private final List<Map<String, String>> mappers = new ArrayList<>();
{
for (int i = 0; i < MAP_COM; i++)
{
@@ -144,7 +144,7 @@ public final class CharSetMap
private static Map<String, String> createMap(final Properties props)
{
- HashMap<String, String> map = new HashMap<String, String>();
+ HashMap<String, String> map = new HashMap<>();
for (Object key : props.keySet())
{
String keyString = (String)key;
@@ -322,7 +322,7 @@ public final class CharSetMap
}
else
{
- mapper = new HashMap<String, String>();
+ mapper = new HashMap<>();
}
mapper.put(key, charset);
mappers.add(MAP_PROG, mapper);
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/StaticContentStep.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/StaticContentStep.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/StaticContentStep.java
index 8007df8..889fcbb 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/StaticContentStep.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/StaticContentStep.java
@@ -88,7 +88,7 @@ public class StaticContentStep extends WizardStep
public StaticContentStep(final IModel<String> title, final IModel<String> summary,
final String content, final boolean allowHtml)
{
- this(title, summary, new Model<String>(content), allowHtml);
+ this(title, summary, new Model<>(content), allowHtml);
}
/**
@@ -107,7 +107,7 @@ public class StaticContentStep extends WizardStep
public StaticContentStep(final String title, final String summary, final IModel<?> content,
final boolean allowHtml)
{
- this(new Model<String>(title), new Model<String>(summary), content, allowHtml);
+ this(new Model<String>(title), new Model<>(summary), content, allowHtml);
}
/**
@@ -126,7 +126,7 @@ public class StaticContentStep extends WizardStep
public StaticContentStep(final String title, final String summary, final String content,
final boolean allowHtml)
{
- this(title, summary, new Model<String>(content), allowHtml);
+ this(title, summary, new Model<>(content), allowHtml);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java
index ac9e9e1..3e478da 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java
@@ -323,7 +323,7 @@ public class Wizard extends Panel implements IWizardModelListener, IWizard
*/
protected <E> Form<E> newForm(final String id)
{
- return new Form<E>(id);
+ return new Form<>(id);
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardModel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardModel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardModel.java
index 3a10768..fd88683 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardModel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardModel.java
@@ -83,13 +83,13 @@ public class WizardModel extends AbstractWizardModel
private IWizardStep activeStep;
/** Conditions with steps. */
- private final List<ICondition> conditions = new ArrayList<ICondition>();
+ private final List<ICondition> conditions = new ArrayList<>();
/** State history. */
- private final ArrayListStack<IWizardStep> history = new ArrayListStack<IWizardStep>();
+ private final ArrayListStack<IWizardStep> history = new ArrayListStack<>();
/** The wizard steps. */
- private final List<IWizardStep> steps = new ArrayList<IWizardStep>();
+ private final List<IWizardStep> steps = new ArrayList<>();
/**
* Construct.
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java
index e589cbd..ad08bbf 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java
@@ -88,7 +88,7 @@ public class WizardStep extends Panel implements IWizardStep
private static final long serialVersionUID = 1L;
- private final List<IFormValidator> validators = new ArrayList<IFormValidator>();
+ private final List<IFormValidator> validators = new ArrayList<>();
/**
* Adds a form validator.
@@ -109,7 +109,7 @@ public class WizardStep extends Panel implements IWizardStep
{
if (isActiveStep())
{
- Set<Component> components = new HashSet<Component>();
+ Set<Component> components = new HashSet<>();
for (IFormValidator v : validators)
{
FormComponent<?>[] dependentComponents = v.getDependentFormComponents();
@@ -166,7 +166,7 @@ public class WizardStep extends Panel implements IWizardStep
public Header(final String id, final IWizard wizard)
{
super(id);
- setDefaultModel(new CompoundPropertyModel<IWizard>(wizard));
+ setDefaultModel(new CompoundPropertyModel<>(wizard));
add(new Label("title", new AbstractReadOnlyModel<String>()
{
private static final long serialVersionUID = 1L;
@@ -290,7 +290,7 @@ public class WizardStep extends Panel implements IWizardStep
*/
public WizardStep(final String title, final String summary, final IModel<?> model)
{
- this(new Model<String>(title), new Model<String>(summary), model);
+ this(new Model<String>(title), new Model<>(summary), model);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java
index c172f44..d4b9227 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java
@@ -34,7 +34,7 @@ public class AjaxEditableLabelPage extends WebPage
public AjaxEditableLabelPage()
{
final AjaxEditableLabel<String> ajaxLabel = new AjaxEditableLabel<String>("ajaxLabel",
- new Model<String>("ajaxTest"));
+ new Model<>("ajaxTest"));
add(ajaxLabel);
add(new AjaxLink<Void>("toggle")
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTest.java
index dd4c318..1da0aed 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTest.java
@@ -40,10 +40,10 @@ public class PaletteTest extends WicketTestCase
@Test
public void standard()
{
- IModel<List<String>> selected = new ListModel<String>(new ArrayList<String>(Arrays.asList(
+ IModel<List<String>> selected = new ListModel<>(new ArrayList<>(Arrays.asList(
"A", "D")));
- IModel<List<String>> all = new ListModel<String>(new ArrayList<String>(Arrays.asList("A",
+ IModel<List<String>> all = new ListModel<>(new ArrayList<>(Arrays.asList("A",
"B", "C", "D")));
PaletteTestPage testPage = new PaletteTestPage(selected, all);
@@ -67,10 +67,10 @@ public class PaletteTest extends WicketTestCase
@Test
public void choicesModelMissingSelected()
{
- IModel<List<String>> selected = new ListModel<String>(new ArrayList<String>(
+ IModel<List<String>> selected = new ListModel<>(new ArrayList<>(
Arrays.asList("D")));
- IModel<List<String>> all = new ListModel<String>(new ArrayList<String>(Arrays.asList("A",
+ IModel<List<String>> all = new ListModel<>(new ArrayList<>(Arrays.asList("A",
"B", "C")));
PaletteTestPage testPage = new PaletteTestPage(selected, all);
@@ -91,9 +91,9 @@ public class PaletteTest extends WicketTestCase
@Test
public void choicesModelAccountingForSelected()
{
- final List<String> list = new ArrayList<String>(Arrays.asList("D"));
+ final List<String> list = new ArrayList<>(Arrays.asList("D"));
- IModel<List<String>> selected = new ListModel<String>(list);
+ IModel<List<String>> selected = new ListModel<>(list);
IModel<List<String>> all = new LoadableDetachableModel<List<String>>()
{
@@ -102,7 +102,7 @@ public class PaletteTest extends WicketTestCase
{
List<String> fromDB = Arrays.asList("A", "B", "C"); // normally coming from DB
- List<String> result = new ArrayList<String>();
+ List<String> result = new ArrayList<>();
result.addAll(fromDB);
// include already selected
@@ -131,9 +131,9 @@ public class PaletteTest extends WicketTestCase
@Test
public void choicesModelSingleNotSelected()
{
- IModel<List<String>> selected = new ListModel<String>(new ArrayList<String>());
+ IModel<List<String>> selected = new ListModel<>(new ArrayList<String>());
- IModel<List<String>> all = new ListModel<String>(new ArrayList<String>(Arrays.asList("A")));
+ IModel<List<String>> all = new ListModel<>(new ArrayList<>(Arrays.asList("A")));
PaletteTestPage testPage = new PaletteTestPage(selected, all);
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTestPage.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTestPage.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTestPage.java
index 9e565c4..ccb62c0 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTestPage.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTestPage.java
@@ -41,7 +41,7 @@ public class PaletteTestPage extends WebPage
*/
public PaletteTestPage(IModel<List<String>> selected, IModel<List<String>> all)
{
- form = new Form<Object>("form", new CompoundPropertyModel<Object>("WICKET-5086"));
+ form = new Form<>("form", new CompoundPropertyModel<Object>("WICKET-5086"));
add(form);
IChoiceRenderer<String> choiceRenderer = new IChoiceRenderer<String>()
@@ -60,7 +60,7 @@ public class PaletteTestPage extends WebPage
};
- palette = new Palette<String>("palette", selected, all, choiceRenderer, 10, true);
+ palette = new Palette<>("palette", selected, all, choiceRenderer, 10, true);
form.add(palette);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage.java
index d665d4f..e8eeae9 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage.java
@@ -42,6 +42,6 @@ public class SelectTestPage extends WebPage
select.add(option1 = new SelectOption<>("option1", new Model<>("OPTION_1")));
select.add(new SelectOption<>("option2", new Model<>("OPTION_2")));
- form.add(new TextField<>("text", new Model<String>(null)).setRequired(true));
+ form.add(new TextField<>("text", new Model<>(null)).setRequired(true));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage2.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage2.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage2.java
index 4a22e72..64c1e37 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage2.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage2.java
@@ -34,7 +34,7 @@ public class SelectTestPage2 extends WebPage
public SelectTestPage2()
{
- form = new Form<Void>("form");
+ form = new Form<>("form");
add(form);
select = new Select<Foo>("select", new Model<Foo>(new Foo("foo")))
@@ -50,7 +50,7 @@ public class SelectTestPage2 extends WebPage
};
form.add(select);
- select.add(option0 = new SelectOption<Foo>("option0", new Model<Foo>(new Foo("foo"))));
+ select.add(option0 = new SelectOption<Foo>("option0", new Model<>(new Foo("foo"))));
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTablePage.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTablePage.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTablePage.java
index 64a65d1..44eb1ed 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTablePage.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTablePage.java
@@ -43,9 +43,9 @@ public class DataTablePage extends WebPage
*/
public DataTablePage()
{
- List<IColumn<Contact, String>> columns = new ArrayList<IColumn<Contact, String>>();
+ List<IColumn<Contact, String>> columns = new ArrayList<>();
- columns.add(new AbstractColumn<Contact, String>(new Model<String>("Actions"))
+ columns.add(new AbstractColumn<Contact, String>(new Model<>("Actions"))
{
private static final long serialVersionUID = 1L;
@@ -57,7 +57,7 @@ public class DataTablePage extends WebPage
}
});
- columns.add(new PropertyColumn<Contact, String>(new Model<String>("ID"), "id")
+ columns.add(new PropertyColumn<Contact, String>(new Model<>("ID"), "id")
{
private static final long serialVersionUID = 1L;
@@ -68,10 +68,10 @@ public class DataTablePage extends WebPage
}
});
- columns.add(new PropertyColumn<Contact, String>(new Model<String>("First Name"), "firstName",
+ columns.add(new PropertyColumn<Contact, String>(new Model<>("First Name"), "firstName",
"firstName"));
- columns.add(new PropertyColumn<Contact, String>(new Model<String>("Last Name"), "lastName",
+ columns.add(new PropertyColumn<Contact, String>(new Model<>("Last Name"), "lastName",
"lastName")
{
private static final long serialVersionUID = 1L;
@@ -83,8 +83,8 @@ public class DataTablePage extends WebPage
}
});
- columns.add(new PropertyColumn<Contact, String>(new Model<String>("Home Phone"), "homePhone"));
- columns.add(new PropertyColumn<Contact, String>(new Model<String>("Cell Phone"), "cellPhone"));
+ columns.add(new PropertyColumn<Contact, String>(new Model<>("Home Phone"), "homePhone"));
+ columns.add(new PropertyColumn<Contact, String>(new Model<>("Cell Phone"), "cellPhone"));
@SuppressWarnings({ "rawtypes", "unchecked" })
DefaultDataTable defaultDataTable = new DefaultDataTable("table", columns,
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java
index 2749a7d..d9711cc 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java
@@ -171,10 +171,10 @@ public class DataTableTest extends WicketTestCase
}
};
- List<IColumn<Number, String>> columns = new ArrayList<IColumn<Number, String>>();
+ List<IColumn<Number, String>> columns = new ArrayList<>();
columns.add(new PropertyColumn<Number, String>(Model.of("value"), "value"));
- DataTable<Number, String> table = new DataTable<Number, String>("table", columns, provider, 10);
+ DataTable<Number, String> table = new DataTable<>("table", columns, provider, 10);
table.addBottomToolbar(new NoRecordsToolbar(table));
table.addTopToolbar(new NoRecordsToolbar(table));
add(table);
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProviderTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProviderTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProviderTest.java
index c094965..6d36904 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProviderTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProviderTest.java
@@ -99,7 +99,7 @@ public class TreeDataProviderTest extends Assert
@Override
public Iterator<? extends String> getChildren(String object)
{
- List<String> children = new ArrayList<String>();
+ List<String> children = new ArrayList<>();
if (hasChildren(object))
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubsetTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubsetTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubsetTest.java
index 3f261db..dc1bac9 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubsetTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubsetTest.java
@@ -38,7 +38,7 @@ public class ProviderSubsetTest extends Assert
/**
* All models requested from the provider.
*/
- private List<StringModel> models = new ArrayList<StringModel>();
+ private List<StringModel> models = new ArrayList<>();
/**
* Test set methods.
@@ -46,7 +46,7 @@ public class ProviderSubsetTest extends Assert
@Test
public void setMethods()
{
- ProviderSubset<String> subset = new ProviderSubset<String>(provider);
+ ProviderSubset<String> subset = new ProviderSubset<>(provider);
subset.add("A");
subset.addAll(Arrays.asList("AA", "AAA"));
@@ -144,7 +144,7 @@ public class ProviderSubsetTest extends Assert
private static final long serialVersionUID = 1L;
- private List<String> EMPTY = new ArrayList<String>();
+ private List<String> EMPTY = new ArrayList<>();
@Override
public Iterator<String> getRoots()
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/AjaxTabbedPanelTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/AjaxTabbedPanelTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/AjaxTabbedPanelTest.java
index b5df8b3..da090e3 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/AjaxTabbedPanelTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/AjaxTabbedPanelTest.java
@@ -25,6 +25,6 @@ public class AjaxTabbedPanelTest extends TabbedPanelTest
@Override
TabbedPanel<ITab> newTabbedPanel(List<ITab> defaultTabs)
{
- return new AjaxTabbedPanel<ITab>("tabpanel", defaultTabs);
+ return new AjaxTabbedPanel<>("tabpanel", defaultTabs);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java
index ab660bf..9407c90 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java
@@ -44,7 +44,7 @@ public class TabbedPanelTest extends WicketTestCase
*/
public TestPage()
{
- List<ITab> defaultTabs = new ArrayList<ITab>();
+ List<ITab> defaultTabs = new ArrayList<>();
defaultTabs.add(new AbstractTab(Model.of("default 1"))
{
private static final long serialVersionUID = 1L;
@@ -73,7 +73,7 @@ public class TabbedPanelTest extends WicketTestCase
TabbedPanel<ITab> newTabbedPanel(List<ITab> defaultTabs)
{
- return new TabbedPanel<ITab>("tabpanel", defaultTabs);
+ return new TabbedPanel<>("tabpanel", defaultTabs);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelVisibilityTestPage.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelVisibilityTestPage.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelVisibilityTestPage.java
index c475956..cdb2a3d 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelVisibilityTestPage.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelVisibilityTestPage.java
@@ -34,7 +34,7 @@ public class TabbedPanelVisibilityTestPage extends WebPage
public TabbedPanelVisibilityTestPage(int nbTabs, int nbTabsVisible)
{
- List<ITab> tabs = new ArrayList<ITab>(nbTabs);
+ List<ITab> tabs = new ArrayList<>(nbTabs);
for (int i = 0; i < nbTabs; i++)
{
tabs.add(new DummyTab(i < nbTabsVisible));
http://git-wip-us.apache.org/repos/asf/wicket/blob/732c9090/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java
index b74490b..f56d199 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java
@@ -43,7 +43,7 @@ public class RfcCompliantEmailValidatorTest extends Assert
"giovanni+cuccu@email.com" };
for (String emailAddress : validEmails)
{
- Validatable<String> validatable = new Validatable<String>(emailAddress);
+ Validatable<String> validatable = new Validatable<>(emailAddress);
validator.validate(validatable);
assertTrue(emailAddress + " wasn't valid but should be", validatable.isValid());
}
@@ -64,7 +64,7 @@ public class RfcCompliantEmailValidatorTest extends Assert
for (String emailAddress : inValidEmails)
{
- Validatable<String> validatable = new Validatable<String>(emailAddress);
+ Validatable<String> validatable = new Validatable<>(emailAddress);
validator.validate(validatable);
assertFalse(emailAddress + " was valid but shouldn't be", validatable.isValid());
}
[05/20] git commit: Fix jshint warnings
Posted by mg...@apache.org.
Fix jshint warnings
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b59bb769
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b59bb769
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b59bb769
Branch: refs/heads/master
Commit: b59bb769871633de82c45a74892d1077a41e5e86
Parents: 44a4132
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 09:53:10 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:38 2013 +0200
----------------------------------------------------------------------
Gruntfile.js | 15 +++++++--------
wicket-core/src/test/js/event.js | 4 +++-
2 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/b59bb769/Gruntfile.js
----------------------------------------------------------------------
diff --git a/Gruntfile.js b/Gruntfile.js
index f3877ae..127d429 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -6,7 +6,6 @@
* 1) install node.js - http://nodejs.org/#download. This will install 'npm' (Node Package Manager) too
* 2) install grunt - 'npm -g install grunt-cli'
* 3) run: npm install (This will use package.json and install all dependencies)
- * 4) use it:
* 4.1) grunt jshint - checks all JavaScript files with JSHint
* 4.2) grunt jshint:core - checks only the files in wicket-core
* 4.3) grunt test - starts a web server and runs all tests (Ajax, non-Ajax and AMD)
@@ -118,13 +117,13 @@ module.exports = function(grunt) {
},
connect: {
- server: {
- options: {
- port: 38888,
- base: './wicket-core/src'
- }
- }
- }
+ server: {
+ options: {
+ port: 38888,
+ base: './wicket-core/src'
+ }
+ }
+ }
});
grunt.loadNpmTasks('grunt-contrib-qunit');
http://git-wip-us.apache.org/repos/asf/wicket/blob/b59bb769/wicket-core/src/test/js/event.js
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/js/event.js b/wicket-core/src/test/js/event.js
index 84b9a74..cae6d94 100644
--- a/wicket-core/src/test/js/event.js
+++ b/wicket-core/src/test/js/event.js
@@ -16,7 +16,7 @@
*/
/*global ok: true, start: true, test: true, equal: true, deepEqual: true,
- QUnit: true, module: true, expect: true */
+ QUnit: true, module: true, expect: true, stop: true */
jQuery(document).ready(function() {
"use strict";
@@ -237,7 +237,9 @@ jQuery(document).ready(function() {
module("Custom events");
test('inputchange', function() {
+
stop();
+
if (Wicket.Browser.isIE()) {
expect(3);
} else {