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/18 16:42:37 UTC
[2/6] git commit: Java 7 diamonds
Java 7 diamonds
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/604a075f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/604a075f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/604a075f
Branch: refs/heads/master
Commit: 604a075fbcbd71606ef48938294263230e450ec3
Parents: 8e518d8
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Jun 18 14:43:39 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jun 18 14:43:39 2013 +0200
----------------------------------------------------------------------
.../extensions/markup/html/form/select/Select.java | 2 +-
.../markup/html/form/select/SelectTestPage.java | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/604a075f/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java
index 91e4de7..79c8c09 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java
@@ -151,7 +151,7 @@ public class Select<T> extends FormComponent<T>
"] is not of type java.util.Collection, but more then one SelectOption component has been selected. Either remove the multiple attribute from the select tag or make the model of the Select component a collection");
}
- List<Object> converted = new ArrayList<Object>(values.length);
+ List<Object> converted = new ArrayList<>(values.length);
/*
* if the input is null we do not need to do anything since the model collection has already
http://git-wip-us.apache.org/repos/asf/wicket/blob/604a075f/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage.java
index b64ec9c..d665d4f 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage.java
@@ -32,16 +32,16 @@ public class SelectTestPage extends WebPage
public SelectTestPage()
{
- form = new Form<Void>("form");
+ form = new Form<>("form");
add(form);
- select = new Select<String>("select", new Model<String>(null));
+ select = new Select<>("select", new Model<String>(null));
form.add(select);
- select.add(new SelectOption<String>("option0", new Model<String>("OPTION_0")));
- select.add(option1 = new SelectOption<String>("option1", new Model<String>("OPTION_1")));
- select.add(new SelectOption<String>("option2", new Model<String>("OPTION_2")));
+ select.add(new SelectOption<>("option0", new Model<>("OPTION_0")));
+ select.add(option1 = new SelectOption<>("option1", new Model<>("OPTION_1")));
+ select.add(new SelectOption<>("option2", new Model<>("OPTION_2")));
- form.add(new TextField<String>("text", new Model<String>(null)).setRequired(true));
+ form.add(new TextField<>("text", new Model<String>(null)).setRequired(true));
}
}
\ No newline at end of file