OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-07 17:15:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

deprecate the method that assumes one instance per descriptor

Browse Source
This commit is contained in:
Kohsuke Kawaguchi committed 2012-04-26 00:04:01 -07:00
1 parent c12df414ea
commit 047fdda91f
2 files changed
+9 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/model/Build.java
+3 -3
View File
@@ -118,7 +118,7 @@ public abstract class Build <P extends Project<P,B>,B extends Build<P,B>>
protected Result doRun(BuildListener listener) throws Exception {
if(!preBuild(listener,project.getBuilders()))
return FAILURE;
if(!preBuild(listener,project.getPublishers()))
if(!preBuild(listener,project.getPublishersList()))
return FAILURE;
Result r = null;
@@ -159,7 +159,7 @@ public abstract class Build <P extends Project<P,B>,B extends Build<P,B>>
}
public void post2(BuildListener listener) throws IOException, InterruptedException {
if (!performAllBuildSteps(listener, project.getPublishers(), true))
if (!performAllBuildSteps(listener, project.getPublishersList(), true))
setResult(FAILURE);
if (!performAllBuildSteps(listener, project.getProperties(), true))
setResult(FAILURE);
@@ -168,7 +168,7 @@ public abstract class Build <P extends Project<P,B>,B extends Build<P,B>>
@Override
public void cleanUp(BuildListener listener) throws Exception {
// at this point it's too late to mark the build as a failure, so ignore return value.
performAllBuildSteps(listener, project.getPublishers(), false);
performAllBuildSteps(listener, project.getPublishersList(), false);
performAllBuildSteps(listener, project.getProperties(), false);
super.cleanUp(listener);
}
core/src/main/java/hudson/model/Project.java
+6 -1
View File
@@ -105,6 +105,11 @@ public abstract class Project<P extends Project<P,B>,B extends Build<P,B>>
return builders.toList();
}
/**
* @deprecated as of 1.463
* We will be soon removing the restriction that only one instance of publisher is allowed per type.
* Use {@link #getPublishersList()} instead.
*/
public Map<Descriptor<Publisher>,Publisher> getPublishers() {
return publishers.toMap();
}
@@ -195,7 +200,7 @@ public abstract class Project<P extends Project<P,B>,B extends Build<P,B>>
buildWrappers.rebuild(req,json, BuildWrappers.getFor(this));
builders.rebuildHetero(req,json, Builder.all(), "builder");
publishers.rebuildHetero(req, json, Publisher.all(), "publisher");
publishers.rebuild(req, json, BuildStepDescriptor.filter(Publisher.all(), this.getClass()));
}
@Override