[EMPTY] Organize all imports

[gigi.git] / src / org / cacert / gigi / output / CertificateIterable.java

diff --git a/src/org/cacert/gigi/output/CertificateIterable.java b/src/org/cacert/gigi/output/CertificateIterable.java
index 5108e1c8e7808384ebba999877f4d420e1802ef3..261fef196245897d08abf9988398873460771c27 100644 (file)
--- a/src/org/cacert/gigi/output/CertificateIterable.java
+++ b/src/org/cacert/gigi/output/CertificateIterable.java
@@ -1,21 +1,20 @@
 package org.cacert.gigi.output;
 
-import java.sql.SQLException;
 import java.util.Map;
 
-import org.cacert.gigi.Certificate;
-import org.cacert.gigi.Language;
+import org.cacert.gigi.dbObjects.Certificate;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.IterableDataset;
 
 public class CertificateIterable implements IterableDataset {
 
-    Certificate[] certificates;
+    private Certificate[] certificates;
 
     public CertificateIterable(Certificate[] certificates) {
         this.certificates = certificates;
     }
 
-    int i = 0;
+    private int i = 0;
 
     @Override
     public boolean next(Language l, Map<String, Object> vars) {
@@ -23,15 +22,11 @@ public class CertificateIterable implements IterableDataset {
             return false;
         }
         Certificate c = certificates[i++];
-        try {
-            vars.put("state", l.getTranslation(c.getStatus().toString().toLowerCase()));
-        } catch (SQLException e) {
-            vars.put("state", "Failed");
-            e.printStackTrace();
-        }
+        vars.put("state", l.getTranslation(c.getStatus().toString().toLowerCase()));
         vars.put("CN", c.getDistinguishedName());
         vars.put("serial", c.getSerial());
         vars.put("digest", c.getMessageDigest());
+        vars.put("profile", c.getProfile().getVisibleName());
 
         vars.put("issued", "TODO"); // TODO output dates
         vars.put("revoked", "TODO");