diff --git a/core/src/main/java/hudson/matrix/Layouter.java b/core/src/main/java/hudson/matrix/Layouter.java index ca54779019..474f3b0045 100644 --- a/core/src/main/java/hudson/matrix/Layouter.java +++ b/core/src/main/java/hudson/matrix/Layouter.java @@ -112,7 +112,7 @@ public abstract class Layouter { } /** - * Computes the width of n-th X-axis. + * Computes the width of n-th Y-axis. */ public int height(int n) { return calc(y,n); diff --git a/core/src/main/java/hudson/matrix/MatrixBuild.java b/core/src/main/java/hudson/matrix/MatrixBuild.java index b1aec5eeb5..046502c438 100644 --- a/core/src/main/java/hudson/matrix/MatrixBuild.java +++ b/core/src/main/java/hudson/matrix/MatrixBuild.java @@ -53,6 +53,8 @@ import org.kohsuke.stapler.StaplerResponse; * @author Kohsuke Kawaguchi */ public class MatrixBuild extends AbstractBuild { + private AxisList axes; + public MatrixBuild(MatrixProject job) throws IOException { super(job); } @@ -65,6 +67,13 @@ public class MatrixBuild extends AbstractBuild { super(project, buildDir); } + public Object readResolve() { + // MatrixBuild.axes added in 1.285; default to parent axes for old data + if (axes==null) + axes = getParent().getAxes(); + return this; + } + /** * Used by view to render a ball for {@link MatrixRun}. */ @@ -83,7 +92,7 @@ public class MatrixBuild extends AbstractBuild { } public Layouter getLayouter() { - return new Layouter(getParent().getAxes()) { + return new Layouter(axes) { protected RunPtr getT(Combination c) { return new RunPtr(c); } @@ -114,7 +123,7 @@ public class MatrixBuild extends AbstractBuild { try { MatrixRun item = getRun(Combination.fromString(token)); if(item!=null) - return item; + return item; } catch (IllegalArgumentException _) { // failed to parse the token as Combination. Must be something else } @@ -161,6 +170,7 @@ public class MatrixBuild extends AbstractBuild { } } + axes = p.getAxes(); Collection activeConfigurations = p.getActiveConfigurations(); final int n = getNumber(); diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly index 38b2333fdd..5b56d89a35 100644 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly +++ b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly @@ -29,13 +29,13 @@ THE SOFTWARE. - + ${b.iconColor.description} + tooltip="${p.tooltip}" alt="${p.tooltip}"/> ${p.combination.toString(o.z)} - \ No newline at end of file + diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly index fef44af7c8..fb91fc091a 100644 --- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly +++ b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly @@ -29,11 +29,11 @@ THE SOFTWARE. - ${p.iconColor.description} + ${p.iconColor.description} ${p.combination.toString(o.z)} - \ No newline at end of file +