From da9b00a783f41b627f1f4c45a2654708bf75129e Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 23 Jun 2007 23:23:36 +0000 Subject: [PATCH] implemented user-defined axis support. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@3533 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/matrix/Axis.java | 34 +++++++++++++++ .../src/main/java/hudson/matrix/AxisList.java | 1 - .../java/hudson/matrix/MatrixProject.java | 41 +++++++++++++++---- .../MatrixProject/configure-entries.jelly | 35 ++++++++++++---- .../main/resources/lib/form/repeatable.jelly | 1 + 5 files changed, 95 insertions(+), 17 deletions(-) diff --git a/core/src/main/java/hudson/matrix/Axis.java b/core/src/main/java/hudson/matrix/Axis.java index b30ad9e2d5..174cd13668 100644 --- a/core/src/main/java/hudson/matrix/Axis.java +++ b/core/src/main/java/hudson/matrix/Axis.java @@ -2,11 +2,14 @@ package hudson.matrix; import hudson.Util; import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.DataBoundConstructor; import java.util.ArrayList; import java.util.Enumeration; import java.util.Iterator; import java.util.List; +import java.util.StringTokenizer; +import java.util.Arrays; /** * Configuration axis. @@ -38,6 +41,25 @@ public final class Axis implements Comparable, Iterable { throw new IllegalArgumentException(); // bug in the code } + /** + * Used to build {@link Axis} from form. + * + * Axis with empty values need to be removed later. + */ + @DataBoundConstructor + public Axis(String name, String value) { + this.name = name; + this.values = new ArrayList(Arrays.asList(Util.tokenize(value))); + } + + /** + * Returns ture if this axis is a system-reserved axis + * that has special treatment. + */ + public boolean isSystem() { + return name.equals("jdk") || name.equals("label"); + } + public Iterator iterator() { return values.iterator(); } @@ -62,6 +84,18 @@ public final class Axis implements Comparable, Iterable { return new StringBuilder().append(name).append("={").append(Util.join(values,",")).append('}').toString(); } + /** + * Used for generating the config UI. + * If the axis is big and occupies a lot of space, use NL for separator + * to display multi-line text + */ + public String getValueString() { + int len=0; + for (String value : values) + len += value.length(); + return Util.join(values, len>30 ?"\n":" "); + } + /** * Parses the submitted form (where possible values are * presented as a list of checkboxes) and creates an axis diff --git a/core/src/main/java/hudson/matrix/AxisList.java b/core/src/main/java/hudson/matrix/AxisList.java index 4f15ba316b..79e3d9b1c5 100644 --- a/core/src/main/java/hudson/matrix/AxisList.java +++ b/core/src/main/java/hudson/matrix/AxisList.java @@ -25,7 +25,6 @@ public class AxisList extends ArrayList { return null; } - public boolean add(Axis axis) { return axis!=null && super.add(axis); } diff --git a/core/src/main/java/hudson/matrix/MatrixProject.java b/core/src/main/java/hudson/matrix/MatrixProject.java index cdc481a161..7f09194283 100644 --- a/core/src/main/java/hudson/matrix/MatrixProject.java +++ b/core/src/main/java/hudson/matrix/MatrixProject.java @@ -1,14 +1,9 @@ package hudson.matrix; import hudson.FilePath; -import hudson.maven.ModuleName; -import hudson.tasks.Builder; -import hudson.tasks.Publisher; -import hudson.tasks.BuildWrapper; -import hudson.tasks.BuildWrappers; -import hudson.tasks.BuildStep; import hudson.model.AbstractProject; import hudson.model.DependencyGraph; +import hudson.model.Descriptor; import hudson.model.Descriptor.FormException; import hudson.model.Hudson; import hudson.model.Item; @@ -21,7 +16,11 @@ import hudson.model.Node; import hudson.model.SCMedItem; import hudson.model.TopLevelItem; import hudson.model.TopLevelItemDescriptor; -import hudson.model.Descriptor; +import hudson.tasks.BuildStep; +import hudson.tasks.BuildWrapper; +import hudson.tasks.BuildWrappers; +import hudson.tasks.Builder; +import hudson.tasks.Publisher; import hudson.util.CopyOnWriteMap; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; @@ -33,10 +32,12 @@ import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.LinkedHashSet; +import java.util.List; import java.util.Map; import java.util.Set; -import java.util.List; import java.util.Vector; +import java.util.ArrayList; +import java.util.Iterator; /** * @author Kohsuke Kawaguchi @@ -82,6 +83,17 @@ public class MatrixProject extends AbstractProject im return axes; } + /** + * Gets the subset of {@link AxisList} that are not system axes. + */ + public List getUserAxes() { + List r = new ArrayList(); + for (Axis a : axes) + if(!a.isSystem()) + r.add(a); + return r; + } + public Layouter getLayouter() { return new Layouter(axes); } @@ -239,8 +251,19 @@ public class MatrixProject extends AbstractProject im super.submit(req, rsp); AxisList newAxes = new AxisList(); + + // parse user axes + newAxes.addAll(req.bindParametersToList(Axis.class,"axis.")); + // get rid of empty values + for (Iterator itr = newAxes.iterator(); itr.hasNext();) { + Axis a = itr.next(); + if(a.values.isEmpty()) itr.remove(); + } + + // parse system axes newAxes.add(Axis.parsePrefixed(req,"jdk")); - newAxes.add(Axis.parsePrefixed(req,"label")); + if(req.getParameter("multipleNodes")!=null) + newAxes.add(Axis.parsePrefixed(req,"label")); this.axes = newAxes; buildWrappers = buildDescribable(req, BuildWrappers.WRAPPERS, "wrapper"); diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly index e24da9bd1c..9bca2c2ac1 100644 --- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly +++ b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly @@ -57,12 +57,33 @@ - - - - + + + + + + + + + + + + +
+ + +
+
+
+
+
+
+ + + + diff --git a/core/src/main/resources/lib/form/repeatable.jelly b/core/src/main/resources/lib/form/repeatable.jelly index f21d09d4d5..c5767d6d84 100644 --- a/core/src/main/resources/lib/form/repeatable.jelly +++ b/core/src/main/resources/lib/form/repeatable.jelly @@ -67,6 +67,7 @@ +