diff options
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java index 3a29e3b3..60ea343a 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java @@ -24,9 +24,9 @@ import org.openslx.dozmod.thrift.ImageDetailsActions; import org.openslx.dozmod.thrift.ImageDetailsActions.VirtConfCallback; import org.openslx.dozmod.thrift.cache.MetaDataCache; import org.openslx.util.XmlHelper; -import org.openslx.vm.VboxMetaData; -import org.openslx.vm.VmMetaData; -import org.openslx.vm.VmwareConfig; +import org.openslx.virtualization.configuration.VirtualizationConfigurationVirtualBox; +import org.openslx.virtualization.configuration.VirtualizationConfigurationVmwareFileFormat; +import org.openslx.virtualization.configuration.VirtualizationConfiguration; public class VirtConfigEditorWindow extends VirtConfigEditorWindowLayout implements UiFeedback { @@ -88,26 +88,26 @@ public class VirtConfigEditorWindow extends VirtConfigEditorWindowLayout impleme // we make use of the fact that we saved the BB here! final String userInput = pnlEditor.getText(); byte[] uiBytes = userInput.getBytes(StandardCharsets.ISO_8859_1); - Charset cs = VmwareConfig.getCharset(uiBytes, uiBytes.length); + Charset cs = VirtualizationConfigurationVmwareFileFormat.getCharset(uiBytes, uiBytes.length); // cs is now either the detected encoding, or latin1 as a default uiBytes = userInput.getBytes(cs); // now we should have the correct bytes... - VmMetaData<?, ?, ?, ?, ?> metaCandidate = null; + VirtualizationConfiguration<?, ?, ?, ?> virtualizationConfig = null; try { - metaCandidate = VmMetaData.getInstance(MetaDataCache.getOperatingSystems(), uiBytes, + virtualizationConfig = VirtualizationConfiguration.getInstance(MetaDataCache.getOperatingSystems(), uiBytes, uiBytes.length); } catch (IOException e) { LOGGER.error("Could not get VmMetaData instance from given machine description: ", e); } - if (metaCandidate == null) { + if (virtualizationConfig == null) { dispose(); return; } - byte[] uiBytesFiltered = metaCandidate.getDefinitionArray(); + byte[] uiBytesFiltered = virtualizationConfig.getConfigurationAsByteArray(); final String userInputFiltered; // TODO: This is ugly, why is there instanceof stuff here, add a method to VmMetaData!? - if (metaCandidate instanceof VboxMetaData) { + if (virtualizationConfig instanceof VirtualizationConfigurationVirtualBox) { userInputFiltered = XmlHelper.getFormattedXml(new ByteArrayInputStream(uiBytesFiltered)); } else { userInputFiltered = new String(uiBytesFiltered, cs); @@ -131,13 +131,13 @@ public class VirtConfigEditorWindow extends VirtConfigEditorWindowLayout impleme return; } ByteBuffer toSave; - if (metaCandidate instanceof VboxMetaData) { + if (virtualizationConfig instanceof VirtualizationConfigurationVirtualBox) { String unformattedInput = XmlHelper.getUnformattedXml(new ByteArrayInputStream(uiBytesFiltered)); toSave = ByteBuffer.wrap(unformattedInput.getBytes(cs)); } else { toSave = ByteBuffer.wrap(uiBytesFiltered); } - // we have a valid vmx or the user accepted to push the filtered input + // we have a valid virtualization configuration or the user accepted to push the filtered input actionHandler.setVirtualizerConfig(imageVersionId, toSave, new VirtConfCallback() { @Override public void virtConfCallback(boolean success) { |