[JENKINS-30088] Use the function name instead of the display name

Originally-Committed-As: 577f2acb256c0c91eaa81abe3177b4248bbaa059
jenkinsci · Sep 28, 2015 · d10e6ae · d10e6ae
1 parent 5263170
commit d10e6ae
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/job/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java b/job/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java
@@ -656,7 +656,7 @@ private final class GraphL implements GraphListener {
             }
             node.addAction(new TimingAction());
 
-            logNodeMessage(node, "Running: " + node.getDisplayName());
+            logNodeMessage(node, "Running: " + node.getDisplayFunctionName());
             if (node instanceof FlowEndNode) {
                 finish(((FlowEndNode) node).getResult(), execution.getCauseOfFailure());
             } else {

diff --git a/job/src/main/java/org/jenkinsci/plugins/workflow/job/console/WorkflowRunConsoleNote.java b/job/src/main/java/org/jenkinsci/plugins/workflow/job/console/WorkflowRunConsoleNote.java
@@ -0,0 +1,31 @@
+package org.jenkinsci.plugins.workflow.job.console;
+
+import org.jenkinsci.plugins.workflow.job.WorkflowRun;
+
+import hudson.Extension;
+import hudson.MarkupText;
+import hudson.console.ConsoleAnnotationDescriptor;
+import hudson.console.ConsoleAnnotator;
+import hudson.console.ConsoleNote;
+import hudson.model.Run;
+
+public class WorkflowRunConsoleNote extends ConsoleNote<Run<?, ?>> {
+
+    @Override
+    public ConsoleAnnotator<Run<?,?>> annotate(Run<?, ?> context, MarkupText text, int charPos) {
+        if (context instanceof WorkflowRun) {
+            // TODO
+        }
+        return null;
+    }
+
+    @Extension
+    public static final class DescriptorImpl extends ConsoleAnnotationDescriptor {
+        public String getDisplayName() {
+            return "Workflow Console Note";
+        }
+    }
+
+    private static final long serialVersionUID = 1L;
+
+}