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 66f8e90fcfbbe229f2580711180c00426f1da36d..74848f24662ca5f51d2e37a21e3dfd07b28b7045 100644 (file)
--- a/src/org/cacert/gigi/pages/account/Certificates.java
+++ b/src/org/cacert/gigi/pages/account/Certificates.java
@@ -12,8 +12,8 @@ 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.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;
@@ -22,7 +22,7 @@ import org.cacert.gigi.util.PEM;
 
 public class Certificates extends Page {
 
-    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";
 
@@ -85,7 +85,7 @@ public class Certificates extends Page {
         return true;
     }
 
-    Template certTable = new Template(CertificateIterable.class.getResource("CertificateTable.templ"));
+    private Template certTable = new Template(CertificateIterable.class.getResource("CertificateTable.templ"));
 
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {