X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Foutput%2FCertificateTable.java;h=ce0e5d56c2b80d68a0ede1c2789310c131066954;hp=413de877b9235bb0988f33fe0ee99b1dfe076cbe;hb=89fed14fafeb0af07b09c183bf934e1234d21e48;hpb=ea6ee43a84f9a1f055d97ff0de8196569154e4d0

diff --git a/src/org/cacert/gigi/output/CertificateTable.java b/src/org/cacert/gigi/output/CertificateTable.java
index 413de877..ce0e5d56 100644
--- a/src/org/cacert/gigi/output/CertificateTable.java
+++ b/src/org/cacert/gigi/output/CertificateTable.java
@@ -3,53 +3,60 @@ package org.cacert.gigi.output;
 import java.io.PrintWriter;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.LinkedList;
 import java.util.Map;
 
 import org.cacert.gigi.Language;
+import org.cacert.gigi.output.DataTable.Cell;
 
 public class CertificateTable implements Outputable {
 	String resultSet;
 	public CertificateTable(String resultSet) {
 		this.resultSet = resultSet;
 	}
-	private static final String[] columnNames = new String[]{
-			"Renew/Revoke/Delete", "Status", "Email Address", "SerialNumber",
-			"Revoked", "Expires", "Login"};
 
 	@Override
 	public void output(PrintWriter out, Language l, Map<String, Object> vars) {
 		ResultSet rs = (ResultSet) vars.get(resultSet);
 		try {
 			out.println("<form method=\"post\" action=\"account.php\">");
-			out.println("<table align=\"center\" valign=\"middle\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"wrapper\">");
-			out.println("<tr>");
-			for (String column : columnNames) {
-				out.print("<td class=\"DataTD\">");
-				out.print(l.getTranslation(column));
-				out.println("</td>");
-			}
-			out.print("<td colspan=\"2\" class=\"DataTD\">");
-			out.print(l.getTranslation("Comment *"));
-			out.println("</td></tr>");
-
+			final LinkedList<Cell> cells = new LinkedList<>();
 			rs.beforeFirst();
 			while (rs.next()) {
 				// out.println(rs.getString("id"));
-				out.print("<tr><td class=\"DataTD\">&nbsp;</td><td class=\"DataTD\">State</td><td class=\"DataTD\">");
-				out.println(rs.getString("CN"));
-				out.print("</td><td class=\"DataTD\">");
-				out.println(rs.getString("serial"));
-				out.print("</td><td class=\"DataTD\">");
+				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));
 				if (rs.getString("revoked") == null) {
-					out.println("N/A");
+					cells.add(new Cell("N/A", false));
 				} else {
-					out.println(rs.getString("revoked"));
+					cells.add(new Cell(rs.getString("revoked"), false));
 				}
-				out.print("</td><td class=\"DataTD\">");
-				out.println(rs.getString("expire"));
-				out.println("</td><td class=\"DataTD\">a</td><td class=\"DataTD\">a</td></tr>");
+				cells.add(new Cell(rs.getString("expire"), false));
+				cells.add(new Cell(rs.getString("a"), false));
+				cells.add(new Cell(rs.getString("a"), false));
 			}
-			out.println("</table>");
+			DataTable t = new DataTable() {
+
+				@Override
+				protected LinkedList<Cell> getTableContent() {
+					return cells;
+				}
+
+				@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\"") };
+				}
+			};
+			t.output(out, l, vars);
+			out.println("</form>");
 		} catch (SQLException e) {
 			e.printStackTrace();
 		}