Author: pedro
Date: Tue Jul 5 20:31:35 2011
New Revision: 1143195
URL: http://svn.apache.org/viewvc?rev=1143195&view=rev
Log:
- detach models recursively
Issue: WICKET-3872
Added:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/DetachableTest.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java?rev=1143195&r1=1143194&r2=1143195&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
Tue Jul 5 20:31:35 2011
@@ -644,7 +644,7 @@ public abstract class MarkupContainer ex
// Do not call remove() because the
state change would than be
// recorded twice.
child.internalOnRemove();
- child.detachModel();
+ child.detach();
child.setParent(null);
}
}
Added:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/DetachableTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/DetachableTest.java?rev=1143195&view=auto
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/DetachableTest.java
(added)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/DetachableTest.java
Tue Jul 5 20:31:35 2011
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.model;
+
+import java.io.Serializable;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+
+/**
+ * @author Pedro Santos
+ */
+public class DetachableTest extends WicketTestCase
+{
+
+ /**
+ * <a
href="https://issues.apache.org/jira/browse/WICKET-3872";>WICKET-3872</a>
+ */
+ public void testDetachRemovedChildrenTree()
+ {
+ DetachableComponent a = new DetachableComponent("a");
+ DetachableComponent ab = new DetachableComponent("b");
+ DetachableComponent ac = new DetachableComponent("c");
+ DetachableComponent abd = new DetachableComponent("d");
+ DetachableModel detachableModel = new DetachableModel();
+ DetachableBehavior detachableBehavior = new
DetachableBehavior();
+ abd.setDefaultModel(detachableModel);
+ abd.add(detachableBehavior);
+
+ a.add(ab);
+ a.add(ac);
+ ab.add(abd);
+ a.removeAll();
+
+ assertFalse(a.detached);
+ assertTrue(ab.detached);
+ assertTrue(ac.detached);
+ assertTrue(abd.detached);
+ assertTrue(detachableModel.detached);
+ assertTrue(detachableBehavior.detached);
+ }
+
+
+ private class DetachableComponent extends WebMarkupContainer
+ {
+ private boolean detached;
+
+ private DetachableComponent(String id)
+ {
+ super(id);
+ }
+
+ @Override
+ protected void onDetach()
+ {
+ super.onDetach();
+ detached = true;
+ }
+ }
+
+ private class DetachableModel extends Model<Serializable>
+ {
+ private boolean detached;
+
+ @Override
+ public void detach()
+ {
+ detached = true;
+ }
+ }
+
+ private class DetachableBehavior extends Behavior
+ {
+ private boolean detached;
+
+ @Override
+ public void detach(Component component)
+ {
+ detached = true;
+ }
+ }
+}
