Simplify the code to find the RadioGroup's model value (cherry picked from commit 80e3c6a209f79de9074894325c07ecd96f6784fd)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/af400d80 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/af400d80 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/af400d80 Branch: refs/heads/master Commit: af400d80f33c3fe2d25712cc4f42681e110a6df9 Parents: e6e3cef Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue May 27 15:06:53 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue May 27 15:09:32 2014 +0200 ---------------------------------------------------------------------- .../org/apache/wicket/markup/html/form/RadioGroup.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/af400d80/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java index 4bcccd6..8e412e5 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java @@ -92,24 +92,19 @@ public class RadioGroup<T> extends FormComponent<T> implements IOnChangeListener @Override protected String getModelValue() { - final StringBuilder builder = new StringBuilder(); - - final T t = getModelObject(); - - visitChildren(Radio.class, new IVisitor<Radio<T>, Void>() + String radioValue = visitChildren(Radio.class, new IVisitor<Radio<T>, String>() { @Override - public void component(Radio<T> radio, IVisit<Void> visit) + public void component(Radio<T> radio, IVisit<String> visit) { if (getModelComparator().compare(RadioGroup.this, radio.getDefaultModelObject())) { - builder.append(radio.getValue()); - visit.stop(); + visit.stop(radio.getValue()); } } }); - return builder.toString(); + return radioValue; } /**
