[client] Sanitize coding style/conventions in GUI classes

19 files changed, 170 insertions, 173 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 659d7919..1d209775 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
@@ -19,10 +19,10 @@ public class ImageCustomPermissionPageLayout extends WizardPage {
 	protected ImageCustomPermissionManager imageCustomPermissionManager;
 
 	// permissions checks
-	protected JCheckBox readPermissionsCheck;
-	protected JCheckBox writePermissionsCheck;
-	protected JCheckBox linkPermissionsCheck;
-	protected JCheckBox adminPermissionsCheck;
+	protected final JCheckBox chkPermissionRead;
+	protected final JCheckBox chkPermissionEdit;
+	protected final JCheckBox chkPermissionLink;
+	protected final JCheckBox chkPermissionAdmin;
 
 	/**
 	 * wizard page for setting custom permissions
@@ -53,16 +53,16 @@ public class ImageCustomPermissionPageLayout extends WizardPage {
 
 		JPanel permissionsPanel = new JPanel();
 		permissionsPanel.setLayout(new BoxLayout(permissionsPanel, BoxLayout.LINE_AXIS));
-		linkPermissionsCheck = new JCheckBox("Verlinken");
-		linkPermissionsCheck.setSelected(true);
-		readPermissionsCheck = new JCheckBox("Download");
-		readPermissionsCheck.setSelected(true);
-		writePermissionsCheck = new JCheckBox("Bearbeiten");
-		adminPermissionsCheck = new JCheckBox("Admin");
-		permissionsPanel.add(linkPermissionsCheck);
-		permissionsPanel.add(readPermissionsCheck);
-		permissionsPanel.add(writePermissionsCheck);
-		permissionsPanel.add(adminPermissionsCheck);
+		chkPermissionLink = new JCheckBox("Verlinken");
+		chkPermissionLink.setSelected(true);
+		chkPermissionRead = new JCheckBox("Download");
+		chkPermissionRead.setSelected(true);
+		chkPermissionEdit = new JCheckBox("Bearbeiten");
+		chkPermissionAdmin = new JCheckBox("Admin");
+		permissionsPanel.add(chkPermissionLink);
+		permissionsPanel.add(chkPermissionRead);
+		permissionsPanel.add(chkPermissionEdit);
+		permissionsPanel.add(chkPermissionAdmin);
 		permissionsPanel.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 0));
 		grid.add(permissionsPanel).fill(true, false).expand(true, false);
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java
index 46792063..7e16af9f 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java
@@ -2,10 +2,8 @@ package org.openslx.dozmod.gui.wizard.layout;
 
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
-import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
-import javax.swing.border.TitledBorder;
 
 import org.openslx.bwlp.thrift.iface.OperatingSystem;
 import org.openslx.dozmod.gui.Gui;
@@ -20,10 +18,10 @@ import org.openslx.thrifthelper.Comparators;
 @SuppressWarnings("serial")
 public abstract class ImageMetaDataPageLayout extends WizardPage {
 
-	protected JComboBox<OperatingSystem> osCombo;
-	protected JTextArea descriptionText;
-	protected JCheckBox licencedSoftwareCheck;
-	protected JCheckBox isTemplateCheck;
+	protected final JComboBox<OperatingSystem> cboOperatingSystem;
+	protected final JTextArea txtDescription;
+	protected final JCheckBox chkLicenseRestricted;
+	protected final JCheckBox chkIsTemplate;
 
 	/**
 	 * wizard page for entering image data at creating or editing an image
@@ -37,7 +35,7 @@ public abstract class ImageMetaDataPageLayout extends WizardPage {
 		GridManager grid = new GridManager(this, 2, false);
 
 		QLabel osCaption = new QLabel("Betriebssystem");
-		osCombo = new ComboBox<>(Comparators.operatingSystem, new ComboBoxRenderer<OperatingSystem>() {
+		cboOperatingSystem = new ComboBox<>(Comparators.operatingSystem, new ComboBoxRenderer<OperatingSystem>() {
 			@Override
 			public String renderItem(OperatingSystem item) {
 				if (item == null)
@@ -45,37 +43,37 @@ public abstract class ImageMetaDataPageLayout extends WizardPage {
 				return item.getOsName();
 			}
 		});
-		osCombo.setEditable(false);
+		cboOperatingSystem.setEditable(false);
 		grid.add(osCaption);
-		grid.add(osCombo);
+		grid.add(cboOperatingSystem);
 
 		QLabel descriptionCation = new QLabel("Beschreibung");
-		descriptionText = new JTextArea(5, 50);
-		descriptionText.setMinimumSize(Gui.getScaledDimension(0, 70));
-		descriptionText.setLineWrap(true);
-		descriptionText.setWrapStyleWord(true);
-		JScrollPane descPane = new JScrollPane(descriptionText, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
+		txtDescription = new JTextArea(5, 50);
+		txtDescription.setMinimumSize(Gui.getScaledDimension(0, 70));
+		txtDescription.setLineWrap(true);
+		txtDescription.setWrapStyleWord(true);
+		JScrollPane descPane = new JScrollPane(txtDescription, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
 				JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-		descPane.setMinimumSize(descriptionText.getMinimumSize());
+		descPane.setMinimumSize(txtDescription.getMinimumSize());
 		grid.add(descriptionCation);
 		grid.add(descPane).fill(true, false).expand(true, false);
 		grid.nextRow();
 
-		licencedSoftwareCheck = new JCheckBox("Image enthält lizenzpflichtige Software");
-		licencedSoftwareCheck.setSelected(true);
-		grid.add(licencedSoftwareCheck, 2);
+		chkLicenseRestricted = new JCheckBox("Image enthält lizenzpflichtige Software");
+		chkLicenseRestricted.setSelected(true);
+		grid.add(chkLicenseRestricted, 2);
 		grid.nextRow();
 
 		// -- end permissions group --
-		isTemplateCheck = new JCheckBox("Vorlage erstellen");
-		grid.add(isTemplateCheck, 2);
+		chkIsTemplate = new JCheckBox("Vorlage erstellen");
+		grid.add(chkIsTemplate, 2);
 		grid.nextRow();
 
 		grid.finish(true);
 	}
 
 	public String getImageDescription() {
-		return descriptionText.getText();
+		return txtDescription.getText();
 	}
 
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java
index 4f4dd58d..ab1e1153 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java
@@ -17,11 +17,11 @@ import org.openslx.dozmod.gui.wizard.WizardPage;
 @SuppressWarnings("serial")
 public abstract class ImageUploadPageLayout extends WizardPage {
 
-	protected JTextField imageNameTextField;
-	protected JButton imageFileBrowseButton;
-	protected JTextField imageFileTextField;
-	protected JCheckBox softwareLicenseBox;
-	protected QLabel imageNameCaption;
+	protected final JTextField txtImageName;
+	protected final JButton btnBrowseForImage;
+	protected final JTextField txtImageFile;
+	protected final JCheckBox chkLicenseRestricted;
+	protected final QLabel lblImageName;
 
 	/**
 	 * Page for uploading an imagefile
@@ -33,26 +33,26 @@ public abstract class ImageUploadPageLayout extends WizardPage {
 
 		// -- Browse for VM --
 		QLabel imageFileCaption = new QLabel("Virtuelle Maschine");
-		imageFileTextField = new JTextField();
-		imageFileTextField.setEditable(false);
-		imageFileBrowseButton = new JButton("Durchsuchen");
-		imageFileBrowseButton.setMnemonic(KeyEvent.VK_B);
+		txtImageFile = new JTextField();
+		txtImageFile.setEditable(false);
+		btnBrowseForImage = new JButton("Durchsuchen");
+		btnBrowseForImage.setMnemonic(KeyEvent.VK_B);
 		grid.add(imageFileCaption);
-		grid.add(imageFileTextField).fill(true, false).expand(true, false);
-		grid.add(imageFileBrowseButton);
+		grid.add(txtImageFile).fill(true, false).expand(true, false);
+		grid.add(btnBrowseForImage);
 		grid.nextRow();
 
-		imageNameCaption = new QLabel("Name");
-		imageNameTextField = new JTextField();
-		grid.add(imageNameCaption);
-		grid.add(imageNameTextField, 2, 1).fill(true, false).expand(true, false);
+		lblImageName = new QLabel("Name");
+		txtImageName = new JTextField();
+		grid.add(lblImageName);
+		grid.add(txtImageName, 2, 1).fill(true, false).expand(true, false);
 		grid.nextRow();
 
 		// -- Software license changed - shown only in UploadWizard --
-		softwareLicenseBox = new JCheckBox("enthält lizenzpflichtige Software");
-		softwareLicenseBox.setVisible(false);
+		chkLicenseRestricted = new JCheckBox("enthält lizenzpflichtige Software");
+		chkLicenseRestricted.setVisible(false);
 		grid.skip();
-		grid.add(softwareLicenseBox, 2, 1).fill(false, false).expand(true, false);
+		grid.add(chkLicenseRestricted, 2, 1).fill(false, false).expand(true, false);
 		grid.nextRow();
 
 		grid.add(Box.createVerticalGlue(), 3).expand(true, true);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadSummaryPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadSummaryPageLayout.java
index ec82b29e..ecad4d36 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadSummaryPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadSummaryPageLayout.java
@@ -12,25 +12,25 @@ import org.openslx.dozmod.gui.wizard.WizardPage;
 @SuppressWarnings("serial")
 public class ImageUploadSummaryPageLayout extends WizardPage {
 
-	protected final BlockProgressBar progressBar;
+	protected final BlockProgressBar ctlUploadProgressBar;
 	protected final JCheckBox chkCreateLecture;
-	protected final JLabel infoText;
+	protected final JLabel lblHelpText;
 
 	public ImageUploadSummaryPageLayout(Wizard wizard, boolean allowCreateLecture) {
 		super(wizard, "Fertig!");
 		setDescription("Assistent abgeschlossen");
 		GridManager grid = new GridManager(this, 1);
 
-		progressBar = new BlockProgressBar(null);
-		progressBar.setMinimumSize(progressBar.getPreferredSize());
-		grid.add(progressBar).expand(true, false).fill(true, false);
+		ctlUploadProgressBar = new BlockProgressBar(null);
+		ctlUploadProgressBar.setMinimumSize(ctlUploadProgressBar.getPreferredSize());
+		grid.add(ctlUploadProgressBar).expand(true, false).fill(true, false);
 		grid.nextRow();
 
 		grid.add(Box.createVerticalStrut(16));
 		grid.nextRow();
 
-		infoText = new JLabel();
-		grid.add(infoText).expand(true, false).fill(true, false);
+		lblHelpText = new JLabel();
+		grid.add(lblHelpText).expand(true, false).fill(true, false);
 		grid.nextRow();
 
 		grid.add(Box.createVerticalGlue()).expand(true, true);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java
index aa21a214..f3944cfd 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java
@@ -24,12 +24,12 @@ import org.openslx.dozmod.util.DateLabelFormatter;
 @SuppressWarnings("serial")
 public abstract class LectureCreationPageLayout extends WizardPage {
 
-	protected final JTextField lectureNameTextField;
-	protected final JTextArea descriptionText;
-	protected final QDatePickerImpl startDate;
-	protected final QDatePickerImpl endDate;
-	protected final JSpinner startTime;
-	protected final JSpinner endTime;
+	protected final JTextField txtName;
+	protected final JTextArea txtDescription;
+	protected final QDatePickerImpl dtpStartDate;
+	protected final QDatePickerImpl dtpEndDate;
+	protected final JSpinner spnStartTime;
+	protected final JSpinner spnEndTime;
 	protected final QLabel lblCalcPeriod;
 
 	private static final Properties pickerStrings = new Properties();
@@ -52,37 +52,37 @@ public abstract class LectureCreationPageLayout extends WizardPage {
 		GridManager grid = new GridManager(this, 3);
 
 		// lecture name
-		lectureNameTextField = new JTextField();
+		txtName = new JTextField();
 		grid.add(new QLabel("Veranstaltungsname"));
-		grid.add(lectureNameTextField, 2).fill(true, false).expand(true, false);
+		grid.add(txtName, 2).fill(true, false).expand(true, false);
 		grid.nextRow();
 
-		descriptionText = new JTextArea(3, 50);
-		descriptionText.setLineWrap(true);
-		descriptionText.setWrapStyleWord(true);
-		JScrollPane descPane = new JScrollPane(descriptionText, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
+		txtDescription = new JTextArea(3, 50);
+		txtDescription.setLineWrap(true);
+		txtDescription.setWrapStyleWord(true);
+		JScrollPane descPane = new JScrollPane(txtDescription, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
 				JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-		descriptionText.setMinimumSize(Gui.getScaledDimension(0, 60));
-		descPane.setMinimumSize(descriptionText.getMinimumSize());
+		txtDescription.setMinimumSize(Gui.getScaledDimension(0, 60));
+		descPane.setMinimumSize(txtDescription.getMinimumSize());
 		grid.add(new QLabel("Beschreibung"));
 		grid.add(descPane, 2).fill(true, false).expand(true, false);
 		grid.nextRow();
 
 		// Start date/time
-		startDate = new QDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings),
+		dtpStartDate = new QDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings),
 				new DateLabelFormatter());
-		startTime = makeTimeSpinner(0, 0);
+		spnStartTime = makeTimeSpinner(0, 0);
 		grid.add(new QLabel("Startdatum"));
-		grid.add(startDate).fill(true, false).expand(true, false);
-		grid.add(startTime);
+		grid.add(dtpStartDate).fill(true, false).expand(true, false);
+		grid.add(spnStartTime);
 		grid.nextRow();
 
-		endDate = new QDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings),
+		dtpEndDate = new QDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings),
 				new DateLabelFormatter());
-		endTime = makeTimeSpinner(23, 59);
+		spnEndTime = makeTimeSpinner(23, 59);
 		grid.add(new QLabel("Enddatum"));
-		grid.add(endDate).fill(true, false).expand(true, false);
-		grid.add(endTime);
+		grid.add(dtpEndDate).fill(true, false).expand(true, false);
+		grid.add(spnEndTime);
 		grid.nextRow();
 
 		grid.add(new QLabel("Dauer der Veranstaltung: "));
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 b80ef067..849f4a6a 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
@@ -19,8 +19,8 @@ public abstract class LectureCustomPermissionPageLayout extends WizardPage {
 	protected LectureCustomPermissionManager lectureCustomPermissionManager;
 
 	// permissions checks
-	protected JCheckBox editPermissionsCheck;
-	protected JCheckBox adminPermissionsCheck;
+	protected final JCheckBox chkPermissionEdit;
+	protected final JCheckBox chkPermissionAdmin;
 
 	/**
 	 * Page for setting custom permissions of a lecture
@@ -48,10 +48,10 @@ public abstract class LectureCustomPermissionPageLayout extends WizardPage {
 
 		JPanel permissionsPanel = new JPanel();
 		permissionsPanel.setLayout(new BoxLayout(permissionsPanel, BoxLayout.LINE_AXIS));
-		editPermissionsCheck = new JCheckBox("Bearbeiten");
-		adminPermissionsCheck = new JCheckBox("Admin");
-		permissionsPanel.add(editPermissionsCheck);
-		permissionsPanel.add(adminPermissionsCheck);
+		chkPermissionEdit = new JCheckBox("Bearbeiten");
+		chkPermissionAdmin = new JCheckBox("Admin");
+		permissionsPanel.add(chkPermissionEdit);
+		permissionsPanel.add(chkPermissionAdmin);
 
 		permissionsPanel.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 0));
 		grid.add(permissionsPanel).fill(true, false).expand(true, false);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureImageListPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureImageListPageLayout.java
index 1b2616d6..5aabd196 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureImageListPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureImageListPageLayout.java
@@ -9,7 +9,7 @@ import org.openslx.dozmod.gui.wizard.WizardPage;
 @SuppressWarnings("serial")
 public abstract class LectureImageListPageLayout extends WizardPage {
 
-	protected final ImageListViewer imageListViewer;
+	protected final ImageListViewer ctlImageList;
 
 	/**
 	 * Page for setting custom permissions of a lecture
@@ -19,8 +19,8 @@ public abstract class LectureImageListPageLayout extends WizardPage {
 		setDescription("Wählen Sie ein Image für diese Veranstaltung aus");
 		GridManager grid = new GridManager(this, 1, false);
 
-		imageListViewer = new ImageListViewer(FilterType.USABLE);
-		grid.add(imageListViewer).fill(true, true).expand(true, true);
+		ctlImageList = new ImageListViewer(FilterType.USABLE);
+		grid.add(ctlImageList).fill(true, true).expand(true, true);
 		grid.finish(false);
 	}
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureLocationSelectionPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureLocationSelectionPageLayout.java
index 5ee2a671..929b55b8 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureLocationSelectionPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureLocationSelectionPageLayout.java
@@ -11,14 +11,14 @@ public class LectureLocationSelectionPageLayout extends WizardPage {
 
 	private final static Logger LOGGER = Logger.getLogger(LectureLocationSelectionPageLayout.class);
 
-	protected final LocationSelector locationSelector;
+	protected final LocationSelector ctlLocationSelector;
 
 	public LectureLocationSelectionPageLayout(Wizard wizard) {
 		super(wizard, "Raumauswahl");
 		setDescription("Bitte wählen Sie die Räume für diese Veranstaltung aus");
-		locationSelector = new LocationSelector();
+		ctlLocationSelector = new LocationSelector();
 		GridManager grid = new GridManager(this, 1);
-		grid.add(locationSelector).fill(true, true).expand(true, true);
+		grid.add(ctlLocationSelector).fill(true, true).expand(true, true);
 		grid.finish(false);
 	}
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureOptionsPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureOptionsPageLayout.java
index 8726da41..c71ea385 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureOptionsPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureOptionsPageLayout.java
@@ -11,10 +11,10 @@ public abstract class LectureOptionsPageLayout extends WizardPage {
 
 	protected static String title = "Zusätzliche Optionen";
 
-	protected JCheckBox networkAccessCheck;
-	protected JCheckBox examCheck;
-	protected JCheckBox autoUpdate;
-	protected JCheckBox enabledCheck;
+	protected final JCheckBox chkInternetEnabled;
+	protected final JCheckBox chkIsExam;
+	protected final JCheckBox chkAutoUpdate;
+	protected final JCheckBox chkIsActive;
 
 	/**
 	 * Page for additional options of lecture
@@ -25,20 +25,20 @@ public abstract class LectureOptionsPageLayout extends WizardPage {
 		GridManager grid = new GridManager(this, 1);
 
 		// Options related to exams
-		examCheck = new JCheckBox("Veranstaltung ist eine Prüfung");
-		grid.add(examCheck);
+		chkIsExam = new JCheckBox("Veranstaltung ist eine Prüfung");
+		grid.add(chkIsExam);
 		grid.nextRow();
 
-		networkAccessCheck = new JCheckBox("Internet verfügbar", true);
-		grid.add(networkAccessCheck);
+		chkInternetEnabled = new JCheckBox("Internet verfügbar", true);
+		grid.add(chkInternetEnabled);
 		grid.nextRow();
 
-		autoUpdate = new JCheckBox("Immer auf aktuellste Imageversion updaten", true);
-		grid.add(autoUpdate);
+		chkAutoUpdate = new JCheckBox("Immer auf aktuellste Imageversion updaten", true);
+		grid.add(chkAutoUpdate);
 		grid.nextRow();
 
-		enabledCheck = new JCheckBox("Vorlesung ist aktiv", true);
-		grid.add(enabledCheck);
+		chkIsActive = new JCheckBox("Vorlesung ist aktiv", true);
+		grid.add(chkIsActive);
 		grid.nextRow();
 
 		grid.finish(true);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureRestrictionPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureRestrictionPageLayout.java
index 248ba8df..85c508ae 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureRestrictionPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureRestrictionPageLayout.java
@@ -8,7 +8,6 @@ public class LectureRestrictionPageLayout extends WizardPage {
 
 	public LectureRestrictionPageLayout(Wizard wizard) {
 		super(wizard, "Beschränkungen");
-
 	}
 
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java
index a2bbc405..f758156d 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java
@@ -27,10 +27,10 @@ public class ImageCustomPermissionPage extends ImageCustomPermissionPageLayout {
 		super(wizard);
 		setPageComplete(true);
 		this.state = uploadWizardState;
-		linkPermissionsCheck.setSelected(state.defaultPermissions.link);
-		readPermissionsCheck.setSelected(state.defaultPermissions.download);
-		writePermissionsCheck.setSelected(state.defaultPermissions.edit);
-		adminPermissionsCheck.setSelected(state.defaultPermissions.admin);
+		chkPermissionLink.setSelected(state.defaultPermissions.link);
+		chkPermissionRead.setSelected(state.defaultPermissions.download);
+		chkPermissionEdit.setSelected(state.defaultPermissions.edit);
+		chkPermissionAdmin.setSelected(state.defaultPermissions.admin);
 	}
 
 	@Override
@@ -46,9 +46,9 @@ public class ImageCustomPermissionPage extends ImageCustomPermissionPageLayout {
 	protected boolean wantNextOrFinish() {
 		LOGGER.debug("Saving permissions to state ...");
 		// saving the default permissions
-		state.defaultPermissions = new ImagePermissions(linkPermissionsCheck.isSelected(),
-				readPermissionsCheck.isSelected(), writePermissionsCheck.isSelected(),
-				adminPermissionsCheck.isSelected());
+		state.defaultPermissions = new ImagePermissions(chkPermissionLink.isSelected(),
+				chkPermissionRead.isSelected(), chkPermissionEdit.isSelected(),
+				chkPermissionAdmin.isSelected());
 		// save the table stuff to our upload wizard state
 		Map<String, ImagePermissions> newPermissionMap = imageCustomPermissionManager.updatePermissionReferences();
 		if (newPermissionMap == null || newPermissionMap.isEmpty())
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
index 4e87038e..dded2e09 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
@@ -33,7 +33,7 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 		setPageComplete(false);
 		// HACK set fixed uploadWizardState to test functions
 		uploadWizardState.shareMode = ShareMode.LOCAL;
-		isTemplateCheck.setEnabled(Session.isSuperUser());
+		chkIsTemplate.setEnabled(Session.isSuperUser());
 		// fetch the OS list
 		QuickTimer.scheduleOnce(new Task() {
 			List<OperatingSystem> osList = null;
@@ -52,7 +52,7 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 			}
 		});
 
-		osCombo.addItemListener(new ItemListener() {
+		cboOperatingSystem.addItemListener(new ItemListener() {
 			@Override
 			public void itemStateChanged(ItemEvent e) {
 				if (e.getStateChange() == ItemEvent.SELECTED) {
@@ -61,7 +61,7 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 			}
 		});
 
-		descriptionText.getDocument().addDocumentListener(new TextChangeListener() {
+		txtDescription.getDocument().addDocumentListener(new TextChangeListener() {
 			@Override
 			public void changed() {
 				reactToUserInput();
@@ -73,20 +73,20 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 	protected void onPageEnter() {
 		// Preselect OS if possible
 		if (state.detectedOs != null) {
-			osCombo.setSelectedItem(state.detectedOs);
+			cboOperatingSystem.setSelectedItem(state.detectedOs);
 		} else if (state.selectedOs == null) {
-			osCombo.setSelectedItem(null);
+			cboOperatingSystem.setSelectedItem(null);
 		}
-		isTemplateCheck.setSelected(state.isTemplate);
-		licencedSoftwareCheck.setSelected(state.isRestricted);
+		chkIsTemplate.setSelected(state.isTemplate);
+		chkLicenseRestricted.setSelected(state.isRestricted);
 		reactToUserInput();
 	}
 
 	@Override
 	protected boolean wantNextOrFinish() {
-		state.selectedOs = (OperatingSystem) osCombo.getSelectedItem();
-		state.isTemplate = isTemplateCheck.isSelected();
-		state.isRestricted = licencedSoftwareCheck.isSelected();
+		state.selectedOs = (OperatingSystem) cboOperatingSystem.getSelectedItem();
+		state.isTemplate = chkIsTemplate.isSelected();
+		state.isRestricted = chkLicenseRestricted.isSelected();
 		return state.selectedOs != null && state.description != null;
 	}
 
@@ -95,7 +95,7 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 	 */
 	private void fillOsCombo(List<OperatingSystem> osList) {
 		for (OperatingSystem os : osList) {
-			osCombo.addItem(os);
+			cboOperatingSystem.addItem(os);
 		}
 	}
 
@@ -105,14 +105,14 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 	 * and call setPageComplete(bool) accordingly.
 	 */
 	private void reactToUserInput() {
-		if (osCombo.getSelectedIndex() == -1) {
+		if (cboOperatingSystem.getSelectedIndex() == -1) {
 			// OS empty, description input present
 			setWarningMessage("Wählen Sie das Betriebssystem aus.");
 			setPageComplete(false);
 			return;
 		}
 		// evaluate description field
-		state.description = descriptionText.getText();
+		state.description = txtDescription.getText();
 		if (state.description == null || state.description.isEmpty()) {
 			// OS set, no description
 			setWarningMessage("Fügen Sie eine Beschreibung hinzu.");
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java
index d6f8c6aa..24fc13f1 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java
@@ -50,21 +50,21 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 		this.state = uploadWizardState;
 		this.existingImage = existingImage;
 
-		imageNameCaption.setVisible(existingImage == null);
-		imageNameTextField.setVisible(existingImage == null);
+		lblImageName.setVisible(existingImage == null);
+		txtImageName.setVisible(existingImage == null);
 		// show the licenced software checkbox since we are uploading new version
-		softwareLicenseBox.setVisible(existingImage != null);
-		softwareLicenseBox.setSelected(existingImage != null); // TODO selected by default?
+		chkLicenseRestricted.setVisible(existingImage != null);
+		chkLicenseRestricted.setSelected(existingImage != null); // TODO selected by default?
 
 		// Browse for *.vmx
-		imageFileBrowseButton.addActionListener(new ActionListener() {
+		btnBrowseForImage.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				browseForVm();
 			}
 		});
 
-		imageFileTextField.addMouseListener(new MouseAdapter() {
+		txtImageFile.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent e) {
 				if (e.getClickCount() == 1)
@@ -72,7 +72,7 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 			}
 		});
 
-		imageFileBrowseButton.requestFocus();
+		btnBrowseForImage.requestFocus();
 	}
 
 	private void browseForVm() {
@@ -136,14 +136,14 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 
 		if (existingImage == null) {
 			// User didn't enter a name yet or didn't change it -> set
-			String imageName = imageNameTextField.getText();
+			String imageName = txtImageName.getText();
 			if (imageName.isEmpty() || imageName.equals(lastDetectedName)) {
-				imageNameTextField.setText(state.meta.getDisplayName());
+				txtImageName.setText(state.meta.getDisplayName());
 			}
 		}
 		lastDetectedName = state.meta.getDisplayName();
 		state.detectedOs = state.meta.getOs();
-		imageFileTextField.setText(file.getAbsolutePath());
+		txtImageFile.setText(file.getAbsolutePath());
 		// let the user know the upload is ready
 		setErrorMessage(null);
 		setDescription("Sie können jetzt den Upload starten.");
@@ -168,7 +168,7 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 		// are we creating a new image? then either:
 		// get the image name either auto filled by VmwareMetaData or by user
 		// get the image name from the image we are uploading a new version of
-		state.name = existingImage != null ? existingImage.getImageName() : imageNameTextField.getText();
+		state.name = existingImage != null ? existingImage.getImageName() : txtImageName.getText();
 
 		// -- create image to get uuid --
 		if (existingImage == null) {
@@ -177,9 +177,9 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 				if (state.uuid == null)
 					return false;
 
-				imageNameTextField.setEnabled(false);
-				imageFileBrowseButton.setEnabled(false);
-				imageFileTextField.setEnabled(false);
+				txtImageName.setEnabled(false);
+				btnBrowseForImage.setEnabled(false);
+				txtImageFile.setEnabled(false);
 			}
 		} else {
 			state.uuid = existingImage.getImageBaseId();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java
index 405214ab..b5db050b 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java
@@ -35,7 +35,7 @@ public class ImageUploadSummaryPage extends ImageUploadSummaryPageLayout {
 			if (!pageIsVisible)
 				return;
 			if (event.progress != null) {
-				progressBar.setStatus(event.progress);
+				ctlUploadProgressBar.setStatus(event.progress);
 			}
 			if (event.state == TransferState.FINISHED) {
 				updateInfoText(null);
@@ -111,7 +111,7 @@ public class ImageUploadSummaryPage extends ImageUploadSummaryPageLayout {
 		Gui.asyncExec(new Runnable() {
 			@Override
 			public void run() {
-				infoText.setText("<html><body style ='width:100%'>" + t + "</body></html>");
+				lblHelpText.setText("<html><body style ='width:100%'>" + t + "</body></html>");
 				if (initState == UploadInitState.UPLOAD_STARTED) {
 					setPageComplete(true);
 				}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCreationPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCreationPage.java
index c3039fcd..737aa4c0 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCreationPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCreationPage.java
@@ -42,8 +42,8 @@ public class LectureCreationPage extends LectureCreationPageLayout {
 			}
 		};
 
-		lectureNameTextField.getDocument().addDocumentListener(docListener);
-		descriptionText.getDocument().addDocumentListener(docListener);
+		txtName.getDocument().addDocumentListener(docListener);
+		txtDescription.getDocument().addDocumentListener(docListener);
 
 		// listeners for the date pickers
 		final ActionListener actionListener = new ActionListener() {
@@ -59,10 +59,10 @@ public class LectureCreationPage extends LectureCreationPageLayout {
 				reactToUserInput();
 			}
 		};
-		startTime.addChangeListener(changeListener);
-		endTime.addChangeListener(changeListener);
-		startDate.addActionListener(actionListener);
-		endDate.addActionListener(actionListener);
+		spnStartTime.addChangeListener(changeListener);
+		spnEndTime.addChangeListener(changeListener);
+		dtpStartDate.addActionListener(actionListener);
+		dtpEndDate.addActionListener(actionListener);
 		calculateDatePeriod();
 	}
 
@@ -88,8 +88,8 @@ public class LectureCreationPage extends LectureCreationPageLayout {
 	 * corresponding label.
 	 */
 	private void calculateDatePeriod() {
-		Date start = DateTimeHelper.getDateFrom(startDate, startTime);
-		Date end = DateTimeHelper.getDateFrom(endDate, endTime);
+		Date start = DateTimeHelper.getDateFrom(dtpStartDate, spnStartTime);
+		Date end = DateTimeHelper.getDateFrom(dtpEndDate, spnEndTime);
 		if (end.before(start)) {
 			lblCalcPeriod.setText("Endzeitpunkt ist vor Startzeitpunkt!");
 		} else {
@@ -99,21 +99,21 @@ public class LectureCreationPage extends LectureCreationPageLayout {
 	}
 
 	private boolean isPageValid() {
-		if (lectureNameTextField.getText().isEmpty()) {
+		if (txtName.getText().isEmpty()) {
 			setWarningMessage("Geben Sie einen Veranstaltungsnamen ein.");
 			return false;
 		} else {
-			state.name = lectureNameTextField.getText();
+			state.name = txtName.getText();
 		}
-		if (descriptionText.getText().isEmpty()) {
+		if (txtDescription.getText().isEmpty()) {
 			setWarningMessage("Fügen Sie eine Beschreibung hinzu.");
 			return false;
 		} else {
-			state.description = descriptionText.getText();
+			state.description = txtDescription.getText();
 		}
 		final Date now = new Date();
-		final Date start = DateTimeHelper.getDateFrom(startDate, startTime);
-		final Date end = DateTimeHelper.getDateFrom(endDate, endTime);
+		final Date start = DateTimeHelper.getDateFrom(dtpStartDate, spnStartTime);
+		final Date end = DateTimeHelper.getDateFrom(dtpEndDate, spnEndTime);
 
 		if (start.after(end)) {
 			setWarningMessage("Startzeit ist nach Endzeit!");
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java
index 4c57f19d..4500b7e6 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java
@@ -27,8 +27,8 @@ public class LectureCustomPermissionPage extends LectureCustomPermissionPageLayo
 	public LectureCustomPermissionPage(Wizard wizard, LectureWizardState state) {
 		super(wizard);
 		this.state = state;
-		editPermissionsCheck.setSelected(state.defaultPermissions.edit);
-		adminPermissionsCheck.setSelected(state.defaultPermissions.admin);
+		chkPermissionEdit.setSelected(state.defaultPermissions.edit);
+		chkPermissionAdmin.setSelected(state.defaultPermissions.admin);
 		setPageComplete(true);
 	}
 
@@ -45,8 +45,8 @@ public class LectureCustomPermissionPage extends LectureCustomPermissionPageLayo
 	protected boolean wantNextOrFinish() {
 		LOGGER.debug("Saving permissions to state ...");
 		// save the table stuff to our upload wizard state
-		state.defaultPermissions.edit = editPermissionsCheck.isSelected();
-		state.defaultPermissions.admin = adminPermissionsCheck.isSelected();
+		state.defaultPermissions.edit = chkPermissionEdit.isSelected();
+		state.defaultPermissions.admin = chkPermissionAdmin.isSelected();
 		Map<String, LecturePermissions> newPermissionMap = lectureCustomPermissionManager.updatePermissionReferences();
 		if (newPermissionMap == null || newPermissionMap.isEmpty()) {
 			return true;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java
index 6524705c..9afbe8a6 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java
@@ -30,7 +30,7 @@ public class LectureImageListPage extends LectureImageListPageLayout {
 	/**
 	 * The image table held by the ImageListViewer
 	 */
-	private final ImageTable imageTable = imageListViewer.getImageTable();
+	private final ImageTable imageTable = ctlImageList.getImageTable();
 
 	/**
 	 * Page for setting custom permissions of a lecture
@@ -67,7 +67,7 @@ public class LectureImageListPage extends LectureImageListPageLayout {
 
 	@Override
 	protected void onPageEnter() {
-		imageListViewer.refreshList(false, 1);
+		ctlImageList.refreshList(false, 1);
 	}
 
 	/**
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureLocationSelectionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureLocationSelectionPage.java
index 31c2782c..8eebd0bd 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureLocationSelectionPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureLocationSelectionPage.java
@@ -27,12 +27,12 @@ public class LectureLocationSelectionPage extends LectureLocationSelectionPageLa
 	}
 
 	private boolean updateState() {
-		List<Integer> locations = locationSelector.getSelectedLocationsAsIds();
-		boolean locationExclusive = locationSelector.getOnlyInSelection();
+		List<Integer> locations = ctlLocationSelector.getSelectedLocationsAsIds();
+		boolean locationExclusive = ctlLocationSelector.getOnlyInSelection();
 		if (locations != null && locations.size() > Session.getSatelliteConfig().maxLocationsPerLecture) {
 			setErrorMessage("Zu viele Räume/Orte ausgewählt");
-			locationSelector.setSelectedLocationsAsIds(locations);
-			locationSelector.collapseFullySelectedNodes();
+			ctlLocationSelector.setSelectedLocationsAsIds(locations);
+			ctlLocationSelector.collapseFullySelectedNodes();
 			return false;
 		}
 		state.locations = locations;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureOptionsPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureOptionsPage.java
index c77616aa..7a3f1f6e 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureOptionsPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureOptionsPage.java
@@ -21,8 +21,8 @@ public class LectureOptionsPage extends LectureOptionsPageLayout {
 		setPageComplete(true);
 
 		//TODO Temporarily disabled until implemented
-		examCheck.setEnabled(false);
-		networkAccessCheck.setEnabled(false);
+		chkIsExam.setEnabled(false);
+		chkInternetEnabled.setEnabled(false);
 	}
 
 	@Override
@@ -34,10 +34,10 @@ public class LectureOptionsPage extends LectureOptionsPageLayout {
 	 * Set the selected options in state
 	 */
 	private boolean updateState() {
-		state.isExam = examCheck.isSelected();
-		state.autoUpdate = autoUpdate.isSelected();
-		state.internetAccess = networkAccessCheck.isSelected();
-		state.isEnabled = enabledCheck.isSelected();
+		state.isExam = chkIsExam.isSelected();
+		state.autoUpdate = chkAutoUpdate.isSelected();
+		state.internetAccess = chkInternetEnabled.isSelected();
+		state.isEnabled = chkIsActive.isSelected();
 
 		setDescription("Klicken Sie auf 'Weiter' für Berechtigungen oder 'Fertigstellen'.");
 		return true;