[client] Included new permission options into lecture details.

1 files changed, 28 insertions, 26 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 175c1ae8..294122bc 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
@@ -74,12 +74,12 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 	 * Image that this window shows the details of
 	 */
 	private ImageDetailsRead image = null;
-	
+
 	/**
 	 * The custom permissions of the image
 	 */
 	private Map<String, ImagePermissions> permissionMap;
-	
+
 	/**
 	 * Whether the custom permission window has been used.
 	 */
@@ -129,17 +129,17 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 			public void actionPerformed(ActionEvent e) {
 				UserListWindow.open(JOptionPane.getFrameForComponent(btnChangeOwner),
 						new UserAddedCallback() {
-							@Override
-							public void userAdded(UserInfo user, UserListWindow window) {
-								window.dispose();
-								setImageOwner(user);
-							}
+					@Override
+					public void userAdded(UserInfo user, UserListWindow window) {
+						window.dispose();
+						setImageOwner(user);
+					}
 
-						}, "Besitzer festlegen");
+				}, "Besitzer festlegen");
 			}
 		});
-		btnCustomPermissions.addActionListener(new ActionListener() {
-			
+		btnPermissions.addActionListener(new ActionListener() {
+
 			@Override
 			public void actionPerformed(ActionEvent arg0) {
 				PermissionDefaultToCustomLink<ImagePermissions> pl = ImageCustomPermissionWindow.open(JOptionPane.getFrameForComponent(me), me.permissionMap, image.defaultPermissions);
@@ -237,18 +237,18 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 		final ImageMetaCallback callback = new ImageMetaCallback() {
 			@Override
 			public void fetchedImageDetails(ImageDetailsRead imageDetails,
-				Map<String, ImagePermissions> permissions) {
+					Map<String, ImagePermissions> permissions) {
 				if (imageDetails == null) {
 					return;
 				}
 				if (permissions == null) {
 					// TODO
 				}
-				
+
 				synchronized(me) {
 					image = imageDetails;
 					permissionMap = permissions;
-						
+
 				}
 				fill();
 			}
@@ -287,12 +287,14 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 		// now trigger the actual action
 		if (!ThriftActions.updateImageBase(JOptionPane.getFrameForComponent(me), image.getImageBaseId(), ibw))
 			return;
-		try {
-			LOGGER.info(permissionMap);
-			ThriftManager.getSatClient().writeImagePermissions(Session.getSatelliteToken(), image.imageBaseId, permissionMap);
-			permissionsChanged = false;
-		} catch (TException e) {
-			LOGGER.error("Fehler beim Übertragen der benutzerdefinierten Berechtigungen: ", e);
+		if(permissionsChanged){
+			try {
+
+				ThriftManager.getSatClient().writeImagePermissions(Session.getSatelliteToken(), image.imageBaseId, permissionMap);
+				permissionsChanged = false;
+			} catch (TException e) {
+				LOGGER.error("Fehler beim Übertragen der benutzerdefinierten Berechtigungen: ", e);
+			}
 		}
 		// success
 		btnSaveChanges.setEnabled(false);
@@ -324,11 +326,11 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 			return;
 		ThriftActions.deleteImageBaseOrVersion(JOptionPane.getFrameForComponent(this),
 				image.getImageBaseId(), version.versionId, new DeleteCallback() {
-					@Override
-					public void isDeleted(boolean success) {
-						refresh(success);
-					}
-				});
+			@Override
+			public void isDeleted(boolean success) {
+				refresh(success);
+			}
+		});
 	}
 
 	/********************************************************************************	
@@ -427,7 +429,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 		};
 		cboOperatingSystem.addItemListener(comboItemListener);
 		cboShareMode.addItemListener(comboItemListener);
-		
+
 		// Listener to detect changes in checkboxes
 		final ActionListener checkBoxListener = new ActionListener() {
 			@Override
@@ -450,7 +452,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 		txtTags.setEditable(editable);
 		cboOperatingSystem.setEnabled(editable);
 		cboShareMode.setEnabled(editable);
-		btnCustomPermissions.setEnabled(adminEdit);
+		btnPermissions.setEnabled(adminEdit);
 		btnChangeOwner.setEnabled(adminEdit);
 	}