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

Conflicts:
	dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
	dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
	dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java

möp. großes geschrei, fehler bitte an mich.
	dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
	dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
	dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
	dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
	dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
	dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
	dozentenmodulserver/src/main/java/server/ServerHandler.java
	dozentenmodulserver/src/main/java/server/generated/Server.java
	dozentenmodulserver/thrift/server.thrift

1 files changed, 2 insertions, 1 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
index fea3ae42..f7238b03 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
@@ -39,6 +39,7 @@ import javax.swing.border.EmptyBorder;
 import models.Image;
 import models.Links;
 import models.SessionData;
+import models.person;
 
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
@@ -170,7 +171,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 		}
 
 		setBackground(Color.WHITE);
-		setTitle("Dozentenmodul - Image herunterladen");
+		setTitle("Dozentenmodul - Image herunterladen - "+person.verantwortlicher.getUserID());
 		// Aktion die beim Schliessen durchgefuehrt werden soll
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 		setBounds(0, 0, 603, 722);