If OS=windows, then isLicensed always true

2 files changed, 42 insertions, 0 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
index 8e9a9b1f..0fb31a66 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
@@ -157,6 +157,14 @@ public class CreateImageTechnisch_GUI extends JFrame {
 		panel_1.add(lblNewLabel_2);
 		
 		chckbxIsLicensed = new JCheckBox("");
+		chckbxIsLicensed.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				//if windows is selected, always set isLicensed()=true
+				if(comboBox.getSelectedItem().toString().startsWith("Windows")){
+					chckbxIsLicensed.setSelected(true);
+				}
+			}
+		});
 		chckbxIsLicensed.setSelected(true);
 		chckbxIsLicensed.setBounds(266, 52, 97, 23);
 		panel_1.add(chckbxIsLicensed);
@@ -184,6 +192,14 @@ public class CreateImageTechnisch_GUI extends JFrame {
 		// populate comboBox with list of supported OS we get
 		// from the server ...
 		comboBox = new JComboBox<String>();
+		comboBox.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				//if windows is selected, always set isLicensed()=true
+				if(comboBox.getSelectedItem().toString().startsWith("Windows")){
+					chckbxIsLicensed.setSelected(true);
+				}
+			}
+		});
 		List<String> os = null;
 		try {
 			os = client.getAllOS();
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
index 9f03d4d5..98367420 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
@@ -49,6 +49,12 @@ import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 
 import javax.swing.JCheckBox;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
 
 @SuppressWarnings("serial")
 public class EditImageTechnisch_GUI extends JFrame {
@@ -146,6 +152,14 @@ public class EditImageTechnisch_GUI extends JFrame {
 		panel_1.add(lblNewLabel_2);
 		
 		chckbxIsLicensed = new JCheckBox("");
+		chckbxIsLicensed.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				//if windows is selected, always set isLicensed()=true
+				if(comboBox.getSelectedItem().toString().startsWith("Windows")){
+					chckbxIsLicensed.setSelected(true);
+				}
+			}
+		});
 		chckbxIsLicensed.setBounds(266, 57, 97, 23);
 		panel_1.add(chckbxIsLicensed);
 		
@@ -173,6 +187,18 @@ public class EditImageTechnisch_GUI extends JFrame {
 		panel_1.add(lblBetriebssystem);
 		
 		comboBox = new JComboBox<String>();
+		comboBox.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				
+				//if windows is selected, always set isLicensed()=true
+				if(comboBox.getSelectedItem().toString().startsWith("Windows")){
+					chckbxIsLicensed.setSelected(true);
+				}
+			}
+		});
+
+		
+		
 		List<String> os = null;
 		try {
 			os=client.getAllOS();