diff options
| author | Simon Rettberg | 2015-08-11 17:50:41 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-08-11 17:50:41 +0200 |
| commit | 67d6892eaa5f004674c8641438d09ffc6baade18 (patch) | |
| tree | 1d147fbf7dcd8c49fcf214fa5d3234374f241215 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java | |
| parent | [server] Don't try to deserialize null (diff) | |
| download | tutor-module-67d6892eaa5f004674c8641438d09ffc6baade18.tar.gz tutor-module-67d6892eaa5f004674c8641438d09ffc6baade18.tar.xz tutor-module-67d6892eaa5f004674c8641438d09ffc6baade18.zip | |
[client] Show image name in lecture wizard; check form validity on "Next"
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java index c5e124a2..3c9ccf56 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java @@ -17,6 +17,8 @@ import javax.swing.event.DocumentListener; import org.apache.log4j.Logger; import org.openslx.bwlp.thrift.iface.ImageDetailsRead; +import org.openslx.bwlp.thrift.iface.ImageSummaryRead; +import org.openslx.bwlp.thrift.iface.ImageVersionDetails; import org.openslx.bwlp.thrift.iface.OperatingSystem; import org.openslx.bwlp.thrift.iface.ShareMode; import org.openslx.bwlp.thrift.iface.Virtualizer; @@ -84,7 +86,12 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe if (e.getSource().equals(popupItemNew)) { // TODO new lecture wizard with this image preset LOGGER.debug("New lecture clicked"); - new LectureWizard(me, versionTable.getSelectedItem()).setVisible(true); + ImageVersionDetails selected = versionTable.getSelectedItem(); + if (selected == null) + return; + ImageSummaryRead summary = new ImageSummaryRead(); + summary.setImageName(image.getImageName()); // Maybe create a helper class/function some day that transforms all fields + new LectureWizard(me, summary, selected.getVersionId()).setVisible(true); } if (e.getSource().equals(popupItemDownload)) { // TODO delete that image @@ -149,7 +156,8 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe synchronized (me) { if (image != null) return; - image = ThriftManager.getSatClient().getImageDetails(Session.getSatelliteToken(), imageBaseId); + image = ThriftManager.getSatClient().getImageDetails(Session.getSatelliteToken(), + imageBaseId); } } catch (Exception e) { error = e; @@ -162,8 +170,8 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe @Override public void run() { if (e != null || image == null) { - Gui.showMessageBox(null, "Konnte Daten des Images nicht abrufen", MessageType.ERROR, LOGGER, - e); + Gui.showMessageBox(null, "Konnte Daten des Images nicht abrufen", + MessageType.ERROR, LOGGER, e); dispose(); } else { fill(); @@ -306,7 +314,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe // Image name: if (!txtTitle.getText().equals(image.getImageName())) { LOGGER.debug("Title changed to: " + txtTitle.getText()); - changed =true; + changed = true; } // Image description: if (!txtDescription.getText().equals(image.getDescription())) { |