Author: mallon Date: 2012-07-30 12:17:08 +0200 (Mon, 30 Jul 2012) New Revision: 3554 Url: http://chorem.org/repositories/revision/lima/3554 Log: fixes #710 Ajout du surlignage en rouge des entrees ayant leur debit et credit egaux a zero, et correction du surlignage des transactions n ayant pas leur balance a zero. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java trunk/lima-swing/src/main/resources/log4j.properties Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-07-24 16:39:43 UTC (rev 3553) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-07-30 10:17:08 UTC (rev 3554) @@ -121,7 +121,7 @@ public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { boolean isHighlighted = false; - Object value = adapter.getValueAt(adapter.row, 8); + Object value = adapter.getValueAt(adapter.row, 6); if (value instanceof BigDecimal) { BigDecimal currentBalance = (BigDecimal) value; // can compare two BigDecimals with different scales @@ -133,10 +133,29 @@ return isHighlighted; } }; + + //To color in red entry with debit and credit equals to zero colorTransaction = new ColorHighlighter(predicate, new Color(255, 198, 209), null); addHighlighter(colorTransaction); + HighlightPredicate debitCreditZero = new HighlightPredicate() { + @Override + public boolean isHighlighted(Component renderer, + ComponentAdapter adapter) { + + Object valueDebit = adapter.getValueAt(adapter.row, 4); + Object valueCredit = adapter.getValueAt(adapter.row, 5); + + return (valueDebit.equals(BigDecimal.ZERO) || valueDebit.toString().equals("0.00")) + && (valueCredit.equals(BigDecimal.ZERO) || valueCredit.toString().equals("0.00")); + } + }; + + Highlighter entryDebitCreditZero = + new ColorHighlighter(debitCreditZero, new Color(255, 198, 209), null); + addHighlighter(entryDebitCreditZero); + } public FinancialTransactionViewHandler getHandler() { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-07-24 16:39:43 UTC (rev 3553) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-07-30 10:17:08 UTC (rev 3554) @@ -109,7 +109,7 @@ } // entry books - List<EntryBook> allEntryBooks = entryBookService.getAllEntryBooks(); + final List<EntryBook> allEntryBooks = entryBookService.getAllEntryBooks(); view.getEntryBookComboBoxModel().setObjects(allEntryBooks); if (log.isDebugEnabled()) { Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-07-24 16:39:43 UTC (rev 3553) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-07-30 10:17:08 UTC (rev 3554) @@ -42,4 +42,4 @@ log4j.logger.org.chorem.lima.ui.lettering.LetteringViewHandler=DEBUG log4j.logger.org.chorem.lima.ui.lettering.LettringSelectionModel=DEBUG log4j.logger.org.chorem.lima.ui.lettering.LetteringEditModel=DEBUG -log4j.logger.org.chorem.lima.ui.financialtransaction.FinancialTransactionTableModel=DEBUG +log4j.logger.org.chorem.lima.ui.financialtransaction.FinancialTransactionTableModel=DEBUG \ No newline at end of file