[client] fix "add/delete user" buttons not showing up in ImageCustomPermissionPage

2 files changed, 28 insertions, 15 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java
index d257b6f9..5b5f615a 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java
@@ -1,6 +1,9 @@
 package org.openslx.dozmod.gui.wizard.layout;
 
+import java.awt.GridBagLayout;
+
 import javax.swing.JButton;
+import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 
 import org.openslx.dozmod.gui.control.table.ImagePermissionTable;
@@ -18,7 +21,7 @@ public class ImageCustomPermissionPageLayout extends WizardPage {
 	protected JButton addUser;
 	protected JButton removeUser;
 
-	protected String addUserLabel = "Benutzer Hinzufügen";
+	protected String addUserLabel = "Benutzer hinzufügen";
 	protected String removeUserLabel = "Benutzer entfernen";
 
 	/**
@@ -29,17 +32,18 @@ public class ImageCustomPermissionPageLayout extends WizardPage {
 	public ImageCustomPermissionPageLayout(Wizard wizard) {
 		super(wizard, "Benutzerspezifische Rechte setzen");
 		setDescription("Setzen Sie hier spezielle Berechtigungen, sofern Sie dies wünschen.");
+		setLayout(new GridBagLayout());
 
-		// table
+		// table in the center
 		permissionTable = new ImagePermissionTable();
 		add(new JScrollPane(permissionTable), GridPos.get(0, 0, true, true));
 
 		// Buttons below Table
+		JPanel panel = new JPanel();
 		addUser = new JButton(addUserLabel);
-		add(addUser, GridPos.get(0, 1));
-
 		removeUser = new JButton(removeUserLabel);
-		add(removeUser, GridPos.get(0, 2));
+		panel.add(addUser);
+		panel.add(removeUser);
+		add(panel, GridPos.get(0, 1));
 	}
-
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java
index c137edda..566e75dc 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java
@@ -19,7 +19,7 @@ public class ImageCustomPermissionPage extends ImageCustomPermissionPageLayout {
 
 	private final static Logger LOGGER = Logger.getLogger(ImageCustomPermissionPage.class);
 
-	private UploadWizardState uploadWizardState = null;
+	private UploadWizardState state = null;
 	private ArrayList<UserImagePermissions> permissionList = null;
 
 	/**
@@ -30,13 +30,15 @@ public class ImageCustomPermissionPage extends ImageCustomPermissionPageLayout {
 	public ImageCustomPermissionPage(Wizard wizard, UploadWizardState uploadWizardState) {
 		super(wizard);
 		setPageComplete(true);
-		this.uploadWizardState = uploadWizardState;
+		this.state = uploadWizardState;
 
 		// setup permission list for the table
 		permissionList = new ArrayList<>();
 		for (UserInfo user : UserCache.getAll()) {
-			permissionList.add(new UserImagePermissions(user.getUserId(), new ImagePermissions(true, true,
-					true, false)));
+			// check if we have a default permission
+			if (state.permissions != null) {
+				permissionList.add(new UserImagePermissions(user.getUserId(), state.permissions));
+			}
 		}
 		permissionTable.setData(permissionList, true);
 		
@@ -45,7 +47,14 @@ public class ImageCustomPermissionPage extends ImageCustomPermissionPageLayout {
 		addUser.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				LOGGER.debug("addUser called"); // TODO
+				LOGGER.debug("addUser clicked"); // TODO
+			}
+		});
+		// delete user button adapter
+		removeUser.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				LOGGER.debug("removeUser clicked"); // TODO
 			}
 		});
 	}
@@ -57,16 +66,16 @@ public class ImageCustomPermissionPage extends ImageCustomPermissionPageLayout {
 		if (permissionList == null || permissionList.isEmpty())
 			return;
 		// stuff in our list, clear old list in state before continuing
-		if (uploadWizardState.permissionList == null) {
-			uploadWizardState.permissionList = new HashMap<String, ImagePermissions>();
+		if (state.permissionList == null) {
+			state.permissionList = new HashMap<String, ImagePermissions>();
 		} else {
-			uploadWizardState.permissionList.clear();
+			state.permissionList.clear();
 		}
 
 		// add them one by one
 		for (UserImagePermissions perm : permissionList) {
 			// for now just overwrite the saved permission list of the state
-			uploadWizardState.permissionList.put(perm.userId, perm.permissions);
+			state.permissionList.put(perm.userId, perm.permissions);
 		}
 	}
 }