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/08/01 09:02:22 UTC
[1/6] git commit: WICKET-5296 OnEventHeaderItem should remove 'on'
prefix for the event name
Updated Branches:
refs/heads/master 4b08879ad -> fb478e926
WICKET-5296 OnEventHeaderItem should remove 'on' prefix for the event name
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/fb478e92
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fb478e92
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fb478e92
Branch: refs/heads/master
Commit: fb478e926dbf163e22f5c84e0da29516ca32aad4
Parents: f3398d7
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Aug 1 09:01:19 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Aug 1 09:02:13 2013 +0200
----------------------------------------------------------------------
.../apache/wicket/markup/head/OnEventHeaderItem.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/fb478e92/wicket-core/src/main/java/org/apache/wicket/markup/head/OnEventHeaderItem.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/OnEventHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/OnEventHeaderItem.java
index f6b8b91..4949dcd 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/OnEventHeaderItem.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/OnEventHeaderItem.java
@@ -18,6 +18,7 @@ package org.apache.wicket.markup.head;
import java.util.Collections;
import java.util.List;
+import java.util.Locale;
import org.apache.wicket.Application;
import org.apache.wicket.request.Response;
@@ -39,7 +40,7 @@ public class OnEventHeaderItem extends HeaderItem
* @param target
* The target of the event handler, for example 'window' or 'document'.
* @param event
- * The event itself, for example 'onclick'.
+ * The event itself, for example 'click'.
* @param javaScript
* The script to execute on the event.
*
@@ -64,7 +65,15 @@ public class OnEventHeaderItem extends HeaderItem
public OnEventHeaderItem(String target, String event, CharSequence javaScript)
{
this.target = Args.notEmpty(target, "target");
- this.event = Args.notEmpty(event, "event");
+
+ Args.notEmpty(event, "event");
+ event = event.toLowerCase(Locale.ENGLISH);
+ if (event.startsWith("on"))
+ {
+ event = event.substring(2);
+ }
+ this.event = event;
+
this.javaScript = Args.notEmpty(javaScript, "javaScript");
}
[4/6] git commit: Non functional changes.
Posted by mg...@apache.org.
Non functional changes.
Fix typos in comments.
Use character instead of String where possible.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6de89118
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6de89118
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6de89118
Branch: refs/heads/master
Commit: 6de89118fabe6e660c581dd32628fe615051dc03
Parents: ec7b454
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jul 29 13:26:47 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Aug 1 09:02:13 2013 +0200
----------------------------------------------------------------------
.../util/iterator/AbstractHierarchyIterator.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6de89118/wicket-core/src/main/java/org/apache/wicket/util/iterator/AbstractHierarchyIterator.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/iterator/AbstractHierarchyIterator.java b/wicket-core/src/main/java/org/apache/wicket/util/iterator/AbstractHierarchyIterator.java
index 27580a2..a946977 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/iterator/AbstractHierarchyIterator.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/iterator/AbstractHierarchyIterator.java
@@ -281,7 +281,7 @@ public abstract class AbstractHierarchyIterator<N, I extends N> implements Itera
// Move up one level
data = stack.pop();
- // If we are on childFirst, than it's now time to handle the parent
+ // If we are on childFirst, then it's now time to handle the parent
if (childFirst)
{
hasNextWasLast = true;
@@ -291,7 +291,7 @@ public abstract class AbstractHierarchyIterator<N, I extends N> implements Itera
}
return nextNode();
}
- // If we are on parent first, than get the next element
+ // If we are on parent first, then get the next element
else if (data.hasNext())
{
return nextNode();
@@ -381,14 +381,14 @@ public abstract class AbstractHierarchyIterator<N, I extends N> implements Itera
.append(childFirst)
.append("; hasNextWasLast=")
.append(hasNextWasLast)
- .append("\n");
+ .append('\n');
msg.append("data.node=")
.append(data.node)
- .append("\n")
+ .append('\n')
.append("data.lastNode=")
.append(data.lastNode)
- .append("\n");
+ .append('\n');
msg.append("stack.size=").append(stack.size());
@@ -450,10 +450,10 @@ public abstract class AbstractHierarchyIterator<N, I extends N> implements Itera
StringBuilder msg = new StringBuilder(500);
msg.append("node=")
.append(node)
- .append("\n")
+ .append('\n')
.append("lastNode=")
.append(lastNode)
- .append("\n");
+ .append('\n');
return msg.toString();
}
[6/6] git commit: Java 7 diamonds
Posted by mg...@apache.org.
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/fe1e6210
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fe1e6210
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fe1e6210
Branch: refs/heads/master
Commit: fe1e621081ebe22c22f6e5b5fa98d51e44d50d76
Parents: 6de8911
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jul 31 09:24:20 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Aug 1 09:02:13 2013 +0200
----------------------------------------------------------------------
.../main/java/org/apache/wicket/model/CompoundPropertyModel.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/fe1e6210/wicket-core/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java b/wicket-core/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java
index e0e3dc6..347fe96 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java
@@ -94,7 +94,7 @@ public class CompoundPropertyModel<T> extends ChainingModel<T> implements ICompo
*/
public <S> IModel<S> bind(String property)
{
- return new PropertyModel<S>(this, property);
+ return new PropertyModel<>(this, property);
}
/**
@@ -165,6 +165,6 @@ public class CompoundPropertyModel<T> extends ChainingModel<T> implements ICompo
*/
public static <Z> CompoundPropertyModel<Z> of(IModel<Z> model)
{
- return new CompoundPropertyModel<Z>(model);
+ return new CompoundPropertyModel<>(model);
}
}
[5/6] git commit: Minor, non-functional code simplification
Posted by mg...@apache.org.
Minor, non-functional code simplification
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f3398d74
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f3398d74
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f3398d74
Branch: refs/heads/master
Commit: f3398d74ffcbe5b5f1de5b2392b26d226ae326c6
Parents: 725f047
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jul 31 09:32:33 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Aug 1 09:02:13 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/model/AbstractPropertyModel.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f3398d74/wicket-core/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java b/wicket-core/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java
index 78746ef..be6f047 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java
@@ -126,9 +126,8 @@ public abstract class AbstractPropertyModel<T> extends ChainingModel<T>
}
else
{
- PropertyResolverConverter prc = null;
- prc = new PropertyResolverConverter(Application.get().getConverterLocator(),
- Session.get().getLocale());
+ PropertyResolverConverter prc = new PropertyResolverConverter(
+ Application.get().getConverterLocator(), Session.get().getLocale());
PropertyResolver.setValue(expression, getInnermostModelOrObject(), object, prc);
}
}
[2/6] git commit: Use character instead of String where possible
Posted by mg...@apache.org.
Use character instead of String where possible
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/725f0471
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/725f0471
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/725f0471
Branch: refs/heads/master
Commit: 725f0471bbc322ca6703ee910867f5244226bb64
Parents: fe1e621
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jul 31 09:26:46 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Aug 1 09:02:13 2013 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/model/ChainingModel.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/725f0471/wicket-core/src/main/java/org/apache/wicket/model/ChainingModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/ChainingModel.java b/wicket-core/src/main/java/org/apache/wicket/model/ChainingModel.java
index 5c3a2bf..49b2d25 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/ChainingModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/ChainingModel.java
@@ -147,8 +147,8 @@ public abstract class ChainingModel<T> implements IChainingModel<T>
public String toString()
{
StringBuilder sb = new StringBuilder("Model:classname=[");
- sb.append(getClass().getName()).append("]");
- sb.append(":nestedModel=[").append(target).append("]");
+ sb.append(getClass().getName()).append(']');
+ sb.append(":nestedModel=[").append(target).append(']');
return sb.toString();
}
}
[3/6] git commit: Java 7 diamonds
Posted by mg...@apache.org.
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/ec7b4544
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ec7b4544
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ec7b4544
Branch: refs/heads/master
Commit: ec7b454475658364ca9e4d866b18af55fa8c4e55
Parents: 4b08879
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jul 29 12:06:20 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Aug 1 09:02:13 2013 +0200
----------------------------------------------------------------------
.../apache/wicket/util/iterator/AbstractHierarchyIterator.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec7b4544/wicket-core/src/main/java/org/apache/wicket/util/iterator/AbstractHierarchyIterator.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/iterator/AbstractHierarchyIterator.java b/wicket-core/src/main/java/org/apache/wicket/util/iterator/AbstractHierarchyIterator.java
index 0af34f0..27580a2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/iterator/AbstractHierarchyIterator.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/iterator/AbstractHierarchyIterator.java
@@ -46,7 +46,7 @@ import org.apache.wicket.util.lang.Args;
public abstract class AbstractHierarchyIterator<N, I extends N> implements Iterator<I>, Iterable<I>
{
// An iterator for each level we are down from root
- private ArrayListStack<LevelIterator<N>> stack = new ArrayListStack<LevelIterator<N>>();
+ private ArrayListStack<LevelIterator<N>> stack = new ArrayListStack<>();
// The current level iterator
private LevelIterator<N> data;
@@ -74,7 +74,7 @@ public abstract class AbstractHierarchyIterator<N, I extends N> implements Itera
if (hasChildren(root))
{
- data = new LevelIterator<N>(root, newIterator(root));
+ data = new LevelIterator<>(root, newIterator(root));
}
}
@@ -163,7 +163,7 @@ public abstract class AbstractHierarchyIterator<N, I extends N> implements Itera
stack.push(data);
// Initialize the data for the next level
- data = new LevelIterator<N>(node, newIterator(node));
+ data = new LevelIterator<>(node, newIterator(node));
// Get the next node on the current level. If it's a container, than move downwards. If
// there are no more elements, than move up again.