From 0654614c58e42f1fc56ca6cec17157dbf042ab65 Mon Sep 17 00:00:00 2001
From: Nino Breuer
Date: Fri, 31 Oct 2014 13:46:57 +0100
Subject: • fixed bug which caused search guis to be closed when pressing enter
 in search bar

---
 .../src/main/java/gui/image/SearchImage_GUI.java       | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java')

diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index bcc1775d..1d0a37ce 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -156,7 +156,7 @@ public class SearchImage_GUI extends JFrame {
 	List<RowFilter<Object,Object>> andFilters = new ArrayList<RowFilter<Object,Object>>();
 
 	//the final filter which handles the search in the templates
-	RowFilter finalFilter = null;
+	RowFilter templateFilter = null;
 	ArrayList<RowFilter<Object, Object>> finalFilters = new ArrayList<RowFilter<Object, Object>>();
 	
 	
@@ -175,6 +175,8 @@ public class SearchImage_GUI extends JFrame {
 		finalFilters.add(andFilter);
 		finalFilters.add(orFilter);
 		
+		templateFilter = RowFilter.andFilter(finalFilters);
+		
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -337,7 +339,6 @@ public class SearchImage_GUI extends JFrame {
 					activeSearch = true;
 					// Filtere nach der Eingabe
 					
-					
 				 	orFilters.clear();
 				 	andFilters.clear();
 				 	finalFilters.clear();
@@ -349,21 +350,14 @@ public class SearchImage_GUI extends JFrame {
 					
 					rowSorterAll.setRowFilter(orFilter);
 					rowSorterMyImages.setRowFilter(orFilter);
-					
-					orFilters.clear();
-					
-				 	orFilters.add(RowFilter.regexFilter("(?i)"+stext, 0)); //case insensitive
-					orFilters.add(RowFilter.regexFilter("(?i)"+stext, 9)); //case insensitive
 
-					orFilter = RowFilter.orFilter(orFilters);
-					
 					andFilters.add(RowFilter.regexFilter("1", 8));
 					andFilter = RowFilter.andFilter(andFilters);
 					
 					finalFilters.add(andFilter);
 					finalFilters.add(orFilter);
-					finalFilter = RowFilter.andFilter(finalFilters);
-					rowSorterPublicVorlagen.setRowFilter(finalFilter); //TODO füttere finalFilter mit andFilter und orFilter --> TEST
+					templateFilter = RowFilter.andFilter(finalFilters);
+					rowSorterPublicVorlagen.setRowFilter(templateFilter); //TODO füttere finalFilter mit andFilter und orFilter --> TEST
 				} 
 				else 
 				{ //refresh list 
@@ -770,7 +764,7 @@ public class SearchImage_GUI extends JFrame {
 				});
 				okButton.setActionCommand("OK");
 				buttonPane.add(okButton);
-				getRootPane().setDefaultButton(okButton);
+				//getRootPane().setDefaultButton(okButton); //causes the main menue to open and the search gui to close when pressing enter in search bar
 			}
 		}
 
-- 
cgit v1.2.3-55-g7522