From 862f7f7fbea471e27375b3f8c6ccaca3b6ec8722 Mon Sep 17 00:00:00 2001 From: Nino Breuer Date: Mon, 17 Nov 2014 19:37:42 +0100 Subject: • fixed bug where the os name was not set to the correct value while editing an image --- .../src/main/java/gui/image/EditImageTechnisch_GUI.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java') diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java index 9b687de4..a273d7cc 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java @@ -191,6 +191,13 @@ public class EditImageTechnisch_GUI extends JFrame { comboBox.setBounds(270, 26, 277, 20); panel_1.add(comboBox); + try { + comboBox.setSelectedItem(client.getOsNameForGuestOs(Image.image.getOS())); + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + chckbxIsInternetBlocked.setSelected(Image.image.isInternet()); chckbxIsLicensed.setSelected(Image.image.isLicensed()); @@ -328,6 +335,8 @@ public class EditImageTechnisch_GUI extends JFrame { JButton cancelButton = new JButton("Weiter"); cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { + + Image.image.setCpu(Integer.valueOf( spinnerCPU.getValue().toString()).intValue()); Image.image.setRam(Integer.valueOf( @@ -335,6 +344,9 @@ public class EditImageTechnisch_GUI extends JFrame { Image.image.setInternet(chckbxIsInternetBlocked.isSelected()); Image.image.setLicensed(chckbxIsLicensed.isSelected()); Image.image.setOS(comboBox.getSelectedItem().toString()); + + //System.out.println("OS bei Klick auf Weiter: "+Image.image.getOS()); + LOGGER.info("OS: " + Image.image.getOS() + ", Vorlage: " + Image.image.isVorlage() + ", Lizenzpflichtig: " + Image.image.isLicensed() + -- cgit v1.2.3-55-g7522