diff --git a/core/src/main/java/hudson/model/ItemDescriptor.java b/core/src/main/java/hudson/model/ItemDescriptor.java new file mode 100644 index 0000000000..e5bf22e676 --- /dev/null +++ b/core/src/main/java/hudson/model/ItemDescriptor.java @@ -0,0 +1,32 @@ +package hudson.model; + +/** + * {@link Descriptor} for {@link Item}s. + * + *

+ * Historically, {@link TopLevelItemDescriptor} came into being first, so this descriptor is parametered + * to retain that signature identical. + * + * @author Kohsuke Kawaguchi + * @since 1.296 + */ +public abstract class ItemDescriptor> extends Descriptor { + protected ItemDescriptor(Class clazz) { + super(clazz); + } + + protected ItemDescriptor() { + } + + /** + * {@link ItemDescriptor}s often uses other descriptors to decorate itself. + * This method allows the subtype of {@link ItemDescriptor}s to filter them out. + * + *

+ * This is useful for a workflow/company specific job type that wants to eliminate + * options that the user would see. + */ + public boolean isApplicable(Descriptor descriptor) { + return true; + } +} diff --git a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java index f0d1bcd23e..13fb912175 100644 --- a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java +++ b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java @@ -35,7 +35,7 @@ import hudson.tasks.BuildStepDescriptor; * * @author Kohsuke Kawaguchi */ -public abstract class TopLevelItemDescriptor extends Descriptor { +public abstract class TopLevelItemDescriptor extends ItemDescriptor { protected TopLevelItemDescriptor(Class clazz) { super(clazz); } @@ -50,20 +50,6 @@ public abstract class TopLevelItemDescriptor extends Descriptor { protected TopLevelItemDescriptor() { } - /** - * {@link TopLevelItemDescriptor}s often uses other descriptors to decorate itself. - * This method allows the subtype of {@link TopLevelItemDescriptor}s to filter them out. - * - *

- * This is useful for a workflow/company specific job type that wants to eliminate - * options that the user would see. - * - * @since 1.294 - */ - public boolean isApplicable(Descriptor descriptor) { - return true; - } - /** * {@inheritDoc} * diff --git a/core/src/main/java/hudson/scm/SCM.java b/core/src/main/java/hudson/scm/SCM.java index cd38c8dd4b..8a02783c66 100644 --- a/core/src/main/java/hudson/scm/SCM.java +++ b/core/src/main/java/hudson/scm/SCM.java @@ -40,6 +40,7 @@ import hudson.model.Node; import hudson.model.WorkspaceCleanupThread; import hudson.model.Hudson; import hudson.model.Descriptor; +import hudson.model.ItemDescriptor; import hudson.model.AbstractProject.AbstractProjectDescriptor; import java.io.File; @@ -377,9 +378,9 @@ public abstract class SCM implements Describable, ExtensionPoint { for (SCMDescriptor scmDescriptor : all()) { if(!scmDescriptor.isApplicable(project)) continue; - if (pd instanceof AbstractProjectDescriptor) { - AbstractProjectDescriptor apd = (AbstractProjectDescriptor) pd; - if(!apd.isApplicable(scmDescriptor)) continue; + if (pd instanceof ItemDescriptor) { + ItemDescriptor id = (ItemDescriptor) pd; + if(!id.isApplicable(scmDescriptor)) continue; } r.add(scmDescriptor); diff --git a/core/src/main/java/hudson/tasks/BuildStepDescriptor.java b/core/src/main/java/hudson/tasks/BuildStepDescriptor.java index d27da3b7f7..a2799c7ae0 100644 --- a/core/src/main/java/hudson/tasks/BuildStepDescriptor.java +++ b/core/src/main/java/hudson/tasks/BuildStepDescriptor.java @@ -27,6 +27,7 @@ import hudson.model.Describable; import hudson.model.Descriptor; import hudson.model.AbstractProject; import hudson.model.Hudson; +import hudson.model.ItemDescriptor; import hudson.model.AbstractProject.AbstractProjectDescriptor; import java.util.List; @@ -61,7 +62,7 @@ public abstract class BuildStepDescriptor> * * @return * true to allow user to configure this post-promotion task for the given project. - * @see AbstractProjectDescriptor#isApplicable(Descriptor) + * @see AbstractProjectDescriptor#isApplicable(Descriptor) */ public abstract boolean isApplicable(Class jobType); @@ -76,7 +77,7 @@ public abstract class BuildStepDescriptor> List> r = new ArrayList>(base.size()); for (Descriptor d : base) { - if (pd instanceof AbstractProjectDescriptor && !((AbstractProjectDescriptor)pd).isApplicable(d)) + if (pd instanceof ItemDescriptor && !((ItemDescriptor)pd).isApplicable(d)) continue; if (d instanceof BuildStepDescriptor) { diff --git a/core/src/main/java/hudson/tasks/BuildWrappers.java b/core/src/main/java/hudson/tasks/BuildWrappers.java index 6455525afc..a04628833a 100644 --- a/core/src/main/java/hudson/tasks/BuildWrappers.java +++ b/core/src/main/java/hudson/tasks/BuildWrappers.java @@ -26,6 +26,7 @@ package hudson.tasks; import hudson.model.AbstractProject; import hudson.model.Descriptor; import hudson.model.Hudson; +import hudson.model.ItemDescriptor; import hudson.model.AbstractProject.AbstractProjectDescriptor; import hudson.Extension; import hudson.util.DescriptorList; @@ -58,7 +59,7 @@ public class BuildWrappers { Descriptor pd = Hudson.getInstance().getDescriptor((Class)project.getClass()); for (Descriptor w : BuildWrapper.all()) { - if (pd instanceof AbstractProjectDescriptor && !((AbstractProjectDescriptor)pd).isApplicable(w)) + if (pd instanceof ItemDescriptor && !((ItemDescriptor)pd).isApplicable(w)) continue; if (w instanceof BuildWrapperDescriptor) { BuildWrapperDescriptor bwd = (BuildWrapperDescriptor) w; diff --git a/core/src/main/java/hudson/triggers/Trigger.java b/core/src/main/java/hudson/triggers/Trigger.java index 1ff4d1c497..84f7aa9b18 100644 --- a/core/src/main/java/hudson/triggers/Trigger.java +++ b/core/src/main/java/hudson/triggers/Trigger.java @@ -40,6 +40,8 @@ import hudson.model.Project; import hudson.model.PeriodicWork; import hudson.model.TopLevelItem; import hudson.model.TopLevelItemDescriptor; +import hudson.model.Descriptor; +import hudson.model.ItemDescriptor; import hudson.scheduler.CronTab; import hudson.scheduler.CronTabList; import hudson.util.DoubleLaunchChecker; @@ -270,15 +272,15 @@ public abstract class Trigger implements Describable> * Returns a subset of {@link TriggerDescriptor}s that applys to the given item. */ public static List for_(Item i) { + Descriptor pd = Hudson.getInstance().getDescriptor((Class)i.getClass()); + List r = new ArrayList(); for (TriggerDescriptor t : all()) { if(!t.isApplicable(i)) continue; - if (i instanceof TopLevelItem) {// ugly - TopLevelItemDescriptor tld = ((TopLevelItem) i).getDescriptor(); - // tld shouldn't be really null in contract, but we often write test Describables that - // doesn't have a Descriptor. - if(tld!=null && !tld.isApplicable(t)) continue; + if (pd instanceof ItemDescriptor) {// ugly + ItemDescriptor tld = (ItemDescriptor) pd; + if(!tld.isApplicable(t)) continue; } r.add(t);