[client] Redirect after selecting ovf file in image upload wizard

Until now the wizard implementation only allows going through the pages
in a linear way. The two new functions should allow to jump to an out
of order page and return to the normal order. The pages to jump to
have to be kept in the wizards state for now.

Feature: #3771

1 files changed, 22 insertions, 8 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 1c2b2201..745a5b47 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
@@ -52,12 +52,16 @@ public class ImageCreationWizard extends Wizard implements UiFeedback, QuitNotif
 	 * Adding Pages to the Wizard to create a virtual machine
 	 */
 	public void doVmCreation() {
+
 		cleanCurrent();
-		currentPages.add(new ImageUploadPage(this, state, null));
-		// currentPages.add(new ImageOvfConversionPage(this,state));
+		state.imageUploadPage = new ImageUploadPage(this, state, null);
+		currentPages.add(state.imageUploadPage);
 		currentPages.add(new ImageMetaDataPage(this, state));
 		currentPages.add(new ImageCustomPermissionPage(this, state));
 		addPages();
+
+		state.conversionPage = new ImageOvfConversionPage(this, state);
+		addOutOfOrderPage(state.conversionPage);
 	}
 
 	/**
@@ -66,20 +70,20 @@ public class ImageCreationWizard extends Wizard implements UiFeedback, QuitNotif
 	public void doDockerCreation() {
 		cleanCurrent();
 
-		currentPages.add(new DockerfileUploadPage(this,state));
-		currentPages.add(new ImageMetaDataPage(this,state));
+		currentPages.add(new DockerfileUploadPage(this, state));
+		currentPages.add(new ImageMetaDataPage(this, state));
 		currentPages.add(new ImageCustomPermissionPage(this, state));
 		addPages();
 	}
 
 	private void addPages() {
-		for (WizardPage i:currentPages) {
+		for (WizardPage i : currentPages) {
 			addPage(i);
 		}
 	}
 
 	private void cleanCurrent() {
-		if( !currentPages.isEmpty()) {
+		if (!currentPages.isEmpty()) {
 			removePages(currentPages);
 			currentPages = new ArrayList<WizardPage>();
 		}
@@ -133,8 +137,8 @@ public class ImageCreationWizard extends Wizard implements UiFeedback, QuitNotif
 			public void fire() {
 				// push version data
 				try {
-					ThriftActions.updateImageVersion(state.upload.getToken(), new ImageVersionWrite(
-							state.isRestricted));
+					ThriftActions.updateImageVersion(state.upload.getToken(),
+							new ImageVersionWrite(state.isRestricted));
 				} catch (TException e) {
 					if (state.isRestricted) {
 						Gui.showMessageBox(null, "Unerwarteter Fehler beim Setzen der Option"
@@ -221,6 +225,16 @@ public class ImageCreationWizard extends Wizard implements UiFeedback, QuitNotif
 	}
 
 	@Override
+	protected final void doPrevious() {
+		if (state.outOfOrderFlow) {
+			state.outOfOrderFlow = false;
+			returnAfterOutOfOrderPage(state.imageUploadPage, state.conversionPage);
+		} else {
+			super.doPrevious();
+		}
+	}
+
+	@Override
 	protected boolean onCancelRequest() {
 		if (state.uuid == null)
 			return true;