From 550aaec03085384396eaa9bbcd40383252b7494c Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 23 Jun 2007 23:52:21 +0000 Subject: [PATCH] implemented table layouter. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@3534 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- .../src/main/java/hudson/matrix/Layouter.java | 54 +++++++++++++------ .../hudson/matrix/MatrixProject/index.jelly | 27 ++++++++++ 3 files changed, 67 insertions(+), 16 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index a44e689905..6cc5786ae1 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -119,7 +119,7 @@ org.kohsuke.stapler stapler - 1.33 + 1.34-SNAPSHOT org.kohsuke diff --git a/core/src/main/java/hudson/matrix/Layouter.java b/core/src/main/java/hudson/matrix/Layouter.java index 79b313e6d2..e72ef047ca 100644 --- a/core/src/main/java/hudson/matrix/Layouter.java +++ b/core/src/main/java/hudson/matrix/Layouter.java @@ -2,6 +2,7 @@ package hudson.matrix; import java.util.List; import java.util.ArrayList; +import java.util.AbstractList; /** * Used to assist thegeneration of config table. @@ -48,23 +49,12 @@ public final class Layouter { case 2: x.add(nonTrivialAxes.get(0)); y.add(nonTrivialAxes.get(1)); - break; + return; } - // for size > 3, - int i; - for( i=0; i 3, use x and y, and try to pack y more + for( int i=0; i getRows() { + return new AbstractList() { + final int size = calc(y,-1); + final Row row = new Row(); + public Row get(int index) { + row.index = index; + return row; + } + + public int size() { + return size; + } + }; + } + + public final class Row { + private int index; + + public String drawYHeader(int n) { + int base = calc(y,n); + if(index/base==(index-1)/base && index!=0) return null; // no need to draw a new value + + Axis axis = y.get(n); + return axis.value((index/base)%axis.values.size()); + } + + } } diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index.jelly b/core/src/main/resources/hudson/matrix/MatrixProject/index.jelly index 5d360fa085..b13b97f962 100644 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index.jelly +++ b/core/src/main/resources/hudson/matrix/MatrixProject/index.jelly @@ -26,6 +26,33 @@ +

Configuration Matrix

+ + + + + + + + + + + + + + + + + + + + + + +
+ + + ${v}
${r.drawYHeader(loop.index)}