summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard
diff options
context:
space:
mode:
authorSimon Rettberg2018-04-16 17:28:21 +0200
committerSimon Rettberg2018-04-16 17:28:21 +0200
commit4c27202aa0cc989001524385a04a191699a73226 (patch)
tree9a2e722ccb4b80fb52dc88830cd6bebf9816e5c4 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard
parent[client] Reduce assigned RAM for downloaded VMs; had some OOMs on Win10 (diff)
downloadtutor-module-4c27202aa0cc989001524385a04a191699a73226.tar.gz
tutor-module-4c27202aa0cc989001524385a04a191699a73226.tar.xz
tutor-module-4c27202aa0cc989001524385a04a191699a73226.zip
[client] Minor cleanups, add/remove TODOs, rename vars, ...
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java6
1 files changed, 3 insertions, 3 deletions
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 ec501234..1b2a233a 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
@@ -101,10 +101,11 @@ public class ImageUploadPage extends ImageUploadPageLayout {
if (existingImage != null) {
if (existingImage.virtId.equals("vmware")) {
fc.setFileFilter(vmxFilter);
- } else if (existingImage.virtId.equals("vbox")) {
+ } else if (existingImage.virtId.equals("virtualbox")) {
fc.setFileFilter(vboxFilter);
}
- } else {
+ }
+ if (fc.getFileFilter() == null) {
fc.setFileFilter(allSupportedFilter);
}
@@ -160,7 +161,6 @@ public class ImageUploadPage extends ImageUploadPageLayout {
}
// now check the disk files
- // TODO: Use disk image class, check for standalone/snapshot flags
File vmDiskFileInfo = new File(hdds.get(0).diskImage);
if (!vmDiskFileInfo.isAbsolute()) {
// it's relative, compose path using the vmx location