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

Conflicts:
	dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
	dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
	dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
g

14 files changed, 395 insertions, 900 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
index 47fe3967..8a6af0da 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
@@ -66,7 +66,7 @@ public class CreateImageTechnisch_GUI extends JFrame {
 	JSpinner spinnerRam;
 	private JCheckBox chckbxIsLicensed;
 	private JCheckBox chckbxIsInternetBlocked;
-	JComboBox comboBox;
+	JComboBox<String> comboBox;
 	private final ButtonGroup buttonGrouplicense = new ButtonGroup();
 	private final ButtonGroup buttonGroupInternet = new ButtonGroup();
 	private final ButtonGroup buttonGroupVorlage = new ButtonGroup();
@@ -154,11 +154,12 @@ public class CreateImageTechnisch_GUI extends JFrame {
 		panel_1.add(lblNewLabel_2);
 		
 		chckbxIsLicensed = new JCheckBox("");
-		chckbxIsLicensed.setSelected(true);
+		chckbxIsLicensed.setSelected(Image.image.isLicensed());
 		chckbxIsLicensed.setBounds(266, 52, 97, 23);
 		panel_1.add(chckbxIsLicensed);
 		
 		chckbxIsInternetBlocked = new JCheckBox("");
+		chckbxIsInternetBlocked.setSelected(Image.image.isInternet());
 		chckbxIsInternetBlocked.setBounds(266, 80, 97, 23);
 		panel_1.add(chckbxIsInternetBlocked);
 		
@@ -176,45 +177,21 @@ public class CreateImageTechnisch_GUI extends JFrame {
 		lblBetriebssystem.setBounds(10, 21, 250, 20);
 		panel_1.add(lblBetriebssystem);
 		
-		/*
-		if (Image.image.isVorlage() == true) {
-			//radioButtonVorlageJa.setSelected(true);
-			chckbxIsTemplate.setSelected(true);
-		} else {
-			//radioButtonVorlageNein.setSelected(true);
-			chckbxIsTemplate.setSelected(false);
-		}
-		*/
-		
-		if(Image.image.isInternet() == true ){
-			chckbxIsInternetBlocked.setSelected(true);
-		} else {
-			chckbxIsInternetBlocked.setSelected(false);
-		}
-		
-		/* TODO deprecated, as checked is default in new image 
-		if (Image.image.isLicensed() == true) {
-			//rdbtnlicenseJa.setSelected(true);
-			chckbxIsLicensed.setSelected(true);
-			chckbxIsLicensed.isSelected();
-		} else {
-			//rdbtnlicenseNein.setSelected(true);
-			chckbxIsLicensed.setSelected(false);
-		}
-		*/
-		
-		comboBox = new JComboBox();
+		// populate comboBox with list of supported OS we get
+		// from the server ...
+		comboBox = new JComboBox<String>();
+		List<String> os = null;
 		try {
-			List<String> os=client.getAllOS();
-			
+			os = client.getAllOS();
 			for(int i=0; i<os.size();i++){
 				comboBox.addItem(os.get(i).toString());
 			}
 		} catch (TException e1) {
-			// TODO Auto-generated catch block
 			e1.printStackTrace();
+			LOGGER.error("Could not fetch list of supported OSs from server!");
 		}
 		comboBox.setBounds(270, 21, 277, 20);
+		comboBox.setSelectedItem(Image.image.getOS() == null ? os.get(0) : Image.image.getOS());
 		panel_1.add(comboBox);
 		
 		JPanel panel_2 = new JPanel();
diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index 9074f7a2..fc9fa1e7 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -86,11 +86,8 @@ public class DeleteImage_GUI extends JFrame {
 	JRadioButton rdbtnInternetJa;
 	JRadioButton rdbtnInternetNein;
 	JComboBox<String> comboBox;
-	JTable tableAllImages;
 	JTable tablemyImages;
-	JTable tablePublicVorlagen;
 	private JTextField textFieldName;
-	JTabbedPane tabbedPane;
 	boolean activeSearch = false;
 	String[] titles = { "Name", "Lizenzpflichtig", "OS", "Veranstaltung",
 			"Verantwortlicher", "Letztes Update", "ID", "Version", "Template" }; // Angezeigt
@@ -137,8 +134,6 @@ public class DeleteImage_GUI extends JFrame {
 			modelMyImages);
 	final TableRowSorter<TableModel> rowSorterPublicVorlagen = new TableRowSorter<TableModel>(
 			modelPublicVorlagen);
-	private JLabel lblBeschreibung_1;
-	private JTextField textField;
 
 	/**
 	 * Create the dialog.
@@ -180,47 +175,53 @@ public class DeleteImage_GUI extends JFrame {
 				tablemyImages.getColumnModel().getColumn(7).setMinWidth(0);
 				tablemyImages.getColumnModel().getColumn(7).setMaxWidth(0);
 
-				tablePublicVorlagen.getColumnModel().getColumn(1).setWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(1)
-						.setMinWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(1)
-						.setMaxWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(3).setWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(3)
-						.setMinWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(3)
-						.setMaxWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(8).setWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(8)
-						.setMinWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(8)
-						.setMaxWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(6).setWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(6)
-						.setMinWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(6)
-						.setMaxWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(7).setWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(7)
-						.setMinWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(7)
-						.setMaxWidth(0);
-
-				tableAllImages.getColumnModel().getColumn(1).setWidth(0);
-				tableAllImages.getColumnModel().getColumn(1).setMinWidth(0);
-				tableAllImages.getColumnModel().getColumn(1).setMaxWidth(0);
-				tableAllImages.getColumnModel().getColumn(3).setWidth(0);
-				tableAllImages.getColumnModel().getColumn(3).setMinWidth(0);
-				tableAllImages.getColumnModel().getColumn(3).setMaxWidth(0);
-				tableAllImages.getColumnModel().getColumn(8).setWidth(0);
-				tableAllImages.getColumnModel().getColumn(8).setMinWidth(0);
-				tableAllImages.getColumnModel().getColumn(8).setMaxWidth(0);
-				tableAllImages.getColumnModel().getColumn(6).setWidth(0);
-				tableAllImages.getColumnModel().getColumn(6).setMinWidth(0);
-				tableAllImages.getColumnModel().getColumn(6).setMaxWidth(0);
-				tableAllImages.getColumnModel().getColumn(7).setWidth(0);
-				tableAllImages.getColumnModel().getColumn(7).setMinWidth(0);
-				tableAllImages.getColumnModel().getColumn(7).setMaxWidth(0);
+				/*
+				 * tablePublicVorlagen.getColumnModel().getColumn(1).setWidth(0);
+				 * tablePublicVorlagen.getColumnModel().getColumn(1)
+				 * .setMinWidth(0);
+				 * tablePublicVorlagen.getColumnModel().getColumn(1)
+				 * .setMaxWidth(0);
+				 * tablePublicVorlagen.getColumnModel().getColumn
+				 * (3).setWidth(0);
+				 * tablePublicVorlagen.getColumnModel().getColumn(3)
+				 * .setMinWidth(0);
+				 * tablePublicVorlagen.getColumnModel().getColumn(3)
+				 * .setMaxWidth(0);
+				 * tablePublicVorlagen.getColumnModel().getColumn
+				 * (8).setWidth(0);
+				 * tablePublicVorlagen.getColumnModel().getColumn(8)
+				 * .setMinWidth(0);
+				 * tablePublicVorlagen.getColumnModel().getColumn(8)
+				 * .setMaxWidth(0);
+				 * tablePublicVorlagen.getColumnModel().getColumn
+				 * (6).setWidth(0);
+				 * tablePublicVorlagen.getColumnModel().getColumn(6)
+				 * .setMinWidth(0);
+				 * tablePublicVorlagen.getColumnModel().getColumn(6)
+				 * .setMaxWidth(0);
+				 * tablePublicVorlagen.getColumnModel().getColumn
+				 * (7).setWidth(0);
+				 * tablePublicVorlagen.getColumnModel().getColumn(7)
+				 * .setMinWidth(0);
+				 * tablePublicVorlagen.getColumnModel().getColumn(7)
+				 * .setMaxWidth(0);
+				 * 
+				 * tableAllImages.getColumnModel().getColumn(1).setWidth(0);
+				 * tableAllImages.getColumnModel().getColumn(1).setMinWidth(0);
+				 * tableAllImages.getColumnModel().getColumn(1).setMaxWidth(0);
+				 * tableAllImages.getColumnModel().getColumn(3).setWidth(0);
+				 * tableAllImages.getColumnModel().getColumn(3).setMinWidth(0);
+				 * tableAllImages.getColumnModel().getColumn(3).setMaxWidth(0);
+				 * tableAllImages.getColumnModel().getColumn(8).setWidth(0);
+				 * tableAllImages.getColumnModel().getColumn(8).setMinWidth(0);
+				 * tableAllImages.getColumnModel().getColumn(8).setMaxWidth(0);
+				 * tableAllImages.getColumnModel().getColumn(6).setWidth(0);
+				 * tableAllImages.getColumnModel().getColumn(6).setMinWidth(0);
+				 * tableAllImages.getColumnModel().getColumn(6).setMaxWidth(0);
+				 * tableAllImages.getColumnModel().getColumn(7).setWidth(0);
+				 * tableAllImages.getColumnModel().getColumn(7).setMinWidth(0);
+				 * tableAllImages.getColumnModel().getColumn(7).setMaxWidth(0);
+				 */
 				// bis hier
 				textFieldName.requestFocusInWindow();
 			}
@@ -252,8 +253,7 @@ public class DeleteImage_GUI extends JFrame {
 			getContentPane().add(panel);
 			panel.setLayout(null);
 			{
-				JLabel lblNewLabel = new JLabel(
-						"Zu löschendes Image wählen");
+				JLabel lblNewLabel = new JLabel("Zu löschendes Image wählen");
 				lblNewLabel.setBounds(10, 11, 509, 22);
 				panel.add(lblNewLabel);
 				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
@@ -281,12 +281,12 @@ public class DeleteImage_GUI extends JFrame {
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
 
-		JLabel lblNewLabel_2 = new JLabel("Name:");
-		lblNewLabel_2.setBounds(10, 30, 80, 20);
+		JLabel lblNewLabel_2 = new JLabel("Volltextsuche:");
+		lblNewLabel_2.setBounds(30, 30, 80, 20);
 		panel_1.add(lblNewLabel_2);
 
 		JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:");
-		lblInternetIstInnerhalb.setBounds(10, 58, 80, 20);
+		lblInternetIstInnerhalb.setBounds(30, 58, 80, 20);
 		panel_1.add(lblInternetIstInnerhalb);
 
 		textFieldName = new JTextField();
@@ -321,7 +321,7 @@ public class DeleteImage_GUI extends JFrame {
 			}
 		});
 
-		textFieldName.setBounds(96, 30, 166, 20);
+		textFieldName.setBounds(133, 30, 400, 20);
 		panel_1.add(textFieldName);
 		textFieldName.setColumns(10);
 
@@ -368,17 +368,8 @@ public class DeleteImage_GUI extends JFrame {
 			}
 
 		});
-		comboBox.setBounds(96, 58, 166, 20);
+		comboBox.setBounds(133, 58, 191, 20);
 		panel_1.add(comboBox);
-		
-		lblBeschreibung_1 = new JLabel("Beschreibung:");
-		lblBeschreibung_1.setBounds(291, 30, 80, 20);
-		panel_1.add(lblBeschreibung_1);
-		
-		textField = new JTextField();
-		textField.setColumns(10);
-		textField.setBounds(381, 30, 166, 20);
-		panel_1.add(textField);
 
 		JLabel lblHauptmen = new JLabel("Hauptmenü");
 		lblHauptmen.addMouseListener(new MouseAdapter() {
@@ -416,139 +407,6 @@ public class DeleteImage_GUI extends JFrame {
 		lblNewLabel_1.setBounds(128, 11, 85, 14);
 		contentPanel.add(lblNewLabel_1);
 
-		tabbedPane = new JTabbedPane(JTabbedPane.TOP);
-		tabbedPane.addChangeListener(new ChangeListener() {
-			public void stateChanged(ChangeEvent arg0) {
-				if (tabbedPane.getSelectedIndex() == 0 && activeSearch == false) {
-
-					String username = person.verantwortlicher.getName() + " "
-							+ person.verantwortlicher.getVorname();
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
-							username, 4));
-				} else if (tabbedPane.getSelectedIndex() == 1
-						&& activeSearch == false) {
-					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
-							"true", 8));
-				} else if (tabbedPane.getSelectedIndex() == 2
-						&& activeSearch == false) {
-					rowSorterAll.setRowFilter(null);
-				}
-
-			}
-		});
-
-		tabbedPane.setBounds(10, 158, 557, 339);
-		contentPanel.add(tabbedPane);
-
-		JScrollPane scrollPaneMyImage = new JScrollPane();
-		tablemyImages = new JTable();
-		tablemyImages.getSelectionModel().addListSelectionListener(
-				new ListSelectionListener() {
-					public void valueChanged(ListSelectionEvent e) {
-						String imageid = modelMyImages.getValueAt(
-								tablemyImages
-										.convertRowIndexToModel(tablemyImages
-												.getSelectedRow()), 6)
-								.toString();
-						String version = modelMyImages.getValueAt(
-								tablemyImages
-										.convertRowIndexToModel(tablemyImages
-												.getSelectedRow()), 7)
-								.toString();
-						writeImageData(imageid, version);
-					}
-				});
-		tablemyImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		tablemyImages.setModel(modelMyImages);
-		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit();
-		tablemyImages.setRowSorter(rowSorterMyImages);
-
-		scrollPaneMyImage.setViewportView(tablemyImages);
-		tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);
-
-		JScrollPane scrollPaneCoopImages = new JScrollPane();
-		JTable tableCoopImages = new JTable();
-		tableCoopImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		tableCoopImages.setModel(model);
-		tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit();
-
-		JScrollPane scrollPanePublicVorlagen = new JScrollPane();
-		tablePublicVorlagen = new JTable();
-		tablePublicVorlagen.getSelectionModel().addListSelectionListener(
-				new ListSelectionListener() {
-					public void valueChanged(ListSelectionEvent e) {
-						String imageid = modelPublicVorlagen
-								.getValueAt(
-										tablePublicVorlagen
-												.convertRowIndexToModel(tablePublicVorlagen
-														.getSelectedRow()), 6)
-								.toString();
-						String version = modelPublicVorlagen
-								.getValueAt(
-										tablePublicVorlagen
-												.convertRowIndexToModel(tablePublicVorlagen
-														.getSelectedRow()), 7)
-								.toString();
-						writeImageData(imageid, version);
-					}
-				});
-		tablePublicVorlagen.setModel(modelPublicVorlagen);
-		tablePublicVorlagen
-				.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-
-		tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit();
-		tablePublicVorlagen.setRowSorter(rowSorterPublicVorlagen);
-		scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);
-		tabbedPane.addTab("Vorlagen", null, scrollPanePublicVorlagen, null);
-
-		JScrollPane scrollPaneAllImages = new JScrollPane();
-		tableAllImages = new JTable();
-		tableAllImages.getSelectionModel().addListSelectionListener(
-				new ListSelectionListener() {
-					public void valueChanged(ListSelectionEvent e) {
-
-						String imageid = modelAll.getValueAt(
-								tableAllImages
-										.convertRowIndexToModel(tableAllImages
-												.getSelectedRow()), 6)
-								.toString();
-						String version = modelAll.getValueAt(
-								tableAllImages
-										.convertRowIndexToModel(tableAllImages
-												.getSelectedRow()), 7)
-								.toString();
-						writeImageData(imageid, version);
-
-					}
-				});
-		tableAllImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		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();
-		tableAllImages.setRowSorter(rowSorterAll);
-
-		scrollPaneAllImages.setViewportView(tableAllImages);
-		tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
-
-		scrollPaneCoopImages.setViewportView(tableCoopImages);
-		tabbedPane.addTab("bwLehrpool", null, scrollPaneCoopImages, null);
-		tabbedPane.setEnabledAt(3, false);
-
 		JButton btnDelete = new JButton("Löschen");
 		btnDelete.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
