Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	Dozentenmodul/src/GUI/SearchImage_GUI.java
	Dozentenmodul/src/Models/person.java
	Dozentenmodul/src/Models/vm.java

1 files changed, 48 insertions, 0 deletions

diff --git a/Dozentenmodul/src/thrift/AuthorizationError.java b/Dozentenmodul/src/thrift/AuthorizationError.java
new file mode 100644
index 00000000..443be4f4
--- /dev/null
+++ b/Dozentenmodul/src/thrift/AuthorizationError.java
@@ -0,0 +1,48 @@
+/**
+ * Autogenerated by Thrift Compiler (0.9.1)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+package thrift;
+
+
+import java.util.Map;
+import java.util.HashMap;
+import org.apache.thrift.TEnum;
+
+public enum AuthorizationError implements org.apache.thrift.TEnum {
+  GENERIC_ERROR(0),
+  NOT_AUTHENTICATED(1),
+  NO_PERMISSION(2);
+
+  private final int value;
+
+  private AuthorizationError(int value) {
+    this.value = value;
+  }
+
+  /**
+   * Get the integer value of this enum value, as defined in the Thrift IDL.
+   */
+  public int getValue() {
+    return value;
+  }
+
+  /**
+   * Find a the enum type by its integer value, as defined in the Thrift IDL.
+   * @return null if the value is not found.
+   */
+  public static AuthorizationError findByValue(int value) { 
+    switch (value) {
+      case 0:
+        return GENERIC_ERROR;
+      case 1:
+        return NOT_AUTHENTICATED;
+      case 2:
+        return NO_PERMISSION;
+      default:
+        return null;
+    }
+  }
+}