diff options
| author | Jonathan Bauer | 2015-08-21 14:48:42 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2015-08-21 14:48:42 +0200 |
| commit | 192963b9c9cce03e6b819affc927e58dd5c7192a (patch) | |
| tree | 4e8507745befd0d21a8afd82c063f8a3196dd9fb /dozentenmodul/src/main/java | |
| parent | Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1 (diff) | |
| download | tutor-module-192963b9c9cce03e6b819affc927e58dd5c7192a.tar.gz tutor-module-192963b9c9cce03e6b819affc927e58dd5c7192a.tar.xz tutor-module-192963b9c9cce03e6b819affc927e58dd5c7192a.zip | |
[client] ThriftAction in ImageCustomPermissionWindow
Diffstat (limited to 'dozentenmodul/src/main/java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageCustomPermissionWindow.java | 13 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java | 4 |
2 files changed, 7 insertions, 10 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageCustomPermissionWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageCustomPermissionWindow.java index deea0719..27f1f9d8 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageCustomPermissionWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageCustomPermissionWindow.java @@ -5,6 +5,8 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.Map; +import javax.swing.JOptionPane; + import org.apache.log4j.Logger; import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.ImagePermissions; @@ -12,6 +14,7 @@ import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.helper.MessageType; import org.openslx.dozmod.gui.window.layout.ImageCustomPermissionWindowLayout; import org.openslx.dozmod.thrift.Session; +import org.openslx.dozmod.thrift.ThriftActions; import org.openslx.thrifthelper.ThriftManager; /** @@ -30,16 +33,10 @@ public class ImageCustomPermissionWindow extends ImageCustomPermissionWindowLayo imagePermissionManager.initPanel(permissionMap, defaultPermissions); btnSave.addActionListener(new ActionListener() { - @Override public void actionPerformed(ActionEvent e) { - // push permissions to satellite server - try { - ThriftManager.getSatClient().writeImagePermissions(Session.getSatelliteToken(), - imageBaseId, imagePermissionManager.getMap()); - } catch (TException er) { - Gui.showMessageBox(me, "Konnte Berechtigungen nicht an den Satelliten übertragen: ", MessageType.ERROR, LOGGER, er); - } + ThriftActions.writeImagePermissions(JOptionPane.getFrameForComponent(me), + imageBaseId, imagePermissionManager.getMap()); dispose(); } }); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java index 2f47cb81..e6e39a58 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java @@ -204,7 +204,7 @@ public class ThriftActions { ThriftManager.getSatClient().updateImageBase(Session.getSatelliteToken(), imageBaseId, meta); } catch (TException e) { - ThriftError.showMessage(frame, LOGGER, e, "Konnte Metadaten des Images nicht hochladen"); + ThriftError.showMessage(frame, LOGGER, e, "Konnte Metadaten des Images nicht übertragen"); } } /** @@ -220,7 +220,7 @@ public class ThriftActions { ThriftManager.getSatClient().writeImagePermissions(Session.getSatelliteToken(), imageBaseId, permissions); } catch (TException e) { - ThriftError.showMessage(frame, LOGGER, e, "Konnte Berechtigungen nicht hochladen"); + ThriftError.showMessage(frame, LOGGER, e, "Konnte Berechtigungen nicht übertragen"); } } |