Author: mallon Date: 2012-08-09 16:19:55 +0200 (Thu, 09 Aug 2012) New Revision: 3594 Url: http://chorem.org/repositories/revision/lima/3594 Log: fixes #751 Correction sur les decorateurs des objets contenus par les listes deroulantes. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaDecoratorProvider.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java trunk/lima-swing/src/main/resources/log4j.properties 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-08-09 12:56:08 UTC (rev 3593) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaDecoratorProvider.java 2012-08-09 14:19:55 UTC (rev 3594) @@ -42,12 +42,12 @@ registerJXPathDecorator(EntryBook.class, "${code}$s - ${label}$s"); - registerJXPathDecorator( + registerMultiJXPathDecorator( FiscalPeriod.class, - "${beginDate}$td/%1$tm/%1$tY - ${endDate}$td/%1$tm/%1$tY"); + "${beginDate}$td/%1$tm/%1$tY#${endDate}$td/%2$tm/%2$tY", "#"," - "); - registerJXPathDecorator( + registerMultiJXPathDecorator( FinancialPeriod.class, - "${beginDate}$td/%1$tm/%1$tY - ${endDate}$td/%1$tm/%1$tY"); + "${beginDate}$td/%1$tm/%1$tY#${endDate}$td/%2$tm/%2$tY", "#"," - "); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java 2012-08-09 12:56:08 UTC (rev 3593) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java 2012-08-09 14:19:55 UTC (rev 3594) @@ -37,6 +37,7 @@ import org.chorem.lima.business.api.FiscalPeriodService; import org.chorem.lima.business.api.ImportService; import org.chorem.lima.entity.FiscalPeriod; +import org.chorem.lima.entity.FiscalPeriodImpl; import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.financialperiod.FinancialPeriodTableModel; @@ -92,7 +93,7 @@ public void setSelectedItem(Object anItem) { if (log.isDebugEnabled()) { - log.debug("Beginning and end dates of first fiscal period : " + ((FiscalPeriod)getElementAt(0)).getBeginDate() + ", " + ((FiscalPeriod)getElementAt(0)).getEndDate()); + log.debug("Beginning and end dates of first fiscal period : " + ((FiscalPeriod) getElementAt(0)).getBeginDate() + ", " + ((FiscalPeriod) getElementAt(0)).getEndDate()); } selectedFiscalPeriod = (FiscalPeriod)anItem; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java 2012-08-09 12:56:08 UTC (rev 3593) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java 2012-08-09 14:19:55 UTC (rev 3594) @@ -131,10 +131,13 @@ LimaRendererUtil.newDecoratorListCellRenderer(FiscalPeriod.class); final JComboBox fiscalPeriod = new JComboBox(fiscalModel); fiscalPeriod.setRenderer(renderer); + fiscalPeriod.setEditable(false); if (log.isDebugEnabled()) { - log.debug("Fiscal period of combo box : " + ((FiscalPeriod)fiscalPeriod.getItemAt(0)).getBeginDate() + " - " + ((FiscalPeriod)fiscalPeriod.getItemAt(0)).getEndDate() ); + log.debug("First fiscal period of combo box : " + ((FiscalPeriod)fiscalPeriod.getItemAt(0)).getBeginDate() + " - " + ((FiscalPeriod)fiscalPeriod.getItemAt(0)).getEndDate() ); + log.debug("Second fiscal period of combo box : " + ((FiscalPeriod)fiscalPeriod.getItemAt(1)).getBeginDate() + " - " + ((FiscalPeriod)fiscalPeriod.getItemAt(1)).getEndDate() ); } + ActionListener fiscalPeriodActionListener = new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -150,14 +153,15 @@ fiscalPeriod.addActionListener(fiscalPeriodActionListener); removeAll(); add(fiscalPeriod); + break; case FINANCIAL_PERIOD: FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(); - renderer = + ListCellRenderer rendererFinancialPeriod = LimaRendererUtil.newDecoratorListCellRenderer(FinancialPeriod.class); final JComboBox financialPeriod = new JComboBox(financialModel); - financialPeriod.setRenderer(renderer); + financialPeriod.setRenderer(rendererFinancialPeriod); financialPeriod.setEditable(false); if (log.isDebugEnabled()) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2012-08-09 12:56:08 UTC (rev 3593) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2012-08-09 14:19:55 UTC (rev 3594) @@ -91,6 +91,11 @@ } public void setEndDate(Date endDate) { + + if (log.isDebugEnabled()) { + log.debug("End date passed : " + endDate); + } + financialTransactionSearch.setEndDate(endDate); } Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-08-09 12:56:08 UTC (rev 3593) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-08-09 14:19:55 UTC (rev 3594) @@ -52,4 +52,5 @@ log4j.logger.org.chorem.lima.ui.financialtransaction.FinancialTransactionViewHandler=DEBUG log4j.logger.org.chorem.lima.entity.FinancialTransactionDAOImpl=DEBUG log4j.logger.org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel=DEBUG -log4j.logger.org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionPeriodSearchPanel=DEBUG \ No newline at end of file +log4j.logger.org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionPeriodSearchPanel=DEBUG +log4j.logger.org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchViewHandler=DEBUG \ No newline at end of file