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

9 files changed, 101 insertions, 35 deletions

diff --git a/Dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
index 34594f3d..f861901f 100644
--- a/Dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
@@ -52,8 +52,11 @@ public class CreateImageTechnisch_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();
 	
 
 	/**
@@ -110,55 +113,70 @@ public class CreateImageTechnisch_GUI extends JFrame {
 		JPanel panel_1 = new JPanel();
 		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, 124);
+		panel_1.setBounds(10, 52, 557, 138);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
 		
 		rdbtnlicenseNein = new JRadioButton("Nein");
 		buttonGrouplicense.add(rdbtnlicenseNein);
-		rdbtnlicenseNein.setBounds(377, 29, 46, 23);
+		rdbtnlicenseNein.setBounds(377, 49, 46, 23);
 		panel_1.add(rdbtnlicenseNein);
 		
 		rdbtnInternetNein = new JRadioButton("Nein");
 		rdbtnInternetNein.setSelected(true);
 		buttonGroupInternet.add(rdbtnInternetNein);
-		rdbtnInternetNein.setBounds(377, 57, 46, 23);
+		rdbtnInternetNein.setBounds(377, 77, 46, 23);
 		panel_1.add(rdbtnInternetNein);
 		
 		JLabel lblInternetIstInnerhalb = new JLabel("Internet ist f\u00FCr dieses Image gesperrt:");
-		lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
+		lblInternetIstInnerhalb.setBounds(10, 78, 250, 20);
 		panel_1.add(lblInternetIstInnerhalb);
 		
 		JButton btnInternetSettings = new JButton("Einstellungen...");
 		btnInternetSettings.setEnabled(false);
-		btnInternetSettings.setBounds(439, 57, 108, 23);
+		btnInternetSettings.setBounds(439, 77, 108, 23);
 		panel_1.add(btnInternetSettings);
 		
 		rdbtnInternetJa = new JRadioButton("Ja");
 		
 		buttonGroupInternet.add(rdbtnInternetJa);
-		rdbtnInternetJa.setBounds(266, 57, 41, 23);
+		rdbtnInternetJa.setBounds(266, 77, 41, 23);
 		panel_1.add(rdbtnInternetJa);
 		
 		rdbtnlicenseJa = new JRadioButton("Ja");
 		rdbtnlicenseJa.setSelected(true);
 		buttonGrouplicense.add(rdbtnlicenseJa);
-		rdbtnlicenseJa.setBounds(266, 29, 41, 23);
+		rdbtnlicenseJa.setBounds(266, 49, 41, 23);
 		panel_1.add(rdbtnlicenseJa);
 		
 		JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:");
-		lblNewLabel_2.setBounds(10, 30, 250, 20);
+		lblNewLabel_2.setBounds(10, 50, 250, 20);
 		panel_1.add(lblNewLabel_2);
 		
 		JLabel lblLizenzserverEintragen = new JLabel("Lizenzserver eintragen:");
-		lblLizenzserverEintragen.setBounds(10, 85, 250, 20);
+		lblLizenzserverEintragen.setBounds(10, 105, 250, 20);
 		panel_1.add(lblLizenzserverEintragen);
 		
 		JButton btnLicenseServer = new JButton("Server-Adresse...");
 		btnLicenseServer.setEnabled(false);
-		btnLicenseServer.setBounds(266, 84, 157, 23);
+		btnLicenseServer.setBounds(266, 104, 157, 23);
 		panel_1.add(btnLicenseServer);
 		
+		JLabel lblImageIstEine = new JLabel("Image ist eine Vorlage:");
+		lblImageIstEine.setBounds(10, 24, 250, 20);
+		panel_1.add(lblImageIstEine);
+		
+		radioButtonVorlageJa = new JRadioButton("Ja");
+		buttonGroupVorlage.add(radioButtonVorlageJa);
+		radioButtonVorlageJa.setSelected(true);
+		radioButtonVorlageJa.setBounds(266, 23, 41, 23);
+		panel_1.add(radioButtonVorlageJa);
+		
+		radioButtonVorlageNein = new JRadioButton("Nein");
+		buttonGroupVorlage.add(radioButtonVorlageNein);
+		radioButtonVorlageNein.setBounds(377, 23, 46, 23);
+		panel_1.add(radioButtonVorlageNein);
+		
 		JPanel panel_2 = new JPanel();
 		panel_2.setLayout(null);
 		panel_2.setBorder(new TitledBorder(null, "Empfehlung bez\u00fcglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
@@ -314,6 +332,14 @@ public class CreateImageTechnisch_GUI extends JFrame {
 						{
 							Image.image.setLicensed(false);
 						}
+						if(radioButtonVorlageJa.isSelected()==true)
+						{
+							Image.image.setVorlage(true);
+						}
+						else
+						{
+							Image.image.setVorlage(false);
+						}
 						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());
 						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());
 						CreateImageFreigabe_GUI ea=new CreateImageFreigabe_GUI();
diff --git a/Dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
index 47837c22..59483fde 100644
--- a/Dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
@@ -398,6 +398,12 @@ public class EditImageAllgemein_GUI extends JFrame {
 			} else {
 				Image.image.setLicensed(true);
 			}
+			System.out.println(map.get("template"));
+			if (map.get("template").equals("false")) {
+				Image.image.setVorlage(false);
+			} else {
+				Image.image.setVorlage(true);
+			}
 			Image.image.setImagename(map.get("name"));
 			Image.image.setRam(Integer.parseInt(map.get("ram")));
 			Image.image.setCpu(Integer.parseInt(map.get("cpu")));
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);
diff --git a/Dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index b850ccb2..88457e5a 100644
--- a/Dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/Dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -531,7 +531,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 					person.verantwortlicher.getFakultaet(),
 					Image.image.isLicensed(), Image.image.isInternet(),
 					Image.image.getRam(), Image.image.getCpu(),
-					"temp/" + Image.image.getNewName(),false,Image.image.getFilesize(),Image.image.getShareMode());
+					"temp/" + Image.image.getNewName(),Image.image.isVorlage(),Image.image.getFilesize(),Image.image.getShareMode());
 			client.startFileCopy(Image.image.getNewName());
 		} catch (TException e) {
 			// TODO Auto-generated catch block
diff --git a/Dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
index a2123712..9e21aba3 100644
--- a/Dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/Dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -511,7 +511,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 						Image.image.getImagename(),Image.image.getImagepath(), Image.image.isLicensed(),
 						Image.image.isInternet(), Image.image.getRam(),
 						Image.image.getCpu(), Image.image.getImageId(),
-						Image.image.getVersion(), false,Image.image.getFilesize(),Image.image.getShareMode());
+						Image.image.getVersion(), Image.image.isVorlage(),Image.image.getFilesize(),Image.image.getShareMode());
 				client.startFileCopy(Image.image.getNewName());
 			}
 			else{
@@ -521,7 +521,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 					Image.image.getImagename(),"temp/" + Image.image.getNewName(), Image.image.isLicensed(),
 					Image.image.isInternet(), Image.image.getRam(),
 					Image.image.getCpu(), Image.image.getImageId(),
-					Image.image.getVersion(), false,Image.image.getFilesize(),Image.image.getShareMode());
+					Image.image.getVersion(), Image.image.isVorlage(),Image.image.getFilesize(),Image.image.getShareMode());
 			client.startFileCopy(Image.image.getNewName());
 			}
 		} catch (TException e) {
diff --git a/Dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index ef8b75bb..c20ecc99 100644
--- a/Dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/Dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -201,8 +201,8 @@ public class SearchImage_GUI extends JFrame {
 			public void mouseClicked(MouseEvent arg0) {
 				// oeffnet das Fenster Extended GUI
 				
-				//ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
-				//es.setVisible(true);
+				ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
+				es.setVisible(true);
 			}
 		});
 		lblErweiterteSuche.setForeground(Color.BLUE);
diff --git a/Dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/Dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index 0e289610..e07bfd7d 100644
--- a/Dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/Dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -204,16 +204,18 @@ public class Login_GUI extends JFrame {
 			// null package
 			if (checkClientPackage() == true) {
 				// package has information
+				System.out.println("Auth");
 				result = client.authenticate(lblusername.getText(), passText);
+				System.out.println("Succes Auth");
 				SessionData.session.setAuthToken(result.authToken);
 				SessionData.session.setSessionID(result.sessionId);
 				SessionData.session.setServerAdress(result.serverAddress);
-
+				System.out.println("Master");
 				// set connection to bwLehrpoolSuiteServer
 				ThriftConnection bwthrift = new ThriftConnection();
 				server.Server.Client bwClient = bwthrift.getThriftConnection();
 				models.Client.clientcon.setClient(bwClient);
-
+				System.out.println("Client");
 				System.out.println("Session-ID: " + result.sessionId
 						+ "\nToken: " + result.authToken);
 
diff --git a/Dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index 0a00e781..0f30aa15 100644
--- a/Dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/Dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -184,7 +184,7 @@ public class CreateLectureLink_GUI extends JFrame {
 		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
-				ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
+				ExtendedSearchForLectures_GUI es = new ExtendedSearchForLectures_GUI();
 				es.setVisible(true);
 			}
 		});
diff --git a/Dozentenmodul/src/main/java/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/main/java/gui/lecture/ExtendedSearchForLectures_GUI.java
index 579ea3bd..9afb1790 100644
--- a/Dozentenmodul/src/main/java/gui/lecture/ExtendedSearchForImages_GUI.java
+++ b/Dozentenmodul/src/main/java/gui/lecture/ExtendedSearchForLectures_GUI.java
@@ -37,7 +37,7 @@ import util.GuiOrganizer;
 import util.OpenLinks;
 
 @SuppressWarnings("serial")
-public class ExtendedSearchForImages_GUI extends JFrame {
+public class ExtendedSearchForLectures_GUI extends JFrame {
 
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
@@ -48,7 +48,7 @@ public class ExtendedSearchForImages_GUI extends JFrame {
 	/**
 	 * Create the dialog.
 	 */
-	public ExtendedSearchForImages_GUI() {
+	public ExtendedSearchForLectures_GUI() {
 	
 		setResizable(false);