Suchmaske für Images neu

12 files changed, 1836 insertions, 1684 deletions

diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
index ef88fe83..d2f10ed0 100644
--- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
index ede6f4c6..037c95bb 100644
--- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
+++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
index f9d36a25..64a51e5d 100644
--- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
index c65c6705..134aa93c 100644
--- a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
index 21bbf00a..3bfff271 100644
--- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
@@ -22,6 +22,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import javax.swing.JButton;
 import javax.swing.JComboBox;
@@ -47,6 +48,8 @@ import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
@@ -65,6 +68,16 @@ import util.OpenLinks;
 public class DeleteImage_GUI extends JFrame {
 
 	private final JPanel contentPanel = new JPanel();
+	JLabel labelName;
+	JLabel labelUpdate;
+	JLabel labelVerantwortlicher;
+	JLabel labelWeitereVerantwortliche;
+	JLabel labelVorlage;
+	JLabel labelLizenzSoftware;
+	JLabel labelInternet;
+	JLabel labelRam;
+	JLabel labelCPU;
+	private JLabel labelOS;
 	String[] result;
 	JRadioButton rdbtnInternetJa;
 	JRadioButton rdbtnInternetNein;
@@ -173,7 +186,7 @@ public class DeleteImage_GUI extends JFrame {
 		// Setzt den Fenstertitel
 		setTitle("bwLehrpool Suite *Prototyp* - Image l\u00F6schen");
 		// Zentriert das Fenster in die Bildmitte
-		setBounds(0, 0, 603, 722);
+		setBounds(0, 0, 918, 722);
 		GuiOrganizer.centerGUI(this);
 
 		final DefaultTableModel model = new DefaultTableModel(titles, 0);
@@ -182,7 +195,7 @@ public class DeleteImage_GUI extends JFrame {
 		{
 			JPanel panel = new JPanel();
 			panel.setBackground(SystemColor.menu);
-			panel.setBounds(10, 11, 577, 57);
+			panel.setBounds(10, 11, 892, 57);
 			getContentPane().add(panel);
 			panel.setLayout(null);
 			{
@@ -211,7 +224,7 @@ public class DeleteImage_GUI extends JFrame {
 		panel_1.setBackground(SystemColor.menu);
 		panel_1.setBorder(new TitledBorder(null, "Filterfunktionen",
 				TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 49, 557, 92);
+		panel_1.setBounds(10, 49, 557, 98);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
 
@@ -327,17 +340,17 @@ public class DeleteImage_GUI extends JFrame {
 		label_1.setBounds(69, 11, 13, 14);
 		contentPanel.add(label_1);
 
-		JLabel lblVlimage = new JLabel("VL-Image");
+		JLabel lblVlimage = new JLabel("Image");
 		lblVlimage.setForeground(Color.BLUE);
 		lblVlimage.setBounds(81, 11, 45, 14);
 		contentPanel.add(lblVlimage);
 
 		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(133, 11, 13, 14);
+		label_2.setBounds(115, 11, 13, 14);
 		contentPanel.add(label_2);
 
 		JLabel lblNewLabel_1 = new JLabel("Imageauswahl");
-		lblNewLabel_1.setBounds(146, 11, 85, 14);
+		lblNewLabel_1.setBounds(128, 11, 85, 14);
 		contentPanel.add(lblNewLabel_1);
 
 		tabbedPane = new JTabbedPane(JTabbedPane.TOP);
@@ -361,12 +374,33 @@ public class DeleteImage_GUI extends JFrame {
 			}
 		});
 
-		tabbedPane.setBounds(10, 152, 557, 345);
+		tabbedPane.setBounds(10, 158, 557, 339);
 		contentPanel.add(tabbedPane);
 		
 
 		JScrollPane scrollPaneMyImage = new JScrollPane();
 		tablemyImages = new JTable();
+	    tablemyImages.getSelectionModel().addListSelectionListener( new ListSelectionListener()
+	    {
+	        public void valueChanged(ListSelectionEvent e)
+	        {
+	        	String imageid = modelMyImages
+						.getValueAt(
+								tablemyImages
+										.convertRowIndexToModel(tablemyImages
+												.getSelectedRow()), 6)
+						.toString();
+	        	System.out.println(imageid);
+	        	String version = modelMyImages
+						.getValueAt(
+								tablemyImages
+										.convertRowIndexToModel(tablemyImages
+												.getSelectedRow()), 7)
+						.toString();
+	        	System.out.println(version);
+	        	writeImageData(imageid, version);
+	        }
+	    });
 		tablemyImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 		tablemyImages.setModel(modelMyImages);
 		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
@@ -393,6 +427,27 @@ public class DeleteImage_GUI extends JFrame {
 		
 				JScrollPane scrollPanePublicVorlagen = new JScrollPane();
 				tablePublicVorlagen = new JTable();
+			    tablePublicVorlagen.getSelectionModel().addListSelectionListener( new ListSelectionListener()
+			    {
+			        public void valueChanged(ListSelectionEvent e)
+			        {
+			        	String imageid = modelPublicVorlagen
+								.getValueAt(
+										tablePublicVorlagen
+												.convertRowIndexToModel(tablePublicVorlagen
+														.getSelectedRow()), 6)
+								.toString();
+			        	System.out.println(imageid);
+			        	String version = modelPublicVorlagen
+								.getValueAt(
+										tablePublicVorlagen
+												.convertRowIndexToModel(tablePublicVorlagen
+														.getSelectedRow()), 7)
+								.toString();
+			        	System.out.println(version);
+			        	writeImageData(imageid, version);
+			        }
+			    });
 				tablePublicVorlagen.setModel(modelPublicVorlagen);
 				tablePublicVorlagen
 						.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -409,6 +464,29 @@ public class DeleteImage_GUI extends JFrame {
 		
 				JScrollPane scrollPaneAllImages = new JScrollPane();
 				tableAllImages = new JTable();
+			    tableAllImages.getSelectionModel().addListSelectionListener( new ListSelectionListener()
+			    {
+			        public void valueChanged(ListSelectionEvent e)
+			        {
+
+			        	String imageid = modelAll
+								.getValueAt(
+										tableAllImages
+												.convertRowIndexToModel(tableAllImages
+														.getSelectedRow()), 6)
+								.toString();
+			        	System.out.println(imageid);
+			        	String version = modelAll
+								.getValueAt(
+										tableAllImages
+												.convertRowIndexToModel(tableAllImages
+														.getSelectedRow()), 7)
+								.toString();
+			        	System.out.println(version);
+			        	writeImageData(imageid, version);
+
+			        }
+			    });
 				tableAllImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 				tableAllImages.setModel(modelAll);
 				tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit();
@@ -731,7 +809,7 @@ public class DeleteImage_GUI extends JFrame {
 		contentPanel.add(btnDelete);
 		{
 			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 33);
+			buttonPane.setBounds(0, 640, 902, 33);
 			buttonPane.setBackground(SystemColor.menu);
 			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
 			getContentPane().add(buttonPane);
@@ -758,13 +836,110 @@ public class DeleteImage_GUI extends JFrame {
 		}
 
 		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 78, 597, 2);
+		separator.setBounds(0, 79, 912, 1);
 		getContentPane().add(separator);
 
 		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 627, 597, 2);
+		separator_1.setBounds(0, 627, 912, 2);
 		getContentPane().add(separator_1);
 
+		JPanel panel = new JPanel();
+		panel.setLayout(null);
+		panel.setBorder(new TitledBorder(null, "Detailinformationen",
+
+						TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel.setBackground(SystemColor.menu);
+		panel.setBounds(586, 85, 316, 531);
+		getContentPane().add(panel);
+		
+		JLabel lblName = new JLabel("Name:");
+		lblName.setBounds(10, 30, 130, 14);
+		panel.add(lblName);
+		
+		labelName = new JLabel("");
+		labelName.setBounds(150, 30, 130, 14);
+		panel.add(labelName);
+		
+		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");
+		lblVerantwortlicher.setBounds(10, 105, 130, 14);
+		panel.add(lblVerantwortlicher);
+		
+		labelOS = new JLabel("");
+		labelOS.setBounds(150, 55, 130, 14);
+		panel.add(labelOS);
+		
+		JLabel lblWeitereVerantwortliche = new JLabel("Betriebssystem:");
+		lblWeitereVerantwortliche.setBounds(10, 55, 130, 14);
+		panel.add(lblWeitereVerantwortliche);
+		
+		labelVerantwortlicher = new JLabel("");
+		labelVerantwortlicher.setBounds(150, 105, 130, 14);
+		panel.add(labelVerantwortlicher);
+		
+		JLabel label = new JLabel("Weitere Verantwortliche:");
+		label.setBounds(10, 130, 130, 14);
+		panel.add(label);
+		
+		labelWeitereVerantwortliche = new JLabel("");
+		labelWeitereVerantwortliche.setBounds(150, 130, 130, 14);
+		panel.add(labelWeitereVerantwortliche);
+		
+		JLabel label_5 = new JLabel("");
+		label_5.setBounds(150, 130, 130, 14);
+		panel.add(label_5);
+		
+		labelUpdate = new JLabel("");
+		labelUpdate.setBounds(150, 80, 130, 14);
+		panel.add(labelUpdate);
+		
+		JLabel lblLetztesUpdate = new JLabel("Letztes Update:");
+		lblLetztesUpdate.setBounds(10, 80, 130, 14);
+		panel.add(lblLetztesUpdate);
+		
+		JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:");
+		lblImageIstVorlage.setBounds(10, 259, 130, 14);
+		panel.add(lblImageIstVorlage);
+		
+		labelVorlage = new JLabel("");
+		labelVorlage.setBounds(150, 259, 130, 14);
+		panel.add(labelVorlage);
+		
+		labelLizenzSoftware = new JLabel("");
+		labelLizenzSoftware.setBounds(150, 284, 130, 14);
+		panel.add(labelLizenzSoftware);
+		
+		JLabel lblLizenzpflichtigeSoftware = new JLabel("Lizenzpflichtige Software:");
+		lblLizenzpflichtigeSoftware.setBounds(10, 284, 130, 14);
+		panel.add(lblLizenzpflichtigeSoftware);
+		
+		JLabel lblInternet = new JLabel("Internet:");
+		lblInternet.setBounds(10, 309, 130, 14);
+		panel.add(lblInternet);
+		
+		labelInternet = new JLabel("");
+		labelInternet.setBounds(150, 309, 130, 14);
+		panel.add(labelInternet);
+		
+		JLabel lblEmpfehlungRam = new JLabel("Empfehlung RAM:");
+		lblEmpfehlungRam.setBounds(10, 334, 130, 14);
+		panel.add(lblEmpfehlungRam);
+		
+		labelRam = new JLabel("");
+		labelRam.setBounds(150, 334, 130, 14);
+		panel.add(labelRam);
+		
+		JLabel lblEmpfehlungCpu = new JLabel("Empfehlung CPU:");
+		lblEmpfehlungCpu.setBounds(10, 359, 130, 14);
+		panel.add(lblEmpfehlungCpu);
+		
+		labelCPU = new JLabel("");
+		labelCPU.setBounds(150, 359, 130, 14);
+		panel.add(labelCPU);
+		
+		JLabel lblTechnischeDaten = new JLabel("Technische Daten:");
+		lblTechnischeDaten.setBounds(10, 223, 296, 14);
+		panel.add(lblTechnischeDaten);
+		
 		JMenuBar menuBar = new JMenuBar();
 		setJMenuBar(menuBar);
 
@@ -836,8 +1011,8 @@ public class DeleteImage_GUI extends JFrame {
 			Iterator<server.Image> i = images.iterator();
 			
 			int x = 0;
-			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
+			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
 			while (i.hasNext()) {
 				
 				//System.out.println(out.format(in.parse(images.get(x).updateTime)));
@@ -869,5 +1044,40 @@ public class DeleteImage_GUI extends JFrame {
 		}
 		return model;
 	}
-
+	public void writeImageData(String id, String version){
+    	try {
+			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
+			Map<String,String> res=client.getImageData(id,version);
+			labelName.setText(res.get("name"));
+			labelOS.setText(res.get("os"));
+			labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));
+			labelVerantwortlicher.setText(res.get("owner"));
+			labelWeitereVerantwortliche.setText("Noch nicht Verfügbar");
+			if(res.get("template").equals("true")){
+				labelVorlage.setText("Ja");
+			}else{
+				labelVorlage.setText("Nein");
+			}
+			if(res.get("license").equals("1")){
+				labelLizenzSoftware.setText("Ja");
+			}
+			else
+			{
+				labelLizenzSoftware.setText("Nein");
+			}
+			if(res.get("internet").equals("1")){
+				labelInternet.setText("Ja");
+			}
+			else
+			{
+				labelInternet.setText("Nein");
+			}
+			labelRam.setText(res.get("ram"));
+			labelCPU.setText(res.get("cpu"));
+		} catch (TException | ParseException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+	}
 }
diff --git a/Dozentenmodul/src/gui/image/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/gui/image/ExtendedSearchForImages_GUI.java
deleted file mode 100644
index 872e8f8d..00000000
--- a/Dozentenmodul/src/gui/image/ExtendedSearchForImages_GUI.java
+++ /dev/null
@@ -1,278 +0,0 @@
-package gui.image;
-
-
-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 java.util.List;
-
-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 org.apache.thrift.TException;
-
-import models.Links;
-import models.Search;
-import server.Server.Client;
-import thrift.ThriftConnection;
-import util.GuiOrganizer;
-import util.OpenLinks;
-
-@SuppressWarnings("serial")
-public class ExtendedSearchForImages_GUI extends JFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	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.
-	 */
-	public ExtendedSearchForImages_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);
-		
-		chckbxBestehendesImage = new JCheckBox("Bestehendes Image");
-		chckbxBestehendesImage.setSelected(search.isExistingImage());
-		chckbxBestehendesImage.setBounds(192, 38, 138, 23);
-		panel_1.add(chckbxBestehendesImage);
-		
-		chckbxRohling = new JCheckBox("Rohling");
-		chckbxRohling.setSelected(search.isRohling());
-		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);
-		textField.setText(search.getSoftware());
-		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);
-		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);
-		
-		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);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton cancelButton = new JButton("\u00DCbernehmen");
-				cancelButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						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");
-				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/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
index f45c0510..6d03d25c 100644
--- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
@@ -17,8 +17,11 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import javax.swing.JButton;
 import javax.swing.JComboBox;
@@ -43,6 +46,8 @@ import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
@@ -63,6 +68,16 @@ import util.OpenLinks;
 public class SearchEditImage_GUI extends JFrame {
 
 	private final JPanel contentPanel = new JPanel();
+	JLabel labelName;
+	JLabel labelUpdate;
+	JLabel labelVerantwortlicher;
+	JLabel labelWeitereVerantwortliche;
+	JLabel labelVorlage;
+	JLabel labelLizenzSoftware;
+	JLabel labelInternet;
+	JLabel labelRam;
+	JLabel labelCPU;
+	private JLabel labelOS;
 	String[] result;
 	JRadioButton rdbtnInternetJa;
 	JRadioButton rdbtnInternetNein;
@@ -73,7 +88,7 @@ public class SearchEditImage_GUI extends JFrame {
 	boolean activeSearch=false;
 	private JTextField textFieldName;
 	JTabbedPane tabbedPane;
-	String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung",
+	String[] titles = { "Name", "Lizenzpflichtig", "OS", "Veranstaltung",
 			"Verantwortlicher", "Letztes Update", "ID", "Version","Template" };
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
@@ -117,6 +132,42 @@ public class SearchEditImage_GUI extends JFrame {
 				initTableModel(modelMyImages);
 				initTableModel(modelAll);
 				initTableModel(modelPublicVorlagen);
+				tablemyImages.getColumnModel().getColumn(1).setWidth(0);
+				tablemyImages.getColumnModel().getColumn(1).setMinWidth(0);
+				tablemyImages.getColumnModel().getColumn(1).setMaxWidth(0);
+				tablemyImages.getColumnModel().getColumn(8).setWidth(0);
+				tablemyImages.getColumnModel().getColumn(8).setMinWidth(0);
+				tablemyImages.getColumnModel().getColumn(8).setMaxWidth(0);
+				tablemyImages.getColumnModel().getColumn(6).setWidth(0);
+				tablemyImages.getColumnModel().getColumn(6).setMinWidth(0);
+				tablemyImages.getColumnModel().getColumn(6).setMaxWidth(0);
+				tablemyImages.getColumnModel().getColumn(7).setWidth(0);
+				tablemyImages.getColumnModel().getColumn(7).setMinWidth(0);
+				tablemyImages.getColumnModel().getColumn(7).setMaxWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(1).setWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(1).setMinWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(1).setMaxWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(8).setWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(8).setMinWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(8).setMaxWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(6).setWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(6).setMinWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(6).setMaxWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(7).setWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(7).setMinWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(7).setMaxWidth(0);
+				tableAllImages.getColumnModel().getColumn(1).setWidth(0);
+				tableAllImages.getColumnModel().getColumn(1).setMinWidth(0);
+				tableAllImages.getColumnModel().getColumn(1).setMaxWidth(0);
+				tableAllImages.getColumnModel().getColumn(8).setWidth(0);
+				tableAllImages.getColumnModel().getColumn(8).setMinWidth(0);
+				tableAllImages.getColumnModel().getColumn(8).setMaxWidth(0);
+				tableAllImages.getColumnModel().getColumn(6).setWidth(0);
+				tableAllImages.getColumnModel().getColumn(6).setMinWidth(0);
+				tableAllImages.getColumnModel().getColumn(6).setMaxWidth(0);
+				tableAllImages.getColumnModel().getColumn(7).setWidth(0);
+				tableAllImages.getColumnModel().getColumn(7).setMinWidth(0);
+				tableAllImages.getColumnModel().getColumn(7).setMaxWidth(0);
 				textFieldName.requestFocusInWindow();
 			}
 		});
@@ -134,7 +185,7 @@ public class SearchEditImage_GUI extends JFrame {
 		// Setzt den Fenstertitel
 		setTitle("bwLehrpool Suite *Prototyp* - Image bearbeiten");
 		// Zentriert das Fenster in die Bildmitte
-		setBounds(0, 0, 603, 722);
+		setBounds(0, 0, 918, 722);
 		GuiOrganizer.centerGUI(this);
 
 		final DefaultTableModel model = new DefaultTableModel(titles, 0);
@@ -143,11 +194,11 @@ public class SearchEditImage_GUI extends JFrame {
 		{
 			JPanel panel = new JPanel();
 			panel.setBackground(SystemColor.menu);
-			panel.setBounds(10, 11, 577, 57);
+			panel.setBounds(10, 11, 892, 57);
 			getContentPane().add(panel);
 			panel.setLayout(null);
 			{
-				JLabel lblNewLabel = new JLabel("Suche nach VL-Image");
+				JLabel lblNewLabel = new JLabel("Imageauswahl");
 				lblNewLabel.setBounds(10, 11, 509, 22);
 				panel.add(lblNewLabel);
 				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
@@ -157,7 +208,7 @@ public class SearchEditImage_GUI extends JFrame {
 			txtpnBitteWhlenSie.setEditable(false);
 			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
 			txtpnBitteWhlenSie
-					.setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");
+					.setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");
 			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
 			panel.add(txtpnBitteWhlenSie);
 		}
@@ -171,7 +222,7 @@ public class SearchEditImage_GUI extends JFrame {
 		panel_1.setBackground(SystemColor.menu);
 		panel_1.setBorder(new TitledBorder(null, "Filterfunktionen",
 				TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 49, 557, 96);
+		panel_1.setBounds(10, 49, 557, 98);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
 
@@ -285,17 +336,17 @@ public class SearchEditImage_GUI extends JFrame {
 		label_1.setBounds(69, 11, 13, 14);
 		contentPanel.add(label_1);
 
-		JLabel lblVlimage = new JLabel("VL-Image");
+		JLabel lblVlimage = new JLabel("Image");
 		lblVlimage.setForeground(Color.BLUE);
 		lblVlimage.setBounds(81, 11, 45, 14);
 		contentPanel.add(lblVlimage);
 
 		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(133, 11, 13, 14);
+		label_2.setBounds(116, 11, 13, 14);
 		contentPanel.add(label_2);
 
 		JLabel lblNewLabel_1 = new JLabel("Imageauswahl");
-		lblNewLabel_1.setBounds(146, 11, 85, 14);
+		lblNewLabel_1.setBounds(129, 11, 85, 14);
 		contentPanel.add(lblNewLabel_1);
 
 		tabbedPane = new JTabbedPane(JTabbedPane.TOP);
@@ -318,12 +369,33 @@ public class SearchEditImage_GUI extends JFrame {
 			}
 		});
 
-		tabbedPane.setBounds(10, 156, 557, 341);
+		tabbedPane.setBounds(10, 158, 557, 339);
 		contentPanel.add(tabbedPane);
 		
 
 		JScrollPane scrollPaneMyImage = new JScrollPane();
 		tablemyImages = new JTable();
+	    tablemyImages.getSelectionModel().addListSelectionListener( new ListSelectionListener()
+	    {
+	        public void valueChanged(ListSelectionEvent e)
+	        {
+	        	String imageid = modelMyImages
+						.getValueAt(
+								tablemyImages
+										.convertRowIndexToModel(tablemyImages
+												.getSelectedRow()), 6)
+						.toString();
+	        	System.out.println(imageid);
+	        	String version = modelMyImages
+						.getValueAt(
+								tablemyImages
+										.convertRowIndexToModel(tablemyImages
+												.getSelectedRow()), 7)
+						.toString();
+	        	System.out.println(version);
+	        	writeImageData(imageid, version);
+	        }
+	    });
 		tablemyImages.setModel(modelMyImages);
 		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
 		tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -346,6 +418,27 @@ public class SearchEditImage_GUI extends JFrame {
 		
 				JScrollPane scrollPanePublicVorlagen = new JScrollPane();
 				tablePublicVorlagen = new JTable();
+			    tablePublicVorlagen.getSelectionModel().addListSelectionListener( new ListSelectionListener()
+			    {
+			        public void valueChanged(ListSelectionEvent e)
+			        {
+			        	String imageid = modelPublicVorlagen
+								.getValueAt(
+										tablePublicVorlagen
+												.convertRowIndexToModel(tablePublicVorlagen
+														.getSelectedRow()), 6)
+								.toString();
+			        	System.out.println(imageid);
+			        	String version = modelPublicVorlagen
+								.getValueAt(
+										tablePublicVorlagen
+												.convertRowIndexToModel(tablePublicVorlagen
+														.getSelectedRow()), 7)
+								.toString();
+			        	System.out.println(version);
+			        	writeImageData(imageid, version);
+			        }
+			    });
 				tablePublicVorlagen.setModel(modelPublicVorlagen);
 				tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
 				tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -354,12 +447,35 @@ public class SearchEditImage_GUI extends JFrame {
 				tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit();
 				tablePublicVorlagen.setRowSorter(rowSorterPublicVorlagen);
 						scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);
-						tabbedPane.addTab("\u00D6ffentliche Vorlagen", null,
+						tabbedPane.addTab("Vorlagen", null,
 								scrollPanePublicVorlagen, null);
 		
 
 		JScrollPane scrollPaneAllImages = new JScrollPane();
 		tableAllImages = new JTable();
+	    tableAllImages.getSelectionModel().addListSelectionListener( new ListSelectionListener()
+	    {
+	        public void valueChanged(ListSelectionEvent e)
+	        {
+
+	        	String imageid = modelAll
+						.getValueAt(
+								tableAllImages
+										.convertRowIndexToModel(tableAllImages
+												.getSelectedRow()), 6)
+						.toString();
+	        	System.out.println(imageid);
+	        	String version = modelAll
+						.getValueAt(
+								tableAllImages
+										.convertRowIndexToModel(tableAllImages
+												.getSelectedRow()), 7)
+						.toString();
+	        	System.out.println(version);
+	        	writeImageData(imageid, version);
+
+	        }
+	    });
 		tableAllImages.setModel(modelAll);
 		tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit();
 		tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -373,24 +489,10 @@ public class SearchEditImage_GUI extends JFrame {
 						
 
 		scrollPaneCoopImages.setViewportView(tableCoopImages);
-		tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages,
+		tabbedPane.addTab("bwLehrpool", null, scrollPaneCoopImages,
 				null);
 		tabbedPane.setEnabledAt(3, false);
 
-		JScrollPane scrollPanePublicImages = new JScrollPane();
-		JTable tablePublicImages = new JTable();
-		tablePublicImages.setModel(model);
-		tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit();
-
-		scrollPanePublicImages.setViewportView(tablePublicImages);
-		tabbedPane.addTab("\u00D6ffentliche Images", null,
-				scrollPanePublicImages, null);
-		tabbedPane.setEnabledAt(4, false);
-
 		JButton btnDownload = new JButton("Download");
 		btnDownload.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
@@ -480,7 +582,7 @@ public class SearchEditImage_GUI extends JFrame {
 		contentPanel.add(btnDownload);
 		{
 			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 33);
+			buttonPane.setBounds(0, 640, 902, 33);
 			buttonPane.setBackground(SystemColor.menu);
 			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
 			getContentPane().add(buttonPane);
@@ -590,13 +692,110 @@ public class SearchEditImage_GUI extends JFrame {
 		}
 
 		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 78, 597, 2);
+		separator.setBounds(0, 79, 912, 1);
 		getContentPane().add(separator);
 
 		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 627, 597, 2);
+		separator_1.setBounds(0, 627, 912, 2);
 		getContentPane().add(separator_1);
 
+		JPanel panel = new JPanel();
+		panel.setLayout(null);
+		panel.setBorder(new TitledBorder(null, "Detailinformationen",
+
+						TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel.setBackground(SystemColor.menu);
+		panel.setBounds(586, 85, 316, 531);
+		getContentPane().add(panel);
+		
+		JLabel lblName = new JLabel("Name:");
+		lblName.setBounds(10, 30, 130, 14);
+		panel.add(lblName);
+		
+		labelName = new JLabel("");
+		labelName.setBounds(150, 30, 130, 14);
+		panel.add(labelName);
+		
+		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");
+		lblVerantwortlicher.setBounds(10, 105, 130, 14);
+		panel.add(lblVerantwortlicher);
+		
+		labelOS = new JLabel("");
+		labelOS.setBounds(150, 55, 130, 14);
+		panel.add(labelOS);
+		
+		JLabel lblWeitereVerantwortliche = new JLabel("Betriebssystem:");
+		lblWeitereVerantwortliche.setBounds(10, 55, 130, 14);
+		panel.add(lblWeitereVerantwortliche);
+		
+		labelVerantwortlicher = new JLabel("");
+		labelVerantwortlicher.setBounds(150, 105, 130, 14);
+		panel.add(labelVerantwortlicher);
+		
+		JLabel label = new JLabel("Weitere Verantwortliche:");
+		label.setBounds(10, 130, 130, 14);
+		panel.add(label);
+		
+		labelWeitereVerantwortliche = new JLabel("");
+		labelWeitereVerantwortliche.setBounds(150, 130, 130, 14);
+		panel.add(labelWeitereVerantwortliche);
+		
+		JLabel label_5 = new JLabel("");
+		label_5.setBounds(150, 130, 130, 14);
+		panel.add(label_5);
+		
+		labelUpdate = new JLabel("");
+		labelUpdate.setBounds(150, 80, 130, 14);
+		panel.add(labelUpdate);
+		
+		JLabel lblLetztesUpdate = new JLabel("Letztes Update:");
+		lblLetztesUpdate.setBounds(10, 80, 130, 14);
+		panel.add(lblLetztesUpdate);
+		
+		JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:");
+		lblImageIstVorlage.setBounds(10, 259, 130, 14);
+		panel.add(lblImageIstVorlage);
+		
+		labelVorlage = new JLabel("");
+		labelVorlage.setBounds(150, 259, 130, 14);
+		panel.add(labelVorlage);
+		
+		labelLizenzSoftware = new JLabel("");
+		labelLizenzSoftware.setBounds(150, 284, 130, 14);
+		panel.add(labelLizenzSoftware);
+		
+		JLabel lblLizenzpflichtigeSoftware = new JLabel("Lizenzpflichtige Software:");
+		lblLizenzpflichtigeSoftware.setBounds(10, 284, 130, 14);
+		panel.add(lblLizenzpflichtigeSoftware);
+		
+		JLabel lblInternet = new JLabel("Internet:");
+		lblInternet.setBounds(10, 309, 130, 14);
+		panel.add(lblInternet);
+		
+		labelInternet = new JLabel("");
+		labelInternet.setBounds(150, 309, 130, 14);
+		panel.add(labelInternet);
+		
+		JLabel lblEmpfehlungRam = new JLabel("Empfehlung RAM:");
+		lblEmpfehlungRam.setBounds(10, 334, 130, 14);
+		panel.add(lblEmpfehlungRam);
+		
+		labelRam = new JLabel("");
+		labelRam.setBounds(150, 334, 130, 14);
+		panel.add(labelRam);
+		
+		JLabel lblEmpfehlungCpu = new JLabel("Empfehlung CPU:");
+		lblEmpfehlungCpu.setBounds(10, 359, 130, 14);
+		panel.add(lblEmpfehlungCpu);
+		
+		labelCPU = new JLabel("");
+		labelCPU.setBounds(150, 359, 130, 14);
+		panel.add(labelCPU);
+		
+		JLabel lblTechnischeDaten = new JLabel("Technische Daten:");
+		lblTechnischeDaten.setBounds(10, 223, 296, 14);
+		panel.add(lblTechnischeDaten);
+		
 		JMenuBar menuBar = new JMenuBar();
 		setJMenuBar(menuBar);
 
@@ -666,7 +865,8 @@ public class SearchEditImage_GUI extends JFrame {
 			images = client.getImageList();
 
 			Iterator<server.Image> i = images.iterator();
-
+			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
 			int x = 0;
 
 			while (i.hasNext()) {
@@ -676,7 +876,7 @@ public class SearchEditImage_GUI extends JFrame {
 						images.get(x).getOsName(),
 						images.get(x).getLectureName(),
 						images.get(x).getUserData(),
-						images.get(x).getUpdateTime(), images.get(x).id,
+						out.format(in.parse(images.get(x).updateTime)), images.get(x).id,
 						images.get(x).getVersion(),
 						images.get(x).getIsTemplate()};
 				// Fuege diese Objekte der Tabelle hinzu
@@ -688,7 +888,7 @@ public class SearchEditImage_GUI extends JFrame {
 			}
 
 			return model;
-		} catch (TException e1) {
+		} catch (TException | ParseException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
 			JOptionPane.showMessageDialog(null,
@@ -697,5 +897,40 @@ public class SearchEditImage_GUI extends JFrame {
 		}
 		return model;
 	}
-
+	public void writeImageData(String id, String version){
+    	try {
+			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
+			Map<String,String> res=client.getImageData(id,version);
+			labelName.setText(res.get("name"));
+			labelOS.setText(res.get("os"));
+			labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));
+			labelVerantwortlicher.setText(res.get("owner"));
+			labelWeitereVerantwortliche.setText("Noch nicht Verfügbar");
+			if(res.get("template").equals("true")){
+				labelVorlage.setText("Ja");
+			}else{
+				labelVorlage.setText("Nein");
+			}
+			if(res.get("license").equals("1")){
+				labelLizenzSoftware.setText("Ja");
+			}
+			else
+			{
+				labelLizenzSoftware.setText("Nein");
+			}
+			if(res.get("internet").equals("1")){
+				labelInternet.setText("Ja");
+			}
+			else
+			{
+				labelInternet.setText("Nein");
+			}
+			labelRam.setText(res.get("ram"));
+			labelCPU.setText(res.get("cpu"));
+		} catch (TException | ParseException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+	}
 }
diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
index 32a28d7a..2bdb7f32 100644
--- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
@@ -1,648 +1,888 @@
-package gui.image;
-
-import gui.intro.About_GUI;
-import gui.intro.MainMenue_GUI;
-
-import java.awt.Color;
-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.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.swing.JButton;
-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.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JTabbedPane;
-import javax.swing.JTable;
-import javax.swing.JTextField;
-import javax.swing.JTextPane;
-import javax.swing.RowFilter;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableModel;
-import javax.swing.table.TableRowSorter;
-
-import models.Image;
-import models.Links;
-import models.person;
-
-import org.apache.thrift.TException;
-
-import server.Server.Client;
-import thrift.ThriftConnection;
-import util.GuiOrganizer;
-import util.OpenLinks;
-
-@SuppressWarnings("serial")
-public class SearchImage_GUI extends JFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	String[] result;
-	JRadioButton rdbtnInternetJa;
-	JRadioButton rdbtnInternetNein;
-	JComboBox<String> comboBox;
-	JTable tableAllImages;
-	JTable tablemyImages;
-	JTable tablePublicVorlagen;
-	private JTextField textFieldName;
-	JTabbedPane tabbedPane;
-	boolean activeSearch = false;
-	String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung",
-			"Verantwortlicher", "Letztes Update", "ID", "Version", "Template" };
-	ThriftConnection con = new ThriftConnection();
-	Client client = models.Client.clientcon.getClient();
-	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) {
-		public boolean isCellEditable(int rowIndex, int mColIndex) {
-			return false;
-		}
-	};
-	final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0) {
-		public boolean isCellEditable(int rowIndex, int mColIndex) {
-			return false;
-		}
-	};
-	final DefaultTableModel modelPublicVorlagen = new DefaultTableModel(titles,
-			0) {
-		public boolean isCellEditable(int rowIndex, int mColIndex) {
-			return false;
-		}
-	};
-	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
-			modelAll);
-	final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>(
-			modelMyImages);
-	final TableRowSorter<TableModel> rowSorterPublicVorlagen = new TableRowSorter<TableModel>(
-			modelPublicVorlagen);
-
-	/**
-	 * Create the dialog.
-	 */
-	public SearchImage_GUI() {
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent arg0) {
-				// Beendet die Anwendung nach klick auf X
-				con.closeThriftConnection();
-				System.exit(0);
-			}
-
-			@Override
-			public void windowOpened(WindowEvent arg0) {
-				initTableModel(modelAll);
-				initTableModel(modelMyImages);
-				initTableModel(modelPublicVorlagen);
-				textFieldName.requestFocusInWindow();
-			}
-		});
-		// Verhindert das Vergroessern Des Fensters
-		setResizable(false);
-
-		try {
-			// Setzt das Look & Feel auf System
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (ClassNotFoundException | InstantiationException
-				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		// Setzt den Fenstertitel
-		setTitle("bwLehrpool Suite *Prototyp* - Suche VL-Image");
-		// Zentriert das Fenster in die Bildmitte
-		setBounds(0, 0, 603, 722);
-		GuiOrganizer.centerGUI(this);
-
-		final DefaultTableModel model = new DefaultTableModel(titles, 0);
-
-		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("Suche nach VL-Image");
-				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("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");
-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
-			panel.add(txtpnBitteWhlenSie);
-		}
-		contentPanel.setBounds(10, 85, 577, 531);
-		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, "Filterfunktionen",
-				TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 49, 557, 98);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-
-		JLabel lblNewLabel_2 = new JLabel("Anzeigename:");
-		lblNewLabel_2.setBounds(10, 30, 250, 20);
-		panel_1.add(lblNewLabel_2);
-
-		JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:");
-		lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
-		panel_1.add(lblInternetIstInnerhalb);
-
-		textFieldName = new JTextField();
-		// Key Listener der Tastatureingabe registriert
-		textFieldName.addKeyListener(new KeyAdapter() {
-			@Override
-			public void keyReleased(KeyEvent e) {
-				// Textfield eingabe auslesen
-				String stext = textFieldName.getText();
-
-				// Wenn Textfield nicht leer
-				if (stext != "") {
-					activeSearch = true;
-					// Filtere nach der Eingabe
-					rowSorterAll.setRowFilter(RowFilter.regexFilter(
-							textFieldName.getText(), 0));
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
-							textFieldName.getText(), 0));
-					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
-							textFieldName.getText(), 0));
-
-				} else {
-					activeSearch = false;
-					String username = person.verantwortlicher.getName() + " "
-							+ person.verantwortlicher.getVorname();
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
-							username, 4));
-					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
-							"true", 8));
-					rowSorterAll.setRowFilter(null);
-				}
-			}
-		});
-
-		textFieldName.setBounds(270, 30, 250, 20);
-		panel_1.add(textFieldName);
-		textFieldName.setColumns(10);
-
-		comboBox = new JComboBox<String>();
-		try {
-			// Holt sich eine Liste aller verfuegbaren Betriebssysteme vom
-			// Server
-			List<String> list = client.getAllOS();
-			// Leeres Item hinzufuegen
-			comboBox.addItem("");
-			for (int i = 0; i < list.size(); i++) {
-				// Hinzufuegen der verfuegbaren Betriebssysteme
-				comboBox.addItem(list.get(i));
-			}
-		} catch (TException e2) {
-			// TODO Auto-generated catch block
-			e2.printStackTrace();
-			JOptionPane.showMessageDialog(null,
-					e2.getCause() + "\n" + e2.getMessage(), "Debug-Message",
-					JOptionPane.ERROR_MESSAGE);
-		}
-		// Registriert Auswahlaenderungen der Box
-		comboBox.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				// Prueft das die Auswahl nicht leer ist
-				if (comboBox.getSelectedItem().toString() != "") {
-					activeSearch = true;
-					rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox
-							.getSelectedItem().toString(), 2));
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
-							comboBox.getSelectedItem().toString(), 2));
-					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
-							comboBox.getSelectedItem().toString(), 2));
-				} else {
-					activeSearch = false;
-					String username = person.verantwortlicher.getName() + " "
-							+ person.verantwortlicher.getVorname();
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
-							username, 4));
-					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
-							"true", 8));
-					rowSorterAll.setRowFilter(null);
-				}
-			}
-
-		});
-		comboBox.setBounds(270, 58, 250, 20);
-		panel_1.add(comboBox);
-
-		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				// oeffnet das Hauuetmenue
-
-				SearchImage_GUI.this.setVisible(false);
-				MainMenue_GUI main = new MainMenue_GUI();
-				main.setVisible(true);
-			}
-		});
-		lblHauptmen.setForeground(Color.BLUE);
-		lblHauptmen.setBounds(10, 11, 61, 14);
-		contentPanel.add(lblHauptmen);
-
-		JLabel label_1 = new JLabel(">");
-		label_1.setBounds(69, 11, 13, 14);
-		contentPanel.add(label_1);
-
-		JLabel lblVlimage = new JLabel("VL-Image");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 45, 14);
-		contentPanel.add(lblVlimage);
-
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(133, 11, 13, 14);
-		contentPanel.add(label_2);
-
-		JLabel lblNewLabel_1 = new JLabel("Imageauswahl");
-		lblNewLabel_1.setBounds(146, 11, 85, 14);
-		contentPanel.add(lblNewLabel_1);
-
-		tabbedPane = new JTabbedPane(JTabbedPane.TOP);
-		tabbedPane.addChangeListener(new ChangeListener() {
-			public void stateChanged(ChangeEvent arg0) {
-				if (tabbedPane.getSelectedIndex() == 0 && activeSearch == false) {
-
-					String username = person.verantwortlicher.getName() + " "
-							+ person.verantwortlicher.getVorname();
-					// String username="Spitzer Tobias";
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
-							username, 4));
-				} else if (tabbedPane.getSelectedIndex() == 1
-						&& activeSearch == false) {
-					// System.out.println("Yeah");
-					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
-							"true", 8));
-				} else if (tabbedPane.getSelectedIndex() == 2
-						&& activeSearch == false) {
-					rowSorterAll.setRowFilter(null);
-				}
-
-			}
-		});
-
-		tabbedPane.setBounds(10, 158, 557, 339);
-		contentPanel.add(tabbedPane);
-
-		JScrollPane scrollPaneAllImages = new JScrollPane();
-		tableAllImages = new JTable();
-		tableAllImages.setModel(modelAll);
-		tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tableAllImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit();
-
-		JScrollPane scrollPaneMyImage = new JScrollPane();
-		tablemyImages = new JTable();
-		tablemyImages.setModel(modelMyImages);
-		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit();
-		tablemyImages.setRowSorter(rowSorterMyImages);
-
-		scrollPaneMyImage.setViewportView(tablemyImages);
-		tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);
-
-		JScrollPane scrollPanePublicVorlagen = new JScrollPane();
-		tablePublicVorlagen = new JTable();
-		tablePublicVorlagen.setModel(modelPublicVorlagen);
-		tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit();
-		tablePublicVorlagen.setRowSorter(rowSorterPublicVorlagen);
-		scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);
-		tabbedPane.addTab("\u00D6ffentliche Vorlagen", null,
-				scrollPanePublicVorlagen, null);
-		tableAllImages.setRowSorter(rowSorterAll);
-
-		scrollPaneAllImages.setViewportView(tableAllImages);
-		tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
-
-		JScrollPane scrollPaneCoopImages = new JScrollPane();
-		JTable tableCoopImages = new JTable();
-		tableCoopImages.setModel(model);
-		tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit();
-
-		scrollPaneCoopImages.setViewportView(tableCoopImages);
-		tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages,
-				null);
-		tabbedPane.setEnabledAt(3, false);
-
-		JScrollPane scrollPanePublicImages = new JScrollPane();
-		JTable tablePublicImages = new JTable();
-		tablePublicImages.setModel(model);
-		tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit();
-
-		scrollPanePublicImages.setViewportView(tablePublicImages);
-		tabbedPane.addTab("\u00D6ffentliche Images", null,
-				scrollPanePublicImages, null);
-		tabbedPane.setEnabledAt(4, false);
-
-		JButton btnDownload = new JButton("Download");
-		btnDownload.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				// oeffnet den Downloader
-				String username = person.verantwortlicher.getName() + " "
-						+ person.verantwortlicher.getVorname();
-				//
-				// meine Images
-				//
-				if (tabbedPane.getSelectedIndex() == 0) {
-					if (tablemyImages.getSelectedRow() != -1) {
-						String imageid = modelMyImages.getValueAt(
-								tablemyImages
-										.convertRowIndexToModel(tablemyImages
-												.getSelectedRow()), 6)
-								.toString();
-
-						Image.image.setImageId(imageid);
-						String imageversion = modelMyImages.getValueAt(
-								tablemyImages
-										.convertRowIndexToModel(tablemyImages
-												.getSelectedRow()), 7)
-								.toString();
-
-						Image.image.setVersion(imageversion);
-						SearchImage_GUI.this.setVisible(false);
-						FTPSearchDownloader_GUI down = new FTPSearchDownloader_GUI();
-						down.setVisible(true);
-
-					}
-				} else if (tabbedPane.getSelectedIndex() == 1) {
-					//
-					// Vorlagen Images
-					//
-					System.out.println("yeah");
-					if (tablePublicVorlagen.getSelectedRow() != -1
-					// && modelPublicVorlagen
-					// .getValueAt(
-					// tablePublicVorlagen
-					// .convertRowIndexToModel(tablePublicVorlagen
-					// .getSelectedRow()),
-					// 4).equals(username) == true
-					) {
-						String imageid = modelPublicVorlagen
-								.getValueAt(
-										tablePublicVorlagen
-												.convertRowIndexToModel(tablePublicVorlagen
-														.getSelectedRow()), 6)
-								.toString();
-
-						Image.image.setImageId(imageid);
-						String imageversion = modelPublicVorlagen
-								.getValueAt(
-										tablePublicVorlagen
-												.convertRowIndexToModel(tablePublicVorlagen
-														.getSelectedRow()), 7)
-								.toString();
-
-						Image.image.setVersion(imageversion);
-
-						SearchImage_GUI.this.setVisible(false);
-						FTPSearchDownloader_GUI down = new FTPSearchDownloader_GUI();
-						down.setVisible(true);
-					}
-				} else if (tabbedPane.getSelectedIndex() == 2) {
-					//
-					// Alle Images
-					//
-					/**
-					 * if (tableAllImages.getSelectedRow() != -1 && modelAll
-					 * .getValueAt( tableAllImages
-					 * .convertRowIndexToModel(tableAllImages
-					 * .getSelectedRow()), 4).equals(username) == true) {
-					 **/
-					if (tableAllImages.getSelectedRow() != -1) {
-						// nur eigene Images downloadbar
-						if (modelAll.getValueAt(
-								tableAllImages
-										.convertRowIndexToModel(tableAllImages
-												.getSelectedRow()), 4).equals(
-								username) == true) {
-							String imageid = modelAll
-									.getValueAt(
-											tableAllImages
-													.convertRowIndexToModel(tableAllImages
-															.getSelectedRow()),
-											6).toString();
-
-							Image.image.setImageId(imageid);
-							String imageversion = modelAll
-									.getValueAt(
-											tableAllImages
-													.convertRowIndexToModel(tableAllImages
-															.getSelectedRow()),
-											7).toString();
-
-							Image.image.setVersion(imageversion);
-
-							SearchImage_GUI.this.setVisible(false);
-							FTPSearchDownloader_GUI down = new FTPSearchDownloader_GUI();
-							down.setVisible(true);
-						} else {
-							JOptionPane
-									.showMessageDialog(
-											null,
-											"Sie haben keine Berechtigung fremde Images herunterzuladen.",
-											"Message",
-											JOptionPane.INFORMATION_MESSAGE);
-						}
-
-					}
-
-				} else {
-					//
-					// nichts markiert
-					//
-					JOptionPane
-							.showMessageDialog(
-									null,
-									"Bitte w\u00e4hlen Sie ein Image f\u00fcr den Download aus",
-									"Message", JOptionPane.INFORMATION_MESSAGE);
-				}
-			}
-		});
-		btnDownload.setBounds(449, 508, 118, 23);
-		contentPanel.add(btnDownload);
-		{
-			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) {
-						// oeffnet das Hauptmenue
-
-						MainMenue_GUI main = new MainMenue_GUI();
-						main.setVisible(true);
-						dispose();
-					}
-				});
-				okButton.setActionCommand("OK");
-				buttonPane.add(okButton);
-				getRootPane().setDefaultButton(okButton);
-			}
-		}
-
-		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_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);
-
-	}
-
-	// Initiale Beffuelung eines Table models
-	public DefaultTableModel initTableModel(DefaultTableModel model) {
-		List<server.Image> images;
-		try {
-			// Hole eine Liste der Images
-			images = client.getImageList();
-
-			Iterator<server.Image> i = images.iterator();
-
-			int x = 0;
-
-			while (i.hasNext()) {
-				// erzeuge Objekte fuer die Tabelle
-				Object[] obj = { images.get(x).getImageName(),
-						images.get(x).getLicenseRestriction(),
-						images.get(x).getOsName(),
-						images.get(x).getLectureName(),
-						images.get(x).getUserData(),
-						images.get(x).getUpdateTime(), images.get(x).id,
-						images.get(x).getVersion(),
-						images.get(x).getIsTemplate() };
-				// Fuege diese Objekte der Tabelle hinzu
-				model.addRow(obj);
-				x++;
-				i.next();
-
-			}
-
-			return model;
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-			JOptionPane.showMessageDialog(null,
-					e1.getCause() + "\n" + e1.getMessage(), "Debug-Message",
-					JOptionPane.ERROR_MESSAGE);
-		}
-		return model;
-	}
-
-}
+package gui.image;

