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, 28 insertions, 0 deletions

diff --git a/Dozentenmodul/src/Models/Lecture.java b/Dozentenmodul/src/Models/Lecture.java
index 383bded9..6b7e6fa1 100644
--- a/Dozentenmodul/src/Models/Lecture.java
+++ b/Dozentenmodul/src/Models/Lecture.java
@@ -6,14 +6,42 @@ public class Lecture {
 
 	
 	private String name;
+	private String newName;
 	private String shortDesc;
 	private String desc;
 	private Date startdate;
 	private Date enddate;
 	private boolean active;
+	private String id;
+	private String linkedImagename;
+	
 	
 	public static Lecture lecture =new Lecture();
+	
+
+	public String getNewName() {
+		return newName;
+	}
 
+	public void setNewName(String newName) {
+		this.newName = newName;
+	}
+
+	public String getLinkedImagename() {
+		return linkedImagename;
+	}
+
+	public void setLinkedImagename(String linkedImagename) {
+		this.linkedImagename = linkedImagename;
+	}
+
+	public String getid() {
+		return id;
+	}
+
+	public void setid(String id) {
+		this.id = id;
+	}
 	public String getName() {
 		return name;
 	}