From 593548a6309299e63fa56f54d97b569d9d704150 Mon Sep 17 00:00:00 2001
From: Janis Streib <janis@dogcraft.de>
Date: Fri, 27 Jun 2014 01:47:32 +0200
Subject: [PATCH] Updated impl.

---
 .../cacert/gigi/output/CertificateTable.java   | 18 ++++++++++--------
 src/org/cacert/gigi/output/DataTable.java      | 16 ++++------------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/org/cacert/gigi/output/CertificateTable.java b/src/org/cacert/gigi/output/CertificateTable.java
index 5cd6e074..a3aa4b63 100644
--- a/src/org/cacert/gigi/output/CertificateTable.java
+++ b/src/org/cacert/gigi/output/CertificateTable.java
@@ -21,6 +21,14 @@ public class CertificateTable implements Outputable {
 		try {
 			out.println("<form method=\"post\" action=\"account.php\">");
 			final LinkedList<Cell> cells = new LinkedList<>();
+			cells.add(new Cell("Renew/Revoke/Delete", true));
+			cells.add(new Cell("Status", true));
+			cells.add(new Cell("Email Address", true));
+			cells.add(new Cell("SerialNumber", true));
+			cells.add(new Cell("Revoked", true));
+			cells.add(new Cell("Expires", true));
+			cells.add(new Cell("Login", true));
+			cells.add(new Cell("Comment *", true, "colspan=\"2\""));
 			rs.beforeFirst();
 			while (rs.next()) {
 				// out.println(rs.getString("id"));
@@ -45,14 +53,8 @@ public class CertificateTable implements Outputable {
 				}
 
 				@Override
-				protected Cell[] getColumns() {
-					return new Cell[] { new Cell("Renew/Revoke/Delete", true),
-							new Cell("Status", true),
-							new Cell("Email Address", true),
-							new Cell("SerialNumber", true),
-							new Cell("Revoked", true),
-							new Cell("Expires", true), new Cell("Login", true),
-							new Cell("Comment *", true, "colspan=\"2\"") };
+				protected int getColoumnCount() {
+					return 8;
 				}
 			};
 			t.output(out, l, vars);
diff --git a/src/org/cacert/gigi/output/DataTable.java b/src/org/cacert/gigi/output/DataTable.java
index c9ba47b8..47f1fc97 100644
--- a/src/org/cacert/gigi/output/DataTable.java
+++ b/src/org/cacert/gigi/output/DataTable.java
@@ -7,26 +7,18 @@ import java.util.Map;
 import org.cacert.gigi.Language;
 
 public abstract class DataTable implements Outputable {
-	protected abstract Cell[] getColumns();
+	protected abstract int getColoumnCount();
 
 	protected abstract LinkedList<Cell> getTableContent();
 
 	@Override
 	public void output(PrintWriter out, Language l, Map<String, Object> vars) {
 		out.println("<table align=\"center\" valign=\"middle\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"wrapper\">");
-		out.println("<tr>");
-		for (Cell column : getColumns()) {
-			out.print("<td " + column.getHtmlAttribs() + " class=\"DataTD\">");
-			out.print(column.shouldTranslate() ? l.getTranslation(column
-					.getText()) : column.getText());
-			out.println("</td>");
-		}
-		out.println("</tr>");
 		LinkedList<Cell> tableContnet = getTableContent();
-		for (int i = 0; i < tableContnet.size() / getColumns().length; i++) {
+		for (int i = 0; i < tableContnet.size() / getColoumnCount(); i++) {
 			out.println("<tr>");
-			for (int j = 0; j < getColumns().length; j++) {
-				Cell current = tableContnet.get((i * getColumns().length) + j);
+			for (int j = 0; j < getColoumnCount(); j++) {
+				Cell current = tableContnet.get((i * getColoumnCount()) + j);
 				out.println("<td " + current.getHtmlAttribs()
 						+ " class=\"DataTD\">");
 				out.print(current.shouldTranslate() ? l.getTranslation(current
-- 
2.39.2