+

+import gui.intro.About_GUI;

+import gui.intro.MainMenue_GUI;

+

+import java.awt.Color;

+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.KeyAdapter;

+import java.awt.event.KeyEvent;

+import java.awt.event.MouseAdapter;

+import java.awt.event.MouseEvent;

+import java.awt.event.WindowAdapter;

+import java.awt.event.WindowEvent;

+import java.net.URI;

+import java.net.URISyntaxException;

+import java.text.ParseException;

+import java.text.SimpleDateFormat;

+import java.util.Iterator;

+import java.util.List;

+import java.util.Map;

+

+import javax.swing.JButton;

+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.JOptionPane;

+import javax.swing.JPanel;

+import javax.swing.JRadioButton;

+import javax.swing.JScrollPane;

+import javax.swing.JSeparator;

+import javax.swing.JTabbedPane;

+import javax.swing.JTable;

+import javax.swing.JTextField;

+import javax.swing.JTextPane;

+import javax.swing.RowFilter;

+import javax.swing.UIManager;

+import javax.swing.UnsupportedLookAndFeelException;

+import javax.swing.border.EmptyBorder;

+import javax.swing.border.TitledBorder;

+import javax.swing.event.ChangeEvent;

+import javax.swing.event.ChangeListener;

+import javax.swing.event.ListSelectionEvent;

