diff options
author | Simon Rettberg | 2022-03-17 13:11:39 +0100 |
---|---|---|
committer | Simon Rettberg | 2022-03-17 13:11:39 +0100 |
commit | bff3e6f556534c04ad192a171de81bcc6c3a7334 (patch) | |
tree | 1499674f2ce9d8a69ed84e6ce9036b6014fdec97 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java | |
parent | [client] Add timestamps to file logger (diff) | |
download | tutor-module-bff3e6f556534c04ad192a171de81bcc6c3a7334.tar.gz tutor-module-bff3e6f556534c04ad192a171de81bcc6c3a7334.tar.xz tutor-module-bff3e6f556534c04ad192a171de81bcc6c3a7334.zip |
[client] Try to do a better job cleaning up when closing wizards
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java')
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java | 42 |
1 files changed, 30 insertions, 12 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 6d310bf1..0bfe2b22 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 @@ -1,5 +1,13 @@ package org.openslx.dozmod.gui.wizard; +import java.awt.Window; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.List; + +import javax.swing.JOptionPane; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; @@ -10,24 +18,27 @@ import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.gui.helper.MessageType; import org.openslx.dozmod.gui.helper.QuitNotification; import org.openslx.dozmod.gui.helper.UiFeedback; -import org.openslx.dozmod.gui.wizard.page.*; +import org.openslx.dozmod.gui.wizard.page.ContainerUploadPage; +import org.openslx.dozmod.gui.wizard.page.ImageCustomPermissionPage; +import org.openslx.dozmod.gui.wizard.page.ImageMetaDataPage; +import org.openslx.dozmod.gui.wizard.page.ImageOvfConversionPage; +import org.openslx.dozmod.gui.wizard.page.ImageTypePage; +import org.openslx.dozmod.gui.wizard.page.ImageUploadPage; +import org.openslx.dozmod.gui.wizard.page.ImageUploadSummaryPage; import org.openslx.dozmod.model.ContainerDefinition; import org.openslx.dozmod.state.UploadWizardState; -import org.openslx.dozmod.thrift.*; +import org.openslx.dozmod.thrift.Session; +import org.openslx.dozmod.thrift.ThriftActions; +import org.openslx.dozmod.thrift.ThriftError; +import org.openslx.dozmod.thrift.UploadInitiator; import org.openslx.dozmod.thrift.UploadInitiator.GotUploadTokenCallback; +import org.openslx.dozmod.thrift.WrappedException; import org.openslx.sat.thrift.version.Feature; import org.openslx.thrifthelper.ThriftManager; import org.openslx.util.QuickTimer; import org.openslx.util.QuickTimer.Task; import org.openslx.virtualization.configuration.VirtualizationConfigurationDocker; -import javax.swing.*; -import java.awt.*; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.List; - public class ImageCreationWizard extends Wizard implements UiFeedback, QuitNotification { /** @@ -37,9 +48,9 @@ public class ImageCreationWizard extends Wizard implements UiFeedback, QuitNotif private final static Logger LOGGER = LogManager.getLogger(ImageCreationWizard.class); - private final UploadWizardState state = new UploadWizardState(); + private UploadWizardState state = new UploadWizardState(); - private final ContainerDefinition containerDefinition = new ContainerDefinition(); + private ContainerDefinition containerDefinition = new ContainerDefinition(); private List<WizardPage> currentPages = new ArrayList<>(); @@ -313,7 +324,14 @@ public class ImageCreationWizard extends Wizard implements UiFeedback, QuitNotif @Override public void onApplicationQuit() { if (state != null && state.upload != null) { - state.upload.cancelError("Application quit (redirected via wizard)"); + state.upload.cancelError("Application quit (via ImageCreationWizard)"); } } + + @Override + protected void doCleanup() { + state = null; + containerDefinition = null; + currentPages.clear(); + } } |