Author: mallon Date: 2012-07-20 11:01:02 +0200 (Fri, 20 Jul 2012) New Revision: 3541 Url: http://chorem.org/repositories/revision/lima/3541 Log: Correction du lien entre 'DateFilter' et 'LetteringFilter' : d?\195?\169sormais, 'LetteringFilter' h?\195?\169rite de 'DateFilter', permettant ainsi d'?\195?\169viter d'avoir ?\195?\160 poser un second 'propertyChange' sur l'objet 'DateFilter' ?\195?\160 l'origine dans 'LetteringFilter' (Composition). Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-callao/src/main/xmi/accounting.zargo trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-07-19 16:07:36 UTC (rev 3540) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-07-20 09:01:02 UTC (rev 3541) @@ -204,7 +204,7 @@ query += " and E.financialTransaction.transactionDate between :beginDate and :endDate " + " order by F.transactionDate, F." + FinancialTransaction.TOPIA_CREATE_DATE; - entries = context.findAll(query, "account", filter.getAccount().getAccountNumber() + "%", "beginDate", filter.getFiscalDateFilter().getDateStart(), "endDate", filter.getFiscalDateFilter().getDateEnd()); + entries = context.findAll(query, "account", filter.getAccount().getAccountNumber() + "%", "beginDate", filter.getDateStart(), "endDate", filter.getDateEnd()); return entries; } Modified: trunk/lima-callao/src/main/xmi/accounting.zargo =================================================================== (Binary files differ) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2012-07-19 16:07:36 UTC (rev 3540) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2012-07-20 09:01:02 UTC (rev 3541) @@ -85,7 +85,7 @@ </cell> <cell> <JXDatePicker id="pickerDebut" - onActionPerformed="filterModel.getFiscalDateFilter().setDateStart(pickerDebut.getDate())"/> + onActionPerformed="filterModel.setDateStart(pickerDebut.getDate())"/> </cell> </row> <row> @@ -94,7 +94,7 @@ </cell> <cell> <JXDatePicker id="pickerFin" - onActionPerformed="filterModel.getFiscalDateFilter().setDateEnd(pickerFin.getDate())"/> + onActionPerformed="filterModel.setDateEnd(pickerFin.getDate())"/> </cell> </row> </Table> 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-07-19 16:07:36 UTC (rev 3540) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-20 09:01:02 UTC (rev 3541) @@ -109,19 +109,6 @@ } }); - //FIXME Allon-11/07/2012 : mettre simplement deux dates au niveau de 'LetteringFilter' - //pour eviter d'avoir a poser un propertyChange supplementaire sur le 'DateFilter' - filter.getFiscalDateFilter().addPropertyChangeListener(new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - onBalanceChanged(null); - view.getLettringSelectionModel().clearSelection(); - updateAllEntries(); - onButtonModeChanged("all"); - } - }); - editModel.addPropertyChangeListener(new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { @@ -261,8 +248,8 @@ view.getPickerDebut().setDate(defaultDateBegFiscalPeriod); view.getPickerFin().setDate(defaultDateEndCurrent); - filter.getFiscalDateFilter().setDateStart(defaultDateBegFiscalPeriod); - filter.getFiscalDateFilter().setDateEnd(defaultDateEndCurrent); + filter.setDateStart(defaultDateBegFiscalPeriod); + filter.setDateEnd(defaultDateEndCurrent); filter.setDisplayUnlettred(true); updateAllEntries();