FORGE-1704: temporary workaround

forge · Mar 28, 2014 · eb4e324 · eb4e324
1 parent 6a68988
commit eb4e324
Showing 1 changed file with 20 additions and 11 deletions.
diff --git a/...l/src/main/java/org/jboss/forge/addon/ui/impl/controller/WizardCommandControllerImpl.java b/...l/src/main/java/org/jboss/forge/addon/ui/impl/controller/WizardCommandControllerImpl.java
@@ -42,9 +42,9 @@
 import org.jboss.forge.furnace.addons.AddonRegistry;
 
 /**
- * 
+ *
  * Implementation for the {@link WizardCommandController} interface
- * 
+ *
  * @author <a href="ggastald@redhat.com">George Gastaldi</a>
  */
 class WizardCommandControllerImpl extends AbstractCommandController implements WizardCommandController
@@ -386,21 +386,30 @@ public WizardCommandController next() throws Exception
    }
 
    /**
-    * 
+    * Remove stale pages in case of navigational changes
     */
    private void cleanSubsequentStalePages()
    {
-      // Remove subsequent pages and push the subflows back to the stack
-      Iterator<WizardStepEntry> it = flow.listIterator(flowPointer + 1);
-      int subflowIdx = 0;
-      while (it.hasNext())
+      // FIXME: Workaround until FORGE-1704 is fixed
+      if (flowPointer == 0)
       {
-         WizardStepEntry entry = it.next();
-         if (entry.subflowHead && !subflow.contains(entry))
+         flow.subList(1, flow.size()).clear();
+         subflow.clear();
+      }
+      else
+      {
+         // Remove subsequent pages and push the subflows back to the stack
+         Iterator<WizardStepEntry> it = flow.listIterator(flowPointer + 1);
+         int subflowIdx = 0;
+         while (it.hasNext())
          {
-            subflow.add(subflowIdx++, entry);
+            WizardStepEntry entry = it.next();
+            if (entry.subflowHead && !subflow.contains(entry))
+            {
+               subflow.add(subflowIdx++, entry);
+            }
+            it.remove();
          }
-         it.remove();
       }
    }