@@ -562,8 +420,8 @@ public class DeleteImage_GUI extends JFrame {
 
 					// frage, soll das selektierte Daten geloescht werden?
 					eingabe = JOptionPane.showConfirmDialog(null,
-							"Wollen Sie diese Daten löschen?",
-							"Löschen?", JOptionPane.YES_NO_OPTION);
+							"Wollen Sie diese Daten löschen?", "Löschen?",
+							JOptionPane.YES_NO_OPTION);
 
 					if (eingabe == JOptionPane.YES_OPTION) {
 
@@ -599,15 +457,6 @@ public class DeleteImage_GUI extends JFrame {
 										di.setVisible(true);
 										dispose();
 
-										/*
-										 * } else {
-										 * 
-										 * JOptionPane.showConfirmDialog(null,
-										 * "Loeschen vom Server hat leider nicht geklappt!!"
-										 * , imageversion,
-										 * JOptionPane.OK_CANCEL_OPTION); }
-										 */
-
 									} else {
 
 										JOptionPane
@@ -655,224 +504,171 @@ public class DeleteImage_GUI extends JFrame {
 						}
 					}
 
-				} else if (tablePublicVorlagen.getSelectedRowCount() != 0
-						&& modelPublicVorlagen
-								.getValueAt(
-										tablePublicVorlagen
-												.convertRowIndexToModel(tablePublicVorlagen
-														.getSelectedRow()), 4)
-								.equals(username)) {
-
-					// frage, soll das selektierte Daten geloescht werden?
-					eingabe = JOptionPane.showConfirmDialog(null,
-							"Wollen Sie diese Daten löschen?",
-							"Löschen?", JOptionPane.YES_NO_OPTION);
-
-					if (eingabe == JOptionPane.YES_OPTION) {
-
-						imageid = modelPublicVorlagen
-								.getValueAt(
-										tablePublicVorlagen
-												.convertRowIndexToModel(tablePublicVorlagen
-														.getSelectedRow()), 6)
-								.toString();
-
-						imageversion = modelPublicVorlagen
-								.getValueAt(
-										tablePublicVorlagen
-												.convertRowIndexToModel(tablePublicVorlagen
-														.getSelectedRow()), 7)
-								.toString();
-
-						// TODO
-						// Image darf nur geloescht werden, wenn keine
-						// Veranstaltung mehr auf das Image verweist.
-						// Unbdingt abfragen!
-
-						try {
-							if (!client.connectedToLecture(imageid,
-									imageversion)) {
-								try {
-									client.deleteImageServer(imageid,
-											imageversion);
-									if (client.deleteImageData(imageid,
-											imageversion)) {
-										// if (client.deleteImageServer(imageid
-										// ,imageversion)) {
-
-										DeleteImage_GUI di = new DeleteImage_GUI();
-										di.setVisible(true);
-										dispose();
-
-										/*
-										 * } else {
-										 * 
-										 * JOptionPane.showConfirmDialog(null,
-										 * "Loeschen vom Server hat leider nicht geklappt!!"
-										 * , imageversion,
-										 * JOptionPane.OK_CANCEL_OPTION); }
-										 */
-
-									} else {
-
-										JOptionPane
-												.showConfirmDialog(
-														null,
-														"Löschen von der DB hat leider nicht geklappt!!",
-														"Fehler",
-														JOptionPane.INFORMATION_MESSAGE);
-									}
-								} catch (HeadlessException e) {
-									// TODO Auto-generated catch block
-									e.printStackTrace();
-									JOptionPane.showMessageDialog(
-											null,
-											e.getCause() + "\n"
-													+ e.getStackTrace(),
-											"Debug-Message",
-											JOptionPane.ERROR_MESSAGE);
-								} catch (TException e) {
-									// TODO Auto-generated catch block
-									e.printStackTrace();
-									JOptionPane.showMessageDialog(
-											null,
-											e.getCause() + "\n"
-													+ e.getStackTrace(),
-											"Debug-Message",
-											JOptionPane.ERROR_MESSAGE);
-								}
-
-							} else {
-
-								JOptionPane
-										.showMessageDialog(
-												null,
-												"Image kann nicht gelöscht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist.",
-												"Verlinkung vorhanden",
-												JOptionPane.INFORMATION_MESSAGE);
-							}
-						} catch (TException e) {
-							// TODO Auto-generated catch block
-							e.printStackTrace();
-							JOptionPane.showMessageDialog(null, e.getCause()
-									+ "\n" + e.getStackTrace(),
-									"Debug-Message", JOptionPane.ERROR_MESSAGE);
-						}
-					}
-
-				} else if (tableAllImages.getSelectedRowCount() != 0
-						&& modelAll.getValueAt(
-								tableAllImages
-										.convertRowIndexToModel(tableAllImages
-												.getSelectedRow()), 4).equals(
-								username)) {
-
-					// frage, soll das selektierte Daten geloescht werden?
-					eingabe = JOptionPane.showConfirmDialog(null,
-							"Wollen Sie diese Daten löschen?",
-							"Löschen?", JOptionPane.YES_NO_OPTION);
+					/*
+					 * } else if (tablePublicVorlagen.getSelectedRowCount() != 0
+					 * && modelPublicVorlagen .getValueAt( tablePublicVorlagen
+					 * .convertRowIndexToModel(tablePublicVorlagen
+					 * .getSelectedRow()), 4) .equals(username)) {
+					 * 
+					 * // frage, soll das selektierte Daten geloescht werden?
+					 * eingabe = JOptionPane.showConfirmDialog(null,
+					 * "Wollen Sie diese Daten löschen?", "Löschen?",
+					 * JOptionPane.YES_NO_OPTION);
+					 * 
+					 * if (eingabe == JOptionPane.YES_OPTION) {
+					 * 
+					 * imageid = modelPublicVorlagen .getValueAt(
+					 * tablePublicVorlagen
+					 * .convertRowIndexToModel(tablePublicVorlagen
+					 * .getSelectedRow()), 6) .toString();
+					 * 
+					 * imageversion = modelPublicVorlagen .getValueAt(
+					 * tablePublicVorlagen
+					 * .convertRowIndexToModel(tablePublicVorlagen
+					 * .getSelectedRow()), 7) .toString();
+					 * 
+					 * // TODO // Image darf nur geloescht werden, wenn keine //
+					 * Veranstaltung mehr auf das Image verweist. // Unbdingt
+					 * abfragen!
+					 * 
+					 * try { if (!client.connectedToLecture(imageid,
+					 * imageversion)) { try { client.deleteImageServer(imageid,
+					 * imageversion); if (client.deleteImageData(imageid,
+					 * imageversion)) { // if (client.deleteImageServer(imageid
+					 * // ,imageversion)) {
+					 * 
+					 * DeleteImage_GUI di = new DeleteImage_GUI();
+					 * di.setVisible(true); dispose();
+					 * 
+					 * 
+					 * 
+					 * } else {
+					 * 
+					 * JOptionPane .showConfirmDialog( null,
+					 * "Löschen von der DB hat leider nicht geklappt!!",
+					 * "Fehler", JOptionPane.INFORMATION_MESSAGE); } } catch
+					 * (HeadlessException e) { // TODO Auto-generated catch
+					 * block e.printStackTrace(); JOptionPane.showMessageDialog(
+					 * null, e.getCause() + "\n" + e.getStackTrace(),
+					 * "Debug-Message", JOptionPane.ERROR_MESSAGE); } catch
+					 * (TException e) { // TODO Auto-generated catch block
+					 * e.printStackTrace(); JOptionPane.showMessageDialog( null,
+					 * e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
+					 * JOptionPane.ERROR_MESSAGE); }
+					 * 
+					 * } else {
+					 * 
+					 * JOptionPane .showMessageDialog( null,
+					 * "Image kann nicht gelöscht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist."
+					 * , "Verlinkung vorhanden",
+					 * JOptionPane.INFORMATION_MESSAGE); } } catch (TException
+					 * e) { // TODO Auto-generated catch block
+					 * e.printStackTrace(); JOptionPane.showMessageDialog(null,
+					 * e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
+					 * JOptionPane.ERROR_MESSAGE); } }
+					 * 
+					 * } else if (tableAllImages.getSelectedRowCount() != 0 &&
+					 * modelAll.getValueAt( tableAllImages
+					 * .convertRowIndexToModel(tableAllImages
+					 * .getSelectedRow()), 4).equals( username)) {
+					 * 
+					 * // frage, soll das selektierte Daten geloescht werden?
+					 * eingabe = JOptionPane.showConfirmDialog(null,
+					 * "Wollen Sie diese Daten löschen?", "Löschen?",
+					 * JOptionPane.YES_NO_OPTION);
+					 * 
+					 * if (eingabe == JOptionPane.YES_OPTION) {
+					 * 
+					 * imageid = modelAll.getValueAt( tableAllImages
+					 * .convertRowIndexToModel(tableAllImages
+					 * .getSelectedRow()), 6) .toString();
+					 * 
+					 * imageversion = modelAll.getValueAt( tableAllImages
+					 * .convertRowIndexToModel(tableAllImages
+					 * .getSelectedRow()), 7) .toString();
+					 * 
+					 * // TODO // Image darf nur geloescht werden, wenn keine //
+					 * Veranstaltung mehr auf das Image verweist. // Unbdingt
+					 * abfragen!
+					 * 
+					 * try { if (!client.connectedToLecture(imageid,
+					 * imageversion)) { try { client.deleteImageServer(imageid,
+					 * imageversion); if (client.deleteImageData(imageid,
+					 * imageversion)) { // if (client.deleteImageServer(imageid
+					 * // ,imageversion)) {
+					 * 
+					 * DeleteImage_GUI di = new DeleteImage_GUI();
+					 * di.setVisible(true); dispose();
+					 * 
+					 * 
+					 * } else {
+					 * 
+					 * JOptionPane .showConfirmDialog( null,
+					 * "Löschen von der DB hat leider nicht geklappt!!",
+					 * "Fehler", JOptionPane.INFORMATION_MESSAGE); } } catch
+					 * (HeadlessException e) { // TODO Auto-generated catch
+					 * block e.printStackTrace(); JOptionPane.showMessageDialog(
+					 * null, e.getCause() + "\n" + e.getStackTrace(),
+					 * "Debug-Message", JOptionPane.ERROR_MESSAGE); } catch
+					 * (TException e) { // TODO Auto-generated catch block
+					 * e.printStackTrace(); JOptionPane.showMessageDialog( null,
+					 * e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
+					 * JOptionPane.ERROR_MESSAGE); }
+					 * 
+					 * } else {
+					 * 
+					 * JOptionPane .showMessageDialog( null,
+					 * "Image kann nicht gelöscht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist."
+					 * , "Verlinkung vorhanden",
+					 * JOptionPane.INFORMATION_MESSAGE); } } catch (TException
+					 * e) { // TODO Auto-generated catch block
+					 * e.printStackTrace(); JOptionPane.showMessageDialog(null,
+					 * e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
+					 * JOptionPane.ERROR_MESSAGE); } }
+					 * 
+					 * } else {
+					 * 
+					 * JOptionPane.showMessageDialog(null,
+					 * "Bitte wählen Sie ein eigenes Image aus", "Message",
+					 * JOptionPane.INFORMATION_MESSAGE);
+					 */
+				}
 
