[client] more cleanup stuff in imageWizard [WIP]

1 files changed, 8 insertions, 3 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 87ba4db2..24621eb3 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
@@ -61,14 +61,12 @@ public class ImageWizard extends Wizard implements UiFeedback {
 	@Override
 	public void performFinish() {
 		// TODO run the actually request over external threaded class?
-
 		// push image base to satellite
 		ThriftActions.updateImageBase(JOptionPane.getFrameForComponent(this),
 				uploadWizardState.uuid, imageBaseWriteFromState());
 
 		// push permissions to satellite if we have custom permissions
 		if (uploadWizardState.permissionMap != null) {
-		
 			ThriftActions.writeImagePermissions(JOptionPane.getFrameForComponent(this),
 					uploadWizardState.uuid, uploadWizardState.permissionMap);
 		}
@@ -155,10 +153,17 @@ public class ImageWizard extends Wizard implements UiFeedback {
 						uploadWizardState.uuid, null, null);
 			}
 			if (uploadWizardState.transferInformation != null) {
+				// TODO possible that transferInfo exists but no token?
 				// we started an upload, thus we have a image version
+				ThriftActions.deleteImageBaseOrVersion(JOptionPane.getFrameForComponent(this),
+						uploadWizardState.uuid,
+						uploadWizardState.transferInformation.getToken(),
+						null);
 			}
 			if (uploadWizardState.uploadTask != null) {
-				// an upload is running.
+				uploadWizardState.uploadTask.cancel();
+				// TODO how to cancel AsyncGen?
+				// Maybe: save the ref in uploadTask to be able to get it here?
 			}
 		}
 		return confirmed;