summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
diff options
context:
space:
mode:
authorSimon Rettberg2015-03-05 17:30:32 +0100
committerSimon Rettberg2015-03-05 17:30:32 +0100
commitd6225d9c444822df05fa64191f4cba79f1bbd2c1 (patch)
treeedac0ea7bc34b2e729368511c51513ebbb355972 /dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
parent[client] Restore RPC version check; add error message on thrift communication... (diff)
downloadtutor-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/EditImageTechnisch_GUI.java')
-rw-r--r--dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java6
1 files changed, 3 insertions, 3 deletions
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<String> os = null;
try {
- os=ThriftManager.getSatClient().getAllOS(SessionData.session.getAuthToken());
+ os=ThriftManager.getSatClient().getAllOS(SessionData.authToken);
for(int i=0;i<os.size();i++) {
comboBox.addItem(os.get(i).toString());
}
@@ -190,7 +190,7 @@ public class EditImageTechnisch_GUI extends JInternalFrame {
panel_1.add(comboBox);
try {
- comboBox.setSelectedItem(ThriftManager.getSatClient().getOsNameForGuestOs(Image.image.getOS(),SessionData.session.getAuthToken()));
+ comboBox.setSelectedItem(ThriftManager.getSatClient().getOsNameForGuestOs(Image.image.getOS(),SessionData.authToken));
} catch (TException e1)
{
// TODO Auto-generated catch block
@@ -349,7 +349,7 @@ public class EditImageTechnisch_GUI extends JInternalFrame {
try {
//check if user may change permissions and choose window
- 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 has permission, go to permission GUI
GuiManager.show(new PermissionEditImage_GUI());
} else {