-					if (eingabe == JOptionPane.YES_OPTION) {
+			}
+		});
+		btnDelete.setBounds(449, 508, 118, 23);
+		contentPanel.add(btnDelete);
 
-						imageid = modelAll.getValueAt(
-								tableAllImages
-										.convertRowIndexToModel(tableAllImages
+		JScrollPane scrollPaneMyImage = new JScrollPane();
+		scrollPaneMyImage.setBounds(10, 158, 557, 339);
+		contentPanel.add(scrollPaneMyImage);
+		tablemyImages = new JTable();
+		tablemyImages.getSelectionModel().addListSelectionListener(
+				new ListSelectionListener() {
+					public void valueChanged(ListSelectionEvent e) {
+						String imageid = modelMyImages.getValueAt(
+								tablemyImages
+										.convertRowIndexToModel(tablemyImages
 												.getSelectedRow()), 6)
 								.toString();
-
-						imageversion = modelAll.getValueAt(
-								tableAllImages
-										.convertRowIndexToModel(tableAllImages
+						String version = modelMyImages.getValueAt(
+								tablemyImages
+										.convertRowIndexToModel(tablemyImages
 												.getSelectedRow()), 7)
 								.toString();
-
-						// TODO
-						// Image darf nur geloescht werden, wenn keine
-						// Veranstaltung mehr auf das Image verweist.
-						// Unbdingt abfragen!
-
-						try {
-							if (!client.connectedToLecture(imageid,
-									imageversion)) {
-								try {
-									client.deleteImageServer(imageid,
-											imageversion);
-									if (client.deleteImageData(imageid,
-											imageversion)) {
-										// if (client.deleteImageServer(imageid
-										// ,imageversion)) {
-
-										DeleteImage_GUI di = new DeleteImage_GUI();
-										di.setVisible(true);
-										dispose();
-
-										/*
-										 * } else {
-										 * 
-										 * JOptionPane.showConfirmDialog(null,
-										 * "Loeschen vom Server hat leider nicht geklappt!!"
-										 * , imageversion,
-										 * JOptionPane.OK_CANCEL_OPTION); }
-										 */
-
-									} else {
-
-										JOptionPane
-												.showConfirmDialog(
-														null,
-														"Löschen von der DB hat leider nicht geklappt!!",
-														"Fehler",
-														JOptionPane.INFORMATION_MESSAGE);
-									}
-								} catch (HeadlessException e) {
-									// TODO Auto-generated catch block
-									e.printStackTrace();
-									JOptionPane.showMessageDialog(
-											null,
-											e.getCause() + "\n"
-													+ e.getStackTrace(),
-											"Debug-Message",
-											JOptionPane.ERROR_MESSAGE);
-								} catch (TException e) {
-									// TODO Auto-generated catch block
-									e.printStackTrace();
-									JOptionPane.showMessageDialog(
-											null,
-											e.getCause() + "\n"
-													+ e.getStackTrace(),
-											"Debug-Message",
-											JOptionPane.ERROR_MESSAGE);
-								}
-
-							} else {
-
-								JOptionPane
-										.showMessageDialog(
-												null,
-												"Image kann nicht gelöscht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist.",
-												"Verlinkung vorhanden",
-												JOptionPane.INFORMATION_MESSAGE);
-							}
-						} catch (TException e) {
-							// TODO Auto-generated catch block
-							e.printStackTrace();
-							JOptionPane.showMessageDialog(null, e.getCause()
-									+ "\n" + e.getStackTrace(),
-									"Debug-Message", JOptionPane.ERROR_MESSAGE);
-						}
+						writeImageData(imageid, version);
 					}
+				});
+		tablemyImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+		tablemyImages.setModel(modelMyImages);
+		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
+		tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
+		tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit();
+		tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit();
+		tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit();
+		tablemyImages.setRowSorter(rowSorterMyImages);
 
-				} else {
-
-					JOptionPane.showMessageDialog(null,
-							"Bitte wählen Sie ein eigenes Image aus",
-							"Message", JOptionPane.INFORMATION_MESSAGE);
-				}
-
-			}
-		});
-		btnDelete.setBounds(449, 508, 118, 23);
-		contentPanel.add(btnDelete);
+		scrollPaneMyImage.setViewportView(tablemyImages);
 		{
 			JPanel buttonPane = new JPanel();
 			buttonPane.setBounds(0, 640, 902, 33);
@@ -958,11 +754,11 @@ public class DeleteImage_GUI extends JFrame {
 		panel.add(lblLetztesUpdate);
 
 		JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:");
-		lblImageIstVorlage.setBounds(10, 336, 130, 14);
+		lblImageIstVorlage.setBounds(10, 334, 130, 14);
 		panel.add(lblImageIstVorlage);
 
 		labelVorlage = new JLabel("");
-		labelVorlage.setBounds(10, 350, 296, 14);
+		labelVorlage.setBounds(10, 348, 296, 14);
 		panel.add(labelVorlage);
 
 		labelLizenzSoftware = new JLabel("");
@@ -999,7 +795,7 @@ public class DeleteImage_GUI extends JFrame {
 		panel.add(labelCPU);
 
 		JLabel lblTechnischeDaten = new JLabel("Technische Daten:");
-		lblTechnischeDaten.setBounds(10, 322, 296, 14);
+		lblTechnischeDaten.setBounds(10, 312, 296, 14);
 		panel.add(lblTechnischeDaten);
 
 		JLabel lblId = new JLabel("ID:");
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index 9e287c9a..985a9bf7 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -73,7 +73,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	@SuppressWarnings("unused")
 	private JPanel contentPane;
 	private final JPanel contentPanel = new JPanel();
-	
+
 	JLabel lblPath;
 	JProgressBar progressBar;
 	String host = SessionData.session.getServerAdress();
@@ -102,6 +102,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	int progress = 0; // progress of upload
 	private boolean isCurrentlyLoading = false; // currently up or downloading
 												// file
+
 	private boolean isAborted = false; //down- or upload was manually aborted 
 	
 	private static final String HELP_MESSAGE =	"<html><div align = \"center\">" +
@@ -111,6 +112,9 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		   	"werden die Daten NICHT übernommen und auch die .vmdk-Datei wird nicht aktiv geschaltet." +
 		   	"</div></html>";
 
+
+
+
 	/**
 	 * Create the frame.
 	 */
@@ -362,8 +366,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		btnUploadStoppen = new JButton("Upload abbrechen");
 		btnUploadStoppen.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
-				
-				isAborted = true; //set flag
+
+				isAborted = true; // set flag
 				try {
 					client.DeleteFtpUser(user.userName);
 					LOGGER.info("Deleted FTP user.");
@@ -373,8 +377,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 				}
 				task.cancel(true);
 				resetValues();
-				
-				//reset buttons
+
+				// reset buttons
 				resetButtons();
 
 			}
@@ -456,23 +460,20 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 							}// end if choice
 						} else {
-							
-							int selectedOption = JOptionPane.showConfirmDialog(null, 
-	                                  "<html>Achtung: Alle Änderungen gehen verloren!<br />Klicken Sie auf fertigstellen, wenn Sie die Änderungen dauerhaft speichern möchten.<br /><br />Möchten Sie jetzt abbrechen und zurück?</html>", 
-	                                  "Abbrechen und zurück", 
-	                                  JOptionPane.YES_NO_OPTION); 
-							if (selectedOption == JOptionPane.YES_OPTION) 
-							{
-								dispose();							
+
+							int selectedOption = JOptionPane
+									.showConfirmDialog(
+											null,
+											"<html>Achtung: Alle Änderungen gehen verloren!<br />Klicken Sie auf fertigstellen, wenn Sie die Änderungen dauerhaft speichern möchten.<br /><br />Möchten Sie jetzt abbrechen und zurück?</html>",
+											"Abbrechen und zurück",
+											JOptionPane.YES_NO_OPTION);
+							if (selectedOption == JOptionPane.YES_OPTION) {
+								dispose();
 								PermissionCreateImage_GUI m = new PermissionCreateImage_GUI();
 								m.setVisible(true);
+							} else {
+								// for actions if "no" is selected. tbd.
 							}
-							else
-							{
-								//for actions if "no" is selected. tbd.
-							}
-							
-					
 
 						}// end else
 					}// end action
