WebSVN - OpenConcerto - Diff - Rev 83 and 182 - /trunk/OpenConcerto/src/org/openconcerto/sql/view/search/SearchItemComponent.java

 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
- * Copyright 2011 OpenConcerto, by ILM Informatique. All rights reserved.
+ * Copyright 2011-2019 OpenConcerto, by ILM Informatique. All rights reserved.
+ *
  * The contents of this file are subject to the terms of the GNU General Public License Version 3
  * only ("GPL"). You may not use this file except in compliance with the License. You can obtain a
  * copy of the License at http://www.gnu.org/licenses/gpl-3.0.html See the License for the specific
  * language governing permissions and limitations under the License.
 import javax.swing.JTextField;
 import javax.swing.ListCellRenderer;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
+import javax.swing.table.TableModel;
 import javax.swing.text.BadLocationException;
 import net.jcip.annotations.Immutable;
 public class SearchItemComponent extends JPanel {
         public final int getIndex() {
             return this.index;
+        }
+    }
-    private JTextField textFieldRecherche = new JTextField(10);
+    private final JTextField textFieldRecherche = new JTextField(10);
-    private final JComboBox comboColonnePourRecherche;
+    private final JComboBox<Column> comboColonnePourRecherche;
-    private final JComboBox searchMode;
+    private final JComboBox<String> searchMode;
-    private JCheckBox invertSearch = new JCheckBox(TM.tr("toReverse"));
+    private final JCheckBox invertSearch = new JCheckBox(TM.tr("toReverse"));
-    private JButton buttonAdd = new JButton("+");
+    private final JButton buttonAdd = new JButton("+");
-    private JButton buttonRemove = new JButton();
+    private final JButton buttonRemove = new JButton();
     final SearchListComponent list;
+    // final to ease removing listener, SearchListComponent.reset() removes every item
+    // when the TableModel changes.
+    private final TableModel tableModel;
     private String text = "";
     public SearchItemComponent(final SearchListComponent list) {
         super();
         this.list = list;
+        this.tableModel = this.list.getTableModel();
         this.setOpaque(false);
         // Initialisation de l'interface graphique
+        this.searchMode = new JComboBox<>(
-        this.searchMode = new JComboBox(new String[] { TM.tr("contains"), TM.tr("contains.exactly"), TM.tr("isLessThan"), TM.tr("isEqualTo"), TM.tr("isExactlyEqualTo"), TM.tr("isGreaterThan"),
+                new String[] { TM.tr("contains"), TM.tr("contains.exactly"), TM.tr("isLessThan"), TM.tr("isEqualTo"), TM.tr("isExactlyEqualTo"), TM.tr("isGreaterThan"), TM.tr("isEmpty") });
-                TM.tr("isEmpty") });
-        final ListComboBoxModel comboModel = new ListComboBoxModel(Arrays.asList(TOUT));
+        final ListComboBoxModel<Column> comboModel = new ListComboBoxModel<>(Arrays.asList(TOUT));
         comboModel.setSelectOnAdd(false);
         // allow getColIndex() and thus getSearchItem() to work from now on
         assert comboModel.getSelectedItem() != null;
-        this.comboColonnePourRecherche = new JComboBox(comboModel);
+        this.comboColonnePourRecherche = new JComboBox<>(comboModel);
         uiInit();
+    }
+    final TableModel getTableModel() {
+        return this.tableModel;
+    }
     private void uiInit() {
         this.setLayout(new GridBagLayout());
         final GridBagConstraints c = new GridBagConstraints();
         c.gridx = 0;
         c.gridy = 0;
         c.insets = new Insets(0, 2, 0, 2);
         c.fill = GridBagConstraints.HORIZONTAL;
         // designation
         // don't just use DefaultListCellRenderer, it fails on some l&f
+        @SuppressWarnings("unchecked")
-        final ListCellRenderer old = this.comboColonnePourRecherche.getRenderer();
+        final ListCellRenderer<Object> old = (ListCellRenderer<Object>) this.comboColonnePourRecherche.getRenderer();
-        this.comboColonnePourRecherche.setRenderer(new ListCellRenderer() {
+        this.comboColonnePourRecherche.setRenderer(new ListCellRenderer<Column>() {
             @Override
-            public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+            public Component getListCellRendererComponent(JList<? extends Column> list, Column value, int index, boolean isSelected, boolean cellHasFocus) {
-                return old.getListCellRendererComponent(list, ((Column) value).getLabel(), index, isSelected, cellHasFocus);
+                return old.getListCellRendererComponent(list, value.getLabel(), index, isSelected, cellHasFocus);
+            }
         });
         // hand tuned for a IListPanel width of 1024px
         this.comboColonnePourRecherche.setMinimumSize(new Dimension(150, 20));
         this.comboColonnePourRecherche.setOpaque(false);
         initCombo();
         initSearchText();
         initInvertSearch();
         this.buttonAdd.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 SearchItemComponent.this.list.addNewSearchItem();
+            }
         });
         this.buttonRemove.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 SearchItemComponent.this.list.removeSearchItem(SearchItemComponent.this);
+            }
         });
+    }
     private void initInvertSearch() {
         this.invertSearch.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 updateSearchList();
+            }
         });
