You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2014/08/27 18:28:02 UTC
git commit: WICKET-5683 PreviousButton isEnabled() should bo logical
conjunction of getWizardModel().isPreviousAvailable() and super.isEnabled()
Repository: wicket
Updated Branches:
refs/heads/master cfab8755b -> 450d89da0
WICKET-5683 PreviousButton isEnabled() should bo logical conjunction of
getWizardModel().isPreviousAvailable() and super.isEnabled()
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/450d89da
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/450d89da
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/450d89da
Branch: refs/heads/master
Commit: 450d89da0b8a322ea99c943e726d654728264b66
Parents: cfab875
Author: adelbene <an...@gmail.com>
Authored: Wed Aug 27 18:27:37 2014 +0200
Committer: adelbene <an...@gmail.com>
Committed: Wed Aug 27 18:27:37 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/extensions/wizard/CancelButton.java | 2 +-
.../java/org/apache/wicket/extensions/wizard/FinishButton.java | 3 ++-
.../java/org/apache/wicket/extensions/wizard/LastButton.java | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/450d89da/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/CancelButton.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/CancelButton.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/CancelButton.java
index d288379..7830190 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/CancelButton.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/CancelButton.java
@@ -55,7 +55,7 @@ public class CancelButton extends WizardButton
@Override
public final boolean isVisible()
{
- return getWizardModel().isCancelVisible();
+ return getWizardModel().isCancelVisible() && super.isVisible();
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/450d89da/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/FinishButton.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/FinishButton.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/FinishButton.java
index ae157d4..be62df0 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/FinishButton.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/FinishButton.java
@@ -46,7 +46,8 @@ public class FinishButton extends WizardButton
public boolean isEnabled()
{
IWizardStep activeStep = getWizardModel().getActiveStep();
- return ((activeStep != null) && getWizardModel().isLastStep(activeStep));
+ return (activeStep != null) && getWizardModel().isLastStep(activeStep)
+ && super.isEnabled();
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/450d89da/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/LastButton.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/LastButton.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/LastButton.java
index 5c47e18..5fad4d4 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/LastButton.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/LastButton.java
@@ -46,7 +46,7 @@ public class LastButton extends WizardButton
@Override
public boolean isEnabled()
{
- return getWizardModel().isLastAvailable();
+ return getWizardModel().isLastAvailable() && super.isEnabled();
}
/**
@@ -55,7 +55,7 @@ public class LastButton extends WizardButton
@Override
public boolean isVisible()
{
- return getWizardModel().isLastVisible();
+ return getWizardModel().isLastVisible() && super.isVisible();
}
/**