We don't need abstract here... + include colspan in rendering

[gigi.git] / src / org / cacert / gigi / output / DataTable.java

diff --git a/src/org/cacert/gigi/output/DataTable.java b/src/org/cacert/gigi/output/DataTable.java
index 47f1fc974c1d4bf769d9d2caca7357f4ee795ff7..60893b0446ef0875453168059abbc0a4881c527e 100644 (file)
--- a/src/org/cacert/gigi/output/DataTable.java
+++ b/src/org/cacert/gigi/output/DataTable.java
@@ -6,19 +6,29 @@ import java.util.Map;
 
 import org.cacert.gigi.Language;
 
-public abstract class DataTable implements Outputable {
-       protected abstract int getColoumnCount();
+public class DataTable implements Outputable {
+       private LinkedList<Cell> cells;
+       private int columnCount;
 
-       protected abstract LinkedList<Cell> getTableContent();
+       public DataTable(int coloumnCount, LinkedList<Cell> content) {
+               this.columnCount = coloumnCount;
+               this.cells = content;
+       }
 
        @Override
        public void output(PrintWriter out, Language l, Map<String, Object> vars) {
+               int mesCells = cells.size();
+               for (Cell c : cells) {
+                       if (c.getColSpan() > 1) {
+                               mesCells += c.getColSpan();
+                       }
+               }
                out.println("<table align=\"center\" valign=\"middle\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"wrapper\">");
-               LinkedList<Cell> tableContnet = getTableContent();
-               for (int i = 0; i < tableContnet.size() / getColoumnCount(); i++) {
+               for (int i = 0; i < mesCells / columnCount; i++) {
                        out.println("<tr>");
-                       for (int j = 0; j < getColoumnCount(); j++) {
-                               Cell current = tableContnet.get((i * getColoumnCount()) + j);
+                       for (int j = 0; j < columnCount;) {
+                               Cell current = cells.get((i * columnCount) + j);
+                               j += current.getColSpan();
                                out.println("<td " + current.getHtmlAttribs()
                                                + " class=\"DataTD\">");
                                out.print(current.shouldTranslate() ? l.getTranslation(current
@@ -39,19 +49,26 @@ public abstract class DataTable implements Outputable {
        public static class Cell {
                private String text, htmlAttribs;
                private boolean translate;
+               private int colSpan;
 
                public Cell() {
                        this("&nbsp;", false);
                }
 
-               public Cell(String text, boolean translate, String htmlAttribs) {
+               public Cell(String text, boolean translate, int colSpan,
+                               String htmlAttribs) {
                        this.text = text;
                        this.translate = translate;
                        this.htmlAttribs = htmlAttribs;
+                       this.colSpan = colSpan;
                }
 
                public Cell(String text, boolean translate) {
-                       this(text, translate, "");
+                       this(text, translate, 1, "");
+               }
+
+               public Cell(String text, boolean translate, int colSpan) {
+                       this(text, translate, colSpan, "");
                }
 
                public boolean shouldTranslate() {
@@ -62,6 +79,10 @@ public abstract class DataTable implements Outputable {
                        return text;
                }
 
+               public int getColSpan() {
+                       return colSpan;
+               }
+
                public String getHtmlAttribs() {
                        return htmlAttribs;
                }