Merge pull request #1 from david-resnick/JENKINS-5761

[FIXED JENKINS-5761]
jenkinsci · Jun 21, 2011 · 1244237 · 1244237
2 parents c0ce12c + 8a3f323
commit 1244237
Showing 1 changed file with 6 additions and 28 deletions.
diff --git a/src/main/java/org/jvnet/hudson/plugins/DownstreamBuildViewAction.java b/src/main/java/org/jvnet/hudson/plugins/DownstreamBuildViewAction.java
@@ -29,7 +29,6 @@
 import hudson.model.Hudson;
 import hudson.model.Result;
 import hudson.model.Run;
-import hudson.tasks.BuildTrigger;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -47,20 +46,14 @@ public class DownstreamBuildViewAction extends AbstractDownstreamBuildViewAction
 
     public DownstreamBuildViewAction(AbstractBuild<?, ?> build) {
         super(build);
-        BuildTrigger buildTrigger = build.getProject().getPublishersList().get(BuildTrigger.class);
-        if (buildTrigger != null) {
-            List<AbstractProject> childs = buildTrigger.getChildProjects();
-
-            for (Iterator<AbstractProject> iterator = childs.iterator(); iterator.hasNext();) {
-                AbstractProject project = iterator.next();
-                addDownstreamBuilds(project.getName(),0);
-            }
-          //  downstreamBuildList = findDownstream(childs, 1, new ArrayList<Integer>(),build.getParent().getName(),build.getNumber());
+        List<AbstractProject> childs = build.getProject().getDownstreamProjects();
+        for (Iterator<AbstractProject> iterator = childs.iterator(); iterator.hasNext();) {
+            AbstractProject project = iterator.next();
+            addDownstreamBuilds(project.getName(),0);
         }
         rootURL = Hudson.getInstance().getRootUrl();
     }
 
-
     private List<DownstreamBuilds> findDownstream(List<AbstractProject> childs, int depth,List<Integer> parentChildSize,String upProjectName,int upBuildNumber) {
     	List<DownstreamBuilds> childList = new ArrayList<DownstreamBuilds>();
         for (Iterator<AbstractProject> iterator = childs.iterator(); iterator.hasNext();) {
@@ -106,19 +99,15 @@ public class DownstreamBuilds {
         private List<Integer> parentChildSize;
         private transient AbstractProject project;
         private transient Run<?, ?> run;
-
 
         private void initilize(){
         	project = Hudson.getInstance().getItemByFullName(projectName, AbstractProject.class);
         	run = project.getBuildByNumber(buildNumber);
         }
 
-
         public List<Integer> getParentChildSize() {
             return parentChildSize;
         }
-
-
 
         public void setParentChildSize(List<Integer> parentChildSize) {
             this.parentChildSize = parentChildSize;
@@ -154,7 +143,6 @@ public String currentBuildNumber() {
         	}
             return Integer.toString(buildNumber);
         }
-
 
         public int getDepth() {
             return depth;
@@ -195,8 +183,6 @@ public void setDepth(int depth) {
             this.depth = depth;
         }
 
-
-
         public String getStatusMessage() {
         	if(project == null ){
         		initilize();
@@ -231,20 +217,12 @@ public String getRootURL() {
     }
 
     public List<DownstreamBuilds> getDownstreamBuildList() {
-    	BuildTrigger buildTrigger = build.getProject().getPublishersList().get(BuildTrigger.class);
-        if (buildTrigger != null) {
-            List<AbstractProject> childs = buildTrigger.getChildProjects();
-            downstreamBuildList = findDownstream(childs, 1, new ArrayList<Integer>(),build.getParent().getName(),build.getNumber());
-        }
+        List<AbstractProject> childs = build.getProject().getDownstreamProjects();
+        downstreamBuildList = findDownstream(childs, 1, new ArrayList<Integer>(),build.getParent().getName(),build.getNumber());
         return downstreamBuildList;
     }
 
     public void setDownstreamBuildList(List<DownstreamBuilds> downstreamBuildList) {
         this.downstreamBuildList = downstreamBuildList;
     }
-
-
-
-
-
  }