+import javax.swing.event.ListSelectionListener;

+import javax.swing.event.TableModelEvent;

+import javax.swing.event.TableModelListener;

+import javax.swing.table.DefaultTableModel;

+import javax.swing.table.TableModel;

+import javax.swing.table.TableRowSorter;

+

+import models.Image;

+import models.Links;

+import models.person;

+

+import org.apache.thrift.TException;

+

+import server.Server.Client;

+import thrift.ThriftConnection;

+import util.GuiOrganizer;

+import util.OpenLinks;

+import java.beans.PropertyChangeListener;

+import java.beans.PropertyChangeEvent;

+

+@SuppressWarnings("serial")

+public class SearchImage_GUI extends JFrame {

+

+	private final JPanel contentPanel = new JPanel();

+	JLabel labelName;

+	JLabel labelUpdate;

+	JLabel labelVerantwortlicher;

+	JLabel labelWeitereVerantwortliche;

+	JLabel labelVorlage;

+	JLabel labelLizenzSoftware;

+	JLabel labelInternet;

+	JLabel labelRam;

+	JLabel labelCPU;

+	private JLabel labelOS;

+	String[] result;

+	JRadioButton rdbtnInternetJa;

+	JRadioButton rdbtnInternetNein;

+	JComboBox<String> comboBox;

+	JTable tableAllImages;

+	JTable tablemyImages;

+	JTable tablePublicVorlagen;

+	private JTextField textFieldName;

+	JTabbedPane tabbedPane;

+	boolean activeSearch = false;

+	String[] titles = { "Name", "Lizenzpflichtig", "OS", "Veranstaltung",

+			"Verantwortlicher", "Letztes Update", "ID", "Version", "Template" };

+	ThriftConnection con = new ThriftConnection();

+	Client client = models.Client.clientcon.getClient();

+	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) {

+		public boolean isCellEditable(int rowIndex, int mColIndex) {

+			return false;

+		}

+	};

