[client] refactoring

4 files changed, 23 insertions, 39 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 135738d9..ba336652 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
@@ -127,7 +127,6 @@ import java.util.List;
 
 	@Override public boolean wantFinish() {
 
-
 		if (state.meta instanceof DockerMetaDataDummy)
 			initUpload();
 		// since we only started the upload and created a "blank" image entry
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 fbec5bf4..0923db0c 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
@@ -1,10 +1,5 @@
 package org.openslx.dozmod.gui.wizard.layout;
 
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-
 import org.openslx.bwlp.thrift.iface.OperatingSystem;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.configurator.ContainerBindMountConfigurator;
@@ -16,8 +11,9 @@ import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.WizardPage;
 import org.openslx.thrifthelper.Comparators;
 
-@SuppressWarnings("serial")
-public abstract class ImageMetaDataPageLayout extends WizardPage {
+import javax.swing.*;
+
+@SuppressWarnings("serial") public abstract class ImageMetaDataPageLayout extends WizardPage {
 
 	protected final JComboBox<OperatingSystem> cboOperatingSystem;
 	protected final JTextArea txtDescription;
@@ -31,8 +27,8 @@ public abstract class ImageMetaDataPageLayout extends WizardPage {
 
 	/**
 	 * wizard page for entering image data at creating or editing an image
-	 * 
-	 * @param wizard
+	 *
+	 * @param wizard The Wizard-object, which this extended {@link WizardPage} belongs to.
 	 */
 	public ImageMetaDataPageLayout(Wizard wizard) {
 		super(wizard, "Metadaten");
@@ -41,14 +37,14 @@ public abstract class ImageMetaDataPageLayout extends WizardPage {
 		GridManager grid = new GridManager(this, 2, false);
 
 		QLabel osCaption = new QLabel("Betriebssystem");
-		cboOperatingSystem = new ComboBox<>(Comparators.operatingSystem, new ComboBoxRenderer<OperatingSystem>() {
-			@Override
-			public String renderItem(OperatingSystem item) {
-				if (item == null)
-					return null;
-				return item.getOsName();
-			}
-		});
+		cboOperatingSystem = new ComboBox<>(Comparators.operatingSystem,
+				new ComboBoxRenderer<OperatingSystem>() {
+					@Override public String renderItem(OperatingSystem item) {
+						if (item == null)
+							return null;
+						return item.getOsName();
+					}
+				});
 		cboOperatingSystem.setEditable(false);
 		grid.add(osCaption);
 		grid.add(cboOperatingSystem);
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 785e3289..7b9dcd10 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,10 +1,5 @@
 package org.openslx.dozmod.gui.wizard.page;
 
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.util.Collections;
-import java.util.List;
-
 import org.apache.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.OperatingSystem;
 import org.openslx.bwlp.thrift.iface.ShareMode;
@@ -22,6 +17,11 @@ import org.openslx.util.QuickTimer.Task;
 import org.openslx.util.vm.DockerMetaDataDummy;
 import org.openslx.util.vm.QemuMetaData;
 
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * Page for setting the details of an image.
  */
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/model/ContainerDefinition.java b/dozentenmodul/src/main/java/org/openslx/dozmod/model/ContainerDefinition.java
index 872c734f..46dba2e0 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/model/ContainerDefinition.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/model/ContainerDefinition.java
@@ -39,25 +39,14 @@ public class ContainerDefinition {
 		containerMeta = new ContainerMeta();
 	}
 
-	public ContainerDefinition(ContainerDefinition containerDef) {
-		containerRecipe = String.valueOf(containerDef.getContainerRecipe());
-		containerMeta = new ContainerMeta(containerDef.getContainerMeta());
-	}
-
-	public ContainerDefinition(ContainerMeta containerMeta) {
-		this.containerMeta = containerMeta;
-	}
-
 	/**
-	 * Constructor to create a temporal ContainerDefinition object, to construct DockerMetaDataDummy
-	 * TODO i think this is a temp. solution and could be changed in a later cleanup.
+	 * Copy Constructor
 	 *
-	 * @param file          container recipe file
-	 * @param containerMeta container meta object
+	 * @param containerDef {@link ContainerDefinition} from which to make a deep copy.
 	 */
-	public ContainerDefinition(File file, ContainerMeta containerMeta) {
-		this.containerRecipe = readContainerRecipe(file);
-		this.containerMeta = containerMeta;
+	public ContainerDefinition(ContainerDefinition containerDef) {
+		containerRecipe = String.valueOf(containerDef.getContainerRecipe());
+		containerMeta = new ContainerMeta(containerDef.getContainerMeta());
 	}
 
 	public String getContainerRecipe() {