@@ -642,8 +643,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 				lblFilesize.setText((filesize / 1024 / 1024) + " MB");
 
 			}
-		} //end if(isAborted==false)
-	}//end propertyChange
+		} // end if(isAborted==false)
+	}// end propertyChange
 
 	public boolean writeData() {
 
@@ -706,13 +707,12 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		lblVerbleibend.setText("0");
 		progressBar.setValue(0);
 	}// end resetValues
-	
-	
-	public void resetButtons(){
+
+	public void resetButtons() {
 		btnFinish.setEnabled(false);
 		btnUploadStarten.setEnabled(true);
 		btnUploadStarten.setText("Upload starten");
 		btnUploadStoppen.setEnabled(false);
-		
-	}//end resetButtons
+
+	}// end resetButtons
 }// end class
\ No newline at end of file
diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index 4b61c9e1..a0116e40 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -1,7 +1,6 @@
 package gui.image;
 
 import gui.intro.About_GUI;
-import gui.intro.Login_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
@@ -87,18 +86,16 @@ public class SearchEditImage_GUI extends JFrame {
 	JLabel labelCPU;
 	JLabel labelID;
 	JLabel labelVersion;
+	JLabel lblNewLabel = new JLabel("Imageauswahl");
 	JTextArea textAreadesc;
 	private JLabel labelOS;
 	String[] result;
 	JRadioButton rdbtnInternetJa;
 	JRadioButton rdbtnInternetNein;
 	JComboBox<String> comboBox;
-	JTable tableAllImages;
 	JTable tablemyImages;
-	JTable tablePublicVorlagen;
 	boolean activeSearch = false;
 	private JTextField textFieldName;
-	JTabbedPane tabbedPane;
 	String[] titles = { "Name", "Lizenzpflichtig", "OS", "Veranstaltung",
 			"Verantwortlicher", "Letztes Update", "ID", "Version", "Template" };// Angezeigt
 																				// werden
@@ -140,7 +137,6 @@ public class SearchEditImage_GUI extends JFrame {
 			modelMyImages);
 	final TableRowSorter<TableModel> rowSorterPublicVorlagen = new TableRowSorter<TableModel>(
 			modelPublicVorlagen);
-	private JTextField textField;
 
 	/**
 	 * Create the dialog.
@@ -181,7 +177,7 @@ public class SearchEditImage_GUI extends JFrame {
 				tablemyImages.getColumnModel().getColumn(7).setWidth(0);
 				tablemyImages.getColumnModel().getColumn(7).setMinWidth(0);
 				tablemyImages.getColumnModel().getColumn(7).setMaxWidth(0);
-				
+				/*
 				tablePublicVorlagen.getColumnModel().getColumn(1).setWidth(0);
 				tablePublicVorlagen.getColumnModel().getColumn(1)
 						.setMinWidth(0);
@@ -223,6 +219,7 @@ public class SearchEditImage_GUI extends JFrame {
 				tableAllImages.getColumnModel().getColumn(7).setWidth(0);
 				tableAllImages.getColumnModel().getColumn(7).setMinWidth(0);
 				tableAllImages.getColumnModel().getColumn(7).setMaxWidth(0);
+				*/
 				textFieldName.requestFocusInWindow();
 			}
 		});
