WebSVN - OpenConcerto - Diff - Rev 174 and 177 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/ui/SaisieJournalItemTable.java

 import org.openconcerto.sql.view.list.AutoCompletionManager;
 import org.openconcerto.sql.view.list.RowValuesTable;
 import org.openconcerto.sql.view.list.RowValuesTableControlPanel;
 import org.openconcerto.sql.view.list.RowValuesTableModel;
 import org.openconcerto.sql.view.list.SQLTableElement;
-import org.openconcerto.sql.view.list.TextTableCellEditorWithCompletion;
 import org.openconcerto.sql.view.list.ValidStateChecker;
 import org.openconcerto.ui.DefaultGridBagConstraints;
 import org.openconcerto.ui.JComponentUtils;
 import org.openconcerto.ui.RangedIntegerTableCellEditor;
 import org.openconcerto.utils.DecimalUtils;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.beans.PropertyChangeEvent;
         c.weightx = 1;
         final SQLElement elt = Configuration.getInstance().getDirectory().getElement("SAISIE_KM_ELEMENT");
         // TODO Obligation de choisir un compte correct
-        final List<SQLTableElement> list = new Vector<SQLTableElement>();
+        final List<SQLTableElement> list = new Vector<>();
         final SQLTable tableElement = elt.getTable();
-        final SQLTableElement tableElementJour = new SQLTableElement(tableElement.getField("JOUR"), Integer.class, rangedIntegerTableCellEditor) {
+        final SQLTableElement tableElementJour = new SQLTableElement(tableElement.getField("JOUR"), Integer.class, this.rangedIntegerTableCellEditor) {
             @Override
             public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
                 return super.isCellEditable(vals, rowIndex, columnIndex) && rowIndex == 0;
+            }
+                }
             });
             final MultiLineTableCellEditor multiLineTableCellEditor = new MultiLineTableCellEditor((RowValuesMultiLineEditTable) analytiqueAssocTable.getTable(), analytiqueAssocTable);
             SQLTableElement eltPourcentAnalytique = new SQLTableElement(tableElement.getField("ANALYTIQUE"), String.class, multiLineTableCellEditor) {
+                @Override
                 public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
                     return vals.getString("NUMERO") != null && (vals.getString("NUMERO").startsWith("6") || vals.getString("NUMERO").startsWith("7"));
                 };
             };
             list.add(eltPourcentAnalytique);
                 super.setValueAt(aValue, rowIndex, columnIndex);
                 final int debitIndex = getColumnIndexForElement(SaisieJournalItemTable.this.debit);
                 final int creditIndex = getColumnIndexForElement(SaisieJournalItemTable.this.credit);
-                // float debitVal = ((Float) model.getValueAt(rowIndex, debitIndex);
-                if (debitIndex == columnIndex && ((Long) aValue).longValue() != 0 && ((Long) getValueAt(rowIndex, creditIndex)).longValue() != 0) {
+                if (debitIndex == columnIndex && ((Number) aValue).longValue() != 0 && ((Number) getValueAt(rowIndex, creditIndex)).longValue() != 0) {
                     setValueAt(Long.valueOf(0), rowIndex, creditIndex);
                 } else {
-                    if (creditIndex == columnIndex && ((Long) aValue).longValue() != 0 && ((Long) getValueAt(rowIndex, debitIndex)).longValue() != 0) {
+                    if (creditIndex == columnIndex && ((Number) aValue).longValue() != 0 && ((Number) getValueAt(rowIndex, debitIndex)).longValue() != 0) {
                         setValueAt(Long.valueOf(0), rowIndex, debitIndex);
+                    }
+                }
+            }
         };
         this.table = new RowValuesTable(model, null);
         ToolTipManager.sharedInstance().unregisterComponent(this.table);
         ToolTipManager.sharedInstance().unregisterComponent(this.table.getTableHeader());
