Author: pedro
Date: Thu Jan 27 18:03:02 2011
New Revision: 1064236
URL: http://svn.apache.org/viewvc?rev=1064236&view=rev
Log:
New PopupSettings constructor to receive the page map name instead of its
instance as parameter
Issue: WICKET-3109
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java?rev=1064236&r1=1064235&r2=1064236&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java
Thu Jan 27 18:03:02 2011
@@ -131,16 +131,33 @@ public class PopupSettings implements IC
* separate page map as Wicket holds references to a limited
number of pages/
* versions only. If you don't put your popup in a separate
page map, the user might
* get page expired exceptions when getting back to the main
window again.
+ *
+ * @deprecated Use the {@link PopupSettings#PopupSettings(String)}
*/
+ @Deprecated
public PopupSettings(IPageMap pagemap)
{
- this(pagemap, 0);
+ this(pagemap.getName(), 0);
}
/**
* Construct.
*
- * @param pagemap
+ * @param pageMapName
+ * The page map name where this popup must be in. Typically,
you should put any popup
+ * in a separate page map as Wicket holds references to a
limited number of pages/
+ * versions only. If you don't put your popup in a separate
page map, the user might
+ * get page expired exceptions when getting back to the main
window again.
+ */
+ public PopupSettings(String pageMapName)
+ {
+ this(pageMapName, 0);
+ }
+
+ /**
+ * Construct.
+ *
+ * @param pageMapName
* The pagemap where this popup must be in. Typically, you
should put any popup in a
* separate page map as Wicket holds references to a limited
number of pages/
* versions only. If you don't put your popup in a separate
page map, the user might
@@ -148,14 +165,10 @@ public class PopupSettings implements IC
* @param displayFlags
* Display flags
*/
- public PopupSettings(IPageMap pagemap, final int displayFlags)
+ public PopupSettings(String pageMapName, final int displayFlags)
{
this.displayFlags = displayFlags;
- if (pagemap != null)
- {
- pageMapName = pagemap.getName();
- windowName = pageMapName;
- }
+ windowName = this.pageMapName = pageMapName;
}
/**
