Author: ivaynberg
Date: Mon Oct 12 07:19:13 2009
New Revision: 824245
URL: http://svn.apache.org/viewvc?rev=824245&view=rev
Log:
more ng migration work
Added:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Component2.java
- copied, changed from r824217,
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Page2.java
- copied, changed from r824217,
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Page.java
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Page.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Application.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/DefaultPageFactory.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/markup/html/form/Form.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/markup/html/link/Link.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/page/persistent/DefaultPageStore.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageFactory.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=824245&r1=824244&r2=824245&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Mon Oct
12 07:19:13 2009
@@ -45,6 +45,7 @@
import org.apache.wicket.model.IModelComparator;
import org.apache.wicket.model.IWrapModel;
import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.ng.request.component.RequestableComponent;
import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.settings.IDebugSettings;
import org.apache.wicket.util.convert.IConverter;
@@ -198,7 +199,7 @@
* @author Juergen Donnerstag
* @author Igor Vaynberg (ivaynberg)
*/
-public abstract class Component implements IClusterable, IConverterLocator
+public abstract class Component implements IClusterable, IConverterLocator,
RequestableComponent
{
/**
* Change record of a model.
@@ -4089,7 +4090,7 @@
* Path to component
* @return The component at the path
*/
- Component get(final String path)
+ public Component get(final String path)
{
// Path to this component is an empty path
if (path.equals(""))
@@ -4378,4 +4379,21 @@
}
return state;
}
+
+ public final boolean canCallListenerInterface()
+ {
+ if (!isEnabled() || !isVisible())
+ {
+ return false;
+ }
+ else if (getParent() != null)
+ {
+ return getParent().canCallListenerInterface();
+ }
+ else
+ {
+ return false;
+ }
+
+ }
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java?rev=824245&r1=824244&r2=824245&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java Mon Oct 12
07:19:13 2009
@@ -37,6 +37,7 @@
import org.apache.wicket.markup.resolver.IComponentResolver;
import org.apache.wicket.model.IModel;
import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.ng.request.component.RequestablePage;
import org.apache.wicket.request.RequestParameters;
import org.apache.wicket.session.ISessionStore;
import org.apache.wicket.session.pagemap.IPageMapEntry;
@@ -121,8 +122,23 @@
* @author Johan Compagner
*
*/
-public abstract class Page extends MarkupContainer implements
IRedirectListener, IPageMapEntry
+public abstract class Page extends MarkupContainer
+ implements
+ IRedirectListener,
+ IPageMapEntry,
+ RequestablePage
{
+ /** TODO javadoc */
+ int pageId;
+ /** TODO javadoc */
+ static int pageIdCounter;
+ /** TODO javadoc */
+ private boolean wasCreatedBookmarkable;
+
+ /** TODO javadoc */
+ private int renderCount = 0;
+
+
/**
* You can set implementation of the interface in the {...@link
Page#serializer} then that
* implementation will handle the serialization of this page. The
serializePage method is called
@@ -328,6 +344,33 @@
}
/**
+ * TODO javadoc
+ *
+ * @param wasCreatedBookmarkable
+ */
+ public void setWasCreatedBookmarkable(boolean wasCreatedBookmarkable)
+ {
+ this.wasCreatedBookmarkable = wasCreatedBookmarkable;
+ }
+
+
+ /**
+ * ${inheritDoc}
+ */
+ public boolean wasCreatedBookmarkable()
+ {
+ return wasCreatedBookmarkable;
+ }
+
+ /**
+ * ${inheritDoc}
+ */
+ public int getRenderCount()
+ {
+ return renderCount;
+ }
+
+ /**
* Called right after a component's listener method (the provided
method argument) was called.
* This method may be used to clean up dependencies, do logging, etc.
NOTE: this method will
* also be called when {...@link WebPage#beforeCallComponent(Component,
RequestListenerInterface)}
@@ -834,6 +877,8 @@
throw new UnauthorizedActionException(this,
Component.RENDER);
}
+ ++renderCount;
+
// Make sure it is really empty
renderedComponents = null;
@@ -1137,6 +1182,9 @@
*/
private final void init()
{
+ pageId = pageIdCounter++;
+
+
final RequestCycle cycle = getRequestCycle();
String pageMapName = null;
if (cycle != null)
@@ -1592,4 +1640,11 @@
{
return getAssociatedMarkup();
}
+
+ public int getPageId()
+ {
+ return pageId;
+ }
+
+
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Application.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Application.java?rev=824245&r1=824244&r2=824245&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Application.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Application.java Mon
Oct 12 07:19:13 2009
@@ -580,7 +580,7 @@
public RequestablePage getPageInstance(int pageId)
{
- return Page.get(pageId);
+ return Page2.get(pageId);
}
public Class<? extends RequestablePage> getHomePageClass()
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Component2.java
(from r824217,
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Component.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Component2.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Component2.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Component.java&r1=824217&r2=824245&rev=824245&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Component.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Component2.java Mon
Oct 12 07:19:13 2009
@@ -30,65 +30,65 @@
*
* @author Matej Knopp
*/
-public class Component implements RequestableComponent
+public class Component2 implements RequestableComponent
{
private static final long serialVersionUID = 1L;
private final String id;
- public Component(String id)
+ public Component2(String id)
{
this.id = id;
}
- private final List<Component> children = new ArrayList<Component>();
+ private final List<Component2> children = new ArrayList<Component2>();
- public List<Component> getChildren()
+ public List<Component2> getChildren()
{
return Collections.unmodifiableList(children);
}
- private Component parent;
+ private Component2 parent;
- public Component getParent()
+ public Component2 getParent()
{
return parent;
}
- public void remove(Component component)
+ public void remove(Component2 Component2)
{
- if (component == null)
+ if (Component2 == null)
{
- throw new NullPointerException("Argument 'component'
may not be null.");
+ throw new NullPointerException("Argument 'Component2'
may not be null.");
}
- if (component.getParent() != this)
+ if (Component2.getParent() != this)
{
- throw new IllegalStateException("Component is not child
of this component.");
+ throw new IllegalStateException("Component2 is not
child of this Component2.");
}
- children.remove(component);
- component.parent = null;
+ children.remove(Component2);
+ Component2.parent = null;
}
- public void add(Component component)
+ public void add(Component2 Component2)
{
- if (component == null)
+ if (Component2 == null)
{
- throw new NullPointerException("Argument 'component'
may not be null.");
+ throw new NullPointerException("Argument 'Component2'
may not be null.");
}
- if (component.getParent() != null)
+ if (Component2.getParent() != null)
{
- throw new IllegalStateException("Component is already
added to another component.");
+ throw new IllegalStateException("Component2 is already
added to another Component2.");
}
- for (Component c : children)
+ for (Component2 c : children)
{
- if (c.getId().equals(component.getId()))
+ if (c.getId().equals(Component2.getId()))
{
throw new IllegalStateException(
- "Component with same id already added
to this component.");
+ "Component2 with same id already added
to this Component2.");
}
}
- component.parent = this;
- children.add(component);
+ Component2.parent = this;
+ children.add(Component2);
}
public boolean isEnabled()
@@ -119,11 +119,11 @@
private static final char PATH_SEPARATOR = ':';
- public Component get(String path)
+ public Component2 get(String path)
{
String first = Strings.firstPathComponent(path, PATH_SEPARATOR);
String after = Strings.afterFirstPathComponent(path,
PATH_SEPARATOR);
- for (Component c : getChildren())
+ for (Component2 c : getChildren())
{
if (first.equals(c.getId()))
{
@@ -163,12 +163,13 @@
{
if (markupId == null && createIfDoesNotExist)
{
- markupId = getId() +
getPage().getMarkupIdConterNextValue();
+ throw new RuntimeException("check code");
+ // markupId = getId() +
getPage().getMarkupIdConterNextValue();
}
return markupId;
}
- public Page getPage()
+ public Page2 getPage()
{
if (getParent() != null)
{
@@ -199,7 +200,7 @@
public void detach()
{
- for (Component c : getChildren())
+ for (Component2 c : getChildren())
{
c.detach();
}
@@ -208,7 +209,7 @@
public final void prepareForRender(boolean setRenderingFlag)
{
- for (Component c : getChildren())
+ for (Component2 c : getChildren())
{
c.prepareForRender(setRenderingFlag);
}
@@ -216,7 +217,7 @@
public void renderComponent()
{
- for (Component c : children)
+ for (Component2 c : children)
{
c.renderComponent();
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/DefaultPageFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/DefaultPageFactory.java?rev=824245&r1=824244&r2=824245&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/DefaultPageFactory.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/DefaultPageFactory.java
Mon Oct 12 07:19:13 2009
@@ -20,6 +20,7 @@
import java.lang.reflect.InvocationTargetException;
import java.util.Map;
+import org.apache.wicket.Page;
import org.apache.wicket.ng.request.component.PageFactory;
import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.component.RequestablePage;
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Page2.java (from
r824217, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Page.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Page2.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Page2.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Page.java&r1=824217&r2=824245&rev=824245&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Page.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Page2.java Mon Oct
12 07:19:13 2009
@@ -21,7 +21,7 @@
import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.ng.request.response.Response;
-public class Page extends Component implements RequestablePage
+public class Page2 extends Component2 implements RequestablePage
{
private static final long serialVersionUID = 1L;
@@ -29,12 +29,12 @@
static int pageIdCounter;
- public Page()
+ public Page2()
{
this(null);
}
- public Page(PageParameters parameters)
+ public Page2(PageParameters parameters)
{
super("");
pageId = pageIdCounter++;
@@ -48,10 +48,10 @@
}
}
- public static Page get(int id)
+ public static Page2 get(int id)
{
Application app = Application.get();
- return (Page)app.getPageManager().getPage(id);
+ return (Page2)app.getPageManager().getPage(id);
}
public int getPageId()
@@ -127,7 +127,7 @@
response.write("<p>This is a " + getClass().getName() +
"</p>\n");
- for (Component c : getChildren())
+ for (Component2 c : getChildren())
{
c.renderComponent();
}
@@ -149,7 +149,7 @@
}
@Override
- public Page getPage()
+ public Page2 getPage()
{
return this;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/markup/html/form/Form.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/markup/html/form/Form.java?rev=824245&r1=824244&r2=824245&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/markup/html/form/Form.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/markup/html/form/Form.java
Mon Oct 12 07:19:13 2009
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.ng.markup.html.form;
-import org.apache.wicket.ng.Component;
+import org.apache.wicket.ng.Component2;
import org.apache.wicket.ng.request.Request;
import org.apache.wicket.ng.request.RequestHandler;
import org.apache.wicket.ng.request.cycle.RequestCycle;
@@ -25,7 +25,7 @@
import
org.apache.wicket.ng.request.handler.impl.ListenerInterfaceRequestHandler;
import org.apache.wicket.ng.request.response.Response;
-public class Form extends Component implements IFormSubmitListener
+public class Form extends Component2 implements IFormSubmitListener
{
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/markup/html/link/Link.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/markup/html/link/Link.java?rev=824245&r1=824244&r2=824245&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/markup/html/link/Link.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/markup/html/link/Link.java
Mon Oct 12 07:19:13 2009
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.ng.markup.html.link;
-import org.apache.wicket.ng.Component;
+import org.apache.wicket.ng.Component2;
import org.apache.wicket.ng.request.RequestHandler;
import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
@@ -27,7 +27,7 @@
@SuppressWarnings("serial")
// Very simple and naive link component
-public abstract class Link extends Component implements ILinkListener
+public abstract class Link extends Component2 implements ILinkListener
{
public Link(String id)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/page/persistent/DefaultPageStore.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/page/persistent/DefaultPageStore.java?rev=824245&r1=824244&r2=824245&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/page/persistent/DefaultPageStore.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/page/persistent/DefaultPageStore.java
Mon Oct 12 07:19:13 2009
@@ -22,7 +22,7 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.wicket.ng.Page;
+import org.apache.wicket.ng.Page2;
import org.apache.wicket.ng.page.ManageablePage;
import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.lang.Objects;
@@ -214,7 +214,7 @@
public Object restoreAfterSerialization(Serializable serializable)
{
- if (!storeAfterSessionReplication() || serializable instanceof
Page)
+ if (!storeAfterSessionReplication() || serializable instanceof
Page2)
{
return serializable;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageFactory.java?rev=824245&r1=824244&r2=824245&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageFactory.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageFactory.java
Mon Oct 12 07:19:13 2009
@@ -17,7 +17,7 @@
package org.apache.wicket.ng.request.component;
import org.apache.wicket.IPageFactory;
-import org.apache.wicket.ng.Page;
+import org.apache.wicket.Page;
import org.apache.wicket.ng.Session;
import org.apache.wicket.ng.WicketRuntimeException;
@@ -67,5 +67,6 @@
* @throws WicketRuntimeException
* Thrown if the page cannot be constructed
*/
- <C extends RequestablePage> RequestablePage newPage(final Class<C>
pageClass, final PageParameters parameters);
+ <C extends RequestablePage> RequestablePage newPage(final Class<C>
pageClass,
+ final PageParameters parameters);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java?rev=824245&r1=824244&r2=824245&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java
Mon Oct 12 07:19:13 2009
@@ -17,7 +17,7 @@
package org.apache.wicket.ng.request.handler;
import org.apache.wicket.ng.Application;
-import org.apache.wicket.ng.Page;
+import org.apache.wicket.ng.Page2;
import org.apache.wicket.ng.page.PageManager;
import org.apache.wicket.ng.request.RequestHandler;
import org.apache.wicket.ng.request.RequestMapper;
@@ -246,9 +246,9 @@
{
page =
getPageSource().newPageInstance(pageClass, pageParameters);
freshCreated = true;
- if (prepareForRenderNewPage() && page
instanceof Page)
+ if (prepareForRenderNewPage() && page
instanceof Page2)
{
- ((Page)page).prepareForRender(false);
+ ((Page2)page).prepareForRender(false);
}
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender.java?rev=824245&r1=824244&r2=824245&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender.java
Mon Oct 12 07:19:13 2009
@@ -18,7 +18,7 @@
import junit.framework.TestCase;
-import org.apache.wicket.ng.Page;
+import org.apache.wicket.ng.Page2;
import org.apache.wicket.ng.ThreadContext;
import org.apache.wicket.ng.markup.html.link.ILinkListener;
import org.apache.wicket.ng.markup.html.link.Link;
@@ -35,7 +35,7 @@
public class TestPageRender extends TestCase
{
- public static class Page1 extends Page
+ public static class Page1 extends Page2
{
private static final long serialVersionUID = 1L;