+	final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0) {

+		public boolean isCellEditable(int rowIndex, int mColIndex) {

+			return false;

+		}

+	};

+	final DefaultTableModel modelPublicVorlagen = new DefaultTableModel(titles,

+			0) {

+		public boolean isCellEditable(int rowIndex, int mColIndex) {

+			return false;

+		}

+	};

+	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(

+			modelAll);

+	final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>(

+			modelMyImages);

+	final TableRowSorter<TableModel> rowSorterPublicVorlagen = new TableRowSorter<TableModel>(

+			modelPublicVorlagen);

+	

+

+	/**

+	 * Create the dialog.

+	 */

+	public SearchImage_GUI() {

+		addWindowListener(new WindowAdapter() {

+			@Override

+			public void windowClosing(WindowEvent arg0) {

+				// Beendet die Anwendung nach klick auf X

+				con.closeThriftConnection();

+				System.exit(0);

+			}

+

+			@Override

+			public void windowOpened(WindowEvent arg0) {

+				initTableModel(modelAll);

+				initTableModel(modelMyImages);

+				initTableModel(modelPublicVorlagen);

+				tablemyImages.getColumnModel().getColumn(1).setWidth(0);

+				tablemyImages.getColumnModel().getColumn(1).setMinWidth(0);

+				tablemyImages.getColumnModel().getColumn(1).setMaxWidth(0);

+				tablemyImages.getColumnModel().getColumn(8).setWidth(0);

+				tablemyImages.getColumnModel().getColumn(8).setMinWidth(0);

+				tablemyImages.getColumnModel().getColumn(8).setMaxWidth(0);

+				tablemyImages.getColumnModel().getColumn(6).setWidth(0);

+				tablemyImages.getColumnModel().getColumn(6).setMinWidth(0);

+				tablemyImages.getColumnModel().getColumn(6).setMaxWidth(0);

+				tablemyImages.getColumnModel().getColumn(7).setWidth(0);

+				tablemyImages.getColumnModel().getColumn(7).setMinWidth(0);

+				tablemyImages.getColumnModel().getColumn(7).setMaxWidth(0);

+				tablePublicVorlagen.getColumnModel().getColumn(1).setWidth(0);

+				tablePublicVorlagen.getColumnModel().getColumn(1).setMinWidth(0);

+				tablePublicVorlagen.getColumnModel().getColumn(1).setMaxWidth(0);

+				tablePublicVorlagen.getColumnModel().getColumn(8).setWidth(0);

+				tablePublicVorlagen.getColumnModel().getColumn(8).setMinWidth(0);

+				tablePublicVorlagen.getColumnModel().getColumn(8).setMaxWidth(0);

+				tablePublicVorlagen.getColumnModel().getColumn(6).setWidth(0);

+				tablePublicVorlagen.getColumnModel().getColumn(6).setMinWidth(0);

+				tablePublicVorlagen.getColumnModel().getColumn(6).setMaxWidth(0);

+				tablePublicVorlagen.getColumnModel().getColumn(7).setWidth(0);

+				tablePublicVorlagen.getColumnModel().getColumn(7).setMinWidth(0);

+				tablePublicVorlagen.getColumnModel().getColumn(7).setMaxWidth(0);

+				tableAllImages.getColumnModel().getColumn(1).setWidth(0);

+				tableAllImages.getColumnModel().getColumn(1).setMinWidth(0);

+				tableAllImages.getColumnModel().getColumn(1).setMaxWidth(0);

+				tableAllImages.getColumnModel().getColumn(8).setWidth(0);

+				tableAllImages.getColumnModel().getColumn(8).setMinWidth(0);

+				tableAllImages.getColumnModel().getColumn(8).setMaxWidth(0);

+				tableAllImages.getColumnModel().getColumn(6).setWidth(0);

+				tableAllImages.getColumnModel().getColumn(6).setMinWidth(0);

+				tableAllImages.getColumnModel().getColumn(6).setMaxWidth(0);

+				tableAllImages.getColumnModel().getColumn(7).setWidth(0);

+				tableAllImages.getColumnModel().getColumn(7).setMinWidth(0);

+				tableAllImages.getColumnModel().getColumn(7).setMaxWidth(0);

+				textFieldName.requestFocusInWindow();

+			}

+		});

+		// Verhindert das Vergroessern Des Fensters

+		setResizable(false);

+

+		try {

+			// Setzt das Look & Feel auf System

+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

+		} catch (ClassNotFoundException | InstantiationException

+				| IllegalAccessException | UnsupportedLookAndFeelException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		// Setzt den Fenstertitel

+		setTitle("bwLehrpool Suite *Prototyp* - Suche VL-Image");

+		// Zentriert das Fenster in die Bildmitte

+		setBounds(0, 0, 918, 722);

+		GuiOrganizer.centerGUI(this);

+

+		final DefaultTableModel model = new DefaultTableModel(titles, 0);

+

+		getContentPane().setLayout(null);

+		{

+			JPanel panel = new JPanel();

+			panel.setBackground(SystemColor.menu);

+			panel.setBounds(10, 11, 892, 57);

+			getContentPane().add(panel);

+			panel.setLayout(null);

+			{

+				JLabel lblNewLabel = new JLabel("Imagesuche");

+				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("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");

+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);

+			panel.add(txtpnBitteWhlenSie);

+		}

+		contentPanel.setBounds(10, 85, 577, 531);

+		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, "Filterfunktionen",

+				TitledBorder.LEADING, TitledBorder.TOP, null, null));

