Author: ivaynberg
Date: Tue Nov 30 01:25:02 2010
New Revision: 1040381
URL: http://svn.apache.org/viewvc?rev=1040381&view=rev
Log:
cleanup
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.java
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java?rev=1040381&r1=1040380&r2=1040381&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java
Tue Nov 30 01:25:02 2010
@@ -83,20 +83,11 @@ public class NavigationToolbar extends A
return new NavigatorLabel(navigatorId, table);
}
- /**
- * @see org.apache.wicket.Component#callOnBeforeRenderIfNotVisible()
- */
- @Override
- protected boolean callOnBeforeRenderIfNotVisible()
- {
- return true;
- }
-
/** {...@inheritdoc} */
@Override
- protected void onBeforeRender()
+ protected void onConfigure()
{
+ super.onConfigure();
setVisible(table.getPageCount() > 1);
- super.onBeforeRender();
}
}
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=1040381&r1=1040380&r2=1040381&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 Tue Nov
30 01:25:02 2010
@@ -1038,8 +1038,8 @@ public abstract class Component
{
configure();
- if ((determineVisibility() || callOnBeforeRenderIfNotVisible())
&&
- !getFlag(FLAG_RENDERING) &&
!getFlag(FLAG_PREPARED_FOR_RENDER))
+ if ((determineVisibility()) && !getFlag(FLAG_RENDERING) &&
+ !getFlag(FLAG_PREPARED_FOR_RENDER))
{
setRequestFlag(RFLAG_BEFORE_RENDER_SUPER_CALL_VERIFIED,
false);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.java?rev=1040381&r1=1040380&r2=1040381&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.java
Tue Nov 30 01:25:02 2010
@@ -63,23 +63,14 @@ public class FormComponentFeedbackIndica
* Set the component's visibility according to the existence (or not)
of feedback messages
*/
@Override
- public void onBeforeRender()
+ public void onConfigure()
{
- super.onBeforeRender();
+ super.onConfigure();
// Get the messages for the current page
setVisible(Session.get().getFeedbackMessages().hasMessage(getFeedbackMessageFilter()));
}
/**
- * @see org.apache.wicket.Component#callOnBeforeRenderIfNotVisible()
- */
- @Override
- protected boolean callOnBeforeRenderIfNotVisible()
- {
- return true;
- }
-
- /**
* @return Let subclass specify some other filter
*/
protected IFeedbackMessageFilter getFeedbackMessageFilter()