-        tableElementNomEcriture.getTableCellEditor(table).addCellEditorListener(new CellEditorListener() {
+        tableElementNomEcriture.getTableCellEditor(this.table).addCellEditorListener(new CellEditorListener() {
             @Override
             public void editingStopped(ChangeEvent e) {
                 e.getSource();
-                int row = table.getSelectedRow();
+                int row = SaisieJournalItemTable.this.table.getSelectedRow();
                 int col = 4;
-                if (table.getValueAt(row, col) != null) {
+                if (SaisieJournalItemTable.this.table.getValueAt(row, col) != null) {
-                    defaultRowVals.put("NOM_ECRITURE", table.getValueAt(row, col));
+                    defaultRowVals.put("NOM_ECRITURE", SaisieJournalItemTable.this.table.getValueAt(row, col));
+                }
-                // defaultRowVals.put
+            }
             @Override
             public void editingCanceled(ChangeEvent e) {
-                // TODO Auto-generated method stub
+                //
+            }
         });
-        tableElementNomPiece.getTableCellEditor(table).addCellEditorListener(new CellEditorListener() {
+        tableElementNomPiece.getTableCellEditor(this.table).addCellEditorListener(new CellEditorListener() {
             @Override
             public void editingStopped(ChangeEvent e) {
                 e.getSource();
-                int row = table.getSelectedRow();
+                int row = SaisieJournalItemTable.this.table.getSelectedRow();
                 int col = 3;
-                if (table.getValueAt(row, col) != null) {
+                if (SaisieJournalItemTable.this.table.getValueAt(row, col) != null) {
-                    defaultRowVals.put("NOM_PIECE", table.getValueAt(row, col));
+                    defaultRowVals.put("NOM_PIECE", SaisieJournalItemTable.this.table.getValueAt(row, col));
+                }
-                // defaultRowVals.put
+            }
             @Override
             public void editingCanceled(ChangeEvent e) {
-                // TODO Auto-generated method stub
+                //
+            }
         });
-        tableElementJour.getTableCellEditor(table).addCellEditorListener(new CellEditorListener() {
+        tableElementJour.getTableCellEditor(this.table).addCellEditorListener(new CellEditorListener() {
             @Override
             public void editingStopped(ChangeEvent e) {
-                final Object valueAt = table.getValueAt(0, 0);
+                final Object valueAt = SaisieJournalItemTable.this.table.getValueAt(0, 0);
                 defaultRowVals.put("JOUR", valueAt);
-                if (table.getRowCount() > 1) {
+                if (SaisieJournalItemTable.this.table.getRowCount() > 1) {
-                    for (int i = 1; i < table.getRowCount(); i++) {
+                    for (int i = 1; i < SaisieJournalItemTable.this.table.getRowCount(); i++) {
-                        table.getRowValuesTableModel().putValue(valueAt, i, "JOUR");
+                        SaisieJournalItemTable.this.table.getRowValuesTableModel().putValue(valueAt, i, "JOUR");
+                    }
+                }
+            }
             @Override
             public void editingCanceled(ChangeEvent e) {
-                // TODO Auto-generated method stub
+                //
+            }
         });
-        ;
-        final KeyListener keyListenerContrepartie = new KeyListener() {
-            @Override
-            public void keyTyped(KeyEvent e) {
-            }
-            @Override
-            public void keyReleased(KeyEvent e) {
+        final KeyListener keyListenerContrepartie = new KeyAdapter() {
-            }
             @Override
             public void keyPressed(KeyEvent e) {
                 if (e.getKeyCode() == KeyEvent.VK_ENTER) {
                     montantValid(defaultRowVals, false, textField);
                     ComptePCESQLElement elt = Configuration.getInstance().getDirectory().getElement(ComptePCESQLElement.class);
                     @Override
                     public ValidState getValidState(Object o) {
                         if (o != null) {
-                            return elt.getCompteNumeroValidState(o.toString());
+                            return this.elt.getCompteNumeroValidState(o.toString());
+                        }
                         return super.getValidState(o);
+                    }
                 });
         m.fill("NOM", "NOM");
                 this.table, this.table.getRowValuesTableModel(), ITextWithCompletion.MODE_CONTAINS, true);
         m2.fill("NUMERO", "NUMERO");
         m2.setFillWithField("NOM");
         m2.setWhere(w);
-        TextTableCellEditorWithCompletion t = (TextTableCellEditorWithCompletion) this.tableElementNumeroCompte.getTableCellEditor(this.table);
-        JButton buttonClone = new JButton(TM.tr("duplicateLine"));
+        JButton buttonClone = new JButton(TM.tr(Configuration.getInstance().getLocale(), "duplicateLine"));
         buttonClone.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
-                cloneLine(table.getSelectedRow());
+                cloneLine(SaisieJournalItemTable.this.table.getSelectedRow());
+            }
         });
         buttonClone.setEnabled(false);
         c.gridx++;
         JComponentUtils.setMinimumWidth(buttonClone, 95);
             @Override
             public void tableChanged(TableModelEvent e) {
                 // Sélectionne automatiquement la ligne ajoutée
                 if (e.getType() == TableModelEvent.INSERT) {
-                    if (table.getRowCount() == 1) {
+                    if (SaisieJournalItemTable.this.table.getRowCount() == 1) {
                         editCellAt(e.getFirstRow(), 0);
                     } else {
                         editCellAt(e.getFirstRow(), 1);
+                    }
+                }
         this.panel = panel;
         final PropertyChangeListener lActiveAddButton = new PropertyChangeListener() {
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
-                controlPanel.setButtonAjouterEnabled(!panel.getBoxJournal().isEmpty() && !panel.getBoxMois().isEmpty());
+                SaisieJournalItemTable.this.controlPanel.setButtonAjouterEnabled(!panel.getBoxJournal().isEmpty() && !panel.getBoxMois().isEmpty());
+            }
         };
         panel.getBoxJournal().addModelListener("wantedID", lActiveAddButton);
         panel.getBoxMois().addModelListener("wantedID", lActiveAddButton);
                     if (selectedRow != null && !selectedRow.isUndefined()) {
                         Calendar c = Calendar.getInstance();
                         c.set(Calendar.DAY_OF_MONTH, 1);
                         c.set(Calendar.YEAR, (Integer) SaisieJournalItemTable.this.panel.spin.getValue());
                         c.set(Calendar.MONTH, SaisieJournalItemTable.this.panel.getSelectedMonth());
-                        rangedIntegerTableCellEditor.setMax(c.getActualMaximum(Calendar.DAY_OF_MONTH));
+                        SaisieJournalItemTable.this.rangedIntegerTableCellEditor.setMax(c.getActualMaximum(Calendar.DAY_OF_MONTH));
+                    }
+                }
+            }
         };
     public void refreshTotal() {
         long totalD = 0L;
         long totalC = 0L;
-        for (int i = 0; i < table.getRowCount(); i++) {
+        for (int i = 0; i < this.table.getRowCount(); i++) {
-            Long c = (Long) table.getRowValuesTableModel().getValueAt(i, table.getRowValuesTableModel().getColumnForField("DEBIT"));
+            Number c = (Number) this.table.getRowValuesTableModel().getValueAt(i, this.table.getRowValuesTableModel().getColumnForField("DEBIT"));
-            Long d = (Long) table.getRowValuesTableModel().getValueAt(i, table.getRowValuesTableModel().getColumnForField("CREDIT"));
+            Number d = (Number) this.table.getRowValuesTableModel().getValueAt(i, this.table.getRowValuesTableModel().getColumnForField("CREDIT"));
             if (c != null) {
-                totalC += c;
+                totalC += c.longValue();
+            }
             if (d != null) {
-                totalD += d;
+                totalD += d.longValue();
+            }
+        }
         this.labelTotalCredit.setText(GestionDevise.currencyToString(totalC));
         this.labelTotalDebit.setText(GestionDevise.currencyToString(totalD));
         long totalD = 0L;
         long totalC = 0L;
         boolean cptOK = true;
         String lib = null;
-        for (int i = 0; i < table.getRowCount(); i++) {
+        for (int i = 0; i < this.table.getRowCount(); i++) {
-            Long c = (Long) table.getRowValuesTableModel().getValueAt(i, table.getRowValuesTableModel().getColumnForField("DEBIT"));
+            Number c = (Number) this.table.getRowValuesTableModel().getValueAt(i, this.table.getRowValuesTableModel().getColumnForField("DEBIT"));
-            Long d = (Long) table.getRowValuesTableModel().getValueAt(i, table.getRowValuesTableModel().getColumnForField("CREDIT"));
+            Number d = (Number) this.table.getRowValuesTableModel().getValueAt(i, this.table.getRowValuesTableModel().getColumnForField("CREDIT"));
             if (c != null) {
-                totalC += c;
+                totalC += c.longValue();
+            }
             if (d != null) {
-                totalD += d;
+                totalD += d.longValue();
+            }
             if (lib == null) {
-                lib = (String) table.getRowValuesTableModel().getValueAt(i, table.getRowValuesTableModel().getColumnForField("NOM"));
+                lib = (String) this.table.getRowValuesTableModel().getValueAt(i, this.table.getRowValuesTableModel().getColumnForField("NOM"));
+            }
-            String cptNUmber = (String) table.getRowValuesTableModel().getValueAt(i, table.getRowValuesTableModel().getColumnForField("NUMERO"));
+            String cptNUmber = (String) this.table.getRowValuesTableModel().getValueAt(i, this.table.getRowValuesTableModel().getColumnForField("NUMERO"));
             cptOK = cptOK && cptNUmber != null && ComptePCESQLElement.isExist(cptNUmber);
+        }
         return totalD + totalC != 0 && totalD == totalC && cptOK;
+    }
     private Tuple2<Date, String> getDateAndLabelFromSaisie() {
         int day = 1;
         String lib = null;
-        for (int i = 0; i < table.getRowCount(); i++) {
+        for (int i = 0; i < this.table.getRowCount(); i++) {
-            day = (Integer) table.getRowValuesTableModel().getValueAt(i, table.getRowValuesTableModel().getColumnForField("JOUR"));
+            day = (Integer) this.table.getRowValuesTableModel().getValueAt(i, this.table.getRowValuesTableModel().getColumnForField("JOUR"));
             if (lib == null) {
-                lib = (String) table.getRowValuesTableModel().getValueAt(i, table.getRowValuesTableModel().getColumnForField("NOM"));
+                lib = (String) this.table.getRowValuesTableModel().getValueAt(i, this.table.getRowValuesTableModel().getColumnForField("NOM"));
+            }
+        }
         // Create saisieKM
         Calendar c = Calendar.getInstance();
         c.set(Calendar.YEAR, SaisieJournalItemTable.this.panel.getSelectedYear());
         c.set(Calendar.DAY_OF_MONTH, day);
         return Tuple2.create(c.getTime(), lib);
+    }
     public void montantValid(final SQLRowValues defaultRowVals, final boolean fromAnalytique, final JTextField textPiece) {
-        System.err.println("Enter");
         final SQLRowValues vals = SaisieJournalItemTable.this.table.getSelectedRowValues();
         final int selectedRow = SaisieJournalItemTable.this.table.getSelectedRow();
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {
-                if (boxAutoInsert.isSelected() && isSaisieValid()) {
+                if (SaisieJournalItemTable.this.boxAutoInsert.isSelected() && isSaisieValid()) {
                     if (SaisieJournalItemTable.this.panel.getSelectedJournal() == SQLRow.NONEXISTANT_ID || SaisieJournalItemTable.this.panel.getSelectedMonth() == -1) {
                         JOptionPane.showMessageDialog(SaisieJournalItemTable.this.panel, "Impossible de créer la saisie si aucun journal ou aucun mois n'est sélectionné!");
                     } else {
                         createSaisie(defaultRowVals, textPiece);
+                    }
                 } else {
+                    if (!fromAnalytique && !SaisieJournalItemTable.this.hideAnalytique && vals.getString("NUMERO") != null
-                    if (!fromAnalytique && !hideAnalytique && vals.getString("NUMERO") != null && (vals.getString("NUMERO").startsWith("6") || vals.getString("NUMERO").startsWith("7"))) {
+                            && (vals.getString("NUMERO").startsWith("6") || vals.getString("NUMERO").startsWith("7"))) {
                         // Update montant
                         Collection<SQLRowValues> rowsLinked = vals.getReferentRows(vals.getTable().getTable("ASSOCIATION_ANALYTIQUE"));
                         long montant = vals.getLong("DEBIT") - vals.getLong("CREDIT");
                         for (SQLRowValues sqlRowValues : rowsLinked) {
                             sqlRowValues.put("MONTANT", sqlRowValues.getBigDecimal("POURCENT").movePointLeft(2).multiply(new BigDecimal(montant), DecimalUtils.HIGH_PRECISION)
                                     .setScale(0, RoundingMode.HALF_UP).longValue());
+                        }
-                        editCellAt(selectedRow, table.getRowValuesTableModel().getColumnForField("ANALYTIQUE"));
+                        editCellAt(selectedRow, SaisieJournalItemTable.this.table.getRowValuesTableModel().getColumnForField("ANALYTIQUE"));
                     } else {
                         long l = getContrepartie();
                         SQLRowValues rowVals = new SQLRowValues(defaultRowVals);
                         if (l > 0) {
         rowVAlsKM.put("ID_JOURNAL", SaisieJournalItemTable.this.panel.getSelectedJournal());
         int id;
         try {
             id = rowVAlsKM.insert().getID();
-            table.updateField("ID_SAISIE_KM", id);
+            this.table.updateField("ID_SAISIE_KM", id);
-            table.clear();
+            this.table.clear();
             GenerationMvtSaisieKm gen = new GenerationMvtSaisieKm(id);
             int idMvt = gen.genereMouvement();
             // maj de l'id du mouvement correspondant
             SQLRowValues rowValsKMMvt = new SQLRowValues(SaisieJournalItemTable.this.table.getRowValuesTableModel().getSQLElement().getTable().getForeignTable("ID_SAISIE_KM"));
-            rowValsKMMvt.put("ID_MOUVEMENT", new Integer(idMvt));
+            rowValsKMMvt.put("ID_MOUVEMENT", Integer.valueOf(idMvt));
             rowValsKMMvt.update(id);
             defaultRowVals.put("NOM_PIECE", "");
             defaultRowVals.put("NOM_ECRITURE", "");
-            table.getRowValuesTableModel().addNewRow();
+            this.table.getRowValuesTableModel().addNewRow();
             pieceText.setText("");
         } catch (SQLException e) {
             e.printStackTrace();
+        }
         final RowValuesTableModel model = this.table.getRowValuesTableModel();
         final int creditIndex = model.getColumnIndexForElement(getCreditElement());
         final int debitIndex = model.getColumnIndexForElement(getDebitElement());
         for (int i = 0; i < this.table.getRowCount(); i++) {
             if (model.isRowValid(i)) {
-                final Long fTc = (Long) model.getValueAt(i, creditIndex);
+                final Number fTc = (Number) model.getValueAt(i, creditIndex);
                 if (fTc != null) {
                     totalCred += fTc.longValue();
+                }
-                final Long fTd = (Long) model.getValueAt(i, debitIndex);
+                final Number fTd = (Number) model.getValueAt(i, debitIndex);
                 if (fTd != null) {
                     totalDeb += fTd.longValue();
+                }
+            }
+        }
     public void fillEmptyEntryLabel(String previousText, String text) {
         assert SwingUtilities.isEventDispatchThread();
         if (text == null)
             return;
-        RowValuesTableModel model = table.getRowValuesTableModel();
+        RowValuesTableModel model = this.table.getRowValuesTableModel();
         int size = model.getRowCount();
         for (int i = 0; i < size; i++) {
             SQLRowValues r = model.getRowValuesAt(i);
             if (r.getString("NOM_ECRITURE") == null || r.getString("NOM_ECRITURE").trim().isEmpty() || r.getString("NOM_ECRITURE").trim().equals(previousText)) {
                 r.put("NOM_ECRITURE", text);
+            }
+        }
         model.fireTableDataChanged();
+    }
+    @Override
     public void mousePressed(final MouseEvent e) {
         final int rowSel = this.table.getSelectedRow();
         if (e.getButton() == MouseEvent.BUTTON3 && rowSel >= 0 && rowSel < this.table.getRowCount()) {
             final JPopupMenu menuDroit = new JPopupMenu();
             menuDroit.show(e.getComponent(), e.getPoint().x, e.getPoint().y);
             menuDroit.setVisible(true);
+        }
+    }
+    @Override
     public void mouseReleased(final MouseEvent e) {
+        // Nothing
+    }
+    @Override
     public void mouseClicked(final MouseEvent e) {
+        // Nothing
+    }
+    @Override
     public void mouseEntered(final MouseEvent e) {
+        // Nothing
+    }
+    @Override
     public void mouseExited(final MouseEvent e) {
+        // Nothing
+    }
     private void cloneLine(int row) {
         if (row < 0) {
-            System.err.println("RowValuesTableControlPanel.cloneLine() wrong selected line, index = " + row);
-            Thread.dumpStack();
             return;
+        }
         SQLRowValues rowVals = this.table.getRowValuesTableModel().getRowValuesAt(row);
         SQLRowValues rowValsBis = rowVals.deepCopy();

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/ui/SaisieJournalItemTable.java @ 174 - Rev 174 → 177