-Suchfenster "Image bearbeiten", "Image löschen", Veranstaltung bearbeiten", "Veranstaltung löschen" wurden vereinfacht (nur Anzeige, noch nicht Logik)

-Login speichert nun den gesamten Login als User, nicht nur den String vor dem "@uni......."
-SQL wurde umgebogen um den Login als primary key für den User festzulegen und damit umzugehen

7 files changed, 390 insertions, 723 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index 2f6ca6f3..964f8ae3 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
@@ -173,47 +170,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();
 			}
@@ -245,8 +248,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));
@@ -363,11 +365,11 @@ public class DeleteImage_GUI extends JFrame {
 		});
 		comboBox.setBounds(96, 58, 166, 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);
@@ -409,139 +411,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) {
@@ -555,8 +424,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) {
 
@@ -592,15 +461,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
@@ -648,224 +508,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);
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index 754a5d63..62937f60 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -66,8 +66,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	/**
 	 * Logger instance for this class.
 	 */
-	private final static Logger LOGGER = Logger
-			.getLogger(FTPCreateUploader_GUI.class);
+	private final static Logger LOGGER = Logger.getLogger(FTPCreateUploader_GUI.class);
 
 	@SuppressWarnings("unused")
 	private JPanel contentPane;
@@ -616,6 +615,32 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	public boolean writeData() {
 
 		try {
+			
+			LOGGER.info("Writing this VLData: " +
+					Image.image.getImagename()+
+					", "+
+					Image.image.getDesc()+
+					", "+
+					person.verantwortlicher.getUsername()+
+					", "+
+					person.verantwortlicher.getVorname()+
+					", "+
+					person.verantwortlicher.getName()+
+					", "+
+					person.verantwortlicher.getHochschule()+
+					", "+
+					person.verantwortlicher.getEMail()+
+					", "+
+					person.verantwortlicher.getTel()+
+					", "+
+					person.verantwortlicher.getFakultaet()+
+					", "+
+					Image.image.isLicensed()+
+					", "+ Image.image.isInternet()+", "+
+					Image.image.getRam()+", "+ 
+					Image.image.getCpu()+", "+ "temp/"+ Image.image.getNewName()+", "+
+					Image.image.isVorlage()+", "+ Image.image.getFilesize()+", "+
+					Image.image.getShareMode()+", "+ Image.image.getOS() );
 
 			client.writeVLdata(Image.image.getImagename(),
 					Image.image.getDesc(),
diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index 2d65fda3..3535643a 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
@@ -175,7 +172,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);
@@ -217,6 +214,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();
 			}
 		});
