diff options
author | Jonathan Bauer | 2015-09-17 18:18:41 +0200 |
---|---|---|
committer | Jonathan Bauer | 2015-09-17 18:18:41 +0200 |
commit | d11c30564208f2651a9b0db1a9a7cfccda25e23f (patch) | |
tree | dec9e111c8b7a7354698878babb55ffc99c4f627 /dozentenmodul/src/main/java/org/openslx/dozmod/gui | |
parent | [client] Disclaimer no longer editable. (diff) | |
download | tutor-module-d11c30564208f2651a9b0db1a9a7cfccda25e23f.tar.gz tutor-module-d11c30564208f2651a9b0db1a9a7cfccda25e23f.tar.xz tutor-module-d11c30564208f2651a9b0db1a9a7cfccda25e23f.zip |
[client] success message when the upload creation finished
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui')
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java index 32ec91ea..772f69af 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java @@ -63,10 +63,11 @@ public class ImageCreationWizard extends Wizard implements UiFeedback { @Override public void performFinish() { // push image base to satellite - boolean pushedBase = ThriftActions.updateImageBase(JOptionPane.getFrameForComponent(this), uploadWizardState.uuid, - imageBaseWriteFromState()); + boolean pushedBase = ThriftActions.updateImageBase(JOptionPane.getFrameForComponent(this), + uploadWizardState.uuid, imageBaseWriteFromState()); if (!pushedBase) { - Gui.showMessageBox(this, "Konnte die Metadaten des Images nicht auf dem Satelliten speichern!", MessageType.ERROR, null, null); + Gui.showMessageBox(this, "Konnte die Metadaten des Images nicht auf dem Satelliten speichern!", + MessageType.ERROR, null, null); return; } // push permissions to satellite if we have custom permissions @@ -75,20 +76,35 @@ public class ImageCreationWizard extends Wizard implements UiFeedback { pushedPerms = ThriftActions.writeImagePermissions(JOptionPane.getFrameForComponent(this), uploadWizardState.uuid, uploadWizardState.permissionMap); if (!pushedPerms) { - Gui.showMessageBox(this, "Konnte die Berechtigungen nicht auf dem Satelliten speichern!", MessageType.ERROR, null, null); - // TODO delete base image? + Gui.showMessageBox(this, "Konnte die Berechtigungen nicht auf dem Satelliten speichern!", + MessageType.ERROR, null, null); + ThriftActions.deleteImageBase(JOptionPane.getFrameForComponent(this), uploadWizardState.uuid, + null); return; } } // push version metadata to satellite boolean pushedVersion = ThriftActions.updateImageVersion(JOptionPane.getFrameForComponent(this), - uploadWizardState.transferInformation.getToken(), new ImageVersionWrite( - uploadWizardState.isRestricted)); + uploadWizardState.transferInformation.getToken(), + new ImageVersionWrite(uploadWizardState.isRestricted)); if (!pushedVersion) { - Gui.showMessageBox(this, "Konnte die Metadaten der Version nicht auf dem Satelliten speichern!", MessageType.ERROR, null, null); - // TODO delete base image? + Gui.showMessageBox(this, "Konnte die Metadaten der Version nicht auf dem Satelliten speichern!", + MessageType.ERROR, null, null); + ThriftActions.deleteImageBase(JOptionPane.getFrameForComponent(this), uploadWizardState.uuid, + null); return; } + + // check upload state + String successMessage = "Image erfolgreich erstellt!"; + if (!uploadWizardState.uploadTask.isComplete()) { + // still running and all of the above worked, so success message + if (!uploadWizardState.uploadTask.isCanceled()) + successMessage += " Der Upload läuft im Hintergrund... Verlassen Sie das Programm nicht solange es läuft."; + } else { + successMessage += " Der Upload ist fertig. Sie können nun eine Veranstaltung anlegen."; + } + Gui.showMessageBox(JOptionPane.getFrameForComponent(this), successMessage, MessageType.INFO, null, null); } /** |