+		panel_1.setBounds(10, 49, 557, 98);

+		contentPanel.add(panel_1);

+		panel_1.setLayout(null);

+

+		JLabel lblNewLabel_2 = new JLabel("Anzeigename:");

+		lblNewLabel_2.setBounds(10, 30, 250, 20);

+		panel_1.add(lblNewLabel_2);

+

+		JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:");

+		lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);

+		panel_1.add(lblInternetIstInnerhalb);

+

+		textFieldName = new JTextField();

+		// Key Listener der Tastatureingabe registriert

+		textFieldName.addKeyListener(new KeyAdapter() {

+			@Override

+			public void keyReleased(KeyEvent e) {

+				// Textfield eingabe auslesen

+				String stext = textFieldName.getText();

+

+				// Wenn Textfield nicht leer

+				if (stext != "") {

+					activeSearch = true;

+					// Filtere nach der Eingabe

+					rowSorterAll.setRowFilter(RowFilter.regexFilter(

+							textFieldName.getText(), 0));

+					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(

+							textFieldName.getText(), 0));

+					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(

+							textFieldName.getText(), 0));

+

+				} else {

+					activeSearch = false;

+					String username = person.verantwortlicher.getName() + " "

+							+ person.verantwortlicher.getVorname();

+					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(

+							username, 4));

+					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(

+							"true", 8));

+					rowSorterAll.setRowFilter(null);

+				}

+			}

+		});

+

+		textFieldName.setBounds(270, 30, 250, 20);

+		panel_1.add(textFieldName);

+		textFieldName.setColumns(10);

+

+		comboBox = new JComboBox<String>();

+		try {

+			// Holt sich eine Liste aller verfuegbaren Betriebssysteme vom

+			// Server

+			List<String> list = client.getAllOS();

+			// Leeres Item hinzufuegen

+			comboBox.addItem("");

+			for (int i = 0; i < list.size(); i++) {

+				// Hinzufuegen der verfuegbaren Betriebssysteme

+				comboBox.addItem(list.get(i));

+			}

+		} catch (TException e2) {

+			// TODO Auto-generated catch block

+			e2.printStackTrace();

+			JOptionPane.showMessageDialog(null,

+					e2.getCause() + "\n" + e2.getMessage(), "Debug-Message",

+					JOptionPane.ERROR_MESSAGE);

+		}

+		// Registriert Auswahlaenderungen der Box

+		comboBox.addActionListener(new ActionListener() {

+			public void actionPerformed(ActionEvent arg0) {

+				// Prueft das die Auswahl nicht leer ist

+				if (comboBox.getSelectedItem().toString() != "") {

+					activeSearch = true;

+					rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox

+							.getSelectedItem().toString(), 2));

+					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(

+							comboBox.getSelectedItem().toString(), 2));

+					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(

+							comboBox.getSelectedItem().toString(), 2));

+				} else {

+					activeSearch = false;

+					String username = person.verantwortlicher.getName() + " "

+							+ person.verantwortlicher.getVorname();

+					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(

+							username, 4));

+					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(

+							"true", 8));

+					rowSorterAll.setRowFilter(null);

+				}

+			}

+

+		});

+		comboBox.setBounds(270, 58, 250, 20);

+		panel_1.add(comboBox);

+

+		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");

+		lblHauptmen.addMouseListener(new MouseAdapter() {

+			@Override

+			public void mouseClicked(MouseEvent arg0) {

+				// oeffnet das Hauuetmenue

+

+				SearchImage_GUI.this.setVisible(false);

+				MainMenue_GUI main = new MainMenue_GUI();

+				main.setVisible(true);

+			}

+		});

+		lblHauptmen.setForeground(Color.BLUE);

+		lblHauptmen.setBounds(10, 11, 61, 14);

+		contentPanel.add(lblHauptmen);

+

+		JLabel label_1 = new JLabel(">");

+		label_1.setBounds(69, 11, 13, 14);

+		contentPanel.add(label_1);

+

+		JLabel lblVlimage = new JLabel("Image");

+		lblVlimage.setForeground(Color.BLUE);

+		lblVlimage.setBounds(81, 11, 45, 14);

+		contentPanel.add(lblVlimage);

+

+		JLabel label_2 = new JLabel(">");

+		label_2.setBounds(116, 11, 13, 14);

+		contentPanel.add(label_2);

+

+		JLabel lblNewLabel_1 = new JLabel("Imageauswahl");

+		lblNewLabel_1.setBounds(129, 11, 85, 14);

+		contentPanel.add(lblNewLabel_1);

+

+		tabbedPane = new JTabbedPane(JTabbedPane.TOP);

+		tabbedPane.addChangeListener(new ChangeListener() {

+			public void stateChanged(ChangeEvent arg0) {

+				if (tabbedPane.getSelectedIndex() == 0 && activeSearch == false) {

+

+					String username = person.verantwortlicher.getName() + " "

+							+ person.verantwortlicher.getVorname();

+					// String username="Spitzer Tobias";

+					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(

+							username, 4));

+				} else if (tabbedPane.getSelectedIndex() == 1

+						&& activeSearch == false) {

+					// System.out.println("Yeah");

+					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(

+							"true", 8));

+				} else if (tabbedPane.getSelectedIndex() == 2

+						&& activeSearch == false) {

+					rowSorterAll.setRowFilter(null);

+				}

+

+			}

+		});

+

+		tabbedPane.setBounds(10, 158, 557, 339);

+		contentPanel.add(tabbedPane);

+

+		JScrollPane scrollPaneAllImages = new JScrollPane();

+		tableAllImages = new JTable();

+	    tableAllImages.getSelectionModel().addListSelectionListener( new ListSelectionListener()

+	    {

+	        public void valueChanged(ListSelectionEvent e)

+	        {

+

+	        	String imageid = modelAll

+						.getValueAt(

+								tableAllImages

+										.convertRowIndexToModel(tableAllImages

+												.getSelectedRow()), 6)

+						.toString();

+	        	System.out.println(imageid);

+	        	String version = modelAll

+						.getValueAt(

+								tableAllImages

+										.convertRowIndexToModel(tableAllImages

+												.getSelectedRow()), 7)

+						.toString();

+	        	System.out.println(version);

+	        	writeImageData(imageid, version);

+

+	        }

+	    });

+		tableAllImages.setModel(modelAll);

+		tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit();

+		tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit();

+		tableAllImages.getColumnModel().getColumn(3).sizeWidthToFit();

+		tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit();

+		tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit();

+

+		JScrollPane scrollPaneMyImage = new JScrollPane();

+		tablemyImages = new JTable();

+	    tablemyImages.getSelectionModel().addListSelectionListener( new ListSelectionListener()

+	    {

+	        public void valueChanged(ListSelectionEvent e)

+	        {

+	        	String imageid = modelMyImages

+						.getValueAt(

+								tablemyImages

+										.convertRowIndexToModel(tablemyImages

+												.getSelectedRow()), 6)

+						.toString();

+	        	System.out.println(imageid);

+	        	String version = modelMyImages

+						.getValueAt(

+								tablemyImages

+										.convertRowIndexToModel(tablemyImages

+												.getSelectedRow()), 7)

+						.toString();

+	        	System.out.println(version);

+	        	writeImageData(imageid, version);

+	        }

+	    });

+		tablemyImages.setModel(modelMyImages);

+		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();

+		tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();

+		tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit();

+		tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit();

+		tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit();

+		tablemyImages.setRowSorter(rowSorterMyImages);

+

+		scrollPaneMyImage.setViewportView(tablemyImages);

+		tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);

+

+		JScrollPane scrollPanePublicVorlagen = new JScrollPane();

+		tablePublicVorlagen = new JTable();

+	    tablePublicVorlagen.getSelectionModel().addListSelectionListener( new ListSelectionListener()

+	    {

+	        public void valueChanged(ListSelectionEvent e)

+	        {

+	        	String imageid = modelPublicVorlagen

+						.getValueAt(

+								tablePublicVorlagen

+										.convertRowIndexToModel(tablePublicVorlagen

+												.getSelectedRow()), 6)

+						.toString();

+	        	System.out.println(imageid);

+	        	String version = modelPublicVorlagen

+						.getValueAt(

+								tablePublicVorlagen

+										.convertRowIndexToModel(tablePublicVorlagen

+												.getSelectedRow()), 7)

+						.toString();

+	        	System.out.println(version);

+	        	writeImageData(imageid, version);

+	        }

+	    });

