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

Conflicts:
	ffffDozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class
	Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
	Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
	Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
	Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
	Dozentenmodul/bin/gui/image/SearchImage_GUI.class
	Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class
	Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class
	Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class
	Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class
	Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
	Dozentenmodul/src/models/Links.java

6 files changed, 23 insertions, 11 deletions

diff --git a/Dozentenmodul/src/models/Client.java b/Dozentenmodul/src/models/Client.java
index 6dc587f1..42eccdec 100644
--- a/Dozentenmodul/src/models/Client.java
+++ b/Dozentenmodul/src/models/Client.java
@@ -3,7 +3,6 @@ package models;
 public class Client {
 
 	private server.Server.Client client;
-	
 	public static Client clientcon=new Client();
 
 	public server.Server.Client getClient() {
diff --git a/Dozentenmodul/src/models/Image.java b/Dozentenmodul/src/models/Image.java
index 0b3c936e..89df5cd5 100644
--- a/Dozentenmodul/src/models/Image.java
+++ b/Dozentenmodul/src/models/Image.java
@@ -1,21 +1,28 @@
 package models;
 
 public class Image {
+	
 	private String ImageId;
 	private String version;
-
 	private String imagename;
 	private String newName;
 	private String imagepath;
+	private int shareMode;
 	private boolean licensed;
 	private boolean internet;
 	private int ram;
 	private int cpu;
 	private long filesize;
-	
 	public static Image image =new Image();
 	
 	
+	
+	public int getShareMode() {
+		return shareMode;
+	}
+	public void setShareMode(int shareMode) {
+		this.shareMode = shareMode;
+	}
 	public String getImagepath() {
 		return imagepath;
 	}
diff --git a/Dozentenmodul/src/models/Lecture.java b/Dozentenmodul/src/models/Lecture.java
index 6b7e6fa1..eae05ec5 100644
--- a/Dozentenmodul/src/models/Lecture.java
+++ b/Dozentenmodul/src/models/Lecture.java
@@ -4,7 +4,6 @@ import java.util.Date;
 
 public class Lecture {
 
-	
 	private String name;
 	private String newName;
 	private String shortDesc;
@@ -14,8 +13,6 @@ public class Lecture {
 	private boolean active;
 	private String id;
 	private String linkedImagename;
-	
-	
 	public static Lecture lecture =new Lecture();
 	
 
diff --git a/Dozentenmodul/src/models/Links.java b/Dozentenmodul/src/models/Links.java
index 729801e5..860cae35 100644
--- a/Dozentenmodul/src/models/Links.java
+++ b/Dozentenmodul/src/models/Links.java
@@ -9,6 +9,8 @@ public class Links {
 	
 	private static String FAQ = "http://bwlehrpool.hs-offenburg.de/";
 	private static String OTRS = "https://bwlehrpool-otrs.rz.hs-offenburg.de//otrs/customer.pl";
+	private static String uriWindows="https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0";
+	private static String uriLinux="https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0";
 	
 	public static String getFAQ() {
 		return FAQ;
@@ -18,6 +20,7 @@ public class Links {
 		return OTRS;
 	}
 	
+<<<<<<< HEAD
 	public static void openFAQ() {
 		
 		String faq = FAQ;
@@ -95,4 +98,14 @@ public static void openOTRS() {
 		} 
 
 	}
+=======
+	public static String getUriWindows() {
+		return uriWindows;
+	}
+	
+	public static String getUriLinux() {
+		return uriLinux;
+	}
+	
+>>>>>>> 5d24cdec4d239f473ee2359493ab47d1ef3273dd
 }
diff --git a/Dozentenmodul/src/models/person.java b/Dozentenmodul/src/models/person.java
index 67b6b84e..0f14af51 100644
--- a/Dozentenmodul/src/models/person.java
+++ b/Dozentenmodul/src/models/person.java
@@ -3,9 +3,7 @@ package models;
 
 public class person{
 
-
 	private String username;
-
 	private String Name;
 	private String Vorname;
 	private String Hochschule;
@@ -13,11 +11,8 @@ public class person{
 	private String Tel;
 	private String Fakultaet;
 	private boolean ischecked;
-
-	//public static person verantowrtlicher=new person();
 	public static person verantwortlicher=new person();
 	
-	
 	public String getUsername() {
 		return username;
 	}
diff --git a/Dozentenmodul/src/models/user.java b/Dozentenmodul/src/models/user.java
index be64937f..9aa958a4 100644
--- a/Dozentenmodul/src/models/user.java
+++ b/Dozentenmodul/src/models/user.java
@@ -4,6 +4,7 @@ public class user {
 	
 	private String userName;
 	private String Password;
+	
 	public String getUserName() {
 		return userName;
 	}