From f1a4b248da7e636a8fb9f2d3001fdd4ba628471c Mon Sep 17 00:00:00 2001
From: Nino Breuer
Date: Tue, 28 Oct 2014 20:02:36 +0100
Subject: changed implementation of full text search in some classes

---
 .../src/main/java/gui/image/SearchImage_GUI.java   | 27 ++++++++++------------
 1 file changed, 12 insertions(+), 15 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 49e71b7d..67aab17d 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -300,24 +300,21 @@ public class SearchImage_GUI extends JFrame {
 				String stext = textFieldName.getText().trim();
 
 				// Wenn Textfield nicht leer
-				if (stext != "") {
+				if (stext != "") 
+				{
 					activeSearch = true;
 					// Filtere nach der Eingabe
-					rowSorterAll.setRowFilter(RowFilter.regexFilter(
-							textFieldName.getText(), 0));
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
-							textFieldName.getText(), 0));
-					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
-							textFieldName.getText(), 0));
+					rowSorterAll.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0));
+					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0));
+					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0));
 					
-				} else { //refresh list (deprecated, remove tabfolder)
+				} 
+				else 
+				{ //refresh list 
 					activeSearch = false;
-					String username = person.verantwortlicher.getName() + " "
-							+ person.verantwortlicher.getVorname();
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
-							username, 4));
-					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
-							"true", 8));
+					String username = person.verantwortlicher.getName() + " " + person.verantwortlicher.getVorname();
+					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4));
+					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter("true", 8));
 					rowSorterAll.setRowFilter(null);
 				}
 			}
@@ -463,7 +460,7 @@ public class SearchImage_GUI extends JFrame {
 					public void valueChanged(ListSelectionEvent e) {
 						String imageid = modelMyImages.getValueAt(
 								tablemyImages
-										.convertRowIndexToModel(tablemyImages
+										.convertRowIndexToModel(tablemyImages	//hier wird auf myImages zugegriffen, obwohl man sich in Vorlage oder "Alle" befindet.
 												.getSelectedRow()), 6)
 								.toString();
 						String version = modelMyImages.getValueAt(
-- 
cgit v1.2.3-55-g7522