@@ -253,7 +250,7 @@ public class SearchEditImage_GUI extends JFrame {
 			getContentPane().add(panel);
 			panel.setLayout(null);
 			{
-				JLabel lblNewLabel = new JLabel("Imageauswahl");
+				
 				lblNewLabel.setBounds(10, 11, 509, 22);
 				panel.add(lblNewLabel);
 				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
@@ -281,12 +278,12 @@ public class SearchEditImage_GUI extends JFrame {
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
 
-		JLabel lblNewLabel_2 = new JLabel("Name:");
-		lblNewLabel_2.setBounds(10, 30, 80, 20);
+		JLabel lblNewLabel_2 = new JLabel("Volltextsuche:");
+		lblNewLabel_2.setBounds(30, 30, 80, 20);
 		panel_1.add(lblNewLabel_2);
 
 		JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:");
-		lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
+		lblInternetIstInnerhalb.setBounds(30, 58, 80, 20);
 		panel_1.add(lblInternetIstInnerhalb);
 
 		textFieldName = new JTextField();
@@ -320,7 +317,7 @@ public class SearchEditImage_GUI extends JFrame {
 			}
 		});
 
-		textFieldName.setBounds(96, 30, 166, 20);
+		textFieldName.setBounds(133, 30, 400, 20);
 		panel_1.add(textFieldName);
 		textFieldName.setColumns(10);
 
@@ -368,17 +365,8 @@ public class SearchEditImage_GUI extends JFrame {
 			}
 
 		});
-		comboBox.setBounds(96, 58, 166, 20);
+		comboBox.setBounds(133, 58, 191, 20);
 		panel_1.add(comboBox);
-		
-		JLabel label_3 = new JLabel("Beschreibung:");
-		label_3.setBounds(291, 30, 80, 20);
-		panel_1.add(label_3);
-		
-		textField = new JTextField();
-		textField.setColumns(10);
-		textField.setBounds(381, 30, 166, 20);
-		panel_1.add(textField);
 
 		JLabel lblHauptmen = new JLabel("Hauptmenü");
 		lblHauptmen.addMouseListener(new MouseAdapter() {
@@ -412,133 +400,6 @@ public class SearchEditImage_GUI extends JFrame {
 		lblNewLabel_1.setBounds(129, 11, 85, 14);
 		contentPanel.add(lblNewLabel_1);
 
-		tabbedPane = new JTabbedPane(JTabbedPane.TOP);
-		tabbedPane.addChangeListener(new ChangeListener() {
-			public void stateChanged(ChangeEvent arg0) {
-				if (tabbedPane.getSelectedIndex() == 0 && activeSearch == false) {
-
-					String username = person.verantwortlicher.getName() + " "
-							+ person.verantwortlicher.getVorname();
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
-							username, 4));
-				} else if (tabbedPane.getSelectedIndex() == 1
-						&& activeSearch == false) {
-					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
-							"true", 8));
-				} else if (tabbedPane.getSelectedIndex() == 2
-						&& activeSearch == false) {
-					rowSorterAll.setRowFilter(null);
-				}
-
-			}
-		});
-
-		tabbedPane.setBounds(10, 158, 557, 339);
-		contentPanel.add(tabbedPane);
-
-		JScrollPane scrollPaneMyImage = new JScrollPane();
-		tablemyImages = new JTable();
-		tablemyImages.getSelectionModel().addListSelectionListener(
-				new ListSelectionListener() {
-					public void valueChanged(ListSelectionEvent e) {
-						String imageid = modelMyImages.getValueAt(
-								tablemyImages
-										.convertRowIndexToModel(tablemyImages
-												.getSelectedRow()), 6)
-								.toString();
-						String version = modelMyImages.getValueAt(
-								tablemyImages
-										.convertRowIndexToModel(tablemyImages
-												.getSelectedRow()), 7)
-								.toString();
-						writeImageData(imageid, version);
-					}
-				});
-		tablemyImages.setModel(modelMyImages);
-		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit();
-		tablemyImages.setRowSorter(rowSorterMyImages);
-
-		scrollPaneMyImage.setViewportView(tablemyImages);
-		tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);
-
-		JScrollPane scrollPaneCoopImages = new JScrollPane();
-		JTable tableCoopImages = new JTable();
-		tableCoopImages.setModel(model);
-		tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit();
-
-		JScrollPane scrollPanePublicVorlagen = new JScrollPane();
-		tablePublicVorlagen = new JTable();
-		tablePublicVorlagen.getSelectionModel().addListSelectionListener(
-				new ListSelectionListener() {
-					public void valueChanged(ListSelectionEvent e) {
-						String imageid = modelPublicVorlagen
-								.getValueAt(
-										tablePublicVorlagen
-												.convertRowIndexToModel(tablePublicVorlagen
-														.getSelectedRow()), 6)
-								.toString();
-						String version = modelPublicVorlagen
-								.getValueAt(
-										tablePublicVorlagen
-												.convertRowIndexToModel(tablePublicVorlagen
-														.getSelectedRow()), 7)
-								.toString();
-						writeImageData(imageid, version);
-					}
-				});
-		tablePublicVorlagen.setModel(modelPublicVorlagen);
-		tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit();
-		tablePublicVorlagen.setRowSorter(rowSorterPublicVorlagen);
-		scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);
-		tabbedPane.addTab("Vorlagen", null, scrollPanePublicVorlagen, null);
-
-		JScrollPane scrollPaneAllImages = new JScrollPane();
-		tableAllImages = new JTable();
-		tableAllImages.getSelectionModel().addListSelectionListener(
-				new ListSelectionListener() {
-					public void valueChanged(ListSelectionEvent e) {
-
-						String imageid = modelAll.getValueAt(
-								tableAllImages
-										.convertRowIndexToModel(tableAllImages
-												.getSelectedRow()), 6)
-								.toString();
-						String version = modelAll.getValueAt(
-								tableAllImages
-										.convertRowIndexToModel(tableAllImages
-												.getSelectedRow()), 7)
-								.toString();
-						writeImageData(imageid, version);
-
-					}
-				});
-		tableAllImages.setModel(modelAll);
-		tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tableAllImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit();
-		tableAllImages.setRowSorter(rowSorterAll);
-
-		scrollPaneAllImages.setViewportView(tableAllImages);
-		tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
-
-		scrollPaneCoopImages.setViewportView(tableCoopImages);
-		tabbedPane.addTab("bwLehrpool", null, scrollPaneCoopImages, null);
-		tabbedPane.setEnabledAt(3, false);
-
 		JButton btnDownload = new JButton("Download");
 		btnDownload.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
