mavenization on its way...

8 files changed, 3851 insertions, 0 deletions

diff --git a/Dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
new file mode 100644
index 00000000..44e8bd50
--- /dev/null
+++ b/Dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
@@ -0,0 +1,545 @@
+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.ScrollPane;
+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.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Calendar;
+import java.util.Date;
+
+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.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JSeparator;
+import javax.swing.JTextArea;
+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.Image;
+import models.Lecture;
+import models.Links;
+import models.person;
+import util.GuiOrganizer;
+import util.OpenLinks;
+
+import com.toedter.calendar.JDateChooser;
+
+@SuppressWarnings("serial")
+public class CreateLectureAllgemein_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	private JTextField Vorname;
+	private JTextField Nachname;
+	private JTextField Hochschule;
+	private JTextField EMail;
+	private JTextField txtFldVeranstaltungsname;
+	JTextArea description;
+	JRadioButton radioButtonyes;
+	JRadioButton radioButtonno;
+	JDateChooser dateChooserend;
+	JDateChooser dateChooserstart;
+	Date startDate = new Date();
+	Date endDate;
+	int maxLifeTime = 180; // Anzahl Tage, die eine Veranstaltung in der Zukunft
+							// aktiv sein darf
+	boolean isDateOrderCorrect, isDateMaxLifeTimeCorrect,
+			isAllInformationReady = false;
+
+
+	/**
+	 * Create the dialog.
+	 */
+	public CreateLectureAllgemein_GUI() {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent arg0) {
+				System.exit(0);
+			}
+
+			@Override
+			public void windowOpened(WindowEvent arg0) {
+				txtFldVeranstaltungsname.requestFocusInWindow();
+			}
+		});
+		setResizable(false);
+
+		try {
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung erzeugen");
+		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("Eingabe Ihrer Daten");
+				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("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 21);
+			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, "Informationen zum Besitzer",
+				TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_1.setBounds(10, 331, 557, 162);
+		contentPanel.add(panel_1);
+		panel_1.setLayout(null);
+
+		JLabel label = new JLabel("Vorname: *");
+		label.setBackground(SystemColor.menu);
+		label.setBounds(10, 33, 125, 20);
+		panel_1.add(label);
+
+		Vorname = new JTextField();
+		Vorname.setEditable(false);
+		Vorname.setEnabled(false);
+		Vorname.setText(person.verantwortlicher.getVorname());
+		Vorname.setBackground(Color.WHITE);
+		Vorname.setColumns(10);
+		Vorname.setBounds(145, 33, 350, 20);
+		panel_1.add(Vorname);
+
+		JLabel label_7 = new JLabel("Nachname: *");
+		label_7.setBackground(SystemColor.menu);
+		label_7.setBounds(10, 64, 125, 20);
+		panel_1.add(label_7);
+
+		Nachname = new JTextField();
+		Nachname.setEnabled(false);
+		Nachname.setEditable(false);
+		Nachname.setText(person.verantwortlicher.getName());
+		Nachname.setBackground(Color.WHITE);
+		Nachname.setColumns(10);
+		Nachname.setBounds(145, 64, 350, 20);
+		panel_1.add(Nachname);
+
+		JLabel label_8 = new JLabel("Hochschule: *");
+		label_8.setBackground(SystemColor.menu);
+		label_8.setBounds(10, 95, 125, 20);
+		panel_1.add(label_8);
+
+		Hochschule = new JTextField();
+		Hochschule.setEnabled(false);
+		Hochschule.setEditable(false);
+		Hochschule.setText(person.verantwortlicher.getHochschule());
+		Hochschule.setBackground(Color.WHITE);
+		Hochschule.setColumns(10);
+		Hochschule.setBounds(145, 95, 350, 20);
+		panel_1.add(Hochschule);
+
+		JLabel label_9 = new JLabel("E-Mail: *");
+		label_9.setBackground(SystemColor.menu);
+		label_9.setBounds(10, 126, 125, 20);
+		panel_1.add(label_9);
+
+		EMail = new JTextField();
+		EMail.setEnabled(false);
+		EMail.setEditable(false);
+		EMail.setText(person.verantwortlicher.getEMail());
+		EMail.setBackground(Color.WHITE);
+		EMail.setColumns(10);
+		EMail.setBounds(145, 126, 350, 20);
+		panel_1.add(EMail);
+
+		JPanel panel = new JPanel();
+		panel.setBounds(10, 402, 577, 33);
+		contentPanel.add(panel);
+		panel.setLayout(null);
+		panel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		panel.setBackground(SystemColor.menu);
+
+		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
+		lblHauptmen.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+
+				CreateLectureAllgemein_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("Neu");
+		lblNewLabel_1.setBounds(146, 11, 46, 14);
+		contentPanel.add(lblNewLabel_1);
+
+		JPanel panel_2 = new JPanel();
+		panel_2.setLayout(null);
+		panel_2.setBorder(new TitledBorder(null, "Veranstaltungsdaten",
+				TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_2.setBackground(SystemColor.menu);
+		panel_2.setBounds(10, 36, 557, 284);
+		contentPanel.add(panel_2);
+
+		JLabel label_3 = new JLabel("Laborname (Anzeigename): *");
+		label_3.setBounds(10, 25, 180, 14);
+		panel_2.add(label_3);
+
+		txtFldVeranstaltungsname = new JTextField();
+		txtFldVeranstaltungsname.setColumns(10);
+		txtFldVeranstaltungsname.setBounds(200, 22, 347, 20);
+		txtFldVeranstaltungsname.setText(Lecture.lecture.getName());
+		panel_2.add(txtFldVeranstaltungsname);
+
+		JTextArea textArea = new JTextArea();
+		textArea.setEditable(false);
+		textArea.setWrapStyleWord(true);
+		textArea.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an. Dieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\"");
+		textArea.setLineWrap(true);
+		textArea.setFont(new Font("Tahoma", Font.PLAIN, 12));
+		textArea.setBackground(SystemColor.menu);
+		textArea.setBounds(10, 49, 537, 49);
+		panel_2.add(textArea);
+
+		JLabel lblDesc = new JLabel("Beschreibung: *");
+		lblDesc.setBounds(10, 111, 180, 14);
+		panel_2.add(lblDesc);
+
+		ScrollPane scrollPane = new ScrollPane();
+		scrollPane.setBounds(200, 104, 347, 78);
+		panel_2.add(scrollPane);
+		description = new JTextArea();
+		description.setFont(new Font("Tahoma", Font.PLAIN, 11));
+		description.setLineWrap(true);
+		description.setText(Lecture.lecture.getDesc());
+		scrollPane.add(description);
+		description.setBounds(0, 0, 4, 22);
+		scrollPane.add(description);
+
+		dateChooserend = new JDateChooser();
+		endDate = addDays(new Date(), maxLifeTime); // Datum darf weiter als 6
+													// Monate in der Zukunft
+													// liegen
+		dateChooserend.setDate(endDate);
+		if (Lecture.lecture.getEnddate() == null) {
+			// is not defined yet
+			dateChooserend.setDate(endDate);
+		} else {
+			// already defined from last visit on this page
+			dateChooserend.setDate(Lecture.lecture.getEnddate());
+		}
+		dateChooserend.setDateFormatString("yyyy-MM-dd hh:mm:ss");
+		dateChooserend.setBounds(404, 188, 143, 20);
+		panel_2.add(dateChooserend);
+
+		JLabel lblBis = new JLabel("bis:");
+		lblBis.setBounds(378, 188, 21, 20);
+		panel_2.add(lblBis);
+
+		dateChooserstart = new JDateChooser();
+		if (Lecture.lecture.getStartdate() == null) {
+			// is not defined yet
+			dateChooserstart.setDate(startDate);
+		} else {
+			// already defined from last visit on this page
+			dateChooserstart.setDate(Lecture.lecture.getStartdate());
+		}
+		dateChooserstart.setDateFormatString("yyyy-MM-dd hh:mm:ss");
+		dateChooserstart.setBounds(226, 188, 143, 20);
+		panel_2.add(dateChooserstart);
+
+		JLabel label_6 = new JLabel("von:");
+		label_6.setBounds(200, 188, 30, 20);
+		panel_2.add(label_6);
+
+		JLabel label_10 = new JLabel("G\u00FCltigkeitsdatum: *");
+		label_10.setBounds(10, 194, 127, 14);
+		panel_2.add(label_10);
+
+		JLabel label_11 = new JLabel("Aktiv:");
+		label_11.setBounds(10, 229, 127, 14);
+		panel_2.add(label_11);
+
+		radioButtonyes = new JRadioButton("Ja");
+		radioButtonyes.setSelected(true);
+		radioButtonyes.setBounds(200, 225, 73, 23);
+		panel_2.add(radioButtonyes);
+
+		radioButtonno = new JRadioButton("Nein");
+		radioButtonyes.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent arg0) {
+				radioButtonyes.setSelected(true);
+				radioButtonno.setSelected(false);
+			}
+		});
+		radioButtonno.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				radioButtonno.setSelected(true);
+				radioButtonyes.setSelected(false);
+			}
+		});
+		radioButtonno.setBounds(296, 225, 73, 23);
+		panel_2.add(radioButtonno);
+
+		JLabel lblimVmchooserSichtbar = new JLabel("(im VMChooser sichtbar)");
+		lblimVmchooserSichtbar.setBounds(10, 245, 127, 14);
+		panel_2.add(lblimVmchooserSichtbar);
+		
+		JLabel lblmaxMonate = new JLabel("(max. 6 Monate)");
+		lblmaxMonate.setBounds(10, 208, 127, 14);
+		panel_2.add(lblmaxMonate);
+		{
+			JPanel buttonPane = new JPanel();
+			buttonPane.setBounds(0, 640, 597, 33);
+			buttonPane.setBackground(SystemColor.menu);
+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+			getContentPane().add(buttonPane);
+			{
+				JButton backButton = new JButton("Zur\u00FCck");
+				backButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						if (radioButtonyes.isSelected() == true) {
+							Lecture.lecture.setActive(true);
+						} else {
+							Lecture.lecture.setActive(false);
+						}
+
+						Lecture.lecture.setName(txtFldVeranstaltungsname
+								.getText());
+						Lecture.lecture.setDesc(description.getText());
+						Lecture.lecture.setEnddate(dateChooserend.getDate());
+						Lecture.lecture.setStartdate(dateChooserstart.getDate());
+						Image.image.setImagename(txtFldVeranstaltungsname
+								.getText());
+
+						MainMenue_GUI sr = new MainMenue_GUI();
+						sr.setVisible(true);
+						dispose();
+					}
+				});
+				backButton.setActionCommand("Cancel");
+				buttonPane.add(backButton);
+				getRootPane().setDefaultButton(backButton);
+			}
+			{
+				JButton continueButton = new JButton("Weiter");
+				continueButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						// liegt das End-Datum vor dem Start-Datum?
+						if (dateChooserend.getDate().before(
+								dateChooserstart.getDate())) {
+							// datum ist falsch rum
+							isDateOrderCorrect = false;
+							JOptionPane
+									.showMessageDialog(
+											null,
+											"Das End-Datum liegt vor dem Start-Datum. Bitte \u00e4ndern.",
+											"Datum fehlerhaft",
+											JOptionPane.INFORMATION_MESSAGE);
+						} else {
+							// bereit
+							isDateOrderCorrect = true;
+						}
+						// liegt das eingegebene Datum nach dem erlaubten
+						// End-Datum?
+						if (dateChooserend.getDate().after(endDate)) {
+							// Datum zu weit weg
+							isDateMaxLifeTimeCorrect = false;
+							JOptionPane.showMessageDialog(null,
+									"Das End-Datum liegt zu weit in der Zukunft. Erlaubt ist maximal:\n"
+											+ endDate, "Datum fehlerhaft",
+									JOptionPane.INFORMATION_MESSAGE);
+							dateChooserend.setDate(endDate); //setze Datum auf maximum
+						} else {
+							// bereit
+							isDateMaxLifeTimeCorrect = true;
+						}
+						// Pruefen ob alles eingegeben wurde
+						if (txtFldVeranstaltungsname.getText().isEmpty() == true
+								|| description.getText().isEmpty() == true) {
+							// mind 1 Textfeld ist leer
+							isAllInformationReady = false;
+							JOptionPane
+									.showMessageDialog(
+											null,
+											"Bitte geben Sie einen Veranstaltungsnamen und eine Beschreibung ein.",
+											"Datum fehlerhaft",
+											JOptionPane.INFORMATION_MESSAGE);
+						} else {
+							// Textfelder bereit
+							isAllInformationReady = true;
+						}
+
+						// welcher Radiobutton ist geklickt?
+						if (radioButtonyes.isSelected() == true) {
+							Lecture.lecture.setActive(true);
+						} else {
+							Lecture.lecture.setActive(false);
+						}
+						// Pruefe ob alle Eingaben korrekt sind, dann mache
+						// weiter
+						if (isAllInformationReady == true
+								&& isDateMaxLifeTimeCorrect == true
+								&& isDateOrderCorrect == true) {
+							// everything is ok, proceed
+							Lecture.lecture.setName(txtFldVeranstaltungsname
+									.getText());
+							Lecture.lecture.setDesc(description.getText());
+							Lecture.lecture.setEnddate(dateChooserend.getDate());
+							Lecture.lecture.setStartdate(dateChooserstart
+									.getDate());
+							Image.image.setImagename(txtFldVeranstaltungsname
+									.getText());
+
+							CreateLectureLink_GUI ev = new CreateLectureLink_GUI();
+							ev.setVisible(true);
+							dispose();
+						}
+
+					}
+				});
+				continueButton.setActionCommand("OK");
+				buttonPane.add(continueButton);
+			}
+		}
+
+		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);
+
+		JLabel lblPflichtfelder = new JLabel("* Pflichtfelder");
+		lblPflichtfelder.setBounds(32, 602, 136, 14);
+		getContentPane().add(lblPflichtfelder);
+
+		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 mnmtAbout = new JMenuItem("About");
+		mnmtAbout.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				About_GUI ab = new About_GUI();
+				ab.setVisible(true);
+			}
+		});
+		mnNewMenu_1.add(mnmtAbout);
+
+	}
+
+	public Date addDays(Date date, int days) {
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(date);
+		cal.add(Calendar.DATE, days); // minus number would decrement the days
+		return cal.getTime();
+	}
+}
diff --git a/Dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
new file mode 100644
index 00000000..0a00e781
--- /dev/null
+++ b/Dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -0,0 +1,540 @@
+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.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+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.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
+import javax.swing.table.DefaultTableModel;
+
+import models.Lecture;
+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 CreateLectureLink_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	JRadioButton rdbtnInternetJa;
+	JRadioButton rdbtnInternetNein;
+	JComboBox<String> comboBox;
+	JTable tableAllImages = new JTable();
+	JTable tablemyImages = new JTable();
+	JTable tableCoopImages = new JTable();
+	JTable tablePublicImages = new JTable();
+	JTable tablePublicVorlagen = new JTable();
+	private JTextField textFieldName;
+	String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung",
+			"Verantwortlicher", "Letztes Update", "Schlagwort" };
+	ThriftConnection con = new ThriftConnection();
+	Client client = models.Client.clientcon.getClient();
+
+	
+	/**
+	 * Create the dialog.
+	 */
+	public CreateLectureLink_GUI() {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent arg0) {
+				con.closeThriftConnection();
+				System.exit(0);
+			}
+
+			@Override
+			public void windowOpened(WindowEvent arg0) {
+				textFieldName.requestFocusInWindow();
+			}
+		});
+		setResizable(false);
+
+		try {
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung erzeugen");
+		setBounds(0, 0, 603, 722);
+		GuiOrganizer.centerGUI(this);
+
+		final DefaultTableModel modelAll = new DefaultTableModel(titles, 0);
+		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("Image verlinken");
+				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("W\u00E4hlen Sie bitte ein Image aus, auf dem Ihre Versanstaltung basiert.");
+			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, 131);
+		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();
+		textFieldName.addKeyListener(new KeyAdapter() {
+			@Override
+			public void keyReleased(KeyEvent e) {
+				String stext = textFieldName.getText();
+				modelAll.setRowCount(0);
+				initTableModel(modelAll);
+
+				if (stext != "")
+					for (int i = 0; i < modelAll.getRowCount(); i++) {
+
+						if (modelAll.getValueAt(i, 0).toString()
+								.startsWith(stext)) {
+
+						} else {
+							modelAll.removeRow(i);
+						}
+					}
+
+			}
+
+		});
+
+		textFieldName.setBounds(270, 30, 250, 20);
+		panel_1.add(textFieldName);
+		textFieldName.setColumns(10);
+
+		JLabel lblErweiterteSuche = new JLabel(
+				"<html><u>Erweiterte Suche</u></html>");
+		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
+				es.setVisible(true);
+			}
+		});
+		lblErweiterteSuche.setForeground(Color.BLUE);
+
+		lblErweiterteSuche.setBounds(431, 106, 89, 14);
+		panel_1.add(lblErweiterteSuche);
+
+		comboBox = new JComboBox<String>();
+		try {
+			List<String> list = client.getAllOS();
+			comboBox.addItem("");
+			for (int i = 0; i < list.size(); i++) {
+				comboBox.addItem(list.get(i));
+			}
+		} catch (TException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			JOptionPane.showMessageDialog(null,
+					e.getCause()+"\n"+e.getMessage(),
+					"Debug-Message", JOptionPane.ERROR_MESSAGE);
+		}
+		comboBox.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent arg0) {
+				modelAll.setRowCount(0);
+				initTableModel(modelAll);
+				String selItem = comboBox.getSelectedItem().toString();
+				if (selItem != "") {
+					for (int i = 0; i < modelAll.getRowCount(); i++) {
+
+						if (modelAll.getValueAt(i, 2).equals(selItem)) {
+
+						} else {
+							modelAll.removeRow(i);
+						}
+					}
+
+				}
+			}
+		});
+		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) {
+
+				CreateLectureLink_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, 76, 14);
+		contentPanel.add(lblVlimage);
+
+		JLabel label_2 = new JLabel(">");
+		label_2.setBounds(151, 11, 13, 14);
+		contentPanel.add(label_2);
+
+		JLabel lblNewLabel_1 = new JLabel("Imageauswahl");
+		lblNewLabel_1.setBounds(164, 11, 85, 14);
+		contentPanel.add(lblNewLabel_1);
+
+		JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP);
+
+		tabbedPane.setBounds(10, 197, 557, 300);
+		contentPanel.add(tabbedPane);
+
+		JScrollPane scrollPaneMyImage = new JScrollPane();
+
+		tablemyImages.setModel(model);
+		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();
+
+		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();
+
+		scrollPaneAllImages.setViewportView(tableAllImages);
+		tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
+
+		scrollPaneMyImage.setViewportView(tablemyImages);
+		tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);
+
+		JScrollPane scrollPaneCoopImages = new JScrollPane();
+
+		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(2, false);
+
+		JScrollPane scrollPanePublicImages = new JScrollPane();
+
+		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(3, false);
+
+		JScrollPane scrollPanePublicVorlagen = new JScrollPane();
+
+		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 Vorlagen", null,
+				scrollPanePublicVorlagen, null);
+		tabbedPane.setEnabledAt(4, false);
+
+		initTableModel(modelAll);
+		{
+			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("Zur\u00FCck");
+				cancelButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						
+						CreateLectureAllgemein_GUI eVAG = new CreateLectureAllgemein_GUI();
+						eVAG.setVisible(true);
+						dispose();
+					}
+				});
+				cancelButton.setActionCommand("CANCEL");
+				buttonPane.add(cancelButton);
+				getRootPane().setDefaultButton(cancelButton);
+			}
+			{
+				JButton doLinkButton = new JButton(
+						"Veranstaltung erzeugen und abschlie\u00DFen");
+				doLinkButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+
+						// check if a row is selected
+						if ((tableAllImages.getSelectedRow() != -1)
+								|| (tablemyImages.getSelectedRow() != -1)
+								|| (tableCoopImages.getSelectedRow() != -1)
+								|| (tablePublicImages.getSelectedRow() != -1)
+								|| (tablePublicVorlagen.getSelectedRow() != -1)) {
+
+							// a row is selected, do operations
+							String imagename = tableAllImages.getValueAt(
+									tableAllImages.getSelectedRow(), 0)
+									.toString();
+							try {
+								DateFormat formatter = new SimpleDateFormat(
+										"yyyy-MM-dd hh:mm:ss");
+								client.writeLecturedata(
+										Lecture.lecture.getName(),
+										Lecture.lecture.getShortDesc(),
+										Lecture.lecture.getDesc(),
+										formatter.format(
+												Lecture.lecture.getStartdate())
+												.toString(),
+										formatter.format(
+												Lecture.lecture.getEnddate())
+												.toString(),
+										Lecture.lecture.isActive(),
+										imagename,
+										person.verantwortlicher.getUsername(),
+										person.verantwortlicher.getVorname(),
+										person.verantwortlicher.getName(),
+										person.verantwortlicher.getHochschule(),
+										person.verantwortlicher.getEMail(),
+										person.verantwortlicher.getTel(),
+										person.verantwortlicher.getFakultaet());
+								JOptionPane
+										.showMessageDialog(
+												null,
+												"Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmen\u00fc zur\u00fcck.",
+												"Veranstaltung angelegt",
+												JOptionPane.INFORMATION_MESSAGE);
+								// zurueck zum Menue
+								MainMenue_GUI m = new MainMenue_GUI();
+								m.setVisible(true);
+							} catch (TException e1) {
+								// TODO Auto-generated catch block
+								e1.printStackTrace();
+								JOptionPane
+										.showMessageDialog(
+												null,
+												"Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.",
+												"Error",
+												JOptionPane.ERROR_MESSAGE);
+								JOptionPane.showMessageDialog(null,
+										e1.getCause()+"\n"+e1.getMessage(),
+										"Debug-Message", JOptionPane.ERROR_MESSAGE);
+							}
+							
+							dispose();
+
+						} else {
+							// nothing selected
+							JOptionPane.showMessageDialog(null,
+									"Bitte w\u00e4hlen Sie ein Image aus.",
+									"Image Auswahl",
+									JOptionPane.INFORMATION_MESSAGE);
+						}
+
+					}
+				});
+				doLinkButton.setActionCommand("OK");
+				buttonPane.add(doLinkButton);
+			}
+		}
+
+		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);
+
+	}
+
+	public DefaultTableModel initTableModel(DefaultTableModel model) {
+		List<server.Image> images;
+		try {
+			images = client.getImageList();
+			Iterator<server.Image> i = images.iterator();
+			List<Object[]> ListObj = new ArrayList<Object[]>();
+			int x = 0;
+
+			while (i.hasNext()) {
+
+				i.next();
+				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()
+						 };
+				ListObj.add(obj);
+				model.addRow(ListObj.get(x));
+				x++;
+
+			}
+
+			return model;
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		return model;
+	}
+
+}
diff --git a/Dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
new file mode 100644
index 00000000..c638e440
--- /dev/null
+++ b/Dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
@@ -0,0 +1,495 @@
+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.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.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 DeleteLecture_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);
+	final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0);
+	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
+			modelAll);
+	final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(
+			modelMyLectures);
+	private JButton button;
+
+	
+	/**
+	 * Create the dialog.
+	 */
+	public DeleteLecture_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 l\u00F6schen");
+		// 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(
+						"Zu l\u00F6schende Veranstaltung w\u00E4hlen");
+				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("W\u00E4hlen Sie bitte aus der unten stehenden Liste die zu l\u00F6schende Veranstaltung aus.");
+			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, 131);
+		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 lblErweiterteSuche = new JLabel(
+				"<html><u>Erweiterte Suche*Folgt noch*</u></html>");
+		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				// oeffnet das Fenster Extended GUI
+				
+				//ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
+				//es.setVisible(true);
+			}
+		});
+		lblErweiterteSuche.setForeground(Color.BLUE);
+
+		lblErweiterteSuche.setBounds(336, 106, 184, 14);
+		panel_1.add(lblErweiterteSuche);
+
+		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
+		lblHauptmen.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				// oeffnet das Hauptmenue
+				
+				DeleteLecture_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, 197, 557, 300);
+		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();
+
+		scrollPaneCoopImages.setViewportView(tableCoopImages);
+		tabbedPane.addTab("Kooperative Veranstaltungen", null,
+				scrollPaneCoopImages, null);
+		tabbedPane.setEnabledAt(2, 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(3, false);
+
+		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 Vorlagen", null,
+				scrollPanePublicVorlagen, null);
+		tabbedPane.setEnabledAt(4, false);
+
+		button = new JButton("L\u00F6schen");
+		button.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				String lectureID="";
+				int eingabe;
+				
+				//check if a row is selected
+				if (tablemyLectures.getSelectedRowCount() !=0){
+					//a row is selected
+					//ask for confirmation
+					eingabe = JOptionPane.showConfirmDialog(null,
+							"Wollen Sie diese Daten l\u00f6schen?", "L\u00f6schen?",
+							JOptionPane.YES_NO_OPTION);
+					
+					if (eingabe == JOptionPane.YES_OPTION) {
+						//user has confirmed deletion, now get the ID of the selected lecture
+						lectureID = modelMyLectures.getValueAt(tablemyLectures.convertColumnIndexToModel(tablemyLectures.getSelectedRow()), 8).toString();
+						System.out.println("L\u00f6sche Lecture "+lectureID);
+						try {
+							if(client.deleteLecture(lectureID, person.verantwortlicher.getHochschule(),person.verantwortlicher.getUsername())){
+								System.out.println("L\u00f6schen erfolgreich");
+								//delete successful
+								
+								DeleteLecture_GUI dl = new DeleteLecture_GUI();
+								dl.setVisible(true);
+								dispose();
+							} else {
+								//delete not successful
+								JOptionPane
+								.showMessageDialog(
+										null,
+										"L\u00f6schen aus Datenbank fehlgeschlagen.",
+										"Fehler",
+										JOptionPane.INFORMATION_MESSAGE);
+							}
+						} catch (TException e1) {
+							// TODO Auto-generated catch block
+							e1.printStackTrace();
+						}//end delete
+					}//end ask for confirmation
+					
+				}//end check if a row is selected
+
+			}
+		});
+		button.setBounds(459, 508, 118, 23);
+		contentPanel.add(button);
+		{
+			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;
+	}
+}
diff --git a/Dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
new file mode 100644
index 00000000..b72efce9
--- /dev/null
+++ b/Dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
@@ -0,0 +1,454 @@
+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.ScrollPane;
+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.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import javax.swing.ButtonGroup;
+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.JSeparator;
+import javax.swing.JTextArea;
+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.Image;
+import models.Lecture;
+import models.Links;
+import models.person;
+import util.GuiOrganizer;
+import util.OpenLinks;
+
+import com.toedter.calendar.JDateChooser;
+
+
+@SuppressWarnings("serial")
+public class EditLectureAllgemein_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	private JTextField Vorname;
+	private JTextField Nachname;
+	private JTextField Hochschule;
+	private JTextField EMail;
+	private JTextField textFieldLaborname;
+	JTextArea description;
+	JRadioButton radioButtonyes;
+	JDateChooser dateChooserend;
+	JDateChooser dateChooserstart;
+	JRadioButton radioButtonno;
+	private final ButtonGroup buttonGroup = new ButtonGroup();
+	
+
+	/**
+	 * Create the dialog.
+	 */
+	public EditLectureAllgemein_GUI() {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent arg0) {
+				System.exit(0);
+			}
+		});
+		setResizable(false);
+		
+		try {
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung bearbeiten");;
+		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("Eingabe Ihrer Daten");
+				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("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 21);
+			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, "Informationen zum Besitzer", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_1.setBounds(10, 331, 557, 162);
+		contentPanel.add(panel_1);
+		panel_1.setLayout(null);
+		
+		JLabel label = new JLabel("Vorname: *");
+		label.setBackground(SystemColor.menu);
+		label.setBounds(10, 33, 125, 20);
+		panel_1.add(label);
+		
+		Vorname = new JTextField();
+		Vorname.setEditable(false);
+		Vorname.setEnabled(false);
+		Vorname.setText(person.verantwortlicher.getVorname());
+		Vorname.setBackground(Color.WHITE);
+		Vorname.setColumns(10);
+		Vorname.setBounds(145, 33, 350, 20);
+		panel_1.add(Vorname);
+		
+		JLabel label_7 = new JLabel("Nachname: *");
+		label_7.setBackground(SystemColor.menu);
+		label_7.setBounds(10, 64, 125, 20);
+		panel_1.add(label_7);
+		
+		Nachname = new JTextField();
+		Nachname.setEnabled(false);
+		Nachname.setEditable(false);
+		Nachname.setText(person.verantwortlicher.getName());
+		Nachname.setBackground(Color.WHITE);
+		Nachname.setColumns(10);
+		Nachname.setBounds(145, 64, 350, 20);
+		panel_1.add(Nachname);
+		
+		JLabel label_8 = new JLabel("Hochschule: *");
+		label_8.setBackground(SystemColor.menu);
+		label_8.setBounds(10, 95, 125, 20);
+		panel_1.add(label_8);
+		
+		Hochschule = new JTextField();
+		Hochschule.setEnabled(false);
+		Hochschule.setEditable(false);
+		Hochschule.setText(person.verantwortlicher.getHochschule());
+		Hochschule.setBackground(Color.WHITE);
+		Hochschule.setColumns(10);
+		Hochschule.setBounds(145, 95, 350, 20);
+		panel_1.add(Hochschule);
+		
+		JLabel label_9 = new JLabel("E-Mail: *");
+		label_9.setBackground(SystemColor.menu);
+		label_9.setBounds(10, 126, 125, 20);
+		panel_1.add(label_9);
+		
+		EMail = new JTextField();
+		EMail.setEnabled(false);
+		EMail.setEditable(false);
+		EMail.setText(person.verantwortlicher.getEMail());
+		EMail.setBackground(Color.WHITE);
+		EMail.setColumns(10);
+		EMail.setBounds(145, 126, 350, 20);
+		panel_1.add(EMail);
+		
+		JPanel panel = new JPanel();
+		panel.setBounds(10, 402, 577, 33);
+		contentPanel.add(panel);
+		panel.setLayout(null);
+		panel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		panel.setBackground(SystemColor.menu);
+		
+		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
+		lblHauptmen.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				
+				EditLectureAllgemein_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("Neu");
+		lblNewLabel_1.setBounds(146, 11, 46, 14);
+		contentPanel.add(lblNewLabel_1);
+		
+		JPanel panel_2 = new JPanel();
+		panel_2.setLayout(null);
+		panel_2.setBorder(new TitledBorder(null, "Veranstaltungsdaten", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_2.setBackground(SystemColor.menu);
+		panel_2.setBounds(10, 36, 557, 284);
+		contentPanel.add(panel_2);
+		
+		JLabel label_3 = new JLabel("Laborname (Anzeigename): *");
+		label_3.setBounds(10, 25, 180, 14);
+		panel_2.add(label_3);
+		
+		textFieldLaborname = new JTextField();
+		textFieldLaborname.setText(Lecture.lecture.getName());
+		textFieldLaborname.setColumns(10);
+		textFieldLaborname.setBounds(200, 22, 347, 20);
+		panel_2.add(textFieldLaborname);
+		
+		JTextArea textArea = new JTextArea();
+		textArea.setEditable(false);
+		textArea.setWrapStyleWord(true);
+		textArea.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an. Dieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\"");
+		textArea.setLineWrap(true);
+		textArea.setFont(new Font("Tahoma", Font.PLAIN, 12));
+		textArea.setBackground(SystemColor.menu);
+		textArea.setBounds(10, 49, 537, 49);
+		panel_2.add(textArea);
+		
+		JLabel label_4 = new JLabel("Beschreibung: *");
+		label_4.setBounds(10, 111, 180, 14);
+		panel_2.add(label_4);
+		
+		ScrollPane scrollPane = new ScrollPane();
+		scrollPane.setBounds(200, 104, 347, 78);
+		panel_2.add(scrollPane);
+		description = new JTextArea();
+		description.setFont(new Font("Tahoma", Font.PLAIN, 11));
+		description.setText(Lecture.lecture.getDesc());
+		description.setLineWrap(true);
+		scrollPane.add(description);
+		description.setBounds(0, 0, 4, 22);
+		scrollPane.add(description);
+		
+		dateChooserend = new JDateChooser();
+		dateChooserend.setDateFormatString("dd-MM-yyyy hh:mm:ss");
+		dateChooserend.setDate(Lecture.lecture.getEnddate());
+		dateChooserend.setBounds(385, 188, 100, 20);
+		panel_2.add(dateChooserend);
+		
+		JLabel label_5 = new JLabel("bis");
+		label_5.setBounds(351, 188, 24, 20);
+		panel_2.add(label_5);
+		
+		dateChooserstart = new JDateChooser();
+		dateChooserstart.setDateFormatString("yyyy-MM-dd hh:mm:ss");
+		dateChooserstart.setDate(Lecture.lecture.getStartdate());
+		dateChooserstart.setBounds(240, 188, 101, 20);
+		panel_2.add(dateChooserstart);
+		
+		JLabel label_6 = new JLabel("von:");
+		label_6.setBounds(200, 188, 30, 20);
+		panel_2.add(label_6);
+		
+		JLabel label_10 = new JLabel("G\u00FCltigkeitsdatum: *");
+		label_10.setBounds(10, 188, 250, 14);
+		panel_2.add(label_10);
+		
+		JLabel label_11 = new JLabel("Aktiv:");
+		label_11.setBounds(10, 229, 250, 14);
+		panel_2.add(label_11);
+		
+		radioButtonyes = new JRadioButton("Ja");
+		buttonGroup.add(radioButtonyes);
+		if(Lecture.lecture.isActive()==true)
+		{
+			radioButtonyes.setSelected(true);
+		}else
+		{
+			radioButtonno.setSelected(true);
+		}
+		
+		radioButtonyes.setBounds(240, 225, 109, 23);
+		panel_2.add(radioButtonyes);
+		
+		radioButtonno = new JRadioButton("Nein");
+		buttonGroup.add(radioButtonno);
+		radioButtonno.setBounds(385, 225, 109, 23);
+		panel_2.add(radioButtonno);
+		
+		JLabel label_12 = new JLabel("(Im VMChooser sichtbar)");
+		label_12.setBounds(10, 254, 250, 14);
+		panel_2.add(label_12);
+		{
+			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) {
+						if(radioButtonyes.isSelected()==true)
+						{
+							Lecture.lecture.setActive(true);
+						}
+						else
+						{
+							Lecture.lecture.setActive(false);
+						}
+						
+						Lecture.lecture.setName(textFieldLaborname.getText());
+						Lecture.lecture.setDesc(description.getText());
+						Lecture.lecture.setEnddate(dateChooserend.getDate());
+						Lecture.lecture.setStartdate(dateChooserstart.getDate());
+						Image.image.setImagename(textFieldLaborname.getText());
+						
+						MainMenue_GUI sr=new MainMenue_GUI();
+						sr.setVisible(true);
+						dispose();
+					}
+				});
+				okButton.setActionCommand("OK");
+				buttonPane.add(okButton);
+				getRootPane().setDefaultButton(okButton);
+			}
+			{
+				JButton cancelButton = new JButton("Weiter");
+				cancelButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						if(radioButtonyes.isSelected()==true)
+						{
+							Lecture.lecture.setActive(true);
+						}
+						else
+						{
+							Lecture.lecture.setActive(false);
+						}
+						
+						Lecture.lecture.setName(textFieldLaborname.getText());
+						Lecture.lecture.setNewName(textFieldLaborname.getText());
+						Lecture.lecture.setDesc(description.getText());
+						Lecture.lecture.setEnddate(dateChooserend.getDate());
+						Lecture.lecture.setStartdate(dateChooserstart.getDate());
+						Image.image.setImagename(textFieldLaborname.getText());
+						
+
+					EditLectureLink_GUI ev=new EditLectureLink_GUI();
+					ev.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);
+		
+		JLabel lblPflichtfelder = new JLabel("* Pflichtfelder");
+		lblPflichtfelder.setBounds(32, 602, 136, 14);
+		getContentPane().add(lblPflichtfelder);
+		
+		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);
+		
+	}
+	
+
+}
\ No newline at end of file
diff --git a/Dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
new file mode 100644
index 00000000..f7b38b06
--- /dev/null
+++ b/Dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -0,0 +1,532 @@
+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.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+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.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
+import javax.swing.table.DefaultTableModel;
+
+import models.Lecture;
+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 EditLectureLink_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	JRadioButton rdbtnInternetJa;
+	JRadioButton rdbtnInternetNein;
+	JComboBox<String> comboBox;
+	JTable tableAllImages = new JTable();
+	JTable tablemyImages = new JTable();
+	JTable tableCoopImages = new JTable();
+	JTable tablePublicImages = new JTable();
+	JTable tablePublicVorlagen = new JTable();
+	private JTextField textFieldName;
+	String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung",
+			"Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" };
+	ThriftConnection con = new ThriftConnection();
+	Client client = models.Client.clientcon.getClient();
+
+	/**
+	 * Create the dialog.
+	 */
+	public EditLectureLink_GUI() {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent arg0) {
+				con.closeThriftConnection();
+				System.exit(0);
+			}
+		});
+		setResizable(false);
+
+		try {
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung bearbeiten");
+		
+		setBounds(0, 0, 603, 722);
+		GuiOrganizer.centerGUI(this);
+
+		final DefaultTableModel modelAll = new DefaultTableModel(titles, 0);
+		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("Image verlinken");
+				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("W\u00E4hlen Sie bitte ein Image aus, auf dem Ihre Versanstaltung basiert.");
+			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, 131);
+		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();
+		textFieldName.addKeyListener(new KeyAdapter() {
+			@Override
+			public void keyReleased(KeyEvent e) {
+				String stext = textFieldName.getText();
+				modelAll.setRowCount(0);
+				initTableModel(modelAll);
+
+				if (stext != "")
+					for (int i = 0; i < modelAll.getRowCount(); i++) {
+
+						if (modelAll.getValueAt(i, 0).toString()
+								.startsWith(stext)) {
+
+						} else {
+							modelAll.removeRow(i);
+						}
+					}
+
+			}
+
+		});
+
+		textFieldName.setBounds(270, 30, 250, 20);
+		panel_1.add(textFieldName);
+		textFieldName.setColumns(10);
+
+		JLabel lblErweiterteSuche = new JLabel(
+				"<html><u>Erweiterte Suche *Folgt noch*</u></html>");
+		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				// ExtendedSearchForImages_GUI es = new
+				// ExtendedSearchForImages_GUI();
+				// es.setVisible(true);
+			}
+		});
+		lblErweiterteSuche.setForeground(Color.BLUE);
+
+		lblErweiterteSuche.setBounds(317, 106, 203, 14);
+		panel_1.add(lblErweiterteSuche);
+
+		comboBox = new JComboBox<String>();
+		try {
+			List<String> list = client.getAllOS();
+			comboBox.addItem("");
+			for (int i = 0; i < list.size(); i++) {
+				comboBox.addItem(list.get(i));
+			}
+		} catch (TException e2) {
+			// TODO Auto-generated catch block
+			e2.printStackTrace();
+		}
+		comboBox.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent arg0) {
+				modelAll.setRowCount(0);
+				initTableModel(modelAll);
+				String selItem = comboBox.getSelectedItem().toString();
+				if (selItem != "") {
+					for (int i = 0; i < modelAll.getRowCount(); i++) {
+
+						if (modelAll.getValueAt(i, 2).equals(selItem)) {
+
+						} else {
+							modelAll.removeRow(i);
+						}
+					}
+
+				}
+			}
+		});
+		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) {
+
+				EditLectureLink_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, 76, 14);
+		contentPanel.add(lblVlimage);
+
+		JLabel label_2 = new JLabel(">");
+		label_2.setBounds(151, 11, 13, 14);
+		contentPanel.add(label_2);
+
+		JLabel lblNewLabel_1 = new JLabel("Veranstaltung verlinken");
+		lblNewLabel_1.setBounds(164, 11, 113, 14);
+		contentPanel.add(lblNewLabel_1);
+
+		JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP);
+
+		tabbedPane.setBounds(10, 197, 557, 300);
+		contentPanel.add(tabbedPane);
+
+		JScrollPane scrollPaneMyImage = new JScrollPane();
+
+		tablemyImages.setModel(model);
+		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();
+
+		JScrollPane scrollPaneAllImages = new JScrollPane();
+		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();
+
+		scrollPaneAllImages.setViewportView(tableAllImages);
+		tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
+
+		scrollPaneMyImage.setViewportView(tablemyImages);
+		tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);
+
+		JScrollPane scrollPaneCoopImages = new JScrollPane();
+
+		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(2, false);
+
+		JScrollPane scrollPanePublicImages = new JScrollPane();
+
+		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(3, false);
+
+		JScrollPane scrollPanePublicVorlagen = new JScrollPane();
+
+		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 Vorlagen", null,
+				scrollPanePublicVorlagen, null);
+		tabbedPane.setEnabledAt(4, false);
+
+		JButton btnLinkLschen = new JButton("Link l\u00F6schen");
+		btnLinkLschen.setEnabled(false);
+		btnLinkLschen.setBounds(478, 508, 89, 23);
+		contentPanel.add(btnLinkLschen);
+
+		initTableModel(modelAll);
+		{
+			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) {
+
+						EditLectureAllgemein_GUI el = new EditLectureAllgemein_GUI();
+						el.setVisible(true);
+						dispose();
+					}
+				});
+				okButton.setActionCommand("OK");
+				buttonPane.add(okButton);
+				getRootPane().setDefaultButton(okButton);
+			}
+			{
+				JButton cancelButton = new JButton(
+						"Veranstaltung \u00e4ndern und abschlie\u00DFen");
+				cancelButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+
+						// check if a row is selected
+						if ((tableAllImages.getSelectedRow() != -1)
+								|| (tablemyImages.getSelectedRow() != -1)
+								|| (tableCoopImages.getSelectedRow() != -1)
+								|| (tablePublicImages.getSelectedRow() != -1)
+								|| (tablePublicVorlagen.getSelectedRow() != -1)) {
+
+							// a row is selected, do operations
+							String imagename = tableAllImages.getValueAt(
+									tableAllImages.getSelectedRow(), 0)
+									.toString();
+
+							try {
+
+								DateFormat formatter = new SimpleDateFormat(
+										"yyyy-MM-dd hh:mm:ss");
+								client.updateLecturedata(
+										Lecture.lecture.getName(),
+										Lecture.lecture.getNewName(),
+										Lecture.lecture.getShortDesc(),
+										Lecture.lecture.getDesc(),
+										formatter.format(
+												Lecture.lecture.getStartdate())
+												.toString(),
+										formatter.format(
+												Lecture.lecture.getEnddate())
+												.toString(),
+										Lecture.lecture.isActive(),
+										imagename,
+										person.verantwortlicher.getVorname(),
+										person.verantwortlicher.getName(),
+										person.verantwortlicher.getHochschule(),
+										person.verantwortlicher.getEMail(),
+										person.verantwortlicher.getTel(),
+										person.verantwortlicher.getFakultaet(),
+										Lecture.lecture.getid());
+
+								JOptionPane
+										.showMessageDialog(
+												null,
+												"Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmen\u00fc zur\u00fcck.",
+												"Veranstaltung angelegt",
+												JOptionPane.INFORMATION_MESSAGE);
+
+							} catch (TException e1) {
+								// TODO Auto-generated catch block
+								e1.printStackTrace();
+							}
+
+						} else {
+							// nothing selected
+							JOptionPane.showMessageDialog(null,
+									"Bitte w\u00e4hlen Sie ein Image aus.",
+									"Image Auswahl",
+									JOptionPane.INFORMATION_MESSAGE);
+
+						}
+
+						MainMenue_GUI m = new MainMenue_GUI();
+						m.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);
+
+	}
+
+	public DefaultTableModel initTableModel(DefaultTableModel model) {
+		List<server.Image> images;
+		try {
+			images = client.getImageList();
+			Iterator<server.Image> i = images.iterator();
+			List<Object[]> ListObj = new ArrayList<Object[]>();
+			int x = 0;
+
+			while (i.hasNext()) {
+
+				i.next();
+				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() };
+				ListObj.add(obj);
+				model.addRow(ListObj.get(x));
+				x++;
+
+			}
+
+			return model;
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		return model;
+	}
+}
diff --git a/Dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
new file mode 100644
index 00000000..58329ae2
--- /dev/null
+++ b/Dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
@@ -0,0 +1,563 @@
+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.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+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.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.Lecture;
+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 EditLectureSearch_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 EditLectureSearch_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 bearbeiten");
+		// 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 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, 131);
+		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 lblErweiterteSuche = new JLabel(
+				"<html><u>Erweiterte Suche *Folgt noch*</u></html>");
+		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				// oeffnet das Fenster Extended GUI
+				
+				//ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
+				//es.setVisible(true);
+			}
+		});
+		lblErweiterteSuche.setForeground(Color.BLUE);
+
+		lblErweiterteSuche.setBounds(326, 106, 194, 14);
+		panel_1.add(lblErweiterteSuche);
+
+		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
+		lblHauptmen.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				// oeffnet das Hauptmenue
+				
+				EditLectureSearch_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, 197, 557, 323);
+		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();
+
+		scrollPaneCoopImages.setViewportView(tableCoopImages);
+		tabbedPane.addTab("Kooperative Veranstaltungen", null,
+				scrollPaneCoopImages, null);
+		tabbedPane.setEnabledAt(2, 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(3, false);
+
+		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 Vorlagen", null,
+				scrollPanePublicVorlagen, 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);
+			}
+			{
+				JButton btnContinue = new JButton("Weiter");
+				btnContinue.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						// check if a row is selected
+						if ((tableAllLectures.getSelectedRow() != -1)
+								|| (tablemyLectures.getSelectedRow() != -1)
+								|| (tableCoopImages.getSelectedRow() != -1)
+								|| (tablePublicImages.getSelectedRow() != -1)
+								|| (tablePublicVorlagen.getSelectedRow() != -1)) {
+
+							// a row is selected, do operations
+
+							if (tabbedPane.getSelectedIndex() == 0) {
+
+								Lecture.lecture.setid(modelMyLectures
+										.getValueAt(
+												tablemyLectures
+														.convertRowIndexToModel(tablemyLectures
+																.getSelectedRow()),
+												8).toString());
+								Lecture.lecture.setName(modelMyLectures
+										.getValueAt(
+												tablemyLectures
+														.convertRowIndexToModel(tablemyLectures
+																.getSelectedRow()),
+												0).toString());
+								Lecture.lecture.setDesc(modelMyLectures
+										.getValueAt(
+												tablemyLectures
+														.convertRowIndexToModel(tablemyLectures
+																.getSelectedRow()),
+												1).toString());
+								String date = modelMyLectures
+										.getValueAt(
+												tablemyLectures
+														.convertRowIndexToModel(tablemyLectures
+																.getSelectedRow()),
+												2).toString();
+								
+								Lecture.lecture.setLinkedImagename(modelMyLectures
+										.getValueAt(
+												tablemyLectures
+														.convertRowIndexToModel(tablemyLectures
+																.getSelectedRow()),
+												6).toString());
+
+								int zweitesLeerzeichen = date.indexOf(" ",
+										date.indexOf(" ") + 1);
+
+								String startdate = date.substring(0,
+										zweitesLeerzeichen);
+								String enddate = date
+										.substring(zweitesLeerzeichen);
+								DateFormat df = new SimpleDateFormat(
+										"yyyy-MM-dd hh:mm:ss");
+
+								try {
+									// Format has to be "yyyy-MM-dd hh:mm:ss"
+									Lecture.lecture.setEnddate(df
+											.parse(enddate));
+									Lecture.lecture.setStartdate(df
+											.parse(startdate));
+								} catch (ParseException e1) {
+									// TODO Auto-generated catch block
+									e1.printStackTrace();
+								}
+								if (modelMyLectures
+										.getValueAt(
+												tablemyLectures
+														.convertRowIndexToModel(tablemyLectures
+																.getSelectedRow()),
+												3).toString().equals("1")) {
+									Lecture.lecture.setActive(true);
+								} else {
+									Lecture.lecture.setActive(false);
+								}
+
+								
+								// EditImageAllgemein_GUI ea=new
+								// EditImageAllgemein_GUI();
+								EditLectureAllgemein_GUI el = new EditLectureAllgemein_GUI();
+								el.setVisible(true);
+								dispose();
+							} else {
+								JOptionPane
+										.showMessageDialog(
+												null,
+												"Bitte w\u00f4hlen Sie ein eigenes Image aus",
+												"Message",
+												JOptionPane.INFORMATION_MESSAGE);
+							}
+						} else {
+							// nothing selected
+							JOptionPane.showMessageDialog(null,
+									"Bitte w\u00f4hlen Sie ein Image aus.",
+									"Image Auswahl",
+									JOptionPane.INFORMATION_MESSAGE);
+						}// end check if a row is selected
+
+					}
+				});
+				btnContinue.setActionCommand("Cancel");
+				buttonPane.add(btnContinue);
+			}
+		}
+
+		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;
+	}
+
+}
diff --git a/Dozentenmodul/src/main/java/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/main/java/gui/lecture/ExtendedSearchForImages_GUI.java
new file mode 100644
index 00000000..579ea3bd
--- /dev/null
+++ b/Dozentenmodul/src/main/java/gui/lecture/ExtendedSearchForImages_GUI.java
@@ -0,0 +1,269 @@
+package gui.lecture;
+
+
+import gui.image.CreateImageAllgemein_GUI;
+import gui.image.FTPCreateUploader_GUI;
+import gui.intro.About_GUI;
+
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.SystemColor;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.JTextField;
+import javax.swing.JTextPane;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
+
+import models.Links;
+import util.GuiOrganizer;
+import util.OpenLinks;
+
+@SuppressWarnings("serial")
+public class ExtendedSearchForImages_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	private JTextField textField;
+	private JTextField textField_1;
+	
+
+	/**
+	 * 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);
+		
+		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/main/java/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
new file mode 100644
index 00000000..6035ebf5
--- /dev/null
+++ b/Dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -0,0 +1,453 @@
+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, 131);
+		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 lblErweiterteSuche = new JLabel(
+				"<html><u>Erweiterte Suche *Folgt noch*</u></html>");
+		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				// oeffnet das Fenster Extended GUI
+				
+				//ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
+				//es.setVisible(true);
+			}
+		});
+		lblErweiterteSuche.setForeground(Color.BLUE);
+
+		lblErweiterteSuche.setBounds(315, 106, 205, 14);
+		panel_1.add(lblErweiterteSuche);
+
+		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, 197, 557, 323);
+		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();
+
+		scrollPaneCoopImages.setViewportView(tableCoopImages);
+		tabbedPane.addTab("Kooperative Veranstaltungen", null,
+				scrollPaneCoopImages, null);
+		tabbedPane.setEnabledAt(2, 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(3, false);
+
+		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 Vorlagen", null,
+				scrollPanePublicVorlagen, 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;
+	}
+
+}