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

Conflicts:
	dozentenmodulserver/src/main/java/server/ServerHandler.java
	dozentenmodulserver/src/main/java/sql/SQL.java

2 files changed, 74 insertions, 7 deletions

diff --git a/dozentenmodul/src/main/java/models/ItemOwner.java b/dozentenmodul/src/main/java/models/ItemOwner.java
new file mode 100644
index 00000000..3afb20d2
--- /dev/null
+++ b/dozentenmodul/src/main/java/models/ItemOwner.java
@@ -0,0 +1,74 @@
+package models;
+
+public class ItemOwner {
+
+	private String userID;
+	private String username;
+	private String nachname;
+	private String vorname;
+	private String hochschule;
+	private String email;
+
+
+	public static ItemOwner itemOwner = new ItemOwner();
+
+	public String getUserID() {
+		return userID;
+	}
+
+	public void setUserID(String userID) {
+		this.userID = userID;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getNachname() {
+		return nachname;
+	}
+
+	public void setNachname(String nachname) {
+		this.nachname = nachname;
+	}
+
+	public String getVorname() {
+		return vorname;
+	}
+
+	public void setVorname(String vorname) {
+		this.vorname = vorname;
+	}
+
+	public String getHochschule() {
+		return hochschule;
+	}
+
+	public void setHochschule(String hochschule) {
+		this.hochschule = hochschule;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	
+	public void reset(){
+		userID=null;
+		username=null;
+		nachname=null;
+		vorname=null;
+		hochschule=null;
+		email=null;
+	}
+	
+
+}
diff --git a/dozentenmodul/src/main/java/models/person.java b/dozentenmodul/src/main/java/models/person.java
index d1621d00..7bb48da2 100644
--- a/dozentenmodul/src/main/java/models/person.java
+++ b/dozentenmodul/src/main/java/models/person.java
@@ -64,13 +64,6 @@ public class person {
 		this.image_write = image_write;
 	}
 
-	/*
-	 * public boolean isChangePermission() { return changePermission;}
-	 * 
-	 * public void setChangePermission(boolean changePermission) {
-	 * this.changePermission = changePermission;}
-	 */
-
 	public boolean isImageAdmin() {
 		return image_admin;
 	}