Rolling back 9328,9331,9352-9354 as I still wanted to make some adjustments to them

before they are merged into the main line.



git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@9366 71c3de6d-444a-0410-be80-ed276b4c234a

core/src/main/java/hudson/Functions.java

@@ -1,7 +1,21 @@
 package hudson;
 
 import hudson.maven.ExecutedMojo;
-import hudson.model.*;
+import hudson.model.AbstractProject;
+import hudson.model.Action;
+import hudson.model.Descriptor;
+import hudson.model.Hudson;
+import hudson.model.Item;
+import hudson.model.ItemGroup;
+import hudson.model.Items;
+import hudson.model.Job;
+import hudson.model.JobPropertyDescriptor;
+import hudson.model.ModelObject;
+import hudson.model.Node;
+import hudson.model.Project;
+import hudson.model.Run;
+import hudson.model.TopLevelItem;
+import hudson.model.View;
 import hudson.search.SearchableModelObject;
 import hudson.tasks.BuildStep;
 import hudson.tasks.BuildStepDescriptor;
@@ -493,14 +507,6 @@ public class Functions {
         return BuildStepDescriptor.filter(BuildStep.PUBLISHERS, project.getClass());
     }
 
-    public static List<Descriptor<SlaveStartMethod>> getSlaveStartMethodDescriptors() {
-        return SlaveStartMethod.LIST;
-    }
-
-    public static List<Descriptor<SlaveAvailabilityStrategy>> getSlaveAvailabilityStrategyDescriptors() {
-        return SlaveAvailabilityStrategy.LIST;
-    }
-
     /**
      * Computes the path to the icon of the given action
      * from the context path.