[client] implements missing UIFeedback

7 files changed, 58 insertions, 9 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageCustomPermissionWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageCustomPermissionWindow.java
index 2daca6f4..3fce3d6b 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageCustomPermissionWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageCustomPermissionWindow.java
@@ -7,6 +7,7 @@ import java.util.Map;
 
 import org.apache.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.ImagePermissions;
+import org.openslx.dozmod.gui.helper.UiFeedback;
 import org.openslx.dozmod.gui.window.layout.ImageCustomPermissionWindowLayout;
 import org.openslx.dozmod.permissions.PermissionDefaultToCustomLink;
 
@@ -14,7 +15,7 @@ import org.openslx.dozmod.permissions.PermissionDefaultToCustomLink;
  * Window for modifying the custom permissions of an image.  
  */
 @SuppressWarnings("serial")
-public class ImageCustomPermissionWindow extends ImageCustomPermissionWindowLayout {
+public class ImageCustomPermissionWindow extends ImageCustomPermissionWindowLayout implements UiFeedback {
 
 	private static final Logger LOGGER = Logger.getLogger(ImageCustomPermissionWindow.class);
 
@@ -69,6 +70,18 @@ public class ImageCustomPermissionWindow extends ImageCustomPermissionWindowLayo
 	public static PermissionDefaultToCustomLink<ImagePermissions> open(Window modalParent, Map<String, ImagePermissions> permissionMap, ImagePermissions defaultPermissions) {
 		return new ImageCustomPermissionWindow(modalParent, permissionMap, defaultPermissions).runAndReturn();
 	}
+
+
+	@Override
+	public boolean wantConfirmQuit() {
+		return false;
+	}
+
+
+	@Override
+	public void escapePressed() {
+		dispose();
+	}
 }
 
 
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 e6ee32ae..e07f08c3 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
@@ -141,7 +141,6 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 			}
 		});
 		btnPermissions.addActionListener(new ActionListener() {
-
 			@Override
 			public void actionPerformed(ActionEvent arg0) {
 				PermissionDefaultToCustomLink<ImagePermissions> pl = ImageCustomPermissionWindow.open(me, me.permissionMap, image.defaultPermissions);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeLinkedImage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeLinkedImage.java
index 1da67079..faa3e306 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeLinkedImage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeLinkedImage.java
@@ -15,13 +15,14 @@ import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.control.table.ImageTable;
 import org.openslx.dozmod.gui.helper.MessageType;
+import org.openslx.dozmod.gui.helper.UiFeedback;
 import org.openslx.dozmod.gui.window.layout.LectureChangeLinkedImageLayout;
 
 /**
  * Window for modifying the custom permissions of an lecture.  
  */
 @SuppressWarnings("serial")
-public class LectureChangeLinkedImage extends LectureChangeLinkedImageLayout {
+public class LectureChangeLinkedImage extends LectureChangeLinkedImageLayout implements UiFeedback {
 
 	private static final Logger LOGGER = Logger.getLogger(LectureChangeLinkedImage.class);
 
@@ -130,4 +131,14 @@ public class LectureChangeLinkedImage extends LectureChangeLinkedImageLayout {
 	public static ImageSummaryRead open(Window modalParent) {
 		return new LectureChangeLinkedImage(modalParent).runAndReturn();
 	}
+
+	@Override
+	public boolean wantConfirmQuit() {
+		return false;
+	}
+
+	@Override
+	public void escapePressed() {
+		dispose();
+	}
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureCustomPermissionWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureCustomPermissionWindow.java
index 082a058b..a95dd66c 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureCustomPermissionWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureCustomPermissionWindow.java
@@ -7,6 +7,7 @@ import java.util.Map;
 
 import org.apache.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.LecturePermissions;
+import org.openslx.dozmod.gui.helper.UiFeedback;
 import org.openslx.dozmod.gui.window.layout.LectureCustomPermissionWindowLayout;
 import org.openslx.dozmod.permissions.PermissionDefaultToCustomLink;
 
@@ -14,7 +15,7 @@ import org.openslx.dozmod.permissions.PermissionDefaultToCustomLink;
  * Window for modifying the custom permissions of an lecture.  
  */
 @SuppressWarnings("serial")
-public class LectureCustomPermissionWindow extends LectureCustomPermissionWindowLayout {
+public class LectureCustomPermissionWindow extends LectureCustomPermissionWindowLayout implements UiFeedback {
 
 	private static final Logger LOGGER = Logger.getLogger(LectureCustomPermissionWindow.class);
 
@@ -54,6 +55,7 @@ public class LectureCustomPermissionWindow extends LectureCustomPermissionWindow
 
 	/**
 	 * Set a created ImageCustomPermissionWindow visible and return resulting permissions
+	 * 
 	 * @return PermissionDefaultToCustomLink with default- and customPermissions when using OK button, null otherwise
 	 */
 	private PermissionDefaultToCustomLink<LecturePermissions> runAndReturn(){
@@ -68,13 +70,26 @@ public class LectureCustomPermissionWindow extends LectureCustomPermissionWindow
 
 	/**
 	 * Create new LecturePermissionWindow dialog
+	 * 
 	 * @param modalParent parentwindow of the popup window
 	 * @param permissionMap the permissions of the lecture
 	 * @param defaultPermissions default permissions of the lecture
 	 * @return PermissionDefaultToCustomLink with new permissions of null, if abort button has been used
 	 */
 
-	public static PermissionDefaultToCustomLink<LecturePermissions> open(Window modalParent, Map<String, LecturePermissions> permissionMap, LecturePermissions defaultPermissions) {
+	public static PermissionDefaultToCustomLink<LecturePermissions> open(
+			Window modalParent, Map<String, LecturePermissions> permissionMap, LecturePermissions defaultPermissions) {
 		return new LectureCustomPermissionWindow(modalParent, permissionMap, defaultPermissions).runAndReturn();
 	}
+
+	@Override
+	public boolean wantConfirmQuit() {
+		// TODO only return true if user added something new in the list
+		return false;
+	}
+
+	@Override
+	public void escapePressed() {
+		dispose();
+	}
 }
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 b2e8d0e9..d4b11857 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
@@ -19,6 +19,7 @@ import javax.swing.event.DocumentListener;
 import org.apache.log4j.Logger;
 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;
@@ -26,7 +27,7 @@ import org.openslx.util.QuickTimer;
 import org.openslx.util.QuickTimer.Task;
 
 @SuppressWarnings("serial")
-public class UserListWindow extends UserListWindowLayout {
+public class UserListWindow extends UserListWindowLayout implements UiFeedback {
 
 	private final static Logger LOGGER = Logger.getLogger(UserListWindow.class);
 
@@ -123,4 +124,14 @@ public class UserListWindow extends UserListWindowLayout {
 	public static void open(Window modalParent, UserAddedCallback callback, String actionCaption) {
 		new UserListWindow(modalParent, callback, actionCaption).setVisible(true);
 	}
+
+	@Override
+	public boolean wantConfirmQuit() {
+		return false;
+	}
+
+	@Override
+	public void escapePressed() {
+		dispose();
+	}
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java
index 5e736426..fb56eda0 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java
@@ -86,7 +86,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 	}
 
 	public LectureDetailsWindowLayout(Frame modalParent) {
-		super(modalParent, "der mit dem blub", ModalityType.APPLICATION_MODAL);
+		super(modalParent, "Veranstaltungsdetails", ModalityType.APPLICATION_MODAL);
 		setResizable(true);
 		setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
 		setLayout(new BorderLayout());
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java
index 673e2387..fe8da98b 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java
@@ -39,8 +39,8 @@ public class LectureWizard extends Wizard implements UiFeedback {
 		super(parent);
 
 		if (image != null && imageVersionId != null) {
-			this.state.image = image;
-			this.state.imageVersionId = imageVersionId;
+			state.image = image;
+			state.imageVersionId = imageVersionId;
 		}
 
 		// create the shared object for all pages of the wizard