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

Conflicts: delete Image db and server
	Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
	Dozentenmodulserver/bin/server/ServerHandler.class
	Dozentenmodulserver/bin/sql/SQL.class
	Dozentenmodulserver/src/sql/SQL.java

2 files changed, 17 insertions, 0 deletions

diff --git a/Dozentenmodul/src/Models/Lecture.java b/Dozentenmodul/src/Models/Lecture.java
index 069946b3..6b7e6fa1 100644
--- a/Dozentenmodul/src/Models/Lecture.java
+++ b/Dozentenmodul/src/Models/Lecture.java
@@ -6,6 +6,7 @@ public class Lecture {
 
 	
 	private String name;
+	private String newName;
 	private String shortDesc;
 	private String desc;
 	private Date startdate;
@@ -18,6 +19,14 @@ public class Lecture {
 	public static Lecture lecture =new Lecture();
 	
 
+	public String getNewName() {
+		return newName;
+	}
+
+	public void setNewName(String newName) {
+		this.newName = newName;
+	}
+
 	public String getLinkedImagename() {
 		return linkedImagename;
 	}
diff --git a/Dozentenmodul/src/Models/person.java b/Dozentenmodul/src/Models/person.java
index 24ab16f3..435f3c1d 100644
--- a/Dozentenmodul/src/Models/person.java
+++ b/Dozentenmodul/src/Models/person.java
@@ -3,7 +3,9 @@ package models;
 
 public class person{
 
+
 	private String username;
+
 	private String Name;
 	private String Vorname;
 	private String Hochschule;
@@ -13,6 +15,11 @@ public class person{
 	private boolean ischecked;
 	
 	
+
+	public static person verantowrtlicher=new person();
+	public static person ersteller=new person();
+	
+
 	public static person verantwortlicher=new person();
 	
 	
@@ -22,6 +29,7 @@ public class person{
 	public void setUsername(String username) {
 		this.username = username;
 	}
+
 	public String getName() {
 		return Name;
 	}