@@ -547,7 +408,7 @@ public class SearchEditImage_GUI extends JFrame {
 				String username = person.verantwortlicher.getName() + " "
 						+ person.verantwortlicher.getVorname();
 				// check if user is in correct tab
-				if (tabbedPane.getSelectedIndex() == 0) {
+				/*if (tabbedPane.getSelectedIndex() == 0) { */
 					// check if a row is selected
 					if (tablemyImages.getSelectedRow() != -1) {
 						String imageid = modelMyImages.getValueAt(
@@ -568,7 +429,7 @@ public class SearchEditImage_GUI extends JFrame {
 						FTPEditDownloader_GUI ea = new FTPEditDownloader_GUI();
 						ea.setVisible(true);
 						dispose();
-					}
+						/*	}
 				} else if (tabbedPane.getSelectedIndex() == 1) {
 					if (tablePublicVorlagen.getSelectedRow() != -1) {
 						if (modelPublicVorlagen
@@ -644,16 +505,16 @@ public class SearchEditImage_GUI extends JFrame {
 
 							FTPEditDownloader_GUI ea = new FTPEditDownloader_GUI();
 							ea.setVisible(true);
-							dispose();
-						} else {
+							dispose(); 
+						} else { 
 							JOptionPane
 									.showMessageDialog(
 											null,
 											"Sie haben keine Berechtigung fremde Images herunterzuladen.",
 											"Message",
 											JOptionPane.INFORMATION_MESSAGE);
-						}
-					}
+						}//end actionPerformed
+					} */
 				} else {
 					JOptionPane
 							.showMessageDialog(
@@ -665,6 +526,36 @@ public class SearchEditImage_GUI extends JFrame {
 		});
 		btnDownload.setBounds(449, 508, 118, 23);
 		contentPanel.add(btnDownload);
+		
+				JScrollPane scrollPaneMyImage = new JScrollPane();
+				scrollPaneMyImage.setBounds(10, 158, 557, 339);
+				contentPanel.add(scrollPaneMyImage);
+				tablemyImages = new JTable();
+				tablemyImages.getSelectionModel().addListSelectionListener(
+						new ListSelectionListener() {
+							public void valueChanged(ListSelectionEvent e) {
+								String imageid = modelMyImages.getValueAt(
+										tablemyImages
+												.convertRowIndexToModel(tablemyImages
+														.getSelectedRow()), 6)
+										.toString();
+								String version = modelMyImages.getValueAt(
+										tablemyImages
+												.convertRowIndexToModel(tablemyImages
+														.getSelectedRow()), 7)
+										.toString();
+								writeImageData(imageid, version);
+							}
+						});
+				tablemyImages.setModel(modelMyImages);
+				tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
+				tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
+				tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit();
+				tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit();
+				tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit();
+				tablemyImages.setRowSorter(rowSorterMyImages);
+				
+						scrollPaneMyImage.setViewportView(tablemyImages);
 		{
 			JPanel buttonPane = new JPanel();
 			buttonPane.setBounds(0, 640, 902, 33);
@@ -694,7 +585,7 @@ public class SearchEditImage_GUI extends JFrame {
 						String username = person.verantwortlicher.getName()
 								+ " " + person.verantwortlicher.getVorname();
 						// check if user is in correct tab
-						if (tabbedPane.getSelectedIndex() == 0) {
+						//if (tabbedPane.getSelectedIndex() == 0) {
 							// check if a row is selected
 							if (tablemyImages.getSelectedRow() != -1) {
 								String imageid = modelMyImages
@@ -718,7 +609,7 @@ public class SearchEditImage_GUI extends JFrame {
 								ea.setVisible(true);
 								dispose();
 							}
-						} else if (tabbedPane.getSelectedIndex() == 1) {
+						/* } else if (tabbedPane.getSelectedIndex() == 1) {
 							if (tablePublicVorlagen.getSelectedRow() != -1
 									&& modelPublicVorlagen //deprecated(?) 
 											.getValueAt(
@@ -784,7 +675,7 @@ public class SearchEditImage_GUI extends JFrame {
 												JOptionPane.INFORMATION_MESSAGE);
 							}
 						}// end check if correct tab is selected
-					}
+					*/}//end actionPerformed
 				});
 				cancelButton.setActionCommand("Cancel");
 				buttonPane.add(cancelButton);
@@ -849,11 +740,11 @@ public class SearchEditImage_GUI extends JFrame {
 		panel.add(lblLetztesUpdate);
 
 		JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:");
-		lblImageIstVorlage.setBounds(10, 336, 130, 14);
+		lblImageIstVorlage.setBounds(10, 334, 130, 14);
 		panel.add(lblImageIstVorlage);
 
 		labelVorlage = new JLabel("");
-		labelVorlage.setBounds(10, 350, 296, 14);
+		labelVorlage.setBounds(10, 348, 296, 14);
 		panel.add(labelVorlage);
 
 		labelLizenzSoftware = new JLabel("");
@@ -890,7 +781,7 @@ public class SearchEditImage_GUI extends JFrame {
 		panel.add(labelCPU);
 
 		JLabel lblTechnischeDaten = new JLabel("Technische Daten:");
-		lblTechnischeDaten.setBounds(10, 322, 296, 14);
+		lblTechnischeDaten.setBounds(10, 312, 296, 14);
 		panel.add(lblTechnischeDaten);
 
 		JLabel lblId = new JLabel("ID:");
diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index d021b264..a51cdfe0 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -141,7 +141,6 @@ public class SearchImage_GUI extends JFrame {
 			modelMyImages);

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

 			modelPublicVorlagen);

-	private JTextField textField;

 

 	/**

 	 * Create the dialog.

@@ -282,12 +281,12 @@ public class SearchImage_GUI extends JFrame {
 		contentPanel.add(panel_1);

 		panel_1.setLayout(null);

 

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

-		lblNewLabel_2.setBounds(10, 30, 80, 20);

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

+		lblNewLabel_2.setBounds(30, 30, 80, 20);

 		panel_1.add(lblNewLabel_2);

 

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

-		lblInternetIstInnerhalb.setBounds(10, 58, 80, 20);

+		lblInternetIstInnerhalb.setBounds(30, 58, 80, 20);

 		panel_1.add(lblInternetIstInnerhalb);

 

 		textFieldName = new JTextField();

@@ -322,7 +321,7 @@ public class SearchImage_GUI extends JFrame {
 			}

 		});

 

-		textFieldName.setBounds(96, 30, 166, 20);

+		textFieldName.setBounds(133, 30, 400, 20);

 		panel_1.add(textFieldName);

 		textFieldName.setColumns(10);

 

@@ -369,17 +368,8 @@ public class SearchImage_GUI extends JFrame {
 			}

 

 		});

-		comboBox.setBounds(96, 58, 166, 20);

+		comboBox.setBounds(133, 58, 191, 20);

 		panel_1.add(comboBox);

-		

-		JLabel label_3 = new JLabel("Beschreibung:");

-		label_3.setBounds(291, 30, 80, 20);

-		panel_1.add(label_3);

-		

-		textField = new JTextField();

-		textField.setColumns(10);

-		textField.setBounds(381, 30, 166, 20);

-		panel_1.add(textField);

 

 		JLabel lblHauptmen = new JLabel("Hauptmenü");

 		lblHauptmen.addMouseListener(new MouseAdapter() {

@@ -753,11 +743,11 @@ public class SearchImage_GUI extends JFrame {
 		panel.add(lblLetztesUpdate);

 

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

-		lblImageIstVorlage.setBounds(10, 336, 130, 14);

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

 		panel.add(lblImageIstVorlage);

 

 		labelVorlage = new JLabel("");

-		labelVorlage.setBounds(10, 350, 296, 14);

+		labelVorlage.setBounds(10, 348, 296, 14);

 		panel.add(labelVorlage);

 

 		labelLizenzSoftware = new JLabel("");

@@ -794,7 +784,7 @@ public class SearchImage_GUI extends JFrame {
 		panel.add(labelCPU);

 

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

-		lblTechnischeDaten.setBounds(10, 322, 296, 14);

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

 		panel.add(lblTechnischeDaten);

 

 		JLabel lblId = new JLabel("ID:");

diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index 656f58bb..a20daa55 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -241,8 +241,8 @@ public class Login_GUI extends JFrame {
 
 		String hochschule = user.eMail.substring(user.eMail.indexOf("@") + 1);
 
-		person.verantwortlicher.setUsername(lblusername.getText().substring(0,
-				lblusername.getText().indexOf("@")));
+		//person.verantwortlicher.setUsername(lblusername.getText().substring(0,lblusername.getText().indexOf("@")));
+		person.verantwortlicher.setUsername(lblusername.getText().trim());
 		person.verantwortlicher.setName(user.lastName);
 		person.verantwortlicher.setVorname(user.firstName);
 		person.verantwortlicher.setEMail(user.eMail);
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index a8993278..b874b9c2 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -125,7 +125,6 @@ public class CreateLectureLink_GUI extends JFrame {
 			modelMyImages);
 	final TableRowSorter<TableModel> rowSorterPublicVorlagen = new TableRowSorter<TableModel>(
 			modelPublicVorlagen);
-	private JTextField textField;
 	
 	/**
 	 * Create the dialog.
@@ -260,12 +259,12 @@ public class CreateLectureLink_GUI extends JFrame {
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
 
-		JLabel lblNewLabel_2 = new JLabel("Anzeigename:");
-		lblNewLabel_2.setBounds(10, 30, 80, 20);
+		JLabel lblNewLabel_2 = new JLabel("Volltextsuche:");
+		lblNewLabel_2.setBounds(30, 30, 80, 20);
 		panel_1.add(lblNewLabel_2);
 
 		JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:");
-		lblInternetIstInnerhalb.setBounds(10, 58, 80, 20);
+		lblInternetIstInnerhalb.setBounds(30, 58, 80, 20);
 		panel_1.add(lblInternetIstInnerhalb);
 
 		textFieldName = new JTextField();
@@ -299,7 +298,7 @@ public class CreateLectureLink_GUI extends JFrame {
 
 		});
 
-		textFieldName.setBounds(96, 30, 166, 20);
+		textFieldName.setBounds(133, 30, 400, 20);
 		panel_1.add(textFieldName);
 		textFieldName.setColumns(10);
 
@@ -341,17 +340,8 @@ public class CreateLectureLink_GUI extends JFrame {
 				}
 			}
 		});
-		comboBox.setBounds(96, 58, 166, 20);
+		comboBox.setBounds(133, 58, 191, 20);
 		panel_1.add(comboBox);
-		
-		JLabel label_3 = new JLabel("Beschreibung:");
-		label_3.setBounds(291, 30, 80, 20);
-		panel_1.add(label_3);
-		
-		textField = new JTextField();
-		textField.setColumns(10);
-		textField.setBounds(381, 30, 166, 20);
-		panel_1.add(textField);
 
 		JLabel lblHauptmen = new JLabel("Hauptmenü");
 		lblHauptmen.addMouseListener(new MouseAdapter() {
diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
index 131acd97..014b9f71 100644
--- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
@@ -82,14 +82,13 @@ public class DeleteLecture_GUI extends JFrame {
 	JTextArea labelimage;
 	JTextArea labeldesc;
 	JLabel labelVerantwortlicher;
-	JTable tableAllLectures;
 	JTable tablemyLectures;
 	private JTextField textFieldName;
-	JTabbedPane tabbedPane;
 	boolean activeSearch=false;
 	String[] titles = { "Veranstaltungsname", "Beschreibung",
 			"Gültigkeitsdatum", "Aktiv", "Letzte Benutzung",
 			"Verantwortlicher", "Image", "Schlagwort", "ID" };
+	
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
 	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0);
@@ -99,6 +98,7 @@ public class DeleteLecture_GUI extends JFrame {
 	final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(
 			modelMyLectures);
 	private JButton button;
+
 	private JTextField textField;
 	
 	private static final String HELP_MESSAGE = "<html><div align=\"center\">" +
@@ -107,6 +107,7 @@ public class DeleteLecture_GUI extends JFrame {
 			"Veraltet bedeutet, dass Veranstaltungen, die drei Monate lang nicht augerufen wurden, vorerst deaktiviert werden." +
 			"</div></html>";
 
+
 	
 	/**
 	 * Create the dialog.
@@ -157,6 +158,7 @@ public class DeleteLecture_GUI extends JFrame {
 				tablemyLectures.getColumnModel().getColumn(8).setMinWidth(0);
 				tablemyLectures.getColumnModel().getColumn(8).setMaxWidth(0);
 				
+				/*
 				tableAllLectures.getColumnModel().getColumn(1).setWidth(0);
 				tableAllLectures.getColumnModel().getColumn(1).setMinWidth(0);
 				tableAllLectures.getColumnModel().getColumn(1).setMaxWidth(0);
@@ -175,6 +177,7 @@ public class DeleteLecture_GUI extends JFrame {
 				tableAllLectures.getColumnModel().getColumn(8).setWidth(0);
 				tableAllLectures.getColumnModel().getColumn(8).setMinWidth(0);
 				tableAllLectures.getColumnModel().getColumn(8).setMaxWidth(0);
+				*/
 			}
 		});
 		// Verhindert das Vergroessern Des Fensters
@@ -232,8 +235,8 @@ public class DeleteLecture_GUI extends JFrame {
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
 
-		JLabel lblNewLabel_2 = new JLabel("Name:");
-		lblNewLabel_2.setBounds(10, 30, 80, 20);
+		JLabel lblNewLabel_2 = new JLabel("Volltextsuche:");
+		lblNewLabel_2.setBounds(30, 30, 80, 20);
 		panel_1.add(lblNewLabel_2);
 
 		textFieldName = new JTextField();
@@ -263,18 +266,9 @@ public class DeleteLecture_GUI extends JFrame {
 			}
 		});
 
-		textFieldName.setBounds(96, 30, 166, 20);
+		textFieldName.setBounds(133, 30, 400, 20);
 		panel_1.add(textFieldName);
 		textFieldName.setColumns(10);
-		
-		JLabel label = new JLabel("Beschreibung:");
-		label.setBounds(291, 30, 80, 20);
-		panel_1.add(label);
-		
-		textField = new JTextField();
-		textField.setColumns(10);
-		textField.setBounds(381, 30, 166, 20);
-		panel_1.add(textField);
 
 		JLabel lblHauptmen = new JLabel("Hauptmenü");
 		lblHauptmen.addMouseListener(new MouseAdapter() {
@@ -307,72 +301,22 @@ public class DeleteLecture_GUI extends JFrame {
 		JLabel lblNewLabel_1 = new JLabel("Veranstaltung löschen");
 		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) {
-					rowSorterAll.setRowFilter(null);
-				}
-
-			}
-		});
-
-		tabbedPane.setBounds(10, 123, 557, 397);
-		contentPanel.add(tabbedPane);
-		
-
-		JScrollPane scrollPaneAllImages = new JScrollPane();
-		tableAllLectures = new JTable();
-	    tableAllLectures.getSelectionModel().addListSelectionListener( new ListSelectionListener()
-	    {
-	        public void valueChanged(ListSelectionEvent e)
-	        {
-	        	String imageid = modelAll
-						.getValueAt(
-								tableAllLectures
-										.convertRowIndexToModel(tableAllLectures
-												.getSelectedRow()), 8)
-						.toString();
-
-	        	try {
-					writeLectureData(imageid);
-				} catch (TException e1) {
-					// TODO Auto-generated catch block
-					e1.printStackTrace();
-				} catch (ParseException e1) {
-					// TODO Auto-generated catch block
-					e1.printStackTrace();
-				}
-	        }
-	    });
-		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();
-		tableAllLectures.setRowSorter(rowSorterAll);
 		JScrollPane scrollPaneMyImage = new JScrollPane();
+		scrollPaneMyImage.setBounds(10, 120, 552, 369);
+		contentPanel.add(scrollPaneMyImage);
 		tablemyLectures = new JTable();
-	    tablemyLectures.getSelectionModel().addListSelectionListener( new ListSelectionListener()
-	    {
-	        public void valueChanged(ListSelectionEvent e)
-	        {
-	        	String imageid = modelMyLectures
+		tablemyLectures.getSelectionModel().addListSelectionListener( new ListSelectionListener()
+		{
+		    public void valueChanged(ListSelectionEvent e)
+		    {
+		    	String imageid = modelMyLectures
 						.getValueAt(
 								tablemyLectures
 										.convertRowIndexToModel(tablemyLectures
 												.getSelectedRow()), 8)
 						.toString();
 
-	        	try {
+		    	try {
 					writeLectureData(imageid);
 				} catch (TException e1) {
 					// TODO Auto-generated catch block
@@ -381,24 +325,18 @@ public class DeleteLecture_GUI extends JFrame {
 					// TODO Auto-generated catch block
 					e1.printStackTrace();
 				}
-	        }
-	    });
+		    }
+		});
 		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);
 		
-
-		scrollPaneAllImages.setViewportView(tableAllLectures);
-		tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
+				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);
 		{
 			JPanel buttonPane = new JPanel();
 			buttonPane.setBounds(0, 640, 826, 33);
@@ -527,6 +465,7 @@ public class DeleteLecture_GUI extends JFrame {
 				getContentPane().add(button);
 				button.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
+						
 						String lectureID="";
 						int eingabe;
 						String username = person.verantwortlicher.getName() + " "
@@ -568,7 +507,7 @@ public class DeleteLecture_GUI extends JFrame {
 							}//end ask for confirmation
 							
 						}//end check if a row is selected
-						else if (tableAllLectures.getSelectedRowCount() !=0 && tableAllLectures.getValueAt(tableAllLectures.getSelectedRow(), 5).toString().equals(username)){
+						/* else if (tableAllLectures.getSelectedRowCount() !=0 && tableAllLectures.getValueAt(tableAllLectures.getSelectedRow(), 5).toString().equals(username)){
 							//a row is selected
 							//ask for confirmation
 							eingabe = JOptionPane.showConfirmDialog(null,
@@ -610,7 +549,7 @@ public class DeleteLecture_GUI extends JFrame {
 									"Bitte wählen Sie ein eigenes Image aus.",
 									"Message",
 									JOptionPane.INFORMATION_MESSAGE);
-						}
+						} */
 
 					}
 				});
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
index d1d1bed3..4a3dc744 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
@@ -517,12 +517,6 @@ public class EditLectureAllgemein_GUI extends JFrame {
 		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);
 
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
index b27c7985..63827070 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -125,6 +125,7 @@ public class EditLectureLink_GUI extends JFrame {
 			"Ändern Sie hier das Image, zu dem Ihre Veranstaltung gehört.<br />" +
 			"Wählen Sie das Image aus, das zu Ihrer Veranstaltung passt und klicken Sie anschließend auf \"Veranstaltung ändern und abschließen\"." +
 			"</div></html>";
+
 	/**
 	 * Create the dialog.
 	 */
@@ -258,12 +259,12 @@ public class EditLectureLink_GUI extends JFrame {
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
 
-		JLabel lblNewLabel_2 = new JLabel("Name:");
-		lblNewLabel_2.setBounds(10, 30, 80, 20);
+		JLabel lblNewLabel_2 = new JLabel("Volltextsuche:");
+		lblNewLabel_2.setBounds(30, 30, 80, 20);
 		panel_1.add(lblNewLabel_2);
 
 		JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:");
-		lblInternetIstInnerhalb.setBounds(10, 58, 80, 20);
+		lblInternetIstInnerhalb.setBounds(30, 58, 80, 20);
 		panel_1.add(lblInternetIstInnerhalb);
 
 		textFieldName = new JTextField();
@@ -297,7 +298,7 @@ public class EditLectureLink_GUI extends JFrame {
 
 		});
 
-		textFieldName.setBounds(96, 30, 166, 20);
+		textFieldName.setBounds(133, 30, 400, 20);
 		panel_1.add(textFieldName);
 		textFieldName.setColumns(10);
 
@@ -335,17 +336,8 @@ public class EditLectureLink_GUI extends JFrame {
 				}
 			}
 		});
