Author: tchemit Date: 2012-09-18 17:59:06 +0200 (Tue, 18 Sep 2012) New Revision: 3647 Url: http://chorem.org/repositories/revision/lima/3647 Log: fixes #810: Patch affichage du nom de compte (using Decorator API) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaDecoratorProvider.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/FinancialTransactionSearchTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaDecoratorProvider.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaDecoratorProvider.java 2012-09-18 15:51:37 UTC (rev 3646) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaDecoratorProvider.java 2012-09-18 15:59:06 UTC (rev 3647) @@ -24,9 +24,11 @@ */ package org.chorem.lima.ui; +import org.chorem.lima.entity.Account; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FiscalPeriod; +import org.nuiton.util.decorator.Decorator; import org.nuiton.util.decorator.DecoratorProvider; /** @@ -41,6 +43,7 @@ protected void loadDecorators() { registerJXPathDecorator(EntryBook.class, "${code}$s - ${label}$s"); + registerJXPathDecorator(Account.class, "${accountNumber}$s - ${label}$s"); registerMultiJXPathDecorator( FiscalPeriod.class, 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 2012-09-18 15:51:37 UTC (rev 3646) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-09-18 15:59:06 UTC (rev 3647) @@ -27,11 +27,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.lima.LimaContext; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.service.LimaServiceFactory; +import org.nuiton.util.decorator.Decorator; +import org.nuiton.util.decorator.DecoratorProvider; import javax.swing.table.AbstractTableModel; import java.math.BigDecimal; @@ -59,8 +62,18 @@ protected List<Object> transactionAndEntries; + /** + * To decorate account objects. + */ + protected final Decorator<Account> accountDecorator; + public FinancialTransactionTableModel() { - financialTransactionService = LimaServiceFactory.getService(FinancialTransactionService.class); + financialTransactionService = + LimaServiceFactory.getService(FinancialTransactionService.class); + + DecoratorProvider decoratorProvider = + LimaContext.get().getDecoratorProvider(); + accountDecorator = decoratorProvider.getDecoratorByType(Account.class); } public void setTransactionAndEntries(List<Object> transactionAndEntries) { @@ -190,12 +203,11 @@ result = currentEntry.getVoucher(); break; case 2: // account - if (currentEntry.getAccount() != null) { + if (currentEntry.getAccount() == null) { + result = null; + } else { Account acc = currentEntry.getAccount(); - result = acc.getAccountNumber() + " - " - + acc.getLabel(); - } else { - result = null; + result = accountDecorator.toString(acc); } break; case 3: Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2012-09-18 15:51:37 UTC (rev 3646) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2012-09-18 15:59:06 UTC (rev 3647) @@ -37,6 +37,7 @@ import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.lima.LimaContext; import org.chorem.lima.beans.FinancialTransactionSearch; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.FinancialPeriodService; @@ -50,6 +51,8 @@ import org.chorem.lima.entity.FinancialTransactionImpl; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; +import org.nuiton.util.decorator.Decorator; +import org.nuiton.util.decorator.DecoratorProvider; /** * Basic transaction table model. @@ -86,7 +89,12 @@ protected List<Object> cacheDataList; + /** + * To decorate account objects. + */ + protected final Decorator<Account> accountDecorator; + /** * Model constructor. * <p/> @@ -101,6 +109,9 @@ financialPeriodService = LimaServiceFactory.getService( FinancialPeriodService.class); + DecoratorProvider decoratorProvider = + LimaContext.get().getDecoratorProvider(); + accountDecorator = decoratorProvider.getDecoratorByType(Account.class); } /** @@ -280,12 +291,11 @@ result = currentEntry.getVoucher(); //Voucher break; case 3: // account - if (currentEntry.getAccount() != null) { + if (currentEntry.getAccount() == null) { + result = null; + } else { Account acc = currentEntry.getAccount(); - result = acc.getAccountNumber() + " - " - + acc.getLabel(); - } else { - result = null; + result = accountDecorator.toString(acc); } break; case 4: 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 2012-09-18 15:51:37 UTC (rev 3646) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2012-09-18 15:59:06 UTC (rev 3647) @@ -35,6 +35,7 @@ import javax.swing.table.AbstractTableModel; +import org.chorem.lima.LimaContext; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.business.utils.EntryComparator; @@ -45,6 +46,8 @@ import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; +import org.nuiton.util.decorator.Decorator; +import org.nuiton.util.decorator.DecoratorProvider; /** * Basic transaction table model. @@ -53,10 +56,6 @@ * * @author ore * @author chatellier - * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : $Author$ */ public class FinancialTransactionUnbalancedTableModel extends AbstractTableModel implements ServiceListener { @@ -73,20 +72,19 @@ protected List<Object> cacheDataList; /** - * collection - * <p/> - * <p/> - * /** - * Model constructor. - * <p/> - * Just init service proxies. + * To decorate account objects. */ + protected final Decorator<Account> accountDecorator; + public FinancialTransactionUnbalancedTableModel() { - /* Services */ financialTransactionService = LimaServiceFactory.getService( FinancialTransactionService.class); LimaServiceFactory.addServiceListener(financialTransactionService, this); + + DecoratorProvider decoratorProvider = + LimaContext.get().getDecoratorProvider(); + accountDecorator = decoratorProvider.getDecoratorByType(Account.class); } /** @@ -268,12 +266,11 @@ result = currentEntry.getVoucher(); break; case 3: // account - if (currentEntry.getAccount() != null) { - Account acc = currentEntry.getAccount(); - result = acc.getAccountNumber() + " - " - + acc.getLabel(); - } else { + if (currentEntry.getAccount() == null) { result = null; + } else { + Account acc = currentEntry.getAccount(); + result = accountDecorator.toString(acc); } break; case 4: Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2012-09-18 15:51:37 UTC (rev 3646) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2012-09-18 15:59:06 UTC (rev 3647) @@ -25,8 +25,12 @@ package org.chorem.lima.ui.lettering; +import org.chorem.lima.LimaContext; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; +import org.nuiton.util.decorator.Decorator; +import org.nuiton.util.decorator.DecoratorProvider; + import javax.swing.table.AbstractTableModel; import java.math.BigDecimal; import java.util.Date; @@ -42,10 +46,6 @@ * * @author ore * @author chatellier - * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : $Author$ */ public class LetteringTableModel extends AbstractTableModel{ @@ -62,6 +62,17 @@ protected List<Date> datesEntree; protected List<String> entryBooks; + /** + * To decorate account objects. + */ + protected final Decorator<Account> accountDecorator; + + public LetteringTableModel() { + DecoratorProvider decoratorProvider = + LimaContext.get().getDecoratorProvider(); + accountDecorator = decoratorProvider.getDecoratorByType(Account.class); + } + public List<Entry> getEntries(){ return entries; } @@ -188,10 +199,9 @@ case 0: result = datesEntree.get(row); // date break; - case 1: + case 1: // account Account acc = currentEntry.getAccount(); - result = acc.getAccountNumber() + " - " - + acc.getLabel(); + result = accountDecorator.toString(acc); break; case 2: result = currentEntry.getVoucher();