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/04/25 11:03:35 UTC
[1/2] git commit: Fix a typo in javadoc
Repository: wicket
Updated Branches:
refs/heads/wicket-6.x a134f6aa9 -> 197906d52
Fix a typo in javadoc
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/83511b71
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/83511b71
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/83511b71
Branch: refs/heads/wicket-6.x
Commit: 83511b71da27477715e298b95bfc1fd8a988ea24
Parents: a134f6a
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Apr 25 12:02:57 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Apr 25 12:02:57 2014 +0300
----------------------------------------------------------------------
.../java/org/apache/wicket/request/mapper/info/ComponentInfo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/83511b71/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
index 299886c..230dc6d 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
@@ -20,7 +20,7 @@ import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.Strings;
/**
- * Encodes listener inteface and component path in form of
+ * Encodes listener interface and component path in form of
* <listenerInterface>-<componentPath>,
* <listenerInterface>.<behaviorIndex>-<componentPath> or
* <render-count>.<listenerInterface>.<behaviorIndex>-<componentPath>
[2/2] git commit: WICKET-5553 When using an Ajax request to display
initially hidden components inside inline enclosures,
only the first one appears.
Posted by mg...@apache.org.
WICKET-5553 When using an Ajax request to display initially hidden components inside inline enclosures, only the first one appears.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/197906d5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/197906d5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/197906d5
Branch: refs/heads/wicket-6.x
Commit: 197906d5217dd205280394ad74955fa9a449ce1e
Parents: 83511b7
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Apr 25 12:03:09 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Apr 25 12:03:09 2014 +0300
----------------------------------------------------------------------
.../protocol/http/AjaxEnclosureListener.java | 24 ++++++++++++--------
1 file changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/197906d5/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java
index f2dbfcb..275c0ad 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.protocol.http;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import org.apache.wicket.Component;
@@ -67,31 +70,32 @@ public class AjaxEnclosureListener implements AjaxRequestTarget.IListener
@Override
public void onBeforeRespond(final Map<String, Component> map, final AjaxRequestTarget target)
{
- String key = target.getPage().visitChildren(InlineEnclosure.class, new IVisitor<InlineEnclosure, String>()
+ final List<String> keysToRemove = new ArrayList<String>();
+
+ target.getPage().visitChildren(InlineEnclosure.class, new IVisitor<InlineEnclosure, Void>()
{
@Override
- public void component(final InlineEnclosure enclosure, final IVisit<String> visit)
+ public void component(final InlineEnclosure enclosure, final IVisit<Void> visit)
{
- for (Map.Entry<String, Component> entry : map.entrySet())
+ Iterator<Map.Entry<String, Component>> entriesItor = map.entrySet().iterator();
+ while (entriesItor.hasNext())
{
- String key = entry.getKey();
+ Map.Entry<String, Component> entry = entriesItor.next();
+ String componentId = entry.getKey();
Component component = entry.getValue();
-
if (isControllerOfEnclosure(component, enclosure))
{
- // update the visibility of the enclosure
enclosure.updateVisibility();
-
- // add enclosure to Ajax target
target.add(enclosure);
- visit.stop(key);
+ visit.dontGoDeeper();
+ keysToRemove.add(componentId);
break;
}
}
}
});
- if (key != null)
+ for (String key : keysToRemove)
{
map.remove(key);
}