Updated Branches: refs/heads/master 91cc7960f -> 69530253d
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/34eaca28 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/34eaca28 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/34eaca28 Branch: refs/heads/master Commit: 34eaca28eb661b51f2937c14f8a48c32b438851d Parents: 91cc796 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Dec 19 12:02:27 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Dec 19 12:02:27 2013 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/markup/ComponentTag.java | 6 +++--- .../org/apache/wicket/markup/html/form/AbstractChoice.java | 4 ++-- .../wicket/markup/html/form/AbstractSingleSelectChoice.java | 2 +- .../org/apache/wicket/markup/html/form/EnumChoiceRenderer.java | 1 - .../java/org/apache/wicket/markup/html/form/FormComponent.java | 3 +-- .../markup/html/form/palette/component/Recorder.java | 4 ++-- 6 files changed, 9 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/34eaca28/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java b/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java index 24dcc25..d387368 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java @@ -430,11 +430,11 @@ public class ComponentTag extends MarkupElement } if (behaviors != null) { - dest.behaviors = new ArrayList<Behavior>(behaviors); + dest.behaviors = new ArrayList<>(behaviors); } if (userData != null) { - dest.userData = new HashMap<String, Object>(userData); + dest.userData = new HashMap<>(userData); } } @@ -917,7 +917,7 @@ public class ComponentTag extends MarkupElement { if (userData == null) { - userData = new HashMap<String, Object>(); + userData = new HashMap<>(); } userData.put(key, value); } http://git-wip-us.apache.org/repos/asf/wicket/blob/34eaca28/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java index b094a54..9a46891 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java @@ -246,7 +246,7 @@ public abstract class AbstractChoice<T, E> extends FormComponent<T> addStateChange(); } } - this.choices = new WildcardListModel<E>(choices); + this.choices = new WildcardListModel<>(choices); return this; } @@ -268,7 +268,7 @@ public abstract class AbstractChoice<T, E> extends FormComponent<T> { if (renderer == null) { - renderer = new ChoiceRenderer<E>(); + renderer = new ChoiceRenderer<>(); } this.renderer = renderer; return this; http://git-wip-us.apache.org/repos/asf/wicket/blob/34eaca28/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java index 8ab23a5..667037a 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java @@ -409,4 +409,4 @@ public abstract class AbstractSingleSelectChoice<T> extends AbstractChoice<T, T> { return (selected != null) && selected.equals(getChoiceRenderer().getIdValue(object, index)); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/34eaca28/wicket-core/src/main/java/org/apache/wicket/markup/html/form/EnumChoiceRenderer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/EnumChoiceRenderer.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/EnumChoiceRenderer.java index 563e855..ff87c58 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/EnumChoiceRenderer.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/EnumChoiceRenderer.java @@ -116,5 +116,4 @@ public class EnumChoiceRenderer<T extends Enum<T>> implements IChoiceRenderer<T> { return object.name(); } - } http://git-wip-us.apache.org/repos/asf/wicket/blob/34eaca28/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java index 963cb45..fdeb8c6 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java @@ -44,7 +44,6 @@ import org.apache.wicket.markup.html.form.AutoLabelResolver.AutoLabelMarker; import org.apache.wicket.model.IModel; import org.apache.wicket.model.IPropertyReflectionAwareModel; import org.apache.wicket.model.Model; -import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.convert.ConversionException; import org.apache.wicket.util.convert.IConverter; import org.apache.wicket.util.lang.Args; @@ -852,7 +851,7 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer impleme @SuppressWarnings("unchecked") public final List<IValidator<? super T>> getValidators() { - final List<IValidator<? super T>> list = new ArrayList<IValidator<? super T>>(); + final List<IValidator<? super T>> list = new ArrayList<>(); for (Behavior behavior : getBehaviors()) { http://git-wip-us.apache.org/repos/asf/wicket/blob/34eaca28/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java index 080d5b1..9985066 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java @@ -161,7 +161,7 @@ public class Recorder<T> extends HiddenField<String> { final IChoiceRenderer<T> renderer = getPalette().getChoiceRenderer(); final Collection<? extends T> choices = getPalette().getChoices(); - final List<T> unselected = new ArrayList<T>(choices.size()); + final List<T> unselected = new ArrayList<>(choices.size()); final String ids = getValue(); for (final T choice : choices) @@ -176,4 +176,4 @@ public class Recorder<T> extends HiddenField<String> return unselected; } -} \ No newline at end of file +}
