Author: ivaynberg
Date: Wed May 9 14:47:04 2007
New Revision: 536665
URL: http://svn.apache.org/viewvc?view=rev&rev=536665
Log:
WICKET-548
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage.java
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java?view=diff&rev=536665&r1=536664&r2=536665
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
Wed May 9 14:47:04 2007
@@ -216,7 +216,7 @@
}
component.setAuto(true);
add(component);
- component.onBeforeRender();
+ component.beforeRender();
component.render();
return true;
}
@@ -833,7 +833,7 @@
{
return visitChildren(null, visitor);
}
-
+
/**
* @param component
* Component being added
@@ -855,10 +855,13 @@
// Set child's parent
component.setParent(this);
+ component.attach();
+
final IDebugSettings debugSettings =
Application.get().getDebugSettings();
if (debugSettings.getComponentUseCheck())
{
- component.setMetaData(ADDED_AT_KEY,
Strings.toString(component, new MarkupException("added")));
+ component.setMetaData(ADDED_AT_KEY,
Strings.toString(component, new MarkupException(
+ "added")));
}
// Tell the page a component was added
@@ -1109,30 +1112,8 @@
page.componentRemoved(component);
}
- // detach children models
- if (component instanceof MarkupContainer)
- {
- ((MarkupContainer)component).visitChildren(new
IVisitor()
- {
- public Object component(Component component)
- {
- try
- {
- // detach any models of the
component
- component.detachModels();
- }
- catch (Exception e) // catch anything;
we MUST detach all
- // models
- {
- log.error("detaching models of
component " + component + " failed:", e);
- }
- return IVisitor.CONTINUE_TRAVERSAL;
- }
- });
- }
+ component.detach();
- // Detach model
- component.detachModels();
// Component is removed
component.setParent(null);
}
@@ -1439,6 +1420,7 @@
}
super.onAfterRenderChildren();
}
+
/**
* @return True if this markup container has associated markup
*/
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage.java?view=diff&rev=536665&r1=536664&r2=536665
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage.java
Wed May 9 14:47:04 2007
@@ -27,6 +27,7 @@
*/
public class OnChangeAjaxBehaviorTestPage extends WebPage
{
+ private static final long serialVersionUID = 1L;
/**
* Construct.
