[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.

2 files changed, 6 insertions, 6 deletions

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();