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

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

• Note: manual merge

3 files changed, 52 insertions, 0 deletions

diff --git a/dozentenmodul/src/main/java/models/Image.java b/dozentenmodul/src/main/java/models/Image.java
index fc31e583..4f7f3968 100644
--- a/dozentenmodul/src/main/java/models/Image.java
+++ b/dozentenmodul/src/main/java/models/Image.java
@@ -195,7 +195,37 @@ public class Image {
 		public void setVorlage(boolean vorlage) {
 			this.vorlage = vorlage;
 		}
+		
+		public void reset()
+		{
+	         ImageId = null;
 
+	         version = null;
+
+	         imagename = null;
+
+	         newName = null;
+
+	         imagepath = null;
+	        
+	          OS = null;
+
+	          shareMode = 0;
+
+	          licensed = false;
+
+	          internet = false;
+	        
+	          vorlage = false;
+
+	          ram = 0;
+
+	          cpu = 0;
+
+	          filesize = 0;
+	        
+	          desc = null;
+		}
         
         
 
diff --git a/dozentenmodul/src/main/java/models/Lecture.java b/dozentenmodul/src/main/java/models/Lecture.java
index 8f67baba..0b55172b 100644
--- a/dozentenmodul/src/main/java/models/Lecture.java
+++ b/dozentenmodul/src/main/java/models/Lecture.java
@@ -133,6 +133,27 @@ public class Lecture {
 		this.active = active;
 
 	}
+	
+	public void reset()
+	{
+		  name = null;
+
+		  newName = null;
+
+		  shortDesc = null;
+
+		  desc = null;
+
+		  startdate = null;
+
+		  enddate = null;
+
+		  active = false;
+
+		  id = null;
+
+		  linkedImagename = null;
+	}
 
 	
 
diff --git a/dozentenmodul/src/main/java/models/person.java b/dozentenmodul/src/main/java/models/person.java
index 4ad5bb3d..d1621d00 100644
--- a/dozentenmodul/src/main/java/models/person.java
+++ b/dozentenmodul/src/main/java/models/person.java
@@ -199,4 +199,5 @@ public class person {
 
 	}
 
+
 }