1 files changed, 56 insertions, 17 deletions

diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
index 01b93f47..ca33dc3c 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
@@ -21,6 +21,7 @@ import java.net.URISyntaxException;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -91,25 +92,33 @@ public class EditLectureSearch_GUI extends JFrame {
 			"Klicken Sie anschließend auf \"Weiter\", um die Details der Veranstaltung sowie die Berechtigungen zu ändern." +
 			"</div></html>";
 	
-	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) {
+	/*final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) {
 		public boolean isCellEditable(int rowIndex, int mColIndex) {
 			return false;
 		}
-	};
+	};*/
 	final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0) {
 		public boolean isCellEditable(int rowIndex, int mColIndex) {
 			return false;
 		}
 	};
-	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
-			modelAll);
+	/*final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
+			modelAll);*/
+	
 	final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(
 			modelMyLectures);
+	
+	RowFilter rf = null;
+	List<RowFilter<Object,Object>> filters = new ArrayList<RowFilter<Object,Object>>(2);
 
 	/**
 	 * Create the dialog.
 	 */
 	public EditLectureSearch_GUI(Component formerGUI) {
+		
+		filters.add(RowFilter.regexFilter(".", 0));
+		rf = RowFilter.orFilter(filters);
+		
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -123,7 +132,7 @@ public class EditLectureSearch_GUI extends JFrame {
 				textFieldName.requestFocusInWindow();
 				try {
 					initTableModel(modelMyLectures);
-					initTableModel(modelAll);
+					//initTableModel(modelAll);
 
 				} catch (ParseException e) {
 					// TODO Auto-generated catch block
@@ -223,22 +232,32 @@ public class EditLectureSearch_GUI extends JFrame {
 				// Textfield eingabe auslesen
 				String stext = textFieldName.getText();
 				// Wenn Textfield nicht leer
-				if (stext != "") {
+				if (stext != "") 
+				{
 					activeSearch = true;
 					// Filtere nach der Eingabe
-					rowSorterAll.setRowFilter(RowFilter.regexFilter(
-							textFieldName.getText(), 0));
-					rowSorterMyLectures.setRowFilter(RowFilter.regexFilter(
-							textFieldName.getText(), 0));
 
-				} else {
+				 	filters.clear();
+					filters.add(RowFilter.regexFilter("(?i)"+stext, 0)); //case insensitive
+					filters.add(RowFilter.regexFilter("(?i)"+stext, 1)); //case insensitive
+					rf = RowFilter.orFilter(filters);
+					rowSorterMyLectures.setRowFilter(rf);
+
+
+				} 
+				else 
+				{
 					activeSearch = false;
-					String username = person.verantwortlicher.getName() + " "
-							+ person.verantwortlicher.getVorname();
-					rowSorterMyLectures.setRowFilter(RowFilter.regexFilter(
-							username, 5));
-					rowSorterAll.setRowFilter(null);
+					activeSearch = false;
+					filters.clear();
+					filters.add(RowFilter.regexFilter(".", 0)); //case insensitive, filter for anything
+					rf = RowFilter.orFilter(filters);
+					rowSorterMyLectures.setRowFilter(rf);
+					
 				}
+				tablemyLectures.clearSelection();
+				
+				resetLectureInfo();
 			}
 		});
 
@@ -285,6 +304,9 @@ public class EditLectureSearch_GUI extends JFrame {
 				tablemyLectures.getSelectionModel().addListSelectionListener(
 						new ListSelectionListener() {
 							public void valueChanged(ListSelectionEvent e) {
+								
+								if(tablemyLectures.getSelectedRow() != -1)
+								{
 								String imageid = modelMyLectures.getValueAt(
 										tablemyLectures
 												.convertRowIndexToModel(tablemyLectures
@@ -301,6 +323,8 @@ public class EditLectureSearch_GUI extends JFrame {
 									e1.printStackTrace();
 								}
 							}
+							}
+							
 						});
 				tablemyLectures.setModel(modelMyLectures);
 				
@@ -331,7 +355,7 @@ public class EditLectureSearch_GUI extends JFrame {
 				});
 				btnBack.setActionCommand("OK");
 				buttonPane.add(btnBack);
-				getRootPane().setDefaultButton(btnBack);
+				//getRootPane().setDefaultButton(btnBack);
 			}
 			{
 				JButton btnContinue = new JButton("Weiter");
@@ -735,6 +759,21 @@ public class EditLectureSearch_GUI extends JFrame {
 		}
 		return model;
 	}
+	
+	private void resetLectureInfo() {
+		//reset the detailed information on the right hand side when changing search string
+
+		labelName.setText("");
+		labelVerantwortlicher.setText("");
+		labelAktiv.setText("");
+		labeldesc.setText("");
+		labelenddate.setText("");
+		labelimage.setText("");
+		labelimageversion.setText("");
+		labelstartdate.setText("");
+		labelVerantwortlicher.setText("");
+
+	}
 
 	public void writeLectureData(String id) throws TException, ParseException {