diff options
| author | Simon Rettberg | 2015-03-05 17:30:32 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2015-03-05 17:30:32 +0100 |
| commit | d6225d9c444822df05fa64191f4cba79f1bbd2c1 (patch) | |
| tree | edac0ea7bc34b2e729368511c51513ebbb355972 /dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java | |
| parent | [client] Restore RPC version check; add error message on thrift communication... (diff) | |
| download | tutor-module-d6225d9c444822df05fa64191f4cba79f1bbd2c1.tar.gz tutor-module-d6225d9c444822df05fa64191f4cba79f1bbd2c1.tar.xz tutor-module-d6225d9c444822df05fa64191f4cba79f1bbd2c1.zip | |
[client] Make SessionData a static class instead of a class that doesn't know if it's a singleton or not
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java index f2cbdef8..daec08e6 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java @@ -64,7 +64,7 @@ public class FTPSearchDownloader_GUI extends JInternalFrame implements JLabel lblDownSpeed; User user; JProgressBar progressBar; - String host = SessionData.session.getServerAdress(); + String host = SessionData.serverAdress; int port = 21; String downloadFile = ""; static String arg = ""; @@ -117,15 +117,15 @@ public class FTPSearchDownloader_GUI extends JInternalFrame implements if (choice == 0) { try { - ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); + ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.authToken); try { - ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); + ThriftManager.getSatClient().setSessionInvalid(SessionData.authToken); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); } try { - ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); + ThriftManager.getSatClient().setSessionInvalid(SessionData.authToken); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -158,15 +158,15 @@ public class FTPSearchDownloader_GUI extends JInternalFrame implements // if (choice == 0) { // // try { -// ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); +// ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.AuthToken); // try { -// ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); +// ThriftManager.getSatClient().setSessionInvalid(SessionData.AuthToken); // } catch (TException e1) { // // TODO Auto-generated catch block // e1.printStackTrace(); // } // try { -// ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); +// ThriftManager.getSatClient().setSessionInvalid(SessionData.AuthToken); // } catch (TException e1) { // // TODO Auto-generated catch block // e1.printStackTrace(); @@ -182,7 +182,7 @@ public class FTPSearchDownloader_GUI extends JInternalFrame implements // } else { // // no download running, close window // try { -// ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); +// ThriftManager.getSatClient().setSessionInvalid(SessionData.AuthToken); // } catch (TException e1) { // // TODO Auto-generated catch block // e1.printStackTrace(); @@ -401,7 +401,7 @@ public class FTPSearchDownloader_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("Deleted FTP user."); } catch (TException e1) { // TODO Auto-generated catch block @@ -441,7 +441,7 @@ public class FTPSearchDownloader_GUI extends JInternalFrame implements if (choice == 0) { task.cancel(true); try { - ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); + ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.authToken); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -485,12 +485,12 @@ public class FTPSearchDownloader_GUI extends JInternalFrame implements // Klick btnDownloadStarten.setText("Bitte warten"); try { - user = ThriftManager.getSatClient().getFtpUser(SessionData.session.getAuthToken()); + user = ThriftManager.getSatClient().getFtpUser(SessionData.authToken); downloadFile = user.path + "/" + ThriftManager.getSatClient().getPathOfImage(Image.image.getImageId(), - Image.image.getVersion(),SessionData.session.getAuthToken()); + Image.image.getVersion(),SessionData.authToken); } catch (TException e) { // TODO Auto-generated catch block |