diff options
author | Simon Rettberg | 2015-10-02 15:59:17 +0200 |
---|---|---|
committer | Simon Rettberg | 2015-10-02 15:59:17 +0200 |
commit | a3f643c4544a986dc4e808ada28089b0dbab9846 (patch) | |
tree | 0e27ef775d13b96dfb2351950f06d84e1e0da52b /dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java | |
parent | [server] Tweaks/fixes to file transfers (diff) | |
download | tutor-module-a3f643c4544a986dc4e808ada28089b0dbab9846.tar.gz tutor-module-a3f643c4544a986dc4e808ada28089b0dbab9846.tar.xz tutor-module-a3f643c4544a986dc4e808ada28089b0dbab9846.zip |
[client] Fix several issues with the new upload scheme
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java')
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java index dc526f12..2c2b0b3b 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java @@ -13,7 +13,6 @@ import org.openslx.dozmod.gui.wizard.page.ImageUploadPage; import org.openslx.dozmod.gui.wizard.page.ImageUploadSummaryPage; import org.openslx.dozmod.state.UploadWizardState; import org.openslx.dozmod.thrift.ThriftActions; -import org.openslx.dozmod.thrift.ThriftError; import org.openslx.dozmod.thrift.UploadInitiator.GotUploadTokenCallback; import org.openslx.util.QuickTimer; import org.openslx.util.QuickTimer.Task; @@ -35,29 +34,29 @@ public class ImageUpdateWizard extends Wizard implements UiFeedback { @Override protected boolean wantFinish() { - try { - ThriftActions.updateImageVersion(state.upload.getToken(), new ImageVersionWrite( - state.isRestricted)); - } catch (TException e) { - ThriftError.showMessage(null, LOGGER, e, "Serverseitiger Fehler beim Speichern der Image-Daten."); - return false; - } - state.upload.startUpload(new GotUploadTokenCallback() { + QuickTimer.scheduleOnce(new Task() { @Override public void fire() { - // push version data - try { - ThriftActions.updateImageVersion(state.upload.getToken(), new ImageVersionWrite( - state.isRestricted)); - } catch (TException e) { - if (state.isRestricted) { - Gui.showMessageBox(null, "Unerwarteter Fehler beim Setzen der Option" - + " 'Enthält lizenzpflichtige Software' für diese Virtuelle Maschine.", - MessageType.WARNING, LOGGER, e); + state.upload.startUpload(new GotUploadTokenCallback() { + @Override + public void fire() { + // push version data + try { + ThriftActions.updateImageVersion(state.upload.getToken(), new ImageVersionWrite( + state.isRestricted)); + } catch (TException e) { + if (state.isRestricted) { + Gui.showMessageBox( + null, + "Unerwarteter Fehler beim Setzen der Option" + + " 'Enthält lizenzpflichtige Software' für diese Virtuelle Maschine.", + MessageType.WARNING, LOGGER, e); + } + } } - } + }); } - }); + }, 500); return true; } |