diff options
author | Stephan Schwär | 2020-11-25 03:59:15 +0100 |
---|---|---|
committer | Stephan Schwär | 2020-11-25 03:59:15 +0100 |
commit | d4e18495ef9fec31ea430cf0acb1cc725292dcc1 (patch) | |
tree | 80ea1a9ccb5c80100840522e5041a8f3d172b6ae /dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page | |
parent | [client] Remove unused code of earlier solution (diff) | |
download | tutor-module-d4e18495ef9fec31ea430cf0acb1cc725292dcc1.tar.gz tutor-module-d4e18495ef9fec31ea430cf0acb1cc725292dcc1.tar.xz tutor-module-d4e18495ef9fec31ea430cf0acb1cc725292dcc1.zip |
[client] English support for ovf convert feature
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page')
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java | 40 | ||||
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java | 52 |
2 files changed, 51 insertions, 41 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java index dc4f057a..774d6a6e 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java @@ -17,6 +17,7 @@ import org.apache.commons.io.FilenameUtils; import org.apache.log4j.Logger; import org.openslx.dozmod.Config; import org.openslx.dozmod.gui.Gui; +import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.gui.helper.MessageType; import org.openslx.dozmod.gui.helper.QFileChooser; import org.openslx.dozmod.gui.wizard.Wizard; @@ -37,7 +38,8 @@ public class ImageOvfConversionPage extends ImageOvfConversionPageLayout { private ImageOvfConversionPage page; private File vmxFile; private ConversionTaskWorker worker; - private String startConversionButtonString = "Konvertierung starten"; + private String startConversionButtonString = I18n.PAGE + .getString("ImageOvfConversion.StartConversionButton.text"); public boolean conversionStarted = false; public boolean conversionSuccessful = false; private String ovfToolPath = "ovftool"; @@ -52,9 +54,11 @@ public class ImageOvfConversionPage extends ImageOvfConversionPageLayout { // Linux install should have put the ovftool into the path variable. // Try to set it for windows and macos. if (os.toLowerCase().contains("windows")) { - ovfToolPath = System.getenv("ProgramFiles(X86)") + "\\VMware\\VMware Workstation\\OVFTool\\ovftool.exe"; + ovfToolPath = System.getenv("ProgramFiles(X86)") + + "\\VMware\\VMware Workstation\\OVFTool\\ovftool.exe"; if (!(new File(ovfToolPath).exists())) { - ovfToolPath = System.getenv("ProgramFiles(X86)") + "\\VMware\\VMware Player\\OVFTool\\ovftool.exe"; + ovfToolPath = System.getenv("ProgramFiles(X86)") + + "\\VMware\\VMware Player\\OVFTool\\ovftool.exe"; } } else if (os.toLowerCase().contains("mac")) { ovfToolPath = "/Applications/VMware Fusion.app/Contents/Library/VMware OVF Tool"; @@ -69,11 +73,14 @@ public class ImageOvfConversionPage extends ImageOvfConversionPageLayout { if (worker == null) { try { updateConversionProgressbar(0); - btnStartConversion.setText("Konvertierung abbrechen"); + btnStartConversion.setText( + I18n.PAGE.getString("ImageOvfConversion.AbortConversionButton.text")); convertOvfToVmx(state.descriptionFile); } catch (Exception error) { btnStartConversion.setEnabled(false); - Gui.showMessageBox(page, "Konvertierung fehlgeschlagen:", MessageType.ERROR, LOGGER, error); + Gui.showMessageBox(page, + I18n.PAGE.getString("ImageOvfConversion.ErrorMessage.ConversionFailed"), + MessageType.ERROR, LOGGER, error); } } else { page.cancelConversionWorker(); @@ -141,7 +148,8 @@ public class ImageOvfConversionPage extends ImageOvfConversionPageLayout { } conversionStarted = true; Files.createDirectories(directoryFile.toPath()); - vmxFile = new File(directoryFile.getPath() + "/" + FilenameUtils.removeExtension((file.getName())) + ".vmx"); + vmxFile = new File( + directoryFile.getPath() + "/" + FilenameUtils.removeExtension((file.getName())) + ".vmx"); worker = new ConversionTaskWorker(file, vmxFile, page, ovfToolPath); worker.execute(); state.convertedDescriptionFile = vmxFile; @@ -153,14 +161,13 @@ public class ImageOvfConversionPage extends ImageOvfConversionPageLayout { int dialogResult; if (!conversionStarted) { dialogResult = JOptionPane.showConfirmDialog(this, - "Das Verzeichnis, in welcher das konvertierte Image gespeichert werden soll existiert bereits. \n" - + "Soll dieses ersetzt und die darin enthaltenen Dateien gelöscht werden?", - "Verzeichnis Überschreiben?", dialogButton); + I18n.PAGE.getString("ImageOvfConversion.Dialog.DirectoryExists"), + I18n.PAGE.getString("ImageOvfConversion.Dialog.DirectoryExists.title"), dialogButton); } else { dialogResult = JOptionPane.showConfirmDialog(this, - "Für die abgebrochene Konvertierung wurde ein Verzeichnis erstellt.\n" - + "Soll dieses und dessen Inhalt wieder entfernt werden?", - "Verzeichnis Überschreiben?", dialogButton); + I18n.PAGE.getString("ImageOvfConversion.Dialog.RemoveTmpDirectory"), + I18n.PAGE.getString("ImageOvfConversion.Dialog.RemoveTmpDirectory.title"), + dialogButton); } if (dialogResult == 0) { FileUtils.deleteDirectory(directoryFile); @@ -190,14 +197,11 @@ public class ImageOvfConversionPage extends ImageOvfConversionPageLayout { protected void onPageEnter() { if (!fileContainsKeyword(state.descriptionFile, "vmware")) { Gui.showMessageBox(this, - "Die ausgewählte Datei scheint kein mit VMware oder VirtualBox erstelltes Image zu sein.", + I18n.PAGE.getString("ImageOvfConversion.MessageBox.notAVmwareOrVboxImage"), MessageType.WARNING, LOGGER, null); } else if (fileContainsKeyword(state.descriptionFile, "vbox")) { - Gui.showMessageBox(this, "Sie haben ein mit VirtualBox erstelltes Image ausgewählt.\n" - + "Die Umwandlung von mit VirtualBox erstellten OVA" - + " und OVF images wird momentan nocht nicht unterstützt.\n" - + "Sie können dennoch versuchen die Konvertierung zu starten, es können aber Fehler auftreten,\n" - + "da das Konvertierungsprogramm von VMWare verwendet wird.", MessageType.INFO, LOGGER, null); + Gui.showMessageBox(this, I18n.PAGE.getString("ImageOvfConversion.MessageBox.VboxDetected"), + MessageType.INFO, LOGGER, null); } updateConversionProgressbar(0); updateConversionProgressbarText(""); 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 f7ea5540..19ce1429 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 @@ -53,14 +53,18 @@ public class ImageUploadPage extends ImageUploadPageLayout { private ImageDetailsRead existingImage = null; private final FileNameExtensionFilter allSupportedFilter; - private final FileNameExtensionFilter vmxFilter = new FileNameExtensionFilter("VMware Virtual Machine", "vmx"); - private final FileNameExtensionFilter vboxFilter = new FileNameExtensionFilter("VirtualBox Virtual Machine", - "vbox"); + private final FileNameExtensionFilter vmxFilter = new FileNameExtensionFilter("VMware Virtual Machine", + "vmx"); + private final FileNameExtensionFilter vboxFilter = new FileNameExtensionFilter( + "VirtualBox Virtual Machine", "vbox"); - private final FileNameExtensionFilter ovfFilter = new FileNameExtensionFilter("OVF Virtual Machine Format", "ovf"); - private final FileNameExtensionFilter ovaFilter = new FileNameExtensionFilter("OVA Virtual Machine Format", "ova"); + private final FileNameExtensionFilter ovfFilter = new FileNameExtensionFilter( + "OVF Virtual Machine Format", "ovf"); + private final FileNameExtensionFilter ovaFilter = new FileNameExtensionFilter( + "OVA Virtual Machine Format", "ova"); - public ImageUploadPage(Wizard wizard, UploadWizardState uploadWizardState, final ImageDetailsRead existingImage) { + public ImageUploadPage(Wizard wizard, UploadWizardState uploadWizardState, + final ImageDetailsRead existingImage) { super(wizard); setPageComplete(false); this.canComeBack = false; @@ -130,11 +134,8 @@ public class ImageUploadPage extends ImageUploadPageLayout { private void askForConversion(File file) { int dialogButton = JOptionPane.YES_NO_OPTION; int dialogResult = JOptionPane.showConfirmDialog(this, - "Sie haben ein Image im ovf Format ausgewählt. \n" - + "Wenn dieses mit dem Programm VMware exportiert wurde sollte es mithilfe\n" - + "des ovfTool von VMware in ein kompatibles vmx Image umgewandelt werden können. \n" - + "Möchten sie das Image konvertieren? (Das original Image bleibt unverändert.)", - "Image konvertieren?", dialogButton); + I18n.PAGE.getString("ImageUpload.WizardPage.dialog.OvfOvaDetected"), + I18n.PAGE.getString("ImageUpload.WizardPage.dialog.title"), dialogButton); if (dialogResult == 0) { // txtImageFile.setText(file.getAbsolutePath()); // txtImageName.setText(state.meta.getDisplayName()); @@ -177,8 +178,8 @@ public class ImageUploadPage extends ImageUploadPageLayout { final String fileformat = state.meta.getVirtualizer().virtName; // bail if multiple hypervisors are not supported if (!(state.meta instanceof VmwareMetaData) && !Session.hasFeature(Feature.MULTIPLE_HYPERVISORS)) { - setErrorMessage( - I18n.PAGE.getString("ImageUpload.WizardPage.errorMessage.hypervisorNotSupported", fileformat)); + setErrorMessage(I18n.PAGE.getString("ImageUpload.WizardPage.errorMessage.hypervisorNotSupported", + fileformat)); setPageComplete(false); return; } @@ -201,7 +202,8 @@ public class ImageUploadPage extends ImageUploadPageLayout { return; } if (hdds.size() > 1) { - setErrorMessage(I18n.PAGE.getString("ImageUpload.WizardPage.errorMessage.moreThanOneHDD", fileformat)); + setErrorMessage( + I18n.PAGE.getString("ImageUpload.WizardPage.errorMessage.moreThanOneHDD", fileformat)); setPageComplete(false); return; // Allow to continue!? @@ -228,8 +230,9 @@ public class ImageUploadPage extends ImageUploadPageLayout { setPageComplete(false); return; } catch (UnknownImageFormatException e) { - setErrorMessage(I18n.PAGE.getString("ImageUpload.WizardPage.errorMessage.diskImageHasUnknownFormat", - vmDiskFileInfo.getName())); + setErrorMessage( + I18n.PAGE.getString("ImageUpload.WizardPage.errorMessage.diskImageHasUnknownFormat", + vmDiskFileInfo.getName())); LOGGER.debug("Selected disk file has unknown format.", e); setPageComplete(false); return; @@ -237,16 +240,17 @@ public class ImageUploadPage extends ImageUploadPageLayout { // Warn user about snapshot if (diskImage.isSnapshot || state.meta.isMachineSnapshot()) { - Gui.showMessageBox( - I18n.PAGE.getString("ImageUpload.Message.warning.diskImageSnapshot", Branding.getServiceName()), - MessageType.WARNING, null, null); + Gui.showMessageBox(I18n.PAGE.getString("ImageUpload.Message.warning.diskImageSnapshot", + Branding.getServiceName()), MessageType.WARNING, null, null); setErrorMessage(I18n.PAGE.getString("ImageUpload.WizardPage.errorMessage.diskImageSnapshot")); setPageComplete(false); return; } if (!diskImage.isStandalone) { - Gui.showMessageBox(I18n.PAGE.getString("ImageUpload.Message.warning.diskImageStandalone", - diskImage.subFormat, Branding.getApplicationName()), MessageType.WARNING, null, null); + Gui.showMessageBox( + I18n.PAGE.getString("ImageUpload.Message.warning.diskImageStandalone", + diskImage.subFormat, Branding.getApplicationName()), + MessageType.WARNING, null, null); setErrorMessage(I18n.PAGE.getString("ImageUpload.WizardPage.errorMessage.diskImageStandalone")); setPageComplete(false); return; @@ -328,12 +332,14 @@ public class ImageUploadPage extends ImageUploadPageLayout { // file, connecting for upload... if (state.upload == null) { try { - state.upload = new UploadInitiator(state.uuid, state.diskFile, state.meta.getFilteredDefinition()); + state.upload = new UploadInitiator(state.uuid, state.diskFile, + state.meta.getFilteredDefinition()); } catch (WrappedException e) { ThriftError.showMessage(this, LOGGER, e.exception, e.displayMessage); return false; } catch (IOException e) { - Gui.showMessageBox(this, I18n.PAGE.getString("ImageUpload.Message.error.uploadInitiatorFailed"), + Gui.showMessageBox(this, + I18n.PAGE.getString("ImageUpload.Message.error.uploadInitiatorFailed"), MessageType.ERROR, LOGGER, e); return false; } |