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

[kn...@apache.org]

Author: knopp
Date: Sun Aug 26 15:39:25 2007
New Revision: 569900

URL: http://svn.apache.org/viewvc?rev=569900&view=rev
Log:
WICKET-854

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=569900&r1=569899&r2=569900&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 Sun Aug 26 15:39:25 2007
@@ -34,6 +34,8 @@
 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.IModel;
+import org.apache.wicket.model.Model;
 import org.apache.wicket.protocol.http.WebRequest;
 import org.apache.wicket.request.RequestParameters;
 import org.apache.wicket.settings.IPageSettings;
@@ -621,6 +623,19 @@
 	 */
 	public void setTitle(String title)
 	{
+		this.title = new Model(title);
+	}
+	
+	/**
+	 * Sets the title of window. If the window is a page, title can be
+	 * <code>null</code>. In that case it will display the title document
+	 * inside the window.
+	 * 
+	 * @param title
+	 *            Title of the window
+	 */
+	public void setTitle(Model title)
+	{
 		this.title = title;
 	}
 
@@ -629,7 +644,7 @@
 	 * 
 	 * @return Title of the window
 	 */
-	public String getTitle()
+	public IModel getTitle()
 	{
 		return title;
 	}
@@ -958,9 +973,11 @@
 			buffer.append("settings.cookieId=\"" + getCookieName() + "\";\n");
 		}
 
-		if (getTitle() != null)
+		
+		Object title = getTitle() != null ? getTitle().getObject() : null;
+		if (title != null)
 		{
-			buffer.append("settings.title=\"" + escapeQuotes(getTitle()) + "\";\n");
+			buffer.append("settings.title=\"" + escapeQuotes(title.toString()) + "\";\n");
 		}
 
 		if (getMaskType() == MaskType.TRANSPARENT)
@@ -1033,7 +1050,7 @@
 	private String widthUnit = "px";
 	private String heightUnit = "px";
 	private String cookieName;
-	private String title = null;
+	private IModel title = null;
 	private MaskType maskType = MaskType.SEMI_TRANSPARENT;
 
 	private String pageMapName = "modal-dialog-pagemap";