diff options
| author | Jonathan Bauer | 2015-09-16 16:00:10 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2015-09-16 16:00:10 +0200 |
| commit | 80235d0dc4abadf82fb10ce8aaa0ef239741b441 (patch) | |
| tree | 4a8474f47e4ec8ddde5aaf1e732f8e82f1107a2f /dozentenmodul/src/main/java/org/openslx | |
| parent | [client] forgotten TODOs that are long done (diff) | |
| download | tutor-module-80235d0dc4abadf82fb10ce8aaa0ef239741b441.tar.gz tutor-module-80235d0dc4abadf82fb10ce8aaa0ef239741b441.tar.xz tutor-module-80235d0dc4abadf82fb10ce8aaa0ef239741b441.zip | |
[client] ImageUpdateWiz: if updating version metadata failed, inform user
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx')
3 files changed, 6 insertions, 3 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 44c502fa..54b3af39 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 @@ -7,6 +7,8 @@ import javax.swing.JOptionPane; import org.apache.log4j.Logger; import org.openslx.bwlp.thrift.iface.ImageDetailsRead; import org.openslx.bwlp.thrift.iface.ImageVersionWrite; +import org.openslx.dozmod.gui.Gui; +import org.openslx.dozmod.gui.helper.MessageType; import org.openslx.dozmod.gui.helper.UiFeedback; import org.openslx.dozmod.gui.wizard.page.ImageUploadPage; import org.openslx.dozmod.state.UploadWizardState; @@ -28,10 +30,12 @@ public class ImageUpdateWizard extends Wizard implements UiFeedback { @Override public void performFinish() { - // TODO use ret? boolean ret = ThriftActions.updateImageVersion(JOptionPane.getFrameForComponent(this), uploadWizardState.transferInformation.getToken(), new ImageVersionWrite(uploadWizardState.isRestricted)); + if (!ret) { + Gui.showMessageBox(this, "Konnte Metadaten der Version nicht am Satelliten speichern!", MessageType.INFO, null, null); + } } @Override public boolean wantConfirmQuit() { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java index e8fdeb9a..e730c5b7 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java @@ -93,7 +93,7 @@ public class LectureWizard extends Wizard implements UiFeedback { else state.uuid = uuid; // now push the permissions if we have any - if(state.permissionMap != null && !state.permissionMap.isEmpty()) + if (state.permissionMap != null && !state.permissionMap.isEmpty()) if (!ThriftActions.writeLecturePermissions(JOptionPane.getFrameForComponent(this), state.uuid, state.permissionMap)) return false; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java index a3fcee4b..a05d23da 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java @@ -16,7 +16,6 @@ import org.apache.log4j.Logger; import org.openslx.sat.thrift.version.Version; import org.openslx.util.Json; -// ClientVersion is a bad name, TODO find better suited one :) public class ClientVersion { private static final Logger LOGGER = Logger.getLogger(ClientVersion.class); |