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:30 UTC
[11/20] git commit: Java 7 diamonds for wicket-examples
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