+		tablePublicVorlagen.setModel(modelPublicVorlagen);

+		tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();

+		tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();

+		tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit();

+		tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit();

+		tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit();

+		tablePublicVorlagen.setRowSorter(rowSorterPublicVorlagen);

+		scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);

+		tabbedPane.addTab("Vorlagen", null,

+				scrollPanePublicVorlagen, null);

+		tableAllImages.setRowSorter(rowSorterAll);

+

+		scrollPaneAllImages.setViewportView(tableAllImages);

+		tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);

+

+		JScrollPane scrollPaneCoopImages = new JScrollPane();

+		JTable tableCoopImages = new JTable();

+		tableCoopImages.setModel(model);

+		tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit();

+		tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit();

+		tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit();

+		tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit();

+		tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit();

+

+		scrollPaneCoopImages.setViewportView(tableCoopImages);

+		tabbedPane.addTab("bwLehrpool", null, scrollPaneCoopImages,

+				null);

+		tabbedPane.setEnabledAt(3, false);

+

+		JButton btnDownload = new JButton("Download");

+		btnDownload.addActionListener(new ActionListener() {

+			public void actionPerformed(ActionEvent arg0) {

+				// oeffnet den Downloader

+				String username = person.verantwortlicher.getName() + " "

+						+ person.verantwortlicher.getVorname();

+				//

+				// meine Images

+				//

+				if (tabbedPane.getSelectedIndex() == 0) {

+					if (tablemyImages.getSelectedRow() != -1) {

+						String imageid = modelMyImages.getValueAt(

+								tablemyImages

+										.convertRowIndexToModel(tablemyImages

+												.getSelectedRow()), 6)

+								.toString();

+

+						Image.image.setImageId(imageid);

+						String imageversion = modelMyImages.getValueAt(

+								tablemyImages

+										.convertRowIndexToModel(tablemyImages

+												.getSelectedRow()), 7)

+								.toString();

+

+						Image.image.setVersion(imageversion);

+						SearchImage_GUI.this.setVisible(false);

+						FTPSearchDownloader_GUI down = new FTPSearchDownloader_GUI();

+						down.setVisible(true);

+

+					}

+				} else if (tabbedPane.getSelectedIndex() == 1) {

+					//

+					// Vorlagen Images

+					//

+					

+					if (tablePublicVorlagen.getSelectedRow() != -1

+					// && modelPublicVorlagen

+					// .getValueAt(

+					// tablePublicVorlagen

+					// .convertRowIndexToModel(tablePublicVorlagen

+					// .getSelectedRow()),

+					// 4).equals(username) == true

+					) {

+						String imageid = modelPublicVorlagen

+								.getValueAt(

+										tablePublicVorlagen

+												.convertRowIndexToModel(tablePublicVorlagen

+														.getSelectedRow()), 6)

+								.toString();

+

+						Image.image.setImageId(imageid);

+						String imageversion = modelPublicVorlagen

+								.getValueAt(

+										tablePublicVorlagen

+												.convertRowIndexToModel(tablePublicVorlagen

+														.getSelectedRow()), 7)

+								.toString();

+

+						Image.image.setVersion(imageversion);

+

+						SearchImage_GUI.this.setVisible(false);

+						FTPSearchDownloader_GUI down = new FTPSearchDownloader_GUI();

+						down.setVisible(true);

+					}

+				} else if (tabbedPane.getSelectedIndex() == 2) {

+					//

+					// Alle Images

+					//

+					/**

+					 * if (tableAllImages.getSelectedRow() != -1 && modelAll

+					 * .getValueAt( tableAllImages

+					 * .convertRowIndexToModel(tableAllImages

+					 * .getSelectedRow()), 4).equals(username) == true) {

+					 **/

+					if (tableAllImages.getSelectedRow() != -1) {

+						// nur eigene Images downloadbar

+						if (modelAll.getValueAt(

+								tableAllImages

+										.convertRowIndexToModel(tableAllImages

+												.getSelectedRow()), 4).equals(

+								username) == true) {

+							String imageid = modelAll

+									.getValueAt(

+											tableAllImages

+													.convertRowIndexToModel(tableAllImages

+															.getSelectedRow()),

+											6).toString();

+

+							Image.image.setImageId(imageid);

+							String imageversion = modelAll

+									.getValueAt(

+											tableAllImages

+													.convertRowIndexToModel(tableAllImages

+															.getSelectedRow()),

+											7).toString();

+

+							Image.image.setVersion(imageversion);

+

+							SearchImage_GUI.this.setVisible(false);

+							FTPSearchDownloader_GUI down = new FTPSearchDownloader_GUI();

+							down.setVisible(true);

+						} else {

+							JOptionPane

+									.showMessageDialog(

+											null,

+											"Sie haben keine Berechtigung fremde Images herunterzuladen.",

+											"Message",

+											JOptionPane.INFORMATION_MESSAGE);

+						}

+

+					}

+

+				} else {

+					//

+					// nichts markiert

+					//

+					JOptionPane

+							.showMessageDialog(

+									null,

+									"Bitte w\u00e4hlen Sie ein Image f\u00fcr den Download aus",

+									"Message", JOptionPane.INFORMATION_MESSAGE);

+				}

+			}

+		});

+		btnDownload.setBounds(449, 508, 118, 23);

+		contentPanel.add(btnDownload);

+		{

+			JPanel buttonPane = new JPanel();

+			buttonPane.setBounds(0, 640, 902, 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) {

+						// oeffnet das Hauptmenue

+

+						MainMenue_GUI main = new MainMenue_GUI();

+						main.setVisible(true);

+						dispose();

+					}

+				});

+				okButton.setActionCommand("OK");

+				buttonPane.add(okButton);

+				getRootPane().setDefaultButton(okButton);

+			}

+		}

+

+		JSeparator separator = new JSeparator();

+		separator.setBounds(0, 79, 912, 1);

+		getContentPane().add(separator);

+

+		JSeparator separator_1 = new JSeparator();

+		separator_1.setBounds(0, 627, 912, 2);

+		getContentPane().add(separator_1);

+		

+		JPanel panel = new JPanel();

+		panel.setLayout(null);

+		panel.setBorder(new TitledBorder(null, "Detailinformationen",


+						TitledBorder.LEADING, TitledBorder.TOP, null, null));

+		panel.setBackground(SystemColor.menu);

+		panel.setBounds(586, 85, 316, 531);

+		getContentPane().add(panel);

+		

+		JLabel lblName = new JLabel("Name:");

+		lblName.setBounds(10, 30, 130, 14);

+		panel.add(lblName);

+		

+		labelName = new JLabel("");

+		labelName.setBounds(150, 30, 130, 14);

+		panel.add(labelName);

+		

+		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");

+		lblVerantwortlicher.setBounds(10, 105, 130, 14);

+		panel.add(lblVerantwortlicher);

+		

+		labelOS = new JLabel("");

+		labelOS.setBounds(150, 55, 130, 14);

+		panel.add(labelOS);

+		

+		JLabel lblWeitereVerantwortliche = new JLabel("Betriebssystem:");

+		lblWeitereVerantwortliche.setBounds(10, 55, 130, 14);

+		panel.add(lblWeitereVerantwortliche);

+		

+		labelVerantwortlicher = new JLabel("");

+		labelVerantwortlicher.setBounds(150, 105, 130, 14);

+		panel.add(labelVerantwortlicher);

+		

+		JLabel label = new JLabel("Weitere Verantwortliche:");

+		label.setBounds(10, 130, 130, 14);

+		panel.add(label);

+		

+		labelWeitereVerantwortliche = new JLabel("");

+		labelWeitereVerantwortliche.setBounds(150, 130, 130, 14);

+		panel.add(labelWeitereVerantwortliche);

+		

+		JLabel label_5 = new JLabel("");

+		label_5.setBounds(150, 130, 130, 14);

+		panel.add(label_5);

+		

+		labelUpdate = new JLabel("");

+		labelUpdate.setBounds(150, 80, 130, 14);

+		panel.add(labelUpdate);

+		

+		JLabel lblLetztesUpdate = new JLabel("Letztes Update:");

+		lblLetztesUpdate.setBounds(10, 80, 130, 14);

+		panel.add(lblLetztesUpdate);

+		

+		JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:");

+		lblImageIstVorlage.setBounds(10, 259, 130, 14);

+		panel.add(lblImageIstVorlage);

+		

+		labelVorlage = new JLabel("");

+		labelVorlage.setBounds(150, 259, 130, 14);

+		panel.add(labelVorlage);

+		

+		labelLizenzSoftware = new JLabel("");

+		labelLizenzSoftware.setBounds(150, 284, 130, 14);

+		panel.add(labelLizenzSoftware);

+		

+		JLabel lblLizenzpflichtigeSoftware = new JLabel("Lizenzpflichtige Software:");

+		lblLizenzpflichtigeSoftware.setBounds(10, 284, 130, 14);

+		panel.add(lblLizenzpflichtigeSoftware);

+		

+		JLabel lblInternet = new JLabel("Internet:");

+		lblInternet.setBounds(10, 309, 130, 14);

+		panel.add(lblInternet);

+		

+		labelInternet = new JLabel("");

+		labelInternet.setBounds(150, 309, 130, 14);

+		panel.add(labelInternet);

+		

+		JLabel lblEmpfehlungRam = new JLabel("Empfehlung RAM:");

+		lblEmpfehlungRam.setBounds(10, 334, 130, 14);

+		panel.add(lblEmpfehlungRam);

+		

+		labelRam = new JLabel("");

+		labelRam.setBounds(150, 334, 130, 14);

+		panel.add(labelRam);

+		

+		JLabel lblEmpfehlungCpu = new JLabel("Empfehlung CPU:");

+		lblEmpfehlungCpu.setBounds(10, 359, 130, 14);

+		panel.add(lblEmpfehlungCpu);

+		

+		labelCPU = new JLabel("");

+		labelCPU.setBounds(150, 359, 130, 14);

+		panel.add(labelCPU);

+		

+		JLabel lblTechnischeDaten = new JLabel("Technische Daten:");

+		lblTechnischeDaten.setBounds(10, 223, 296, 14);

+		panel.add(lblTechnischeDaten);

+

+		JMenuBar menuBar = new JMenuBar();

+		setJMenuBar(menuBar);

+

+		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);

+

+	}

+

+	// Initiale Beffuelung eines Table models

+	public DefaultTableModel initTableModel(DefaultTableModel model) {

+		List<server.Image> images;

+		try {

+			// Hole eine Liste der Images

+			images = client.getImageList();

+

+			Iterator<server.Image> i = images.iterator();

+			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");

+			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");

+			int x = 0;

+

+			while (i.hasNext()) {

+				// erzeuge Objekte fuer die Tabelle

+				Object[] obj = { images.get(x).getImageName(),

+						images.get(x).getLicenseRestriction(),

+						images.get(x).getOsName(),

+						images.get(x).getLectureName(),

+						images.get(x).getUserData(),

+						out.format(in.parse(images.get(x).updateTime)), images.get(x).id,

+						images.get(x).getVersion(),

+						images.get(x).getIsTemplate() };

+				// Fuege diese Objekte der Tabelle hinzu

+				model.addRow(obj);

+				x++;

+				i.next();

+

+			}

+

+			return model;

+		} catch (TException | ParseException e1) {

+			// TODO Auto-generated catch block

+			e1.printStackTrace();

+			JOptionPane.showMessageDialog(null,

+					e1.getCause() + "\n" + e1.getMessage(), "Debug-Message",

+					JOptionPane.ERROR_MESSAGE);

+		}

+		return model;

+	}

+	

+	public void writeImageData(String id, String version){

+    	try {

+			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");

+			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");

+			Map<String,String> res=client.getImageData(id,version);

+			labelName.setText(res.get("name"));

+			labelOS.setText(res.get("os"));

+			labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));

+			labelVerantwortlicher.setText(res.get("owner"));

+			labelWeitereVerantwortliche.setText("Noch nicht Verfügbar");

+			if(res.get("template").equals("true")){

+				labelVorlage.setText("Ja");

+			}else{

+				labelVorlage.setText("Nein");

+			}

+			if(res.get("license").equals("1")){

+				labelLizenzSoftware.setText("Ja");

+			}

+			else

+			{

+				labelLizenzSoftware.setText("Nein");

+			}

+			if(res.get("internet").equals("1")){

+				labelInternet.setText("Ja");

+			}

+			else

+			{

+				labelInternet.setText("Nein");

+			}

+			labelRam.setText(res.get("ram"));

+			labelCPU.setText(res.get("cpu"));

+		} catch (TException | ParseException e1) {

+			// TODO Auto-generated catch block

+			e1.printStackTrace();

+		}