-		comboBox.setBounds(96, 58, 166, 20);
+		comboBox.setBounds(133, 58, 191, 20);
 		panel_1.add(comboBox);
-		
-		JLabel label_3 = new JLabel("Beschreibung:");
-		label_3.setBounds(291, 30, 80, 20);
-		panel_1.add(label_3);
-		
-		textField = new JTextField();
-		textField.setColumns(10);
-		textField.setBounds(381, 30, 166, 20);
-		panel_1.add(textField);
 
 		JLabel lblHauptmen = new JLabel("Hauptmenü");
 		lblHauptmen.addMouseListener(new MouseAdapter() {
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
index c925daed..2ef05d15 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
@@ -80,10 +80,8 @@ public class EditLectureSearch_GUI extends JFrame {
 	JTextArea labelimage;
 	JTextArea labeldesc;
 	JLabel labelVerantwortlicher;
-	JTable tableAllLectures;
 	JTable tablemyLectures;
 	private JTextField textFieldName;
-	JTabbedPane tabbedPane;
 	boolean activeSearch = false;
 	String[] titles = { "Veranstaltungsname", "Beschreibung",
 			"Gültigkeitsdatum", "Aktiv", "Letzte Benutzung",
@@ -161,6 +159,7 @@ public class EditLectureSearch_GUI extends JFrame {
 				tablemyLectures.getColumnModel().getColumn(8).setMinWidth(0);
 				tablemyLectures.getColumnModel().getColumn(8).setMaxWidth(0);
 
+				/*
 				tableAllLectures.getColumnModel().getColumn(1).setWidth(0);
 				tableAllLectures.getColumnModel().getColumn(1).setMinWidth(0);
 				tableAllLectures.getColumnModel().getColumn(1).setMaxWidth(0);
@@ -179,6 +178,7 @@ public class EditLectureSearch_GUI extends JFrame {
 				tableAllLectures.getColumnModel().getColumn(8).setWidth(0);
 				tableAllLectures.getColumnModel().getColumn(8).setMinWidth(0);
 				tableAllLectures.getColumnModel().getColumn(8).setMaxWidth(0);
+				*/
 			}
 		});
 		// Verhindert das Vergroessern Des Fensters
@@ -309,94 +309,41 @@ public class EditLectureSearch_GUI extends JFrame {
 		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) {
-					rowSorterAll.setRowFilter(null);
-				}
-
-			}
-		});
-
-		tabbedPane.setBounds(10, 123, 557, 397);
-		contentPanel.add(tabbedPane);
-
-		JScrollPane scrollPaneAllImages = new JScrollPane();
-		tableAllLectures = new JTable();
-		tableAllLectures.getSelectionModel().addListSelectionListener(
-				new ListSelectionListener() {
-					public void valueChanged(ListSelectionEvent e) {
-						String imageid = modelAll
-								.getValueAt(
-										tableAllLectures
-												.convertRowIndexToModel(tableAllLectures
+		
+				JScrollPane scrollPaneMyImage = new JScrollPane();
+				scrollPaneMyImage.setBounds(10, 120, 552, 369);
+				contentPanel.add(scrollPaneMyImage);
+				tablemyLectures = new JTable();
+				tablemyLectures.getSelectionModel().addListSelectionListener(
+						new ListSelectionListener() {
+							public void valueChanged(ListSelectionEvent e) {
+								String imageid = modelMyLectures.getValueAt(
+										tablemyLectures
+												.convertRowIndexToModel(tablemyLectures
 														.getSelectedRow()), 8)
-								.toString();
-
-						try {
-							writeLectureData(imageid);
-						} catch (TException e1) {
-							// TODO Auto-generated catch block
-							e1.printStackTrace();
-						} catch (ParseException e1) {
-							// TODO Auto-generated catch block
-							e1.printStackTrace();
-						}
-					}
-				});
-		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();
-
-		JScrollPane scrollPaneMyImage = new JScrollPane();
-		tablemyLectures = new JTable();
-		tablemyLectures.getSelectionModel().addListSelectionListener(
-				new ListSelectionListener() {
-					public void valueChanged(ListSelectionEvent e) {
-						String imageid = modelMyLectures.getValueAt(
-								tablemyLectures
-										.convertRowIndexToModel(tablemyLectures
-												.getSelectedRow()), 8)
-								.toString();
-
-						try {
-							writeLectureData(imageid);
-						} catch (TException e1) {
-							// TODO Auto-generated catch block
-							e1.printStackTrace();
-						} catch (ParseException e1) {
-							// TODO Auto-generated catch block
-							e1.printStackTrace();
-						}
-					}
-				});
-		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);
+										.toString();
+
+								try {
+									writeLectureData(imageid);
+								} catch (TException e1) {
+									// TODO Auto-generated catch block
+									e1.printStackTrace();
+								} catch (ParseException e1) {
+									// TODO Auto-generated catch block
+									e1.printStackTrace();
+								}
+							}
+						});
+				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);
 		{
 			JPanel buttonPane = new JPanel();
 			buttonPane.setBounds(0, 640, 826, 33);
@@ -507,7 +454,8 @@ public class EditLectureSearch_GUI extends JFrame {
 							EditLectureAllgemein_GUI el = new EditLectureAllgemein_GUI();
 							el.setVisible(true);
 							dispose();
-						} else if (tableAllLectures.getSelectedRow() != -1
+						}
+						/*else if (tableAllLectures.getSelectedRow() != -1
 								&& tableAllLectures
 										.getValueAt(
 												tableAllLectures
@@ -598,8 +546,8 @@ public class EditLectureSearch_GUI extends JFrame {
 											"Bitte wählen Sie ein eigenes Image aus.",
 											"Message",
 											JOptionPane.INFORMATION_MESSAGE);
-						} // End Else
-					} // Action
+						} // End Else */
+					} // end action
 
 				});
 				btnContinue.setActionCommand("Cancel");
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
index a2936712..d63a220a 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
@@ -387,12 +387,6 @@ public class PermissionCreateLecture_GUI extends JFrame {
 		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);
 		
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
index f814e2dc..0f06ec9d 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
@@ -383,12 +383,6 @@ public class PermissionEditLecture_GUI extends JFrame {
 		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);
 		
diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index 510e7a7d..4a8b9fd9 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -102,7 +102,6 @@ public class SearchLecture_GUI extends JFrame {
 			modelAll);

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

 			modelMyLectures);

-	private JTextField textField;

 

 

 	/**

@@ -217,8 +216,8 @@ public class SearchLecture_GUI extends JFrame {
 		contentPanel.add(panel_1);

 		panel_1.setLayout(null);

 

-		JLabel lblNewLabel_2 = new JLabel("Name:");

-		lblNewLabel_2.setBounds(10, 30, 80, 20);

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

+		lblNewLabel_2.setBounds(30, 30, 80, 20);

 		panel_1.add(lblNewLabel_2);

 

 		textFieldName = new JTextField();

@@ -248,18 +247,9 @@ public class SearchLecture_GUI extends JFrame {
 			}

 		});

 

-		textFieldName.setBounds(96, 30, 166, 20);

+		textFieldName.setBounds(133, 30, 400, 20);

 		panel_1.add(textFieldName);

 		textFieldName.setColumns(10);

-		

-		JLabel label = new JLabel("Beschreibung:");

-		label.setBounds(291, 30, 80, 20);

-		panel_1.add(label);

-		

-		textField = new JTextField();

-		textField.setColumns(10);

-		textField.setBounds(381, 30, 166, 20);

-		panel_1.add(textField);

 

 		JLabel lblHauptmen = new JLabel("Hauptmenü");

 		lblHauptmen.addMouseListener(new MouseAdapter() {