diff options
Diffstat (limited to 'Dozentenmodul/src/gui/image/SearchEditImage_GUI.java')
| -rw-r--r-- | Dozentenmodul/src/gui/image/SearchEditImage_GUI.java | 39 |
1 files changed, 30 insertions, 9 deletions
diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index 30e2b06d..b5838efa 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -65,6 +65,7 @@ public class SearchEditImage_GUI extends JFrame { JComboBox<String> comboBox; JTable tableAllImages; JTable tablemyImages; + boolean activeSearch=false; private JTextField textFieldName; JTabbedPane tabbedPane; String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", @@ -101,6 +102,8 @@ public class SearchEditImage_GUI extends JFrame { @Override public void windowOpened(WindowEvent arg0) { + initTableModel(modelMyImages); + initTableModel(modelAll); textFieldName.requestFocusInWindow(); } }); @@ -178,14 +181,22 @@ public class SearchEditImage_GUI extends JFrame { String stext = textFieldName.getText(); // Wenn Textfield nicht leer - if (stext != "") { + if (stext.isEmpty()==false) { + activeSearch=true; // Filtere nach der Eingabe rowSorterAll.setRowFilter(RowFilter.regexFilter( textFieldName.getText(), 0)); rowSorterMyImages.setRowFilter(RowFilter.regexFilter( textFieldName.getText(), 0)); - - } + } + else{ + activeSearch=false; + String username = person.verantwortlicher.getName() + " " + + person.verantwortlicher.getVorname(); + rowSorterMyImages.setRowFilter(RowFilter.regexFilter( + username, 4)); + rowSorterAll.setRowFilter(null); + } } }); @@ -230,13 +241,23 @@ public class SearchEditImage_GUI extends JFrame { comboBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { // Prueft das die Auswahl nicht leer ist - if (comboBox.getSelectedItem().toString() != "") { + if (comboBox.getSelectedItem().toString().isEmpty()==false) { // Filtert nach dem ausgewaehlten Betriebssystem + activeSearch=true; rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox .getSelectedItem().toString(), 2)); rowSorterMyImages.setRowFilter(RowFilter.regexFilter( comboBox.getSelectedItem().toString(), 2)); } + else{ + activeSearch=false; + String username = person.verantwortlicher.getName() + " " + + person.verantwortlicher.getVorname(); + rowSorterMyImages.setRowFilter(RowFilter.regexFilter( + username, 4)); + + rowSorterAll.setRowFilter(null); + } } }); @@ -278,15 +299,15 @@ public class SearchEditImage_GUI extends JFrame { tabbedPane = new JTabbedPane(JTabbedPane.TOP); tabbedPane.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent arg0) { - if (tabbedPane.getSelectedIndex() == 0) { + if (tabbedPane.getSelectedIndex() == 0 && activeSearch==false) { String username = person.verantwortlicher.getName() + " " + person.verantwortlicher.getVorname(); // String username="Spitzer Tobias"; rowSorterMyImages.setRowFilter(RowFilter.regexFilter( username, 4)); - } else if (tabbedPane.getSelectedIndex() == 1) { - + } else if(tabbedPane.getSelectedIndex()==1 && activeSearch==false){ + rowSorterAll.setRowFilter(null); } } @@ -294,7 +315,7 @@ public class SearchEditImage_GUI extends JFrame { tabbedPane.setBounds(10, 197, 557, 300); contentPanel.add(tabbedPane); - initTableModel(modelMyImages); + JScrollPane scrollPaneAllImages = new JScrollPane(); tableAllImages = new JTable(); @@ -304,7 +325,7 @@ public class SearchEditImage_GUI extends JFrame { tableAllImages.getColumnModel().getColumn(3).sizeWidthToFit(); tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit(); tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit(); - initTableModel(modelAll); + JScrollPane scrollPaneMyImage = new JScrollPane(); tablemyImages = new JTable(); |