[client] Fix warnings and replace deprecated methods

12 files changed, 58 insertions, 19 deletions

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