Sämtliche Logik und Grafiken zur Vergabe und Verwaltung von Berechtigungen eingeführt. Kleinere Bugs sind bekannt, werden aktuell behoben

1 files changed, 143 insertions, 43 deletions

diff --git a/dozentenmodulserver/src/main/java/server/generated/Person.java b/dozentenmodulserver/src/main/java/server/generated/Person.java
index 8129579b..d1bdac76 100644
--- a/dozentenmodulserver/src/main/java/server/generated/Person.java
+++ b/dozentenmodulserver/src/main/java/server/generated/Person.java
@@ -38,13 +38,14 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
   private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField NACHNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("Nachname", org.apache.thrift.protocol.TType.STRING, (short)2);
   private static final org.apache.thrift.protocol.TField VORNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("Vorname", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField IMAGE_READ_FIELD_DESC = new org.apache.thrift.protocol.TField("image_read", org.apache.thrift.protocol.TType.BOOL, (short)4);
-  private static final org.apache.thrift.protocol.TField IMAGE_WRITE_FIELD_DESC = new org.apache.thrift.protocol.TField("image_write", org.apache.thrift.protocol.TType.BOOL, (short)5);
-  private static final org.apache.thrift.protocol.TField IMAGE_ADMIN_FIELD_DESC = new org.apache.thrift.protocol.TField("image_admin", org.apache.thrift.protocol.TType.BOOL, (short)6);
-  private static final org.apache.thrift.protocol.TField IMAGE_LINK_FIELD_DESC = new org.apache.thrift.protocol.TField("image_link", org.apache.thrift.protocol.TType.BOOL, (short)7);
-  private static final org.apache.thrift.protocol.TField LECTURE_READ_FIELD_DESC = new org.apache.thrift.protocol.TField("lecture_read", org.apache.thrift.protocol.TType.BOOL, (short)8);
-  private static final org.apache.thrift.protocol.TField LECTURE_WRITE_FIELD_DESC = new org.apache.thrift.protocol.TField("lecture_write", org.apache.thrift.protocol.TType.BOOL, (short)9);
-  private static final org.apache.thrift.protocol.TField LECTURE_ADMIN_FIELD_DESC = new org.apache.thrift.protocol.TField("lecture_admin", org.apache.thrift.protocol.TType.BOOL, (short)10);
+  private static final org.apache.thrift.protocol.TField MAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("mail", org.apache.thrift.protocol.TType.STRING, (short)4);
+  private static final org.apache.thrift.protocol.TField IMAGE_READ_FIELD_DESC = new org.apache.thrift.protocol.TField("image_read", org.apache.thrift.protocol.TType.BOOL, (short)5);
+  private static final org.apache.thrift.protocol.TField IMAGE_WRITE_FIELD_DESC = new org.apache.thrift.protocol.TField("image_write", org.apache.thrift.protocol.TType.BOOL, (short)6);
+  private static final org.apache.thrift.protocol.TField IMAGE_ADMIN_FIELD_DESC = new org.apache.thrift.protocol.TField("image_admin", org.apache.thrift.protocol.TType.BOOL, (short)7);
+  private static final org.apache.thrift.protocol.TField IMAGE_LINK_FIELD_DESC = new org.apache.thrift.protocol.TField("image_link", org.apache.thrift.protocol.TType.BOOL, (short)8);
+  private static final org.apache.thrift.protocol.TField LECTURE_READ_FIELD_DESC = new org.apache.thrift.protocol.TField("lecture_read", org.apache.thrift.protocol.TType.BOOL, (short)9);
+  private static final org.apache.thrift.protocol.TField LECTURE_WRITE_FIELD_DESC = new org.apache.thrift.protocol.TField("lecture_write", org.apache.thrift.protocol.TType.BOOL, (short)10);
+  private static final org.apache.thrift.protocol.TField LECTURE_ADMIN_FIELD_DESC = new org.apache.thrift.protocol.TField("lecture_admin", org.apache.thrift.protocol.TType.BOOL, (short)11);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -55,6 +56,7 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
   public String userID; // required
   public String Nachname; // required
   public String Vorname; // required
+  public String mail; // required
   public boolean image_read; // required
   public boolean image_write; // required
   public boolean image_admin; // required
@@ -68,13 +70,14 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
     USER_ID((short)1, "userID"),
     NACHNAME((short)2, "Nachname"),
     VORNAME((short)3, "Vorname"),
-    IMAGE_READ((short)4, "image_read"),
-    IMAGE_WRITE((short)5, "image_write"),
-    IMAGE_ADMIN((short)6, "image_admin"),
-    IMAGE_LINK((short)7, "image_link"),
-    LECTURE_READ((short)8, "lecture_read"),
-    LECTURE_WRITE((short)9, "lecture_write"),
-    LECTURE_ADMIN((short)10, "lecture_admin");
+    MAIL((short)4, "mail"),
+    IMAGE_READ((short)5, "image_read"),
+    IMAGE_WRITE((short)6, "image_write"),
+    IMAGE_ADMIN((short)7, "image_admin"),
+    IMAGE_LINK((short)8, "image_link"),
+    LECTURE_READ((short)9, "lecture_read"),
+    LECTURE_WRITE((short)10, "lecture_write"),
+    LECTURE_ADMIN((short)11, "lecture_admin");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -95,19 +98,21 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
           return NACHNAME;
         case 3: // VORNAME
           return VORNAME;
-        case 4: // IMAGE_READ
+        case 4: // MAIL
+          return MAIL;
+        case 5: // IMAGE_READ
           return IMAGE_READ;
-        case 5: // IMAGE_WRITE
+        case 6: // IMAGE_WRITE
           return IMAGE_WRITE;
-        case 6: // IMAGE_ADMIN
+        case 7: // IMAGE_ADMIN
           return IMAGE_ADMIN;
-        case 7: // IMAGE_LINK
+        case 8: // IMAGE_LINK
           return IMAGE_LINK;
-        case 8: // LECTURE_READ
+        case 9: // LECTURE_READ
           return LECTURE_READ;
-        case 9: // LECTURE_WRITE
+        case 10: // LECTURE_WRITE
           return LECTURE_WRITE;
-        case 10: // LECTURE_ADMIN
+        case 11: // LECTURE_ADMIN
           return LECTURE_ADMIN;
         default:
           return null;
@@ -166,6 +171,8 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.VORNAME, new org.apache.thrift.meta_data.FieldMetaData("Vorname", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.MAIL, new org.apache.thrift.meta_data.FieldMetaData("mail", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.IMAGE_READ, new org.apache.thrift.meta_data.FieldMetaData("image_read", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     tmpMap.put(_Fields.IMAGE_WRITE, new org.apache.thrift.meta_data.FieldMetaData("image_write", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -191,6 +198,7 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
     String userID,
     String Nachname,
     String Vorname,
+    String mail,
     boolean image_read,
     boolean image_write,
     boolean image_admin,
@@ -203,6 +211,7 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
     this.userID = userID;
     this.Nachname = Nachname;
     this.Vorname = Vorname;
+    this.mail = mail;
     this.image_read = image_read;
     setImage_readIsSet(true);
     this.image_write = image_write;
@@ -233,6 +242,9 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
     if (other.isSetVorname()) {
       this.Vorname = other.Vorname;
     }
+    if (other.isSetMail()) {
+      this.mail = other.mail;
+    }
     this.image_read = other.image_read;
     this.image_write = other.image_write;
     this.image_admin = other.image_admin;
@@ -251,6 +263,7 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
     this.userID = null;
     this.Nachname = null;
     this.Vorname = null;
+    this.mail = null;
     setImage_readIsSet(false);
     this.image_read = false;
     setImage_writeIsSet(false);
@@ -339,6 +352,30 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
     }
   }
 
+  public String getMail() {
+    return this.mail;
+  }
+
+  public Person setMail(String mail) {
+    this.mail = mail;
+    return this;
+  }
+
+  public void unsetMail() {
+    this.mail = null;
+  }
+
+  /** Returns true if field mail is set (has been assigned a value) and false otherwise */
+  public boolean isSetMail() {
+    return this.mail != null;
+  }
+
+  public void setMailIsSet(boolean value) {
+    if (!value) {
+      this.mail = null;
+    }
+  }
+
   public boolean isImage_read() {
     return this.image_read;
   }
@@ -526,6 +563,14 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
       }
       break;
 
+    case MAIL:
+      if (value == null) {
+        unsetMail();
+      } else {
+        setMail((String)value);
+      }
+      break;
+
     case IMAGE_READ:
       if (value == null) {
         unsetImage_read();
@@ -596,6 +641,9 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
     case VORNAME:
       return getVorname();
 
+    case MAIL:
+      return getMail();
+
     case IMAGE_READ:
       return Boolean.valueOf(isImage_read());
 
@@ -634,6 +682,8 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
       return isSetNachname();
     case VORNAME:
       return isSetVorname();
+    case MAIL:
+      return isSetMail();
     case IMAGE_READ:
       return isSetImage_read();
     case IMAGE_WRITE:
@@ -692,6 +742,15 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
         return false;
     }
 
+    boolean this_present_mail = true && this.isSetMail();
+    boolean that_present_mail = true && that.isSetMail();
+    if (this_present_mail || that_present_mail) {
+      if (!(this_present_mail && that_present_mail))
+        return false;
+      if (!this.mail.equals(that.mail))
+        return false;
+    }
+
     boolean this_present_image_read = true;
     boolean that_present_image_read = true;
     if (this_present_image_read || that_present_image_read) {
@@ -801,6 +860,16 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetMail()).compareTo(other.isSetMail());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetMail()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mail, other.mail);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     lastComparison = Boolean.valueOf(isSetImage_read()).compareTo(other.isSetImage_read());
     if (lastComparison != 0) {
       return lastComparison;
@@ -915,6 +984,14 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
     }
     first = false;
     if (!first) sb.append(", ");
+    sb.append("mail:");
+    if (this.mail == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.mail);
+    }
+    first = false;
+    if (!first) sb.append(", ");
     sb.append("image_read:");
     sb.append(this.image_read);
     first = false;
@@ -1011,7 +1088,15 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 4: // IMAGE_READ
+          case 4: // MAIL
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.mail = iprot.readString();
+              struct.setMailIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 5: // IMAGE_READ
             if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
               struct.image_read = iprot.readBool();
               struct.setImage_readIsSet(true);
@@ -1019,7 +1104,7 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 5: // IMAGE_WRITE
+          case 6: // IMAGE_WRITE
             if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
               struct.image_write = iprot.readBool();
               struct.setImage_writeIsSet(true);
@@ -1027,7 +1112,7 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 6: // IMAGE_ADMIN
+          case 7: // IMAGE_ADMIN
             if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
               struct.image_admin = iprot.readBool();
               struct.setImage_adminIsSet(true);
@@ -1035,7 +1120,7 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 7: // IMAGE_LINK
+          case 8: // IMAGE_LINK
             if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
               struct.image_link = iprot.readBool();
               struct.setImage_linkIsSet(true);
@@ -1043,7 +1128,7 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 8: // LECTURE_READ
+          case 9: // LECTURE_READ
             if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
               struct.lecture_read = iprot.readBool();
               struct.setLecture_readIsSet(true);
@@ -1051,7 +1136,7 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 9: // LECTURE_WRITE
+          case 10: // LECTURE_WRITE
             if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
               struct.lecture_write = iprot.readBool();
               struct.setLecture_writeIsSet(true);
@@ -1059,7 +1144,7 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 10: // LECTURE_ADMIN
+          case 11: // LECTURE_ADMIN
             if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
               struct.lecture_admin = iprot.readBool();
               struct.setLecture_adminIsSet(true);
@@ -1097,6 +1182,11 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
         oprot.writeString(struct.Vorname);
         oprot.writeFieldEnd();
       }