+	}

+}

diff --git a/Dozentenmodul/src/gui/lecture/ExtendedSearchForLectures_GUI.java b/Dozentenmodul/src/gui/lecture/ExtendedSearchForLectures_GUI.java
deleted file mode 100644
index 9afb1790..00000000
--- a/Dozentenmodul/src/gui/lecture/ExtendedSearchForLectures_GUI.java
+++ /dev/null
@@ -1,269 +0,0 @@
-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/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java
index 20be7872..23195b1a 100644
--- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java
@@ -1,437 +1,452 @@
-package gui.lecture;
-
-import gui.intro.About_GUI;
-import gui.intro.MainMenue_GUI;
-
-import java.awt.Color;
-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.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.swing.JButton;
-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.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JTabbedPane;
-import javax.swing.JTable;
-import javax.swing.JTextField;
-import javax.swing.JTextPane;
-import javax.swing.RowFilter;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableModel;
-import javax.swing.table.TableRowSorter;
-
-import models.Links;
-import models.person;
-
-import org.apache.thrift.TException;
-
-import server.Server.Client;
-import thrift.ThriftConnection;
-import util.GuiOrganizer;
-import util.OpenLinks;
-
-@SuppressWarnings("serial")
-public class SearchLecture_GUI extends JFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	String[] result;
-	JRadioButton rdbtnInternetJa;
-	JRadioButton rdbtnInternetNein;
-	JTable tableAllLectures;
-	JTable tablemyLectures;
-	JTable tableCoopImages;
-	JTable tablePublicVorlagen;
-	JTable tablePublicImages;
-	private JTextField textFieldName;
-	JTabbedPane tabbedPane;
-	String[] titles = { "Veranstaltungsname", "Beschreibung",
-			"G\u00fcltigkeitsdatum", "Aktiv", "Letzte Benutzung",
-			"Verantwortlicher", "Image", "Schlagwort", "ID" };
-	ThriftConnection con = new ThriftConnection();
-	Client client = models.Client.clientcon.getClient();
-	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){
-		 public boolean isCellEditable(int rowIndex, int mColIndex) {
-		        return false;
-		      }
-	};
-	final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0){
-		 public boolean isCellEditable(int rowIndex, int mColIndex) {
-		        return false;
-		      }
-	};
-	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
-			modelAll);
-	final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(
-			modelMyLectures);
-
-
-	/**
-	 * Create the dialog.
-	 */
-	public SearchLecture_GUI() {
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent arg0) {
-				// Beendet die Anwendung nach klick auf X
-				con.closeThriftConnection();
-				System.exit(0);
-			}
-		});
-		// Verhindert das Vergroessern Des Fensters
-		setResizable(false);
-
-		try {
-			// Setzt das Look & Feel auf System
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (ClassNotFoundException | InstantiationException
-				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		// Setzt den Fenstertitel
-		setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung suchen");
-		// Zentriert das Fenster in die Bildmitte 2;
-		setBounds(0, 0, 603, 722);
-		GuiOrganizer.centerGUI(this);
-
-		final DefaultTableModel model = new DefaultTableModel(titles, 0);
-
-		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("Suche nach Veranstaltung");
-				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("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");
-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
-			panel.add(txtpnBitteWhlenSie);
-		}
-		contentPanel.setBounds(10, 85, 577, 531);
-		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, "Filterfunktionen",
-				TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 49, 557, 63);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-
-		JLabel lblNewLabel_2 = new JLabel("Anzeigename:");
-		lblNewLabel_2.setBounds(10, 30, 250, 20);
-		panel_1.add(lblNewLabel_2);
-
-		textFieldName = new JTextField();
-		// Key Listener der Tastatureingabe registriert
-		textFieldName.addKeyListener(new KeyAdapter() {
-			@Override
-			public void keyReleased(KeyEvent e) {
-				// Textfield eingabe auslesen
-				String stext = textFieldName.getText();
-
-				// Wenn Textfield nicht leer
-				if (stext != "") {
-					// Filtere nach der Eingabe
-					rowSorterAll.setRowFilter(RowFilter.regexFilter(
-							textFieldName.getText(), 0));
-					rowSorterMyLectures.setRowFilter(RowFilter.regexFilter(
-							textFieldName.getText(), 0));
-
-				}
-			}
-		});
-
-		textFieldName.setBounds(270, 30, 250, 20);
-		panel_1.add(textFieldName);
-		textFieldName.setColumns(10);
-
-		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				// oeffnet das Hauptmenue
-				
-				SearchLecture_GUI.this.setVisible(false);
-				MainMenue_GUI main = new MainMenue_GUI();
-				main.setVisible(true);
-			}
-		});
-		lblHauptmen.setForeground(Color.BLUE);
-		lblHauptmen.setBounds(10, 11, 61, 14);
-		contentPanel.add(lblHauptmen);
-
-		JLabel label_1 = new JLabel(">");
-		label_1.setBounds(69, 11, 13, 14);
-		contentPanel.add(label_1);
-
-		JLabel lblVlimage = new JLabel("Veranstaltung");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 75, 14);
-		contentPanel.add(lblVlimage);
-
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(152, 11, 13, 14);
-		contentPanel.add(label_2);
-
-		JLabel lblNewLabel_1 = new JLabel("Veranstaltungsauswahl");
-		lblNewLabel_1.setBounds(166, 11, 128, 14);
-		contentPanel.add(lblNewLabel_1);
-
-		tabbedPane = new JTabbedPane(JTabbedPane.TOP);
-		tabbedPane.addChangeListener(new ChangeListener() {
-			public void stateChanged(ChangeEvent arg0) {
-				if (tabbedPane.getSelectedIndex() == 0) {
-
-					String username = person.verantwortlicher.getName() + " "
-							+ person.verantwortlicher.getVorname();
-					rowSorterMyLectures.setRowFilter(RowFilter.regexFilter(
-							username, 5));
-				} else if (tabbedPane.getSelectedIndex() == 1) {
-
-				}
-
-			}
-		});
-
-		tabbedPane.setBounds(10, 123, 557, 397);
-		contentPanel.add(tabbedPane);
-		initTableModel(modelMyLectures);
-
-		JScrollPane scrollPaneAllImages = new JScrollPane();
-		tableAllLectures = new JTable();
-		tableAllLectures.setModel(modelAll);
-		tableAllLectures.getColumnModel().getColumn(1).sizeWidthToFit();
-		tableAllLectures.getColumnModel().getColumn(2).sizeWidthToFit();
-		tableAllLectures.getColumnModel().getColumn(3).sizeWidthToFit();
-		tableAllLectures.getColumnModel().getColumn(4).sizeWidthToFit();
-		tableAllLectures.getColumnModel().getColumn(5).sizeWidthToFit();
-		initTableModel(modelAll);
-
-		JScrollPane scrollPaneMyImage = new JScrollPane();
-		tablemyLectures = new JTable();
-		tablemyLectures.setModel(modelMyLectures);
-
-		tablemyLectures.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablemyLectures.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablemyLectures.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablemyLectures.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablemyLectures.getColumnModel().getColumn(5).sizeWidthToFit();
-		tablemyLectures.setRowSorter(rowSorterMyLectures);
-
-		scrollPaneMyImage.setViewportView(tablemyLectures);
-		tabbedPane.addTab("Meine Veranstaltungen", null, scrollPaneMyImage,
-				null);
-		tableAllLectures.setRowSorter(rowSorterAll);
-
-		scrollPaneAllImages.setViewportView(tableAllLectures);
-		tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
-
-		JScrollPane scrollPaneCoopImages = new JScrollPane();
-		tableCoopImages = new JTable();
-		tableCoopImages.setModel(model);
-		tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit();
-		
-				JScrollPane scrollPanePublicVorlagen = new JScrollPane();
-				tablePublicVorlagen = new JTable();
-				tablePublicVorlagen.setModel(model);
-				tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
-				tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
-				tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit();
-				tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit();
-				tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit();
-				
-						scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);
-						tabbedPane.addTab("\u00D6ffentliche Veranstaltungen", null,
-								scrollPanePublicVorlagen, null);
-						tabbedPane.setEnabledAt(2, false);
-
-		scrollPaneCoopImages.setViewportView(tableCoopImages);
-		tabbedPane.addTab("Kooperative Veranstaltungen", null,
-				scrollPaneCoopImages, null);
-		tabbedPane.setEnabledAt(3, false);
-
-		JScrollPane scrollPanePublicImages = new JScrollPane();
-		tablePublicImages = new JTable();
-		tablePublicImages.setModel(model);
-		tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit();
-
-		scrollPanePublicImages.setViewportView(tablePublicImages);
-		tabbedPane.addTab("\u00D6ffentliche Images", null,
-				scrollPanePublicImages, null);
-		tabbedPane.setEnabledAt(4, false);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton btnBack = new JButton("Zur\u00FCck");
-				btnBack.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						// oeffnet das Hauptmenue
-						
-						MainMenue_GUI main = new MainMenue_GUI();
-						main.setVisible(true);
-						dispose();
-					}
-				});
-				btnBack.setActionCommand("OK");
-				buttonPane.add(btnBack);
-				getRootPane().setDefaultButton(btnBack);
-			}
-		}
-
-		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_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);
-
-	}
-
-	// Initiale Beffuelung eines Table models
-	public DefaultTableModel initTableModel(DefaultTableModel model) {
-		List<server.Lecture> lectures;
-		try {
-			// Hole eine Liste der Images
-			lectures = client.getLectureList();
-			Iterator<server.Lecture> i = lectures.iterator();
-
-			int x = 0;
-
-			while (i.hasNext()) {
-				// erzeuge Objekte fuer die Tabelle
-				Object[] obj = {
-						lectures.get(x).lecturename,
-						lectures.get(x).desc,
-						lectures.get(x).starttime + " "
-								+ lectures.get(x).endtime,
-						lectures.get(x).isActive, lectures.get(x).lastused,
-						lectures.get(x).username, 
-						lectures.get(x).imagename," " ,lectures.get(x).id };
-				// Fuege diese Objekte der Tabelle hinzu
-				model.addRow(obj);
-				x++;
-				i.next();
-
-			}
-
-			return model;
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-		return model;
-	}
-
-}
+package gui.lecture;

+

+import gui.intro.About_GUI;

+import gui.intro.MainMenue_GUI;

+

+import java.awt.Color;

+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.KeyAdapter;

+import java.awt.event.KeyEvent;

+import java.awt.event.MouseAdapter;

+import java.awt.event.MouseEvent;

+import java.awt.event.WindowAdapter;

+import java.awt.event.WindowEvent;

+import java.net.URI;

+import java.net.URISyntaxException;

+import java.util.Iterator;

+import java.util.List;

+

+import javax.swing.JButton;

+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.JRadioButton;

+import javax.swing.JScrollPane;

+import javax.swing.JSeparator;

+import javax.swing.JTabbedPane;

+import javax.swing.JTable;

+import javax.swing.JTextField;

+import javax.swing.JTextPane;

+import javax.swing.RowFilter;

+import javax.swing.UIManager;

+import javax.swing.UnsupportedLookAndFeelException;

+import javax.swing.border.EmptyBorder;

+import javax.swing.border.TitledBorder;

+import javax.swing.event.ChangeEvent;

+import javax.swing.event.ChangeListener;

+import javax.swing.table.DefaultTableModel;

+import javax.swing.table.TableModel;

+import javax.swing.table.TableRowSorter;

+

+import models.Links;

+import models.person;

+

+import org.apache.thrift.TException;

+

+import server.Server.Client;

+import thrift.ThriftConnection;

+import util.GuiOrganizer;

+import util.OpenLinks;

+

+@SuppressWarnings("serial")

+public class SearchLecture_GUI extends JFrame {

+

+	private final JPanel contentPanel = new JPanel();

+	String[] result;

+	JRadioButton rdbtnInternetJa;

+	JRadioButton rdbtnInternetNein;

+	JTable tableAllLectures;

+	JTable tablemyLectures;

+	JTable tableCoopImages;

+	JTable tablePublicVorlagen;

+	JTable tablePublicImages;

+	private JTextField textFieldName;

+	JTabbedPane tabbedPane;

+	String[] titles = { "Veranstaltungsname", "Beschreibung",

+			"G\u00fcltigkeitsdatum", "Aktiv", "Letzte Benutzung",

+			"Verantwortlicher", "Image", "Schlagwort", "ID" };

+	ThriftConnection con = new ThriftConnection();

+	Client client = models.Client.clientcon.getClient();

+	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){

+		 public boolean isCellEditable(int rowIndex, int mColIndex) {

+		        return false;

+		      }

+	};

+	final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0){

+		 public boolean isCellEditable(int rowIndex, int mColIndex) {

+		        return false;

+		      }

+	};

+	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(

+			modelAll);

+	final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(

+			modelMyLectures);

+

+

+	/**

+	 * Create the dialog.

+	 */

