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

Conflicts:
	Dozentenmodul/.classpath
	Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class
	Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
	Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
	Dozentenmodul/bin/gui/intro/Login_GUI.class
	Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java
	Dozentenmodul/src/gui/lecture/ExtendedSearchForLectures_GUI.java
	Dozentenmodul/src/main/java/gui/lecture/ExtendedSearchForImages_GUI.java
	Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class
	Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class
	Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$startFileCopy_args.class
	Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$updateImageData_args.class
	Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$updateImageData_result.class
	Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class
	Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$writeVLdata_args.class
	Dozentenmodulserver/bin/sql/SQL.class

1 files changed, 47 insertions, 15 deletions

diff --git a/Dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
index 825292c2..6573b802 100644
--- a/Dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
@@ -53,8 +53,11 @@ public class EditImageTechnisch_GUI extends JFrame {
 	JRadioButton rdbtnlicenseNein;
 	JRadioButton rdbtnInternetJa;
 	JRadioButton rdbtnInternetNein;
+	JRadioButton radioButtonVorlageJa;
+	JRadioButton radioButtonVorlageNein;
 	private final ButtonGroup buttonGrouplicense = new ButtonGroup();
 	private final ButtonGroup buttonGroupInternet = new ButtonGroup();
+	private final ButtonGroup buttonGroupVorlage = new ButtonGroup();
 
 	/**
 	 * Create the dialog.
@@ -118,24 +121,24 @@ public class EditImageTechnisch_GUI extends JFrame {
 		panel_1.setBackground(SystemColor.menu);
 		panel_1.setBorder(new TitledBorder(null, "Informationen zum Image",
 				TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 66, 557, 95);
+		panel_1.setBounds(10, 25, 557, 136);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
 
 		JLabel lblNewLabel_2 = new JLabel(
 				"Image enth\u00E4lt lizenzpflichtige Software:");
-		lblNewLabel_2.setBounds(10, 30, 250, 20);
+		lblNewLabel_2.setBounds(10, 46, 250, 20);
 		panel_1.add(lblNewLabel_2);
 
 		rdbtnlicenseJa = new JRadioButton("Ja");
 		rdbtnlicenseJa.setSelected(true);
 		buttonGrouplicense.add(rdbtnlicenseJa);
-		rdbtnlicenseJa.setBounds(266, 29, 109, 23);
+		rdbtnlicenseJa.setBounds(266, 45, 109, 23);
 		panel_1.add(rdbtnlicenseJa);
 
 		rdbtnlicenseNein = new JRadioButton("Nein");
 		buttonGrouplicense.add(rdbtnlicenseNein);
-		rdbtnlicenseNein.setBounds(377, 29, 109, 23);
+		rdbtnlicenseNein.setBounds(377, 45, 109, 23);
 		panel_1.add(rdbtnlicenseNein);
 		if (Image.image.isLicensed() == true) {
 			rdbtnlicenseJa.setSelected(true);
@@ -145,23 +148,47 @@ public class EditImageTechnisch_GUI extends JFrame {
 
 		JLabel lblInternetIstInnerhalb = new JLabel(
 				"Internet ist innerhalb des Image gesperrt:");
-		lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
+		lblInternetIstInnerhalb.setBounds(10, 74, 250, 20);
 		panel_1.add(lblInternetIstInnerhalb);
 
 		rdbtnInternetJa = new JRadioButton("Ja");
 		buttonGroupInternet.add(rdbtnInternetJa);
-		rdbtnInternetJa.setBounds(266, 57, 109, 23);
+		rdbtnInternetJa.setBounds(266, 73, 109, 23);
 		panel_1.add(rdbtnInternetJa);
 
 		rdbtnInternetNein = new JRadioButton("Nein");
 		rdbtnInternetNein.setSelected(true);
 		buttonGroupInternet.add(rdbtnInternetNein);
-		rdbtnInternetNein.setBounds(377, 57, 109, 23);
+		rdbtnInternetNein.setBounds(377, 73, 109, 23);
 		panel_1.add(rdbtnInternetNein);
-		if (Image.image.isInternet() == true) {
-			rdbtnInternetJa.setSelected(true);
+		
+		JLabel label = new JLabel("Lizenzserver eintragen:");
+		label.setBounds(10, 103, 250, 20);
+		panel_1.add(label);
+		
+		JButton button = new JButton("Server-Adresse...");
+		button.setEnabled(false);
+		button.setBounds(266, 102, 157, 23);
+		panel_1.add(button);
+		
+		JLabel label_4 = new JLabel("Image ist eine Vorlage:");
+		label_4.setBounds(10, 20, 250, 20);
+		panel_1.add(label_4);
+		
+		radioButtonVorlageJa = new JRadioButton("Ja");
+		buttonGroupVorlage.add(radioButtonVorlageJa);
+		radioButtonVorlageJa.setSelected(true);
+		radioButtonVorlageJa.setBounds(266, 19, 41, 23);
+		panel_1.add(radioButtonVorlageJa);
+		
+		radioButtonVorlageNein = new JRadioButton("Nein");
+		buttonGroupVorlage.add(radioButtonVorlageNein);
+		radioButtonVorlageNein.setBounds(377, 19, 46, 23);
+		panel_1.add(radioButtonVorlageNein);
+		if (Image.image.isVorlage() == true) {
+			radioButtonVorlageJa.setSelected(true);
 		} else {
-			rdbtnInternetNein.setSelected(true);
+			radioButtonVorlageNein.setSelected(true);
 		}
 		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
 		lblHauptmen.addMouseListener(new MouseAdapter() {
@@ -175,24 +202,24 @@ public class EditImageTechnisch_GUI extends JFrame {
 			}
 		});
 		lblHauptmen.setForeground(Color.BLUE);
-		lblHauptmen.setBounds(10, 11, 61, 14);
+		lblHauptmen.setBounds(10, 0, 61, 14);
 		contentPanel.add(lblHauptmen);
 
 		JLabel label_1 = new JLabel(">");
-		label_1.setBounds(69, 11, 13, 14);
+		label_1.setBounds(69, 0, 13, 14);
 		contentPanel.add(label_1);
 
 		JLabel lblVlimage = new JLabel("VL-Image");
 		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 45, 14);
+		lblVlimage.setBounds(81, 0, 45, 14);
 		contentPanel.add(lblVlimage);
 
 		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(133, 11, 13, 14);
+		label_2.setBounds(133, 0, 13, 14);
 		contentPanel.add(label_2);
 
 		JLabel lblNewLabel_1 = new JLabel("Neu");
-		lblNewLabel_1.setBounds(146, 11, 46, 14);
+		lblNewLabel_1.setBounds(146, 0, 46, 14);
 		contentPanel.add(lblNewLabel_1);
 
 		JPanel panel_2 = new JPanel();
@@ -320,6 +347,11 @@ public class EditImageTechnisch_GUI extends JFrame {
 						} else {
 							Image.image.setLicensed(false);
 						}
+						if (radioButtonVorlageJa.isSelected() == true) {
+							Image.image.setVorlage(true);
+						} else {
+							Image.image.setVorlage(false);
+						}
 						// oeffnet das naechste Fenster
 						EditImageFreigabe_GUI ea=new EditImageFreigabe_GUI();
 						ea.setVisible(true);