[client] Fix warnings and replace deprecated methods

30 files changed, 164 insertions, 47 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java
index 1a972b46..55ef788b 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java
@@ -24,9 +24,14 @@ import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
 
-@SuppressWarnings("serial") public class ImageCreationWizard extends Wizard
+public class ImageCreationWizard extends Wizard
 		implements UiFeedback, QuitNotification {
 
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = -353405234601306343L;
+
 	private final static Logger LOGGER = Logger.getLogger(ImageCreationWizard.class);
 
 	private final UploadWizardState state = new UploadWizardState();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java
index 56624820..d05b02b5 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java
@@ -22,9 +22,13 @@ import org.openslx.thrifthelper.TConst;
 import org.openslx.util.QuickTimer;
 import org.openslx.util.QuickTimer.Task;
 
-@SuppressWarnings("serial")
 public class ImageUpdateWizard extends Wizard implements UiFeedback, QuitNotification {
 
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = -584900619809829672L;
+
 	private final static Logger LOGGER = Logger.getLogger(ImageCreationWizard.class);
 	private final UploadWizardState state = new UploadWizardState();
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java
index a5b235a9..86ae6dad 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java
@@ -24,9 +24,13 @@ import org.openslx.dozmod.thrift.ThriftActions;
 import org.openslx.dozmod.thrift.cache.LectureCache;
 import org.openslx.dozmod.thrift.cache.MetaDataCache;
 
-@SuppressWarnings("serial")
 public class LectureWizard extends Wizard implements UiFeedback {
 
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = -7447355922540362345L;
+
 	private final static Logger LOGGER = Logger.getLogger(LectureWizard.class);
 
 	public final LectureWizardState state = new LectureWizardState();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/Wizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/Wizard.java
index 35a4ddad..3c5e27ba 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/Wizard.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/Wizard.java
@@ -13,7 +13,12 @@ import java.awt.event.WindowEvent;
 import java.util.ArrayList;
 import java.util.List;
 
-@SuppressWarnings("serial") public abstract class Wizard extends JDialog {
+public abstract class Wizard extends JDialog {
+
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = 1436816291272809418L;
 
 	private final StatusHeader header;
 	private final List<WizardPage> pages = new ArrayList<>();
@@ -94,15 +99,19 @@ import java.util.List;
 		});
 	}
 
-	@SuppressWarnings("deprecation") @Override public void show() {
-		if (needsLayout) {
-			needsLayout = false;
-			pack();
-			if (!pages.isEmpty()) {
-				showPage(0);
+	@Override
+	public void setVisible(boolean visible) {
+		if (visible) {
+			if (needsLayout) {
+				needsLayout = false;
+				pack();
+				if (!pages.isEmpty()) {
+					showPage(0);
+				}
 			}
 		}
-		super.show();
+
+		super.setVisible(visible);
 	}
 
 	protected void showPage(int index) {
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/WizardPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/WizardPage.java
index b8be827a..48f171d0 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/WizardPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/WizardPage.java
@@ -7,9 +7,13 @@ import javax.swing.Icon;
 import javax.swing.JPanel;
 import javax.swing.UIManager;
 
-@SuppressWarnings("serial")
 public abstract class WizardPage extends JPanel {
 
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = 5899883467618546096L;
+
 	private static final Color WARNING_COLOR = new Color(200, 100, 0);
 
 	private final String title;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ContainerUploadPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ContainerUploadPageLayout.java
index d4d253ab..ada3324a 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ContainerUploadPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ContainerUploadPageLayout.java
@@ -13,6 +13,11 @@ import java.awt.event.KeyEvent;
 
 public class ContainerUploadPageLayout extends WizardPage {
 
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = -6361748362199780290L;
+
 	protected final JTextField txtImageName;
 	protected final JButton btnBrowseForImage;
 	protected final JTextField txtImageFile;
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 c4e94f88..15adf000 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
@@ -14,9 +14,13 @@ import org.openslx.dozmod.gui.helper.I18n;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.WizardPage;
 
-@SuppressWarnings("serial")
 public class ImageCustomPermissionPageLayout extends WizardPage {
 
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = -1928592541187476973L;
+
 	protected ImagePermissionConfigurator imageCustomPermissionManager;
 
 	// permissions checks
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 862712ea..f607e3da 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
@@ -13,7 +13,12 @@ import org.openslx.thrifthelper.Comparators;
 
 import javax.swing.*;
 
-@SuppressWarnings("serial") public abstract class ImageMetaDataPageLayout extends WizardPage {
+public abstract class ImageMetaDataPageLayout extends WizardPage {
+
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = -6627630305879774283L;
 
 	protected final QLabel lblOperatingSystem;
 	protected final JComboBox<OperatingSystem> cboOperatingSystem;
@@ -36,14 +41,14 @@ import javax.swing.*;
 		GridManager grid = new GridManager(this, 2, false);
 
 		lblOperatingSystem = new QLabel(I18n.PAGE_LAYOUT.getString("ImageMetaData.Label.OS.text"));
-		cboOperatingSystem = new ComboBox<>(Comparators.operatingSystem,
+		cboOperatingSystem = new ComboBox<OperatingSystem>(Comparators.operatingSystem,
 				new ComboBoxRenderer<OperatingSystem>() {
 					@Override public String renderItem(OperatingSystem item) {
 						if (item == null)
 							return null;
 						return item.getOsName();
 					}
-				});
+				}, OperatingSystem.class);
 		cboOperatingSystem.setEditable(false);
 		grid.add(lblOperatingSystem);
 		grid.add(cboOperatingSystem);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageOvfConversionPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageOvfConversionPageLayout.java
index 7f42fd9d..bc5f820e 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageOvfConversionPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageOvfConversionPageLayout.java
@@ -15,10 +15,14 @@ import org.openslx.dozmod.gui.helper.I18n;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.WizardPage;
 
-@SuppressWarnings("serial")
 public abstract class ImageOvfConversionPageLayout extends WizardPage {
 
-    public final JButton btnStartConversion;
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = -7840405923937109563L;
+
+	public final JButton btnStartConversion;
     protected final JTextArea txtInfoText;
     protected final JProgressBar conversionProgressBar;
     protected final JButton btnBrowseForOvftool;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageTypePageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageTypePageLayout.java
index c9f3bf34..8999e880 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageTypePageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageTypePageLayout.java
@@ -9,6 +9,11 @@ import javax.swing.*;
 
 public abstract class ImageTypePageLayout extends WizardPage {
 
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = 2548125409461846482L;
+
 	protected final JTextArea txtInfoText;
 	protected final JButton btnNewVmImage;
 	protected final JButton btnNewDockerImage;
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 ceb1ed58..33f12519 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
@@ -15,9 +15,13 @@ import org.openslx.dozmod.gui.helper.I18n;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.WizardPage;
 
-@SuppressWarnings("serial")
 public abstract class ImageUploadPageLayout extends WizardPage {
 
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = 4242983732316327827L;
+
 	protected final JTextField txtImageName;
 	protected final JButton btnBrowseForImage;
 	protected final JTextField txtImageFile;
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 1781a1d9..46c6eb41 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
@@ -10,9 +10,13 @@ import org.openslx.dozmod.gui.helper.I18n;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.WizardPage;
 
-@SuppressWarnings("serial")
 public class ImageUploadSummaryPageLayout extends WizardPage {
 
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = -8323690047540145725L;
+
 	protected final BlockProgressBar ctlUploadProgressBar;
 	protected final JCheckBox chkCreateLecture;
 	protected final JLabel lblHelpText;
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 1149a6c9..eee4f533 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
@@ -19,9 +19,13 @@ import org.openslx.dozmod.gui.wizard.WizardPage;
 
 import java.awt.Dimension;
 
-@SuppressWarnings("serial")
 public abstract class LectureCreationPageLayout extends WizardPage {
 
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = 422592252404059239L;
+
 	protected final JTextField txtName;
 	protected final JEditorPane txtDescription;
 	protected final QDatePickerImpl dtpStartDate;
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 0615fb0b..17f3d38c 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
@@ -14,9 +14,13 @@ import org.openslx.dozmod.gui.helper.I18n;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.WizardPage;
 
-@SuppressWarnings("serial")
 public abstract class LectureCustomPermissionPageLayout extends WizardPage {
 
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = 7355993124602939971L;
+
 	protected LecturePermissionConfigurator lectureCustomPermissionManager;
 
 	// permissions checks
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 ef7baf36..830b8770 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
@@ -7,9 +7,13 @@ import org.openslx.dozmod.gui.helper.I18n;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.WizardPage;
 
-@SuppressWarnings("serial")
 public abstract class LectureImageListPageLayout extends WizardPage {
 
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = -4839648148827234593L;
+
 	protected final ImageListViewer ctlImageList;
 
 	/**
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 bd86e86c..703d88e8 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
@@ -1,16 +1,17 @@
 package org.openslx.dozmod.gui.wizard.layout;
 
-import org.apache.log4j.Logger;
 import org.openslx.dozmod.gui.control.LocationSelector;
 import org.openslx.dozmod.gui.helper.GridManager;
 import org.openslx.dozmod.gui.helper.I18n;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.WizardPage;
 
-@SuppressWarnings("serial")
 public class LectureLocationSelectionPageLayout extends WizardPage {
 
-	private final static Logger LOGGER = Logger.getLogger(LectureLocationSelectionPageLayout.class);
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = -5292483123910412285L;
 
 	protected final LocationSelector ctlLocationSelector;
 
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 28c04d81..a758dae6 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
@@ -9,9 +9,13 @@ import org.openslx.dozmod.gui.helper.I18n;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.WizardPage;
 
-@SuppressWarnings("serial")
 public abstract class LectureOptionsPageLayout extends WizardPage {
 
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = 6681810149647022738L;
+
 	protected static String title = I18n.PAGE_LAYOUT.getString("LectureOptions.WizardPage.title");
 
 	protected final JCheckBox chkUsbEnabled;
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 02e9d7b4..31ccaabf 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
@@ -4,9 +4,13 @@ import org.openslx.dozmod.gui.helper.I18n;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.WizardPage;
 
-@SuppressWarnings("serial")
 public class LectureRestrictionPageLayout extends WizardPage {
 
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = 5529458984966765682L;
+
 	public LectureRestrictionPageLayout(Wizard wizard) {
 		super(wizard, I18n.PAGE_LAYOUT.getString("LectureRestriction.WizardPage.title"));
 	}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
index 1954db28..b16a9785 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
@@ -40,6 +40,11 @@ public class ContainerUploadPage extends ContainerUploadPageLayout {
 	// TODO: Add a Instruction for the new Container-Feature in bwLehrpool.
 	// TODO: Add link to instructions for Docker-Intetragtion at https://www.bwlehrpool.de/doku.php
 
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = 2564301984375080698L;
+
 	private final Logger LOGGER = Logger.getLogger(ContainerUploadPage.class);
 
 	private final UploadWizardState state;
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 c5d91f39..3a40cb35 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
@@ -9,9 +9,13 @@ import org.openslx.dozmod.gui.wizard.layout.ImageCustomPermissionPageLayout;
 import org.openslx.dozmod.state.UploadWizardState;
 import org.openslx.dozmod.thrift.Session;
 
-@SuppressWarnings("serial")
 public class ImageCustomPermissionPage extends ImageCustomPermissionPageLayout {
 
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = -8809873730069813731L;
+
 	private final static Logger LOGGER = Logger.getLogger(ImageCustomPermissionPage.class);
 
 	private boolean initDone = false;
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 19df525a..b767cbd4 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
@@ -1,6 +1,5 @@
 package org.openslx.dozmod.gui.wizard.page;
 
-import org.apache.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.OperatingSystem;
 import org.openslx.bwlp.thrift.iface.ShareMode;
 import org.openslx.dozmod.gui.Gui;
@@ -25,9 +24,12 @@ import java.util.List;
 /**
  * Page for setting the details of an image.
  */
-@SuppressWarnings("serial") public class ImageMetaDataPage extends ImageMetaDataPageLayout {
+public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 
-	private final static Logger LOGGER = Logger.getLogger(ImageMetaDataPage.class);
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = -256817058595905373L;
 
 	private UploadWizardState state;
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java
index 774d6a6e..8caa4c51 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java
@@ -30,9 +30,13 @@ import org.openslx.dozmod.util.ConversionTaskWorker;
  * the new vmx image, starts the conversion SwingWorker and shows the progress.
  * Replaces the image description file in state after conversion.
  */
-@SuppressWarnings("serial")
 public class ImageOvfConversionPage extends ImageOvfConversionPageLayout {
-    private final static Logger LOGGER = Logger.getLogger(ImageOvfConversionPage.class);
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = 464428060782110490L;
+
+	private final static Logger LOGGER = Logger.getLogger(ImageOvfConversionPage.class);
 
     private UploadWizardState state;
     private ImageOvfConversionPage page;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageTypePage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageTypePage.java
index 219f3391..cd80a41e 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageTypePage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageTypePage.java
@@ -8,6 +8,11 @@ import java.awt.event.ActionListener;
 
 public class ImageTypePage extends ImageTypePageLayout {
 
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = 2211290890039619075L;
+
 	public ImageTypePage(final ImageCreationWizard wizard) {
 		super(wizard);
 
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 68bcbd50..4f64f1e9 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
@@ -45,9 +45,13 @@ import org.openslx.vm.disk.DiskImageException;
 /**
  * Page for uploading a new image.
  */
-@SuppressWarnings("serial")
 public class ImageUploadPage extends ImageUploadPageLayout {
 
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = -2974001512014608455L;
+
 	private final static Logger LOGGER = Logger.getLogger(ImageUploadPage.class);
 
 	private UploadWizardState state;
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 73b158c0..fdd52efb 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
@@ -20,9 +20,13 @@ import org.openslx.dozmod.thrift.UploadInitiator.UploadInitState;
 import org.openslx.dozmod.thrift.cache.ImageCache;
 import org.openslx.util.QuickTimer;
 
-@SuppressWarnings("serial")
 public class ImageUploadSummaryPage extends ImageUploadSummaryPageLayout {
 
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = -319910198640112507L;
+
 	private static final Logger LOGGER = Logger.getLogger(ImageUploadSummaryPage.class);
 
 	private boolean pageIsVisible = false;
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 ffa37134..261bb20f 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
@@ -8,7 +8,6 @@ import java.util.Date;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
-import org.apache.log4j.Logger;
 import org.openslx.dozmod.gui.helper.DateTimeHelper;
 import org.openslx.dozmod.gui.helper.I18n;
 import org.openslx.dozmod.gui.helper.TextChangeListener;
@@ -22,10 +21,12 @@ import org.openslx.dozmod.util.FormatHelper;
  * First page for creating a new lecture.
  * Used to set name, description and start- and endtime
  */
-@SuppressWarnings("serial")
 public class LectureCreationPage extends LectureCreationPageLayout {
 
-	private final static Logger LOGGER = Logger.getLogger(LectureCreationPage.class);
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = 1632884502302543558L;
 
 	private LectureWizardState state = null;
 
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 2d37238a..bcaa773e 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
@@ -12,9 +12,13 @@ import org.openslx.dozmod.thrift.Session;
 /**
  * Wizard page for setting custom permissions for the lecture to be created
  */
-@SuppressWarnings("serial")
 public class LectureCustomPermissionPage extends LectureCustomPermissionPageLayout {
 
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = 8593836578573838805L;
+
 	private final static Logger LOGGER = Logger.getLogger(LectureCustomPermissionPage.class);
 
 	private boolean initDone = false;
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 01f179c2..3b4935cb 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
@@ -7,7 +7,6 @@ import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-import org.apache.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
 import org.openslx.dozmod.gui.control.table.ImageTable;
 import org.openslx.dozmod.gui.helper.I18n;
@@ -22,10 +21,12 @@ import org.openslx.util.QuickTimer.Task;
 /**
  * Page for choosing the linked image for the lecture to be created
  */
-@SuppressWarnings("serial")
 public class LectureImageListPage extends LectureImageListPageLayout {
 
-	private final static Logger LOGGER = Logger.getLogger(LectureImageListPage.class);
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = 4934345495859750609L;
 
 	private LectureWizardState state = null;
 	/**
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 bcad47f8..9bb84a49 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
@@ -2,17 +2,18 @@ package org.openslx.dozmod.gui.wizard.page;
 
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.openslx.dozmod.gui.helper.I18n;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.layout.LectureLocationSelectionPageLayout;
 import org.openslx.dozmod.state.LectureWizardState;
 import org.openslx.dozmod.thrift.Session;
 
-@SuppressWarnings("serial")
 public class LectureLocationSelectionPage extends LectureLocationSelectionPageLayout {
 
-	private final static Logger LOGGER = Logger.getLogger(LectureLocationSelectionPage.class);
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = 4438572389120087933L;
 
 	private LectureWizardState state = null;
 
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 45ca1d88..5b5e066f 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
@@ -9,9 +9,13 @@ import org.openslx.dozmod.gui.wizard.layout.LectureOptionsPageLayout;
 import org.openslx.dozmod.state.LectureWizardState;
 import org.openslx.dozmod.thrift.Session;
 
-@SuppressWarnings("serial")
 public class LectureOptionsPage extends LectureOptionsPageLayout {
 
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = -3108044488988318613L;
+
 	private LectureWizardState state = null;
 	private List<NetRule> currentNetrules;
 	private String currentRunscript = new String("");