[server] Applied Eclipse code format (with line width extended to 110)

1 files changed, 247 insertions, 421 deletions

diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java
index 4c0f6d5e..837cc64a 100644
--- a/dozentenmodulserver/src/main/java/server/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java
@@ -24,88 +24,74 @@ import org.openslx.imagemaster.thrift.iface.UserInfo;
 import org.openslx.sat.thrift.iface.Image;
 import org.openslx.sat.thrift.iface.Lecture;
 import org.openslx.sat.thrift.iface.Person;
-import org.openslx.sat.thrift.iface.User;
 import org.openslx.sat.thrift.iface.Server;
+import org.openslx.sat.thrift.iface.User;
 import org.openslx.sat.thrift.version.Version;
 
 import sql.SQL;
 import thrift.MasterThriftConnection;
-//import thrift.SessionData;
-
-//import util.XMLCreator;
 
 public class ServerHandler implements Server.Iface {
 
 	private static Logger log = Logger.getLogger(ServerHandler.class);
 	static SQL sql = new SQL();
-	
-	private Map<String,UserInfo> tokenManager = new HashMap<>(); //saves the current tokens and the mapped userdata, returning from the server
 
+	// saves the current tokens and the mapped userdata, returning from the server
+	private Map<String, UserInfo> tokenManager = new HashMap<>();
 
-	public boolean authenticated(String token) throws TException
-	{	
-		if(tokenManager.get(token) != null)
-		{
-			//user found in tokenManager, session was set to valid once before (cached session, no further action needed)
+	public boolean authenticated(String token) throws TException {
+		if (tokenManager.get(token) != null) {
+			// user found in tokenManager, session was set to valid once before
+			// (cached session, no further action needed)
 			return true;
-		}
-		else
-		{
+		} else {
 			MasterThriftConnection thrift = new MasterThriftConnection();
 			Client client = thrift.getMasterThriftConnection();
 
-			//user not in tokenManager, check authentication, then add user to tokenManager
-			log.info("token is: "+token);
+			// user not in tokenManager, check authentication, then add user to tokenManager
+			log.info("token is: " + token);
 			UserInfo ui = null;
-			if( (ui = client.getUserFromToken(token)) != null) //user authenticated by masterserver
-			{
-				//user was authenticated by the masterserver, cache the data
+			if ((ui = client.getUserFromToken(token)) != null) {
+				// user was authenticated by the masterserver, cache the data
 				tokenManager.put(token, ui);
 				return true;
 			}
 		}
-		
+
 		return false;
 	}
-	
-	
-	private UserInfo getUserFromToken(String token) //local function, which gets userdata from the tokenmanager, not the masterserver
-	{											   //implemented, as there is no need for userdata in each function, so return type of authenticated should stay boolean
+
+	/**
+	 * local function, which gets userdata from the tokenmanager, not the
+	 * masterserver implemented, as there is no need for userdata in each
+	 * function, so return type of authenticated should stay boolean
+	 */
+	private UserInfo getUserFromToken(String token) {
 		UserInfo ui = tokenManager.get(token);
 		return ui;
 	}
-	
-	
-	public boolean setSessionInvalid(String token)
-	{
+
+	public boolean setSessionInvalid(String token) {
 		log.info("token disabling.. round one");
 		log.info(tokenManager.get(token));
-		
-		
+
 		tokenManager.remove(token);
-		
+
 		log.info("token disabling.. round two");
 		log.info(tokenManager.get(token));
-		
-		if(tokenManager.get(token) == null) //check if deletion worked and token isn't stored anymore
-		{
-			return true;
-		}
-		return false;
 
+		// check if deletion worked and token isn't stored anymore
+		return tokenManager.get(token) == null;
 	}
 
 	@Override
-	public User getFtpUser(String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public User getFtpUser(String token) throws TException {
+		if (authenticated(token)) {
 
 			log.info("returning FTPUser...");
 			User user = new User();
 			user.setUserName(UUID.randomUUID().toString().substring(0, 8));
-			user.setPassword(getEncodedSha1Sum(UUID.randomUUID().toString()
-					.substring(0, 8)));
+			user.setPassword(getEncodedSha1Sum(UUID.randomUUID().toString().substring(0, 8)));
 			if (Configuration.config.getAbsolute_path().endsWith("/")) {
 				user.setPath(Configuration.config.getAbsolute_path());
 			} else {
@@ -203,26 +189,18 @@ public class ServerHandler implements Server.Iface {
 		return null;
 	}
 
-	
 	@Override
-
-	public long DeleteFtpUser(String user, String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public long DeleteFtpUser(String user, String token) throws TException {
+		if (authenticated(token)) {
 
 			return sql.DeleteUser(user);
 		}
 		return -1;
 	}
 
-	
 	@Override
-
-	public String getPathOfImage(String image_id, String version, String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public String getPathOfImage(String image_id, String version, String token) throws TException {
+		if (authenticated(token)) {
 			log.info("successfully returned PathOfImage: " + sql.getPathOfImage(image_id, version));
 
 			return sql.getPathOfImage(image_id, version);
@@ -231,10 +209,8 @@ public class ServerHandler implements Server.Iface {
 	}
 
 	@Override
-	public String setInstitution(String university, String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public String setInstitution(String university, String token) throws TException {
+		if (authenticated(token)) {
 
 			return sql.setInstitution(university);
 		}
@@ -242,43 +218,29 @@ public class ServerHandler implements Server.Iface {
 	}
 
 	@Override
-	public boolean writeVLdata(String imagename, String desc,
-			String Tel, String Fak, boolean license, boolean internet,
-			long ram, long cpu, String imagePath, boolean isTemplate,
-			long filesize, long shareMode, String os, String uid, String token, String userID) throws TException 
-	{
-		
-		if(authenticated(token))
-		{
+	public boolean writeVLdata(String imagename, String desc, String Tel, String Fak, boolean license,
+			boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize,
+			long shareMode, String os, String uid, String token, String userID) throws TException {
+
+		if (authenticated(token)) {
 			String mode = null;
-			
-	
+
 			if (shareMode == 0) {
 				mode = "only_local";
 			} else {
 				mode = "to_be_published";
 			}
 
-			// String pk_institution = sql.setInstitution(university);
-			// String pk_person = sql.setPerson(login, lastname, firstname,
-			// Mail,
-			// new Date(), pk_institution);
-
 			// OS impl Select and write
-			// ACHTUNG: Anzahl der Leerzeichen muss eingehalten werden: 'Windows
-			// 7
-			// 32 bit"
+			// ACHTUNG: Anzahl der Leerzeichen muss eingehalten werden:
+			// 'Windows 7 32 bit"
 			String pk_os = sql.getOSpk(os.substring(0, nthIndexOf(os, " ", 2)),
-					os.substring(nthIndexOf(os, " ", 2), os.lastIndexOf(" "))
-							.replace(" ", ""));
+					os.substring(nthIndexOf(os, " ", 2), os.lastIndexOf(" ")).replace(" ", ""));
 
-			// sql.setImageData(pk_person, license, internet, cpu, ram,
-			// imagename,desc, imagePath, filesize,mode,pk_os);
+			sql.setImageData(userID, license, internet, cpu, ram, imagename, desc, imagePath, filesize, mode,
+					pk_os, uid);
 
-			sql.setImageData(userID, license, internet, cpu, ram, imagename, desc,
-					imagePath, filesize, mode, pk_os, uid);
-	
-			log.info("userID in serverhandler was: "+userID);
+			log.info("userID in serverhandler was: " + userID);
 
 			log.info("written VLdata");
 			return true;
@@ -287,11 +249,9 @@ public class ServerHandler implements Server.Iface {
 	}
 
 	@Override
-	//@param: userID - deprecated, to be removed while setting up new suite-architecture
-	public List<Image> getImageListPermissionWrite(String userID, String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	// @param: userID - deprecated, to be removed while setting up new suite-architecture
+	public List<Image> getImageListPermissionWrite(String userID, String token) throws TException {
+		if (authenticated(token)) {
 			UserInfo ui = getUserFromToken(token);
 			return sql.getImageListPermissionWrite(ui.getUserId());
 		}
@@ -299,11 +259,9 @@ public class ServerHandler implements Server.Iface {
 	}
 
 	@Override
-	//@param: userID - deprecated, to be removed while setting up new suite-architecture
-	public List<Image> getImageListPermissionRead(String userID, String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	// @param: userID - deprecated, to be removed while setting up new suite-architecture
+	public List<Image> getImageListPermissionRead(String userID, String token) throws TException {
+		if (authenticated(token)) {
 			UserInfo ui = getUserFromToken(token);
 			return sql.getImageListPermissionRead(ui.getUserId());
 		}
@@ -311,11 +269,9 @@ public class ServerHandler implements Server.Iface {
 	}
 
 	@Override
-	//@param: userID - deprecated, to be removed while setting up new suite-architecture
-	public List<Image> getImageListPermissionLink(String userID, String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	// @param: userID - deprecated, to be removed while setting up new suite-architecture
+	public List<Image> getImageListPermissionLink(String userID, String token) throws TException {
+		if (authenticated(token)) {
 			UserInfo ui = getUserFromToken(token);
 			return sql.getImageListPermissionLink(ui.getUserId());
 		}
@@ -323,11 +279,9 @@ public class ServerHandler implements Server.Iface {
 	}
 
 	@Override
-	//@param: userID - deprecated, to be removed while setting up new suite-architecture
-	public List<Image> getImageListPermissionAdmin(String userID, String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	// @param: userID - deprecated, to be removed while setting up new suite-architecture
+	public List<Image> getImageListPermissionAdmin(String userID, String token) throws TException {
+		if (authenticated(token)) {
 			UserInfo ui = getUserFromToken(token);
 			return sql.getImageListPermissionAdmin(ui.getUserId());
 		}
@@ -335,110 +289,89 @@ public class ServerHandler implements Server.Iface {
 	}
 
 	@Override
-	public List<Image> getImageListAllTemplates(String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public List<Image> getImageListAllTemplates(String token) throws TException {
+		if (authenticated(token)) {
 			return sql.getImageListAllTemplates();
 		}
 		return null;
 	}
 
 	@Override
-	public List<String> getAllOS(String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public List<String> getAllOS(String token) throws TException {
+		if (authenticated(token)) {
 			return sql.getAllOS();
 		}
 		return null;
 	}
 
-	//UserInfo does not return the institution, so in this case, the local method is prepared, but not yet executed, as the institution has to be added to UserInfo (or selected by institutionID)
+	// UserInfo does not return the institution, so in this case, the local
+	// method is prepared, but not yet executed, as the institution has to be
+	// added to UserInfo (or selected by institutionID)
 	@Override
-	public Map<String, String> getPersonData(String Vorname, String Nachname, String token) throws TException 
-	{
-		
-		if(authenticated(token))
-		{
-
-		Map<String, String> map = new HashMap<>();
-		
-		UserInfo ui = getUserFromToken(token);
-		
-		map.put("mail", ui.getEMail());
-		map.put("Nachname", ui.getLastName());
-		map.put("Vorname", ui.getFirstName());
-		
-		//map.put("Hochschule", sql.getInstitutionByID(ui.getOrganizationId())); //does not deliver the correct id
-		Map<String, String> tempMap = new HashMap<>();
-		tempMap = sql.getPersonData(Vorname, Nachname);
-		map.put("Hochschule", tempMap.get("Hochschule"));
-		
-		return map;
+	public Map<String, String> getPersonData(String Vorname, String Nachname, String token) throws TException {
+
+		if (authenticated(token)) {
+
+			Map<String, String> map = new HashMap<>();
+
+			UserInfo ui = getUserFromToken(token);
+
+			map.put("mail", ui.getEMail());
+			map.put("Nachname", ui.getLastName());
+			map.put("Vorname", ui.getFirstName());
+
+			Map<String, String> tempMap = new HashMap<>();
+			tempMap = sql.getPersonData(Vorname, Nachname);
+			map.put("Hochschule", tempMap.get("Hochschule"));
+
+			return map;
 		}
 		return null;
 	}
 
-	
-	public void setPerson(String userID, String token, String institution) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public void setPerson(String userID, String token, String institution) throws TException {
+		if (authenticated(token)) {
 			UserInfo ui = getUserFromToken(token);
-			//String institution = sql.getInstitutionByID(ui.getOrganizationId());
 			sql.setPerson(userID, ui.getLastName(), ui.getFirstName(), ui.getEMail(), new Date(), institution);
 		}
 	}
-	
-	
 
 	@Override
-	public boolean writeLecturedata(String name, String shortdesc, String desc,
-			String startDate, String endDate, boolean isActive,
-			String imageID, String token, String Tel, String Fak, String lectureID, String university)
-			throws TException 
-	{
-		if(authenticated(token))
-		{
+	public boolean writeLecturedata(String name, String shortdesc, String desc, String startDate,
+			String endDate, boolean isActive, String imageID, String token, String Tel, String Fak,
+			String lectureID, String university) throws TException {
+		if (authenticated(token)) {
 			UserInfo ui = getUserFromToken(token);
-		
-			//String pk_image = imageID;
+
 			Map<String, String> map = new HashMap<String, String>();
 			int imageversion = 0;
-			//String university = sql.getInstitutionByID(ui.getOrganizationId());
 			String pk_institution = sql.setInstitution(university);
-			String pk_person = sql.setPerson(ui.getEMail(), ui.getLastName(), ui.getFirstName(), ui.getEMail(),
-					new Date(), pk_institution);
+			String pk_person = sql.setPerson(ui.getEMail(), ui.getLastName(), ui.getFirstName(),
+					ui.getEMail(), new Date(), pk_institution);
 
 			map = sql.getImageIDandVersion(imageID);
 
 			// pk_image = map.get("GUID");
 			imageversion = Integer.parseInt(map.get("version"));
 
-			sql.setLectureData(pk_person, imageID, imageversion, name, desc,
-					shortdesc, startDate, endDate, isActive, lectureID);
+			sql.setLectureData(pk_person, imageID, imageversion, name, desc, shortdesc, startDate, endDate,
+					isActive, lectureID);
 		}
 		return false;
 
 	}
 
 	@Override
-	public boolean startFileCopy(String filename, String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public boolean startFileCopy(String filename, String token) throws TException {
+		if (authenticated(token)) {
 			// copy file from folder temp to folder prod
-			String file = Configuration.config.getAbsolute_path() + "temp/"
-					+ filename;
+			String file = Configuration.config.getAbsolute_path() + "temp/" + filename;
 			File tmpFile = new File(file);
 
-			log.info("Trying to move file to '/srv/openslx/nfs/prod/"
-					+ tmpFile.getName() + "'");
+			log.info("Trying to move file to '/srv/openslx/nfs/prod/" + tmpFile.getName() + "'");
 			try {
-				FileUtils.moveFile(tmpFile,
-						new File(Configuration.config.getAbsolute_path()
-								+ "prod/" + filename));
+				FileUtils.moveFile(tmpFile, new File(Configuration.config.getAbsolute_path() + "prod/"
+						+ filename));
 				// int ret = sql.UpdateImagePath(filename);
 				if (sql.UpdateImagePath(filename) == 0) {
 					log.info("file moved and database updated.");
@@ -453,31 +386,23 @@ public class ServerHandler implements Server.Iface {
 	}
 
 	@Override
-	public Map<String, String> getImageData(String imageid, String imageversion, String token) throws TException 
-	{
-		if(authenticated(token))
-		{
-			//log.info("returning ImageData: "+ sql.getImageData(imageid, imageversion).size() + "items.");
+	public Map<String, String> getImageData(String imageid, String imageversion, String token)
+			throws TException {
+		if (authenticated(token)) {
 			return sql.getImageData(imageid, imageversion);
 		}
 		return null;
 	}
 
 	@Override
-	public boolean updateImageData(String name, String newName, String desc,
-			String image_path, boolean license, boolean internet, long ram,
-			long cpu, String id, String version, boolean isTemplate,
-			long filesize, long shareMode, String os, String token) throws TException 
-	{
-
-		if (authenticated(token)) 
-		{
-			
-			//get old_image_path
-			String old_image_path = sql.getFile(id, version);
-			//log.debug("old file path has value:"+old_image_path.substring(5));
-			//log.debug("new file path has value:"+image_path.substring(5));
+	public boolean updateImageData(String name, String newName, String desc, String image_path,
+			boolean license, boolean internet, long ram, long cpu, String id, String version,
+			boolean isTemplate, long filesize, long shareMode, String os, String token) throws TException {
 
+		if (authenticated(token)) {
+
+			// get old_image_path
+			String old_image_path = sql.getFile(id, version);
 
 			String mode = null;
 
@@ -487,112 +412,92 @@ public class ServerHandler implements Server.Iface {
 				mode = "to_be_published";
 			}
 			String pk_os = sql.getOSpk(os.substring(0, nthIndexOf(os, " ", 2)),
-					os.substring(nthIndexOf(os, " ", 2), os.lastIndexOf(" "))
-							.replace(" ", ""));
+					os.substring(nthIndexOf(os, " ", 2), os.lastIndexOf(" ")).replace(" ", ""));
 
 			// do database update - if successful then delete old file from
 			// drive
-			int val = sql.UpdateImageData(name, newName, desc, image_path,
-					license, internet, cpu, ram, id, version, isTemplate,
-					filesize, mode, pk_os);
-			
-			
-
-			//check if new file has been uploaded by checking if the new file path equals the old file path
-			//if so, no new file was uploaded. Else delete old file
-			if (val == 0 && (!old_image_path.substring(5).matches(image_path.substring(5))) ) {
+			int val = sql.UpdateImageData(name, newName, desc, image_path, license, internet, cpu, ram, id,
+					version, isTemplate, filesize, mode, pk_os);
+
+			// check if new file has been uploaded by checking if the new file
+			// path equals the old file path
+			// if so, no new file was uploaded. Else delete old file
+			if (val == 0 && (!old_image_path.substring(5).matches(image_path.substring(5)))) {
 				// update was successful - delete old file
-				//log.debug("deleting file "+old_image_path);
+				// log.debug("deleting file "+old_image_path);
 				deleteImageByPath(old_image_path);
 			} else {
 				// update was not successful - delete new file
 				// TODO not yet implemented
-				//log.debug("doing nothing because no new file was uploaded..");
+				// log.debug("doing nothing because no new file was uploaded..");
 
 			}
 		}
 		return false;
 	}
-	
 
 	@Override
-	public List<Lecture> getLectureList(String token) throws TException 
-	{
-		if(authenticated(token))
-		{
-			//log.info("returning LectureList");
+	public List<Lecture> getLectureList(String token) throws TException {
+		if (authenticated(token)) {
+			// log.info("returning LectureList");
 			return sql.getLectureList();
 		}
 		return null;
 	}
 
 	@Override
-	public List<Lecture> getLectureListPermissionRead(String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public List<Lecture> getLectureListPermissionRead(String token) throws TException {
+		if (authenticated(token)) {
 			UserInfo ui = getUserFromToken(token);
-			//log.info("returning LectureListRead");
+			// log.info("returning LectureListRead");
 			return sql.getLectureListPermissionRead(ui.getUserId());
 		}
 		return null;
 	}// end getLectureListPermissionRead
 
 	@Override
-	public List<Lecture> getLectureListPermissionWrite(String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public List<Lecture> getLectureListPermissionWrite(String token) throws TException {
+		if (authenticated(token)) {
 			UserInfo ui = getUserFromToken(token);
-			//log.info("returning LectureListWrite");
+			// log.info("returning LectureListWrite");
 			return sql.getLectureListPermissionWrite(ui.getUserId());
 		}
 		return null;
 	}// end getLectureListPermissionRead
 
 	@Override
-
-	public List<Lecture> getLectureListPermissionAdmin(String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public List<Lecture> getLectureListPermissionAdmin(String token) throws TException {
+		if (authenticated(token)) {
 			UserInfo ui = getUserFromToken(token);
-			//log.info("returning LectureListAdmin");
+			// log.info("returning LectureListAdmin");
 			return sql.getLectureListPermissionAdmin(ui.getUserId());
 		}
 		return null;
 	}// end getLectureListPermissionRead
 
-	
 	@Override
-	public boolean updateLecturedata(String name, String newName,
-			String shortdesc, String desc, String startDate, String endDate,
-			boolean isActive, String imageid, String imageversion, String token,
-			String Tel, String Fak, String id, String university) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public boolean updateLecturedata(String name, String newName, String shortdesc, String desc,
+			String startDate, String endDate, boolean isActive, String imageid, String imageversion,
+			String token, String Tel, String Fak, String id, String university) throws TException {
+		if (authenticated(token)) {
 			UserInfo ui = getUserFromToken(token);
-			
-			sql.updateLectureData(imageid, imageversion, ui.getLastName(), newName, desc,
-					shortdesc, startDate, endDate, isActive, id);
-			
+
+			sql.updateLectureData(imageid, imageversion, ui.getLastName(), newName, desc, shortdesc,
+					startDate, endDate, isActive, id);
+
 		}
 		return false;
 	}
 
 	@Override
-	public boolean deleteImageServer(String imageid, String imageversion, String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public boolean deleteImageServer(String imageid, String imageversion, String token) throws TException {
+		if (authenticated(token)) {
 			String stringFile = sql.getFile(imageid, imageversion);
 			log.info("File to Delete: " + stringFile);
 
-			File tmpFile = new File(Configuration.config.getAbsolute_path()
-					+ stringFile);
-			
-			log.info("Absolute Path used for deletion: "+tmpFile);
+			File tmpFile = new File(Configuration.config.getAbsolute_path() + stringFile);
+
+			log.info("Absolute Path used for deletion: " + tmpFile);
 
 			try {
 				// File wird von Server gelöscht
@@ -607,76 +512,58 @@ public class ServerHandler implements Server.Iface {
 		}
 		return false;
 	}
-	
+
 	@Override
-	public boolean deleteImageData(String id, String version, String token) throws TException 
-	{
-		boolean success=false;
-		
-		if(authenticated(token))
-		{
-			if(sql.deleteImage(id, version)==true)
-			{
-				success=true;
-				log.info("Image '"+id+"' and permissions successfully deleted.");
+	public boolean deleteImageData(String id, String version, String token) throws TException {
+		boolean success = false;
+
+		if (authenticated(token)) {
+			if (sql.deleteImage(id, version) == true) {
+				success = true;
+				log.info("Image '" + id + "' and permissions successfully deleted.");
 			}
 		}
 		return success;
 	}
 
-//TODO
-public boolean deleteImageByPath(String image_path) throws TException{
-	
+	// TODO
+	public boolean deleteImageByPath(String image_path) throws TException {
 
+		log.info("File to Delete: " + image_path);
 
-			//String stringFile = sql.getFile(imageid, imageversion);
-			log.info("File to Delete: " + image_path);
+		File tmpFile = new File(Configuration.config.getAbsolute_path() + image_path);
 
-			File tmpFile = new File(Configuration.config.getAbsolute_path()
-					+ image_path);
+		try {
+			// File wird von Server gelöscht
+			FileUtils.forceDelete(tmpFile);
+			return true;
 
-			try {
-				// File wird von Server gelöscht
-				FileUtils.forceDelete(tmpFile);
-				return true;
+		} catch (IOException e) {
+			log.info("Failed to execute deleteImageServer.");
+			e.printStackTrace();
 
-			} catch (IOException e) {
-				log.info("Failed to execute deleteImageServer.");
-				e.printStackTrace();
+		}
 
-			}
-		
+		return false;
 
-	return false;
-	
-}
+	}
 
 	@Override
-	public boolean connectedToLecture(String id, String version, String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public boolean connectedToLecture(String id, String version, String token) throws TException {
+		if (authenticated(token)) {
 			return sql.connectedToLecture(id, version);
 		}
 		return true;
 	}
 
-	public boolean deleteLecture(String id, String token, String university) throws TException 
-	{
+	public boolean deleteLecture(String id, String token, String university) throws TException {
 		boolean success = false;
-		
-		UserInfo ui = getUserFromToken(token);
-		
-		String user = ui.getEMail();
-		
-		if(authenticated(token))
-		{
-			if(sql.deleteLecture(id) == true)
-			{
+
+		if (authenticated(token)) {
+			if (sql.deleteLecture(id) == true) {
 
 				success = true;
-				log.info("Lecture '" + id
-						+ "' and permissions successfully deleted.");
+				log.info("Lecture '" + id + "' and permissions successfully deleted.");
 			}
 		}
 		return success;
@@ -684,31 +571,25 @@ public boolean deleteImageByPath(String image_path) throws TException{
 	}
 
 	@Override
-	public List<String> getAllUniversities(String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public List<String> getAllUniversities(String token) throws TException {
+		if (authenticated(token)) {
 			return sql.getAllUniversities();
 		}
 		return null;
 	}
 
 	@Override
-	public Map<String, String> getLectureData(String lectureid, String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public Map<String, String> getLectureData(String lectureid, String token) throws TException {
+		if (authenticated(token)) {
 			return sql.getLectureData(lectureid);
 		}
 		return null;
 	}
 
-	public static int nthIndexOf(final String string, final String searchToken,final int index) 
-	{
+	public static int nthIndexOf(final String string, final String searchToken, final int index) {
 		int j = 0;
 
-		for (int i = 0; i < index; i++) 
-		{
+		for (int i = 0; i < index; i++) {
 			j = string.indexOf(searchToken, j + 1);
 
 			if (j == -1)
@@ -719,10 +600,8 @@ public boolean deleteImageByPath(String image_path) throws TException{
 	}
 
 	@Override
-	public boolean checkUser(String username, String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public boolean checkUser(String username, String token) throws TException {
+		if (authenticated(token)) {
 			return sql.checkUser(username);
 		}
 		return false;
@@ -730,32 +609,30 @@ public boolean deleteImageByPath(String image_path) throws TException{
 	}
 
 	@Override
-	public boolean createUser(String token, String university) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public boolean createUser(String token, String university) throws TException {
+		if (authenticated(token)) {
 			UserInfo ui = getUserFromToken(token);
 			String pk_institution = sql.setInstitution(university);
-			String pk_person = sql.setPerson(ui.getEMail(), ui.getLastName(), ui.getFirstName(), ui.getEMail(), new Date(), pk_institution);
+			sql.setPerson(ui.getEMail(), ui.getLastName(), ui.getFirstName(), ui.getEMail(), new Date(),
+					pk_institution);
 			return true;
 		}
 		return false;
 	}
 
 	@Override
-	public boolean writeImageRights(String imageID, String token,
-			String role, String university, String userID) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public boolean writeImageRights(String imageID, String token, String role, String university,
+			String userID) throws TException {
+		if (authenticated(token)) {
 			UserInfo ui = getUserFromToken(token);
 			String pk_image = null;
 			Map<String, String> map = new HashMap<String, String>();
-		
+
 			String pk_institution = sql.setInstitution(university);
 
-			String pk_person = sql.setPerson(userID, ui.getLastName(), ui.getFirstName(), ui.getEMail(), new Date(), pk_institution);
-	
+			String pk_person = sql.setPerson(userID, ui.getLastName(), ui.getFirstName(), ui.getEMail(),
+					new Date(), pk_institution);
+
 			map = sql.getImageIDandVersion(imageID);
 
 			pk_image = map.get("GUID");
@@ -768,8 +645,7 @@ public boolean deleteImageByPath(String image_path) throws TException{
 				int linkallowed = 1;
 				int roleID = sql.getRoleID(role);
 
-				sql.setImageRights(pk_person, pk_image, roleID, read, write,
-						admin, linkallowed);
+				sql.setImageRights(pk_person, pk_image, roleID, read, write, admin, linkallowed);
 
 			} else if (role.equals("Admin")) {
 				int read = 1;
@@ -779,8 +655,7 @@ public boolean deleteImageByPath(String image_path) throws TException{
 				int linkallowed = 1;
 				int roleID = sql.getRoleID(role);
 
-				sql.setImageRights(pk_person, pk_image, roleID, read, write,
-						admin, linkallowed);
+				sql.setImageRights(pk_person, pk_image, roleID, read, write, admin, linkallowed);
 			} else {
 				int read = 1;
 				int write = 0;
@@ -789,8 +664,7 @@ public boolean deleteImageByPath(String image_path) throws TException{
 				int linkallowed = 0;
 				int roleID = sql.getRoleID(role);
 
-				sql.setImageRights(pk_person, pk_image, roleID, read, write,
-						admin, linkallowed);
+				sql.setImageRights(pk_person, pk_image, roleID, read, write, admin, linkallowed);
 			}
 
 			log.info("Written image rights");
@@ -800,16 +674,16 @@ public boolean deleteImageByPath(String image_path) throws TException{
 	}
 
 	@Override
-	public boolean writeLectureRights(String lectureID, String role, String token, String university, String userID) throws TException 
-	{
-		if(authenticated(token))
-		{
-			//String pk_lecture = null;
+	public boolean writeLectureRights(String lectureID, String role, String token, String university,
+			String userID) throws TException {
+		if (authenticated(token)) {
+			// String pk_lecture = null;
 			UserInfo ui = getUserFromToken(token);
 			String pk_institution = sql.setInstitution(university);
-			String pk_person = sql.setPerson(userID, ui.getLastName(), ui.getFirstName(), ui.getEMail(), new Date(), pk_institution);
-			//pk_lecture = sql.getLectureID(lectureID);
-	
+			String pk_person = sql.setPerson(userID, ui.getLastName(), ui.getFirstName(), ui.getEMail(),
+					new Date(), pk_institution);
+			// pk_lecture = sql.getLectureID(lectureID);
+
 			if (role.equals("Dozent")) {
 				int read = 1;
 				int write = 1;
@@ -817,8 +691,7 @@ public boolean deleteImageByPath(String image_path) throws TException{
 				int admin = 1;
 				int roleID = sql.getRoleID(role);
 
-				sql.setLectureRights(pk_person, lectureID, roleID, read, write,
-						admin);
+				sql.setLectureRights(pk_person, lectureID, roleID, read, write, admin);
 
 			} else if (role.equals("Admin")) {
 				int read = 1;
@@ -827,8 +700,7 @@ public boolean deleteImageByPath(String image_path) throws TException{
 				int admin = 1;
 				int roleID = sql.getRoleID(role);
 
-				sql.setLectureRights(pk_person, lectureID, roleID, read, write,
-						admin);
+				sql.setLectureRights(pk_person, lectureID, roleID, read, write, admin);
 			} else {
 				int read = 0;
 				int write = 0;
@@ -836,8 +708,7 @@ public boolean deleteImageByPath(String image_path) throws TException{
 				int admin = 0;
 				int roleID = sql.getRoleID(role);
 
-				sql.setLectureRights(pk_person, lectureID, roleID, read, write,
-						admin);
+				sql.setLectureRights(pk_person, lectureID, roleID, read, write, admin);
 			}
 
 			return true;
@@ -846,10 +717,8 @@ public boolean deleteImageByPath(String image_path) throws TException{
 	}
 
 	@Override
-	public List<Person> getAllOtherSatelliteUsers(List<String> userID, String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public List<Person> getAllOtherSatelliteUsers(List<String> userID, String token) throws TException {
+		if (authenticated(token)) {
 			return sql.getAllOtherSatelliteUsers(userID);
 			// return null;
 		}
@@ -857,34 +726,20 @@ public boolean deleteImageByPath(String image_path) throws TException{
 	}
 
 	// set permissions for users which are !=userID
-	public boolean writeAdditionalImageRights(String imageID, String userID,
-			boolean isRead, boolean isWrite, boolean isLinkAllowed,
-			boolean isAdmin, String token) throws TException 
-	{
+	public boolean writeAdditionalImageRights(String imageID, String userID, boolean isRead, boolean isWrite,
+			boolean isLinkAllowed, boolean isAdmin, String token) throws TException {
 		boolean success = false;
-		if(authenticated(token))
-		{
-			Map<String, String> map = new HashMap<String, String>();
-			map = sql.getImageIDandVersion(imageID);
-			// String imageID = map.get("GUID");
-
-			sql.writeAdditionalImageRights(imageID, userID, isRead, isWrite,
-					isLinkAllowed, isAdmin);
+		if (authenticated(token)) {
+			sql.writeAdditionalImageRights(imageID, userID, isRead, isWrite, isLinkAllowed, isAdmin);
 			log.info("Written additional image rights for " + userID);
 		}
 		return success;
 	}
 
-	public boolean writeAdditionalLectureRights(String lectureID,
-			String userID, boolean isRead, boolean isWrite, boolean isAdmin, String token) throws TException 
-	{
-		if(authenticated(token))
-		{
-			Map<String, String> map = new HashMap<String, String>();
-			// String lectureID = sql.getLectureID(lectureID);
-
-			sql.writeAdditionalLectureRights(lectureID, userID, isRead,
-					isWrite, isAdmin);
+	public boolean writeAdditionalLectureRights(String lectureID, String userID, boolean isRead,
+			boolean isWrite, boolean isAdmin, String token) throws TException {
+		if (authenticated(token)) {
+			sql.writeAdditionalLectureRights(lectureID, userID, isRead, isWrite, isAdmin);
 			log.info("Written additional lecture rights for " + userID);
 
 			return true;
@@ -893,95 +748,75 @@ public boolean deleteImageByPath(String image_path) throws TException{
 	}
 
 	@Override
-	public List<Person> getPermissionForUserAndImage(String token,
-			String imageID, String userID) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public List<Person> getPermissionForUserAndImage(String token, String imageID, String userID)
+			throws TException {
+		if (authenticated(token)) {
 			return sql.getPermissionForUserAndImage(userID, imageID);
 		}
 		return null;
 	}
 
-
-	public List<Person> getPermissionForUserAndLecture(String token,String lectureID, String userID) throws TException 
-	{
-		if(authenticated(token))
-		{
-			UserInfo ui = getUserFromToken(token);
+	public List<Person> getPermissionForUserAndLecture(String token, String lectureID, String userID)
+			throws TException {
+		if (authenticated(token)) {
 			return sql.getPermissionForUserAndLecture(userID, lectureID);
 		}
 		return null;
 	}
 
 	@Override
-	public void deleteAllAdditionalImagePermissions(String imageID, String token, String userID) throws TException 
-	{
-		if(authenticated(token))
-		{
-			UserInfo ui = getUserFromToken(token);
+	public void deleteAllAdditionalImagePermissions(String imageID, String token, String userID)
+			throws TException {
+		if (authenticated(token)) {
 			sql.deleteAllAdditionalImagePermissions(imageID, userID);
 		}
 		return;
 	}
 
 	@Override
-	public void deleteAllAdditionalLecturePermissions(String lectureID,String token, String userID) throws TException 
-	{
-		if(authenticated(token))
-		{
-			UserInfo ui = getUserFromToken(token);
+	public void deleteAllAdditionalLecturePermissions(String lectureID, String token, String userID)
+			throws TException {
+		if (authenticated(token)) {
 			sql.deleteAllAdditionalLecturePermissions(lectureID, userID);
 		}
 
 		return;
 	}
 
-
-	@Override 
-	public List<Image> getImageList(String userID, String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	@Override
+	public List<Image> getImageList(String userID, String token) throws TException {
+		if (authenticated(token)) {
 			return sql.getImageList(userID);
 		}
 		return null;
 	}
 
 	@Override
-	public List<String> getAdditionalImageContacts(String imageID, String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public List<String> getAdditionalImageContacts(String imageID, String token) throws TException {
+		if (authenticated(token)) {
 			return sql.getAdditionalImageContacts(imageID);
 		}
 		return null;
 	}
 
 	@Override
-	public String getOsNameForGuestOs(String guestOS, String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public String getOsNameForGuestOs(String guestOS, String token) throws TException {
+		if (authenticated(token)) {
 			return sql.getOsNameForGuestOs(guestOS);
 		}
 		return null;
 	}
 
 	@Override
-	public String createRandomUUID(String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public String createRandomUUID(String token) throws TException {
+		if (authenticated(token)) {
 			return sql.createRandomUUID();
 		}
 		return null;
 	}
 
-	public Map<String, String> getItemOwner(String itemID, String token) throws TException 
-	{
-		if(authenticated(token))
-		{
+	public Map<String, String> getItemOwner(String itemID, String token) throws TException {
+		if (authenticated(token)) {
 			return sql.getItemOwner(itemID);
 		}
 		return null;
@@ -989,43 +824,34 @@ public boolean deleteImageByPath(String image_path) throws TException{
 	}
 
 	@Override
-	public boolean userIsImageAdmin(String imageID, String token, String userID)
-			throws TException {
-		
-		if(authenticated(token))
-		{
-			UserInfo ui = getUserFromToken(token);
-			return sql.userIsImageAdmin(userID,imageID);
+	public boolean userIsImageAdmin(String imageID, String token, String userID) throws TException {
+
+		if (authenticated(token)) {
+			return sql.userIsImageAdmin(userID, imageID);
 		}
 		return false;
 
 	}
 
 	@Override
-	public boolean userIsLectureAdmin(String userID, String lectureID, String token)
-			throws TException {
+	public boolean userIsLectureAdmin(String userID, String lectureID, String token) throws TException {
 
-		if(authenticated(token))
-		{
-			return sql.userIsLectureAdmin(userID,lectureID);
+		if (authenticated(token)) {
+			return sql.userIsLectureAdmin(userID, lectureID);
 
 		}
 		return false;
 	}
 
-
 	@Override
 	public String getInstitutionByID(String institutionID) throws TException {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-
 	@Override
 	public long getVersion() throws TException {
 		return Version.VERSION;
 	}
 
-
-
 }// end class