diff options
| author | Jonathan Bauer | 2014-10-29 14:13:54 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2014-10-29 14:13:54 +0100 |
| commit | 8524260c7a095871b9210b961b19e4ecb53c189a (patch) | |
| tree | a057fe72c9470e4e52eb0bea5ec17b3f2ae7fc14 /dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java | |
| parent | [client] support for loading text files through the ResouceLoader (diff) | |
| parent | g (diff) | |
| download | tutor-module-8524260c7a095871b9210b961b19e4ecb53c189a.tar.gz tutor-module-8524260c7a095871b9210b961b19e4ecb53c189a.tar.xz tutor-module-8524260c7a095871b9210b961b19e4ecb53c189a.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java | 27 |
1 files changed, 12 insertions, 15 deletions
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(
|