You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by kn...@apache.org on 2007/03/30 22:46:26 UTC
svn commit: r524267 -
/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/ajax/AjaxRequestTarget.java
Author: knopp
Date: Fri Mar 30 13:46:25 2007
New Revision: 524267
URL: http://svn.apache.org/viewvc?view=rev&rev=524267
Log:
don't detach components here
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/ajax/AjaxRequestTarget.java
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/ajax/AjaxRequestTarget.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/ajax/AjaxRequestTarget.java?view=diff&rev=524267&r1=524266&r2=524267
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/ajax/AjaxRequestTarget.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/ajax/AjaxRequestTarget.java Fri Mar 30 13:46:25 2007
@@ -540,64 +540,50 @@
{
Iterator it;
- try
+ // process feedback
+ it = markupIdToComponent.entrySet().iterator();
+ while (it.hasNext())
{
- // process feedback
- it = markupIdToComponent.entrySet().iterator();
- while (it.hasNext())
+ final Component component = (Component)((Entry)it.next()).getValue();
+
+ if (component instanceof MarkupContainer)
{
- final Component component = (Component)((Entry)it.next()).getValue();
+ MarkupContainer container = (MarkupContainer)component;
- if (component instanceof MarkupContainer)
+ // collect feedback
+ container.visitChildren(IFeedback.class, new IVisitor()
{
- MarkupContainer container = (MarkupContainer)component;
-
- // collect feedback
- container.visitChildren(IFeedback.class, new IVisitor()
+ public Object component(Component component)
{
- public Object component(Component component)
- {
- ((IFeedback)component).updateFeedback();
- return IVisitor.CONTINUE_TRAVERSAL;
- }
- });
- }
-
- if (component instanceof IFeedback)
- {
- ((IFeedback)component).updateFeedback();
- }
- }
-
- // attach components
- it = markupIdToComponent.entrySet().iterator();
- while (it.hasNext())
- {
- final Component component = (Component)((Entry)it.next()).getValue();
- component.attach();
+ ((IFeedback)component).updateFeedback();
+ return IVisitor.CONTINUE_TRAVERSAL;
+ }
+ });
}
- // process component markup
- it = markupIdToComponent.entrySet().iterator();
- while (it.hasNext())
+ if (component instanceof IFeedback)
{
- final Map.Entry entry = (Entry)it.next();
- final Component component = (Component)entry.getValue();
- final String markupId = (String)entry.getKey();
-
- respondComponent(response, markupId, component);
+ ((IFeedback)component).updateFeedback();
}
+ }
+ // attach components
+ it = markupIdToComponent.entrySet().iterator();
+ while (it.hasNext())
+ {
+ final Component component = (Component)((Entry)it.next()).getValue();
+ component.attach();
}
- finally
+
+ // process component markup
+ it = markupIdToComponent.entrySet().iterator();
+ while (it.hasNext())
{
- // detach
- it = markupIdToComponent.entrySet().iterator();
- if (it.hasNext())
- {
- final Component component = (Component)((Entry)it.next()).getValue();
- component.getPage().detach();
- }
+ final Map.Entry entry = (Entry)it.next();
+ final Component component = (Component)entry.getValue();
+ final String markupId = (String)entry.getKey();
+
+ respondComponent(response, markupId, component);
}
}