[client] Continued implementation of Wizard

1 files changed, 10 insertions, 17 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageWizard.java
index 4a09aa00..33cdea74 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageWizard.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageWizard.java
@@ -1,6 +1,6 @@
 package org.openslx.dozmod.gui.wizard;
 
-import javax.swing.JFrame;
+import java.awt.Window;
 
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
@@ -15,11 +15,12 @@ import org.openslx.dozmod.state.UploadWizardState;
 import org.openslx.dozmod.thrift.Session;
 import org.openslx.thrifthelper.ThriftManager;
 
+@SuppressWarnings("serial")
 public class ImageWizard extends Wizard {
 
 	private final static Logger LOGGER = Logger.getLogger(ImageWizard.class);
 
-	private UploadWizardState uploadWizardState;
+	private final UploadWizardState uploadWizardState = new UploadWizardState();;
 	protected ImageUploadPage imageUploadPage;
 	protected ImageMetaDataPage imageMetaDataPage;
 	protected ImageCustomPermissionPage imageCustomPermissionPage;
@@ -29,26 +30,19 @@ public class ImageWizard extends Wizard {
 	 * 
 	 * @param editExistingImage whether to create new or edit existing image
 	 */
-	public ImageWizard(JFrame parent) {
+	public ImageWizard(Window parent) {
 		super(parent);
-		this.uploadWizardState = new UploadWizardState();
+		imageUploadPage = new ImageUploadPage(this, uploadWizardState);
+		imageMetaDataPage = new ImageMetaDataPage(this, uploadWizardState);
+		imageCustomPermissionPage = new ImageCustomPermissionPage(this, uploadWizardState);
+		addPage(imageUploadPage);
+		addPage(imageMetaDataPage);
+		addPage(imageCustomPermissionPage);
 	}
 
 	@Override
 	public String getWindowTitle() {
 		return "Neues Image erzeugen";
-
-	}
-
-	@Override
-	public void addPages() {
-		// create the shared object for all pages of the wizard
-		imageUploadPage = new ImageUploadPage(uploadWizardState);
-		imageMetaDataPage = new ImageMetaDataPage(uploadWizardState);
-		imageCustomPermissionPage = new ImageCustomPermissionPage(uploadWizardState);
-		addPage(imageUploadPage);
-		addPage(imageMetaDataPage);
-		addPage(imageCustomPermissionPage);
 	}
 
 	@Override
@@ -98,7 +92,6 @@ public class ImageWizard extends Wizard {
 
 		Gui.showMessageBox(this, "Creation of image worked :)", MessageType.INFO, LOGGER, null);
 		return true;
-
 	}
 
 	private boolean isStateValid() {