diff options
| author | Jonathan Bauer | 2015-08-20 17:39:52 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2015-08-20 17:39:52 +0200 |
| commit | aa3c05f909caf15cf4e93255162a9dc0196fd3ce (patch) | |
| tree | be2898e834f2be706f96312fb5ab338ec1db259b | |
| parent | [client] use ThriftActions to delete image in image details window (diff) | |
| download | tutor-module-aa3c05f909caf15cf4e93255162a9dc0196fd3ce.tar.gz tutor-module-aa3c05f909caf15cf4e93255162a9dc0196fd3ce.tar.xz tutor-module-aa3c05f909caf15cf4e93255162a9dc0196fd3ce.zip | |
[client] do the user feedback directly in ThriftActions
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/UpdateWizard.java | 10 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java | 7 |
2 files changed, 6 insertions, 11 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/UpdateWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/UpdateWizard.java index 5cd3ae11..16b20c37 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/UpdateWizard.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/UpdateWizard.java @@ -30,17 +30,9 @@ public class UpdateWizard extends Wizard implements UiFeedback { @Override public void performFinish() { - LOGGER.debug("Finishing: " + uploadWizardState.transferInformation.getToken()); - try { - ThriftActions.updateImageVersion(JOptionPane.getFrameForComponent(this), + ThriftActions.updateImageVersion(JOptionPane.getFrameForComponent(this), uploadWizardState.transferInformation.getToken(), new ImageVersionWrite(uploadWizardState.isRestricted)); - } catch (Exception e) { - // failure - Gui.showMessageBox(this, "Failed to update version", MessageType.ERROR, LOGGER, e); - return; - } - Gui.showMessageBox(this, "Neue Image-Version erfolgreich erstellt.", MessageType.INFO, LOGGER, null); } @Override public boolean wantConfirmQuit() { 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 81add9a6..f45c05c7 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java @@ -284,22 +284,25 @@ public class ThriftActions { } /** + * GUI-BLOCKING + * Gives user feedback * TODO * @param frame * @param transferInformation * @param versionInfo */ public static void updateImageVersion(final Frame frame, - final String versionId, final ImageVersionWrite versionInfo) { + final String versionId, final ImageVersionWrite versionInfo){ try { ThriftManager.getSatClient().updateImageVersion(Session.getSatelliteToken(), versionId, versionInfo); } catch (TException e) { - Gui.asyncMessageBox("Could not set active/restricted flags to satellite: ", + Gui.showMessageBox(frame, "Konnte neue Version nicht erstellen!", MessageType.ERROR, LOGGER, e); return; } + Gui.showMessageBox(frame, "Neue Version erfolgreich erstellt", MessageType.INFO, LOGGER, null); } /* ******************************************************************************* |
