Stage 1 : Create hudson.model.Jenkins, make Hudson derive from Jenkins.

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
This commit is contained in:
Nigel Magnay committed 2011-05-29 11:00:58 +01:00
1 parent 84a78d5bac
commit 70c1065814
313 files changed
+4914 -4953

No files matched your search

@@ -38,7 +38,7 @@ import hudson.model.DependencyGraph;
import hudson.model.Descriptor;
import hudson.model.Descriptor.FormException;
import hudson.model.Executor;
import hudson.model.Hudson;
import hudson.model.Jenkins;
import hudson.model.Item;
import hudson.model.ItemGroup;
import hudson.model.Job;
@@ -225,11 +225,11 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
new DescribableList<BuildWrapper, Descriptor<BuildWrapper>>(this);
public MavenModuleSet(String name) {
this(Hudson.getInstance(),name);
this(Jenkins.getInstance(),name);
}
public MavenModuleSet(ItemGroup parent, String name) {
super(Hudson.getInstance(),name);
super(Jenkins.getInstance(),name);
}
public String getUrlChildPrefix() {
@@ -762,7 +762,7 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
*/
public List<Queue.Item> getQueueItems() {
List<Queue.Item> r = new ArrayList<hudson.model.Queue.Item>();
for( Queue.Item item : Hudson.getInstance().getQueue().getItems() ) {
for( Queue.Item item : Jenkins.getInstance().getQueue().getItems() ) {
Task t = item.task;
if((t instanceof MavenModule && ((MavenModule)t).getParent()==this) || t ==this)
r.add(item);
@@ -913,7 +913,7 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
}
public Maven.DescriptorImpl getMavenDescriptor() {
return Hudson.getInstance().getDescriptorByType(Maven.DescriptorImpl.class);
return Jenkins.getInstance().getDescriptorByType(Maven.DescriptorImpl.class);
}
/**