Author: vsalaun Date: 2011-05-18 16:26:46 +0200 (Wed, 18 May 2011) New Revision: 3133 Url: http://chorem.org/repositories/revision/lima/3133 Log: amelioration de la syntaxe du code Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java 2011-05-17 15:57:08 UTC (rev 3132) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java 2011-05-18 14:26:46 UTC (rev 3133) @@ -63,6 +63,8 @@ protected FinancialPeriodServiceMonitorable financialPeriodService; protected FiscalPeriod selectedFiscalPeriod; + + private boolean displayAllPeriods; /** * Constructor for locked period list. @@ -77,7 +79,10 @@ * @param all if {@code true}, display all available period, otherwize * display only locked ones */ - public FinancialPeriodComboBoxModel(boolean all) { + public FinancialPeriodComboBoxModel(boolean displayAllPeriods) { + + this.displayAllPeriods = displayAllPeriods; + financialPeriodService = LimaServiceFactory.getInstance().getService( FinancialPeriodServiceMonitorable.class); @@ -86,7 +91,7 @@ FiscalPeriodServiceMonitorable.class).addListener(this); LimaServiceFactory.getInstance().getService( ImportServiceMonitorable.class).addListener(this); - if (all) { + if (displayAllPeriods) { datasCache=getAllDataList(); } else { @@ -96,7 +101,13 @@ public void setFiscalPeriod(FiscalPeriod fiscalPeriod){ selectedFiscalPeriod=fiscalPeriod; - datasCache=getDataList(); + if (displayAllPeriods) { + datasCache=getAllDataList(); + } + else { + datasCache=getDataList(); + } + fireContentsChanged(this, 0, datasCache.size()); } @Override @@ -124,8 +135,7 @@ List<FinancialPeriod> result = null; try { if (selectedFiscalPeriod != null){ - result = (List<FinancialPeriod>) - selectedFiscalPeriod.getFinancialPeriod(); + result = financialPeriodService.getFinancialPeriods(selectedFiscalPeriod.getBeginDate(), selectedFiscalPeriod.getEndDate()); } else { result = financialPeriodService.getUnblockedFinancialPeriods(); @@ -144,8 +154,7 @@ List<FinancialPeriod> result = null; try { if (selectedFiscalPeriod != null){ - result = (List<FinancialPeriod>) - selectedFiscalPeriod.getFinancialPeriod(); + result = financialPeriodService.getFinancialPeriods(selectedFiscalPeriod.getBeginDate(), selectedFiscalPeriod.getEndDate()); } else { result = financialPeriodService.getAllFinancialPeriods(); @@ -162,6 +171,7 @@ public void refresh(){ datasCache = getDataList(); + System.out.println(datasCache); fireContentsChanged(this, 0, datasCache.size()); } @@ -173,7 +183,12 @@ @Override public void notifyMethod(String serviceName, String methodeName) { if (serviceName.contains("Period") || methodeName.contains("importAll")){ - refresh(); + if (displayAllPeriods) { + datasCache=getAllDataList(); + } + else { + datasCache=getDataList(); + } } } }