Author: ehillenius
Date: Fri May 4 12:50:29 2007
New Revision: 535363
URL: http://svn.apache.org/viewvc?view=rev&rev=535363
Log:
fixes for onAttach change
Modified:
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/NextButton.java
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java
Modified:
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java?view=diff&rev=535363&r1=535362&r2=535363
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java
Fri May 4 12:50:29 2007
@@ -145,7 +145,7 @@
*/
public boolean getReuseItems()
{
- return Tree.this.getOptimizeItemRemoval();
+ return Tree.this.getReuseItems();
}
/**
@@ -366,24 +366,6 @@
}
/**
- * Gets whether item removal should be optimized. If true, re-rendering
the
- * tree is more efficient if the tree model doesn't get changed.
However, if
- * this is true, you need to push changes to this tree. This can
easility be
- * done by registering this tree as the listener for tree model events
- * (TreeModelListener), but you should <b>be carefull</b> not to create
a
- * memory leak by doing this (e.g. when you store the tree model in your
- * session, the tree you registered cannot be GC-ed). TRUE by default.
- *
- * @return whether item removal should be optimized
- * @deprecated Will be replaced by [EMAIL PROTECTED] #getReuseItems()}
- */
- // TODO Post 1.2: Remove
- public boolean getOptimizeItemRemoval()
- {
- return getReuseItems();
- }
-
- /**
* Gets whether items should be reused. If true, re-rendering the tree
is
* more efficient if the tree model doesn't get changed. However, if
this is
* true, you need to push changes to this tree. This can easility be
done by
@@ -686,11 +668,11 @@
/**
* @see org.apache.wicket.Component#onBeforeRender()
*/
- protected void onAttach()
+ protected void onBeforeRender()
{
- super.onAttach();
+ super.onBeforeRender();
// if we don't optimize, rebuild the paths on every request
- if (!getOptimizeItemRemoval())
+ if (!getReuseItems())
{
treePathsModel.dirty = true;
}
Modified:
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/NextButton.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/NextButton.java?view=diff&rev=535363&r1=535362&r2=535363
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/NextButton.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/NextButton.java
Fri May 4 12:50:29 2007
@@ -75,7 +75,7 @@
/**
* @see org.apache.wicket.Component#onBeforeRender()
*/
- protected final void onAttach()
+ protected final void onBeforeRender()
{
super.onBeforeRender();
// TODO after the constructor change we can do this in the
constructor
Modified:
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java?view=diff&rev=535363&r1=535362&r2=535363
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java
Fri May 4 12:50:29 2007
@@ -336,7 +336,8 @@
/**
* @see
org.apache.wicket.extensions.wizard.IWizardStep#getHeader(java.lang.String,
- * org.apache.wicket.Component,
org.apache.wicket.extensions.wizard.IWizard)
+ * org.apache.wicket.Component,
+ * org.apache.wicket.extensions.wizard.IWizard)
*/
public Component getHeader(String id, Component parent, IWizard wizard)
{
@@ -367,7 +368,8 @@
/**
* @see
org.apache.wicket.extensions.wizard.IWizardStep#getView(java.lang.String,
- * org.apache.wicket.Component,
org.apache.wicket.extensions.wizard.IWizard)
+ * org.apache.wicket.Component,
+ * org.apache.wicket.extensions.wizard.IWizard)
*/
public Component getView(String id, Component parent, IWizard wizard)
{
@@ -455,7 +457,7 @@
}
/**
- * Workaround for adding the form validators; not needed in 2.0.
+ * Workaround for adding the form validators.
*
* @see org.apache.wicket.Component#onBeforeRender()
*/
