more renaming to align with the new name.

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

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

@@ -494,7 +494,7 @@ public class Functions {
         return BuildStepDescriptor.filter(BuildStep.PUBLISHERS, project.getClass());
     }
 
-    public static List<Descriptor<ComputerLauncher>> getSlaveStartMethodDescriptors() {
+    public static List<Descriptor<ComputerLauncher>> getComputerLauncherDescriptors() {
         return ComputerLauncher.LIST;
     }
 

core/src/main/java/hudson/model/Hudson.java

@@ -1526,7 +1526,7 @@ public final class Hudson extends View implements ItemGroup<TopLevelItem>, Node,
         final ComputerLauncher launcher = newDescribedChild(req, j, "launcher", ComputerLauncher.LIST);
         final RetentionStrategy retentionStrategy = newDescribedChild(req, j, "availabilityStrategy", RetentionStrategy.LIST);
         final Slave slave = req.bindJSON(Slave.class, j);
-        slave.setStartMethod(launcher);
+        slave.setLauncher(launcher);
         slave.setRetentionStrategy(retentionStrategy);
         return slave;
     }

core/src/main/java/hudson/model/Slave.java

@@ -114,11 +114,11 @@ public final class Slave implements Node, Serializable {
             throw new FormException(Messages.Slave_InvalidConfig_Executors(name), null);
     }
 
-    public ComputerLauncher getStartMethod() {
+    public ComputerLauncher getLauncher() {
         return launcher == null ? new JNLPLauncher() : launcher;
     }
 
-    public void setStartMethod(ComputerLauncher launcher) {
+    public void setLauncher(ComputerLauncher launcher) {
         this.launcher = launcher;
     }
 

core/src/main/java/hudson/slaves/SlaveComputer.java

@@ -256,7 +256,7 @@ public final class SlaveComputer extends Computer {
     @Override
     protected void setNode(Node node) {
         super.setNode(node);
-        launcher = ((Slave)node).getStartMethod();
+        launcher = ((Slave)node).getLauncher();
 
         // maybe the configuration was changed to relaunch the slave, so try to re-launch now.
         launch();

core/src/main/resources/hudson/model/Hudson/configureExecutors.jelly

@@ -64,7 +64,7 @@
 
                 <s:dropdownList name="slave.startMethodClass" title="${%Start method}"
                                 help="/help/system-config/master-slave/launcher.html">
-                    <j:forEach var="d" items="${h.getSlaveStartMethodDescriptors()}" varStatus="loop">
+                    <j:forEach var="d" items="${h.getComputerLauncherDescriptors()}" varStatus="loop">
                         <s:dropdownListBlock value="${d.class.name}" name="${d.displayName}"
                                              selected="${s.launcher.descriptor==d}"
                                              title="${d.displayName}">