svn commit: r640978 - /wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java

[knopp]

Author: knopp
Date: Tue Mar 25 14:01:46 2008
New Revision: 640978

URL: http://svn.apache.org/viewvc?rev=640978&view=rev
Log:
Check for IComponentAssignedModel in #setTitle and detach title model

Modified:
    
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java

Modified: 
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?rev=640978&r1=640977&r2=640978&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
 Tue Mar 25 14:01:46 2008
@@ -34,6 +34,7 @@
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.markup.html.resources.CompressedResourceReference;
 import org.apache.wicket.markup.html.resources.JavascriptResourceReference;
+import org.apache.wicket.model.IComponentAssignedModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.protocol.http.WebRequest;
@@ -607,6 +608,9 @@
         */
        public void setTitle(IModel title)
        {
+               if (title instanceof IComponentAssignedModel) {
+                       title = 
((IComponentAssignedModel)title).wrapOnAssignment(this);
+               }
                this.title = title;
        }
 
@@ -1034,4 +1038,12 @@
        private PageCreator pageCreator = null;
        private CloseButtonCallback closeButtonCallback = null;
        private WindowClosedCallback windowClosedCallback = null;
+       
+       protected void onDetach()
+       {
+               super.onDetach();
+               if (this.title != null) {
+                       this.title.detach();
+               }
+       }
 }