July 2014 - Lima-commits - mailman.cloud.codelutin.com

r3837 - in trunk: . lima-business/src/license lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/main/java/org/chorem/lima/business/ejb/csv lima-business/src/main/java/org/chorem/lima/business/migration lima-business/src/test/java/org/chorem/lima/business lima-business-api/src/main/java/org/chorem/lima lima-business-api/src/main/java/org/chorem/lima/business lima-business-api/src/main/java/org/chorem/lima/business/api lima-callao/src/main/java/org/chorem/lima/entity li
by sbavencoff＠users.chorem.org July 8, 2014

July 8, 2014

Author: sbavencoff Date: 2014-07-08 16:54:17 +0200 (Tue, 08 Jul 2014) New Revision: 3837 Url: http://forge.chorem.org/projects/lima/repository/revisions/3837 Log: fixes #1040 : update to jdk 1.7 Added: trunk/lima-swing/src/main/assembly/lima.bat Removed: trunk/lima-swing/src/main/assembly/lima.exe Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/LimaTechnicalException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/AccountException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistAccountException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBookException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntryBookException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntryException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialTransactionException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/FiscalPeriodException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportEbpException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/InvalidAccountNumberException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedAccountException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedEntryBookException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/NewImportService.java trunk/lima-business/src/license/THIRD-PARTY.properties trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/NewImportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AccountModel.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryBookModel.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryModel.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FinancialTransactionModel.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalPeriodModel.java trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_8.java trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java trunk/lima-business/src/test/java/org/chorem/lima/business/NewExportServiceTest.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaPersistenceContext.java trunk/lima-swing/pom.xml trunk/lima-swing/src/main/assembly/bin.xml trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java trunk/pom.xml Modified: trunk/lima-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/lima-business/src/license/THIRD-PARTY.properties 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business/src/license/THIRD-PARTY.properties 2014-07-08 14:54:17 UTC (rev 3837) @@ -2,14 +2,14 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - AL 2.0 -# - Apache 2.0 # - Apache License 2.0 # - Apache License, version 2.0 # - Apache Software License - Version 2.0 +# - Apache Software License 2.0 # - BSD License +# - CDDL + GPLv2 with classpath exception # - CDDL 1.1 # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - CPL # - Common Development and Distribution License # - Common Public License Version 1.0 # - Eclipse Distribution License (EDL), Version 1.0 @@ -37,6 +37,8 @@ # Please fill the missing licenses for dependencies : # # -#Mon May 12 16:36:49 CEST 2014 +#Fri Jul 04 15:48:42 CEST 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=jdomlicence +org.metatype.sxc--sxc-jaxb-core--0.8=CDDL 1.1 +org.metatype.sxc--sxc-runtime--0.8=CDDL 1.1 Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/NewImportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/NewImportServiceImpl.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/NewImportServiceImpl.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.business.ejb; +/* + * #%L + * Lima :: business + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.business.ejb.csv; +/* + * #%L + * Lima :: business + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; import org.chorem.lima.business.api.AccountService; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AccountModel.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AccountModel.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AccountModel.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.business.ejb.csv; +/* + * #%L + * Lima :: business + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.Account; import org.chorem.lima.entity.AccountImpl; import org.nuiton.csv.ExportModel; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryBookModel.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryBookModel.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryBookModel.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.business.ejb.csv; +/* + * #%L + * Lima :: business + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryBookImpl; import org.nuiton.csv.ExportModel; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryModel.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryModel.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryModel.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.business.ejb.csv; +/* + * #%L + * Lima :: business + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.entity.Entry; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FinancialTransactionModel.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FinancialTransactionModel.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FinancialTransactionModel.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.business.ejb.csv; +/* + * #%L + * Lima :: business + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FinancialTransactionImpl; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalPeriodModel.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalPeriodModel.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalPeriodModel.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.business.ejb.csv; +/* + * #%L + * Lima :: business + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.FiscalPeriodImpl; import org.nuiton.csv.ExportModel; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_8.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_8.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_8.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,14 +1,34 @@ package org.chorem.lima.business.migration; +/* + * #%L + * Lima :: business + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.TopiaPersistenceContext; import org.nuiton.util.Version; - import java.util.List; /** Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.apache.commons.lang3.StringUtils; import org.chorem.lima.LimaTechnicalException; import org.nuiton.config.ApplicationConfig; Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/NewExportServiceTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/NewExportServiceTest.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/NewExportServiceTest.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.Lists; import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.IOUtils; @@ -14,13 +36,9 @@ import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.FileWriter; -import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; import java.util.List; -import java.util.zip.ZipInputStream; -import java.util.zip.ZipOutputStream; /** * Created by davidcosse on 03/06/14. Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/LimaTechnicalException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/LimaTechnicalException.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/LimaTechnicalException.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + /** * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> */ Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/AccountException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/AccountException.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/AccountException.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + /** * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> */ Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistAccountException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistAccountException.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistAccountException.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + /** * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> */ Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBookException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBookException.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBookException.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.business.utils; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.business.LimaException; import org.chorem.lima.entity.ClosedPeriodicEntryBook; Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntryBookException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntryBookException.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntryBookException.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.EntryBook; /** Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntryException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntryException.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntryException.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.Entry; /** Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialTransactionException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialTransactionException.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialTransactionException.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.FinancialTransaction; /** Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/FiscalPeriodException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/FiscalPeriodException.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/FiscalPeriodException.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.FiscalPeriod; /** Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportEbpException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportEbpException.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportEbpException.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + /** * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> */ Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/InvalidAccountNumberException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/InvalidAccountNumberException.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/InvalidAccountNumberException.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + /** * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> */ Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedAccountException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedAccountException.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedAccountException.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + /** * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> */ Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedEntryBookException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedEntryBookException.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedEntryBookException.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.EntryBook; /** Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/NewImportService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/NewImportService.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/NewImportService.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.business.api; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + /** * Created by davidcosse on 03/06/14. */ Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaPersistenceContext.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaPersistenceContext.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaPersistenceContext.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -1,5 +1,27 @@ package org.chorem.lima.entity; +/* + * #%L + * Lima :: callao + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-swing/pom.xml 2014-07-08 14:54:17 UTC (rev 3837) @@ -34,8 +34,8 @@ <i18n.bundleOutputName>lima</i18n.bundleOutputName>  - <signatureArtifactId>java16-sun</signatureArtifactId> - <signatureVersion>1.10</signatureVersion> + <signatureArtifactId>java17</signatureArtifactId> + <signatureVersion>1.0</signatureVersion>  <skipPostRelease>false</skipPostRelease> @@ -333,12 +333,12 @@ <profile> <id>jnlp-reporting</id> - <activation> +  <reporting> <plugins> <plugin> @@ -353,12 +353,12 @@ <profile> <id>jnlp-profile</id> - <activation> +  <build> <plugins> @@ -467,31 +467,7 @@ </activation> <build> <plugins> - <plugin> - <groupId>org.bluestemsoftware.open.maven.plugin</groupId> - <artifactId>launch4j-plugin</artifactId> - <executions> - <execution> - <id>launch4j</id> - <phase>package</phase> - <goals> - <goal>launch4j</goal> - </goals> - <configuration> - <dontWrapJar>true</dontWrapJar> - <headerType>gui</headerType> - <outfile>target/lima.exe</outfile> - <jar>lima.jar</jar> - <errTitle>${project.name}</errTitle> - <jre> - <minVersion>1.6.0</minVersion> - </jre> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> <finalName>lima-${project.version}</finalName> Modified: trunk/lima-swing/src/main/assembly/bin.xml =================================================================== --- trunk/lima-swing/src/main/assembly/bin.xml 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-swing/src/main/assembly/bin.xml 2014-07-08 14:54:17 UTC (rev 3837) @@ -48,7 +48,7 @@ <destName>lima.${project.packaging}</destName> </file> <file> - <source>src/main/assembly/lima.exe</source> + <source>src/main/assembly/lima.bat</source> </file> <file> <source>src/main/assembly/lima</source> Added: trunk/lima-swing/src/main/assembly/lima.bat =================================================================== --- trunk/lima-swing/src/main/assembly/lima.bat (rev 0) +++ trunk/lima-swing/src/main/assembly/lima.bat 2014-07-08 14:54:17 UTC (rev 3837) @@ -0,0 +1,2 @@ + +java -Xmx1024M -jar lima.jar %1 %2 %3 %4 %5 %6 %7 %8 %9 Deleted: trunk/lima-swing/src/main/assembly/lima.exe =================================================================== (Binary files differ) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -24,7 +24,6 @@ * #L% */ -import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.Condition; @@ -82,7 +81,7 @@ public void setEntryBook(ListSelectionEvent event) { JList entryBookList = view.getEntryBookList(); - List<EntryBook> selectedValuesList = Lists.newArrayList(entryBookList.getSelectedValuesList()); + List<EntryBook> selectedValuesList = entryBookList.getSelectedValuesList(); condition.setEntryBooks(selectedValuesList); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -24,7 +24,6 @@ * #L% */ -import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.Condition; @@ -85,7 +84,7 @@ public void setFinancialPeriod(ListSelectionEvent event) { JList financialPeriodList = view.getFinancialPeriodList(); - List<FinancialPeriod> selectedValuesList = Lists.newArrayList(financialPeriodList.getSelectedValuesList()); + List<FinancialPeriod> selectedValuesList = financialPeriodList.getSelectedValuesList(); condition.setFinancialPeriods(selectedValuesList); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java 2014-07-08 14:54:17 UTC (rev 3837) @@ -24,7 +24,6 @@ * #L% */ -import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.Condition; @@ -83,7 +82,7 @@ public void setFiscalPeriod(ListSelectionEvent event) { JList fiscalPeriodList = view.getFiscalPeriodList(); - List<FiscalPeriod> selectedValuesList = Lists.newArrayList(fiscalPeriodList.getSelectedValuesList()); + List<FiscalPeriod> selectedValuesList = fiscalPeriodList.getSelectedValuesList(); condition.setFiscalPeriods(selectedValuesList); } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-04 13:41:12 UTC (rev 3836) +++ trunk/pom.xml 2014-07-08 14:54:17 UTC (rev 3837) @@ -161,6 +161,15 @@ <platform>chorem.org</platform> <projectId>lima</projectId> +  + + <javaVersion>1.7</javaVersion> + +  + <maven.compiler.source>${javaVersion}</maven.compiler.source> +  + <maven.compiler.target>${javaVersion}</maven.compiler.target> +  <jettyPluginVersion>9.1.5.v20140505</jettyPluginVersion> <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> @@ -181,7 +190,6 @@ <openCsvVersion>2.3</openCsvVersion> <itextVersion>4.2.1</itextVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> - <launch4jPluginVersion>1.5.0.0</launch4jPluginVersion> <jaxxVersion>2.8.8-SNAPSHOT</jaxxVersion> <openEjbVersion>4.6.0.2</openEjbVersion> @@ -546,12 +554,6 @@ </dependencies> </plugin> - <plugin> - <groupId>org.bluestemsoftware.open.maven.plugin</groupId> - <artifactId>launch4j-plugin</artifactId> - <version>${launch4jPluginVersion}</version> - </plugin> - </plugins> </pluginManagement> </build>