@@ -247,7 +245,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));
@@ -406,133 +404,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) {
@@ -541,7 +412,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(
@@ -562,7 +433,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
@@ -638,16 +509,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(
@@ -659,6 +530,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);
@@ -688,7 +589,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
@@ -712,7 +613,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(
@@ -778,7 +679,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);
diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index 4c29027a..31d9d60b 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -237,8 +237,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/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
index b387ab9f..0e2496f3 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);
@@ -151,6 +150,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);
@@ -169,6 +169,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
@@ -301,72 +302,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
@@ -375,24 +326,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);
@@ -521,6 +466,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() + " "
@@ -562,7 +508,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,
@@ -604,7 +550,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/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
index ab72cf11..9282ccd8 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",
@@ -156,6 +154,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);
@@ -174,6 +173,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
@@ -304,94 +304,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);
@@ -502,7 +449,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
@@ -593,8 +541,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/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java
index 349f7f80..92af9f14 100644
--- a/dozentenmodulserver/src/main/java/sql/SQL.java
+++ b/dozentenmodulserver/src/main/java/sql/SQL.java
@@ -189,9 +189,9 @@ public class SQL {
 			

 			if (ret.next() == false) {

 				

-				String id = UUID.randomUUID().toString();

+				//String id = UUID.randomUUID().toString();

 				stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_user`(`userID`,`loginName`,`nachname`,`vorname`,`mail`,`lastLogin`,`institution`)VALUES('"

-						+ id

+						+ login

 						+ "','"

 						+ login

 						+ "','"

@@ -251,6 +251,40 @@ public class SQL {
 			Statement stm = con.createStatement();

 			

 			String uid = UUID.randomUUID().toString();

+			

+			log.info(" - Query is: "+"INSERT INTO `bwLehrpool`.`m_VLData_imageInfo`(`GUID_imageID`,`imageVersion`,`image_name`,`image_description`,`image_path`,`image_lastCall`,`image_create_time`,`image_update_time`,`image_owner`,`image_change_by`,`rec_create_time`,`rec_change_time`,`rec_owner`,`rec_change_by`,`content_operatingSystem`,`status_isCompressed`,`status_isSecure`,`status_isOptimzed`,`status_isValid`,`status_isReady`,`status_isDeleted`,`status_isLastOfficialVersion`,`cond_hasLicenseRestriction`,`cond_hasInternetRestriction`,`cond_minRAM`,`cond_minCPUs`,`image_isTemplate`,`image_filesize`,`image_syncMode`)VALUES('"

+					+ uid // GUID_imageID

+					+ "',1,'" // imageVersion

+					+ imagename // image_name

+					// Ticket #1144 ist hier zu lösen, desc sollte nicht zu lang sein, sonst merkert die DB

+					+ "','" +desc //image_description

+					+ "','" + imagePath // image_path

+					+ "','" + formatter.format(new Date()) // image_lastCall

+					+ "','" + formatter.format(new Date()) // image_create_time

+					+ "','" + formatter.format(new Date()) // image_update_time

+					+ "','" + pk_person // image_owner

+					+ "','" + pk_person // image_change_by

+					+ "','" + formatter.format(new Date()) // rec_create_time

+					+ "','" + formatter.format(new Date()) // rec_change_time

+					+ "','" + pk_person // rec_owner

+					+ "','" + pk_person // rec_change_by

+					+ "','" + pk_os // content_operatingSystem

+					+ "',1" // status_isCompressed

+					+ ",1" // status_isSecure

+					+ ",1" // status_isOptimzed

+					+ ",1" // status_isValid

+					+ ",1" // status_isReady

+					+ ",0" // status_isDeleted

+					+ ",0,'" // status_isLastOfficialVersion

+					+ license_bol // cond_hasLicenseRestriction

+					+ "','" + internet_bol // cond_hasInternetRestriction

+					+ "','" + ram // cond_minRAM

+					+ "','" + cpu // cond_minCPUs

+					+ "','0'" //image_isTemplate

+					+ ",'" + filesize //image_filesize

+					+ "','" + shareMode //shareMode

+					+ "');");

+			

 			stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_imageInfo`(`GUID_imageID`,`imageVersion`,`image_name`,`image_description`,`image_path`,`image_lastCall`,`image_create_time`,`image_update_time`,`image_owner`,`image_change_by`,`rec_create_time`,`rec_change_time`,`rec_owner`,`rec_change_by`,`content_operatingSystem`,`status_isCompressed`,`status_isSecure`,`status_isOptimzed`,`status_isValid`,`status_isReady`,`status_isDeleted`,`status_isLastOfficialVersion`,`cond_hasLicenseRestriction`,`cond_hasInternetRestriction`,`cond_minRAM`,`cond_minCPUs`,`image_isTemplate`,`image_filesize`,`image_syncMode`)VALUES('"

 					+ uid // GUID_imageID

 					+ "',1,'" // imageVersion

@@ -279,8 +313,8 @@ public class SQL {
 					+ "','" + internet_bol // cond_hasInternetRestriction

 					+ "','" + ram // cond_minRAM

 					+ "','" + cpu // cond_minCPUs

-					+ "',0'" //image_isTemplate

-					+ "','" + filesize //image_filesize

+					+ "','0'" //image_isTemplate

+					+ ",'" + filesize //image_filesize

 					+ "','" + shareMode //shareMode

 					+ "');");

 			con.commit();

@@ -563,7 +597,8 @@ public class SQL {
 					+ "',`cond_minCPUs` = '"

 					+ cpu

 					+ "',`image_isTemplate` = '"

-					+ isTemplate

+					//+ isTemplate

+					+ "'0'"

 					+ "',`content_operatingSystem` = '"

 					+ ospk

 					+ "',`image_filesize` = '"

@@ -754,6 +789,11 @@ public class SQL {
 			Statement stm = con.createStatement();

 			String image_path="prod/"+name;

 			

+			log.info(new Date() + " - Updating ImagePath with: UPDATE `bwLehrpool`.`m_VLData_imageInfo` SET `image_path` = '"

+					+ image_path

+					+ "' WHERE `image_path` = '"

+					+ "temp/"+name + "';");

+			

 			stm.executeUpdate("UPDATE `bwLehrpool`.`m_VLData_imageInfo` SET `image_path` = '"

 					+ image_path

 					+ "' WHERE `image_path` = '"