[client] more optimization on ImageDetailWindow

(gimme dat star!)

1 files changed, 16 insertions, 20 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 0887e461..a0d19f91 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
@@ -569,37 +569,32 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 		// Special case: User has admin rights through default permissions
 		//               -> user removes default admin permissions
 		//               -> first save custom permissions, then the rest (including default permissions)
-		if (adminRightsFromDefaultPermissions && image.defaultPermissions.admin == false
-				&& changeListenerPermissions.isCurrentlyChanged()) {
+		if (adminRightsFromDefaultPermissions && changeListenerPermissions.isCurrentlyChanged()) {
 			if (!saveCustomPermissions()) {
 				return false;
 			}
 			changeListenerPermissions.reset();
-			LOGGER.info("Successfully saved new custom permissions");
 		}
-		// now trigger the actual action
-		if (changeMonitor.isCurrentlyModified()) {
-			// first build the ImageBaseWrite from the GUI fields
-			final ImageBaseWrite ibw = new ImageBaseWrite(txtTitle.getText(), txtDescription.getText(),
-					cboOperatingSystem.getItemAt(cboOperatingSystem.getSelectedIndex()).osId, image.virtId,
-					chkIsTemplate.isSelected(),
-					new ImagePermissions(image.defaultPermissions.link, image.defaultPermissions.download,
-							image.defaultPermissions.edit, image.defaultPermissions.admin),
-					cboShareMode.getItemAt(cboShareMode.getSelectedIndex()));
-			try {
-				actionHandler.updateImageBase(image.getImageBaseId(), ibw);
-			} catch (TException e) {
-				ThriftError.showMessage(me, LOGGER, e,
-						"Konnte aktualisierte Metadaten nicht an den Server übermitteln");
-				return false;
-			}
+		// first build the ImageBaseWrite from the GUI fields
+		final ImageBaseWrite ibw = new ImageBaseWrite(txtTitle.getText(), txtDescription.getText(),
+				cboOperatingSystem.getItemAt(cboOperatingSystem.getSelectedIndex()).osId, image.virtId,
+				chkIsTemplate.isSelected(),
+				new ImagePermissions(image.defaultPermissions.link, image.defaultPermissions.download,
+						image.defaultPermissions.edit, image.defaultPermissions.admin),
+				cboShareMode.getItemAt(cboShareMode.getSelectedIndex()));
+		try {
+			actionHandler.updateImageBase(image.getImageBaseId(), ibw);
 			LOGGER.info("Successfully saved new metadata");
+		} catch (TException e) {
+			ThriftError.showMessage(me, LOGGER, e,
+					"Konnte aktualisierte Metadaten nicht an den Server übermitteln");
+			return false;
 		}
+
 		if (changeListenerPermissions.isCurrentlyChanged()) {
 			if (!saveCustomPermissions()) {
 				return false;
 			}
-			LOGGER.info("Successfully saved new custom permissions");
 		}
 		changeMonitor.reset();
 		return true;
@@ -615,6 +610,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 		try {
 			actionHandler.writeImagePermissions(image.getImageBaseId(),
 					ctlImagePermissionConfigurator.getPermissions());
+			LOGGER.info("Successfully saved new custom permissions");
 		} catch (TException e) {
 			ThriftError.showMessage(me, LOGGER, e,
 					"Konnte geänderte Berechtigungen nicht an den Server übermitteln");