Author: mallon Date: 2012-08-20 17:52:18 +0200 (Mon, 20 Aug 2012) New Revision: 3623 Url: http://chorem.org/repositories/revision/lima/3623 Log: Correction concernant l equilibrage du panneau de lettrage Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-08-20 15:40:24 UTC (rev 3622) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-08-20 15:52:18 UTC (rev 3623) @@ -34,7 +34,6 @@ import org.chorem.lima.business.api.FinancialPeriodService; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.business.api.FiscalPeriodService; -import org.chorem.lima.business.ejb.FinancialTransactionServiceImpl; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.FiscalPeriod; @@ -49,7 +48,6 @@ import java.util.Date; import java.util.List; -import static org.nuiton.i18n.I18n._; /** * Handler associated with financial transaction view. @@ -139,8 +137,8 @@ BigDecimal secondSelectedEntryAmount = secondSelectedEntry.getAmount(); if ( secondSelectedEntry.getDebit() != firstSelectedEntry.getDebit() - && firstSelectedEntryAmount.subtract(secondSelectedEntryAmount).abs().compareTo(BigDecimal.ZERO) >=0 - && firstSelectedEntryAmount.subtract(secondSelectedEntryAmount).abs().compareTo(BigDecimal.ONE) <=0) { + && (firstSelectedEntryAmount.subtract(secondSelectedEntryAmount).abs().compareTo(BigDecimal.ZERO) >0 + && firstSelectedEntryAmount.subtract(secondSelectedEntryAmount).abs().compareTo(BigDecimal.ONE) <0) ) { onButtonModeChanged(buttonMode.EQUALIZED); } }else { @@ -234,14 +232,14 @@ BigDecimal debitVal = debit ? amount : BigDecimal.ZERO; BigDecimal creditVal = debit ? BigDecimal.ZERO : amount; - if (debitVal == BigDecimal.ZERO){ + if (debitVal.equals(BigDecimal.ZERO)){ - if (creditVal != BigDecimal.ZERO){ + if (creditVal.equals(BigDecimal.ZERO)){ editModel.setCredit(creditVal); editModel.setSolde(creditVal, true); } - }else if (creditVal == BigDecimal.ZERO){ + }else if (creditVal.equals(BigDecimal.ZERO)){ editModel.setDebit(debitVal); editModel.setSolde(debitVal, false); }else{