You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2010/09/07 21:43:01 UTC
svn commit: r993500 - in
/wicket/trunk/wicket/src/main/java/org/apache/wicket: Page.java
request/handler/ListenerInterfaceRequestHandler.java
Author: pete
Date: Tue Sep 7 19:43:00 2010
New Revision: 993500
URL: http://svn.apache.org/viewvc?rev=993500&view=rev
Log:
cleanup
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java
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=993500&r1=993499&r2=993500&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 Tue Sep 7 19:43:00 2010
@@ -116,11 +116,8 @@ import org.slf4j.LoggerFactory;
* @see org.apache.wicket.markup.html.WebPage
* @see org.apache.wicket.MarkupContainer
* @see org.apache.wicket.model.CompoundPropertyModel
- * @see org.apache.wicket.model.BoundCompoundPropertyModel
* @see org.apache.wicket.Component
- * @see org.apache.wicket.version.IPageVersionManager
- * @see org.apache.wicket.version.undo.UndoPageVersionManager
- *
+ *
* @author Jonathan Locke
* @author Chris Turner
* @author Eelco Hillenius
@@ -485,7 +482,6 @@ public abstract class Page extends Marku
}
/**
- * @see org.apache.wicket.session.pagemap.IPageMapEntry#getNumericId()
* @deprecated
*/
@Deprecated
@@ -494,9 +490,6 @@ public abstract class Page extends Marku
return getPageId();
}
- /**
- * @see org.apache.wicket.session.pagemap.IPageMapEntry#getPageClass()
- */
public final Class<? extends Page> getPageClass()
{
return getClass();
@@ -585,7 +578,7 @@ public abstract class Page extends Marku
pageClassToBookmarkableCache.put(getClass().getName(), bookmarkable);
}
- return bookmarkable.booleanValue();
+ return bookmarkable;
}
/**
@@ -646,14 +639,12 @@ public abstract class Page extends Marku
if (stateless == null)
{
- final Object[] returnArray = new Object[1];
Boolean returnValue = visitChildren(Component.class, new IVisitor<Component, Boolean>()
{
public void component(final Component component, final IVisit<Boolean> visit)
{
if (!component.isStateless())
{
- returnArray[0] = component;
visit.stop(Boolean.FALSE);
}
}
@@ -677,7 +668,7 @@ public abstract class Page extends Marku
*/
}
- return stateless.booleanValue();
+ return stateless;
}
/**
@@ -754,7 +745,7 @@ public abstract class Page extends Marku
* The page itself if it was a full page render or the container that was rendered
* standalone
*/
- private final void checkRendering(final MarkupContainer renderedContainer)
+ private void checkRendering(final MarkupContainer renderedContainer)
{
// If the application wants component uses checked and
// the response is not a redirect
@@ -831,10 +822,9 @@ public abstract class Page extends Marku
}
// Now first test if the component has a sibling that is a transparent resolver.
- Iterator<? extends Component> iterator2 = component.getParent().iterator();
- while (iterator2.hasNext())
+ for (Object o : component.getParent())
{
- Component sibling = iterator2.next();
+ Component sibling = (Component)o;
if (!sibling.isVisible())
{
if (sibling instanceof IComponentResolver)
@@ -844,8 +834,8 @@ public abstract class Page extends Marku
if (log.isDebugEnabled())
{
log.debug(
- "Component {} wasn't rendered but most likely it has a transparent parent: {}",
- component, sibling);
+ "Component {} wasn't rendered but most likely it has a transparent parent: {}",
+ component, sibling);
}
transparentContainerChildren.add(component);
iterator.remove();
@@ -871,11 +861,8 @@ public abstract class Page extends Marku
/**
* Initializes Page by adding it to the Session and initializing it.
- *
- * @param pageMap
- * The page map to put this page in.
*/
- private final void init()
+ private void init()
{
if (isBookmarkable())
{
@@ -1200,7 +1187,6 @@ public abstract class Page extends Marku
/**
*
* @param component
- * @param change
*/
final void componentStateChanging(final Component component)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java?rev=993500&r1=993499&r2=993500&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java Tue Sep 7 19:43:00 2010
@@ -107,7 +107,7 @@ public class ListenerInterfaceRequestHan
}
/**
- * @see org.apache.org.apache.wicket.request.IRequestHandler#detach(org.apache.wicket.request.cycle.RequestCycle)
+ * @see org.apache.wicket.request.IRequestHandler#detach(org.apache.wicket.request.IRequestCycle)
*/
public void detach(IRequestCycle requestCycle)
{
@@ -135,7 +135,7 @@ public class ListenerInterfaceRequestHan
}
/**
- * @see org.apache.org.apache.wicket.request.IRequestHandler#respond(org.apache.wicket.request.cycle.RequestCycle)
+ * @see org.apache.wicket.request.IRequestHandler#respond(org.apache.wicket.request.IRequestCycle)
*/
public void respond(final IRequestCycle requestCycle)
{
@@ -163,7 +163,7 @@ public class ListenerInterfaceRequestHan
*/
if (isAjax & page instanceof IManageablePage)
{
- ((IManageablePage)page).setFreezePageId(true);
+ page.setFreezePageId(true);
}
try
@@ -174,7 +174,7 @@ public class ListenerInterfaceRequestHan
{
if (isAjax && page instanceof IManageablePage)
{
- ((IManageablePage)page).setFreezePageId(false);
+ page.setFreezePageId(false);
}
}