Author: jpepin Date: 2010-05-31 19:46:38 +0200 (Mon, 31 May 2010) New Revision: 2918 Url: http://chorem.org/repositories/revision/lima/2918 Log: Modification ajout notation ejb, servicefactory Added: trunk/lima-business/src/main/java/org/chorem/lima/business/AccountServiceLocal.java trunk/lima-business/src/main/java/org/chorem/lima/business/EntryBookServiceLocal.java trunk/lima-business/src/main/java/org/chorem/lima/business/FinancialPeriodServiceLocal.java trunk/lima-business/src/main/java/org/chorem/lima/business/FinancialTransactionServiceLocal.java trunk/lima-business/src/main/java/org/chorem/lima/business/FiscalPeriodServiceLocal.java trunk/lima-business/src/main/java/org/chorem/lima/business/ImportExportServiceLocal.java trunk/lima-business/src/main/java/org/chorem/lima/business/RecordServiceLocal.java trunk/lima-business/src/main/java/org/chorem/lima/business/ReportServiceLocal.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/AccountService.java trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/EntryBookService.java trunk/lima-business/src/main/java/org/chorem/lima/business/FinancialPeriodService.java trunk/lima-business/src/main/java/org/chorem/lima/business/FinancialTransactionService.java trunk/lima-business/src/main/java/org/chorem/lima/business/FiscalPeriodService.java trunk/lima-business/src/main/java/org/chorem/lima/business/ImportExportService.java trunk/lima-business/src/main/java/org/chorem/lima/business/RecordService.java trunk/lima-business/src/main/java/org/chorem/lima/business/ReportService.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FilesServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportExportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/RecordServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/UserServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/service/LimaServiceFactory.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/model/AccountTreeTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/SubAccountComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.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/financialtransaction/table/FinancialTransactionTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/table/FinancialTransactionTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/model/FiscalPeriodTableModel.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/AccountService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/AccountService.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/AccountService.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -21,6 +21,8 @@ import java.util.List; +import javax.ejb.Remote; + import org.chorem.lima.entity.Account; /** @@ -32,6 +34,8 @@ * Last update : $Date$ * By : $Author$ */ + +@Remote public interface AccountService { List<Account> getAllAccounts() throws LimaException; Added: trunk/lima-business/src/main/java/org/chorem/lima/business/AccountServiceLocal.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/AccountServiceLocal.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/AccountServiceLocal.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -0,0 +1,38 @@ +/* *##% Lima Business + * 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.business; + +import javax.ejb.Local; + +/** + * Account service. + * + * @author chatellier + * @version $Revision: 2917 $ + * + * Last update : $Date: 2010-05-31 15:11:26 +0200 (lun. 31 mai 2010) $ + * By : $Author: jpepin $ + */ + +@Local +public interface AccountServiceLocal extends AccountService{ + + +} \ No newline at end of file Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -18,10 +18,15 @@ */ package org.chorem.lima.business; +import java.util.List; + +import javax.ejb.Remote; + import org.chorem.lima.entity.Account; import org.chorem.lima.entity.ClosedPeriodicEntryBook; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FiscalPeriod; import org.nuiton.topia.TopiaContext; @@ -32,8 +37,6 @@ * */ public interface AccountingRules { - - public void register(Class clazz, Object object); /** * Accounts rules @@ -59,7 +62,7 @@ * @param transaction * @throws LimaException */ - public void createFiscalPeriodRules(FiscalPeriod fiscalPeriod, TopiaContext transaction) throws LimaException; + public List<FinancialPeriod> createFiscalPeriodRules(FiscalPeriod fiscalPeriod, TopiaContext transaction) throws LimaException; public void blockFiscalPeriodRules(FiscalPeriod fiscalPeriod, TopiaContext transaction) throws LimaException; /** Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/EntryBookService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/EntryBookService.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/EntryBookService.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -21,6 +21,8 @@ import java.util.List; +import javax.ejb.Remote; + import org.chorem.lima.entity.EntryBook; /** @@ -33,6 +35,7 @@ * By : $Author$ */ +@Remote public interface EntryBookService { List<EntryBook> getAllEntryBooks() throws LimaException; Added: trunk/lima-business/src/main/java/org/chorem/lima/business/EntryBookServiceLocal.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/EntryBookServiceLocal.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/EntryBookServiceLocal.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -0,0 +1,38 @@ +/* *##% Lima Business + * 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.business; + +import javax.ejb.Local; + + +/** + * Entry book service. + * + * @author chatellier + * @version $Revision: 2889 $ + * + * Last update : $Date: 2010-05-10 15:13:56 +0200 (lun. 10 mai 2010) $ + * By : $Author: jpepin $ + */ + +@Local +public interface EntryBookServiceLocal extends EntryBookService { + +} 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-31 13:11:26 UTC (rev 2917) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/FinancialPeriodService.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -22,6 +22,8 @@ import java.util.Date; import java.util.List; +import javax.ejb.Remote; + import org.chorem.lima.entity.ClosedPeriodicEntryBook; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FinancialPeriod; @@ -36,19 +38,19 @@ * Last update : $Date$ * By : $Author$ */ + +@Remote public interface FinancialPeriodService { List<FinancialPeriod> getAllFinancialPeriods() throws LimaException; List<FinancialPeriod> getUnblockedFinancialPeriods() throws LimaException; - void createFinancialPeriod(FinancialPeriod financialPeriod) throws LimaException; + void createFinancialPeriods(List<FinancialPeriod> financialPeriods) throws LimaException; - void createFinancialPeriodWithTransaction(FinancialPeriod financialPeriod, TopiaContext topiaContext) throws LimaException; - + void createFinancialPeriodsWithTransaction(List<FinancialPeriod> financialPeriods, TopiaContext topiaContext) throws LimaException; FinancialPeriod getFinancialPeriodWithDate(Date date) throws LimaException; - /** Methodes for closedperiodicentrybook */ Added: trunk/lima-business/src/main/java/org/chorem/lima/business/FinancialPeriodServiceLocal.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/FinancialPeriodServiceLocal.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/FinancialPeriodServiceLocal.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -0,0 +1,38 @@ +/* *##% Lima Business + * 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.business; + +import javax.ejb.Local; + + +/** + * Financial period service. + * + * @author chatellier + * @version $Revision: 2913 $ + * + * Last update : $Date: 2010-05-27 16:36:34 +0200 (jeu. 27 mai 2010) $ + * By : $Author: jpepin $ + */ + +@Local +public interface FinancialPeriodServiceLocal extends FinancialPeriodService { + +} Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/FinancialTransactionService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/FinancialTransactionService.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/FinancialTransactionService.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -21,6 +21,8 @@ import java.util.List; +import javax.ejb.Remote; + import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FinancialPeriod; @@ -36,6 +38,8 @@ * Last update : $Date$ * By : $Author$ */ + +@Remote public interface FinancialTransactionService { /** Added: trunk/lima-business/src/main/java/org/chorem/lima/business/FinancialTransactionServiceLocal.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/FinancialTransactionServiceLocal.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/FinancialTransactionServiceLocal.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -0,0 +1,37 @@ +/* *##% Lima Business + * 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.business; + +import javax.ejb.Remote; + +/** + * Transaction service. + * + * @author chatellier + * @version $Revision: 2917 $ + * + * Last update : $Date: 2010-05-31 15:11:26 +0200 (lun. 31 mai 2010) $ + * By : $Author: jpepin $ + */ + +@Remote +public interface FinancialTransactionServiceLocal extends FinancialTransactionService { + +} Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/FiscalPeriodService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/FiscalPeriodService.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/FiscalPeriodService.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -21,6 +21,8 @@ import java.util.List; +import javax.ejb.Remote; + import org.chorem.lima.entity.FiscalPeriod; /** @@ -32,6 +34,7 @@ * Last update : $Date$ * By : $Author$ */ +@Remote public interface FiscalPeriodService { List<FiscalPeriod> getAllFiscalPeriods() throws LimaException; Added: trunk/lima-business/src/main/java/org/chorem/lima/business/FiscalPeriodServiceLocal.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/FiscalPeriodServiceLocal.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/FiscalPeriodServiceLocal.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -0,0 +1,37 @@ +/* *##% Lima Business + * 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.business; + +import javax.ejb.Local; +import org.chorem.lima.entity.FiscalPeriod; + +/** + * Fiscal period service. + * + * @author chatellier + * @version $Revision: 2910 $ + * + * Last update : $Date: 2010-05-26 20:37:42 +0200 (mer. 26 mai 2010) $ + * By : $Author: jpepin $ + */ +@Local +public interface FiscalPeriodServiceLocal extends FiscalPeriodService { + +} Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ImportExportService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ImportExportService.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ImportExportService.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -19,6 +19,8 @@ package org.chorem.lima.business; +import javax.ejb.Remote; + /** * Import export service. * @@ -30,6 +32,7 @@ * Last update : $Date$ * By : $Author$ */ +@Remote public interface ImportExportService { /** Added: trunk/lima-business/src/main/java/org/chorem/lima/business/ImportExportServiceLocal.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ImportExportServiceLocal.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ImportExportServiceLocal.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -0,0 +1,38 @@ +/* *##% Lima Business + * 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.business; + +import javax.ejb.Local; + +/** + * Import export service. + * + * Currently import and export as XML. + * + * @author chatellier + * @version $Revision: 2824 $ + * + * Last update : $Date: 2010-04-02 18:55:19 +0200 (ven. 02 avril 2010) $ + * By : $Author: echatellier $ + */ +@Local +public interface ImportExportServiceLocal extends ImportExportService { + +} Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/RecordService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/RecordService.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/RecordService.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -19,6 +19,8 @@ package org.chorem.lima.business; +import javax.ejb.Remote; + /** * Fiscal period service. * @@ -28,6 +30,8 @@ * Last update : $Date$ * By : $Author$ */ + +@Remote public interface RecordService { //List<FiscalPeriod> getAllFiscalPeriods() throws LimaException; Added: trunk/lima-business/src/main/java/org/chorem/lima/business/RecordServiceLocal.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/RecordServiceLocal.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/RecordServiceLocal.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -0,0 +1,37 @@ +/* *##% Lima Business + * 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.business; + +import javax.ejb.Local; + +/** + * Fiscal period service. + * + * @author chatellier + * @version $Revision: 2902 $ + * + * Last update : $Date: 2010-05-19 18:38:02 +0200 (mer. 19 mai 2010) $ + * By : $Author: jpepin $ + */ + +@Local +public interface RecordServiceLocal extends RecordService { + +} Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ReportService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ReportService.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ReportService.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -21,6 +21,8 @@ import java.util.Date; +import javax.ejb.Remote; + import org.chorem.lima.beans.BalanceTrial; import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.entity.Account; @@ -41,6 +43,8 @@ * Last update : $Date$ * By : $Author$ */ + +@Remote public interface ReportService { /** Added: trunk/lima-business/src/main/java/org/chorem/lima/business/ReportServiceLocal.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ReportServiceLocal.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ReportServiceLocal.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -0,0 +1,44 @@ +/* *##% Lima Business + * 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.business; + +import javax.ejb.Local; + + +/** + * Service de generation des rapports. + * + * Actuellement: + * <ul> + * <li>Balance</li> + * <li>Bilan</li> + * </ul> + * + * @author chatellier + * @version $Revision: 2902 $ + * + * Last update : $Date: 2010-05-19 18:38:02 +0200 (mer. 19 mai 2010) $ + * By : $Author: jpepin $ + */ + +@Local +public interface ReportServiceLocal extends ReportService { + +} Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -21,10 +21,7 @@ import java.util.ArrayList; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; - import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -33,7 +30,6 @@ import org.chorem.lima.business.LimaBusinessException; import org.chorem.lima.business.LimaException; import org.chorem.lima.business.ejb.AccountServiceImpl; -import org.chorem.lima.business.ejb.FinancialPeriodServiceImpl; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.ClosedPeriodicEntryBook; import org.chorem.lima.entity.Entry; @@ -42,7 +38,6 @@ import org.chorem.lima.entity.EntryDAO; import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FinancialTransaction; -import org.chorem.lima.entity.FinancialTransactionDAO; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.FiscalPeriodDAO; import org.chorem.lima.entity.LimaCallaoDAOHelper; @@ -55,20 +50,13 @@ * */ public class DefaultAccountingRules implements AccountingRules { - - private Map<Class, Object> map; - + protected static final Log log = LogFactory.getLog(DefaultAccountingRules.class); + + //TODO make methode getClosedPeriodicEntryBook from financialperiodservice to DAO + FinancialPeriodService financialPeriodService; - public DefaultAccountingRules() { - map = new HashMap<Class, Object>(); - } - - public void register(Class clazz, Object object){ - map.put(clazz, object); - } - /** * Rules to check before create accounts */ @@ -103,12 +91,13 @@ * Rules to check before create fiscals periods */ @Override - public void createFiscalPeriodRules(FiscalPeriod fiscalPeriod, TopiaContext transaction) throws LimaException { + public List<FinancialPeriod> createFiscalPeriodRules(FiscalPeriod fiscalPeriod, TopiaContext transaction) throws LimaException { //check if the enddate period is after the begindate period if (fiscalPeriod.getEndDate().before(fiscalPeriod.getBeginDate())){ throw new LimaBusinessException( "The enddate is before the begindate"); } + return null; } /** @@ -126,12 +115,6 @@ throw new LimaBusinessException("1 - Can't update entry : The financial period is blocked"); } try { - //Get finacialperiodservice - FinancialPeriodService financialPeriodService = - (FinancialPeriodService) map.get(FinancialPeriodService.class); - if (financialPeriodService == null){ - financialPeriodService = new FinancialPeriodServiceImpl(); - } FinancialPeriod financialPeriod = entry.getFinancialTransaction().getFinancialPeriod(); @@ -227,12 +210,6 @@ FinancialPeriod financialPeriod = financialTransaction.getFinancialPeriod(); entryBooks = entryBookDAO.findAll(); for (EntryBook entryBook : entryBooks) { - FinancialPeriodService financialPeriodService = - (FinancialPeriodService) map.get(FinancialPeriodService.class); - if (financialPeriodService == null){ - financialPeriodService = new FinancialPeriodServiceImpl(); - } - if(financialPeriodService.getClosedPeriodicEntryBook(entryBook, financialPeriod).getLocked()){ closedEntryBooks.add(entryBook); } @@ -321,12 +298,6 @@ FinancialPeriod oldFinancialPeriod = financialTransactionOld.getFinancialPeriod(); entryBooks = entryBookDAO.findAll(); for (EntryBook entryBook : entryBooks) { - FinancialPeriodService financialPeriodService = - (FinancialPeriodService) map.get(FinancialPeriodService.class); - if (financialPeriodService == null){ - financialPeriodService = new FinancialPeriodServiceImpl(); - } - if(financialPeriodService.getClosedPeriodicEntryBook(entryBook, financialPeriod).getLocked()){ closedEntryBooks.add(entryBook); } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -1,32 +1,22 @@ package org.chorem.lima.business.accountingrules; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; -import java.util.GregorianCalendar; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.business.FinancialPeriodService; import org.chorem.lima.business.LimaBusinessException; import org.chorem.lima.business.LimaException; -import org.chorem.lima.business.ejb.FinancialPeriodServiceImpl; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.ClosedPeriodicEntryBook; import org.chorem.lima.entity.ClosedPeriodicEntryBookDAO; -import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FinancialPeriod; -import org.chorem.lima.entity.FinancialPeriodDAO; import org.chorem.lima.entity.FinancialPeriodImpl; -import org.chorem.lima.entity.FinancialTransaction; -import org.chorem.lima.entity.FinancialTransactionDAO; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.FiscalPeriodDAO; import org.chorem.lima.entity.LimaCallaoDAOHelper; @@ -39,18 +29,7 @@ protected static final Log log = LogFactory.getLog(DefaultAccountingRules.class); - private TopiaContext rootContext; - private Map<Class, Object> map; - - public FranceAccountingRules() { - map = new HashMap<Class, Object>(); - } - - public void register(Class clazz, Object object){ - map.put(clazz, object); - } - /** * Règles de vérification de la création du PCG, appliquées à la comptabilité française * @@ -96,8 +75,9 @@ * Pas plus de deux exercices fiscaux ne peuvent-être ouvert en même temps * */ - public void createFiscalPeriodRules(FiscalPeriod fiscalPeriod, TopiaContext transaction) throws LimaException { + public List<FinancialPeriod> createFiscalPeriodRules(FiscalPeriod fiscalPeriod, TopiaContext transaction) throws LimaException { super.createFiscalPeriodRules(fiscalPeriod, transaction); + List<FinancialPeriod> financialPeriods = new ArrayList<FinancialPeriod>(); try { FiscalPeriodDAO fiscalPeriodDAO = LimaCallaoDAOHelper.getFiscalPeriodDAO(transaction); @@ -130,11 +110,6 @@ } } - FinancialPeriodService financialPeriodService = (FinancialPeriodService) map.get(FinancialPeriodService.class); - if (financialPeriodService == null){ - financialPeriodService = new FinancialPeriodServiceImpl(); - } - // FinancialPeriods of 1 month are created Date endDate = fiscalPeriod.getEndDate(); Date loopDate = fiscalPeriod.getBeginDate(); @@ -152,7 +127,8 @@ } //create it fiscalPeriod.addFinancialPeriod(financialPeriod); - financialPeriodService.createFinancialPeriodWithTransaction(financialPeriod, transaction); + financialPeriods.add(financialPeriod); + //financialPeriodService.createFinancialPeriodWithTransaction(financialPeriod, transaction); //loop incremente loopDate = DateUtils.addMilliseconds(loopDate, 1); } @@ -160,6 +136,7 @@ catch (TopiaException ex) { doCatch(transaction, ex, log); } + return financialPeriods; } /** Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -26,12 +26,15 @@ import java.util.List; import java.util.ListIterator; +import javax.ejb.EJB; import javax.ejb.Stateless; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.AccountService; +import org.chorem.lima.business.AccountServiceLocal; import org.chorem.lima.business.AccountingRules; +import org.chorem.lima.business.FinancialTransactionService; import org.chorem.lima.business.LimaBusinessException; import org.chorem.lima.business.LimaConfig; import org.chorem.lima.business.LimaException; @@ -54,16 +57,13 @@ * @author Rémi Chapelet */ @Stateless -public class AccountServiceImpl extends AbstractLimaService implements AccountService { +public class AccountServiceImpl extends AbstractLimaService implements AccountService, AccountServiceLocal { private static final Log log = LogFactory.getLog(AccountServiceImpl.class); private TopiaContext rootContext; - protected FinancialTransactionServiceImpl financialTransactionService = - new FinancialTransactionServiceImpl(); - protected AccountingRules accountingRules; public AccountServiceImpl() { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -24,12 +24,16 @@ import java.util.ArrayList; import java.util.List; +import javax.ejb.EJB; import javax.ejb.Stateless; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.AccountingRules; import org.chorem.lima.business.EntryBookService; +import org.chorem.lima.business.EntryBookServiceLocal; +import org.chorem.lima.business.FinancialPeriodService; +import org.chorem.lima.business.FinancialTransactionService; import org.chorem.lima.business.LimaBusinessException; import org.chorem.lima.business.LimaConfig; import org.chorem.lima.business.LimaException; @@ -52,17 +56,17 @@ * @author Rémi Chapelet */ @Stateless -public class EntryBookServiceImpl extends AbstractLimaService implements EntryBookService { +public class EntryBookServiceImpl extends AbstractLimaService implements EntryBookService, EntryBookServiceLocal { private static final Log log = LogFactory.getLog(EntryBookServiceImpl.class); private TopiaContext rootContext; - protected FinancialTransactionServiceImpl financialTransactionService = - new FinancialTransactionServiceImpl(); + @EJB + FinancialTransactionService financialTransactionService; - protected FinancialPeriodServiceImpl financialPeriodService = - new FinancialPeriodServiceImpl(); + @EJB + FinancialPeriodService financialPeriodService; protected AccountingRules accountingRules; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FilesServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FilesServiceImpl.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FilesServiceImpl.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -21,6 +21,8 @@ import java.util.List; +import javax.ejb.EJB; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.entity.Account; 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-31 13:11:26 UTC (rev 2917) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -19,21 +19,19 @@ package org.chorem.lima.business.ejb; -import java.util.ArrayList; import java.util.Date; import java.util.List; import javax.ejb.Stateless; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.AccountingRules; import org.chorem.lima.business.FinancialPeriodService; +import org.chorem.lima.business.FinancialPeriodServiceLocal; import org.chorem.lima.business.LimaConfig; import org.chorem.lima.business.LimaException; import org.chorem.lima.entity.ClosedPeriodicEntryBook; import org.chorem.lima.entity.ClosedPeriodicEntryBookDAO; import org.chorem.lima.entity.ClosedPeriodicEntryBookImpl; -import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryBookDAO; import org.chorem.lima.entity.FinancialPeriod; @@ -55,7 +53,7 @@ * @author Rémi Chapelet */ @Stateless -public class FinancialPeriodServiceImpl extends AbstractLimaService implements FinancialPeriodService { +public class FinancialPeriodServiceImpl extends AbstractLimaService implements FinancialPeriodService, FinancialPeriodServiceLocal { /** log */ private static final Log log = @@ -76,7 +74,6 @@ } accountingRules = config.getAccountingRules(); - accountingRules.register(FinancialPeriodService.class, this); } /** @@ -85,12 +82,12 @@ * @return */ @Override - public void createFinancialPeriod(FinancialPeriod financialPeriod) throws LimaException { + public void createFinancialPeriods(List<FinancialPeriod> financialPeriods) throws LimaException { TopiaContext topiaTransaction = null; try { topiaTransaction = beginTransaction(); - createFinancialPeriodWithTransaction(financialPeriod, topiaTransaction); + createFinancialPeriodsWithTransaction(financialPeriods, topiaTransaction); } catch (TopiaException ex) { @@ -105,32 +102,35 @@ * @return */ @Override - public void createFinancialPeriodWithTransaction(FinancialPeriod financialPeriod, TopiaContext topiaContext) throws LimaException { + public void createFinancialPeriodsWithTransaction(List<FinancialPeriod> financialPeriods, TopiaContext topiaContext) throws LimaException { try { FinancialPeriodDAO financialPeriodDAO = LimaCallaoDAOHelper.getFinancialPeriodDAO(topiaContext); - //create ClosedPeriodicEntryBook for all entrybook ClosedPeriodicEntryBookDAO closedPeriodicEntryBookDAO = LimaCallaoDAOHelper.getClosedPeriodicEntryBookDAO(topiaContext); EntryBookDAO entryBookDAO = LimaCallaoDAOHelper.getEntryBookDAO(topiaContext); - for (EntryBook entryBook : entryBookDAO.findAll()) { - //new closed periodic entrybook - ClosedPeriodicEntryBook closedPeriodicEntryBook - = new ClosedPeriodicEntryBookImpl(); - // set entrybook - closedPeriodicEntryBook.setEntryBook(entryBook); - // set financial period - closedPeriodicEntryBook.setFinancialPeriod(financialPeriod); - // create it - closedPeriodicEntryBookDAO.create(closedPeriodicEntryBook); - } - //create financial period - financialPeriodDAO.create(financialPeriod); + //create all financial period + for (FinancialPeriod financialPeriod : financialPeriods) { + //create ClosedPeriodicEntryBook for all entrybook + for (EntryBook entryBook : entryBookDAO.findAll()) { + //new closed periodic entrybook + ClosedPeriodicEntryBook closedPeriodicEntryBook + = new ClosedPeriodicEntryBookImpl(); + // set entrybook + closedPeriodicEntryBook.setEntryBook(entryBook); + // set financial period + closedPeriodicEntryBook.setFinancialPeriod(financialPeriod); + // create it + closedPeriodicEntryBookDAO.create(closedPeriodicEntryBook); + } + //create financial period + financialPeriodDAO.create(financialPeriod); + } commitTransaction(topiaContext); } catch (TopiaException ex) { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -24,14 +24,17 @@ import java.util.Date; import java.util.List; +import javax.ejb.EJB; import javax.ejb.Stateless; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.AccountingRules; +import org.chorem.lima.business.FinancialPeriodService; +import org.chorem.lima.business.FinancialTransactionService; +import org.chorem.lima.business.FinancialTransactionServiceLocal; import org.chorem.lima.business.LimaConfig; import org.chorem.lima.business.LimaException; -import org.chorem.lima.business.FinancialTransactionService; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; @@ -57,7 +60,7 @@ * @author Rémi Chapelet */ @Stateless -public class FinancialTransactionServiceImpl extends AbstractLimaService implements FinancialTransactionService { +public class FinancialTransactionServiceImpl extends AbstractLimaService implements FinancialTransactionService, FinancialTransactionServiceLocal { private static final Log log = LogFactory.getLog(FinancialTransactionServiceImpl.class); @@ -66,8 +69,8 @@ protected AccountingRules accountingRules; - protected FinancialPeriodServiceImpl financialPeriodService = - new FinancialPeriodServiceImpl(); + @EJB + FinancialPeriodService financialPeriodService; public FinancialTransactionServiceImpl() { LimaConfig config = LimaConfig.getInstance(); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -28,7 +28,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.AccountingRules; +import org.chorem.lima.business.FinancialPeriodService; import org.chorem.lima.business.FiscalPeriodService; +import org.chorem.lima.business.FiscalPeriodServiceLocal; import org.chorem.lima.business.LimaBusinessException; import org.chorem.lima.business.LimaConfig; import org.chorem.lima.business.LimaException; @@ -51,13 +53,15 @@ * @author Rémi Chapelet */ @Stateless -public class FiscalPeriodServiceImpl extends AbstractLimaService implements FiscalPeriodService { +public class FiscalPeriodServiceImpl extends AbstractLimaService implements FiscalPeriodService, FiscalPeriodServiceLocal { private static final Log log = LogFactory.getLog(FiscalPeriodServiceImpl.class); private static TopiaContext rootContext; protected AccountingRules accountingRules; + + FinancialPeriodService financialPeriodService; public FiscalPeriodServiceImpl() { LimaConfig config = LimaConfig.getInstance(); @@ -83,8 +87,10 @@ transaction = beginTransaction(); //check rules before create the account - accountingRules.createFiscalPeriodRules(fiscalPeriod, transaction); + List<FinancialPeriod> financialPeriods = accountingRules.createFiscalPeriodRules(fiscalPeriod, transaction); + financialPeriodService.createFinancialPeriodsWithTransaction(financialPeriods, transaction); + FiscalPeriodDAO fiscalPeriodDAO = LimaCallaoDAOHelper.getFiscalPeriodDAO(transaction); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportExportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportExportServiceImpl.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportExportServiceImpl.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -29,6 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.ImportExportService; +import org.chorem.lima.business.ImportExportServiceLocal; import org.chorem.lima.business.LimaException; /** @@ -43,7 +44,7 @@ * By : $Author$ */ @Stateless -public class ImportExportServiceImpl implements ImportExportService { +public class ImportExportServiceImpl implements ImportExportService, ImportExportServiceLocal { private static final Log log = LogFactory.getLog(ImportExportServiceImpl.class); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/RecordServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/RecordServiceImpl.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/RecordServiceImpl.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -29,6 +29,7 @@ import org.chorem.lima.business.LimaConfig; import org.chorem.lima.business.LimaException; import org.chorem.lima.business.RecordService; +import org.chorem.lima.business.RecordServiceLocal; import org.chorem.lima.entity.LimaCallaoDAOHelper; import org.chorem.lima.entity.Record; import org.chorem.lima.entity.RecordDAO; @@ -45,7 +46,7 @@ * @author Rémi Chapelet */ @Stateless -public class RecordServiceImpl implements RecordService { +public class RecordServiceImpl implements RecordService, RecordServiceLocal { /** log */ private static final Log log = LogFactory.getLog(RecordServiceImpl.class); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -23,6 +23,7 @@ import java.util.Date; import java.util.List; +import javax.ejb.EJB; import javax.ejb.Stateless; import org.apache.commons.logging.Log; @@ -31,9 +32,11 @@ import org.chorem.lima.beans.BalanceTrialImpl; import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.beans.ReportsDatasImpl; +import org.chorem.lima.business.AccountService; import org.chorem.lima.business.LimaConfig; import org.chorem.lima.business.LimaException; import org.chorem.lima.business.ReportService; +import org.chorem.lima.business.ReportServiceLocal; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; @@ -47,14 +50,14 @@ import org.nuiton.topia.framework.TopiaQuery; @Stateless -public class ReportServiceImpl extends AbstractLimaService implements ReportService { +public class ReportServiceImpl extends AbstractLimaService implements ReportService, ReportServiceLocal { private static final Log log = LogFactory.getLog(AccountServiceImpl.class); private TopiaContext rootContext; - protected AccountServiceImpl accountService = - new AccountServiceImpl(); + @EJB + AccountService accountService; public ReportServiceImpl() { LimaConfig config = LimaConfig.getInstance(); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/UserServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/UserServiceImpl.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/UserServiceImpl.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -22,7 +22,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.LimaConfig; -import org.chorem.lima.business.LimaException; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaNotFoundException; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/service/LimaServiceFactory.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/service/LimaServiceFactory.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/service/LimaServiceFactory.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -87,7 +87,7 @@ protected static LimaServiceFactory instance; /** JNDI context used to look for EJB. */ - protected InitialContext ctx; + protected static InitialContext ctx; /** * Init openejb jndi context. @@ -137,7 +137,7 @@ // TODO EC-20100410 put lookup name in configuration // name should be fully configurable due to custom implementation used - String lookupName = "AccountServiceImplLocal"; + String lookupName = "AccountServiceImplRemote"; AccountService ejbHome = null; try { ejbHome = (AccountService)ctx.lookup(lookupName); @@ -158,7 +158,7 @@ // TODO EC-20100410 put lookup name in configuration // name should be fully configurable due to custom implementation used - String lookupName = "FiscalPeriodServiceImplLocal"; + String lookupName = "FiscalPeriodServiceImplRemote"; FiscalPeriodService ejbHome = null; try { ejbHome = (FiscalPeriodService)ctx.lookup(lookupName); @@ -179,7 +179,7 @@ // TODO EC-20100410 put lookup name in configuration // name should be fully configurable due to custom implementation used - String lookupName = "FinancialPeriodServiceImplLocal"; + String lookupName = "FinancialPeriodServiceImplRemote"; FinancialPeriodService ejbHome = null; try { ejbHome = (FinancialPeriodService)ctx.lookup(lookupName); @@ -200,7 +200,7 @@ // TODO EC-20100410 put lookup name in configuration // name should be fully configurable due to custom implementation used - String lookupName = "FinancialTransactionServiceImplLocal"; + String lookupName = "FinancialTransactionServiceImplRemote"; FinancialTransactionService ejbHome = null; try { ejbHome = (FinancialTransactionService)ctx.lookup(lookupName); @@ -221,7 +221,7 @@ // TODO EC-20100410 put lookup name in configuration // name should be fully configurable due to custom implementation used - String lookupName = "EntryBookServiceImplLocal"; + String lookupName = "EntryBookServiceImplRemote"; EntryBookService ejbHome = null; try { ejbHome = (EntryBookService)ctx.lookup(lookupName); @@ -243,7 +243,7 @@ // TODO EC-20100410 put lookup name in configuration // name should be fully configurable due to custom implementation used - String lookupName = "ReportServiceImplLocal"; + String lookupName = "ReportServiceImplRemote"; ReportService ejbHome = null; try { ejbHome = (ReportService)ctx.lookup(lookupName); @@ -264,7 +264,7 @@ // TODO EC-20100410 put lookup name in configuration // name should be fully configurable due to custom implementation used - String lookupName = "RecordServiceImplLocal"; + String lookupName = "RecordServiceImplRemote"; RecordService ejbHome = null; try { ejbHome = (RecordService)ctx.lookup(lookupName); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -44,7 +44,6 @@ import org.chorem.lima.ui.financialtransaction.FinancialTransactionView; import org.chorem.lima.ui.financialtransaction.LetteringView; import org.chorem.lima.ui.financialtransactionunbalanced.FinancialTransactionUnbalancedView; -import org.chorem.lima.ui.financialtransactionunbalanced.FinancialTransactionUnbalancedViewHandler; import org.chorem.lima.util.ErrorHelper; /** Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -26,21 +26,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.LimaBusinessException; -import org.chorem.lima.business.LimaConfig; import org.chorem.lima.business.LimaException; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.AccountImpl; -import org.chorem.lima.entity.LimaCallaoDAOHelper; import org.chorem.lima.ui.account.model.AccountTreeTableModel; import org.chorem.lima.ui.account.AccountForm; import org.chorem.lima.ui.account.AccountView; import org.chorem.lima.ui.account.SubLedgerForm; import org.chorem.lima.util.ErrorHelper; import org.jdesktop.swingx.JXTreeTable; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaContextFactory; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaNotFoundException; /** * Handler associated with account view. @@ -58,18 +52,8 @@ protected AccountView view; - private TopiaContext rootContext; - protected AccountViewHandler(AccountView view) { this.view = view; - LimaConfig config = LimaConfig.getInstance(); - try { - rootContext = TopiaContextFactory.getContext(config.getOptions()); - } catch (TopiaNotFoundException ex) { - if (log.isErrorEnabled()) { - log.error("Can't init topia context", ex); - } - } } /** Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/model/AccountTreeTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/model/AccountTreeTableModel.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/model/AccountTreeTableModel.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -27,7 +27,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.AccountService; -import org.chorem.lima.business.LimaBusinessException; import org.chorem.lima.business.LimaException; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.AccountImpl; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -29,7 +29,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.BalanceTrial; -import org.chorem.lima.beans.BalanceTrialImpl; import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.business.LimaException; import org.chorem.lima.business.ReportService; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -25,11 +25,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.BalanceTrial; -import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.business.FinancialTransactionService; -import org.chorem.lima.business.LimaException; -import org.chorem.lima.entity.Account; -import org.chorem.lima.entity.Entry; import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.ReportsHelper; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBoxModel.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBoxModel.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -18,8 +18,6 @@ package org.chorem.lima.ui.combobox; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; import javax.swing.ComboBoxModel; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookComboBoxModel.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookComboBoxModel.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -17,13 +17,9 @@ * ##%*/ package org.chorem.lima.ui.combobox; - -import java.util.ArrayList; import java.util.List; - import javax.swing.ComboBoxModel; import javax.swing.event.ListDataListener; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.EntryBookService; 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 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -19,11 +19,8 @@ package org.chorem.lima.ui.combobox; import java.util.List; - import javax.swing.ComboBoxModel; import javax.swing.event.ListDataListener; - -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.FinancialPeriodService; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxRenderer.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxRenderer.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -22,8 +22,6 @@ import java.awt.Component; import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; import javax.swing.DefaultListCellRenderer; import javax.swing.JLabel; 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 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -23,8 +23,6 @@ import org.chorem.lima.business.FiscalPeriodService; import org.chorem.lima.business.LimaException; -import org.chorem.lima.entity.FiscalPeriodDAO; -import org.chorem.lima.entity.LimaCallaoDAOHelper; import org.chorem.lima.service.LimaServiceFactory; public class FiscalPeriodComboBoxModel implements ComboBoxModel{ Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxRenderer.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxRenderer.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -20,14 +20,9 @@ import java.awt.Component; import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; - import javax.swing.DefaultListCellRenderer; import javax.swing.JLabel; import javax.swing.JList; - -import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FiscalPeriod; public class FiscalPeriodComboBoxRenderer extends DefaultListCellRenderer { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/SubAccountComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/SubAccountComboBoxModel.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/SubAccountComboBoxModel.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -19,7 +19,6 @@ package org.chorem.lima.ui.combobox; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import javax.swing.ComboBoxModel; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -22,9 +22,7 @@ import static org.nuiton.i18n.I18n._; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Date; -import java.util.List; import javax.swing.table.AbstractTableModel; @@ -32,14 +30,10 @@ import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.beans.ReportsDatasImpl; -import org.chorem.lima.business.EntryBookService; -import org.chorem.lima.business.FinancialTransactionService; import org.chorem.lima.business.LimaException; import org.chorem.lima.business.ReportService; -import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; -import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.util.ErrorHelper; 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-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -23,10 +23,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; - import javax.swing.table.AbstractTableModel; - -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.EntryBookService; 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-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -27,7 +27,6 @@ import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.LimaException; import org.chorem.lima.entity.ClosedPeriodicEntryBook; -import org.chorem.lima.util.ErrorHelper; /** * TODO add comment here. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/table/FinancialTransactionTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/table/FinancialTransactionTable.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/table/FinancialTransactionTable.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -28,8 +28,6 @@ import org.apache.commons.logging.LogFactory; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.EntryBook; -import org.chorem.lima.entity.FinancialTransaction; -import org.chorem.lima.ui.financialtransaction.FinancialTransactionHelper; import org.chorem.lima.ui.financialtransaction.FinancialTransactionViewHandler; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.ColorHighlighter; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/table/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/table/FinancialTransactionTableModel.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/table/FinancialTransactionTableModel.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -42,11 +42,9 @@ import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryImpl; import org.chorem.lima.entity.FinancialPeriod; -import org.chorem.lima.entity.FinancialPeriodImpl; import org.chorem.lima.entity.FinancialTransactionImpl; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.service.LimaServiceFactory; -import org.chorem.lima.ui.financialtransaction.FinancialTransactionHelper; import org.chorem.lima.util.ErrorHelper; /** Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -28,8 +28,6 @@ import org.apache.commons.logging.LogFactory; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.EntryBook; -import org.chorem.lima.entity.FinancialTransaction; -import org.chorem.lima.ui.financialtransaction.FinancialTransactionHelper; import org.chorem.lima.ui.financialtransactionunbalanced.FinancialTransactionUnbalancedViewHandler; import org.chorem.lima.ui.financialtransaction.table.AccountTableCellEditor; import org.chorem.lima.ui.financialtransaction.table.DateTableCellEditor; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -33,7 +33,6 @@ import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.EntryBookService; import org.chorem.lima.business.FinancialPeriodService; -import org.chorem.lima.business.LimaBusinessException; import org.chorem.lima.business.LimaException; import org.chorem.lima.business.FinancialTransactionService; import org.chorem.lima.business.utils.EntryComparator; @@ -43,7 +42,6 @@ import org.chorem.lima.entity.EntryImpl; import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FinancialPeriodImpl; -import org.chorem.lima.entity.FinancialTransactionImpl; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; @@ -97,12 +95,9 @@ */ public FinancialTransactionUnbalancedTableModel() { /* Services */ - financialTransactionService = LimaServiceFactory.getInstance() - .getTransactionService(); - entryBookService = LimaServiceFactory.getInstance(). - getEntryBookService(); - financialPeriodService = LimaServiceFactory.getInstance(). - getFinancialPeriodService(); + financialTransactionService = LimaServiceFactory.getInstance().getTransactionService(); + entryBookService = LimaServiceFactory.getInstance().getEntryBookService(); + financialPeriodService = LimaServiceFactory.getInstance().getFinancialPeriodService(); } /** Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -27,8 +27,6 @@ import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.LimaException; import org.chorem.lima.entity.FinancialTransaction; -import org.chorem.lima.ui.financialtransaction.table.FinancialTransactionTable; -import org.chorem.lima.ui.financialtransaction.table.FinancialTransactionTableModel; /** * Handler associated with financial transaction view. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/model/FiscalPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/model/FiscalPeriodTableModel.java 2010-05-31 13:11:26 UTC (rev 2917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/model/FiscalPeriodTableModel.java 2010-05-31 17:46:38 UTC (rev 2918) @@ -22,10 +22,7 @@ import java.text.SimpleDateFormat; import java.util.List; - import javax.swing.table.AbstractTableModel; - -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.FiscalPeriodService;