[client] Image/Lectures: only push metadata/permissions if they were changed

1 files changed, 4 insertions, 8 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LectureCustomPermissionManager.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LectureCustomPermissionManager.java
index 4925728e..870db6ad 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LectureCustomPermissionManager.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LectureCustomPermissionManager.java
@@ -87,10 +87,8 @@ public class LectureCustomPermissionManager extends JPanel{
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				UserListWindow.open(SwingUtilities.getWindowAncestor(me), new UserAddedCallback() {
-
 					@Override
 					public void userAdded(final UserInfo newUser, UserListWindow window) {
-
 						// check if we have this user already
 						for (UserLecturePermissions current : permissionList) {
 							if (current.userId.equals(newUser.userId)) {
@@ -100,7 +98,6 @@ public class LectureCustomPermissionManager extends JPanel{
 						}
 						// add it to the list with default permissions
 						permissionList.add(new UserLecturePermissions(newUser.userId, new LecturePermissions(defaultPermissions)));
-						LOGGER.debug("User added: " + newUser);
 						permissionTable.setData(permissionList, false);
 					}
 				}, "Hinzufügen", ownerId);
@@ -109,12 +106,10 @@ public class LectureCustomPermissionManager extends JPanel{
 
 		// delete user button listener
 		btnRemoveUser.addActionListener(new ActionListener() {
-
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				final UserLecturePermissions selected = permissionTable.getSelectedItem();
-				LOGGER.debug("Removing: " + selected);
-				if (!permissionList.remove(selected)) {
+				if (selected != null && !permissionList.remove(selected)) {
 					LOGGER.debug("Could not remove: " + selected);
 				}
 				permissionTable.setData(permissionList, false);
@@ -131,8 +126,9 @@ public class LectureCustomPermissionManager extends JPanel{
 	public void initPanel(Map<String, LecturePermissions> permissionMap, final LecturePermissions defaultPermissions, String ownerId){
 		this.ownerId = ownerId;
 		this.newPermissionMap = permissionMap == null ? new HashMap<String, LecturePermissions>() : permissionMap;
-		permissionList.clear();
 		this.defaultPermissions = defaultPermissions;
+
+		permissionList.clear();
 		for (Entry<String, LecturePermissions> e : newPermissionMap.entrySet()) {
 			permissionList.add(new UserLecturePermissions(e.getKey(), e.getValue()));
 		}
@@ -144,7 +140,7 @@ public class LectureCustomPermissionManager extends JPanel{
 	 * Get map with the permissions set in the table of the manager.
 	 * @return Map with new custom permissions, null if something went wrong
 	 */
-	public Map<String, LecturePermissions> getMap(){
+	public Map<String, LecturePermissions> updatePermissionReferences(){
 		if (permissionList == null)
 			return null;