diff options
Diffstat (limited to 'dozentenmodul/src/main/java/org')
3 files changed, 7 insertions, 4 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java index e93cab91..e1ba414a 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java @@ -64,6 +64,7 @@ import org.openslx.dozmod.util.FormatHelper; import org.openslx.dozmod.util.MapHelper; import org.openslx.dozmod.util.OpenLinks; import org.openslx.sat.thrift.version.Feature; +import org.openslx.thrifthelper.TConst; import org.openslx.thrifthelper.ThriftManager; import org.openslx.util.QuickTimer; import org.openslx.util.QuickTimer.Task; @@ -395,7 +396,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe } String tmp = ThriftUtil.byteBufferToString(machineDescription); - if ("qemukvm".equals(image.virtId)) { // TODO: Constants in master-sync-shared after merge + if (TConst.VIRT_QEMU.equals(image.virtId)) { VirtConfigEditorWindow.open(me, actionHandler, selected.versionId, machineDescription, tmp); } else { 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 192ab82e..2a798f27 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 @@ -30,6 +30,7 @@ import org.openslx.dozmod.thrift.UploadInitiator; import org.openslx.dozmod.thrift.WrappedException; 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.UnknownImageFormatException; import org.openslx.util.vm.VboxMetaData; @@ -106,9 +107,9 @@ public class ImageUploadPage extends ImageUploadPageLayout { fc.setFileFilter(allSupportedFilter); // differentiate between existing and new VMs if (existingImage != null) { - if (existingImage.virtId.equals("vmware")) { + if (existingImage.virtId.equals(TConst.VIRT_VMWARE)) { fc.setFileFilter(vmxFilter); - } else if (existingImage.virtId.equals("virtualbox")) { + } else if (existingImage.virtId.equals(TConst.VIRT_VIRTUALBOX)) { fc.setFileFilter(vboxFilter); } } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java index d37fc5b5..e58653e7 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java @@ -23,6 +23,7 @@ import org.openslx.bwlp.thrift.iface.OperatingSystem; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.helper.MessageType; import org.openslx.dozmod.thrift.cache.MetaDataCache; +import org.openslx.thrifthelper.TConst; import org.openslx.util.vm.DiskImage; import org.openslx.util.vm.QemuMetaData; import org.openslx.util.vm.VboxMetaData; @@ -40,7 +41,7 @@ public class VmWrapper { throw new FileNotFoundException("Disk file " + diskFile.getAbsolutePath() + " does not exist"); if (machineDescription == null || machineDescription.length < 10) { - if (!"vmware".equals(virtualizerId)) { + if (!TConst.VIRT_VMWARE.equals(virtualizerId)) { throw new MetaDataMissingException(); } machineDescription = getFallbackVmx(diskImageInfo); |