diff --git a/core/src/main/java/hudson/model/Cause.java b/core/src/main/java/hudson/model/Cause.java index 6f7b6038e2..44d2f3c6e0 100644 --- a/core/src/main/java/hudson/model/Cause.java +++ b/core/src/main/java/hudson/model/Cause.java @@ -27,6 +27,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import hudson.console.HyperlinkNote; import hudson.diagnosis.OldDataMonitor; import hudson.util.XStream2; import org.kohsuke.stapler.export.Exported; @@ -108,11 +109,25 @@ public abstract class Cause { public UpstreamCause(Run up) { upstreamBuild = up.getNumber(); - upstreamProject = up.getParent().getName(); + upstreamProject = up.getParent().getFullName(); upstreamUrl = up.getParent().getUrl(); upstreamCauses = new ArrayList(up.getCauses()); } + /** + * Returns true if this cause points to a build in the specified job. + */ + public boolean pointsTo(Job j) { + return j.getFullName().equals(upstreamProject); + } + + /** + * Returns true if this cause points to the specified build. + */ + public boolean pointsTo(Run r) { + return r.getNumber()==upstreamBuild && pointsTo(r.getParent()); + } + @Exported(visibility=3) public String getUpstreamProject() { return upstreamProject; @@ -130,7 +145,16 @@ public abstract class Cause { @Override public String getShortDescription() { - return Messages.Cause_UpstreamCause_ShortDescription(upstreamProject, Integer.toString(upstreamBuild)); + return Messages.Cause_UpstreamCause_ShortDescription(upstreamProject, upstreamBuild); + } + + @Override + public void print(TaskListener listener) { + listener.getLogger().println( + Messages.Cause_UpstreamCause_ShortDescription( + HyperlinkNote.encodeTo('/'+upstreamUrl, upstreamProject), + HyperlinkNote.encodeTo('/'+upstreamUrl+upstreamBuild, Integer.toString(upstreamBuild))) + ); } public static class ConverterImpl extends XStream2.PassthruConverter {