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

Conflicts:
	dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
	dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
	dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java

möp. großes geschrei, fehler bitte an mich.
	dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
	dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
	dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
	dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
	dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
	dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
	dozentenmodulserver/src/main/java/server/ServerHandler.java
	dozentenmodulserver/src/main/java/server/generated/Server.java
	dozentenmodulserver/thrift/server.thrift

9 files changed, 129 insertions, 42 deletions

diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
index 9ea9f779..9dc90eb3 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
@@ -118,7 +118,7 @@ public class CreateLectureAllgemein_GUI extends JFrame {
 			 
 			e.printStackTrace();
 		}
-		setTitle("bwLehrpool Suite - Veranstaltung erzeugen");
+		setTitle("bwLehrpool Suite - Veranstaltung erzeugen - "+person.verantwortlicher.getUserID());
 		setBounds(0, 0, 603, 722);
 		setLocationRelativeTo(formerGUI);
 
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index 2549e60f..ea1c7b88 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -100,6 +100,7 @@ public class CreateLectureLink_GUI extends JFrame {
 	boolean activeSearch = false;
 	Component c = null;
 	private JTextField textFieldName;
+	private JLabel lblTotalResults;
 	private String uuid = null;
 	String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung",
 			"Verantwortlicher", "Letztes Update", "ID", "Version", "Template", "Beschreibung" };
@@ -215,7 +216,7 @@ public class CreateLectureLink_GUI extends JFrame {
 			 
 			e.printStackTrace();
 		}
-		setTitle("bwLehrpool Suite - Veranstaltung erzeugen");
+		setTitle("bwLehrpool Suite - Veranstaltung erzeugen - "+person.verantwortlicher.getUserID());
 		setBounds(0, 0, 918, 722);
 		setLocationRelativeTo(formerGUI);
 
