From 35733d6e3c2b8706de5739d3d1ef6cc93a8ea5f6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Wed, 9 Jul 2014 16:17:35 +0200
Subject: [PATCH] Tighten Certificate Class (fix Status enums names)

---
 src/org/cacert/gigi/Certificate.java | 35 ++++++++++++++++++----------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/org/cacert/gigi/Certificate.java b/src/org/cacert/gigi/Certificate.java
index c5aaf3fd..47efacce 100644
--- a/src/org/cacert/gigi/Certificate.java
+++ b/src/org/cacert/gigi/Certificate.java
@@ -16,25 +16,24 @@ import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.util.KeyStorage;
 
 public class Certificate {
-	int id;
-	int serial;
-	String dn;
-	String md;
-	String csrName;
-	String crtName;
-	String csr = null;
+	private int id;
+	private int serial;
+	private String dn;
+	private String md;
+	private String csrName;
+	private String crtName;
+	private String csr = null;
 	public Certificate(String dn, String md, String csr) {
 		this.dn = dn;
 		this.md = md;
 		this.csr = csr;
 	}
 
-	// created, modified, revoked, expire
 	public enum CertificateStatus {
-		DRAFT(false), BEEING_ISSUED(true), ISSUED(false), BEEING_REVOKED(true), REVOKED(
+		DRAFT(false), BEING_ISSUED(true), ISSUED(false), BEING_REVOKED(true), REVOKED(
 				false);
 
-		boolean unstable;
+		private boolean unstable;
 
 		private CertificateStatus(boolean unstable) {
 			this.unstable = unstable;
@@ -56,7 +55,7 @@ public class Certificate {
 			throw new IllegalStateException("Certificate not in Database");
 		}
 		if (rs.getString(2) == null) {
-			return CertificateStatus.BEEING_ISSUED;
+			return CertificateStatus.BEING_ISSUED;
 		}
 		crtName = rs.getString(1);
 		System.out.println(crtName);
@@ -65,7 +64,7 @@ public class Certificate {
 		}
 		if (rs.getTime(2) != null
 				&& rs.getString(3).equals("1970-01-01 00:00:00.0")) {
-			return CertificateStatus.BEEING_REVOKED;
+			return CertificateStatus.BEING_REVOKED;
 		}
 		return CertificateStatus.REVOKED;
 	}
@@ -148,5 +147,17 @@ public class Certificate {
 	public Certificate renew() {
 		return null;
 	}
+	public int getId() {
+		return id;
+	}
+	public int getSerial() {
+		return serial;
+	}
+	public String getDistinguishedName() {
+		return dn;
+	}
+	public String getMessageDigest() {
+		return md;
+	}
 
 }
-- 
2.39.2