Skip to content

contentPanel visibility changed to protected #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jkubrynski wants to merge 2 commits into
base: master
Choose a base branch
from
Open

contentPanel visibility changed to protected #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb2970a
Changed contentPanel visibility to protected to allow proper overridi…
jkubrynski Dec 16, 2012
4199e51
Extracted method allowing custom operation on step.getContent
jkubrynski Dec 16, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/org/vaadin/teemu/wizards/Wizard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,16 +386,20 @@ protected void activateStep(WizardStep step) {
}
}

contentPanel.removeAllComponents();
contentPanel.addComponent(step.getContent());
addStepComponent(contentPanel, step);
currentStep = step;

updateUriFragment();
updateButtons();
fireEvent(new WizardStepActivationEvent(this, step));
}

protected void activateStep(String id) {
protected void addStepComponent(Panel wizardContentPanel, WizardStep step) {
wizardContentPanel.removeAllComponents();
wizardContentPanel.addComponent(step.getContent());
}

protected void activateStep(String id) {
WizardStep step = idMap.get(id);
if (step != null) {
// check that we don't go past the lastCompletedStep by using the id
Expand Down