• fixed bug which caused search guis to be closed when pressing enter in search bar

4 files changed, 9 insertions, 15 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index baf4c9be..bac85d04 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -477,7 +477,7 @@ public class SearchEditImage_GUI extends JFrame {
 				});
 				okButton.setActionCommand("OK");
 				buttonPane.add(okButton);
-				getRootPane().setDefaultButton(okButton);
+				//getRootPane().setDefaultButton(okButton);
 			}
 			{
 				JButton cancelButton = new JButton("Weiter");
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

 			}

 		}

 

diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
index 8644f62c..ca33dc3c 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
@@ -355,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");
diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index d61aca35..457d3983 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -418,7 +418,7 @@ public class SearchLecture_GUI extends JFrame {
 				});

 				btnBack.setActionCommand("OK");

 				buttonPane.add(btnBack);

-				getRootPane().setDefaultButton(btnBack);

+				//getRootPane().setDefaultButton(btnBack);

 			}

 		}