1 0

r3836 - in trunk: lima-business/src/main/java/org/chorem/lima/business lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/test/java/org/chorem/lima/business lima-business-api/src/main/java/org/chorem/lima/business lima-business-api/src/main/java/org/chorem/lima/business/api lima-swing/src/main/java/org/chorem/lima/ui/entrybook lima-swing/src/main/resources/i18n
by sbavencoff＠users.chorem.org July 4, 2014

July 4, 2014

Author: sbavencoff Date: 2014-07-04 15:41:12 +0200 (Fri, 04 Jul 2014) New Revision: 3836 Url: http://forge.chorem.org/projects/lima/repository/revisions/3836 Log: refs #557 : fix entry book exception Added: trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedEntryBookException.java Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntryBookException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/EntryBookService.java trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 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 2014-07-02 08:42:53 UTC (rev 3835) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java 2014-07-04 13:41:12 UTC (rev 3836) @@ -61,7 +61,7 @@ * @param entryBook * @throws LimaException */ - void removeEntryBookRules(EntryBook entryBook) throws EntryBookException; + void removeEntryBookRules(EntryBook entryBook) throws UsedEntryBookException; /** * Fiscal Period rules 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 2014-07-02 08:42:53 UTC (rev 3835) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2014-07-04 13:41:12 UTC (rev 3836) @@ -29,12 +29,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.AccountingRules; -import org.chorem.lima.business.EntryBookException; import org.chorem.lima.business.EntryException; import org.chorem.lima.business.FinancialTransactionException; import org.chorem.lima.business.FiscalPeriodException; import org.chorem.lima.business.InvalidAccountNumberException; import org.chorem.lima.business.LimaInterceptor; +import org.chorem.lima.business.UsedEntryBookException; import org.chorem.lima.business.UsedAccountException; import org.chorem.lima.business.utils.ClosedPeriodicEntryBookException; import org.chorem.lima.entity.Account; @@ -138,13 +138,13 @@ /** Check if entrybook have financial transaction */ @Override - public void removeEntryBookRules(EntryBook entryBook) throws EntryBookException { + public void removeEntryBookRules(EntryBook entryBook) throws UsedEntryBookException { FinancialTransactionTopiaDao financialTransactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); // Check if entrybook have entries long nbfinancialtransaction = financialTransactionTopiaDao.getCountByEntryBook(entryBook); if (nbfinancialtransaction != 0) { - throw new EntryBookException(entryBook, "lima-business.defaultaccountingrules.deleteentrybookerror"); + throw new UsedEntryBookException(entryBook); } } 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 2014-07-02 08:42:53 UTC (rev 3835) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2014-07-04 13:41:12 UTC (rev 3836) @@ -26,8 +26,8 @@ package org.chorem.lima.business.ejb; import org.chorem.lima.business.AccountingRules; -import org.chorem.lima.business.EntryBookException; import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.UsedEntryBookException; import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.entity.ClosedPeriodicEntryBook; import org.chorem.lima.entity.ClosedPeriodicEntryBookImpl; @@ -114,7 +114,7 @@ } @Override - public void removeEntryBook(EntryBook entryBook) throws EntryBookException { + public void removeEntryBook(EntryBook entryBook) throws UsedEntryBookException { // check rule AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java 2014-07-02 08:42:53 UTC (rev 3835) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java 2014-07-04 13:41:12 UTC (rev 3836) @@ -79,7 +79,7 @@ * * @throws LimaException */ - @Test(expected=EntryBookException.class) + @Test(expected=UsedEntryBookException.class) public void deleteUsedEntryBook() throws LimaException, ParseException { EntryBook entryBook = entryBookService.getAllEntryBooks().get(0); // VTE Assert.assertNotNull(entryBook); Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntryBookException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntryBookException.java 2014-07-02 08:42:53 UTC (rev 3835) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntryBookException.java 2014-07-04 13:41:12 UTC (rev 3836) @@ -9,14 +9,6 @@ protected EntryBook entryBook; - public EntryBookException(String message) { - super(message); - } - - public EntryBookException(String message, Throwable cause) { - super(message, cause); - } - public EntryBookException(EntryBook entryBook, String message) { super(message); this.entryBook = entryBook; Added: trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedEntryBookException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedEntryBookException.java (rev 0) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedEntryBookException.java 2014-07-04 13:41:12 UTC (rev 3836) @@ -0,0 +1,17 @@ +package org.chorem.lima.business; + +import org.chorem.lima.entity.EntryBook; + +/** + * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + */ +public class UsedEntryBookException extends EntryBookException { + + public UsedEntryBookException(EntryBook entryBook) { + super(entryBook, ""); + } + + public UsedEntryBookException(EntryBook entryBook, Throwable cause) { + super(entryBook, "", cause); + } +} Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/EntryBookService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/EntryBookService.java 2014-07-02 08:42:53 UTC (rev 3835) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/EntryBookService.java 2014-07-04 13:41:12 UTC (rev 3836) @@ -25,8 +25,8 @@ package org.chorem.lima.business.api; -import org.chorem.lima.business.EntryBookException; import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.UsedEntryBookException; import org.chorem.lima.entity.EntryBook; import java.util.List; @@ -82,7 +82,7 @@ * impossible de supprimer celui-ci. * * @param entryBook - * @throws EntryBookException + * @throws org.chorem.lima.business.UsedEntryBookException */ - void removeEntryBook(EntryBook entryBook) throws EntryBookException; + void removeEntryBook(EntryBook entryBook) throws UsedEntryBookException; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2014-07-02 08:42:53 UTC (rev 3835) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2014-07-04 13:41:12 UTC (rev 3836) @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaConfig; -import org.chorem.lima.business.EntryBookException; +import org.chorem.lima.business.UsedEntryBookException; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.business.api.ImportService; @@ -41,7 +41,12 @@ import org.chorem.lima.util.ErrorHelper; import org.jdesktop.swingx.JXTable; -import javax.swing.*; +import javax.swing.AbstractAction; +import javax.swing.ActionMap; +import javax.swing.InputMap; +import javax.swing.JComponent; +import javax.swing.JOptionPane; +import javax.swing.KeyStroke; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; @@ -237,8 +242,8 @@ try { entryBookService.removeEntryBook(selectedEntryBook); entryBookTableModel.remove(selectedEntryBook); - } catch (EntryBookException e) { - errorHelper.showErrorMessage(t(e.getMessage())); + } catch (UsedEntryBookException e) { + errorHelper.showErrorMessage(t("lima.ui.entryBook.delete.used.error", e.getEntryBook().getCode(), e.getEntryBook().getLabel())); } } } Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-07-02 08:42:53 UTC (rev 3835) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-07-04 13:41:12 UTC (rev 3836) @@ -359,6 +359,7 @@ lima.ui.common.remove=Remove lima.ui.common.solde= lima.ui.common.update=Update +lima.ui.entryBook.delete.used.error=Can't delete entry book %2$s (%1$s) because exist financcial transactions in this entry book. lima.ui.entrybook.add= lima.ui.entrybook.code= lima.ui.entrybook.default= Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-07-02 08:42:53 UTC (rev 3835) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-07-04 13:41:12 UTC (rev 3836) @@ -341,6 +341,7 @@ lima.ui.common.remove=Supprimer lima.ui.common.solde=Solde lima.ui.common.update=Modifier +lima.ui.entryBook.delete.used.error=Imposible de supprimer le journal %2$s (%1$s) car Il existe des transactioins sur ce journal. lima.ui.entrybook.add=Ajout de journal lima.ui.entrybook.code=Code lima.ui.entrybook.default=Journaux par défault

