Author: glorieux Date: 2009-12-17 09:47:32 +0100 (Thu, 17 Dec 2009) New Revision: 2755 Modified: trunk/lima-main/src/main/java/org/chorem/lima/DataManager.java Log: Modification of DataManager for addperiod. Modified: trunk/lima-main/src/main/java/org/chorem/lima/DataManager.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/DataManager.java 2009-12-17 08:46:51 UTC (rev 2754) +++ trunk/lima-main/src/main/java/org/chorem/lima/DataManager.java 2009-12-17 08:47:32 UTC (rev 2755) @@ -26,9 +26,9 @@ import org.chorem.lima.table.model.TransactionDataTableModel; import org.chorem.lima.tree.model.AccountTreeTableModel; import javax.swing.JProgressBar; - import java.util.List; -import java.util.LinkedList; +import org.chorem.lima.service.PeriodService; +import org.chorem.lima.service.ServiceFactory; /** * Cette classe permet de gérer les données de Lima. Chaque type de données @@ -77,7 +77,7 @@ if (closureModel == null) { /** Services */ // Création de la liste des périodes - LinkedList<PeriodDTO> listPeriodDTO = new LinkedList<PeriodDTO>(); + List<PeriodDTO> listPeriodDTO = LimaContext.getContext().getNeogiaFactory().getPeriodService().getAllPeriod(getStatus()); // Parcourt toutes les périodes (2007 / 2008 / etc) for (PeriodDTO period : getPeriodes()) { @@ -165,15 +165,19 @@ return transactionModel; } - /** * @return */ public List<PeriodDTO> getPeriodes() { if (periodes == null) { /** Services */ - periodes = LimaContext.getContext().getNeogiaFactory().getPeriodService().getAllPeriod( - getStatus()); + LimaContext context = LimaContext.getContext(); + ServiceFactory factory = context.getNeogiaFactory(); + PeriodService periodService =factory.getPeriodService(); + status = getStatus(); + periodes= periodService.getAllPeriod(status); +// periodes = LimaContext.getContext().getNeogiaFactory().getPeriodService().getAllPeriod( +// getStatus()); } return periodes; } @@ -221,11 +225,11 @@ } public PeriodDTO getCurrentPeriod() { - return currentPeriod == null ? getPeriodes().get(0) : currentPeriod; + return (currentPeriod == null && !getPeriodes().isEmpty()) ? getPeriodes().get(0) : currentPeriod; } public void setCurrentPeriod(PeriodDTO currentPeriod) { - this.currentPeriod = currentPeriod; + this.currentPeriod = currentPeriod; } public boolean isPeriodSelected() {