diff options
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java | 121 |
1 files changed, 58 insertions, 63 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java index 3f1d7ab9..d5ab0330 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java @@ -116,10 +116,12 @@ public class FTPCreateUploader_GUI extends JFrame implements public FTPCreateUploader_GUI(Component formerGUI) { final Object[] options = { "Beenden", "Abbrechen" }; + + try + { + + uuid = client.createRandomUUID(SessionData.session.getAuthToken()); - try { - client.setTokenForSession(SessionData.session.getAuthToken()); - uuid = client.createRandomUUID(); } catch (TException e1) { e1.printStackTrace(); @@ -143,18 +145,31 @@ public class FTPCreateUploader_GUI extends JFrame implements // 0=beenden, 1=abbrechen if (choice == 0) { try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName, SessionData.session.getAuthToken()); } catch (TException e1) { e1.printStackTrace(); } task.cancel(true); con.closeThriftConnection(); + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } System.exit(0); }// end if choice } else { // no upload running, close window - System.exit(0); + + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + System.exit(0); + } }// end if taskrun }// end window closing }); @@ -382,7 +397,7 @@ public class FTPCreateUploader_GUI extends JFrame implements isAborted = true; // set flag try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); LOGGER.info("Deleted FTP user."); } catch (TException e1) { @@ -450,7 +465,7 @@ public class FTPCreateUploader_GUI extends JFrame implements if (taskrun == true) { try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); } catch (TException e1) { @@ -505,7 +520,7 @@ public class FTPCreateUploader_GUI extends JFrame implements // 0=beenden, 1=abbrechen if (choice == 0) { try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); } catch (TException e1) { e1.printStackTrace(); @@ -623,7 +638,7 @@ public class FTPCreateUploader_GUI extends JFrame implements try { LOGGER.info("Getting FTP User..."); - user = client.getFtpUser(); + user = client.getFtpUser(SessionData.session.getAuthToken()); LOGGER.info("Received FTP user."); // LOGGER.debug("FTP name: " + user.userName); // LOGGER.debug("FTP path: " + user.path); @@ -718,63 +733,43 @@ public class FTPCreateUploader_GUI extends JFrame implements try { - client.writeVLdata(Image.image.getImagename(), + client.writeVLdata( + Image.image.getImagename(), Image.image.getDesc(), - person.verantwortlicher.getUsername(), - person.verantwortlicher.getVorname(), - person.verantwortlicher.getName(), - person.verantwortlicher.getHochschule(), - person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultaet(), - Image.image.isLicensed(), Image.image.isInternet(), - Image.image.getRam(), Image.image.getCpu(), "temp/" - + Image.image.getNewName(), - Image.image.isVorlage(), Image.image.getFilesize(), - Image.image.getShareMode(), Image.image.getOS(), uuid); - - client.startFileCopy(Image.image.getNewName()); - - client.writeImageRights(uuid, - person.verantwortlicher.getUsername(), - person.verantwortlicher.getName(), - person.verantwortlicher.getVorname(), - person.verantwortlicher.getEMail(), - person.verantwortlicher.getHochschule(), - person.verantwortlicher.getRole()); - - for (int i = 0; i < RightsManagement.rightsManagement - .getPermittedUserList().size(); i++) { - // System.out.println("Writing additional rights for user "+RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID()+", User "+i+"/"+RightsManagement.rightsManagement.getPermittedUserList().size()); - client.writeAdditionalImageRights(uuid, - RightsManagement.rightsManagement - .getPermittedUserList().get(i).getUserID(), - RightsManagement.rightsManagement - .getPermittedUserList().get(i).isImageRead(), - RightsManagement.rightsManagement - .getPermittedUserList().get(i).isImageWrite(), - RightsManagement.rightsManagement - .getPermittedUserList().get(i) - .isImageLinkAllowed(), - RightsManagement.rightsManagement - .getPermittedUserList().get(i).isImageAdmin()); - /* - * LOGGER.info( "Name: "+Image.image.getImagename() - * +"\tUserID: " - * +RightsManagement.rightsManagement.getPermittedUserList - * ().get(i).getUserID() - * +"\tisImageRead: "+RightsManagement.rightsManagement - * .getPermittedUserList().get(i).isImageRead() - * +"\tisImageWrite: " - * +RightsManagement.rightsManagement.getPermittedUserList - * ().get(i).isImageWrite() - * +"\tisImageLInkAllowed: "+RightsManagement - * .rightsManagement.getPermittedUserList - * ().get(i).isImageLinkAllowed() - * +"\tisImageAdmin: "+RightsManagement - * .rightsManagement.getPermittedUserList - * ().get(i).isImageAdmin() ); - */ + Image.image.isLicensed(), + Image.image.isInternet(), + Image.image.getRam(), + Image.image.getCpu(), + "temp/"+ Image.image.getNewName(), + Image.image.isVorlage(), + Image.image.getFilesize(), + Image.image.getShareMode(), + Image.image.getOS(), + uuid, + SessionData.session.getAuthToken(), + person.verantwortlicher.getUserID() + ); + + //System.out.println("userID is: "+person.verantwortlicher.getUserID()); + System.out.println("starting file copy..."); + client.startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken()); + + client.writeImageRights(uuid,SessionData.session.getAuthToken(),person.verantwortlicher.getRole(),person.verantwortlicher.getHochschule(), person.verantwortlicher.getUserID()); + + for(int i=0; i< RightsManagement.rightsManagement.getPermittedUserList().size(); i++) + { + //System.out.println("Writing additional rights for user "+RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID()+", User "+i+"/"+RightsManagement.rightsManagement.getPermittedUserList().size()); + client.writeAdditionalImageRights( + uuid, + RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(), + RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageRead(), + RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageWrite(), + RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageLinkAllowed(), + RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin(), + SessionData.session.getAuthToken() + ); }// end for |