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:08:02 UTC
[1/4] git commit: Minor fixes:
Repository: wicket
Updated Branches:
refs/heads/wicket-6.x e40ae9188 -> 597ef45fc
Minor fixes:
- remove unused logger
- fix javadoc parameter
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/03c2210f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/03c2210f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/03c2210f
Branch: refs/heads/wicket-6.x
Commit: 03c2210fccc1dd458b5f588cadf130861444b519
Parents: e40ae91
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 14:55:32 2014 +0200
----------------------------------------------------------------------
.../wicket/markup/html/form/AbstractSingleSelectChoice.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/03c2210f/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 8518ec5..d05da71 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
@@ -22,8 +22,6 @@ import org.apache.wicket.Localizer;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.Strings;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
@@ -39,7 +37,6 @@ import org.slf4j.LoggerFactory;
public abstract class AbstractSingleSelectChoice<T> extends AbstractChoice<T, T>
{
private static final long serialVersionUID = 1L;
- private static final Logger logger = LoggerFactory.getLogger(AbstractSingleSelectChoice.class);
/** String to display when the selected value is null and nullValid is false. */
private static final String CHOOSE_ONE = "Choose One";
@@ -399,8 +396,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
@@ -412,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
+}
[4/4] git commit: Append a char instead of a String when possible
Posted by mg...@apache.org.
Append a char instead of a String when possible
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/597ef45f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/597ef45f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/597ef45f
Branch: refs/heads/wicket-6.x
Commit: 597ef45fc1bad72d57d4d13949fa4ace2153075d
Parents: 80e3c6a
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue May 27 15:07:21 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue May 27 15:07:21 2014 +0200
----------------------------------------------------------------------
.../extensions/markup/html/form/palette/component/Recorder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/597ef45f/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 544e69b..c9a9c7c 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
@@ -126,7 +126,7 @@ public class Recorder<T> extends HiddenField<Object>
modelStringBuffer.append(renderer.getIdValue(selection.next(), i++));
if (selection.hasNext())
{
- modelStringBuffer.append(",");
+ modelStringBuffer.append(',');
}
}
[3/4] 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
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/80e3c6a2
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/80e3c6a2
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/80e3c6a2
Branch: refs/heads/wicket-6.x
Commit: 80e3c6a209f79de9074894325c07ecd96f6784fd
Parents: f11a75c
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:06:53 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/80e3c6a2/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 b577615..29d0869 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;
}
/**
[2/4] git commit: WICKET-5601 AbstractSingleSelectChoice fails with
NullPointerException when its choice renderer returns null from #getIdValue()
Posted by mg...@apache.org.
WICKET-5601 AbstractSingleSelectChoice fails with NullPointerException when its choice renderer returns null from #getIdValue()
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f11a75c7
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f11a75c7
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f11a75c7
Branch: refs/heads/wicket-6.x
Commit: f11a75c7a5bd86c424ed29d66847aaf0d25553c1
Parents: 03c2210
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue May 27 15:06:27 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue May 27 15:06:27 2014 +0200
----------------------------------------------------------------------
.../wicket/markup/html/form/AbstractSingleSelectChoice.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f11a75c7/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 d05da71..55d4f11c 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
@@ -275,7 +275,8 @@ public abstract class AbstractSingleSelectChoice<T> extends AbstractChoice<T, T>
{
// Get next choice
final T choice = choices.get(index);
- if (renderer.getIdValue(choice, index).equals(id))
+ String idValue = renderer.getIdValue(choice, index);
+ if (idValue != null && idValue.equals(id))
{
return choice;
}