You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jc...@apache.org on 2007/07/04 16:55:00 UTC
svn commit: r553229 - in
/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket:
Component.java model/IWrapModel.java
Author: jcompagner
Date: Wed Jul 4 07:54:55 2007
New Revision: 553229
URL: http://svn.apache.org/viewvc?view=rev&rev=553229
Log:
detach the wrapped model for a component assigned model
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IWrapModel.java
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java?view=diff&rev=553229&r1=553228&r2=553229
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java Wed Jul 4 07:54:55 2007
@@ -2890,6 +2890,11 @@
{
model.detach();
}
+ // also detach the wrapped model of a component assignet wrap (not inherited)
+ if (model instanceof IWrapModel && !getFlag(FLAG_INHERITABLE_MODEL))
+ {
+ ((IWrapModel)model).getWrappedModel().detach();
+ }
}
/**
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IWrapModel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IWrapModel.java?view=diff&rev=553229&r1=553228&r2=553229
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IWrapModel.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IWrapModel.java Wed Jul 4 07:54:55 2007
@@ -22,6 +22,9 @@
* {@link IComponentAssignedModel#wrapOnAssignment(org.apache.wicket.Component)} and
* {@link IComponentInheritedModel#wrapOnInheritance(org.apache.wicket.Component)}
*
+ * The wrapped model will be called detach on when the component is detached
+ * when the wrapmodel is created by an {@link IComponentAssignedModel}
+ *
* @author jcompagner
* @author Igor Vaynberg (ivaynberg)
*/