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 2009/10/25 04:24:03 UTC
svn commit: r829486 - in
/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples:
WicketExampleHeader.java frames/BodyFrame.java frames/LeftFrame.java
linkomatic/Home.java
Author: ivaynberg
Date: Sun Oct 25 03:24:01 2009
New Revision: 829486
URL: http://svn.apache.org/viewvc?rev=829486&view=rev
Log:
WICKET-NG: slowly phasing out the use of pagemaps in order to remove the concept completely
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java?rev=829486&r1=829485&r2=829486&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java Sun Oct 25 03:24:01 2009
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.examples;
-import org.apache.wicket.PageMap;
import org.apache.wicket.RequestContext;
import org.apache.wicket.devutils.debugbar.DebugBar;
import org.apache.wicket.examples.source.SourcesPage;
@@ -65,11 +64,9 @@
SourcesPage.class, SourcesPage.generatePageParameters(page));
add(link);
- PopupSettings settings = new PopupSettings(PageMap.forName("sources"),
- PopupSettings.RESIZABLE);
+ PopupSettings settings = new PopupSettings("sources", PopupSettings.RESIZABLE);
settings.setWidth(800);
settings.setHeight(600);
- settings.setWindowName("sources");
link.setPopupSettings(settings);
}
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java?rev=829486&r1=829485&r2=829486&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java Sun Oct 25 03:24:01 2009
@@ -17,7 +17,6 @@
package org.apache.wicket.examples.frames;
import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.PageMap;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.WebPage;
@@ -39,8 +38,7 @@
{
public CharSequence getObject()
{
- return RequestCycle.get().urlFor(PageMap.forName(RIGHT_FRAME_NAME),
- frameTarget.getFrameClass(), null);
+ return RequestCycle.get().urlFor(frameTarget.getFrameClass(), null);
}
public void setObject(final CharSequence object)
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java?rev=829486&r1=829485&r2=829486&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java Sun Oct 25 03:24:01 2009
@@ -17,7 +17,6 @@
package org.apache.wicket.examples.frames;
import org.apache.wicket.Page;
-import org.apache.wicket.PageMap;
import org.apache.wicket.examples.linkomatic.Home;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -95,7 +94,6 @@
add(new ChangeFramePageLink("linkToPage1", index, Page1.class));
add(new ChangeFramePageLink("linkToPage2", index, Page2.class));
BookmarkablePageLink link = new BookmarkablePageLink("directLink", Home.class);
- link.setPageMap(PageMap.forName(BodyFrame.RIGHT_FRAME_NAME));
add(link);
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java?rev=829486&r1=829485&r2=829486&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java Sun Oct 25 03:24:01 2009
@@ -17,7 +17,6 @@
package org.apache.wicket.examples.linkomatic;
import org.apache.wicket.Component;
-import org.apache.wicket.PageMap;
import org.apache.wicket.ResourceReference;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.basic.Label;
@@ -118,8 +117,8 @@
RelativePathPrefixHandler.RELATIVE_PATH_BEHAVIOR));
// Popup example
- PopupSettings popupSettings = new PopupSettings(PageMap.forName("popuppagemap")).setHeight(
- 500).setWidth(500);
+ PopupSettings popupSettings = new PopupSettings("popuppagemap").setHeight(500)
+ .setWidth(500);
add(new BookmarkablePageLink("popupLink", Popup.class).setPopupSettings(popupSettings));
// Popup example