Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
	dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
	dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
g

1 files changed, 10 insertions, 33 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
index 47fe3967..8a6af0da 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
@@ -66,7 +66,7 @@ public class CreateImageTechnisch_GUI extends JFrame {
 	JSpinner spinnerRam;
 	private JCheckBox chckbxIsLicensed;
 	private JCheckBox chckbxIsInternetBlocked;
-	JComboBox comboBox;
+	JComboBox<String> comboBox;
 	private final ButtonGroup buttonGrouplicense = new ButtonGroup();
 	private final ButtonGroup buttonGroupInternet = new ButtonGroup();
 	private final ButtonGroup buttonGroupVorlage = new ButtonGroup();
@@ -154,11 +154,12 @@ public class CreateImageTechnisch_GUI extends JFrame {
 		panel_1.add(lblNewLabel_2);
 		
 		chckbxIsLicensed = new JCheckBox("");
-		chckbxIsLicensed.setSelected(true);
+		chckbxIsLicensed.setSelected(Image.image.isLicensed());
 		chckbxIsLicensed.setBounds(266, 52, 97, 23);
 		panel_1.add(chckbxIsLicensed);
 		
 		chckbxIsInternetBlocked = new JCheckBox("");
+		chckbxIsInternetBlocked.setSelected(Image.image.isInternet());
 		chckbxIsInternetBlocked.setBounds(266, 80, 97, 23);
 		panel_1.add(chckbxIsInternetBlocked);
 		
@@ -176,45 +177,21 @@ public class CreateImageTechnisch_GUI extends JFrame {
 		lblBetriebssystem.setBounds(10, 21, 250, 20);
 		panel_1.add(lblBetriebssystem);
 		
-		/*
-		if (Image.image.isVorlage() == true) {
-			//radioButtonVorlageJa.setSelected(true);
-			chckbxIsTemplate.setSelected(true);
-		} else {
-			//radioButtonVorlageNein.setSelected(true);
-			chckbxIsTemplate.setSelected(false);
-		}
-		*/
-		
-		if(Image.image.isInternet() == true ){
-			chckbxIsInternetBlocked.setSelected(true);
-		} else {
-			chckbxIsInternetBlocked.setSelected(false);
-		}
-		
-		/* TODO deprecated, as checked is default in new image 
-		if (Image.image.isLicensed() == true) {
-			//rdbtnlicenseJa.setSelected(true);
-			chckbxIsLicensed.setSelected(true);
-			chckbxIsLicensed.isSelected();
-		} else {
-			//rdbtnlicenseNein.setSelected(true);
-			chckbxIsLicensed.setSelected(false);
-		}
-		*/
-		
-		comboBox = new JComboBox();
+		// populate comboBox with list of supported OS we get
+		// from the server ...
+		comboBox = new JComboBox<String>();
+		List<String> os = null;
 		try {
-			List<String> os=client.getAllOS();
-			
+			os = client.getAllOS();
 			for(int i=0; i<os.size();i++){
 				comboBox.addItem(os.get(i).toString());
 			}
 		} catch (TException e1) {
-			// TODO Auto-generated catch block
 			e1.printStackTrace();
+			LOGGER.error("Could not fetch list of supported OSs from server!");
 		}
 		comboBox.setBounds(270, 21, 277, 20);
+		comboBox.setSelectedItem(Image.image.getOS() == null ? os.get(0) : Image.image.getOS());
 		panel_1.add(comboBox);
 		
 		JPanel panel_2 = new JPanel();