X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Foutput%2FCertificateTable.java;h=836f3449a9f58406a22fc9b93267191e3c4c6d9d;hb=78c6b04860c66d34be008b6766b83c2f594b9909;hp=a5c43d853cc708d2942c0a5c71f4dd22357c6715;hpb=7ff9efc4b22e9f32a78ed70409064ec887d2fb4d;p=gigi.git

diff --git a/src/org/cacert/gigi/output/CertificateTable.java b/src/org/cacert/gigi/output/CertificateTable.java
index a5c43d85..836f3449 100644
--- a/src/org/cacert/gigi/output/CertificateTable.java
+++ b/src/org/cacert/gigi/output/CertificateTable.java
@@ -8,7 +8,6 @@ import java.util.Map;
 
 import org.cacert.gigi.Language;
 import org.cacert.gigi.output.DataTable.Cell;
-import org.cacert.gigi.output.DataTable.EmptyCell;
 
 public class CertificateTable implements Outputable {
 	String resultSet;
@@ -22,10 +21,18 @@ 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, 2));
 			rs.beforeFirst();
 			while (rs.next()) {
 				// out.println(rs.getString("id"));
-				cells.add(new EmptyCell());
+				cells.add(new Cell());
 				cells.add(new Cell("State", false));
 				cells.add(new Cell(rs.getString("CN"), false));
 				cells.add(new Cell(rs.getString("serial"), false));
@@ -38,20 +45,7 @@ public class CertificateTable implements Outputable {
 				cells.add(new Cell(rs.getString("a"), false));
 				cells.add(new Cell(rs.getString("a"), false));
 			}
-			DataTable t = new DataTable() {
-
-				@Override
-				protected LinkedList<Cell> getTableContent() {
-					return cells;
-				}
-
-				@Override
-				protected String[] getColumns() {
-					return new String[] { "Renew/Revoke/Delete", "Status",
-							"Email Address", "SerialNumber", "Revoked",
-							"Expires", "Login", "Comment*" };
-				}
-			};
+			DataTable t = new DataTable(9, cells);
 			t.output(out, l, vars);
 			out.println("</form>");
 		} catch (SQLException e) {