+    }
     private void initSearchText() {
         this.textFieldRecherche.getDocument().addDocumentListener(new SimpleDocumentListener() {
+            @Override
             public void update(DocumentEvent e) {
                 try {
                     // One ne peut pas appeler chercher() car le texte n'est pas encore a jour
                     SearchItemComponent.this.text = e.getDocument().getText(0, e.getDocument().getLength()).trim();
                     updateSearchList();
-                } catch (BadLocationException exn) {
+                } catch (final BadLocationException exn) {
                     // impossible
                     exn.printStackTrace();
+                }
+            }
         });
+    }
     private void initCombo() {
         final ItemListener listener = new ItemListener() {
+            @Override
             public void itemStateChanged(ItemEvent e) {
                 updateSearchList();
+            }
         };
         this.searchMode.addItemListener(listener);
+                }
+            }
         };
         // allow the TableModel to die
         this.addHierarchyListener(new HierarchyListener() {
+            @Override
             public void hierarchyChanged(HierarchyEvent e) {
                 if ((e.getChangeFlags() & HierarchyEvent.DISPLAYABILITY_CHANGED) != 0) {
                     if (e.getChanged().isDisplayable()) {
                         columnsChanged(listener);
-                        SearchItemComponent.this.list.getTableModel().addTableModelListener(tableModelL);
+                        SearchItemComponent.this.getTableModel().addTableModelListener(tableModelL);
                     } else {
-                        SearchItemComponent.this.list.getTableModel().removeTableModelListener(tableModelL);
+                        SearchItemComponent.this.getTableModel().removeTableModelListener(tableModelL);
+                    }
+                }
+            }
         });
         // that way the TableModelListener will get added automatically
         this.comboColonnePourRecherche.setSelectedIndex(0);
+    }
     private void fillColumnCombo(ItemListener listener) {
         // sort column names alphabetically
-        final int columnCount = this.list.getTableModel().getColumnCount();
+        final int columnCount = this.getTableModel().getColumnCount();
         final String[][] names = new String[columnCount][];
         final int[] indexes = new int[columnCount];
         for (int i = 0; i < columnCount; i++) {
             names[i] = this.list.getColumnNames(i);
             indexes[i] = 0;
+        }
         // use column index as columns names are not unique
         final SortedMap<String, Integer> map = solve(names, indexes);
-        final List<Column> cols = new ArrayList<Column>(columnCount);
+        final List<Column> cols = new ArrayList<>(columnCount);
         cols.add(TOUT);
         for (final Entry<String, Integer> e : map.entrySet()) {
             final int colIndex = e.getValue().intValue();
             final String[] colNames = names[colIndex];
             cols.add(new Column(e.getKey(), colNames[colNames.length - 1], colIndex));
+        }
         // don't fire when filling, we will fire when selecting
         this.comboColonnePourRecherche.removeItemListener(listener);
-        final ListComboBoxModel comboModel = (ListComboBoxModel) this.comboColonnePourRecherche.getModel();
+        final ListComboBoxModel<Column> comboModel = (ListComboBoxModel<Column>) this.comboColonnePourRecherche.getModel();
         assert !comboModel.isSelectOnAdd() : "Otherwise our following select might not fire";
         comboModel.removeAllElements();
         comboModel.addAll(cols);
         this.comboColonnePourRecherche.addItemListener(listener);
+    }
     private void columnsChanged(final ItemListener listener) {
         final String currentID = ((Column) this.comboColonnePourRecherche.getSelectedItem()).getID();
         fillColumnCombo(listener);
-        final ListComboBoxModel comboModel = (ListComboBoxModel) this.comboColonnePourRecherche.getModel();
+        final ListComboBoxModel<Column> comboModel = (ListComboBoxModel<Column>) this.comboColonnePourRecherche.getModel();
         // no selection since the model was just emptied
         assert this.comboColonnePourRecherche.getSelectedIndex() == -1 && this.comboColonnePourRecherche.getSelectedItem() == null;
         // try to reselect the same column if it's still there
         for (final Object o : comboModel.getList()) {
             final Column col = (Column) o;
      * @return a sorted map.
      */
     private SortedMap<String, Integer> solve(final String[][] names, final int[] indexes) {
         final int columnCount = names.length;
         // columns' index by name
-        final ListMap<String, Integer> collisions = new ListMap<String, Integer>(columnCount);
+        final ListMap<String, Integer> collisions = new ListMap<>(columnCount);
         for (int i = 0; i < columnCount; i++) {
             final int index = indexes[i];
             if (index >= names[i].length)
                 throw new IllegalStateException("Ran out of names for " + i + " : " + Arrays.asList(names[i]));
             final String columnName = names[i][index];
             collisions.add(columnName, i);
+        }
-        final SortedMap<String, Integer> res = new TreeMap<String, Integer>();
+        final SortedMap<String, Integer> res = new TreeMap<>();
-        for (Entry<String, ? extends Collection<Integer>> e : collisions.entrySet()) {
+        for (final Entry<String, ? extends Collection<Integer>> e : collisions.entrySet()) {
             final Collection<Integer> indexesWithCollision = e.getValue();
             if (indexesWithCollision.size() > 1) {
                 // increment only the minimum indexes to try to solve the conflict with the lowest
                 // possible indexes
                 int minIndex = Integer.MAX_VALUE;

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/sql/view/search/SearchItemComponent.java - Rev 83 → 182