Revert "[FIXED JENKINS-38457] Go back to FlowGraphWalker for now."

This reverts commit a61d549.
jenkinsci · Sep 23, 2016 · e0676fa · e0676fa
1 parent 75e8ee4
commit e0676fa
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/support/visualization/table/FlowGraphTable.java b/src/main/java/org/jenkinsci/plugins/workflow/support/visualization/table/FlowGraphTable.java
@@ -5,9 +5,9 @@
 import org.jenkinsci.plugins.workflow.flow.FlowExecution;
 import org.jenkinsci.plugins.workflow.graph.BlockEndNode;
 import org.jenkinsci.plugins.workflow.graph.BlockStartNode;
-import org.jenkinsci.plugins.workflow.graph.FlowGraphWalker;
 import org.jenkinsci.plugins.workflow.graph.FlowNode;
 import org.jenkinsci.plugins.workflow.actions.NotExecutedNodeAction;
+import org.jenkinsci.plugins.workflow.graphanalysis.DepthFirstScanner;
 import org.jenkinsci.plugins.workflow.visualization.table.FlowNodeViewColumn;
 import org.jenkinsci.plugins.workflow.visualization.table.FlowNodeViewColumnDescriptor;
 
@@ -69,14 +69,13 @@ public void build() {
      */
     private Map<FlowNode, Row> createAllRows() {
         heads = execution.getCurrentHeads();
-        // TODO switch to DepthFirstScanner when JENKINS-38458 is fixed, and put branches back in forward order
-        FlowGraphWalker walker = new FlowGraphWalker();
-        walker.addHeads(heads);
+        final DepthFirstScanner scanner = new DepthFirstScanner();
+        scanner.setup(heads);
 
         // nodes that we've visited
         final Map<FlowNode,Row> rows = new LinkedHashMap<FlowNode, Row>();
 
-        for (FlowNode n : walker) {
+        for (FlowNode n : scanner) {
             Row row = new Row(n);
             rows.put(n, row);
         }