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, 29 insertions, 25 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
index 589fbf87..2c6dbc26 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -345,7 +345,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 				isAborted = true; // set flag
 				try {
 					client.DeleteFtpUser(user.userName);
-					LOGGER.info("Deleted FTP user.");
+					LOGGER.info("FTP user deleted.");
 				} catch (TException e1) {
 					e1.printStackTrace();
 				}
@@ -375,6 +375,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 						// save data
 						boolean success = updateData();
 						if (success == true) {
+							LOGGER.info("Bearbeitetes Image '"+Image.image.getImagename()+"' erfolgreich gespeichert.");
 							JOptionPane
 									.showMessageDialog(
 											c,
@@ -382,6 +383,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 											"Änderungen gespeichert",
 											JOptionPane.INFORMATION_MESSAGE);
 						} else {
+							LOGGER.error("Bearbeitetes Image  '"+Image.image.getImagename()+"'  konnte nicht gespeichert werden.");
 							JOptionPane
 									.showMessageDialog(
 											c,
@@ -551,11 +553,12 @@ public class FTPEditUploader_GUI extends JFrame implements
 		btnUploadStarten.setText("Bitte warten");
 
 		try {
-			LOGGER.info("Getting FTP-User...");
+			//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) {
 			e.printStackTrace();
 			JOptionPane.showMessageDialog(c,
@@ -566,12 +569,12 @@ public class FTPEditUploader_GUI extends JFrame implements
 
 		// set new file name and path only when uploading a new file. else use
 		// old filename and path
-		LOGGER.info("Getting imagePath: "+Image.image.getImagepath());
-		LOGGER.info("Getting old 'newName': "+Image.image.getNewName());
-		LOGGER.info("Setting new File-Name: " + formatter.format(new Date()) + "_"
-				+ person.verantwortlicher.getHochschule() + "_"
-				+ person.verantwortlicher.getUsername() + "_"
-				+ Image.image.getImagename() + ".vmdk");
+		//LOGGER.info("Getting imagePath: "+Image.image.getImagepath());
+		//LOGGER.info("Getting old 'newName': "+Image.image.getNewName());
+		//LOGGER.info("Setting new File-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() + "_"
@@ -646,20 +649,19 @@ public class FTPEditUploader_GUI extends JFrame implements
 	public boolean updateData() {
 
 		try {
-			LOGGER.debug("NewFileName: " + Image.image.getNewName());
-			LOGGER.debug("ImageName: " + Image.image.getImagename());
+			//LOGGER.debug("NewFileName: " + Image.image.getNewName());
+			//LOGGER.debug("ImageName: " + Image.image.getImagename());
 
 			//if a new file has been uploaded and new filename is set
 			if (Image.image.getNewName() != null) {
-				LOGGER.debug("(NOT NULL) new FileName is '"+Image.image.getNewName()+"', imagepath="
-						+ Image.image.getImagepath());
+			//	LOGGER.debug("(NOT NULL) new FileName is '"+Image.image.getNewName()+"', imagepath="
+			//			+ Image.image.getImagepath());
 				client.updateImageData(
 						Image.image.getImagename(),
 						Image.image.getImagename(),
 						Image.image.getDesc(),
 						//Image.image.getImagepath(),
 						"temp/"+Image.image.getNewName(),
-						
 						Image.image.isLicensed(),
 						Image.image.isInternet(),
 						Image.image.getRam(),
@@ -675,21 +677,24 @@ public class FTPEditUploader_GUI extends JFrame implements
 				}
 
 			} else { //no new file uploaded and old file name stays
-				LOGGER.debug("(NULL) newName is '"+Image.image.getNewName()+"', imagepath="+ Image.image.getImagepath());
+				//LOGGER.debug("(NULL) newName is '"+Image.image.getNewName()+"', imagepath="+ Image.image.getImagepath());
 				
 				client.updateImageData(
 						Image.image.getImagename(),
 						Image.image.getImagename(),
 						Image.image.getDesc(),
-						
 						//"temp/" + Image.image.getNewName(), //wrong
 						Image.image.getImagepath(),
-						
-						Image.image.isLicensed(), Image.image.isInternet(),
-						Image.image.getRam(), Image.image.getCpu(),
-						Image.image.getImageId(), Image.image.getVersion(),
-						Image.image.isVorlage(), Image.image.getFilesize(),
-						Image.image.getShareMode(), Image.image.getOS());
+						Image.image.isLicensed(), 
+						Image.image.isInternet(),
+						Image.image.getRam(), 
+						Image.image.getCpu(),
+						Image.image.getImageId(), 
+						Image.image.getVersion(),
+						Image.image.isVorlage(), 
+						Image.image.getFilesize(),
+						Image.image.getShareMode(), 
+						Image.image.getOS());
 
 				if (fileupload == true) {
 					client.startFileCopy(Image.image.getNewName());
@@ -697,7 +702,6 @@ public class FTPEditUploader_GUI extends JFrame implements
 				}
 			}
 
-			// set additional user rights - quick and dirty TODO refactor
 
 			// remove all additional user permissions on first stage