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

Conflicts:
	dozentenmodulserver/src/main/java/sql/SQL.java

• Note: manual merge

1 files changed, 20 insertions, 10 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index 403520a0..bac85d04 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -264,25 +264,35 @@ public class SearchEditImage_GUI extends JFrame {
 				//System.out.println("Help, I don't want to be filtered yet....");
 
 				// Wenn Textfield nicht leer
-				if (stext.trim().length() > 0) {
+				if (stext.trim().length() > 0) 
+				{
+					
 					activeSearch = true;
 					// Filtere nach der Eingabe
-					 	filters.clear();
-						filters.add(RowFilter.regexFilter("(?i)"+stext, 0)); //case insensitive
-						filters.add(RowFilter.regexFilter("(?i)"+stext, 9)); //case insensitive
-						rf = RowFilter.orFilter(filters);
-						rowSorterMyImages.setRowFilter(rf);
-						
-						
+					 	
+					filters.clear();
+					
+					filters.add(RowFilter.regexFilter("(?i)"+stext, 0)); //case insensitive
+					filters.add(RowFilter.regexFilter("(?i)"+stext, 9)); //case insensitive
+					
+					rf = RowFilter.orFilter(filters);
+					rowSorterMyImages.setRowFilter(rf);	
+					
+				} 
+				else 
+				{
 					
-				} else {
 					activeSearch = false;
 					
 					filters.clear();
 					filters.add(RowFilter.regexFilter(".", 0)); //case insensitive, filter for anything
+					
 					rf = RowFilter.orFilter(filters);
+					
 					rowSorterMyImages.setRowFilter(rf);
+					
 				}
+				
 				tablemyImages.clearSelection();
 				
 				resetImageInfo();
@@ -467,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");