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 2014/05/27 15:17:55 UTC
[1/2] git commit: Minor fixes:
Repository: wicket
Updated Branches:
refs/heads/master 5efb8091f -> af400d80f
Minor fixes:
- remove unused logger
- fix javadoc parameter
(cherry picked from commit 03c2210fccc1dd458b5f588cadf130861444b519)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e6e3cefa
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e6e3cefa
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e6e3cefa
Branch: refs/heads/master
Commit: e6e3cefa983248465060ff511d523bf1b9fd2335
Parents: 5efb809
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue May 27 14:55:32 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue May 27 15:08:18 2014 +0200
----------------------------------------------------------------------
.../wicket/markup/html/form/AbstractSingleSelectChoice.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6e3cefa/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 51e21a7..3ff86d0 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
@@ -388,8 +388,8 @@ public abstract class AbstractSingleSelectChoice<T> extends AbstractChoice<T, T>
* Gets whether the given value represents the current selection.
*
*
- * aram object The object to check
- *
+ * @param object
+ * The object to check
* @param index
* The index of the object in the collection
* @param selected
[2/2] git commit: Simplify the code to find the RadioGroup's model
value
Posted by mg...@apache.org.
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 <mg...@apache.org>
Authored: Tue May 27 15:06:53 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
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;
}
/**