Es ist nun möglich ein Image als Vorlage definiert anzulegen und hochzuladen.

Ebsenso ist es möglich eine Vorlage in ein bestehendes Image und andersrum zu tauschen

12 files changed, 461 insertions, 60 deletions

diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
index 34594f3d..f861901f 100644
--- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/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/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
index 47837c22..59483fde 100644
--- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/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/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java
index 825292c2..6573b802 100644
--- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/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/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/gui/image/ExtendedSearchForImages_GUI.java
index 579ea3bd..872e8f8d 100644
--- a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java
+++ b/Dozentenmodul/src/gui/image/ExtendedSearchForImages_GUI.java
@@ -1,4 +1,4 @@
-package gui.lecture;
+package gui.image;
 
 
 import gui.image.CreateImageAllgemein_GUI;
@@ -14,6 +14,7 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.List;
 
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -32,7 +33,12 @@ import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 
+import org.apache.thrift.TException;
+
 import models.Links;
+import models.Search;
+import server.Server.Client;
+import thrift.ThriftConnection;
 import util.GuiOrganizer;
 import util.OpenLinks;
 
@@ -43,7 +49,12 @@ public class ExtendedSearchForImages_GUI extends JFrame {
 	String[] result;
 	private JTextField textField;
 	private JTextField textField_1;
-	
+	JCheckBox chckbxBestehendesImage;
+	JCheckBox chckbxRohling;
+	JComboBox<String> comboBox;
+	Search search=new Search();
+	ThriftConnection con = new ThriftConnection();
+	Client client = models.Client.clientcon.getClient();
 
 	/**
 	 * Create the dialog.
@@ -101,13 +112,13 @@ public class ExtendedSearchForImages_GUI extends JFrame {
 		lblNewLabel_2.setBounds(10, 39, 176, 20);
 		panel_1.add(lblNewLabel_2);
 		
-		JCheckBox chckbxBestehendesImage = new JCheckBox("Bestehendes Image");
-		chckbxBestehendesImage.setSelected(true);
+		chckbxBestehendesImage = new JCheckBox("Bestehendes Image");
+		chckbxBestehendesImage.setSelected(search.isExistingImage());
 		chckbxBestehendesImage.setBounds(192, 38, 138, 23);
 		panel_1.add(chckbxBestehendesImage);
 		
-		JCheckBox chckbxRohling = new JCheckBox("Rohling");
-		chckbxRohling.setSelected(true);
+		chckbxRohling = new JCheckBox("Rohling");
+		chckbxRohling.setSelected(search.isRohling());
 		chckbxRohling.setBounds(332, 38, 97, 23);
 		panel_1.add(chckbxRohling);
 		
@@ -124,6 +135,7 @@ public class ExtendedSearchForImages_GUI extends JFrame {
 		
 		textField = new JTextField();
 		textField.setBounds(196, 39, 351, 20);
+		textField.setText(search.getSoftware());
 		panel.add(textField);
 		textField.setColumns(10);
 		
@@ -145,13 +157,24 @@ public class ExtendedSearchForImages_GUI extends JFrame {
 		textField_1 = new JTextField();
 		textField_1.setColumns(10);
 		textField_1.setBounds(196, 39, 351, 20);
+		textField_1.setText(search.getCreator());
 		panel_2.add(textField_1);
 		
 		JLabel lblHochschuleuniversitt = new JLabel("Hochschule/Universit\u00E4t");
 		lblHochschuleuniversitt.setBounds(10, 70, 176, 20);
 		panel_2.add(lblHochschuleuniversitt);
 		
-		JComboBox<String> comboBox = new JComboBox<String>();
+		comboBox = new JComboBox<String>();
+		try {
+			List<String> universities=client.getAllUniversities();
+			for(int i=0; i< universities.size();i++)
+			{
+				comboBox.addItem(universities.get(i).toString());
+			}
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
 		comboBox.setBounds(196, 70, 351, 20);
 		panel_2.add(comboBox);
 		{
@@ -161,30 +184,16 @@ public class ExtendedSearchForImages_GUI extends JFrame {
 			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
 			getContentPane().add(buttonPane);
 			{
-				JButton okButton = new JButton("Zur\u00FCck");
-				okButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-
-						
-						CreateImageAllgemein_GUI sr=new CreateImageAllgemein_GUI();
-						sr.setVisible(true);
-						dispose();
-					}
-				});
-				okButton.setActionCommand("OK");
-				buttonPane.add(okButton);
-				getRootPane().setDefaultButton(okButton);
-			}
-			{
 				JButton cancelButton = new JButton("\u00DCbernehmen");
 				cancelButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						
-
-						FTPCreateUploader_GUI ea=new FTPCreateUploader_GUI();
-						ea.setVisible(true);
+						search.setExistingImage(chckbxBestehendesImage.isSelected());
+						search.setRohling(chckbxRohling.isSelected());
+						search.setSoftware(textField.getText());
+						search.setCreator(textField_1.getText());
+						search.setHochschule(comboBox.getSelectedItem().toString());
+						System.out.println("Working :" +search.getSoftware());
 						dispose();
-						
 					}
 				});
 				cancelButton.setActionCommand("Cancel");
diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
index b850ccb2..88457e5a 100644
--- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
+++ b/Dozentenmodul/src/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/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
index a2123712..9e21aba3 100644
--- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
+++ b/Dozentenmodul/src/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/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
index ef8b75bb..c20ecc99 100644
--- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java
+++ b/Dozentenmodul/src/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/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java
index 06a87307..86c88fe4 100644
--- a/Dozentenmodul/src/gui/intro/Login_GUI.java
+++ b/Dozentenmodul/src/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/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
index 0a00e781..0f30aa15 100644
--- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
+++ b/Dozentenmodul/src/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/gui/lecture/ExtendedSearchForLectures_GUI.java b/Dozentenmodul/src/gui/lecture/ExtendedSearchForLectures_GUI.java
new file mode 100644
index 00000000..9afb1790
--- /dev/null
+++ b/Dozentenmodul/src/gui/lecture/ExtendedSearchForLectures_GUI.java
@@ -0,0 +1,269 @@
+package gui.lecture;
+
+
+import gui.image.CreateImageAllgemein_GUI;
+import gui.image.FTPCreateUploader_GUI;
+import gui.intro.About_GUI;
+
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.SystemColor;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.JTextField;
+import javax.swing.JTextPane;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
+
+import models.Links;
+import util.GuiOrganizer;
+import util.OpenLinks;
+
+@SuppressWarnings("serial")
+public class ExtendedSearchForLectures_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	private JTextField textField;
+	private JTextField textField_1;
+	
+
+	/**
+	 * Create the dialog.
+	 */
+	public ExtendedSearchForLectures_GUI() {
+	
+		setResizable(false);
+		
+		try {
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		setTitle("bwLehrpool Suite *Prototyp* - Erweiterte Suche");
+		setBounds(0, 0, 603, 722);
+		GuiOrganizer.centerGUI(this);
+
+		getContentPane().setLayout(null);
+		{
+			JPanel panel = new JPanel();
+			panel.setBackground(SystemColor.menu);
+			panel.setBounds(10, 11, 577, 57);
+			getContentPane().add(panel);
+			panel.setLayout(null);
+			{
+				JLabel lblNewLabel = new JLabel("Weitere Suchoptionen");
+				lblNewLabel.setBounds(10, 11, 509, 22);
+				panel.add(lblNewLabel);
+				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
+			}
+			
+			JTextPane txtpnBitteWhlenSie = new JTextPane();
+			txtpnBitteWhlenSie.setEditable(false);
+			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
+			txtpnBitteWhlenSie.setText("beschreibung");
+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
+			panel.add(txtpnBitteWhlenSie);
+		}
+		contentPanel.setBounds(10, 85, 577, 493);
+		contentPanel.setBackground(SystemColor.menu);
+		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		getContentPane().add(contentPanel);
+		contentPanel.setLayout(null);
+		
+		JPanel panel_1 = new JPanel();
+		panel_1.setBackground(SystemColor.menu);
+		panel_1.setBorder(new TitledBorder(null, "Image-Typ", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_1.setBounds(10, 11, 557, 95);
+		contentPanel.add(panel_1);
+		panel_1.setLayout(null);
+		
+		JLabel lblNewLabel_2 = new JLabel("Image-Typ");
+		lblNewLabel_2.setBounds(10, 39, 176, 20);
+		panel_1.add(lblNewLabel_2);
+		
+		JCheckBox chckbxBestehendesImage = new JCheckBox("Bestehendes Image");
+		chckbxBestehendesImage.setSelected(true);
+		chckbxBestehendesImage.setBounds(192, 38, 138, 23);
+		panel_1.add(chckbxBestehendesImage);
+		
+		JCheckBox chckbxRohling = new JCheckBox("Rohling");
+		chckbxRohling.setSelected(true);
+		chckbxRohling.setBounds(332, 38, 97, 23);
+		panel_1.add(chckbxRohling);
+		
+		JPanel panel = new JPanel();
+		panel.setLayout(null);
+		panel.setBorder(new TitledBorder(null, "Image-Inhalt", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel.setBackground(SystemColor.menu);
+		panel.setBounds(10, 117, 557, 95);
+		contentPanel.add(panel);
+		
+		JLabel lblEnthalteneSoftware = new JLabel("Enthaltene Software");
+		lblEnthalteneSoftware.setBounds(10, 39, 176, 20);
+		panel.add(lblEnthalteneSoftware);
+		
+		textField = new JTextField();
+		textField.setBounds(196, 39, 351, 20);
+		panel.add(textField);
+		textField.setColumns(10);
+		
+		JLabel lblNewLabel_1 = new JLabel("Bitte mit ; getrennt angeben");
+		lblNewLabel_1.setBounds(196, 70, 351, 14);
+		panel.add(lblNewLabel_1);
+		
+		JPanel panel_2 = new JPanel();
+		panel_2.setLayout(null);
+		panel_2.setBorder(new TitledBorder(null, "Informationen zum Ersteller", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_2.setBackground(SystemColor.menu);
+		panel_2.setBounds(10, 223, 557, 123);
+		contentPanel.add(panel_2);
+		
+		JLabel lblNachnameDesErstellers = new JLabel("Nachname des Erstellers");
+		lblNachnameDesErstellers.setBounds(10, 39, 176, 20);
+		panel_2.add(lblNachnameDesErstellers);
+		
+		textField_1 = new JTextField();
+		textField_1.setColumns(10);
+		textField_1.setBounds(196, 39, 351, 20);
+		panel_2.add(textField_1);
+		
+		JLabel lblHochschuleuniversitt = new JLabel("Hochschule/Universit\u00E4t");
+		lblHochschuleuniversitt.setBounds(10, 70, 176, 20);
+		panel_2.add(lblHochschuleuniversitt);
+		
+		JComboBox<String> comboBox = new JComboBox<String>();
+		comboBox.setBounds(196, 70, 351, 20);
+		panel_2.add(comboBox);
+		{
+			JPanel buttonPane = new JPanel();
+			buttonPane.setBounds(0, 640, 597, 33);
+			buttonPane.setBackground(SystemColor.menu);
+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+			getContentPane().add(buttonPane);
+			{
+				JButton okButton = new JButton("Zur\u00FCck");
+				okButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+
+						
+						CreateImageAllgemein_GUI sr=new CreateImageAllgemein_GUI();
+						sr.setVisible(true);
+						dispose();
+					}
+				});
+				okButton.setActionCommand("OK");
+				buttonPane.add(okButton);
+				getRootPane().setDefaultButton(okButton);
+			}
+			{
+				JButton cancelButton = new JButton("\u00DCbernehmen");
+				cancelButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						
+
+						FTPCreateUploader_GUI ea=new FTPCreateUploader_GUI();
+						ea.setVisible(true);
+						dispose();
+						
+					}
+				});
+				cancelButton.setActionCommand("Cancel");
+				buttonPane.add(cancelButton);
+			}
+		}
+		
+		JSeparator separator = new JSeparator();
+		separator.setBounds(0, 78, 597, 2);
+		getContentPane().add(separator);
+		
+		JSeparator separator_1 = new JSeparator();
+		separator_1.setBounds(0, 627, 597, 2);
+		getContentPane().add(separator_1);
+		
+		JMenuBar menuBar = new JMenuBar();
+		setJMenuBar(menuBar);
+		
+		JMenu mnNewMenu = new JMenu("Suchen");
+		menuBar.add(mnNewMenu);
+		
+		JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
+		mnNewMenu.add(mntmVlSuche);
+		
+		JMenu mnNewMenu_1 = new JMenu("Hilfe");
+		menuBar.add(mnNewMenu_1);
+		
+		JMenuItem mntmFaq = new JMenuItem("FAQ");
+		mntmFaq.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mousePressed(MouseEvent arg0) {
+				
+				OpenLinks open = new OpenLinks();
+				
+				URI windows;
+				try {
+					windows = new URI(Links.getFAQ());
+					
+					open.openWebpage(windows);
+					
+				} catch (URISyntaxException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+		});
+		mnNewMenu_1.add(mntmFaq);
+		
+
+		JMenuItem mntmOtrs = new JMenuItem("OTRS");
+		mntmOtrs.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mousePressed(MouseEvent arg0) {
+
+				OpenLinks open = new OpenLinks();
+				
+				URI windows;
+				try {
+					windows = new URI(Links.getOTRS());
+					
+					open.openWebpage(windows);
+					
+				} catch (URISyntaxException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				
+			}
+		});
+		mnNewMenu_1.add(mntmOtrs);
+		
+		JMenuItem mntmAbout = new JMenuItem("About");
+		mntmAbout.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				About_GUI ab = new About_GUI();
+				ab.setVisible(true);
+			}
+		});
+		mnNewMenu_1.add(mntmAbout);
+		
+	}
+}
diff --git a/Dozentenmodul/src/models/Image.java b/Dozentenmodul/src/models/Image.java
index 86bc1e48..a18ae8fe 100644
--- a/Dozentenmodul/src/models/Image.java
+++ b/Dozentenmodul/src/models/Image.java
@@ -19,6 +19,8 @@ public class Image {
         private boolean licensed;
 
         private boolean internet;
+        
+        private boolean vorlage;
 
         private int ram;
 
@@ -166,6 +168,15 @@ public class Image {
 
         }
 
+		public boolean isVorlage() {
+			return vorlage;
+		}
+
+		public void setVorlage(boolean vorlage) {
+			this.vorlage = vorlage;
+		}
+
+        
         
 
 }
diff --git a/Dozentenmodul/src/models/Search.java b/Dozentenmodul/src/models/Search.java
new file mode 100644
index 00000000..59a28b21
--- /dev/null
+++ b/Dozentenmodul/src/models/Search.java
@@ -0,0 +1,46 @@
+package models;
+
+public class Search {
+	
+	
+	private String Software;
+	private String Hochschule;
+	private String Creator;
+	private boolean ExistingImage;
+	private boolean Rohling;
+	public static Search search =new Search();
+
+	public String getSoftware() {
+		return Software;
+	}
+	public void setSoftware(String software) {
+		Software = software;
+	}
+	public String getHochschule() {
+		return Hochschule;
+	}
+	public void setHochschule(String hochschule) {
+		Hochschule = hochschule;
+	}
+	public String getCreator() {
+		return Creator;
+	}
+	public void setCreator(String creator) {
+		Creator = creator;
+	}
+	public boolean isExistingImage() {
+		return ExistingImage;
+	}
+	public void setExistingImage(boolean existingImage) {
+		ExistingImage = existingImage;
+	}
+	public boolean isRohling() {
+		return Rohling;
+	}
+	public void setRohling(boolean rohling) {
+		Rohling = rohling;
+	}
+	
+	
+
+}