You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2007/08/27 08:00:43 UTC
svn commit: r570010 -
/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java
Author: ivaynberg
Date: Sun Aug 26 23:00:43 2007
New Revision: 570010
URL: http://svn.apache.org/viewvc?rev=570010&view=rev
Log:
WICKET-886
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java?rev=570010&r1=570009&r2=570010&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java Sun Aug 26 23:00:43 2007
@@ -28,10 +28,9 @@
import org.apache.wicket.util.string.Strings;
/**
- * Implementation of an <a
- * href="http://www.w3.org/TR/REC-html40/present/frames.html#h-16.5">inline
- * frame</a> component. Must be used with an iframe (<iframe src...)
- * element. The src attribute will be generated.
+ * Implementation of an <a href="http://www.w3.org/TR/REC-html40/present/frames.html#h-16.5">inline
+ * frame</a> component. Must be used with an iframe (<iframe src...) element. The src attribute
+ * will be generated.
*
* @author Sven Meier
* @author Ralf Ebert
@@ -44,15 +43,13 @@
private final IPageLink pageLink;
/**
- * The pagemap name where the page that will be created by this inline frame
- * will be created in.
+ * The pagemap name where the page that will be created by this inline frame will be created in.
*/
private final String pageMapName;
/**
- * Constructs an inline frame that instantiates the given Page class when
- * the content of the inline frame is requested. The instantiated Page is
- * used to render a response to the user.
+ * Constructs an inline frame that instantiates the given Page class when the content of the
+ * inline frame is requested. The instantiated Page is used to render a response to the user.
*
* @param id
* See Component
@@ -65,11 +62,10 @@
{
this(id, pageMap, c, null);
}
-
+
/**
- * Constructs an inline frame that instantiates the given Page class when
- * the content of the inline frame is requested. The instantiated Page is
- * used to render a response to the user.
+ * Constructs an inline frame that instantiates the given Page class when the content of the
+ * inline frame is requested. The instantiated Page is used to render a response to the user.
*
* @param id
* See Component
@@ -80,7 +76,8 @@
* @param params
* Page parameters
*/
- public InlineFrame(final String id, final IPageMap pageMap, final Class c, final PageParameters params)
+ public InlineFrame(final String id, final IPageMap pageMap, final Class c,
+ final PageParameters params)
{
this(id, pageMap, new IPageLink()
{
@@ -113,8 +110,8 @@
}
/**
- * This constructor is ideal if a Page object was passed in from a previous
- * Page. Construct an inline frame containing the given Page.
+ * This constructor is ideal if a Page object was passed in from a previous Page. Construct an
+ * inline frame containing the given Page.
*
* @param id
* See component
@@ -123,7 +120,7 @@
*/
public InlineFrame(final String id, final Page page)
{
- this(id, null, new IPageLink()
+ this(id, page.getPageMap(), new IPageLink()
{
private static final long serialVersionUID = 1L;
@@ -143,25 +140,23 @@
/**
* This constructor is ideal for constructing pages lazily.
*
- * Constructs an inline frame which invokes the getPage() method of the
- * IPageLink interface when the content of the inline frame is requested.
- * Whatever Page objects is returned by this method will be rendered back to
- * the user.
+ * Constructs an inline frame which invokes the getPage() method of the IPageLink interface when
+ * the content of the inline frame is requested. Whatever Page objects is returned by this
+ * method will be rendered back to the user.
*
* @param id
* See Component
* @param pageMap
* the pagemap where the page of the inline frame must be in
* @param pageLink
- * An implementation of IPageLink which will create the page to
- * be contained in the inline frame if and when the content is
- * requested
+ * An implementation of IPageLink which will create the page to be contained in the
+ * inline frame if and when the content is requested
*/
public InlineFrame(final String id, final IPageMap pageMap, IPageLink pageLink)
{
super(id);
- this.pageMapName = pageMap.getName();
+ pageMapName = pageMap.getName();
this.pageLink = pageLink;
}
@@ -224,6 +219,6 @@
*/
public final IPageMap getPageMap()
{
- return PageMap.forName(this.pageMapName);
+ return PageMap.forName(pageMapName);
}
}