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

1 files changed, 11 insertions, 0 deletions

diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
index f540e9ec..fe89746c 100644
--- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
@@ -370,6 +370,17 @@ public class EditImageAllgemein_GUI extends JFrame {
 			Image.image.setImagename(map.get("name"));
 			Image.image.setRam(Integer.parseInt(map.get("ram")));
 			Image.image.setCpu(Integer.parseInt(map.get("cpu")));
+			Image.image.setImagepath(map.get("path"));
+			Image.image.setFilesize(Long.parseLong(map.get("filesize")));
+			int mode=0;
+			if(map.get("shareMode").equals("only_local")){
+				mode=0;
+			}
+			else
+			{
+				mode=1;
+			}
+			Image.image.setShareMode(mode);
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();