+      if (struct.mail != null) {
+        oprot.writeFieldBegin(MAIL_FIELD_DESC);
+        oprot.writeString(struct.mail);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldBegin(IMAGE_READ_FIELD_DESC);
       oprot.writeBool(struct.image_read);
       oprot.writeFieldEnd();
@@ -1145,28 +1235,31 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
       if (struct.isSetVorname()) {
         optionals.set(2);
       }
-      if (struct.isSetImage_read()) {
+      if (struct.isSetMail()) {
         optionals.set(3);
       }
-      if (struct.isSetImage_write()) {
+      if (struct.isSetImage_read()) {
         optionals.set(4);
       }
-      if (struct.isSetImage_admin()) {
+      if (struct.isSetImage_write()) {
         optionals.set(5);
       }
-      if (struct.isSetImage_link()) {
+      if (struct.isSetImage_admin()) {
         optionals.set(6);
       }
-      if (struct.isSetLecture_read()) {
+      if (struct.isSetImage_link()) {
         optionals.set(7);
       }
-      if (struct.isSetLecture_write()) {
+      if (struct.isSetLecture_read()) {
         optionals.set(8);
       }
-      if (struct.isSetLecture_admin()) {
+      if (struct.isSetLecture_write()) {
         optionals.set(9);
       }
-      oprot.writeBitSet(optionals, 10);
+      if (struct.isSetLecture_admin()) {
+        optionals.set(10);
+      }
+      oprot.writeBitSet(optionals, 11);
       if (struct.isSetUserID()) {
         oprot.writeString(struct.userID);
       }
@@ -1176,6 +1269,9 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
       if (struct.isSetVorname()) {
         oprot.writeString(struct.Vorname);
       }
+      if (struct.isSetMail()) {
+        oprot.writeString(struct.mail);
+      }
       if (struct.isSetImage_read()) {
         oprot.writeBool(struct.image_read);
       }
@@ -1202,7 +1298,7 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Person struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(10);
+      BitSet incoming = iprot.readBitSet(11);
       if (incoming.get(0)) {
         struct.userID = iprot.readString();
         struct.setUserIDIsSet(true);
@@ -1216,30 +1312,34 @@ public class Person implements org.apache.thrift.TBase<Person, Person._Fields>,
         struct.setVornameIsSet(true);
       }
       if (incoming.get(3)) {
+        struct.mail = iprot.readString();
+        struct.setMailIsSet(true);
+      }
+      if (incoming.get(4)) {
         struct.image_read = iprot.readBool();
         struct.setImage_readIsSet(true);
       }
-      if (incoming.get(4)) {
+      if (incoming.get(5)) {
         struct.image_write = iprot.readBool();
         struct.setImage_writeIsSet(true);
       }
-      if (incoming.get(5)) {
+      if (incoming.get(6)) {
         struct.image_admin = iprot.readBool();
         struct.setImage_adminIsSet(true);
       }
-      if (incoming.get(6)) {
+      if (incoming.get(7)) {
         struct.image_link = iprot.readBool();
         struct.setImage_linkIsSet(true);
       }
-      if (incoming.get(7)) {
+      if (incoming.get(8)) {
         struct.lecture_read = iprot.readBool();
         struct.setLecture_readIsSet(true);
       }
-      if (incoming.get(8)) {
+      if (incoming.get(9)) {
         struct.lecture_write = iprot.readBool();
         struct.setLecture_writeIsSet(true);
       }
-      if (incoming.get(9)) {
+      if (incoming.get(10)) {
         struct.lecture_admin = iprot.readBool();
         struct.setLecture_adminIsSet(true);
       }