[client] fat refactor to reflect what the current state of the classes actually do

remove 'Custom' from windows in which we can also set default perms
TODO: wizards: DefPerms and CustomPerms still split in two pages, so let the "Custom" in the pages class' names as its still the case, but the question is: should it be like this? or do we put the defaults permissions checkboxes also on the last page?

8 files changed, 30 insertions, 29 deletions

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 c767b510..107f5687 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
@@ -156,11 +156,12 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 		btnPermissions.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent arg0) {
-				DefaultCustomPerms<ImagePermissions> pl = ImageCustomPermissionWindow.open(me,
+				DefaultCustomPerms<ImagePermissions> pl = ImagePermissionWindow.open(me,
 						me.permissionMap, image.defaultPermissions, image.ownerId);
 				if (pl != null && pl.defaultPermissions != null && pl.customPermissions != null) {
 					image.defaultPermissions = pl.defaultPermissions;
 					permissionMap = pl.customPermissions;
+					// TODO perms not changed for sure
 					permissionsChanged = true;
 				}
 				reactToChange();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageCustomPermissionWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePermissionWindow.java
index 5c86c9c4..0dd5d024 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageCustomPermissionWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePermissionWindow.java
@@ -8,20 +8,20 @@ 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.gui.window.layout.ImagePermissionWindowLayout;
 import org.openslx.dozmod.permissions.DefaultCustomPerms;
 
 /**
  * Window for modifying the custom permissions of an image.  
  */
 @SuppressWarnings("serial")
-public class ImageCustomPermissionWindow extends ImageCustomPermissionWindowLayout implements UiFeedback {
+public class ImagePermissionWindow extends ImagePermissionWindowLayout implements UiFeedback {
 
-	private static final Logger LOGGER = Logger.getLogger(ImageCustomPermissionWindow.class);
+	private static final Logger LOGGER = Logger.getLogger(ImagePermissionWindow.class);
 
 	private boolean okUsed = false;
 
-	protected ImageCustomPermissionWindow(final Window modalParent, final Map<String, ImagePermissions> permissionMap, final ImagePermissions defaultPermissions, String ownerId) {
+	protected ImagePermissionWindow(final Window modalParent, final Map<String, ImagePermissions> permissionMap, final ImagePermissions defaultPermissions, String ownerId) {
 		super(modalParent);
 		imagePermissionManager.initPanel(permissionMap, defaultPermissions, ownerId);
 
@@ -91,7 +91,7 @@ public class ImageCustomPermissionWindow extends ImageCustomPermissionWindowLayo
 	 * @return PermissionDefaultToCustomLink with resulting permissions or null, if abort has been used to exit the dialog
 	 */
 	public static DefaultCustomPerms<ImagePermissions> open(Window modalParent, Map<String, ImagePermissions> permissionMap, ImagePermissions defaultPermissions, String ownerId) {
-		return new ImageCustomPermissionWindow(modalParent, permissionMap, defaultPermissions, ownerId).runAndReturn();
+		return new ImagePermissionWindow(modalParent, permissionMap, defaultPermissions, ownerId).runAndReturn();
 	}
 
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeLinkedImage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeImage.java
index 63fa107a..4ba21f86 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeLinkedImage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeImage.java
@@ -16,26 +16,26 @@ 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;
+import org.openslx.dozmod.gui.window.layout.LectureChangeImageLayout;
 import org.openslx.dozmod.permissions.ImagePerms;
 
 /**
  * Window for changing the linked image of a lecture
  */
 @SuppressWarnings("serial")
-public class LectureChangeLinkedImage extends LectureChangeLinkedImageLayout implements UiFeedback {
+public class LectureChangeImage extends LectureChangeImageLayout implements UiFeedback {
 
-	private static final Logger LOGGER = Logger.getLogger(LectureChangeLinkedImage.class);
+	private static final Logger LOGGER = Logger.getLogger(LectureChangeImage.class);
 
 	private boolean okUsed = false;
 	private ImageTable imageTable;
 
-	private LectureChangeLinkedImage me;
+	private LectureChangeImage me;
 
 	/**
 	 * Don't use this constructor, use static function open instead.
 	 */
-	protected LectureChangeLinkedImage(final Window modalParent) {
+	protected LectureChangeImage(final Window modalParent) {
 		super(modalParent);
 		me = this;
 
@@ -128,7 +128,7 @@ public class LectureChangeLinkedImage extends LectureChangeLinkedImageLayout imp
 	 * @return ImageSummaryRead of selected image or null, if abort has been used
 	 */
 	public static ImageSummaryRead open(Window modalParent) {
-		return new LectureChangeLinkedImage(modalParent).runAndReturn();
+		return new LectureChangeImage(modalParent).runAndReturn();
 	}
 
 	@Override
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
index 33b44733..c328e880 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
@@ -125,7 +125,7 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 		btnLinkImage.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				ImageSummaryRead newImage = LectureChangeLinkedImage.open(me);
+				ImageSummaryRead newImage = LectureChangeImage.open(me);
 				if (newImage != null) {
 					try {
 						image = ThriftManager.getSatClient().getImageDetails(Session.getSatelliteToken(),
@@ -190,7 +190,7 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 			public void actionPerformed(ActionEvent arg0) {
 				LOGGER.info(permissionMap);
 				LOGGER.info(lecture.defaultPermissions);
-				DefaultCustomPerms<LecturePermissions> pl = LectureCustomPermissionWindow.open(me,
+				DefaultCustomPerms<LecturePermissions> pl = LecturePermissionWindow.open(me,
 						permissionMap, lecture.defaultPermissions, lecture.ownerId);
 				if (pl != null && pl.defaultPermissions != null && pl.customPermissions != null) {
 					lecture.defaultPermissions = pl.defaultPermissions;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureCustomPermissionWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LecturePermissionWindow.java
index 5c6cb6b0..693e2907 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureCustomPermissionWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LecturePermissionWindow.java
@@ -8,23 +8,23 @@ 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.gui.window.layout.LecturePermissionWindowLayout;
 import org.openslx.dozmod.permissions.DefaultCustomPerms;
 
 /**
  * Window for modifying the custom permissions of an lecture.  
  */
 @SuppressWarnings("serial")
-public class LectureCustomPermissionWindow extends LectureCustomPermissionWindowLayout implements UiFeedback {
+public class LecturePermissionWindow extends LecturePermissionWindowLayout implements UiFeedback {
 
-	private static final Logger LOGGER = Logger.getLogger(LectureCustomPermissionWindow.class);
+	private static final Logger LOGGER = Logger.getLogger(LecturePermissionWindow.class);
 	
 	private boolean okUsed = false;
 
 	/**
 	 * Don't use this constructor, use static function LectureCustomPermissionWindow.open instead.
 	 */
-	protected LectureCustomPermissionWindow(final Window modalParent, final Map<String, LecturePermissions> permissionMap, final LecturePermissions defaultPermissions, String ownerId) {
+	protected LecturePermissionWindow(final Window modalParent, final Map<String, LecturePermissions> permissionMap, final LecturePermissions defaultPermissions, String ownerId) {
 		super(modalParent);
 
 		/**
@@ -91,7 +91,7 @@ public class LectureCustomPermissionWindow extends LectureCustomPermissionWindow
 
 	public static DefaultCustomPerms<LecturePermissions> open(
 			Window modalParent, Map<String, LecturePermissions> permissionMap, LecturePermissions defaultPermissions, String ownerId) {
-		return new LectureCustomPermissionWindow(modalParent, permissionMap, defaultPermissions, ownerId).runAndReturn();
+		return new LecturePermissionWindow(modalParent, permissionMap, defaultPermissions, ownerId).runAndReturn();
 	}
 
 	@Override
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageCustomPermissionWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePermissionWindowLayout.java
index 3b9ddbd2..8b7a1276 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageCustomPermissionWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePermissionWindowLayout.java
@@ -20,9 +20,9 @@ import org.openslx.dozmod.gui.helper.GridManager;
  * Window for editing permissions of an Image
  */
 @SuppressWarnings("serial")
-public class ImageCustomPermissionWindowLayout extends JDialog {
+public class ImagePermissionWindowLayout extends JDialog {
 
-	private static final Logger LOGGER = Logger.getLogger(ImageCustomPermissionWindowLayout.class);
+	private static final Logger LOGGER = Logger.getLogger(ImagePermissionWindowLayout.class);
 
 
 	protected final JCheckBox chkCustomPermAdmin;
@@ -35,9 +35,9 @@ public class ImageCustomPermissionWindowLayout extends JDialog {
 
 	protected final ImageCustomPermissionManager imagePermissionManager;
 
-	private static String title = "Benutzerdefinierte Berechtigungen";
+	private static String title = "Berechtigungen";
 
-	protected ImageCustomPermissionWindowLayout(Window modalParent) {
+	protected ImagePermissionWindowLayout(Window modalParent) {
 		super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL
 				: ModalityType.MODELESS);
 		this.setTitle(title);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeLinkedImageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeImageLayout.java
index fc8539cf..9f3d2e03 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeLinkedImageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeImageLayout.java
@@ -20,9 +20,9 @@ import org.openslx.dozmod.gui.helper.GridManager;
  * Layout for the ChangeLinkedImage of a lecture
  */
 @SuppressWarnings("serial")
-public class LectureChangeLinkedImageLayout extends JDialog {
+public class LectureChangeImageLayout extends JDialog {
 
-	private static final Logger LOGGER = Logger.getLogger(LectureChangeLinkedImageLayout.class);
+	private static final Logger LOGGER = Logger.getLogger(LectureChangeImageLayout.class);
 
 	/**
 	 * Buttons
@@ -41,7 +41,7 @@ public class LectureChangeLinkedImageLayout extends JDialog {
 	 */
 	private static String title = "Image zum verlinken auswählen";
 
-	protected LectureChangeLinkedImageLayout(Window modalParent) {
+	protected LectureChangeImageLayout(Window modalParent) {
 		super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL
 				: ModalityType.MODELESS);
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureCustomPermissionWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LecturePermissionWindowLayout.java
index d2a2eee8..83112be4 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureCustomPermissionWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LecturePermissionWindowLayout.java
@@ -20,9 +20,9 @@ import org.openslx.dozmod.gui.helper.GridManager;
  * Layout for the LectureCustomPermissionWindow
  */
 @SuppressWarnings("serial")
-public class LectureCustomPermissionWindowLayout extends JDialog {
+public class LecturePermissionWindowLayout extends JDialog {
 
-	private static final Logger LOGGER = Logger.getLogger(LectureCustomPermissionWindowLayout.class);
+	private static final Logger LOGGER = Logger.getLogger(LecturePermissionWindowLayout.class);
 
 	/**
 	 * Buttons
@@ -42,7 +42,7 @@ public class LectureCustomPermissionWindowLayout extends JDialog {
 	 */
 	private static String title = "Benutzerdefinierte Berechtigungen";
 
-	protected LectureCustomPermissionWindowLayout(Window modalParent) {
+	protected LecturePermissionWindowLayout(Window modalParent) {
 		super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL
 				: ModalityType.MODELESS);