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

4 files changed, 58 insertions, 69 deletions

diff --git a/Dozentenmodul/src/Models/Image.java b/Dozentenmodul/src/Models/Image.java
index 2a8c4fcd..cdc8264c 100644
--- a/Dozentenmodul/src/Models/Image.java
+++ b/Dozentenmodul/src/Models/Image.java
@@ -1,6 +1,9 @@
 package models;
 
 public class Image {
+	private String ImageId;
+	private String version;
+
 	private String imagename;
 	private String newName;
 	private boolean licensed;
@@ -46,4 +49,16 @@ public class Image {
 	public void setNewName(String newName) {
 		this.newName = newName;
 	}
+	public String getImageId() {
+		return ImageId;
+	}
+	public void setImageId(String imageId) {
+		ImageId = imageId;
+	}
+	public String getVersion() {
+		return version;
+	}
+	public void setVersion(String version) {
+		this.version = version;
+	}
 }
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;
 	}
diff --git a/Dozentenmodul/src/Models/person.java b/Dozentenmodul/src/Models/person.java
index f4dd5c22..435f3c1d 100644
--- a/Dozentenmodul/src/Models/person.java
+++ b/Dozentenmodul/src/Models/person.java
@@ -3,6 +3,9 @@ package models;
 
 public class person{
 
+
+	private String username;
+
 	private String Name;
 	private String Vorname;
 	private String Hochschule;
@@ -12,9 +15,21 @@ public class person{
 	private boolean ischecked;
 	
 	
+
 	public static person verantowrtlicher=new person();
 	public static person ersteller=new person();
 	
+
+	public static person verantwortlicher=new person();
+	
+	
+	public String getUsername() {
+		return username;
+	}
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
 	public String getName() {
 		return Name;
 	}
diff --git a/Dozentenmodul/src/Models/vm.java b/Dozentenmodul/src/Models/vm.java
deleted file mode 100644
index 34f9ffaa..00000000
--- a/Dozentenmodul/src/Models/vm.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package models;
-
-import java.awt.List;
-import java.util.Date;
-
-
-public class vm {
-
-	private String Laborname;
-	private String shortDesc;
-	private String longDesc;
-	private String comment;
-	private String OS;
-	private Date begin;
-	private Date end;
-	private List software;
-	
-	public static vm vl=new vm();
-	public String getLaborname() {
-		return Laborname;
-	}
-	public void setLaborname(String laborname) {
-		Laborname = laborname;
-	}
-	public String getShortDesc() {
-		return shortDesc;
-	}
-	public void setShortDesc(String shortDesc) {
-		this.shortDesc = shortDesc;
-	}
-	public String getLongDesc() {
-		return longDesc;
-	}
-	public void setLongDesc(String longDesc) {
-		this.longDesc = longDesc;
-	}
-	public String getComment() {
-		return comment;
-	}
-	public void setComment(String comment) {
-		this.comment = comment;
-	}
-	public String getOS() {
-		return OS;
-	}
-	public void setOS(String oS) {
-		OS = oS;
-	}
-	public Date getBegin() {
-		return begin;
-	}
-	public void setBegin(Date begin) {
-		this.begin = begin;
-	}
-	public Date getEnd() {
-		return end;
-	}
-	public void setEnd(Date end) {
-		this.end = end;
-	}
-	public List getSoftware() {
-		return software;
-	}
-	public void setSoftware(List software) {
-		this.software = software;
-	}
-	
-	
-}