5 files changed, 14 insertions, 14 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 d48aa652..5c86c9c4 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
@@ -9,7 +9,7 @@ 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;
+import org.openslx.dozmod.permissions.DefaultCustomPerms;
 
 /**
  * Window for modifying the custom permissions of an image.  
@@ -68,10 +68,10 @@ public class ImageCustomPermissionWindow extends ImageCustomPermissionWindowLayo
 	 * Set a created ImageCustomPermissionWindow visible and return resulting permissions
 	 * @return PermissionDefaultToCustomLink with default- and customPermissions when using OK button, null otherwise
 	 */
-	private PermissionDefaultToCustomLink<ImagePermissions> runAndReturn(){
+	private DefaultCustomPerms<ImagePermissions> runAndReturn(){
 		setVisible(true);
 		if (okUsed){
-			return new PermissionDefaultToCustomLink<ImagePermissions>(
+			return new DefaultCustomPerms<ImagePermissions>(
 					imagePermissionManager.getMap(),
 					new ImagePermissions(chkCustomPermLink.isSelected(),
 							chkCustomPermDownload.isSelected(),
@@ -90,7 +90,7 @@ public class ImageCustomPermissionWindow extends ImageCustomPermissionWindowLayo
 	 * @param ownerId The id of the user to exclude when adding users. Can be null.
 	 * @return PermissionDefaultToCustomLink with resulting permissions or null, if abort has been used to exit the dialog
 	 */
-	public static PermissionDefaultToCustomLink<ImagePermissions> open(Window modalParent, Map<String, ImagePermissions> permissionMap, ImagePermissions defaultPermissions, String ownerId) {
+	public static DefaultCustomPerms<ImagePermissions> open(Window modalParent, Map<String, ImagePermissions> permissionMap, ImagePermissions defaultPermissions, String ownerId) {
 		return new ImageCustomPermissionWindow(modalParent, permissionMap, defaultPermissions, ownerId).runAndReturn();
 	}
 
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 7b42c14a..c767b510 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
@@ -41,7 +41,7 @@ import org.openslx.dozmod.gui.window.layout.ImageDetailsWindowLayout;
 import org.openslx.dozmod.gui.wizard.ImageUpdateWizard;
 import org.openslx.dozmod.gui.wizard.LectureWizard;
 import org.openslx.dozmod.permissions.ImagePerms;
-import org.openslx.dozmod.permissions.PermissionDefaultToCustomLink;
+import org.openslx.dozmod.permissions.DefaultCustomPerms;
 import org.openslx.dozmod.thrift.Session;
 import org.openslx.dozmod.thrift.ThriftActions;
 import org.openslx.dozmod.thrift.ThriftActions.DeleteCallback;
@@ -156,7 +156,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 		btnPermissions.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent arg0) {
-				PermissionDefaultToCustomLink<ImagePermissions> pl = ImageCustomPermissionWindow.open(me,
+				DefaultCustomPerms<ImagePermissions> pl = ImageCustomPermissionWindow.open(me,
 						me.permissionMap, image.defaultPermissions, image.ownerId);
 				if (pl != null && pl.defaultPermissions != null && pl.customPermissions != null) {
 					image.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/LectureCustomPermissionWindow.java
index f18c9668..5c6cb6b0 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
@@ -9,7 +9,7 @@ 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;
+import org.openslx.dozmod.permissions.DefaultCustomPerms;
 
 /**
  * Window for modifying the custom permissions of an lecture.  
@@ -69,10 +69,10 @@ public class LectureCustomPermissionWindow extends LectureCustomPermissionWindow
 	 * 
 	 * @return PermissionDefaultToCustomLink with default- and customPermissions when using OK button, null otherwise
 	 */
-	private PermissionDefaultToCustomLink<LecturePermissions> runAndReturn(){
+	private DefaultCustomPerms<LecturePermissions> runAndReturn(){
 		setVisible(true);
 		if (okUsed){
-			return new PermissionDefaultToCustomLink<LecturePermissions>(lecturePermissionManager.getMap(), new LecturePermissions(chkCustomPermEdit.isSelected(), chkCustomPermAdmin.isSelected()));
+			return new DefaultCustomPerms<LecturePermissions>(lecturePermissionManager.getMap(), new LecturePermissions(chkCustomPermEdit.isSelected(), chkCustomPermAdmin.isSelected()));
 		} else {
 			return null;
 		}
@@ -89,7 +89,7 @@ public class LectureCustomPermissionWindow extends LectureCustomPermissionWindow
 	 * @return PermissionDefaultToCustomLink with new permissions of null, if abort button has been used
 	 */
 
-	public static PermissionDefaultToCustomLink<LecturePermissions> open(
+	public static DefaultCustomPerms<LecturePermissions> open(
 			Window modalParent, Map<String, LecturePermissions> permissionMap, LecturePermissions defaultPermissions, String ownerId) {
 		return new LectureCustomPermissionWindow(modalParent, permissionMap, defaultPermissions, ownerId).runAndReturn();
 	}
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 ac6c9a1e..33b44733 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
@@ -43,7 +43,7 @@ import org.openslx.dozmod.gui.window.UserListWindow.UserAddedCallback;
 import org.openslx.dozmod.gui.window.layout.LectureDetailsWindowLayout;
 import org.openslx.dozmod.permissions.ImagePerms;
 import org.openslx.dozmod.permissions.LecturePerms;
-import org.openslx.dozmod.permissions.PermissionDefaultToCustomLink;
+import org.openslx.dozmod.permissions.DefaultCustomPerms;
 import org.openslx.dozmod.thrift.Session;
 import org.openslx.dozmod.thrift.ThriftActions;
 import org.openslx.dozmod.thrift.ThriftActions.DownloadCallback;
@@ -190,7 +190,7 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 			public void actionPerformed(ActionEvent arg0) {
 				LOGGER.info(permissionMap);
 				LOGGER.info(lecture.defaultPermissions);
-				PermissionDefaultToCustomLink<LecturePermissions> pl = LectureCustomPermissionWindow.open(me,
+				DefaultCustomPerms<LecturePermissions> pl = LectureCustomPermissionWindow.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/permissions/PermissionDefaultToCustomLink.java b/dozentenmodul/src/main/java/org/openslx/dozmod/permissions/DefaultCustomPerms.java
index 6a947cdd..bb05d182 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/permissions/PermissionDefaultToCustomLink.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/permissions/DefaultCustomPerms.java
@@ -6,11 +6,11 @@ import java.util.Map;
  * Helper class for returning the default- and custom permissions of an image or lecture.
  * @param <T> ImagePermissions of LecturePermissions
  */
-public class PermissionDefaultToCustomLink<T>{
+public class DefaultCustomPerms<T>{
 	public final Map<String, T> customPermissions;
 	public final T defaultPermissions;
 
-	public PermissionDefaultToCustomLink(Map<String, T> customPermissions, T defaultPermissions){
+	public DefaultCustomPerms(Map<String, T> customPermissions, T defaultPermissions){
 		this.customPermissions = customPermissions;
 		this.defaultPermissions = defaultPermissions;
 	}