From: Felix Dörre <felix@dogcraft.de>
Date: Sun, 21 Sep 2014 13:11:22 +0000 (+0200)
Subject: UPD: assurance type goes Enum, (+clean)
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=5e56c8322c407bcb17bea38ceeac83fc96446c7e

UPD: assurance type goes Enum, (+clean)
---

diff --git a/src/org/cacert/gigi/dbObjects/Assurance.java b/src/org/cacert/gigi/dbObjects/Assurance.java
index d4ebe333..2d7c5934 100644
--- a/src/org/cacert/gigi/dbObjects/Assurance.java
+++ b/src/org/cacert/gigi/dbObjects/Assurance.java
@@ -4,6 +4,20 @@ import org.cacert.gigi.database.GigiResultSet;
 
 public class Assurance {
 
+    public enum AssuranceType {
+        FACE_TO_FACE("Face to Face Meeting"), TOPUP("TOPUP"), TTP_ASSISTED("TTP-Assisted");
+
+        private final String description;
+
+        private AssuranceType(String description) {
+            this.description = description;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
     private int id;
 
     private User from;
diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java
index 8abe5bad..b67da929 100644
--- a/src/org/cacert/gigi/dbObjects/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@ -486,7 +486,7 @@ public class User implements IdCachable {
         return Collections.unmodifiableSet(groups);
     }
 
-    public void grantGroup(User granter, Group toGrant) throws GigiApiException {
+    public void grantGroup(User granter, Group toGrant) {
         groups.add(toGrant);
         GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO user_groups SET user=?, permission=?, grantedby=?");
         ps.setInt(1, getId());
@@ -495,7 +495,7 @@ public class User implements IdCachable {
         ps.execute();
     }
 
-    public void revokeGroup(User revoker, Group toRevoke) throws GigiApiException {
+    public void revokeGroup(User revoker, Group toRevoke) {
         groups.remove(toRevoke);
         GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE user_groups SET deleted=CURRENT_TIMESTAMP, revokedby=? WHERE deleted is NULL AND permission=? AND user=?");
         ps.setInt(1, revoker.getId());