1 0

r3835 - trunk/lima-business/src/test/java/org/chorem/lima/business
by sbavencoff＠users.chorem.org July 2, 2014

July 2, 2014

Author: sbavencoff Date: 2014-07-02 10:42:53 +0200 (Wed, 02 Jul 2014) New Revision: 3835 Url: http://forge.chorem.org/projects/lima/repository/revisions/3835 Log: refs #557 : fix test Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java 2014-06-30 07:41:22 UTC (rev 3834) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java 2014-07-02 08:42:53 UTC (rev 3835) @@ -213,8 +213,8 @@ * * @throws LimaException */ - @Test(expected = LimaException.class) - public void removeUnexistedAccountTest() throws LimaException { + @Test(expected = Exception.class) + public void removeUnexistedAccountTest() throws UsedAccountException { Account account4 = new AccountImpl(); account4.setAccountNumber("422"); account4.setLabel("Unsaved account"); Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java 2014-06-30 07:41:22 UTC (rev 3834) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java 2014-07-02 08:42:53 UTC (rev 3835) @@ -79,7 +79,7 @@ * * @throws LimaException */ - @Test(expected=LimaBusinessException.class) + @Test(expected=EntryBookException.class) public void deleteUsedEntryBook() throws LimaException, ParseException { EntryBook entryBook = entryBookService.getAllEntryBooks().get(0); // VTE Assert.assertNotNull(entryBook); Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java 2014-06-30 07:41:22 UTC (rev 3834) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java 2014-07-02 08:42:53 UTC (rev 3835) @@ -1,6 +1,7 @@ package org.chorem.lima.business; import org.apache.commons.lang3.StringUtils; +import org.chorem.lima.LimaTechnicalException; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ArgumentsParserException; @@ -30,7 +31,7 @@ } instance = this; } catch (ArgumentsParserException ex) { - throw new LimaException("Can't read configuration", ex); + throw new LimaTechnicalException("Can't read configuration", ex); } } }

1 0