[client] Don't show owner in userList when changing owner or adding user for permission. Refresh and show lecture list after lecture creation.

1 files changed, 19 insertions, 6 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 d4b11857..bdb16483 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
@@ -21,7 +21,6 @@ import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.helper.UiFeedback;
 import org.openslx.dozmod.gui.window.layout.UserListWindowLayout;
-import org.openslx.dozmod.thrift.Session;
 import org.openslx.dozmod.thrift.cache.UserCache;
 import org.openslx.util.QuickTimer;
 import org.openslx.util.QuickTimer.Task;
@@ -33,12 +32,14 @@ public class UserListWindow extends UserListWindowLayout implements UiFeedback {
 
 	private final UserListWindow me = this;
 
+	private String ownerId = null;
+
 	public interface UserAddedCallback {
 		public void userAdded(UserInfo user, UserListWindow window);
 	}
 
-	public UserListWindow(final Window modalParent, final UserAddedCallback callback, String actionCaption) {
-		super(modalParent, actionCaption);
+	public UserListWindow(final Window modalParent, final UserAddedCallback callback, String buttonCaption) {
+		super(modalParent, buttonCaption);
 
 		addWindowListener(new WindowAdapter() {
 			@Override
@@ -50,8 +51,9 @@ public class UserListWindow extends UserListWindowLayout implements UiFeedback {
 						final List<UserInfo> cacheList = UserCache.getAll();
 						final List<UserInfo> userList = new ArrayList<>(cacheList.size() - 1);
 						for (UserInfo user : cacheList) {
-							if (user.getUserId().equals(Session.getUserId()))
+							if (ownerId != null && user.getUserId().equals(ownerId))
 								continue;
+
 							userList.add(user);
 						}
 						Gui.asyncExec(new Runnable() {
@@ -121,10 +123,21 @@ public class UserListWindow extends UserListWindowLayout implements UiFeedback {
 		//		this.setLocationRelativeTo(SwingUtilities.getWindowAncestor(modalParent));
 	}
 
-	public static void open(Window modalParent, UserAddedCallback callback, String actionCaption) {
-		new UserListWindow(modalParent, callback, actionCaption).setVisible(true);
+	/**
+	 * Open a new UserListWindow
+	 * 
+	 * @param modalParent
+	 * @param callback
+	 * @param buttonCaption
+	 * @param ownerId The Id of the owner of an image or lecture. Should not be shown in the list. Can be null
+	 */
+	public static void open(Window modalParent, UserAddedCallback callback, String buttonCaption, String ownerId) {
+		UserListWindow win = new UserListWindow(modalParent, callback, buttonCaption);
+		win.ownerId = ownerId;
+		win.setVisible(true);
 	}
 
+
 	@Override
 	public boolean wantConfirmQuit() {
 		return false;