Move the "dbObject"s to their own package.

[gigi.git] / src / org / cacert / gigi / pages / account / Certificates.java

diff --git a/src/org/cacert/gigi/pages/account/Certificates.java b/src/org/cacert/gigi/pages/account/Certificates.java
index 37869f4ddf52714cef266ab05e9c750ef6debf76..74848f24662ca5f51d2e37a21e3dfd07b28b7045 100644 (file)
--- a/src/org/cacert/gigi/pages/account/Certificates.java
+++ b/src/org/cacert/gigi/pages/account/Certificates.java
@@ -5,8 +5,6 @@ import java.io.PrintWriter;
 import java.net.URLEncoder;
 import java.security.GeneralSecurityException;
 import java.security.cert.X509Certificate;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.HashMap;
 
@@ -14,10 +12,9 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.cacert.gigi.Certificate;
-import org.cacert.gigi.User;
-import org.cacert.gigi.database.DatabaseConnection;
-import org.cacert.gigi.output.CertificateTable;
+import org.cacert.gigi.dbObjects.Certificate;
+import org.cacert.gigi.dbObjects.User;
+import org.cacert.gigi.output.CertificateIterable;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.Page;
@@ -25,9 +22,7 @@ import org.cacert.gigi.util.PEM;
 
 public class Certificates extends Page {
 
-    CertificateTable myTable = new CertificateTable("mailcerts");
-
-    Template certDisplay = new Template(Certificates.class.getResource("CertificateDisplay.templ"));
+    private Template certDisplay = new Template(Certificates.class.getResource("CertificateDisplay.templ"));
 
     public static final String PATH = "/account/certs";
 
@@ -90,6 +85,8 @@ public class Certificates extends Page {
         return true;
     }
 
+    private Template certTable = new Template(CertificateIterable.class.getResource("CertificateTable.templ"));
+
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
         PrintWriter out = resp.getWriter();
@@ -119,16 +116,8 @@ public class Certificates extends Page {
 
         HashMap<String, Object> vars = new HashMap<String, Object>();
         User us = LoginPage.getUser(req);
-        try {
-            PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `id`, `CN`, `serial`, `revoked`, `expire`, `disablelogin` FROM `certs` WHERE `memid`=?");
-            ps.setInt(1, us.getId());
-            ResultSet rs = ps.executeQuery();
-            vars.put("mailcerts", rs);
-            myTable.output(out, getLanguage(req), vars);
-            rs.close();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
+        vars.put("certs", new CertificateIterable(us.getCertificates()));
+        certTable.output(out, getLanguage(req), vars);
     }
 
 }