svn commit: r909839 - in /wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard: WizardStep.java dynamic/DynamicWizardModel.java

[jdonnerstag]

Author: jdonnerstag
Date: Sat Feb 13 16:04:31 2010
New Revision: 909839

URL: http://svn.apache.org/viewvc?rev=909839&view=rev
Log:
fixed: DynamicWizardModel: setActiveStep is called twice
Issue: WICKET-2740

Modified:
    
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java
    
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModel.java

Modified: 
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java?rev=909839&r1=909838&r2=909839&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java
 Sat Feb 13 16:04:31 2010
@@ -489,6 +489,4 @@
        {
                return wizardModel;
        }
-
-
 }

Modified: 
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModel.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModel.java?rev=909839&r1=909838&r2=909839&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModel.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModel.java
 Sat Feb 13 16:04:31 2010
@@ -24,14 +24,13 @@
 
 /**
  * Wizard model that is specialized on dynamic wizards. Unlike the default, 
static
- * {...@link WizardModel wizard model}, this model isn't very intelligent, but 
rather delegates much
- * of the work and knowledge to the {...@link IDynamicWizardStep dynamic 
wizard steps} it uses.
+ * {...@link WizardModel wizard model}, this model isn't very intelligent, but 
rather delegates much of
+ * the work and knowledge to the {...@link IDynamicWizardStep dynamic wizard 
steps} it uses.
  * 
  * @author eelcohillenius
  */
 public class DynamicWizardModel extends AbstractWizardModel
 {
-
        private static final long serialVersionUID = 1L;
 
        /**
@@ -52,7 +51,6 @@
         */
        public DynamicWizardModel(IDynamicWizardStep startStep)
        {
-               setActiveStep(startStep);
                this.startStep = startStep;
        }