Skip to content
Permalink
Browse files

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

This reverts commit a61d549.
  • Loading branch information
svanoort committed Sep 23, 2016
1 parent 75e8ee4 commit e0676fad9646031d05bd0dba0244cc6d00d4d106
@@ -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);
}

0 comments on commit e0676fa

Please sign in to comment.
You can’t perform that action at this time.