+	public SearchLecture_GUI() {

+		addWindowListener(new WindowAdapter() {

+			@Override

+			public void windowClosing(WindowEvent arg0) {

+				// Beendet die Anwendung nach klick auf X

+				con.closeThriftConnection();

+				System.exit(0);

+			}

+		});

+		// Verhindert das Vergroessern Des Fensters

+		setResizable(false);

+

+		try {

+			// Setzt das Look & Feel auf System

+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

+		} catch (ClassNotFoundException | InstantiationException

+				| IllegalAccessException | UnsupportedLookAndFeelException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		// Setzt den Fenstertitel

+		setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung suchen");

+		// Zentriert das Fenster in die Bildmitte 2;

+		setBounds(0, 0, 842, 722);

+		GuiOrganizer.centerGUI(this);

+

+		final DefaultTableModel model = new DefaultTableModel(titles, 0);

+

+		getContentPane().setLayout(null);

+		{

+			JPanel panel = new JPanel();

+			panel.setBackground(SystemColor.menu);

+			panel.setBounds(10, 11, 816, 57);

+			getContentPane().add(panel);

+			panel.setLayout(null);

+			{

+				JLabel lblNewLabel = new JLabel("Suche nach Veranstaltung");

+				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("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");

+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);

+			panel.add(txtpnBitteWhlenSie);

+		}

+		contentPanel.setBounds(10, 85, 577, 531);

+		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, "Filterfunktionen",

+				TitledBorder.LEADING, TitledBorder.TOP, null, null));

+		panel_1.setBounds(10, 49, 557, 63);

+		contentPanel.add(panel_1);

+		panel_1.setLayout(null);

+

+		JLabel lblNewLabel_2 = new JLabel("Anzeigename:");

+		lblNewLabel_2.setBounds(10, 30, 250, 20);

+		panel_1.add(lblNewLabel_2);

+

+		textFieldName = new JTextField();

+		// Key Listener der Tastatureingabe registriert

+		textFieldName.addKeyListener(new KeyAdapter() {

+			@Override

+			public void keyReleased(KeyEvent e) {

+				// Textfield eingabe auslesen

+				String stext = textFieldName.getText();

+

+				// Wenn Textfield nicht leer

+				if (stext != "") {

+					// Filtere nach der Eingabe

+					rowSorterAll.setRowFilter(RowFilter.regexFilter(

+							textFieldName.getText(), 0));

+					rowSorterMyLectures.setRowFilter(RowFilter.regexFilter(

+							textFieldName.getText(), 0));

+

+				}

+			}

+		});

+

+		textFieldName.setBounds(270, 30, 250, 20);

+		panel_1.add(textFieldName);

+		textFieldName.setColumns(10);

+

+		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");

+		lblHauptmen.addMouseListener(new MouseAdapter() {

+			@Override

+			public void mouseClicked(MouseEvent arg0) {

+				// oeffnet das Hauptmenue

+				

+				SearchLecture_GUI.this.setVisible(false);

+				MainMenue_GUI main = new MainMenue_GUI();

+				main.setVisible(true);

+			}

+		});

+		lblHauptmen.setForeground(Color.BLUE);

+		lblHauptmen.setBounds(10, 11, 61, 14);

+		contentPanel.add(lblHauptmen);

+

+		JLabel label_1 = new JLabel(">");

+		label_1.setBounds(69, 11, 13, 14);

+		contentPanel.add(label_1);

+

+		JLabel lblVlimage = new JLabel("Veranstaltung");

+		lblVlimage.setForeground(Color.BLUE);

+		lblVlimage.setBounds(81, 11, 75, 14);

+		contentPanel.add(lblVlimage);

+

+		JLabel label_2 = new JLabel(">");

+		label_2.setBounds(152, 11, 13, 14);

+		contentPanel.add(label_2);

+

+		JLabel lblNewLabel_1 = new JLabel("Veranstaltungsauswahl");

+		lblNewLabel_1.setBounds(166, 11, 128, 14);

+		contentPanel.add(lblNewLabel_1);

+

+		tabbedPane = new JTabbedPane(JTabbedPane.TOP);

+		tabbedPane.addChangeListener(new ChangeListener() {

+			public void stateChanged(ChangeEvent arg0) {

+				if (tabbedPane.getSelectedIndex() == 0) {

+

+					String username = person.verantwortlicher.getName() + " "

+							+ person.verantwortlicher.getVorname();

+					rowSorterMyLectures.setRowFilter(RowFilter.regexFilter(

+							username, 5));

+				} else if (tabbedPane.getSelectedIndex() == 1) {

+

+				}

+

+			}

+		});

+

+		tabbedPane.setBounds(10, 123, 557, 397);

+		contentPanel.add(tabbedPane);

+		initTableModel(modelMyLectures);

+

+		JScrollPane scrollPaneAllImages = new JScrollPane();

+		tableAllLectures = new JTable();

+		tableAllLectures.setModel(modelAll);

+		tableAllLectures.getColumnModel().getColumn(1).sizeWidthToFit();

+		tableAllLectures.getColumnModel().getColumn(2).sizeWidthToFit();

+		tableAllLectures.getColumnModel().getColumn(3).sizeWidthToFit();

+		tableAllLectures.getColumnModel().getColumn(4).sizeWidthToFit();

+		tableAllLectures.getColumnModel().getColumn(5).sizeWidthToFit();

+		initTableModel(modelAll);

+

+		JScrollPane scrollPaneMyImage = new JScrollPane();

+		tablemyLectures = new JTable();

+		tablemyLectures.setModel(modelMyLectures);

+

+		tablemyLectures.getColumnModel().getColumn(1).sizeWidthToFit();

+		tablemyLectures.getColumnModel().getColumn(2).sizeWidthToFit();

+		tablemyLectures.getColumnModel().getColumn(3).sizeWidthToFit();

+		tablemyLectures.getColumnModel().getColumn(4).sizeWidthToFit();

+		tablemyLectures.getColumnModel().getColumn(5).sizeWidthToFit();

+		tablemyLectures.setRowSorter(rowSorterMyLectures);

+

+		scrollPaneMyImage.setViewportView(tablemyLectures);

+		tabbedPane.addTab("Meine Veranstaltungen", null, scrollPaneMyImage,

+				null);

+		tableAllLectures.setRowSorter(rowSorterAll);

+

+		scrollPaneAllImages.setViewportView(tableAllLectures);

+		tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);

+

+		JScrollPane scrollPaneCoopImages = new JScrollPane();

+		tableCoopImages = new JTable();

+		tableCoopImages.setModel(model);

+		tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit();

+		tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit();

+		tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit();

+		tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit();

+		tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit();

+		

+				JScrollPane scrollPanePublicVorlagen = new JScrollPane();

+				tablePublicVorlagen = new JTable();

+				tablePublicVorlagen.setModel(model);

+				tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();

+				tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();

+				tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit();

+				tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit();

+				tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit();

+				

+						scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);

+						tabbedPane.addTab("\u00D6ffentliche Veranstaltungen", null,

+								scrollPanePublicVorlagen, null);

+						tabbedPane.setEnabledAt(2, false);

+

+		scrollPaneCoopImages.setViewportView(tableCoopImages);

+		tabbedPane.addTab("Kooperative Veranstaltungen", null,

+				scrollPaneCoopImages, null);

+		tabbedPane.setEnabledAt(3, false);

+

+		JScrollPane scrollPanePublicImages = new JScrollPane();

+		tablePublicImages = new JTable();

+		tablePublicImages.setModel(model);

+		tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit();

+		tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit();

+		tablePublicImages.getColumnModel().getColumn(3).sizeWidthToFit();

+		tablePublicImages.getColumnModel().getColumn(4).sizeWidthToFit();

+		tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit();

+

+		scrollPanePublicImages.setViewportView(tablePublicImages);

+		tabbedPane.addTab("\u00D6ffentliche Images", null,

+				scrollPanePublicImages, null);

+		tabbedPane.setEnabledAt(4, false);

+		{

+			JPanel buttonPane = new JPanel();

+			buttonPane.setBounds(0, 640, 826, 33);

+			buttonPane.setBackground(SystemColor.menu);

+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));

+			getContentPane().add(buttonPane);

+			{

+				JButton btnBack = new JButton("Zur\u00FCck");

+				btnBack.addActionListener(new ActionListener() {

+					public void actionPerformed(ActionEvent e) {

+						// oeffnet das Hauptmenue

+						

+						MainMenue_GUI main = new MainMenue_GUI();

+						main.setVisible(true);

+						dispose();

+					}

+				});

+				btnBack.setActionCommand("OK");

+				buttonPane.add(btnBack);

+				getRootPane().setDefaultButton(btnBack);

+			}

+		}

+

+		JSeparator separator = new JSeparator();

+		separator.setBounds(0, 79, 836, 1);

+		getContentPane().add(separator);

+

+		JSeparator separator_1 = new JSeparator();

+		separator_1.setBounds(0, 628, 836, 1);

+		getContentPane().add(separator_1);

+		

+		JPanel panel = new JPanel();

+		panel.setLayout(null);

+		panel.setBorder(new TitledBorder(null, "Detailinformationen",


+						TitledBorder.LEADING, TitledBorder.TOP, null, null));

+		panel.setBackground(SystemColor.menu);

+		panel.setBounds(591, 85, 235, 518);

+		getContentPane().add(panel);

+		

+		JLabel lblNewLabel_3 = new JLabel("Name:");

+		lblNewLabel_3.setBounds(10, 27, 104, 14);

+		panel.add(lblNewLabel_3);

+		

+		JLabel labelName = new JLabel("");

+		labelName.setBounds(124, 27, 104, 14);

+		panel.add(labelName);

+

+		JMenuBar menuBar = new JMenuBar();

+		setJMenuBar(menuBar);

+

+		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);

+

+	}

+

+	// Initiale Beffuelung eines Table models

+	public DefaultTableModel initTableModel(DefaultTableModel model) {

+		List<server.Lecture> lectures;

+		try {

+			// Hole eine Liste der Images

+			lectures = client.getLectureList();

+			Iterator<server.Lecture> i = lectures.iterator();

+

+			int x = 0;

+

+			while (i.hasNext()) {

+				// erzeuge Objekte fuer die Tabelle

+				Object[] obj = {

+						lectures.get(x).lecturename,

+						lectures.get(x).desc,

+						lectures.get(x).starttime + " "

+								+ lectures.get(x).endtime,

+						lectures.get(x).isActive, lectures.get(x).lastused,

+						lectures.get(x).username, 

+						lectures.get(x).imagename," " ,lectures.get(x).id };

+				// Fuege diese Objekte der Tabelle hinzu

+				model.addRow(obj);

+				x++;

+				i.next();

+

+			}

+

+			return model;

+		} catch (TException e1) {

+			// TODO Auto-generated catch block

+			e1.printStackTrace();

+		}

+		return model;

+	}

+}

diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class
index a2be4265..c502967e 100644
--- a/Dozentenmodulserver/bin/sql/SQL.class
+++ b/Dozentenmodulserver/bin/sql/SQL.class
diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java
index a642dd22..2922eafc 100644
--- a/Dozentenmodulserver/src/sql/SQL.java
+++ b/Dozentenmodulserver/src/sql/SQL.java
@@ -490,8 +490,7 @@ public class SQL {
 			Connection con=getConnection();

 			Statement stm = con.createStatement();

 			ResultSet data=stm

-					.executeQuery("SELECT image_name,cond_hasInternetRestriction,cond_hasLicenseRestriction, cond_minCPUs, cond_minRAM, image_syncMode,image_filesize,image_path, image_isTemplate,content_operatingSystem FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"

-							+ id + "' and imageVersion = '" + version + "' ;");

+					.executeQuery("SELECT i.image_name,i.image_update_time,i.cond_hasInternetRestriction,i.cond_hasLicenseRestriction, i.cond_minCPUs,i.cond_minRAM, i.image_syncMode,i.image_filesize,i.image_path, i.image_isTemplate,os.GuestOS, concat(u.Nachname,' ',u.Vorname) as Owner FROM bwLehrpool.m_VLData_imageInfo i,bwLehrpool.m_user u,bwLehrpool.m_operatingSystem os where i.image_owner=u.userID and i.content_operatingSystem=os.operatingSystemID and GUID_imageID = '"	+ id + "' and imageVersion = '" + version + "' ;");

 			while (data.next()) {

 				map.put("name", data.getString("image_name"));

 				map.put("internet",

@@ -503,10 +502,10 @@ public class SQL {
 				map.put("filesize", data.getString("image_filesize"));

 				map.put("path", data.getString("image_path"));

 				map.put("template", data.getString("image_isTemplate"));

-				

-				String os_name=getOS(data.getString("content_operatingSystem"));

-				

-				map.put("os", os_name);

+				map.put("os",data.getString("GuestOS"));

+				map.put("owner", data.getString("Owner"));

+				map.put("lastupdate", data.getString("image_update_time"));

+

 			}

 			con.close();

 			return map;