diff options
| author | Jonathan Bauer | 2015-08-25 15:16:50 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2015-08-25 15:16:50 +0200 |
| commit | 03c6d2037f0b2db02596d96730b11b3b76ac49bc (patch) | |
| tree | af11d56cf0a8ba5fc0e4ec3de44668a4603d27c0 /dozentenmodul/src/main/java | |
| parent | Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1 (diff) | |
| download | tutor-module-03c6d2037f0b2db02596d96730b11b3b76ac49bc.tar.gz tutor-module-03c6d2037f0b2db02596d96730b11b3b76ac49bc.tar.xz tutor-module-03c6d2037f0b2db02596d96730b11b3b76ac49bc.zip | |
[client] remove this shitty workaround and fix it properly
Diffstat (limited to 'dozentenmodul/src/main/java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java | 31 |
1 files changed, 14 insertions, 17 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 294122bc..cce12b93 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 @@ -464,23 +464,20 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe OperatingSystem newOs = cboOperatingSystem.getItemAt(cboOperatingSystem.getSelectedIndex()); ShareMode newShareMode = cboShareMode.getItemAt(cboShareMode.getSelectedIndex()); boolean changed = false; - // TODO remove this workaround - if (newOs == null) { - changed = false; - return; - } - if (!txtTitle.getText().isEmpty() && !txtTitle.getText().equals(image.getImageName())) { - changed = true; - } else if (!txtDescription.getText().isEmpty() && !txtDescription.getText().equals(image.getDescription())) { - changed = true; - } else if (newOs != null && newOs.getOsId() != image.getOsId()) { - changed = true; - } else if (newShareMode != null && !newShareMode.equals(image.shareMode)) { - changed = true; - } else if (chkIsTemplate.isSelected() != image.isTemplate) { - changed = true; - } else if (permissionsChanged){ - changed = true; + if (newOs != null) { + if (!txtTitle.getText().isEmpty() && !txtTitle.getText().equals(image.getImageName())) { + changed = true; + } else if (!txtDescription.getText().isEmpty() && !txtDescription.getText().equals(image.getDescription())) { + changed = true; + } else if (newOs.getOsId() != image.getOsId()) { + changed = true; + } else if (newShareMode != null && !newShareMode.equals(image.shareMode)) { + changed = true; + } else if (chkIsTemplate.isSelected() != image.isTemplate) { + changed = true; + } else if (permissionsChanged){ + changed = true; + } } // TODO TAGS btnSaveChanges.setEnabled(changed); |