mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-17 22:12:25 +00:00
rely more on automatic help link
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@17886 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
60839d4ca3
commit
8024f52b66
21 files changed
+28
-18
No files matched your search
@@ -2169,13 +2169,13 @@ public final class Hudson extends Node implements ItemGroup<TopLevelItem>, Stapl
|
||||
}
|
||||
}
|
||||
|
||||
numExecutors = Integer.parseInt(req.getParameter("numExecutors"));
|
||||
numExecutors = Integer.parseInt(req.getParameter("_.numExecutors"));
|
||||
if(req.hasParameter("master.mode"))
|
||||
mode = Mode.valueOf(req.getParameter("master.mode"));
|
||||
else
|
||||
mode = Mode.NORMAL;
|
||||
|
||||
label = Util.fixNull(req.getParameter("label"));
|
||||
label = Util.fixNull(req.getParameter("_.labelString"));
|
||||
labelSet=null;
|
||||
|
||||
quietPeriod = Integer.parseInt(req.getParameter("quiet_period"));
|
||||
|
||||
@@ -137,6 +137,12 @@ public abstract class Node extends AbstractModelObject implements Describable<No
|
||||
*/
|
||||
public abstract Set<Label> getAssignedLabels();
|
||||
|
||||
/**
|
||||
* The same as {@link #getAssignedLabels()} but returns labels as a single text.
|
||||
* Mainly for form binding.
|
||||
*/
|
||||
public abstract String getLabelString();
|
||||
|
||||
/*
|
||||
* Returns the possibly empty set of labels that it has been determined as supported by this node.
|
||||
* @see hudson.tasks.LabelFinder
|
||||
|
||||
@@ -132,24 +132,24 @@ public abstract class Slave extends Node implements Serializable {
|
||||
|
||||
@DataBoundConstructor
|
||||
public Slave(String name, String nodeDescription, String remoteFS, String numExecutors,
|
||||
Mode mode, String label, ComputerLauncher launcher, RetentionStrategy retentionStrategy, List<? extends NodeProperty<?>> nodeProperties) throws FormException, IOException {
|
||||
this(name,nodeDescription,remoteFS,Util.tryParseNumber(numExecutors, 1).intValue(),mode,label,launcher,retentionStrategy, nodeProperties);
|
||||
Mode mode, String labelString, ComputerLauncher launcher, RetentionStrategy retentionStrategy, List<? extends NodeProperty<?>> nodeProperties) throws FormException, IOException {
|
||||
this(name,nodeDescription,remoteFS,Util.tryParseNumber(numExecutors, 1).intValue(),mode,labelString,launcher,retentionStrategy, nodeProperties);
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
public Slave(String name, String nodeDescription, String remoteFS, int numExecutors,
|
||||
Mode mode, String label, ComputerLauncher launcher, RetentionStrategy retentionStrategy) throws FormException, IOException {
|
||||
this(name, nodeDescription, remoteFS, numExecutors, mode, label, launcher, retentionStrategy, new ArrayList());
|
||||
Mode mode, String labelString, ComputerLauncher launcher, RetentionStrategy retentionStrategy) throws FormException, IOException {
|
||||
this(name, nodeDescription, remoteFS, numExecutors, mode, labelString, launcher, retentionStrategy, new ArrayList());
|
||||
}
|
||||
|
||||
public Slave(String name, String nodeDescription, String remoteFS, int numExecutors,
|
||||
Mode mode, String label, ComputerLauncher launcher, RetentionStrategy retentionStrategy, List<? extends NodeProperty<?>> nodeProperties) throws FormException, IOException {
|
||||
Mode mode, String labelString, ComputerLauncher launcher, RetentionStrategy retentionStrategy, List<? extends NodeProperty<?>> nodeProperties) throws FormException, IOException {
|
||||
this.name = name;
|
||||
this.description = nodeDescription;
|
||||
this.numExecutors = numExecutors;
|
||||
this.mode = mode;
|
||||
this.remoteFS = remoteFS;
|
||||
this.label = Util.fixNull(label).trim();
|
||||
this.label = Util.fixNull(labelString).trim();
|
||||
this.launcher = launcher;
|
||||
this.retentionStrategy = retentionStrategy;
|
||||
getAssignedLabels(); // compute labels now
|
||||
|
||||
@@ -44,13 +44,13 @@ public final class DumbSlave extends Slave {
|
||||
* @deprecated as of 1.286.
|
||||
* Use {@link #DumbSlave(String, String, String, String, Mode, String, ComputerLauncher, RetentionStrategy, List)}
|
||||
*/
|
||||
public DumbSlave(String name, String nodeDescription, String remoteFS, String numExecutors, Mode mode, String label, ComputerLauncher launcher, RetentionStrategy retentionStrategy) throws FormException, IOException {
|
||||
this(name, nodeDescription, remoteFS, numExecutors, mode, label, launcher, retentionStrategy, new ArrayList());
|
||||
public DumbSlave(String name, String nodeDescription, String remoteFS, String numExecutors, Mode mode, String labelString, ComputerLauncher launcher, RetentionStrategy retentionStrategy) throws FormException, IOException {
|
||||
this(name, nodeDescription, remoteFS, numExecutors, mode, labelString, launcher, retentionStrategy, new ArrayList());
|
||||
}
|
||||
|
||||
@DataBoundConstructor
|
||||
public DumbSlave(String name, String nodeDescription, String remoteFS, String numExecutors, Mode mode, String label, ComputerLauncher launcher, RetentionStrategy retentionStrategy, List<? extends NodeProperty<?>> nodeProperties) throws IOException, FormException {
|
||||
super(name, nodeDescription, remoteFS, numExecutors, mode, label, launcher, retentionStrategy, nodeProperties);
|
||||
public DumbSlave(String name, String nodeDescription, String remoteFS, String numExecutors, Mode mode, String labelString, ComputerLauncher launcher, RetentionStrategy retentionStrategy, List<? extends NodeProperty<?>> nodeProperties) throws IOException, FormException {
|
||||
super(name, nodeDescription, remoteFS, numExecutors, mode, labelString, launcher, retentionStrategy, nodeProperties);
|
||||
}
|
||||
|
||||
@Extension
|
||||
|
||||
Reference in new issue
Block a user