Author: jcompagner
Date: Sun Oct 5 13:06:55 2008
New Revision: 701880
URL: http://svn.apache.org/viewvc?rev=701880&view=rev
Log:
remove the finals from the wizard buttons WICKET-1844
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/CancelButton.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/FinishButton.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/LastButton.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/NextButton.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/PreviousButton.java
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/CancelButton.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/CancelButton.java?rev=701880&r1=701879&r2=701880&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/CancelButton.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/CancelButton.java
Sun Oct 5 13:06:55 2008
@@ -22,7 +22,7 @@
*
* @author Eelco Hillenius
*/
-public final class CancelButton extends WizardButton
+public class CancelButton extends WizardButton
{
private static final long serialVersionUID = 1L;
@@ -43,6 +43,7 @@
/**
* @see org.apache.wicket.Component#isEnabled()
*/
+ @Override
public final boolean isEnabled()
{
return true;
@@ -51,6 +52,7 @@
/**
* @see org.apache.wicket.Component#isVisible()
*/
+ @Override
public final boolean isVisible()
{
return getWizardModel().isCancelVisible();
@@ -59,6 +61,7 @@
/**
* @see org.apache.wicket.extensions.wizard.WizardButton#onClick()
*/
+ @Override
public final void onClick()
{
getWizardModel().cancel();
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/FinishButton.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/FinishButton.java?rev=701880&r1=701879&r2=701880&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/FinishButton.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/FinishButton.java
Sun Oct 5 13:06:55 2008
@@ -22,7 +22,7 @@
*
* @author Eelco Hillenius
*/
-public final class FinishButton extends WizardButton
+public class FinishButton extends WizardButton
{
private static final long serialVersionUID = 1L;
@@ -42,6 +42,7 @@
/**
* @see org.apache.wicket.Component#isEnabled()
*/
+ @Override
public final boolean isEnabled()
{
IWizardStep activeStep = getWizardModel().getActiveStep();
@@ -51,6 +52,7 @@
/**
* @see org.apache.wicket.extensions.wizard.WizardButton#onClick()
*/
+ @Override
public final void onClick()
{
IWizardModel wizardModel = getWizardModel();
@@ -67,7 +69,7 @@
else
{
error(getLocalizer().getString(
-
"org.apache.wicket.extensions.wizard.FinishButton.step.did.not.complete",
this));
+
"org.apache.wicket.extensions.wizard.FinishButton.step.did.not.complete",
this));
}
}
}
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/LastButton.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/LastButton.java?rev=701880&r1=701879&r2=701880&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/LastButton.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/LastButton.java
Sun Oct 5 13:06:55 2008
@@ -23,7 +23,7 @@
*
* @author Eelco Hillenius
*/
-public final class LastButton extends WizardButton
+public class LastButton extends WizardButton
{
private static final long serialVersionUID = 1L;
@@ -43,6 +43,7 @@
/**
* @see org.apache.wicket.Component#isEnabled()
*/
+ @Override
public final boolean isEnabled()
{
return getWizardModel().isLastAvailable();
@@ -51,6 +52,7 @@
/**
* @see org.apache.wicket.Component#isVisible()
*/
+ @Override
public final boolean isVisible()
{
return getWizardModel().isLastVisible();
@@ -59,6 +61,7 @@
/**
* @see org.apache.wicket.extensions.wizard.WizardButton#onClick()
*/
+ @Override
public final void onClick()
{
IWizardModel wizardModel = getWizardModel();
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/NextButton.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/NextButton.java?rev=701880&r1=701879&r2=701880&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/NextButton.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/NextButton.java
Sun Oct 5 13:06:55 2008
@@ -24,7 +24,7 @@
*
* @author Eelco Hillenius
*/
-public final class NextButton extends WizardButton
+public class NextButton extends WizardButton
{
private static final long serialVersionUID = 1L;
@@ -42,6 +42,7 @@
/**
* @see org.apache.wicket.Component#isEnabled()
*/
+ @Override
public final boolean isEnabled()
{
return getWizardModel().isNextAvailable();
@@ -50,6 +51,7 @@
/**
* @see org.apache.wicket.extensions.wizard.WizardButton#onClick()
*/
+ @Override
public final void onClick()
{
IWizardModel wizardModel = getWizardModel();
@@ -67,13 +69,14 @@
else
{
error(getLocalizer().getString(
-
"org.apache.wicket.extensions.wizard.NextButton.step.did.not.complete", this));
+
"org.apache.wicket.extensions.wizard.NextButton.step.did.not.complete", this));
}
}
/**
* @see org.apache.wicket.Component#onBeforeRender()
*/
+ @Override
protected final void onBeforeRender()
{
getForm().setDefaultButton(this);
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/PreviousButton.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/PreviousButton.java?rev=701880&r1=701879&r2=701880&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/PreviousButton.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/PreviousButton.java
Sun Oct 5 13:06:55 2008
@@ -22,7 +22,7 @@
*
* @author Eelco Hillenius
*/
-public final class PreviousButton extends WizardButton
+public class PreviousButton extends WizardButton
{
private static final long serialVersionUID = 1L;
@@ -43,6 +43,7 @@
/**
* @see org.apache.wicket.Component#isEnabled()
*/
+ @Override
public final boolean isEnabled()
{
return getWizardModel().isPreviousAvailable();
@@ -51,6 +52,7 @@
/**
* @see org.apache.wicket.extensions.wizard.WizardButton#onClick()
*/
+ @Override
public final void onClick()
{
getWizardModel().previous();