From 7acaf01b523ffadac8dda2e06f4a6a8341527343 Mon Sep 17 00:00:00 2001 From: Manuel Bentele Date: Mon, 1 Feb 2021 16:05:45 +0100 Subject: [client] Extend disk image check for multiple image formats --- .../main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java index d5202f4b..eb5e3d4e 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java @@ -35,6 +35,7 @@ import org.openslx.dozmod.thrift.cache.MetaDataCache; import org.openslx.sat.thrift.version.Feature; import org.openslx.thrifthelper.TConst; import org.openslx.util.vm.DiskImage; +import org.openslx.util.vm.DiskImage.ImageFormat; import org.openslx.util.vm.DiskImage.UnknownImageFormatException; import org.openslx.util.vm.VmMetaData; import org.openslx.util.vm.VmMetaData.HardDisk; @@ -222,8 +223,9 @@ public class ImageUploadPage extends ImageUploadPageLayout { vmDiskFileInfo = new File(vmBaseDirectory, hdds.get(0).diskImage); } DiskImage diskImage; + List supportedImageFormats = state.meta.getSupportedImageFormats(); try { - diskImage = new DiskImage(vmDiskFileInfo); + diskImage = new DiskImage(vmDiskFileInfo, supportedImageFormats); } catch (FileNotFoundException e) { setErrorMessage(I18n.PAGE.getString("ImageUpload.WizardPage.errorMessage.diskImageNotFound", vmDiskFileInfo.getName())); -- cgit v1.2.3-55-g7522