Author: jrthomerson
Date: Sun Feb 20 04:12:53 2011
New Revision: 1072488
URL: http://svn.apache.org/viewvc?rev=1072488&view=rev
Log:
improvement on WICKET-3457
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/Component.java
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/behavior/IComponentConfigurationBehavior.java
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/Component.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/Component.java?rev=1072488&r1=1072487&r2=1072488&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/Component.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/Component.java
Sun Feb 20 04:12:53 2011
@@ -1159,24 +1159,14 @@ public abstract class Component implemen
{
if (!getFlag(FLAG_CONFIGURED))
{
- // Apply behavior modifiers
- List<IComponentConfigurationBehavior> behaviors =
getBehaviors(IComponentConfigurationBehavior.class);
- for (IComponentConfigurationBehavior behavior :
behaviors)
- {
- // Components may reject some behavior
components
- if (isBehaviorAccepted(behavior))
- {
- behavior.preConfigure(this);
- }
- }
onConfigure();
- behaviors =
getBehaviors(IComponentConfigurationBehavior.class);
+ List<IComponentConfigurationBehavior> behaviors =
getBehaviors(IComponentConfigurationBehavior.class);
for (IComponentConfigurationBehavior behavior :
behaviors)
{
// Components may reject some behavior
components
if (isBehaviorAccepted(behavior))
{
- behavior.postConfigure(this);
+ behavior.onConfigure(this);
}
}
setFlag(FLAG_CONFIGURED, true);
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java?rev=1072488&r1=1072487&r2=1072488&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java
Sun Feb 20 04:12:53 2011
@@ -170,16 +170,9 @@ public abstract class AbstractBehavior
}
/**
- * @see
org.apache.wicket.behavior.IComponentConfigurationBehavior#preConfigure(org.apache.wicket.Component)
- */
- public void preConfigure(Component component)
- {
- }
-
- /**
* @see
org.apache.wicket.behavior.IComponentConfigurationBehavior#postConfigure(org.apache.wicket.Component)
*/
- public void postConfigure(Component component)
+ public void onConfigure(Component component)
{
}
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/behavior/IComponentConfigurationBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/behavior/IComponentConfigurationBehavior.java?rev=1072488&r1=1072487&r2=1072488&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/behavior/IComponentConfigurationBehavior.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/behavior/IComponentConfigurationBehavior.java
Sun Feb 20 04:12:53 2011
@@ -30,16 +30,6 @@ public interface IComponentConfiguration
{
/**
- * Called immediately before the onConfigure method in a component.
Since this is before the
- * rendering cycle has begun, the behavior can modify the configuration
of the component (i.e.
- * setVisible(false))
- *
- * @param component
- * the component being configured
- */
- void preConfigure(Component component);
-
- /**
* Called immediately after the onConfigure method in a component.
Since this is before the
* rendering cycle has begun, the behavior can modify the configuration
of the component (i.e.
* setVisible(false))
@@ -47,5 +37,5 @@ public interface IComponentConfiguration
* @param component
* the component being configured
*/
- void postConfigure(Component component);
+ void onConfigure(Component component);
}