@@ -415,6 +416,10 @@ public class CreateLectureLink_GUI extends JFrame {
 		tablemyImages.setRowSorter(rowSorterMyImages);
 
 		scrollPaneMyImage.setViewportView(tablemyImages);
+		
+		lblTotalResults = new JLabel("Anzahl:");
+		lblTotalResults.setBounds(10, 512, 131, 20);
+		contentPanel.add(lblTotalResults);
 
 		{
 			JPanel buttonPane = new JPanel();
@@ -668,6 +673,7 @@ public class CreateLectureLink_GUI extends JFrame {
 		textAreadesc = new JTextArea();
 		textAreadesc.setLineWrap(true);
 		textAreadesc.setBackground(SystemColor.menu);
+		textAreadesc.setFont(new Font("Tahoma", Font.PLAIN, 11));
 		scrollPane.setViewportView(textAreadesc);
 
 		JMenuBar menuBar = new JMenuBar();
@@ -761,7 +767,7 @@ public class CreateLectureLink_GUI extends JFrame {
 		// Hole eine Liste der Images
 		if(person.verantwortlicher.getRole()=="Admin"){
 			//get complete list
-			images = client.getImageList(person.verantwortlicher.getUserID());
+			images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 		} else {		
 			images = client.getImageListPermissionLink(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 		}
@@ -788,6 +794,8 @@ public class CreateLectureLink_GUI extends JFrame {
 			i.next();
 
 		}
+		//show number if rows in GUI
+		lblTotalResults.setText(lblTotalResults.getText()+" "+model.getRowCount());
 		
 		return model;
 
diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
index 6d908413..3e010696 100644
--- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
@@ -83,6 +83,7 @@ public class DeleteLecture_GUI extends JFrame {
 	JLabel labelVerantwortlicher;
 	JTable tablemyLectures;
 	private JTextField textFieldName;
+	private JLabel lblTotalResults;
 	boolean activeSearch = false;
 	String[] titles = { "Veranstaltungsname", "Beschreibung",
 			"Gültigkeitsdatum", "Aktiv", "Letzte Benutzung",
@@ -91,7 +92,14 @@ public class DeleteLecture_GUI extends JFrame {
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
 
-	final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0);
+	final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0){
+		public boolean isCellEditable(int rowIndex, int mColIndex) {
+			return false;
+		}
+	};
+	
+	
+	
 
 	final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(
 			modelMyLectures);
@@ -137,7 +145,6 @@ public class DeleteLecture_GUI extends JFrame {
 				textFieldName.requestFocusInWindow();
 				try {
 					initTableModel(modelMyLectures);
-					// initTableModel(modelAll);
 
 				} catch (ParseException e) {
 
@@ -199,7 +206,7 @@ public class DeleteLecture_GUI extends JFrame {
 			e.printStackTrace();
 		}
 		// Setzt den Fenstertitel
-		setTitle("bwLehrpool Suite - Veranstaltung löschen");
+		setTitle("bwLehrpool Suite - Veranstaltung löschen - "+person.verantwortlicher.getUserID());
 		// Zentriert das Fenster in die Bildmitte
 		setBounds(0, 0, 842, 722);
 		setLocationRelativeTo(formerGUI);
@@ -312,6 +319,10 @@ public class DeleteLecture_GUI extends JFrame {
 		JLabel label_2 = new JLabel(">");
 		label_2.setBounds(152, 11, 13, 14);
 		contentPanel.add(label_2);
+		
+		lblTotalResults = new JLabel("Anzahl:");
+		lblTotalResults.setBounds(10, 500, 131, 20);
+		contentPanel.add(lblTotalResults);
 
 		JLabel lblNewLabel_1 = new JLabel("Löschen");
 		lblNewLabel_1.setBounds(166, 11, 155, 14);
@@ -659,6 +670,10 @@ public class DeleteLecture_GUI extends JFrame {
 				i.next();
 
 			}
+
+			//show number if rows in GUI
+			lblTotalResults.setText(lblTotalResults.getText()+" "+model.getRowCount());
+
 			return model;
 		} catch (TException e1) {
 
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
index eae7a49c..f9fdd8fb 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
@@ -118,7 +118,7 @@ public class EditLectureAllgemein_GUI extends JFrame {
 			 
 			e.printStackTrace();
 		}
-		setTitle("bwLehrpool Suite - Veranstaltung bearbeiten");
+		setTitle("bwLehrpool Suite - Veranstaltung bearbeiten - "+person.verantwortlicher.getUserID());
 		;
 		setBounds(0, 0, 603, 722);
 		setLocationRelativeTo(formerGUI);
@@ -505,7 +505,8 @@ public class EditLectureAllgemein_GUI extends JFrame {
 
 							//check which GUI to open
 							try {
-								if(client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.session.getAuthToken())){
+
+								if((client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.session.getAuthToken()) || (person.verantwortlicher.getRole().equals("Admin")))){
 									//user is admin of the lecture
 									PermissionEditLecture_GUI ev = new PermissionEditLecture_GUI(c);
 									ev.setVisible(true);
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
index a92b2dec..001f1b44 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -167,9 +167,8 @@ public class EditLectureLink_GUI extends JFrame {
 			@Override
 			public void windowOpened(WindowEvent arg0) {
 				try {
-					initTableModel(modelAll);
+					initTableModelAll(modelAll);
 					initTableModel(modelMyImages);
-					//initTableModel(modelPublicVorlagen);
 					initTableModelTemplates(modelPublicVorlagen);
 				} catch (TException e) {
 					
@@ -292,7 +291,7 @@ public class EditLectureLink_GUI extends JFrame {
 			
 			e.printStackTrace();
 		}
-		setTitle("bwLehrpool Suite - Veranstaltung bearbeiten");
+		setTitle("bwLehrpool Suite - Veranstaltung bearbeiten - "+person.verantwortlicher.getUserID());
 
 		setBounds(0, 0, 918, 722);
 		setLocationRelativeTo(formerGUI);
@@ -630,7 +629,9 @@ public class EditLectureLink_GUI extends JFrame {
 						
 						//check which GUI to open
 						try {
-							if(client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.session.getAuthToken())){
+
+							if(client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.session.getAuthToken()) || (person.verantwortlicher.getRole().equals("Admin"))){
+
 								//user is admin of the lecture
 								PermissionEditLecture_GUI ev = new PermissionEditLecture_GUI(c);
 								ev.setVisible(true);
@@ -1134,6 +1135,7 @@ public class EditLectureLink_GUI extends JFrame {
 		textAreadesc = new JTextArea();
 		textAreadesc.setLineWrap(true);
 		textAreadesc.setBackground(SystemColor.menu);
+		textAreadesc.setFont(new Font("Tahoma", Font.PLAIN, 11));
 		scrollPane.setViewportView(textAreadesc);
 
 		JMenuBar menuBar = new JMenuBar();
@@ -1217,7 +1219,50 @@ public class EditLectureLink_GUI extends JFrame {
 		// Hole eine Liste der Images
 		if(person.verantwortlicher.getRole()=="Admin"){
 			//get complete list
-			images = client.getImageList(person.verantwortlicher.getUserID());
+			images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
+		} else {
+			//get permitted list
+			images = client.getImageListPermissionLink(person.verantwortlicher
+				.getUserID(),SessionData.session.getAuthToken());
+		}
+
+		Iterator<server.generated.Image> i = images.iterator();
+		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
+		int x = 0;
+
+		while (i.hasNext()) {
+			// erzeuge Objekte fuer die Tabelle
+			Object[] obj = { images.get(x).getImageName(),
+					images.get(x).getLicenseRestriction(),
+					images.get(x).getOsName(), images.get(x).getLectureName(),
+					images.get(x).getUserData(),
+					out.format(in.parse(images.get(x).updateTime)),
+					images.get(x).id, images.get(x).getVersion(),
+					images.get(x).getIsTemplate(),
+					images.get(x).getDescription()};
+			// Fuege diese Objekte der Tabelle hinzu
+			model.addRow(obj);
+			x++;
+			i.next();
+		}
+		
+		//show number of rows in GUI
+		tabbedPane.setTitleAt(0, tabbedPane.getTitleAt(0)+" ("+model.getRowCount()+") ");
+
+		return model;
+
+	}
+	
+	
+	public DefaultTableModel initTableModelAll(DefaultTableModel model)
+			throws TException, ParseException {
+		List<server.generated.Image> images;
+
+		// Hole eine Liste der Images
+		if(person.verantwortlicher.getRole()=="Admin"){
+			//get complete list
+			images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 		} else {
 			//get permitted list
 			images = client.getImageListPermissionLink(person.verantwortlicher
@@ -1244,6 +1289,9 @@ public class EditLectureLink_GUI extends JFrame {
 			x++;
 			i.next();
 		}
+		
+		//show number of rows in GUI
+		tabbedPane.setTitleAt(2, tabbedPane.getTitleAt(2)+" ("+model.getRowCount()+") ");
 
 		return model;
 
@@ -1280,6 +1328,8 @@ public class EditLectureLink_GUI extends JFrame {
 				i.next();
 
 			}
+			//show number of rows in GUI
+			tabbedPane.setTitleAt(1, tabbedPane.getTitleAt(1)+" ("+model.getRowCount()+") ");
 
 			return model;
 
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
index 92981146..064ad5af 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
@@ -84,6 +84,7 @@ public class EditLectureSearch_GUI extends JFrame {
 	JLabel labelVerantwortlicher;
 	JTable tablemyLectures;
 	private JTextField textFieldName;
+	private JLabel lblTotalResults;
 	boolean activeSearch = false;
 	Component c = null;
 	String[] titles = { "Veranstaltungsname", "Beschreibung",
@@ -196,7 +197,7 @@ public class EditLectureSearch_GUI extends JFrame {
 			e.printStackTrace();
 		}
 		// Setzt den Fenstertitel
-		setTitle("bwLehrpool Suite - Veranstaltung bearbeiten");
+		setTitle("bwLehrpool Suite - Veranstaltung bearbeiten - "+person.verantwortlicher.getUserID());
 		// Zentriert das Fenster in die Bildmitte
 		setBounds(0, 0, 842, 722);
 		setLocationRelativeTo(formerGUI);
@@ -362,6 +363,11 @@ public class EditLectureSearch_GUI extends JFrame {
 		tablemyLectures.setRowSorter(rowSorterMyLectures);
 
 		scrollPaneMyImage.setViewportView(tablemyLectures);
+		
+		lblTotalResults = new JLabel("Anzahl:");
+		lblTotalResults.setBounds(10, 512, 131, 20);
+		contentPanel.add(lblTotalResults);
+		
 		{
 			JPanel buttonPane = new JPanel();
 			buttonPane.setBounds(0, 640, 826, 33);
@@ -695,6 +701,9 @@ public class EditLectureSearch_GUI extends JFrame {
 				i.next();
 
 			}
+			
+			//show number if rows in GUI
+			lblTotalResults.setText(lblTotalResults.getText()+" "+model.getRowCount());
 
 			return model;
 		} catch (TException e1) {
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
index f32648f0..b9886c73 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
@@ -80,7 +80,7 @@ public class PermissionCreateLecture_GUI extends JFrame {
 	// private JTable table = null;
 	private JTable tablePermittedUsers = null;
 	private final ButtonGroup buttonGroup = new ButtonGroup();
-	Object[] titles = { "Name", "Read", "Write", "Admin", "userID" };
+	Object[] titles = { "Name", "Lesen", "Schreiben", "Admin", "userID" };
 	// Object[] titles = { "Name", "Read", "Write", "Link", "Admin", "userID" };
 	Component c = null;
 	private static final String HELP_MESSAGE = "<html><div align=\"center\">"
@@ -144,7 +144,7 @@ public class PermissionCreateLecture_GUI extends JFrame {
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
 			e.printStackTrace();
 		}
-		setTitle("bwLehrpool Suite - Berechtigungen");
+		setTitle("bwLehrpool Suite - Berechtigungen - "+person.verantwortlicher.getUserID());
 
 		setBounds(0, 0, 603, 722);
 		setLocationRelativeTo(formerGUI);
@@ -311,31 +311,31 @@ public class PermissionCreateLecture_GUI extends JFrame {
 				TitledBorder.LEADING, TitledBorder.TOP, null, null));
 		panel.setBackground(SystemColor.menu);
 
-		JLabel label = new JLabel("Read");
+		JLabel label = new JLabel("Lesen");
 		label.setBounds(28, 18, 90, 20);
 		panel.add(label);
 
-		JLabel label_3 = new JLabel("Write");
+		JLabel label_3 = new JLabel("Schreiben");
 		label_3.setBounds(28, 38, 90, 20);
 		panel.add(label_3);
 
 		JLabel label_5 = new JLabel("Admin");
-		label_5.setBounds(28, 78, 90, 20);
+		label_5.setBounds(28, 58, 90, 20);
 		panel.add(label_5);
 
 		JLabel label_7 = new JLabel(
-				"Veranstaltung ist in bwLehrpool Suite und VMchooser für sichtbar..");
-		label_7.setBounds(128, 18, 380, 20);
+				"Veranstaltung ist in bwLehrpool Suite und VMchooser sichtbar.");
+		label_7.setBounds(128, 18, 419, 20);
 		panel.add(label_7);
 
 		JLabel lblimageDarfAngepasst = new JLabel(
-				"<HTML>Image darf angepasst und &uuml;berschrieben, jedoch nicht gel&ouml;scht werden. Berechtigungen f&uuml;r andere Benutzer festlegen</HTML>");
-		lblimageDarfAngepasst.setBounds(128, 38, 380, 45);
+				"Veranstaltung darf angepasst und überschrieben, jedoch nicht gelöscht werden.");
+		lblimageDarfAngepasst.setBounds(128, 38, 419, 20);
 		panel.add(lblimageDarfAngepasst);
 
 		JLabel lblvolleRechteRead = new JLabel(
-				"<HTML>Volle Rechte: read, write, l&ouml;schen und Berechtigungen f&uuml;r andere Benutzer festlegen.</HTML>");
-		lblvolleRechteRead.setBounds(128, 78, 380, 40);
+				"<HTML>Volle Rechte: Lesen, Schreiben, Löschen und Berechtigungen für andere Benutzer festlegen.</HTML>");
+		lblvolleRechteRead.setBounds(128, 58, 419, 35);
 		panel.add(lblvolleRechteRead);
 
 		JPanel panel_1 = new JPanel();
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
index 52e9746a..40956d88 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
@@ -75,7 +75,7 @@ public class PermissionEditLecture_GUI extends JFrame {
 	String[] result;
 	private JTable table;
 	private Class[] classes;
-	Object[] titles = { "Name", "Read", "Write", "Admin", "userID" };
+	Object[] titles = { "Name", "Lesen", "Schreiben", "Admin", "userID" };
 	private List<Person> map = null; // List of people who have rights
 	Component c = null;
 	private static final String HELP_MESSAGE = "<html><div align=\"center\">"
@@ -128,7 +128,7 @@ public class PermissionEditLecture_GUI extends JFrame {
 			
 			e.printStackTrace();
 		}
-		setTitle("bwLehrpool Suite - Berechtigungen");
+		setTitle("bwLehrpool Suite - Berechtigungen - "+person.verantwortlicher.getUserID());
 
 		setBounds(0, 0, 603, 722);
 		setLocationRelativeTo(formerGUI);
@@ -170,32 +170,32 @@ public class PermissionEditLecture_GUI extends JFrame {
 		panel.setBounds(10, 35, 557, 130);
 		contentPanel.add(panel);
 
-		JLabel label = new JLabel("Read");
-		label.setBounds(28, 18, 90, 20);
-		panel.add(label);
+		JLabel lblLesen = new JLabel("Lesen");
+		lblLesen.setBounds(28, 18, 90, 20);
+		panel.add(lblLesen);
 
 		JLabel lblVeranstaltungIstIn = new JLabel(
 				"Veranstaltung ist in bwLehrpool Suite und VMchooser für sichtbar.");
-		lblVeranstaltungIstIn.setBounds(128, 18, 380, 20);
+		lblVeranstaltungIstIn.setBounds(128, 18, 419, 20);
 		panel.add(lblVeranstaltungIstIn);
 
-		JLabel label_4 = new JLabel("Write");
-		label_4.setBounds(28, 38, 90, 20);
-		panel.add(label_4);
+		JLabel lblSchreiben = new JLabel("Schreiben");
+		lblSchreiben.setBounds(28, 38, 90, 20);
+		panel.add(lblSchreiben);
 
 		JLabel label_5 = new JLabel(
-				"<HTML>Veranstaltung darf angepasst und überschrieben, jedoch nicht gelöscht werden. Berechtigungen für andere Benutzer festlegen</HTML>");
-		label_5.setBounds(128, 38, 380, 45);
+				"Veranstaltung darf angepasst und überschrieben, jedoch nicht gelöscht werden.");
+		label_5.setBounds(128, 38, 419, 20);
 		panel.add(label_5);
 
 		JLabel label_6 = new JLabel("Admin");
-		label_6.setBounds(28, 78, 90, 20);
+		label_6.setBounds(28, 58, 90, 20);
 		panel.add(label_6);
 
-		JLabel label_7 = new JLabel(
-				"<HTML>Volle Rechte: read, write, löschen und Berechtigungen für andere Benutzer festlegen.</HTML>");
-		label_7.setBounds(128, 78, 380, 40);
-		panel.add(label_7);
+		JLabel lblvolleRechteLesen = new JLabel(
+				"<HTML>Volle Rechte: Lesen, Schreiben, Löschen und Berechtigungen für andere Benutzer festlegen.</HTML>");
+		lblvolleRechteLesen.setBounds(128, 58, 419, 35);
+		panel.add(lblvolleRechteLesen);
 
 		JPanel panel_1 = new JPanel();
 		panel_1.setBackground(SystemColor.menu);
diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index fc00997f..cb783a59 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -223,7 +223,7 @@ public class SearchLecture_GUI extends JFrame {
 			e.printStackTrace();

 		}

 		// Setzt den Fenstertitel

-		setTitle("bwLehrpool Suite - Veranstaltung suchen");

+		setTitle("bwLehrpool Suite - Veranstaltung suchen - "+person.verantwortlicher.getUserID());

 		// Zentriert das Fenster in die Bildmitte 2;

 		setBounds(0, 0, 842, 722);

 		setLocationRelativeTo(formerGUI);

@@ -660,6 +660,8 @@ public class SearchLecture_GUI extends JFrame {
 				i.next();

 

 			}

+			//show number of rows in GUI

+			tabbedPane.setTitleAt(0, tabbedPane.getTitleAt(0)+" ("+model.getRowCount()+") ");

 

 			return model;

 		} catch (TException e1) {

@@ -697,6 +699,8 @@ public class SearchLecture_GUI extends JFrame {
 				i.next();

 

 			}

+			//show number of rows in GUI

+			tabbedPane.setTitleAt(1, tabbedPane.getTitleAt(1)+" ("+model.getRowCount()+") ");

 

 			return model;

 		} catch (TException e1) {