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

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

1 files changed, 11 insertions, 9 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index e656a711..673b8537 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -63,8 +63,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	/**
 	 * Logger instance for this class.
 	 */
-	private final static Logger LOGGER = Logger
-			.getLogger(FTPCreateUploader_GUI.class);
+	private final static Logger LOGGER = Logger.getLogger(FTPCreateUploader_GUI.class);
 
 
 	@SuppressWarnings("unused")
@@ -398,10 +397,12 @@ public class FTPCreateUploader_GUI extends JFrame implements
 						//save data
 						boolean success = writeData();
 						if(success==true){
+							LOGGER.info("Neues Image '"+Image.image.getImagename()+"' erfolgreich gespeichert.");
 							JOptionPane.showMessageDialog(c,
 									"Die Daten wurden erfolgreich gespeichert.", "Daten gespeichert",
 									JOptionPane.INFORMATION_MESSAGE);
 						} else {
+							LOGGER.info("Neues Image '"+Image.image.getImagename()+"' konnte nicht gespeichert werden.");
 							JOptionPane.showMessageDialog(c,
 									"Die Daten konnten nicht gespeichert werden.", "Fehler",
 									JOptionPane.ERROR_MESSAGE);
@@ -583,9 +584,10 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		try {
 			LOGGER.info("Getting FTP User...");
 			user = client.getFtpUser();
-			LOGGER.debug("FTP name: " + user.userName);
-			LOGGER.debug("FTP path: " + user.path);
-			LOGGER.debug("FTP pass: " + user.password);
+			LOGGER.info("Received FTP user.");
+			//LOGGER.debug("FTP name: " + user.userName);
+			//LOGGER.debug("FTP path: " + user.path);
+			//LOGGER.debug("FTP pass: " + user.password);
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			LOGGER.error("Konnte vom Satellit keinen FTP-User erhalten!");
@@ -596,10 +598,10 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		}
 		DateFormat formatter = new SimpleDateFormat("yyyMMddHHmmss");
 
-		LOGGER.info("Setting new name: " + formatter.format(new Date()) + "_"
-				+ person.verantwortlicher.getHochschule() + "_"
-				+ person.verantwortlicher.getUsername() + "_"
-				+ Image.image.getImagename() + ".vmdk");
+		//LOGGER.info("Setting new name: " + formatter.format(new Date()) + "_"
+		//		+ person.verantwortlicher.getHochschule() + "_"
+		//		+ person.verantwortlicher.getUsername() + "_"
+		//		+ Image.image.getImagename() + ".vmdk");
 		Image.image.setNewName(formatter.format(new Date()) + "_"
 				+ person.verantwortlicher.getHochschule() + "_"
 				+ person.verantwortlicher.getUsername() + "_"