Author: jpepin Date: 2010-05-14 15:46:33 +0200 (Fri, 14 May 2010) New Revision: 2899 Url: http://chorem.org/repositories/revision/lima/2899 Log: Nettoyage du code, suppression d'une classe inutile. Removed: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodEntryBook.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/FinancialPeriodService.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/model/FiscalPeriodTable.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/FinancialPeriodService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/FinancialPeriodService.java 2010-05-14 12:45:50 UTC (rev 2898) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/FinancialPeriodService.java 2010-05-14 13:46:33 UTC (rev 2899) @@ -48,6 +48,8 @@ /** Methodes for closedperiodicentrybook */ + List<ClosedPeriodicEntryBook> getAllClosedPeriodicEntryBooks() throws LimaException; + ClosedPeriodicEntryBook getClosedPeriodicEntryBook(EntryBook entryBook, FinancialPeriod financialPeriod) throws LimaException; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2010-05-14 12:45:50 UTC (rev 2898) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2010-05-14 13:46:33 UTC (rev 2899) @@ -264,6 +264,40 @@ } } + + @Override + public List<ClosedPeriodicEntryBook> getAllClosedPeriodicEntryBooks() throws LimaException { + + List<ClosedPeriodicEntryBook> result = null; + + TopiaContext transaction = null; + try { + // basic check done, make check in database + // TODO move it into JTA + transaction = rootContext.beginTransaction(); + + ClosedPeriodicEntryBookDAO closedPeriodicEntryBookDAO + = LimaCallaoDAOHelper.getClosedPeriodicEntryBookDAO(transaction); + result = closedPeriodicEntryBookDAO.findAll(); + + // FOR NO LAZY EXCEPTION + for (ClosedPeriodicEntryBook closedPeriodicEntryBook : result) { + closedPeriodicEntryBook.getEntryBook().getLabel(); + closedPeriodicEntryBook.getFinancialPeriod().getBeginDate(); + } + + // commit + transaction.commitTransaction(); + } + catch (TopiaException ex) { + doCatch(transaction, ex, log); + } + finally { + doFinally(transaction, log); + } + + return result; + } Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodEntryBook.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodEntryBook.java 2010-05-14 12:45:50 UTC (rev 2898) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodEntryBook.java 2010-05-14 13:46:33 UTC (rev 2899) @@ -1,32 +0,0 @@ -/* *##% Lima Swing - * Copyright (C) 2008 - 2010 CodeLutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * ##%*/ - -package org.chorem.lima.ui.financialperiod; - -import org.chorem.lima.entity.EntryBook; -import org.chorem.lima.entity.FinancialPeriod; - -/** Object to encapsulate entrybook and financialperiod */ -public class FinancialPeriodEntryBook{ - FinancialPeriod financialPeriod; - EntryBook entryBook; - FinancialPeriodEntryBook(FinancialPeriod financialPeriod, EntryBook entryBook){ - this.financialPeriod=financialPeriod; - this.entryBook=entryBook; - } -} \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java 2010-05-14 12:45:50 UTC (rev 2898) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java 2010-05-14 13:46:33 UTC (rev 2899) @@ -45,11 +45,13 @@ @Override public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { - FinancialPeriodEntryBook financialPeriodEntryBook - = (FinancialPeriodEntryBook) model.getElementAt(adapter.row); + ClosedPeriodicEntryBook closedPeriodicEntryBook + = (ClosedPeriodicEntryBook) model.getElementAt(adapter.row); + // FinancialPeriodEntryBook financialPeriodEntryBook + // = (FinancialPeriodEntryBook) model.getElementAt(adapter.row); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM"); int month = Integer.parseInt(simpleDateFormat.format( - financialPeriodEntryBook.financialPeriod.getBeginDate())); + closedPeriodicEntryBook.getFinancialPeriod().getBeginDate())); // true if month is even return ((month % 2)==0); @@ -65,11 +67,11 @@ @Override public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { - FinancialPeriodEntryBook financialPeriodEntryBook = (FinancialPeriodEntryBook) model.getElementAt(adapter.row); ClosedPeriodicEntryBook closedPeriodicEntryBook = new ClosedPeriodicEntryBookImpl(); + ClosedPeriodicEntryBook selectedClosedPeriodicEntryBook = (ClosedPeriodicEntryBook) model.getElementAt(adapter.row); // true if locked try { - closedPeriodicEntryBook = financialPeriodService.getClosedPeriodicEntryBook(financialPeriodEntryBook.entryBook, financialPeriodEntryBook.financialPeriod); + closedPeriodicEntryBook = financialPeriodService.getClosedPeriodicEntryBook(selectedClosedPeriodicEntryBook.getEntryBook(), selectedClosedPeriodicEntryBook.getFinancialPeriod()); } catch (LimaException eee) { log.debug("Can't get closePeriodicEntryBook",eee); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2010-05-14 12:45:50 UTC (rev 2898) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2010-05-14 13:46:33 UTC (rev 2899) @@ -64,7 +64,8 @@ protected FinancialPeriodService financialPeriodService; /** Datas cache */ - protected List<FinancialPeriodEntryBook> cacheDataList; + //protected List<FinancialPeriodEntryBook> cacheDataList; + protected List<ClosedPeriodicEntryBook> cacheDataList; public FinancialPeriodTableModel() { fiscalPeriodService = LimaServiceFactory.getInstance().getFiscalPeriodService(); @@ -129,7 +130,7 @@ return false; } - public FinancialPeriodEntryBook getFinancialPeriodAtRow(int row) throws LimaException { + public ClosedPeriodicEntryBook getFinancialPeriodAtRow(int row) throws LimaException { return cacheDataList.get(row); } @@ -147,14 +148,11 @@ public Object getValueAt(int rowIndex, int columnIndex) { Object result = null; - try { - FinancialPeriodEntryBook financialPeriodEntryBook + ClosedPeriodicEntryBook closedPeriodicEntryBook = cacheDataList.get(rowIndex); - if (financialPeriodEntryBook != null){ - FinancialPeriod financialPeriod - = financialPeriodEntryBook.financialPeriod; - EntryBook entryBook = financialPeriodEntryBook.entryBook; + if (closedPeriodicEntryBook != null){ + EntryBook entryBook = closedPeriodicEntryBook.getEntryBook(); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MMMMM yyyy"); @@ -162,13 +160,13 @@ switch (columnIndex) { case 0: result = StringUtils.capitalize(simpleDateFormat. - format(financialPeriod.getBeginDate())); + format(closedPeriodicEntryBook.getFinancialPeriod().getBeginDate())); break; case 1: result = entryBook.getCode()+" - "+entryBook.getLabel(); break; case 2: - if(financialPeriodService.getClosedPeriodicEntryBook(entryBook, financialPeriod).getLocked()){ + if(closedPeriodicEntryBook.getLocked()){ result = _("lima.close"); } else{ @@ -177,56 +175,26 @@ break; } } - } - catch (LimaException eee){ - if (log.isDebugEnabled()){ - log.debug("Can't get value at row", eee ); - } - } return result; } public void getDataList(){ - - List<FinancialPeriodEntryBook> results - = new ArrayList<FinancialPeriodEntryBook>(); - List<FinancialPeriod> periods = new ArrayList<FinancialPeriod>(); - List<EntryBook> entrybooks = new ArrayList<EntryBook>(); - + List<ClosedPeriodicEntryBook> results = new ArrayList<ClosedPeriodicEntryBook>(); try { - // get all fiscal period unblocked - List<FiscalPeriod> fiscalPeriods - = fiscalPeriodService.getAllUnblockedFiscalPeriods(); - for (FiscalPeriod fiscalPeriod : fiscalPeriods) { - // get all financial period from unblocked fiscal period - periods.addAll(fiscalPeriod.getFinancialPeriod()); + results = financialPeriodService.getAllClosedPeriodicEntryBooks(); + } catch (LimaException eee){ + if (log.isDebugEnabled()){ + log.debug("Can't get closedperiodicentrybook list", eee ); } - // get all entrybook - entrybooks = entryBookService.getAllEntryBooks(); - // build the list with entrybook and financial period - for (FinancialPeriod period : periods) { - for (EntryBook entryB : entrybooks){ - FinancialPeriodEntryBook financialPeriodEntryBook - = new FinancialPeriodEntryBook(period, entryB); - results.add(financialPeriodEntryBook); - } - } - } - catch (LimaException eee) { - if (log.isErrorEnabled()) { - log.debug("Can't update model", eee); - } - ErrorHelper.showErrorDialog("Can't get entrybook and financial period list"); - } cacheDataList=results; } - public void blockFinancialPeriod(FinancialPeriodEntryBook financialPeriodEntryBook) throws LimaException { - ClosedPeriodicEntryBook closedPeriodicEntryBook = - financialPeriodService.getClosedPeriodicEntryBook( + public void blockFinancialPeriod(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException { + /* ClosedPeriodicEntryBook closedPeriodicEntryBook = + financialPeriodService.getClosedPeriodicEntryBook( financialPeriodEntryBook.entryBook, - financialPeriodEntryBook.financialPeriod); + financialPeriodEntryBook.financialPeriod);*/ financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodicEntryBook); fireTableDataChanged(); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java 2010-05-14 12:45:50 UTC (rev 2898) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java 2010-05-14 13:46:33 UTC (rev 2899) @@ -26,6 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.LimaException; +import org.chorem.lima.entity.ClosedPeriodicEntryBook; import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.ui.fiscalperiod.FiscalPeriodView; import org.chorem.lima.util.ErrorHelper; @@ -56,12 +57,12 @@ // blocked it try { - FinancialPeriodEntryBook selectedFinancialPeriodEntryBook = model.getFinancialPeriodAtRow(selectedRow); + ClosedPeriodicEntryBook closedPeriodicEntryBook = model.getFinancialPeriodAtRow(selectedRow); int response = JOptionPane.showConfirmDialog(view, _("lima.question.financialperiod.blocked"), _("lima.question"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (response == JOptionPane.YES_OPTION) { - model.blockFinancialPeriod(selectedFinancialPeriodEntryBook); + model.blockFinancialPeriod(closedPeriodicEntryBook); } } catch (LimaException ex) { if (log.isErrorEnabled()) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/model/FiscalPeriodTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/model/FiscalPeriodTable.java 2010-05-14 12:45:50 UTC (rev 2898) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/model/FiscalPeriodTable.java 2010-05-14 13:46:33 UTC (rev 2899) @@ -20,20 +20,13 @@ import java.awt.Color; import java.awt.Component; -import java.text.SimpleDateFormat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.business.FinancialPeriodService; import org.chorem.lima.business.FiscalPeriodService; -import org.chorem.lima.business.LimaException; -import org.chorem.lima.entity.ClosedPeriodicEntryBook; -import org.chorem.lima.entity.ClosedPeriodicEntryBookImpl; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; -import org.chorem.lima.ui.financialperiod.FinancialPeriodEntryBook; import org.chorem.lima.ui.financialperiod.FinancialPeriodTableModel; -import org.chorem.lima.ui.financialperiod.FinancialPeriodViewHandler; import org.chorem.lima.ui.fiscalperiod.FiscalPeriodViewHandler; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.ColorHighlighter;