[client] Sanitize class/var names, split up control package

All configurators have moved from *.control to *.configurator
*.control should be used for simple controls that feel like
they're really just one thing. The configurators are more like
a group of controls.

28 files changed, 102 insertions, 297 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/Config.java b/dozentenmodul/src/main/java/org/openslx/dozmod/Config.java
index efa59fe2..b1e771b4 100755
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/Config.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/Config.java
@@ -11,7 +11,7 @@ import java.util.Properties;
 import org.apache.log4j.Logger;
 import org.openslx.dozmod.gui.window.DisclaimerWindow;
 import org.openslx.dozmod.gui.window.PrivacyNoticeWindow;
-import org.openslx.dozmod.util.OSHelper;
+import org.openslx.dozmod.util.OsHelper;
 import org.openslx.util.QuickTimer;
 import org.openslx.util.QuickTimer.Task;
 import org.openslx.util.Util;
@@ -71,7 +71,7 @@ public class Config {
 		// Determine OS
 		String osName = System.getProperty("os.name").toLowerCase();
 		LOGGER.info("Machine's OS: " + osName);
-		if (OSHelper.isWindows()) {
+		if (OsHelper.isWindows()) {
 			// Windows machine. Use the environment variable 'APPDATA' which
 			// should point to a path similar to:
 			//		C:\Users\<user>\AppData\Roaming
@@ -83,7 +83,7 @@ public class Config {
 				LOGGER.warn("APPDATA is empty.");
 				configPath = System.getProperty("user.home") + "\\AppData\\Roaming";
 			}
-		} else if (OSHelper.isLinux()) {
+		} else if (OsHelper.isLinux()) {
 			configPath = System.getProperty("user.home") + "/.config";
 		}
 		if (configPath == null || configPath.isEmpty()) {
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/Gui.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/Gui.java
index bf6cf060..6d17022d 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/Gui.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/Gui.java
@@ -32,7 +32,7 @@ import javax.swing.text.html.HTMLDocument;
 import org.apache.log4j.Logger;
 import org.openslx.dozmod.Config;
 import org.openslx.dozmod.gui.helper.MessageType;
-import org.openslx.dozmod.util.OpenLinks;
+import org.openslx.dozmod.util.DesktopEnvironment;
 import org.openslx.util.QuickTimer;
 import org.openslx.util.ResourceLoader;
 
@@ -336,7 +336,7 @@ public class Gui {
 				public void hyperlinkUpdate(HyperlinkEvent e) {
 					if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) {
 						try {
-							OpenLinks.openWebpageUri(e.getURL().toURI());
+							DesktopEnvironment.openWebpageUri(e.getURL().toURI());
 						} catch (URISyntaxException ex) {
 							LOGGER.error("Couldn't parse hyperlink", ex);
 						}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
index ca188fc7..051def34 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
@@ -65,8 +65,8 @@ import org.openslx.dozmod.thrift.Session;
 import org.openslx.dozmod.thrift.ThriftActions;
 import org.openslx.dozmod.util.ClientVersion;
 import org.openslx.dozmod.util.FormatHelper;
-import org.openslx.dozmod.util.OpenLinks;
-import org.openslx.dozmod.util.OpenLinks.Link;
+import org.openslx.dozmod.util.DesktopEnvironment;
+import org.openslx.dozmod.util.DesktopEnvironment.Link;
 import org.openslx.thrifthelper.ThriftManager;
 import org.openslx.util.QuickTimer;
 import org.openslx.util.QuickTimer.Task;
@@ -477,7 +477,7 @@ public abstract class MainWindow {
 		logDirItem.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				OpenLinks.openLocal(new File(Config.getPath()));
+				DesktopEnvironment.openLocal(new File(Config.getPath()));
 			}
 		});
 		logoutItem.addActionListener(new ActionListener() {
@@ -520,7 +520,7 @@ public abstract class MainWindow {
 		wikiItem.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				OpenLinks.openWebpage(Link.FAQ);
+				DesktopEnvironment.openWebpage(Link.FAQ);
 			}
 		});
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/DownloadPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/DownloadPanel.java
index cfa64221..adf1554d 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/DownloadPanel.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/DownloadPanel.java
@@ -10,7 +10,7 @@ import org.openslx.dozmod.filetransfer.DownloadTask;
 import org.openslx.dozmod.filetransfer.TransferEvent;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.helper.MessageType;
-import org.openslx.dozmod.util.OpenLinks;
+import org.openslx.dozmod.util.DesktopEnvironment;
 
 @SuppressWarnings("serial")
 public class DownloadPanel extends TransferPanel implements ActionListener {
@@ -44,7 +44,7 @@ public class DownloadPanel extends TransferPanel implements ActionListener {
 			download.removeListener(panel);
 			close();
 		} else if (e.getSource() == btnOpenFolder) {
-			OpenLinks.openLocal(download.getFile().getAbsoluteFile().getParentFile());
+			DesktopEnvironment.openLocal(download.getFile().getAbsoluteFile().getParentFile());
 		}
 	}
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UpdatePanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UpdatePanel.java
index 3e6ca7ff..46290a83 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UpdatePanel.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UpdatePanel.java
@@ -12,8 +12,8 @@ import javax.swing.SwingUtilities;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.control.QLabel;
 import org.openslx.dozmod.gui.window.CheckUpdateWindow;
-import org.openslx.dozmod.util.OpenLinks;
-import org.openslx.dozmod.util.OpenLinks.Link;
+import org.openslx.dozmod.util.DesktopEnvironment;
+import org.openslx.dozmod.util.DesktopEnvironment.Link;
 
 public class UpdatePanel extends ActivityPanel implements ActionListener {
 
@@ -61,7 +61,7 @@ public class UpdatePanel extends ActivityPanel implements ActionListener {
 	@Override
 	public void actionPerformed(ActionEvent e) {
 		if (e.getSource() == btnLink) {
-			OpenLinks.openWebpage(Link.DOZMOD);
+			DesktopEnvironment.openWebpage(Link.DOZMOD);
 			close();
 		}
 		if (e.getSource() == btnClose) {
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/changemonitor/DialogChangeMonitor.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/changemonitor/DialogChangeMonitor.java
index a1d01eaf..7b2c879c 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/changemonitor/DialogChangeMonitor.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/changemonitor/DialogChangeMonitor.java
@@ -16,9 +16,9 @@ import javax.swing.tree.TreePath;
 import org.apache.log4j.Logger;
 import org.jdatepicker.JDatePicker;
 import org.openslx.bwlp.thrift.iface.LecturePermissions;
+import org.openslx.dozmod.gui.configurator.LecturePermissionConfigurator;
 import org.openslx.dozmod.gui.control.ComboBox;
 import org.openslx.dozmod.gui.control.JCheckBoxTree;
-import org.openslx.dozmod.gui.control.LectureCustomPermissionManager;
 import org.openslx.util.Util;
 
 public class DialogChangeMonitor {
@@ -82,7 +82,7 @@ public class DialogChangeMonitor {
 		return add(new TimeSpinnerWrapper(this, spinner));
 	}
 
-	public AbstractControlWrapper<Map<String, LecturePermissions>> add(LectureCustomPermissionManager manager) {
+	public AbstractControlWrapper<Map<String, LecturePermissions>> add(LecturePermissionConfigurator manager) {
 		return add(new LecturePermissionManagerWrapper(this, manager));
 	}
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/changemonitor/LecturePermissionManagerWrapper.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/changemonitor/LecturePermissionManagerWrapper.java
index a1f066a0..5f68c4f2 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/changemonitor/LecturePermissionManagerWrapper.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/changemonitor/LecturePermissionManagerWrapper.java
@@ -4,9 +4,9 @@ import java.util.Comparator;
 import java.util.Map;
 
 import org.openslx.bwlp.thrift.iface.LecturePermissions;
-import org.openslx.dozmod.gui.control.LectureCustomPermissionManager;
-import org.openslx.dozmod.gui.control.LectureCustomPermissionManager.UserChangeEvent;
-import org.openslx.dozmod.gui.control.LectureCustomPermissionManager.UserChangeEventListener;
+import org.openslx.dozmod.gui.configurator.LecturePermissionConfigurator;
+import org.openslx.dozmod.gui.configurator.LecturePermissionConfigurator.UserChangeEvent;
+import org.openslx.dozmod.gui.configurator.LecturePermissionConfigurator.UserChangeEventListener;
 import org.openslx.dozmod.util.MapHelper;
 
 class LecturePermissionManagerWrapper extends AbstractControlWrapper<Map<String, LecturePermissions>> {
@@ -20,9 +20,9 @@ class LecturePermissionManagerWrapper extends AbstractControlWrapper<Map<String,
 		}
 	};
 	
-	private final LectureCustomPermissionManager component;
+	private final LecturePermissionConfigurator component;
 
-	public LecturePermissionManagerWrapper(DialogChangeMonitor dcm, LectureCustomPermissionManager manager) {
+	public LecturePermissionManagerWrapper(DialogChangeMonitor dcm, LecturePermissionConfigurator manager) {
 		super(dcm, COMPARATOR);
 		this.component = manager;
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageCustomPermissionManager.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ImagePermissionConfigurator.java
index 8dadbd71..e20378f9 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageCustomPermissionManager.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ImagePermissionConfigurator.java
@@ -1,4 +1,4 @@
-package org.openslx.dozmod.gui.control;
+package org.openslx.dozmod.gui.configurator;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -38,14 +38,14 @@ import org.openslx.dozmod.util.FormatHelper;
  * customImagePermissions.
  */
 @SuppressWarnings("serial")
-public class ImageCustomPermissionManager extends JPanel {
+public class ImagePermissionConfigurator extends JPanel {
 
 	protected ImagePermissionTable permissionTable;
 
 	protected JButton btnAddUser;
 	protected JButton btnRemoveUser;
 
-	private ImageCustomPermissionManager me;
+	private ImagePermissionConfigurator me;
 
 	private String ownerId;
 
@@ -54,9 +54,9 @@ public class ImageCustomPermissionManager extends JPanel {
 
 	private ImagePermissions defaultPermissions;
 
-	private static final Logger LOGGER = Logger.getLogger(ImageCustomPermissionManager.class);
+	private static final Logger LOGGER = Logger.getLogger(ImagePermissionConfigurator.class);
 
-	public ImageCustomPermissionManager() {
+	public ImagePermissionConfigurator() {
 		super();
 		me = this;
 		GridManager grid = new GridManager(this, 1);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LdapFilterConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java
index b4e5a4a8..3727b50e 100755
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LdapFilterConfigurator.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java
@@ -1,4 +1,4 @@
-package org.openslx.dozmod.gui.control;
+package org.openslx.dozmod.gui.configurator;
 
 import java.awt.GridBagConstraints;
 import java.awt.Insets;
@@ -21,6 +21,8 @@ import org.apache.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.LdapFilter;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.changemonitor.DialogChangeMonitor;
+import org.openslx.dozmod.gui.control.QLabel;
+import org.openslx.dozmod.gui.control.WordWrapLabel;
 import org.openslx.dozmod.gui.control.table.LectureLdapFilterTable;
 import org.openslx.dozmod.gui.control.table.QScrollPane;
 import org.openslx.dozmod.gui.helper.GridManager;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LectureCustomPermissionManager.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LecturePermissionConfigurator.java
index b853f7e2..b99df3f2 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LectureCustomPermissionManager.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LecturePermissionConfigurator.java
@@ -1,4 +1,4 @@
-package org.openslx.dozmod.gui.control;
+package org.openslx.dozmod.gui.configurator;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -43,12 +43,12 @@ import org.openslx.dozmod.gui.window.UserListWindow.UserAddedCallback;
  *
  */
 @SuppressWarnings("serial")
-public class LectureCustomPermissionManager extends JPanel {
+public class LecturePermissionConfigurator extends JPanel {
 
 	/**
 	 * Self reference
 	 */
-	private LectureCustomPermissionManager me;
+	private LecturePermissionConfigurator me;
 
 	protected LecturePermissionTable permissionTable;
 
@@ -61,9 +61,9 @@ public class LectureCustomPermissionManager extends JPanel {
 
 	private String ownerId = null;
 
-	private static final Logger LOGGER = Logger.getLogger(LectureCustomPermissionManager.class);
+	private static final Logger LOGGER = Logger.getLogger(LecturePermissionConfigurator.class);
 
-	public LectureCustomPermissionManager() {
+	public LecturePermissionConfigurator() {
 		super();
 		me = this;
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/NetrulesConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetrulesConfigurator.java
index 036f3726..cb80fc3e 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/NetrulesConfigurator.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetrulesConfigurator.java
@@ -1,4 +1,4 @@
-package org.openslx.dozmod.gui.control;
+package org.openslx.dozmod.gui.configurator;
 
 import java.awt.Color;
 import java.awt.Insets;
@@ -30,6 +30,7 @@ import org.apache.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.NetDirection;
 import org.openslx.bwlp.thrift.iface.NetRule;
 import org.openslx.dozmod.gui.Gui;
+import org.openslx.dozmod.gui.control.WordWrapLabel;
 import org.openslx.dozmod.gui.helper.GridManager;
 import org.openslx.dozmod.gui.helper.MessageType;
 import org.openslx.dozmod.gui.helper.TextChangeListener;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/NetshareConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java
index d80ba8b3..6141992c 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/NetshareConfigurator.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java
@@ -1,4 +1,4 @@
-package org.openslx.dozmod.gui.control;
+package org.openslx.dozmod.gui.configurator;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -8,8 +8,6 @@ import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.ArrayList;
-import java.util.EventListener;
-import java.util.EventObject;
 import java.util.List;
 
 import javax.swing.BorderFactory;
@@ -22,10 +20,8 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JPasswordField;
 import javax.swing.JTextField;
-import javax.swing.event.EventListenerList;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
-import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 
 import org.apache.log4j.Logger;
@@ -33,6 +29,8 @@ import org.openslx.bwlp.thrift.iface.NetShare;
 import org.openslx.bwlp.thrift.iface.NetShareAuth;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.changemonitor.DialogChangeMonitor;
+import org.openslx.dozmod.gui.control.ComboBox;
+import org.openslx.dozmod.gui.control.QLabel;
 import org.openslx.dozmod.gui.control.ComboBox.ComboBoxRenderer;
 import org.openslx.dozmod.gui.control.table.NetshareTable;
 import org.openslx.dozmod.gui.control.table.QScrollPane;
@@ -47,7 +45,7 @@ public class NetshareConfigurator extends NetshareConfiguratorLayout {
 
 	private static final long serialVersionUID = -3336605759245603655L;
 	private final static Logger LOGGER = Logger.getLogger(NetshareConfigurator.class);
-	private List<NetShare> tblNetshareData = null;
+	private List<NetShare> shareList = null;
 
 	// mount points / win drive letters - ideally, we would check whether the image is linux or windows based
 	// and either show a drive selection list like this one, or a textfield for a user-defined mount point...
@@ -161,17 +159,17 @@ public class NetshareConfigurator extends NetshareConfiguratorLayout {
 				NetShare oldEntry = tblNetshare.getSelectedItem();
 				if (oldEntry != null) {
 					// editing existing one, delete it from the internal data
-					if (!tblNetshareData.remove(oldEntry)) {
+					if (!shareList.remove(oldEntry)) {
 						lblError.setText("Änderung fehlgeschlagen!");
 						LOGGER.debug("Failed to remove selected share for replacement: " + oldEntry);
 						return;
 					}
-					tblNetshare.setData(tblNetshareData, false);
+					tblNetshare.setData(shareList, false);
 				}
 				// either we delete the existing share from the data or we are
 				// creating a new one, either way add it to the list and update
 				// the table, if its not present already
-				if (tblNetshareData.contains(input)) {
+				if (shareList.contains(input)) {
 					lblError.setText("Existiert bereits!");
 					LOGGER.error("Network share already in the list, aborting.");
 					return;
@@ -189,8 +187,8 @@ public class NetshareConfigurator extends NetshareConfiguratorLayout {
 					}
 				}
 				lblError.setText(null);
-				tblNetshareData.add(input);
-				tblNetshare.setData(tblNetshareData, false);
+				shareList.add(input);
+				tblNetshare.setData(shareList, false);
 				clearInputFields();
 			}
 		});
@@ -204,14 +202,14 @@ public class NetshareConfigurator extends NetshareConfiguratorLayout {
 					return;
 				}
 				try {
-					if (!tblNetshareData.remove(selection)) {
+					if (!shareList.remove(selection)) {
 						// false if it was not found
 						LOGGER.error("Could not remove non-existant network share '" + selection.toString()
-								+ "' from the table data: " + tblNetshareData.toString());
+								+ "' from the table data: " + shareList.toString());
 						return;
 					}
 					// refresh table data
-					tblNetshare.getModel().setData(tblNetshareData);
+					tblNetshare.getModel().setData(shareList);
 				} catch (Exception ex) {
 					LOGGER.debug("Failed to remove " + selection.toString() + " from the table data.", ex);
 					return;
@@ -246,17 +244,17 @@ public class NetshareConfigurator extends NetshareConfiguratorLayout {
 		btnAdd.setText("Hinzufügen");
 	}
 	public List<NetShare> getState() {
-		return tblNetshareData;
+		return shareList;
 	}
 
 	public boolean setState(List<NetShare> data) {
 		if (data == null)
 			return false;
-		if (tblNetshareData == null) {
-			tblNetshareData = new ArrayList<>();
+		if (shareList == null) {
+			shareList = new ArrayList<>();
 		}
-		tblNetshareData = data;
-		tblNetshare.setData(tblNetshareData, false);
+		shareList = data;
+		tblNetshare.setData(shareList, false);
 		return true;
 	}
 	
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/RunscriptConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/RunscriptConfigurator.java
index 3378294c..52a686bb 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/RunscriptConfigurator.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/RunscriptConfigurator.java
@@ -1,4 +1,4 @@
-package org.openslx.dozmod.gui.control;
+package org.openslx.dozmod.gui.configurator;
 
 import java.awt.Color;
 import java.awt.Insets;
@@ -20,8 +20,11 @@ import javax.swing.JTextArea;
 import javax.swing.event.EventListenerList;
 
 import org.openslx.dozmod.gui.changemonitor.DialogChangeMonitor;
+import org.openslx.dozmod.gui.configurator.RunscriptConfigurator.RunscriptType;
+import org.openslx.dozmod.gui.control.ComboBox;
+import org.openslx.dozmod.gui.control.QLabel;
+import org.openslx.dozmod.gui.control.WordWrapLabel;
 import org.openslx.dozmod.gui.control.ComboBox.ComboBoxRenderer;
-import org.openslx.dozmod.gui.control.RunscriptConfigurator.RunscriptType;
 import org.openslx.dozmod.gui.helper.GridManager;
 import org.openslx.dozmod.gui.helper.TextChangeListener;
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/PersonLabel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/PersonLabel.java
index a0071824..7c53bf96 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/PersonLabel.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/PersonLabel.java
@@ -11,7 +11,7 @@ import javax.swing.UIManager;
 import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.dozmod.gui.helper.ColorUtil;
 import org.openslx.dozmod.util.FormatHelper;
-import org.openslx.dozmod.util.OpenLinks;
+import org.openslx.dozmod.util.DesktopEnvironment;
 
 /**
  * A label for displaying a {@link UserInfo} object. Supports a callback event
@@ -91,7 +91,7 @@ public class PersonLabel extends QLabel {
 		public void clicked(UserInfo user) {
 			if (user == null || user.eMail == null)
 				return;
-			OpenLinks.sendMail(user.eMail, null);
+			DesktopEnvironment.sendMail(user.eMail, null);
 		}
 	};
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/BwIDMLinkWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/BwIdmLinkWindow.java
index 951b9f0c..f97f0330 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/BwIDMLinkWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/BwIdmLinkWindow.java
@@ -21,13 +21,13 @@ import org.openslx.dozmod.authentication.ShibbolethEcp;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.helper.GridManager;
 import org.openslx.dozmod.gui.helper.UiFeedback;
-import org.openslx.dozmod.util.OpenLinks;
+import org.openslx.dozmod.util.DesktopEnvironment;
 
 /**
  * Class for showing window with button to open registration page in browser.
  */
 @SuppressWarnings("serial")
-public class BwIDMLinkWindow extends JDialog implements UiFeedback {
+public class BwIdmLinkWindow extends JDialog implements UiFeedback {
 	private static final String title = "Registrierung erforderlich";
 	private static final String infoText = "<html><body style='width:100%'>"
 			+ "Sie sind nicht bei bwLehrpool registriert. "
@@ -37,16 +37,16 @@ public class BwIDMLinkWindow extends JDialog implements UiFeedback {
 	protected JButton btnLink;
 	protected JButton OkButton;
 
-	private static final Logger LOGGER = Logger.getLogger(BwIDMLinkWindow.class);
+	private static final Logger LOGGER = Logger.getLogger(BwIdmLinkWindow.class);
 
 	/**
 	 * Don't use this, use static function open instead!
 	 */
-	public BwIDMLinkWindow(Frame modalParent) {
+	public BwIdmLinkWindow(Frame modalParent) {
 		super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL
 				: ModalityType.MODELESS);
 
-		final BwIDMLinkWindow me = this;
+		final BwIdmLinkWindow me = this;
 		setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 
 		// panel for the border.
@@ -67,7 +67,7 @@ public class BwIDMLinkWindow extends JDialog implements UiFeedback {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				try {
-					OpenLinks.openWebpageUri(ShibbolethEcp.getRegistrationUrl().toURI());
+					DesktopEnvironment.openWebpageUri(ShibbolethEcp.getRegistrationUrl().toURI());
 				} catch (URISyntaxException e1) {
 					LOGGER.error("Could not convert from url to uri: ", e1);
 				}
@@ -116,7 +116,7 @@ public class BwIDMLinkWindow extends JDialog implements UiFeedback {
 	 * @param modalParent the parent of the window.
 	 */
 	public static void open(Frame modalParent) {
-		new BwIDMLinkWindow(modalParent).setVisible(true);
+		new BwIdmLinkWindow(modalParent).setVisible(true);
 	}
 
 	@Override
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/CheckUpdateWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/CheckUpdateWindow.java
index 0a0f5883..b3c8ae05 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/CheckUpdateWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/CheckUpdateWindow.java
@@ -9,8 +9,8 @@ import org.openslx.dozmod.gui.helper.UiFeedback;
 import org.openslx.dozmod.gui.window.layout.CheckUpdateWindowLayout;
 import org.openslx.dozmod.util.ClientVersion;
 import org.openslx.dozmod.util.FormatHelper;
-import org.openslx.dozmod.util.OpenLinks;
-import org.openslx.dozmod.util.OpenLinks.Link;
+import org.openslx.dozmod.util.DesktopEnvironment;
+import org.openslx.dozmod.util.DesktopEnvironment.Link;
 
 @SuppressWarnings("serial")
 public class CheckUpdateWindow extends CheckUpdateWindowLayout implements UiFeedback, ActionListener {
@@ -35,7 +35,7 @@ public class CheckUpdateWindow extends CheckUpdateWindowLayout implements UiFeed
 	@Override
 	public void actionPerformed(ActionEvent e) {
 		if (e.getSource() == btnLink) {
-			OpenLinks.openWebpage(Link.DOZMOD);
+			DesktopEnvironment.openWebpage(Link.DOZMOD);
 		}
 		if (e.getSource() == btnClose) {
 			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 d198e897..15964e65 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
@@ -62,7 +62,7 @@ import org.openslx.dozmod.thrift.cache.MetaDataCache;
 import org.openslx.dozmod.thrift.cache.UserCache;
 import org.openslx.dozmod.util.FormatHelper;
 import org.openslx.dozmod.util.MapHelper;
-import org.openslx.dozmod.util.OpenLinks;
+import org.openslx.dozmod.util.DesktopEnvironment;
 import org.openslx.sat.thrift.version.Feature;
 import org.openslx.thrifthelper.TConst;
 import org.openslx.thrifthelper.ThriftManager;
@@ -524,7 +524,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 							"Upload der VM auf den Masterserver fehlgeschlagen."
 									+ " Prüfen Sie, ob Sie bei der Registrierung dem landesweiten VM-Austausch zugestimmt haben.\n"
 									+ " Sie können dies hier überprüfen:\n"
-									+ OpenLinks.Link.REGISTER_BWIDM.uri.toString() + "\n\n");
+									+ DesktopEnvironment.Link.REGISTER_BWIDM.uri.toString() + "\n\n");
 					return;
 				}
 				Gui.asyncExec(new Runnable() {
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LecturePermissionWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LecturePermissionWindow.java
deleted file mode 100644
index 332835f9..00000000
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LecturePermissionWindow.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.openslx.dozmod.gui.window;
-
-import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-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.LecturePermissionWindowLayout;
-
-/**
- * Window for modifying the custom permissions of an lecture.
- */
-@SuppressWarnings("serial")
-public class LecturePermissionWindow extends LecturePermissionWindowLayout implements UiFeedback {
-
-	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 LecturePermissionWindow(final Window modalParent,
-			final Map<String, LecturePermissions> permissionMap, final LecturePermissions defaultPermissions,
-			String ownerId) {
-		super(modalParent);
-
-		/**
-		 * initialise the lecturePermissionManager
-		 */
-		ctlPermissionManager.initPanel(permissionMap, defaultPermissions, ownerId);
-
-		chkCustomPermAdmin.setSelected(defaultPermissions.admin);
-		chkCustomPermEdit.setSelected(defaultPermissions.edit);
-
-		ActionListener updateDefaultPermissionListener = new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				ctlPermissionManager.updateDefaultPermissions(chkCustomPermAdmin.isSelected(),
-						chkCustomPermEdit.isSelected());
-			}
-		};
-
-		chkCustomPermAdmin.addActionListener(updateDefaultPermissionListener);
-		chkCustomPermEdit.addActionListener(updateDefaultPermissionListener);
-
-		/**
-		 * ActionListeners for the buttons.
-		 */
-		btnOk.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				okUsed = true;
-				dispose();
-			}
-		});
-		btnClose.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent arg0) {
-				dispose();
-			}
-		});
-	}
-
-	/**
-	 * Set a created ImageCustomPermissionWindow visible and return resulting
-	 * permissions
-	 * 
-	 * @return PermissionDefaultToCustomLink with default- and customPermissions
-	 *         when using OK button, null otherwise
-	 */
-	private void run() {
-		setVisible(true);
-		if (okUsed)
-			ctlPermissionManager.getPermissions();
-	}
-
-	/**
-	 * 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
-	 * @param ownerId Id not to be shown in the list to add new users. Can be
-	 *            null.
-	 * @return PermissionDefaultToCustomLink with new permissions of null, if
-	 *         abort button has been used
-	 */
-
-	public static void open(Window modalParent, Map<String, LecturePermissions> permissionMap,
-			LecturePermissions defaultPermissions, String ownerId) {
-		new LecturePermissionWindow(modalParent, permissionMap, defaultPermissions, ownerId).run();
-
-	}
-
-	@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/LoginWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
index 07b36328..87524764 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
@@ -42,8 +42,8 @@ import org.openslx.dozmod.thrift.Session;
 import org.openslx.dozmod.thrift.ThriftActions;
 import org.openslx.dozmod.thrift.ThriftError;
 import org.openslx.dozmod.thrift.cache.OrganizationCache;
-import org.openslx.dozmod.util.OpenLinks;
-import org.openslx.dozmod.util.OpenLinks.Link;
+import org.openslx.dozmod.util.DesktopEnvironment;
+import org.openslx.dozmod.util.DesktopEnvironment.Link;
 import org.openslx.util.QuickTimer;
 import org.openslx.util.QuickTimer.Task;
 
@@ -169,7 +169,7 @@ public class LoginWindow extends LoginWindowLayout {
 		btnOpenRegistration.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				OpenLinks.openWebpage(Link.REGISTER_BWIDM);
+				DesktopEnvironment.openWebpage(Link.REGISTER_BWIDM);
 			}
 		});
 
@@ -193,7 +193,7 @@ public class LoginWindow extends LoginWindowLayout {
 		btnLogDir.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				OpenLinks.openLocal(new File(Config.getPath()));
+				DesktopEnvironment.openLocal(new File(Config.getPath()));
 			}
 		});
 
@@ -359,7 +359,7 @@ public class LoginWindow extends LoginWindowLayout {
 					break;
 				case UNREGISTERED_ERROR:
 					LOGGER.error("User not registered!");
-					BwIDMLinkWindow.open((JFrame) SwingUtilities.getWindowAncestor(me));
+					BwIdmLinkWindow.open((JFrame) SwingUtilities.getWindowAncestor(me));
 					break;
 				case INVALID_URL_ERROR:
 					Gui.showMessageBox(me, "ECP Authenticator says: Invalid URL.", MessageType.ERROR, LOGGER,
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java
index 9f7258b0..8da88314 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java
@@ -12,8 +12,8 @@ import org.apache.log4j.Logger;
 import org.openslx.dozmod.Config;
 import org.openslx.dozmod.gui.helper.UiFeedback;
 import org.openslx.dozmod.gui.window.layout.VirtualizerNoticeWindowLayout;
-import org.openslx.dozmod.util.OpenLinks;
-import org.openslx.dozmod.util.OpenLinks.Link;
+import org.openslx.dozmod.util.DesktopEnvironment;
+import org.openslx.dozmod.util.DesktopEnvironment.Link;
 
 @SuppressWarnings("serial")
 public class VirtualizerNoticeWindow extends VirtualizerNoticeWindowLayout implements UiFeedback {
@@ -45,7 +45,7 @@ public class VirtualizerNoticeWindow extends VirtualizerNoticeWindowLayout imple
 		btnDownload.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				OpenLinks.openWebpage(Link.VMWARE);
+				DesktopEnvironment.openWebpage(Link.VMWARE);
 			}
 		});
 	}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePermissionWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePermissionWindowLayout.java
index 231dc4f7..6b9ea566 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePermissionWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePermissionWindowLayout.java
@@ -13,7 +13,7 @@ import javax.swing.JPanel;
 
 import org.apache.log4j.Logger;
 import org.openslx.dozmod.gui.Gui;
-import org.openslx.dozmod.gui.control.ImageCustomPermissionManager;
+import org.openslx.dozmod.gui.configurator.ImagePermissionConfigurator;
 import org.openslx.dozmod.gui.helper.GridManager;
 
 /**
@@ -32,7 +32,7 @@ public class ImagePermissionWindowLayout extends JDialog {
 	protected final JButton btnOk;
 	protected final JButton btnClose;
 
-	protected final ImageCustomPermissionManager imagePermissionManager;
+	protected final ImagePermissionConfigurator imagePermissionManager;
 
 	private static String title = "Berechtigungen";
 	private static String infoTextDefPerms = "<html><body style='width:100%'>"
@@ -48,7 +48,7 @@ public class ImagePermissionWindowLayout extends JDialog {
 		contentPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
 		add(contentPanel);
 
-		imagePermissionManager = new ImageCustomPermissionManager();
+		imagePermissionManager = new ImagePermissionConfigurator();
 
 		// Panel for the buttons at the bottom
 		JPanel buttonPane = new JPanel();
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 f0e03375..1508d95e 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
@@ -28,16 +28,16 @@ import javax.swing.text.DateFormatter;
 import org.jdatepicker.JDatePicker;
 import org.openslx.bwlp.thrift.iface.ImageVersionDetails;
 import org.openslx.dozmod.gui.Gui;
+import org.openslx.dozmod.gui.configurator.LdapFilterConfigurator;
+import org.openslx.dozmod.gui.configurator.LecturePermissionConfigurator;
+import org.openslx.dozmod.gui.configurator.NetshareConfigurator;
+import org.openslx.dozmod.gui.configurator.RunscriptConfigurator;
 import org.openslx.dozmod.gui.control.ComboBox;
 import org.openslx.dozmod.gui.control.ComboBox.ComboBoxRenderer;
-import org.openslx.dozmod.gui.control.LdapFilterConfigurator;
-import org.openslx.dozmod.gui.control.LectureCustomPermissionManager;
 import org.openslx.dozmod.gui.control.LocationSelector;
-import org.openslx.dozmod.gui.control.NetshareConfigurator;
 import org.openslx.dozmod.gui.control.PersonLabel;
 import org.openslx.dozmod.gui.control.QDatePickerImpl;
 import org.openslx.dozmod.gui.control.QLabel;
-import org.openslx.dozmod.gui.control.RunscriptConfigurator;
 import org.openslx.dozmod.gui.control.WordWrapLabel;
 import org.openslx.dozmod.gui.helper.GridManager;
 import org.openslx.dozmod.thrift.Session;
@@ -88,7 +88,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 	protected final JSpinner spnEndTime;
 
 	protected JTabbedPane pnlTabs;
-	protected final LectureCustomPermissionManager ctlPermissionManager;
+	protected final LecturePermissionConfigurator ctlPermissionManager;
 	protected final LocationSelector ctlLocationSelector;
 	protected final RunscriptConfigurator ctlRunscriptConfigurator;
 	protected final NetshareConfigurator ctlNetshareConfigurator;
@@ -330,7 +330,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 		 *                        		Tab "Permissions"
 		 *
 		 ********************************************************************************/
-		ctlPermissionManager = new LectureCustomPermissionManager();
+		ctlPermissionManager = new LecturePermissionConfigurator();
 		pnlTabPermissions = new JPanel();
 		GridManager grdPermissions = new GridManager(pnlTabPermissions, 1, false);
 		JPanel defaultPermissionPane = new JPanel();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureNetrulesWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureNetrulesWindowLayout.java
index ce4067ce..d6f13d8f 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureNetrulesWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureNetrulesWindowLayout.java
@@ -17,7 +17,7 @@ import javax.swing.event.ChangeListener;
 import org.openslx.bwlp.thrift.iface.NetRule;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.changemonitor.ListEditorWindow;
-import org.openslx.dozmod.gui.control.NetrulesConfigurator;
+import org.openslx.dozmod.gui.configurator.NetrulesConfigurator;
 
 public abstract class LectureNetrulesWindowLayout extends JDialog implements ListEditorWindow<NetRule> {
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LecturePermissionWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LecturePermissionWindowLayout.java
deleted file mode 100644
index 1408242d..00000000
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LecturePermissionWindowLayout.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.openslx.dozmod.gui.window.layout;
-
-import java.awt.Window;
-
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JDialog;
-import javax.swing.JPanel;
-
-import org.apache.log4j.Logger;
-import org.openslx.dozmod.gui.Gui;
-import org.openslx.dozmod.gui.control.LectureCustomPermissionManager;
-import org.openslx.dozmod.gui.helper.GridManager;
-
-/**
- * Layout for the LectureCustomPermissionWindow
- */
-@SuppressWarnings("serial")
-public class LecturePermissionWindowLayout extends JDialog {
-
-	private static final Logger LOGGER = Logger.getLogger(LecturePermissionWindowLayout.class);
-
-	/**
-	 * Buttons
-	 */
-	protected final JButton btnOk;
-	protected final JButton btnClose;
-	protected final JCheckBox chkCustomPermAdmin;
-	protected final JCheckBox chkCustomPermEdit;
-
-	/**
-	 * The lecturePermissionManager to use.
-	 */
-	protected final LectureCustomPermissionManager ctlPermissionManager;
-
-	/**
-	 * The title of the window.
-	 */
-	private static String title = "Benutzerdefinierte Berechtigungen";
-
-	protected LecturePermissionWindowLayout(Window modalParent) {
-		super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL
-				: ModalityType.MODELESS);
-
-		// Panel to add everything into, needed for the border.
-		JPanel contentPanel = new JPanel();
-		contentPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-		add(contentPanel);
-
-		GridManager grid = new GridManager(contentPanel, 1);
-
-		// create the lecturePermissionManager and add it to the pane.
-		ctlPermissionManager = new LectureCustomPermissionManager();
-
-		// Panel with the default permissions
-		JPanel defaultPermissionPane = new JPanel();
-		defaultPermissionPane.setBorder(BorderFactory.createTitledBorder("Andere Nutzer"));
-		chkCustomPermEdit = new JCheckBox("Bearbeiten");
-		chkCustomPermAdmin = new JCheckBox("Admin");
-		defaultPermissionPane.add(chkCustomPermEdit);
-		defaultPermissionPane.add(chkCustomPermAdmin);
-
-		// Panel for the buttons at the bottom
-		JPanel buttonPane = new JPanel();
-		buttonPane.setLayout(new BoxLayout(buttonPane, BoxLayout.LINE_AXIS));
-		buttonPane.add(Box.createGlue());
-		btnClose = new JButton("Abbrechen");
-		buttonPane.add(btnClose);
-		btnOk = new JButton("Übernehmen");
-		buttonPane.add(btnOk);
-
-		// Put everything into the grid
-		grid.add(ctlPermissionManager).fill(true, true).expand(true, true);
-		grid.nextRow();
-		grid.add(defaultPermissionPane).fill(true, false).expand(true, false);
-		grid.nextRow();
-		grid.add(buttonPane).fill(true, false).expand(false, false);
-		grid.nextRow();
-		grid.finish(false);
-
-		contentPanel.setPreferredSize(Gui.getScaledDimension(480, 350));
-
-		pack();
-		setLocationRelativeTo(modalParent);
-	}
-}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java
index 1d209775..e833090b 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java
@@ -8,7 +8,7 @@ import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
-import org.openslx.dozmod.gui.control.ImageCustomPermissionManager;
+import org.openslx.dozmod.gui.configurator.ImagePermissionConfigurator;
 import org.openslx.dozmod.gui.helper.GridManager;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.WizardPage;
@@ -16,7 +16,7 @@ import org.openslx.dozmod.gui.wizard.WizardPage;
 @SuppressWarnings("serial")
 public class ImageCustomPermissionPageLayout extends WizardPage {
 
-	protected ImageCustomPermissionManager imageCustomPermissionManager;
+	protected ImagePermissionConfigurator imageCustomPermissionManager;
 
 	// permissions checks
 	protected final JCheckBox chkPermissionRead;
@@ -35,7 +35,7 @@ public class ImageCustomPermissionPageLayout extends WizardPage {
 		GridManager grid = new GridManager(this, 1, false);
 
 		// custom permissions
-		imageCustomPermissionManager = new ImageCustomPermissionManager();
+		imageCustomPermissionManager = new ImagePermissionConfigurator();
 		grid.add(imageCustomPermissionManager).fill(true, true).expand(true, true);
 		grid.nextRow();
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCustomPermissionPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCustomPermissionPageLayout.java
index 849f4a6a..64afc4df 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCustomPermissionPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCustomPermissionPageLayout.java
@@ -8,7 +8,7 @@ import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
-import org.openslx.dozmod.gui.control.LectureCustomPermissionManager;
+import org.openslx.dozmod.gui.configurator.LecturePermissionConfigurator;
 import org.openslx.dozmod.gui.helper.GridManager;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.WizardPage;
@@ -16,7 +16,7 @@ import org.openslx.dozmod.gui.wizard.WizardPage;
 @SuppressWarnings("serial")
 public abstract class LectureCustomPermissionPageLayout extends WizardPage {
 
-	protected LectureCustomPermissionManager lectureCustomPermissionManager;
+	protected LecturePermissionConfigurator lectureCustomPermissionManager;
 
 	// permissions checks
 	protected final JCheckBox chkPermissionEdit;
@@ -30,7 +30,7 @@ public abstract class LectureCustomPermissionPageLayout extends WizardPage {
 		setDescription("Legen Sie hier die gewünschten Berechtigungen fest.");
 		GridManager grid = new GridManager(this, 1, false);
 
-		lectureCustomPermissionManager = new LectureCustomPermissionManager();
+		lectureCustomPermissionManager = new LecturePermissionConfigurator();
 		grid.add(lectureCustomPermissionManager).fill(true, true).expand(true, true);
 		grid.nextRow();
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/OpenLinks.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/DesktopEnvironment.java
index dc34922b..44925b4a 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/OpenLinks.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/DesktopEnvironment.java
@@ -8,12 +8,12 @@ import java.net.URLEncoder;
 
 import org.apache.log4j.Logger;
 
-public class OpenLinks {
+public class DesktopEnvironment {
 
 	/**
 	 * Logger instance for this class
 	 */
-	private final static Logger LOGGER = Logger.getLogger(OpenLinks.class);
+	private final static Logger LOGGER = Logger.getLogger(DesktopEnvironment.class);
 
 	private static final Desktop desktop = Desktop.isDesktopSupported() ? Desktop.getDesktop() : null;
 
@@ -101,12 +101,12 @@ public class OpenLinks {
 	 */
 	public static boolean fallbackExec(String link) {
 		String[] execCommand;
-		if (OSHelper.isLinux()) {
+		if (OsHelper.isLinux()) {
 			execCommand = new String[] { "xdg-open", link };
-		} else if (OSHelper.isWindows()) {
+		} else if (OsHelper.isWindows()) {
 			execCommand = new String[] { "cmd.exe", "/c", "start", link };
 		} else {
-			LOGGER.error("Could not set command for unknown operating system: " + OSHelper.osName);
+			LOGGER.error("Could not set command for unknown operating system: " + OsHelper.osName);
 			return false;
 		}
 		int exitCode = -1;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/OSHelper.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/OsHelper.java
index a3860dfa..e844d0c6 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/OSHelper.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/OsHelper.java
@@ -1,6 +1,6 @@
 package org.openslx.dozmod.util;
 
-public final class OSHelper {
+public final class OsHelper {
 
 	public final static String osName = System.getProperty("os.name").toLowerCase();