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:29 UTC
[10/20] Java 7 diamonds for wicket-examples
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++)
{