[client] Layout tweaks, Change owner feature

1 files changed, 24 insertions, 22 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java
index f7399beb..188eb3cd 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java
@@ -28,8 +28,14 @@ public class UserListWindow extends UserListWindowLayout {
 
 	private final static Logger LOGGER = Logger.getLogger(UserListWindow.class);
 
-	public UserListWindow(final Frame modalParent, final UserAddedCallback callback) {
-		super(modalParent);
+	private final UserListWindow me = this;
+
+	public interface UserAddedCallback {
+		public void userAdded(UserInfo user, UserListWindow window);
+	}
+
+	public UserListWindow(final Frame modalParent, final UserAddedCallback callback, String actionCaption) {
+		super(modalParent, actionCaption);
 
 		addWindowListener(new WindowAdapter() {
 			@Override
@@ -70,32 +76,28 @@ public class UserListWindow extends UserListWindowLayout {
 							RowFilter.regexFilter("(?i)" + searchUserField.getText()));
 					searchUserField.setForeground(UIManager.getColor("TextField.foreground"));
 				} catch (IllegalArgumentException ex) {
-					// TODO set background color of search field to something redish
 					searchUserField.setForeground(Color.RED);
 				}
 			}
 		});
 
-		// ActionListener for the two buttons
-		final ActionListener al = new ActionListener() {
+		setButton.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				if ("Set".equals(e.getActionCommand())) {
-					final UserInfo user = userTable.getSelectedItem();
-					if (user == null)
-						return;
-					callback.userAdded(user);
-				}
-				if ("Cancel".equals(e.getActionCommand())) {
-					setVisible(false);
-					dispose();
-				}
+				final UserInfo user = userTable.getSelectedItem();
+				if (user == null)
+					return;
+				callback.userAdded(user, me);
+			}
+		});
+
+		cancelButton.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				dispose();
 			}
-		};
-		setButton.setActionCommand("Set");
-		setButton.addActionListener(al);
-		cancelButton.setActionCommand("Cancel");
-		cancelButton.addActionListener(al);
+		});
+
 		getRootPane().setDefaultButton(setButton);
 
 		userTable.addMouseListener(new MouseAdapter() {
@@ -109,7 +111,7 @@ public class UserListWindow extends UserListWindowLayout {
 		this.setLocationRelativeTo(modalParent);
 	}
 
-	public static void open(Frame modalParent, final UserAddedCallback callback) {
-		new UserListWindow(modalParent, callback).setVisible(true);
+	public static void open(Frame modalParent, UserAddedCallback callback, String actionCaption) {
+		new UserListWindow(modalParent, callback, actionCaption).setVisible(true);
 	}
 }