diff options
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java index b28ac83c..19c9ba00 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java @@ -70,7 +70,7 @@ public class FTPEditUploader_GUI extends JInternalFrame implements private final JPanel contentPanel = new JPanel(); JLabel lblPath; JProgressBar progressBar; - String host = SessionData.session.getServerAdress(); + String host = SessionData.serverAdress; int port = 21; User user; String filename = ""; @@ -129,19 +129,19 @@ public class FTPEditUploader_GUI extends JInternalFrame implements // 0=beenden, 1=abbrechen if (choice == 0) { try { - ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); + ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.authToken); } catch (TException e1) { e1.printStackTrace(); } task.cancel(true); try { - ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); + ThriftManager.getSatClient().setSessionInvalid(SessionData.authToken); } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); } try { - ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); + ThriftManager.getSatClient().setSessionInvalid(SessionData.authToken); } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -168,19 +168,19 @@ public class FTPEditUploader_GUI extends JInternalFrame implements // // 0=beenden, 1=abbrechen // if (choice == 0) { // try { -// ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); +// ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.AuthToken); // } catch (TException e1) { // e1.printStackTrace(); // } // task.cancel(true); // try { -// ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); +// ThriftManager.getSatClient().setSessionInvalid(SessionData.AuthToken); // } catch (TException e) { // // TODO Auto-generated catch block // e.printStackTrace(); // } // try { -// ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); +// ThriftManager.getSatClient().setSessionInvalid(SessionData.AuthToken); // } catch (TException e) { // // TODO Auto-generated catch block // e.printStackTrace(); @@ -190,7 +190,7 @@ public class FTPEditUploader_GUI extends JInternalFrame implements // } else { // // no upload running, close window // try { -// ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); +// ThriftManager.getSatClient().setSessionInvalid(SessionData.AuthToken); // } catch (TException e) { // // TODO Auto-generated catch block // e.printStackTrace(); @@ -403,7 +403,7 @@ public class FTPEditUploader_GUI extends JInternalFrame implements isAborted = true; // set flag try { - ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); + ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.authToken); LOGGER.info("FTP user deleted."); } catch (TException e1) { e1.printStackTrace(); @@ -475,7 +475,7 @@ public class FTPEditUploader_GUI extends JInternalFrame implements if (taskrun == true) { try { - ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); + ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.authToken); } catch (TException e1) { e1.printStackTrace(); @@ -505,7 +505,7 @@ public class FTPEditUploader_GUI extends JInternalFrame implements // 0=beenden, 1=abbrechen if (choice == 0) { try { - ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); + ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.authToken); } catch (TException e1) { e1.printStackTrace(); } @@ -514,7 +514,7 @@ public class FTPEditUploader_GUI extends JInternalFrame implements try { - if(ThriftManager.getSatClient().userIsImageAdmin(Image.image.getImageId(), SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()) == true || person.verantwortlicher.getRole().equals("Admin")){ + if(ThriftManager.getSatClient().userIsImageAdmin(Image.image.getImageId(), SessionData.authToken,person.verantwortlicher.getUserID()) == true || person.verantwortlicher.getRole().equals("Admin")){ //user is admin and may change permissions GuiManager.show(new PermissionEditImage_GUI()); @@ -541,7 +541,7 @@ public class FTPEditUploader_GUI extends JInternalFrame implements try { System.out.println("userID in editimageuploader is : "+person.verantwortlicher.getUserID()); - if(ThriftManager.getSatClient().userIsImageAdmin(Image.image.getImageId(), SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()) == true) + if(ThriftManager.getSatClient().userIsImageAdmin(Image.image.getImageId(), SessionData.authToken,person.verantwortlicher.getUserID()) == true) { //user is admin and may change permissions GuiManager.show(new PermissionEditImage_GUI()); @@ -580,7 +580,7 @@ public class FTPEditUploader_GUI extends JInternalFrame implements try { //LOGGER.info("Getting FTP-User..."); - user = ThriftManager.getSatClient().getFtpUser(SessionData.session.getAuthToken()); + user = ThriftManager.getSatClient().getFtpUser(SessionData.authToken); LOGGER.info("Received FTP user."); //LOGGER.debug("FTP name: " + user.userName); //LOGGER.debug("FTP path: " + user.path); @@ -699,10 +699,10 @@ public class FTPEditUploader_GUI extends JInternalFrame implements Image.image.getFilesize(), Image.image.getShareMode(), Image.image.getOS(), - SessionData.session.getAuthToken() + SessionData.authToken ); if (fileupload == true) { - ThriftManager.getSatClient().startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken()); + ThriftManager.getSatClient().startFileCopy(Image.image.getNewName(),SessionData.authToken); } } else { //no new file uploaded and old file name stays @@ -725,11 +725,11 @@ public class FTPEditUploader_GUI extends JInternalFrame implements Image.image.getFilesize(), Image.image.getShareMode(), Image.image.getOS(), - SessionData.session.getAuthToken() + SessionData.authToken ); if (fileupload == true) { - ThriftManager.getSatClient().startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken()); + ThriftManager.getSatClient().startFileCopy(Image.image.getNewName(),SessionData.authToken); // client.startFileCopy(Image.image.getImagename()); } } @@ -737,7 +737,7 @@ public class FTPEditUploader_GUI extends JInternalFrame implements // remove all additional user permissions on first stage - ThriftManager.getSatClient().deleteAllAdditionalImagePermissions(Image.image.getImageId(),SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()); + ThriftManager.getSatClient().deleteAllAdditionalImagePermissions(Image.image.getImageId(),SessionData.authToken,person.verantwortlicher.getUserID()); // then, add user permissions as they have been set new for (int i = 0; i < RightsManagement.rightsManagement.getPermittedUserList().size(); i++) @@ -757,7 +757,7 @@ public class FTPEditUploader_GUI extends JInternalFrame implements RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageWrite(), RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageLinkAllowed(), RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin(), - SessionData.session.getAuthToken() + SessionData.authToken ); }// end for |
