Less concat

[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 3f131a224c05ea3df8fe33014c8842c64cf4031e..0a30180070b13e0f27bdb309101abda4f828063f 100644 (file)
--- a/src/org/cacert/gigi/output/DataTable.java
+++ b/src/org/cacert/gigi/output/DataTable.java
@@ -15,21 +15,23 @@ public class DataTable implements Outputable {
                this.cells = content;
        }
 
-       @Override
-       public void output(PrintWriter out, Language l, Map<String, Object> vars) {
-               int mesCells = cells.size();
+       public void output(PrintWriter out, Language l) {
+               float 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\">");
-               for (int i = 0; i < mesCells / columnCount; i++) {
+               int cellsRendered = 0;
+               for (int i = 0; i < Math.ceil(mesCells / columnCount) - 1; i++) {
                        out.println("<tr>");
                        for (int j = 0; j < columnCount;) {
-                               Cell current = cells.get((i * columnCount) + j);
+                               Cell current = cells.get(cellsRendered++);
                                j += current.getColSpan();
-                               out.println("<td " + current.getHtmlAttribs() + " >");
+                               out.println("<td ");
+                               out.print(current.getHtmlAttribs());
+                               out.print(" >");
                                out.print(current.shouldTranslate() ? l.getTranslation(current
                                                .getText()) : current.getText());
                                out.print("</td>");
@@ -53,6 +55,9 @@ public class DataTable implements Outputable {
                        this.text = text;
                        this.translate = translate;
                        this.htmlAttribs = htmlAttribs;
+                       if (colSpan > 1) {
+                               this.htmlAttribs += " colspan=\"" + colSpan + "\"";
+                       }
                        this.colSpan = colSpan;
                }
 
@@ -82,4 +87,9 @@ public class DataTable implements Outputable {
 
        }
 
+       @Override
+       public void output(PrintWriter out, Language l, Map<String, Object> vars) {
+               output(out, l);
+       }
+
 }