Author: vsalaun Date: 2011-05-06 18:08:00 +0200 (Fri, 06 May 2011) New Revision: 3103 Url: http://chorem.org/repositories/revision/lima/3103 Log: #364 remplacement des toutes les occurences de double utilisees dans les calculs par des BigDecimal Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -422,7 +422,7 @@ c.setHorizontalAlignment(Element.ALIGN_LEFT); t.addCell(c); //cell2 - if (grossAmount.doubleValue() != 0){ + if (grossAmount != BigDecimal.ZERO){ phrase = new Phrase(String.valueOf( grossAmount), normalFont); } @@ -431,7 +431,7 @@ } t.addCell(phrase); //cell 3 - if (provisionDeprecationAmount.doubleValue() != 0){ + if (provisionDeprecationAmount != BigDecimal.ZERO){ phrase = new Phrase(String.valueOf( provisionDeprecationAmount), normalFont); } @@ -442,7 +442,7 @@ //cell 4 BigDecimal solde = grossAmount; solde = solde.subtract(provisionDeprecationAmount); - if (solde.doubleValue() != 0){ + if (solde != BigDecimal.ZERO){ phrase = new Phrase(solde.toString(), normalFont); } else { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -246,7 +246,7 @@ entry.setAccount(account); BigDecimal debit = new BigDecimal(entryEBP.getDebit()); BigDecimal credit = new BigDecimal(entryEBP.getCredit()); - if (debit.doubleValue() == 0) { + if (debit == BigDecimal.ZERO) { entry.setDebit(false); entry.setAmount(credit); } else { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -146,7 +146,7 @@ solde = solde.add(debit); solde = solde.subtract(credit); - if (solde.doubleValue() > 0){ + if (solde.compareTo(BigDecimal.ZERO) == 1){ reportsDatas.setSoldeDebit(true); } solde = solde.abs(); @@ -235,7 +235,7 @@ solde = solde.add(debit); solde = solde.subtract(credit); - if (solde.doubleValue() > 0){ + if (solde.compareTo(BigDecimal.ZERO) == 1){ reportsDatas.setSoldeDebit(true); } solde = solde.abs(); @@ -308,7 +308,7 @@ solde = solde.add(debit); solde = solde.subtract(credit); - if (solde.doubleValue() > 0){ + if (solde.compareTo(BigDecimal.ZERO) == 1){ reportsDatas.setSoldeDebit(true); } @@ -385,7 +385,7 @@ //solde = debit - credit; solde = solde.add(debit); solde = solde.subtract(credit); - if (solde.doubleValue() > 0){ + if (solde.compareTo(BigDecimal.ZERO) == 1){ reportsDatas.setSoldeDebit(true); } solde = solde.abs(); @@ -484,7 +484,8 @@ amount = new BigDecimal(0); } if (movementedFilter){ - if (reportsDatas.getAmountCredit().doubleValue() != 0 || reportsDatas.getAmountDebit().doubleValue() != 0){ + if (reportsDatas.getAmountCredit() != BigDecimal.ZERO + || reportsDatas.getAmountDebit() != BigDecimal.ZERO) { // add balance sheet to balance trial balanceTrial.addReportsDatas(reportsDatas); } @@ -505,7 +506,7 @@ //solde = debit - credit; solde = solde.add(debit); solde = solde.subtract(credit); - if (solde.doubleValue() > 0){ + if (solde.compareTo(BigDecimal.ZERO) == 1){ balanceTrial.setSoldeDebit(true); } solde = solde.abs(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -138,7 +138,7 @@ view.amountSoldeLabel.setText(amountSolde.toString()); - if (amountSolde.doubleValue() == 0){ + if (amountSolde == BigDecimal.ZERO){ view.soldeLabel.setText(_("lima.common.solde")); } else { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -151,7 +151,7 @@ String.valueOf(amountSolde)); - if (amountSolde.doubleValue() == 0){ + if (amountSolde == BigDecimal.ZERO){ view.soldeLabel.setText(_("lima.common.solde")); } else { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -157,7 +157,7 @@ BigDecimal amountSolde = datasList.getAmountSolde(); view.amountSoldeLabel.setText(String.valueOf(amountSolde)); - if (amountSolde.doubleValue() == 0){ + if (amountSolde == BigDecimal.ZERO){ view.soldeLabel.setText(_("lima.common.solde")); } else { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -173,7 +173,7 @@ } break; case 1: - if (grossAmount.doubleValue() == 0){ + if (grossAmount == BigDecimal.ZERO){ result = null; } else { @@ -181,7 +181,7 @@ } break; case 2: - if (provisionDeprecationAmount.doubleValue() == 0){ + if (provisionDeprecationAmount == BigDecimal.ZERO){ result = null; } else { @@ -190,7 +190,7 @@ break; case 3: BigDecimal solde = grossAmount.subtract(provisionDeprecationAmount); - if (solde.doubleValue() == 0){ + if (solde == BigDecimal.ZERO) { result = null; } else { 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 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -131,7 +131,7 @@ Object value = adapter.getValueAt(adapter.row, 8); if (value instanceof BigDecimal) { BigDecimal currentBalance = (BigDecimal) value; - if (currentBalance.doubleValue() != 0) { + if (currentBalance != BigDecimal.ZERO) { isHighlighted = true; } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -169,10 +169,10 @@ result = Letter.class; break; case 6: - result = Double.class; + result = BigDecimal.class; break; case 7: - result = Double.class; + result = BigDecimal.class; break; case 8: result = BigDecimal.class; @@ -515,11 +515,11 @@ case 6: //FIXME jpepin 20101231 transtypage "superflu" pour éviter un bug de getColumnName // qui ne fonctionne plus avec les BigDecimal - currentEntry.setAmount(new BigDecimal((Double)value)); + currentEntry.setAmount(new BigDecimal((Long)value)); currentEntry.setDebit(true); break; case 7: - currentEntry.setAmount(new BigDecimal((Double)value)); + currentEntry.setAmount(new BigDecimal((Long)value)); currentEntry.setDebit(false); break; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -118,7 +118,7 @@ Object value = adapter.getValueAt(adapter.row, 8); if (value instanceof BigDecimal) { BigDecimal currentBalance = (BigDecimal) value; - if (currentBalance.doubleValue() != 0) { + if (currentBalance != BigDecimal.ZERO) { isHighlighted = true; } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -123,7 +123,7 @@ Object value = adapter.getValueAt(adapter.row, 8); if (value instanceof BigDecimal) { BigDecimal currentBalance = (BigDecimal) value; - if (currentBalance.doubleValue() != 0) { + if (currentBalance != BigDecimal.ZERO) { isHighlighted = true; } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -175,10 +175,10 @@ result = String.class; break; case 5: - result = Double.class; + result = BigDecimal.class; break; case 6: - result = Double.class; + result = BigDecimal.class; break; case 7: result = BigDecimal.class; @@ -435,11 +435,11 @@ case 5 : //FIXME jpepin 20101231 transtypage "superflu" pour éviter un bug de getColumnName // qui ne fonctionne plus avec les BigDecimal - currentEntry.setAmount(new BigDecimal((Double)value)); + currentEntry.setAmount(new BigDecimal((Long)value)); currentEntry.setDebit(true); break; case 6: - currentEntry.setAmount(new BigDecimal((Double)value)); + currentEntry.setAmount(new BigDecimal((Long)value)); currentEntry.setDebit(false); break; case 8: Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -172,7 +172,7 @@ view.amountSoldeLabel.setText( String.valueOf(amountSolde)); - if (amountSolde.doubleValue() == 0){ + if (amountSolde == BigDecimal.ZERO){ view.soldeLabel.setText(_("lima.common.solde")); } else { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -132,7 +132,7 @@ Object value = adapter.getValueAt(adapter.row, 8); if (value instanceof BigDecimal) { BigDecimal currentBalance = (BigDecimal) value; - if (currentBalance.doubleValue() != 0) { + if (currentBalance != BigDecimal.ZERO) { isHighlighted = true; } }