From d6225d9c444822df05fa64191f4cba79f1bbd2c1 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Thu, 5 Mar 2015 17:30:32 +0100 Subject: [client] Make SessionData a static class instead of a class that doesn't know if it's a singleton or not --- dozentenmodul/src/main/java/ftp/DownloadTask.java | 2 +- .../java/gui/image/CreateImageTechnisch_GUI.java | 4 +-- .../src/main/java/gui/image/DeleteImage_GUI.java | 18 +++++----- .../java/gui/image/EditImageAllgemein_GUI.java | 2 +- .../java/gui/image/EditImageTechnisch_GUI.java | 6 ++-- .../main/java/gui/image/FTPCreateUploader_GUI.java | 38 +++++++++----------- .../main/java/gui/image/FTPEditDownloader_GUI.java | 20 +++++------ .../main/java/gui/image/FTPEditUploader_GUI.java | 40 +++++++++++----------- .../java/gui/image/FTPSearchDownloader_GUI.java | 24 ++++++------- .../java/gui/image/PermissionCreateImage_GUI.java | 2 +- .../java/gui/image/PermissionEditImage_GUI.java | 4 +-- .../main/java/gui/image/SearchEditImage_GUI.java | 12 +++---- .../src/main/java/gui/image/SearchImage_GUI.java | 14 ++++---- .../src/main/java/gui/intro/Login_GUI.java | 20 +++++------ .../src/main/java/gui/intro/MainMenue_GUI.java | 2 +- .../java/gui/lecture/CreateLectureLink_GUI.java | 16 ++++----- .../main/java/gui/lecture/DeleteLecture_GUI.java | 8 ++--- .../java/gui/lecture/EditLectureAllgemein_GUI.java | 2 +- .../main/java/gui/lecture/EditLectureLink_GUI.java | 34 +++++++++--------- .../java/gui/lecture/EditLectureSearch_GUI.java | 8 ++--- .../gui/lecture/PermissionEditLecture_GUI.java | 2 +- .../main/java/gui/lecture/SearchLecture_GUI.java | 8 ++--- .../src/main/java/models/SessionData.java | 29 ++-------------- .../src/main/java/util/ListAllOtherUsers_GUI.java | 2 +- dozentenmodul/src/main/java/util/News.java | 4 +-- 25 files changed, 145 insertions(+), 176 deletions(-) (limited to 'dozentenmodul/src/main/java') diff --git a/dozentenmodul/src/main/java/ftp/DownloadTask.java b/dozentenmodul/src/main/java/ftp/DownloadTask.java index da75bd60..9bcccdf7 100644 --- a/dozentenmodul/src/main/java/ftp/DownloadTask.java +++ b/dozentenmodul/src/main/java/ftp/DownloadTask.java @@ -161,7 +161,7 @@ public class DownloadTask extends SwingWorker { try { imageData = ThriftManager.getSatClient().getImageData( Image.image.getImageId(), Image.image.getVersion(), - SessionData.session.getAuthToken()); + SessionData.authToken); } catch (TException e) { LOGGER.error("Thrift exception during transfer, see trace: ", e); return false; diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java index 94085ac1..71728840 100644 --- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java @@ -72,7 +72,7 @@ public class CreateImageTechnisch_GUI extends JInternalFrame { // @Override // public void windowClosing(WindowEvent arg0) { // try { -// ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); +// ThriftManager.getSatClient().setSessionInvalid(SessionData.AuthToken); // } catch (TException e1) { // // TODO Auto-generated catch block // e1.printStackTrace(); @@ -189,7 +189,7 @@ public class CreateImageTechnisch_GUI extends JInternalFrame { }); List os = null; try { - os = ThriftManager.getSatClient().getAllOS(SessionData.session.getAuthToken()); + os = ThriftManager.getSatClient().getAllOS(SessionData.authToken); for(int i=0; i list = ThriftManager.getSatClient().getAllOS(SessionData.session - .getAuthToken()); + List list = ThriftManager.getSatClient().getAllOS(SessionData.authToken); // Leeres Item hinzufuegen comboBox.addItem(""); for (int i = 0; i < list.size(); i++) { @@ -404,18 +403,17 @@ public class DeleteImage_GUI extends JInternalFrame { try { if (!ThriftManager.getSatClient().connectedToLecture(imageid, imageversion, - SessionData.session.getAuthToken())) { + SessionData.authToken)) { try { // try to delete file from file system if (ThriftManager.getSatClient().deleteImageServer(imageid, imageversion, - SessionData.session.getAuthToken()) == true) { + SessionData.authToken) == true) { // successful, now delete file from DB if (ThriftManager.getSatClient().deleteImageData(imageid, imageversion, - SessionData.session - .getAuthToken())) { + SessionData.authToken)) { LOGGER.info("Image '" + imageid + "' erfolgreich gelöscht."); @@ -701,12 +699,12 @@ public class DeleteImage_GUI extends JInternalFrame { if (person.verantwortlicher.getRole() == "Admin") { // get complete list images = ThriftManager.getSatClient().getImageList(person.verantwortlicher - .getUserID(),SessionData.session.getAuthToken()); + .getUserID(),SessionData.authToken); } else { // get permitted list images = ThriftManager.getSatClient().getImageListPermissionAdmin( person.verantwortlicher.getUserID(), - SessionData.session.getAuthToken()); + SessionData.authToken); } Iterator i = images.iterator(); @@ -777,7 +775,7 @@ public class DeleteImage_GUI extends JInternalFrame { SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); Map res = ThriftManager.getSatClient().getImageData(id, version, - SessionData.session.getAuthToken()); + SessionData.authToken); labelName.setText(res.get("name")); labelOS.setText(res.get("os")); labelUpdate.setText(out.format(in.parse(res.get("lastupdate")))); diff --git a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java index d10bbc59..9ea3dee9 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java @@ -339,7 +339,7 @@ public class EditImageAllgemein_GUI extends JInternalFrame { try { Map map = ThriftManager.getSatClient().getImageData( - Image.image.getImageId(), Image.image.getVersion(),SessionData.session.getAuthToken()); + Image.image.getImageId(), Image.image.getVersion(),SessionData.authToken); if (map.get("internet").equals("0")) { Image.image.setInternet(false); diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java index 4ede0149..f8fa5298 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java @@ -172,7 +172,7 @@ public class EditImageTechnisch_GUI extends JInternalFrame { List os = null; try { - os=ThriftManager.getSatClient().getAllOS(SessionData.session.getAuthToken()); + os=ThriftManager.getSatClient().getAllOS(SessionData.authToken); for(int i=0;i i = map.iterator(); int x = 0; diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java index 77e9bb28..2c037885 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java @@ -289,7 +289,7 @@ public class SearchEditImage_GUI extends JInternalFrame { try { // Holt sich eine Liste aller verfuegbaren Betriebssysteme vom // Server - List list = ThriftManager.getSatClient().getAllOS(SessionData.session.getAuthToken()); + List list = ThriftManager.getSatClient().getAllOS(SessionData.authToken); // Leeres Item hinzufuegen comboBox.addItem(""); for (int i = 0; i < list.size(); i++) { @@ -649,10 +649,10 @@ public class SearchEditImage_GUI extends JInternalFrame { // Hole eine Liste der passenden Images, if(person.verantwortlicher.getRole()=="Admin"){ //get complete list - images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); + images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.authToken); } else { //only get permitted list - images = ThriftManager.getSatClient().getImageListPermissionWrite(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); + images = ThriftManager.getSatClient().getImageListPermissionWrite(person.verantwortlicher.getUserID(),SessionData.authToken); } Iterator i = images.iterator(); @@ -720,7 +720,7 @@ public class SearchEditImage_GUI extends JInternalFrame { try { SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - Map res = ThriftManager.getSatClient().getImageData(id, version,SessionData.session.getAuthToken()); + Map res = ThriftManager.getSatClient().getImageData(id, version,SessionData.authToken); labelName.setText(res.get("name")); labelOS.setText(res.get("os")); labelUpdate.setText(out.format(in.parse(res.get("lastupdate")))); @@ -749,7 +749,7 @@ public class SearchEditImage_GUI extends JInternalFrame { textAreadesc.setText(res.get("desc")); res.clear(); - List contacts = ThriftManager.getSatClient().getAdditionalImageContacts(id,SessionData.session.getAuthToken()); + List contacts = ThriftManager.getSatClient().getAdditionalImageContacts(id,SessionData.authToken); labelWeitereVerantwortliche.setText(""); for (int i = 0; i < contacts.size(); i++) { @@ -769,7 +769,7 @@ public class SearchEditImage_GUI extends JInternalFrame { try { //get values from server and set them in model - map=ThriftManager.getSatClient().getItemOwner(imageid,SessionData.session.getAuthToken()); + map=ThriftManager.getSatClient().getItemOwner(imageid,SessionData.authToken); ItemOwner.itemOwner.setUserID(map.get("userID")); ItemOwner.itemOwner.setUsername(map.get("loginName")); diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java index 5e5aa6f8..d3b6fcc9 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java @@ -398,7 +398,7 @@ public class SearchImage_GUI extends JInternalFrame { try { // Holt sich eine Liste aller verfuegbaren Betriebssysteme vom // Server - List list = ThriftManager.getSatClient().getAllOS(SessionData.session.getAuthToken()); + List list = ThriftManager.getSatClient().getAllOS(SessionData.authToken); // Leeres Item hinzufuegen comboBox.addItem(""); for (int i = 0; i < list.size(); i++) { @@ -888,9 +888,9 @@ public class SearchImage_GUI extends JInternalFrame { // Hole eine Liste der Images if(person.verantwortlicher.getRole()=="Admin"){ //get complete list - images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); + images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.authToken); } else { - images = ThriftManager.getSatClient().getImageListPermissionRead(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); + images = ThriftManager.getSatClient().getImageListPermissionRead(person.verantwortlicher.getUserID(),SessionData.authToken); } Iterator i = images.iterator(); @@ -938,7 +938,7 @@ public class SearchImage_GUI extends JInternalFrame { List images; try { // Hole eine Liste der Images - images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); + images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.authToken); Iterator i = images.iterator(); SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -988,7 +988,7 @@ public class SearchImage_GUI extends JInternalFrame { List images; try { // Hole eine Liste der Images - images = ThriftManager.getSatClient().getImageListAllTemplates(SessionData.session.getAuthToken()); + images = ThriftManager.getSatClient().getImageListAllTemplates(SessionData.authToken); Iterator i = images.iterator(); SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -1056,7 +1056,7 @@ public class SearchImage_GUI extends JInternalFrame { try { SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - Map res = ThriftManager.getSatClient().getImageData(id, version,SessionData.session.getAuthToken()); + Map res = ThriftManager.getSatClient().getImageData(id, version,SessionData.authToken); labelName.setText(res.get("name")); labelOS.setText(res.get("os")); labelUpdate.setText(out.format(in.parse(res.get("lastupdate")))); @@ -1083,7 +1083,7 @@ public class SearchImage_GUI extends JInternalFrame { labelVersion.setText(res.get("version")); textAreadesc.setText(res.get("desc")); - List contacts = ThriftManager.getSatClient().getAdditionalImageContacts(id,SessionData.session.getAuthToken()); + List contacts = ThriftManager.getSatClient().getAdditionalImageContacts(id,SessionData.authToken); labelWeitereVerantwortliche.setText(""); for (int i = 0; i < contacts.size(); i++) { diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java index d6f53a4f..e7e2611b 100644 --- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java @@ -309,9 +309,9 @@ public class Login_GUI extends JInternalFrame { } // set Information - SessionData.session.setAuthToken(result.authToken); - SessionData.session.setSessionID(result.sessionId); - SessionData.session.setServerAdress(result.serverAddress); + SessionData.authToken = result.authToken; + SessionData.sessionID = result.sessionId; + SessionData.serverAdress = result.serverAddress; if (!ThriftManager.setSatellite(result.serverAddress)) { LOGGER.error("Setting satellite IP to '" + result.serverAddress + "' failed. Appears to be empty. Is the satellite IP returned from masterserver correct?"); @@ -372,9 +372,9 @@ public class Login_GUI extends JInternalFrame { person.verantwortlicher.setRole("Dozent"); authToken = ShibbolethECP.getResponse().token; ThriftManager.setSatellite(ShibbolethECP.getResponse().satellites.get("default")); - SessionData.session.setServerAdress(ShibbolethECP.getResponse().satellites.get("default")); - SessionData.session.setAuthToken(ShibbolethECP.getResponse().token); - SessionData.session.setSessionID(ShibbolethECP.getResponse().sessionId); + SessionData.serverAdress = ShibbolethECP.getResponse().satellites.get("default"); + SessionData.authToken = ShibbolethECP.getResponse().token; + SessionData.sessionID = ShibbolethECP.getResponse().sessionId; /* * Now postprocess successful login @@ -466,15 +466,15 @@ public class Login_GUI extends JInternalFrame { LOGGER.debug("Post-processing login ..."); // TODO here do all the session data stuff // TODO and the telling the sat Server who we are - LOGGER.debug("Checking token: " + SessionData.session.getAuthToken()); + LOGGER.debug("Checking token: " + SessionData.authToken); try { - boolean authenticated = ThriftManager.getSatClient().authenticated(SessionData.session.getAuthToken()); + boolean authenticated = ThriftManager.getSatClient().authenticated(SessionData.authToken); if (!authenticated) { JOptionPane.showMessageDialog(null, "Sessionübergabe an den Satelliten fehlgeschlagen.", "Fehler", JOptionPane.ERROR_MESSAGE); return; } - String pk_institution = ThriftManager.getSatClient().setInstitution(person.verantwortlicher.getHochschule(), SessionData.session.getAuthToken()); - ThriftManager.getSatClient().setPerson(person.verantwortlicher.getUserID(), SessionData.session.getAuthToken(), pk_institution); + String pk_institution = ThriftManager.getSatClient().setInstitution(person.verantwortlicher.getHochschule(), SessionData.authToken); + ThriftManager.getSatClient().setPerson(person.verantwortlicher.getUserID(), SessionData.authToken, pk_institution); } catch (TException e) { JOptionPane.showMessageDialog(null, "Unerwarteter Fehler.\n\n" + e.toString(), "Fehler", JOptionPane.ERROR_MESSAGE); LOGGER.error("Unexpected exception", e); diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java index 42272091..3e71cc7b 100644 --- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java @@ -85,7 +85,7 @@ public class MainMenue_GUI extends JInternalFrame { e.printStackTrace(); } setTitle("bwLehrpool Suite - Connected Server: " - + SessionData.session.getServerAdress()+" - "+person.verantwortlicher.getUserID()); + + SessionData.serverAdress+" - "+person.verantwortlicher.getUserID()); setBounds(0, 0, 603, 722); diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java index d5d5c586..5bd5d84c 100644 --- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java @@ -277,7 +277,7 @@ public class CreateLectureLink_GUI extends JInternalFrame { comboBox = new JComboBox(); try { - List list = ThriftManager.getSatClient().getAllOS(SessionData.session.getAuthToken()); + List list = ThriftManager.getSatClient().getAllOS(SessionData.authToken); comboBox.addItem(""); for (int i = 0; i < list.size(); i++) { comboBox.addItem(list.get(i)); @@ -433,7 +433,7 @@ public class CreateLectureLink_GUI extends JInternalFrame { formatter.format(Lecture.lecture.getEnddate()).toString(), Lecture.lecture.isActive(), imageID, - SessionData.session.getAuthToken(), + SessionData.authToken, person.verantwortlicher.getTel(), person.verantwortlicher.getFakultaet(), uuid, @@ -445,7 +445,7 @@ public class CreateLectureLink_GUI extends JInternalFrame { ThriftManager.getSatClient().writeLectureRights( uuid, person.verantwortlicher.getRole(), - SessionData.session.getAuthToken(), + SessionData.authToken, person.verantwortlicher.getHochschule(), person.verantwortlicher.getUserID() ); @@ -459,7 +459,7 @@ public class CreateLectureLink_GUI extends JInternalFrame { RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_read(), RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_write(), RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_admin(), - SessionData.session.getAuthToken() + SessionData.authToken ); }//end for @@ -641,7 +641,7 @@ public class CreateLectureLink_GUI extends JInternalFrame { try { - uuid = ThriftManager.getSatClient().createRandomUUID(SessionData.session.getAuthToken()); + uuid = ThriftManager.getSatClient().createRandomUUID(SessionData.authToken); } catch (TException e1) { @@ -660,9 +660,9 @@ public class CreateLectureLink_GUI extends JInternalFrame { // Hole eine Liste der Images if(person.verantwortlicher.getRole()=="Admin"){ //get complete list - images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); + images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.authToken); } else { - images = ThriftManager.getSatClient().getImageListPermissionLink(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); + images = ThriftManager.getSatClient().getImageListPermissionLink(person.verantwortlicher.getUserID(),SessionData.authToken); } Iterator i = images.iterator(); @@ -716,7 +716,7 @@ public class CreateLectureLink_GUI extends JInternalFrame { SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - Map res = ThriftManager.getSatClient().getImageData(id, version,SessionData.session.getAuthToken()); + Map res = ThriftManager.getSatClient().getImageData(id, version,SessionData.authToken); labelName.setText(res.get("name")); labelOS.setText(res.get("os")); labelUpdate.setText(out.format(in.parse(res.get("lastupdate")))); diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java index 05beda93..fa5c84c5 100644 --- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java @@ -372,7 +372,7 @@ public class DeleteLecture_GUI extends JInternalFrame { try { if (ThriftManager.getSatClient().deleteLecture( lectureID, - SessionData.session.getAuthToken(), + SessionData.authToken, person.verantwortlicher.getHochschule() ) ) @@ -534,12 +534,12 @@ public class DeleteLecture_GUI extends JInternalFrame { if(person.verantwortlicher.getRole()=="Admin") { //get complete list - lectures = ThriftManager.getSatClient().getLectureList(SessionData.session.getAuthToken()); + lectures = ThriftManager.getSatClient().getLectureList(SessionData.authToken); } else { //get permitted list - lectures = ThriftManager.getSatClient().getLectureListPermissionAdmin(SessionData.session.getAuthToken()); + lectures = ThriftManager.getSatClient().getLectureListPermissionAdmin(SessionData.authToken); } Iterator i = lectures.iterator(); @@ -597,7 +597,7 @@ public class DeleteLecture_GUI extends JInternalFrame { SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - Map res = ThriftManager.getSatClient().getLectureData(id,SessionData.session.getAuthToken()); + Map res = ThriftManager.getSatClient().getLectureData(id,SessionData.authToken); labelName.setText(res.get("name")); labelAktiv.setText(res.get("isActive")); labeldesc.setText(res.get("desc")); diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java index 24f9ce65..b36ff94f 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java @@ -480,7 +480,7 @@ public class EditLectureAllgemein_GUI extends JInternalFrame { //check which GUI to open try { - if((ThriftManager.getSatClient().userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.session.getAuthToken()) || (person.verantwortlicher.getRole().equals("Admin")))){ + if((ThriftManager.getSatClient().userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.authToken) || (person.verantwortlicher.getRole().equals("Admin")))){ //user is admin of the lecture GuiManager.show(new PermissionEditLecture_GUI()); } else { diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java index 2a57dcfe..b4bf7bff 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java @@ -388,7 +388,7 @@ public class EditLectureLink_GUI extends JInternalFrame { comboBox = new JComboBox(); try { - List list = ThriftManager.getSatClient().getAllOS(SessionData.session.getAuthToken()); + List list = ThriftManager.getSatClient().getAllOS(SessionData.authToken); comboBox.addItem(""); for (int i = 0; i < list.size(); i++) { comboBox.addItem(list.get(i)); @@ -600,7 +600,7 @@ public class EditLectureLink_GUI extends JInternalFrame { //check which GUI to open try { - if(ThriftManager.getSatClient().userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.session.getAuthToken()) || (person.verantwortlicher.getRole().equals("Admin"))){ + if(ThriftManager.getSatClient().userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.authToken) || (person.verantwortlicher.getRole().equals("Admin"))){ //user is admin of the lecture GuiManager.show(new PermissionEditLecture_GUI()); @@ -655,7 +655,7 @@ public class EditLectureLink_GUI extends JInternalFrame { .convertRowIndexToModel(tablemyImages .getSelectedRow()), 7).toString(), - SessionData.session.getAuthToken(), + SessionData.authToken, person.verantwortlicher.getTel(), person.verantwortlicher.getFakultaet(), Lecture.lecture.getid(), @@ -665,7 +665,7 @@ public class EditLectureLink_GUI extends JInternalFrame { // first stage ThriftManager.getSatClient().deleteAllAdditionalLecturePermissions( Lecture.lecture.getid(), - SessionData.session.getAuthToken(), + SessionData.authToken, person.verantwortlicher.getUserID()); // then, add user permissions as they have been @@ -703,7 +703,7 @@ public class EditLectureLink_GUI extends JInternalFrame { RightsManagement.rightsManagement .getPermittedUserList() .get(i).isLecture_admin(),// admin - SessionData.session.getAuthToken() + SessionData.authToken ); }// end for @@ -768,7 +768,7 @@ public class EditLectureLink_GUI extends JInternalFrame { .convertRowIndexToModel(tablePublicVorlagen .getSelectedRow()), 7).toString(), - SessionData.session.getAuthToken(), + SessionData.authToken, person.verantwortlicher.getTel(), person.verantwortlicher.getFakultaet(), Lecture.lecture.getid(), @@ -778,7 +778,7 @@ public class EditLectureLink_GUI extends JInternalFrame { // first stage ThriftManager.getSatClient().deleteAllAdditionalLecturePermissions( Lecture.lecture.getid(), - SessionData.session.getAuthToken(), + SessionData.authToken, person.verantwortlicher.getUserID()); // then, add user permissions as they have been @@ -810,7 +810,7 @@ public class EditLectureLink_GUI extends JInternalFrame { RightsManagement.rightsManagement .getPermittedUserList() .get(i).isImageAdmin(),// admin - SessionData.session.getAuthToken() + SessionData.authToken ); } @@ -871,7 +871,7 @@ public class EditLectureLink_GUI extends JInternalFrame { .convertRowIndexToModel(tableAllImages .getSelectedRow()), 7).toString(), - SessionData.session.getAuthToken(), + SessionData.authToken, person.verantwortlicher.getTel(), person.verantwortlicher.getFakultaet(), Lecture.lecture.getid(), @@ -881,7 +881,7 @@ public class EditLectureLink_GUI extends JInternalFrame { // first stage ThriftManager.getSatClient().deleteAllAdditionalLecturePermissions( Lecture.lecture.getid(), - SessionData.session.getAuthToken(), + SessionData.authToken, person.verantwortlicher.getUserID()); // then, add user permissions as they have been @@ -913,7 +913,7 @@ public class EditLectureLink_GUI extends JInternalFrame { RightsManagement.rightsManagement .getPermittedUserList() .get(i).isImageAdmin(),// admin - SessionData.session.getAuthToken() + SessionData.authToken ); } @@ -1102,11 +1102,11 @@ public class EditLectureLink_GUI extends JInternalFrame { // Hole eine Liste der Images if(person.verantwortlicher.getRole()=="Admin"){ //get complete list - images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); + images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.authToken); } else { //get permitted list images = ThriftManager.getSatClient().getImageListPermissionLink(person.verantwortlicher - .getUserID(),SessionData.session.getAuthToken()); + .getUserID(),SessionData.authToken); } Iterator i = images.iterator(); @@ -1145,11 +1145,11 @@ public class EditLectureLink_GUI extends JInternalFrame { // Hole eine Liste der Images if(person.verantwortlicher.getRole()=="Admin"){ //get complete list - images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); + images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.authToken); } else { //get permitted list images = ThriftManager.getSatClient().getImageListPermissionLink(person.verantwortlicher - .getUserID(),SessionData.session.getAuthToken()); + .getUserID(),SessionData.authToken); } Iterator i = images.iterator(); @@ -1188,7 +1188,7 @@ public class EditLectureLink_GUI extends JInternalFrame { // Hole eine Liste der Images //images = ThriftManager.getSatClient().getImageListPermissionLink(person.verantwortlicher.getUserID()); - images = ThriftManager.getSatClient().getImageListAllTemplates(SessionData.session.getAuthToken()); + images = ThriftManager.getSatClient().getImageListAllTemplates(SessionData.authToken); Iterator i = images.iterator(); SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -1242,7 +1242,7 @@ public class EditLectureLink_GUI extends JInternalFrame { try { SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - Map res = ThriftManager.getSatClient().getImageData(id, version,SessionData.session.getAuthToken()); + Map res = ThriftManager.getSatClient().getImageData(id, version,SessionData.authToken); labelName.setText(res.get("name")); labelOS.setText(res.get("os")); labelUpdate.setText(out.format(in.parse(res.get("lastupdate")))); diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java index a1e1cc87..e83c4bc3 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java @@ -561,10 +561,10 @@ public class EditLectureSearch_GUI extends JInternalFrame { // Hole eine Liste der erlaubten Images für die diese Person if(person.verantwortlicher.getRole()=="Admin"){ //get complete list - lectures = ThriftManager.getSatClient().getLectureList(SessionData.session.getAuthToken()); + lectures = ThriftManager.getSatClient().getLectureList(SessionData.authToken); } else { //get permitted list - lectures = ThriftManager.getSatClient().getLectureListPermissionWrite(SessionData.session.getAuthToken()); + lectures = ThriftManager.getSatClient().getLectureListPermissionWrite(SessionData.authToken); } Iterator i = lectures.iterator(); @@ -623,7 +623,7 @@ public class EditLectureSearch_GUI extends JInternalFrame { SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - Map res = ThriftManager.getSatClient().getLectureData(id,SessionData.session.getAuthToken()); + Map res = ThriftManager.getSatClient().getLectureData(id,SessionData.authToken); labelName.setText(res.get("name")); labelAktiv.setText(res.get("isActive")); labeldesc.setText(res.get("desc")); @@ -641,7 +641,7 @@ public class EditLectureSearch_GUI extends JInternalFrame { try { // get values from server and set them in model - map = ThriftManager.getSatClient().getItemOwner(lectureid,SessionData.session.getAuthToken()); + map = ThriftManager.getSatClient().getItemOwner(lectureid,SessionData.authToken); ItemOwner.itemOwner.setUserID(map.get("userID")); ItemOwner.itemOwner.setUsername(map.get("loginName")); diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java index dab6f2c9..f090eb46 100644 --- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java @@ -205,7 +205,7 @@ public class PermissionEditLecture_GUI extends JInternalFrame { try { map = ThriftManager.getSatClient().getPermissionForUserAndLecture( - SessionData.session.getAuthToken(),Lecture.lecture.getid(),person.verantwortlicher.getUserID() + SessionData.authToken,Lecture.lecture.getid(),person.verantwortlicher.getUserID() ); Iterator i = map.iterator(); diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java index 8ae9871e..07f8a6e7 100644 --- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java @@ -536,10 +536,10 @@ public class SearchLecture_GUI extends JInternalFrame { // Hole eine Liste der erlaubten Images für die diese Person if(person.verantwortlicher.getRole()=="Admin"){ //get complete list - lectures = ThriftManager.getSatClient().getLectureList(SessionData.session.getAuthToken()); + lectures = ThriftManager.getSatClient().getLectureList(SessionData.authToken); } else { //get permitted list - lectures = ThriftManager.getSatClient().getLectureListPermissionRead(SessionData.session.getAuthToken()); + lectures = ThriftManager.getSatClient().getLectureListPermissionRead(SessionData.authToken); } Iterator i = lectures.iterator(); @@ -580,7 +580,7 @@ public class SearchLecture_GUI extends JInternalFrame { try { // Hole eine Liste der erlaubten Images für die diese Person //lectures = ThriftManager.getSatClient().getLectureList(); - lectures = ThriftManager.getSatClient().getLectureList(SessionData.session.getAuthToken()); + lectures = ThriftManager.getSatClient().getLectureList(SessionData.authToken); Iterator i = lectures.iterator(); SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); @@ -633,7 +633,7 @@ public class SearchLecture_GUI extends JInternalFrame { SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - Map res=ThriftManager.getSatClient().getLectureData(id,SessionData.session.getAuthToken()); + Map res=ThriftManager.getSatClient().getLectureData(id,SessionData.authToken); labelName.setText(res.get("name")); labelAktiv.setText(res.get("isActive")); labeldesc.setText(res.get("desc")); diff --git a/dozentenmodul/src/main/java/models/SessionData.java b/dozentenmodul/src/main/java/models/SessionData.java index d085bc29..33d6fab4 100644 --- a/dozentenmodul/src/main/java/models/SessionData.java +++ b/dozentenmodul/src/main/java/models/SessionData.java @@ -1,32 +1,9 @@ package models; public class SessionData { - - private String sessionID; - private String authToken; - private String serverAdress; - public static SessionData session =new SessionData(); - - public String getSessionID() { - return sessionID; - } - public void setSessionID(String sessionID) { - this.sessionID = sessionID; - } - public String getAuthToken() { - return authToken; - } - public void setAuthToken(String authToken) { - this.authToken = authToken; - } - public String getServerAdress() { - return serverAdress; - } - public void setServerAdress(String serverAdress) { - this.serverAdress = serverAdress; - } + public static String sessionID; + public static String authToken; + public static String serverAdress; - - } diff --git a/dozentenmodul/src/main/java/util/ListAllOtherUsers_GUI.java b/dozentenmodul/src/main/java/util/ListAllOtherUsers_GUI.java index 270c783a..e03e1106 100644 --- a/dozentenmodul/src/main/java/util/ListAllOtherUsers_GUI.java +++ b/dozentenmodul/src/main/java/util/ListAllOtherUsers_GUI.java @@ -272,7 +272,7 @@ public class ListAllOtherUsers_GUI extends JFrame { } //get the info - map = ThriftManager.getSatClient().getAllOtherSatelliteUsers(user,SessionData.session.getAuthToken()); + map = ThriftManager.getSatClient().getAllOtherSatelliteUsers(user,SessionData.authToken); Iterator i = map.iterator(); int x = 0; diff --git a/dozentenmodul/src/main/java/util/News.java b/dozentenmodul/src/main/java/util/News.java index 56b162ac..1c32209a 100644 --- a/dozentenmodul/src/main/java/util/News.java +++ b/dozentenmodul/src/main/java/util/News.java @@ -113,7 +113,7 @@ public class News { private static void init(){ // Document representing the XML Document doc = null; - String satIp = SessionData.session.getServerAdress(); + String satIp = SessionData.serverAdress; // sanity check to see if we have the satellite IP if (satIp == null || satIp.isEmpty()) { LOGGER.error("No satellite IP adress is set in SessionData, aborting news fetching..."); @@ -123,7 +123,7 @@ public class News { // URL to news API URL url = null; try { - url = new URL("http://" + SessionData.session.getServerAdress() + "/slx-admin/api.php?do=news"); + url = new URL("http://" + SessionData.serverAdress + "/slx-admin/api.php?do=news"); } catch (MalformedURLException e) { LOGGER.error("Malformated URL to News-API, see trace: ", e); } -- cgit v1.2.3-55-g7522