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

1 files changed, 18 insertions, 3 deletions

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) {