branch develop updated (7671291 -> 970f2cd)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git from 7671291 refs #1317 Crée une transaction Extourne ou placer les écritures créer pour équilibrer un lettrage new 52e8196 refs #1174 ajout d'une exception pour gérer le cas ou l'on essaye de supprimer un compte qui 'existe pas new 82499b6 refs #1314 mise à jour urls new f2039b7 refs #1207 afficahge du nom du thread de l'exception new b698a64 refs #1174 ajout d'une exception pour gérer le cas ou l'on essaye de supprimer un compte qui 'existe pas new a88940f refs #1207 retrait de la signature de méthode des exceptions non remontées new 80bf13b refs #1207 fource le charset à UTF8 new 6d64b20 refs #1207 utilisation de la variable sauveagarder plutot que celle à sauvegarder new 73bc6af refs #1207 [ISO] suppression d'un appel non utilisé new ca0f149 refs #1207 [ISO] suppression d'une méthode morte new 970f2cd refs #1207 [ISO] Nettoyage, petite corrections The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 970f2cda7c040bc63635dadc7eab908075d8f9d5 Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 19:22:18 2016 +0200 refs #1207 [ISO] Nettoyage, petite corrections commit ca0f1490c0b51139c02fbaedc7c4cfb274aa4e82 Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 19:21:11 2016 +0200 refs #1207 [ISO] suppression d'une méthode morte commit 73bc6aff801c7cfe8d3f94ebfb429fb66692038d Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 19:19:45 2016 +0200 refs #1207 [ISO] suppression d'un appel non utilisé commit 6d64b200cf34205b89ab173b6b2c0467cec2face Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 19:18:48 2016 +0200 refs #1207 utilisation de la variable sauveagarder plutot que celle à sauvegarder commit 80bf13b2f443abea30b874072e7848e6c3ed650d Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 19:17:35 2016 +0200 refs #1207 fource le charset à UTF8 commit a88940fa95542bc7f2174f944fedd7a02f448ff9 Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 19:16:21 2016 +0200 refs #1207 retrait de la signature de méthode des exceptions non remontées commit b698a649c2b4b1f598ed1bc92cf9db2c963f32cb Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 19:02:14 2016 +0200 refs #1174 ajout d'une exception pour gérer le cas ou l'on essaye de supprimer un compte qui 'existe pas commit f2039b71c3306df1ee78a48ff93ef0b0e7d2ebe6 Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 19:01:02 2016 +0200 refs #1207 afficahge du nom du thread de l'exception commit 82499b6691e3a1f7d7c6bd00b0f5d3c2ef948fd3 Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 18:59:37 2016 +0200 refs #1314 mise à jour urls commit 52e819691951759ef962f2d3590ff079caea98b6 Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 18:57:24 2016 +0200 refs #1174 ajout d'une exception pour gérer le cas ou l'on essaye de supprimer un compte qui 'existe pas Summary of changes: .../chorem/lima/business/LimaServiceFactory.java | 2 +- .../lima/business/ServiceMonitorableHandler.java | 28 +++++----- .../chorem/lima/business/api/AccountService.java | 3 +- .../org/chorem/lima/business/api/EntryService.java | 7 --- .../chorem/lima/business/api/ImportService.java | 4 +- .../business/exceptions/UnexistingAccount.java | 11 ++++ lima-business-api/src/site/site.xml | 4 +- .../org/chorem/lima/business/AccountingRules.java | 3 +- .../accountingrules/DefaultAccountingRules.java | 10 ++-- .../accountingrules/FranceAccountingRules.java | 2 +- .../lima/business/ejb/AccountServiceImpl.java | 11 ++-- .../chorem/lima/business/ejb/EntryServiceImpl.java | 9 ---- .../lima/business/ejb/ExportServiceImpl.java | 7 ++- .../business/ejb/FinancialPeriodServiceImpl.java | 4 +- .../ejb/FinancialStatementServiceImpl.java | 2 +- .../ejb/FinancialTransactionServiceImpl.java | 62 +++++++++++----------- .../lima/business/ejb/FiscalPeriodServiceImpl.java | 14 +++-- .../lima/business/ejb/ImportServiceImpl.java | 13 ++--- .../lima/business/ejb/ReportServiceImpl.java | 4 +- .../lima/business/ejb/VatStatementServiceImpl.java | 2 +- .../lima/business/ejb/csv/AbstractLimaModel.java | 4 +- .../chorem/lima/business/ejb/csv/EntryModel.java | 2 +- .../lima/business/ejb/ebp/EntryBookEBPModel.java | 2 +- .../business/ejb/report/CommonsDocumentReport.java | 11 ++-- lima-business/src/site/site.xml | 4 +- .../org/chorem/lima/business/AbstractLimaTest.java | 19 ++----- .../lima/business/AccountServiceImplTest.java | 5 +- .../FinancialTransactionServiceImplTest.java | 10 ++-- .../lima/business/ImportExportServiceTest.java | 10 +++- .../accountingrules/TestAccountingRules.java | 2 +- .../main/java/org/chorem/lima/beans/Condition.java | 4 +- .../lima/beans/FinancialTransactionCondition.java | 2 +- .../main/java/org/chorem/lima/beans/Labeled.java | 2 +- .../org/chorem/lima/beans/VisitorCondition.java | 24 ++++----- .../main/java/org/chorem/lima/clause/Clause.java | 2 +- .../java/org/chorem/lima/clause/DateClause.java | 2 +- .../java/org/chorem/lima/clause/NumberClause.java | 2 +- .../java/org/chorem/lima/clause/SetClause.java | 2 +- .../java/org/chorem/lima/clause/StringClause.java | 2 +- .../org/chorem/lima/clause/SubFilterClause.java | 2 +- .../java/org/chorem/lima/clause/VisitorClause.java | 18 +++---- .../main/java/org/chorem/lima/filter/Filter.java | 6 +-- .../org/chorem/lima/filter/FilterGenerator.java | 19 ++++--- .../java/org/chorem/lima/filter/VisitorFilter.java | 8 +-- .../chorem/lima/report/DocumentReportTypes.java | 2 +- .../lima/report/service/DocumentService.java | 2 +- .../chorem/lima/report/service/JasperReports.java | 2 +- lima-server/src/main/assembly/bin.xml | 4 +- .../java/org/chorem/lima/LimaExceptionHandler.java | 2 +- .../src/main/java/org/chorem/lima/LimaMain.java | 5 +- .../chorem/lima/LimaSwingApplicationContext.java | 3 +- .../java/org/chorem/lima/ui/MainViewHandler.java | 4 +- .../chorem/lima/ui/account/AccountViewHandler.java | 7 ++- .../ui/accountViewer/AccountViewerViewHandler.java | 9 ++-- .../FinancialTransactionUnbalancedViewHandler.java | 4 +- .../FiscalControlExportViewHandler.java | 9 ++-- .../chorem/lima/ui/importexport/ImportExport.java | 2 +- .../chorem/lima/ui/opening/OpeningViewHandler.java | 11 ++-- .../org/chorem/lima/util/BigDecimalToString.java | 1 - .../java/org/chorem/lima/util/ErrorHelper.java | 2 +- .../resources/i18n/lima-swing_en_GB.properties | 1 + .../resources/i18n/lima-swing_fr_FR.properties | 1 + src/site/site.xml | 4 +- 63 files changed, 219 insertions(+), 222 deletions(-) create mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/UnexistingAccount.java -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 52e819691951759ef962f2d3590ff079caea98b6 Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 18:57:24 2016 +0200 refs #1174 ajout d'une exception pour gérer le cas ou l'on essaye de supprimer un compte qui 'existe pas --- .../java/org/chorem/lima/business/api/AccountService.java | 3 ++- .../chorem/lima/business/exceptions/UnexistingAccount.java | 11 +++++++++++ .../main/java/org/chorem/lima/business/AccountingRules.java | 3 ++- .../lima/business/accountingrules/DefaultAccountingRules.java | 10 +++++++--- .../java/org/chorem/lima/business/ejb/AccountServiceImpl.java | 11 ++++++----- .../java/org/chorem/lima/ui/account/AccountViewHandler.java | 7 +++++-- .../src/main/resources/i18n/lima-swing_en_GB.properties | 1 + .../src/main/resources/i18n/lima-swing_fr_FR.properties | 1 + 8 files changed, 35 insertions(+), 12 deletions(-) diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/api/AccountService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/AccountService.java index 5aba6f6..7686c38 100644 --- a/lima-business-api/src/main/java/org/chorem/lima/business/api/AccountService.java +++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/AccountService.java @@ -27,6 +27,7 @@ import org.chorem.lima.business.exceptions.InvalidAccountNumberException; import org.chorem.lima.business.exceptions.LimaException; import org.chorem.lima.business.exceptions.NotAllowedLabelException; import org.chorem.lima.business.exceptions.NotNumberAccountNumberException; +import org.chorem.lima.business.exceptions.UnexistingAccount; import org.chorem.lima.business.exceptions.UsedAccountException; import org.chorem.lima.entity.Account; @@ -103,7 +104,7 @@ public interface AccountService { Account updateAccount(Account account) throws InvalidAccountNumberException, NotNumberAccountNumberException; - void removeAccount(Account account) throws UsedAccountException; + void removeAccount(Account account) throws UsedAccountException, UnexistingAccount; List<Account> stringToListAccounts(String selectedAccounts); diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/exceptions/UnexistingAccount.java b/lima-business-api/src/main/java/org/chorem/lima/business/exceptions/UnexistingAccount.java new file mode 100644 index 0000000..f8c7528 --- /dev/null +++ b/lima-business-api/src/main/java/org/chorem/lima/business/exceptions/UnexistingAccount.java @@ -0,0 +1,11 @@ +package org.chorem.lima.business.exceptions; + +/** + * Created by davidcosse on 08/07/16. + */ +public class UnexistingAccount extends AccountException { + + public UnexistingAccount(String accountNumber, String message) { + super(accountNumber, message); + } +} diff --git a/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java b/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java index a319a22..93cb419 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java +++ b/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java @@ -36,6 +36,7 @@ import org.chorem.lima.business.exceptions.NotLockedClosedPeriodicEntryBooksExce import org.chorem.lima.business.exceptions.NotNumberAccountNumberException; import org.chorem.lima.business.exceptions.UnbalancedEntriesException; import org.chorem.lima.business.exceptions.UnbalancedFinancialTransactionsException; +import org.chorem.lima.business.exceptions.UnexistingAccount; import org.chorem.lima.business.exceptions.UnfilledEntriesException; import org.chorem.lima.business.exceptions.UsedAccountException; import org.chorem.lima.business.exceptions.UsedEntryBookException; @@ -67,7 +68,7 @@ public interface AccountingRules { void updateAccountRules(Account account) throws InvalidAccountNumberException, NotNumberAccountNumberException; - void removeAccountRules(Account account) throws UsedAccountException; + void removeAccountRules(Account account) throws UsedAccountException, UnexistingAccount; /** * Entrybook rules. diff --git a/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java b/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java index 993c31b..410bf2b 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java +++ b/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java @@ -41,6 +41,7 @@ import org.chorem.lima.business.exceptions.NotLockedClosedPeriodicEntryBooksExce import org.chorem.lima.business.exceptions.NotNumberAccountNumberException; import org.chorem.lima.business.exceptions.UnbalancedEntriesException; import org.chorem.lima.business.exceptions.UnbalancedFinancialTransactionsException; +import org.chorem.lima.business.exceptions.UnexistingAccount; import org.chorem.lima.business.exceptions.UnfilledEntriesException; import org.chorem.lima.business.exceptions.UsedAccountException; import org.chorem.lima.business.exceptions.UsedEntryBookException; @@ -63,7 +64,7 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; -; + /** * Defaults rules, if no localized rules classes is instantiated @@ -175,10 +176,13 @@ public class DefaultAccountingRules implements AccountingRules { * Recursive function */ @Override - public void removeAccountRules(Account account) throws UsedAccountException { + public void removeAccountRules(Account account) throws UsedAccountException, UnexistingAccount { EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); // Check if account have entries + if (!account.isPersisted()) { + throw new UnexistingAccount(account.getAccountNumber(), "Unsaved Account, this account can not be removed"); + } if (entryTopiaDao.forAccountEquals(account).exists()) { throw new UsedAccountException(account.getAccountNumber()); } @@ -210,7 +214,7 @@ public class DefaultAccountingRules implements AccountingRules { EntryTopiaDao entryDao = getDaoHelper().getEntryDao(); ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookDao(); // reload object in current transaction - closedPeriodicEntryBook = closedPeriodicEntryBookTopiaDao.findByTopiaId(closedPeriodicEntryBook.getTopiaId()); + closedPeriodicEntryBook = closedPeriodicEntryBookTopiaDao.forTopiaIdEquals(closedPeriodicEntryBook.getTopiaId()).findUnique(); // Check if all financial transactions of closedperiodicentrybook are equilibrate FinancialPeriod period = closedPeriodicEntryBook.getFinancialPeriod(); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java index 44022e7..63add0f 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java @@ -31,6 +31,7 @@ import org.chorem.lima.business.exceptions.InvalidAccountNumberException; import org.chorem.lima.business.exceptions.LimaException; import org.chorem.lima.business.exceptions.NotAllowedLabelException; import org.chorem.lima.business.exceptions.NotNumberAccountNumberException; +import org.chorem.lima.business.exceptions.UnexistingAccount; import org.chorem.lima.business.exceptions.UsedAccountException; import org.chorem.lima.business.utils.AccountComparator; import org.chorem.lima.entity.Account; @@ -187,10 +188,10 @@ public class AccountServiceImpl extends AbstractLimaService implements AccountSe * compte ou a un de ses sous-compte, il est alors impossible de supprimer le compte. * * @param account Le compte à supprimer - * @throws LimaException + * @throws UsedAccountException, UnexistingAccount */ @Override - public void removeAccount(Account account) throws UsedAccountException { + public void removeAccount(Account account) throws UsedAccountException, UnexistingAccount { AccountingRules accountingRules = LimaBusinessConfig.getInstance().getAccountingRules(); @@ -199,7 +200,7 @@ public class AccountServiceImpl extends AbstractLimaService implements AccountSe // remove account AccountTopiaDao accountDao = getDaoHelper().getAccountDao(); - Account accountToDelete = accountDao.findByTopiaId(account.getTopiaId()); + Account accountToDelete = accountDao.forTopiaIdEquals(account.getTopiaId()).findUnique(); accountDao.delete(accountToDelete); } @@ -231,7 +232,7 @@ public class AccountServiceImpl extends AbstractLimaService implements AccountSe // TODO sbavencoff 18/07/2014 revoir la selection des comptes #1046 @Override public List<Account> stringToListAccounts(String selectedAccounts) { - Set<Account> accounts = new HashSet<Account>(); + Set<Account> accounts = new HashSet<>(); if (selectedAccounts != null) { AccountTopiaDao accountDao = getDaoHelper().getAccountDao(); //Remove Spaces @@ -293,7 +294,7 @@ public class AccountServiceImpl extends AbstractLimaService implements AccountSe first = false; } } - return new ArrayList<Account>(accounts); + return new ArrayList<>(accounts); } @Override diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java index 85f0b23..0b3d79d 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java @@ -32,6 +32,7 @@ import org.chorem.lima.business.api.ImportService; import org.chorem.lima.business.exceptions.AlreadyExistAccountException; import org.chorem.lima.business.exceptions.InvalidAccountNumberException; import org.chorem.lima.business.exceptions.NotNumberAccountNumberException; +import org.chorem.lima.business.exceptions.UnexistingAccount; import org.chorem.lima.business.exceptions.UsedAccountException; import org.chorem.lima.entity.Account; import org.chorem.lima.enums.AccountsChartEnum; @@ -204,7 +205,7 @@ public class AccountViewHandler implements ServiceListener { } // render in tree node hierarchy for DefaultTreeTableModel - SortedMap<String, DefaultMutableTreeTableNode> nodeCache = new TreeMap<String, DefaultMutableTreeTableNode>(REVERSE_ACCOUNT_LENGTH_COMPARATOR); + SortedMap<String, DefaultMutableTreeTableNode> nodeCache = new TreeMap<>(REVERSE_ACCOUNT_LENGTH_COMPARATOR); DefaultMutableTreeTableNode root = new DefaultMutableTreeTableNode(null); for (Account account : accounts) { // find parent @@ -325,7 +326,7 @@ public class AccountViewHandler implements ServiceListener { * @return node list */ protected List<MutableTreeTableNode> findSubNodes(TreeTableNode currentNode, String accountNumber) { - List<MutableTreeTableNode> nodes = new ArrayList<MutableTreeTableNode>(); + List<MutableTreeTableNode> nodes = new ArrayList<>(); for (int childIndex = 0; childIndex < currentNode.getChildCount(); childIndex++) { MutableTreeTableNode child = (MutableTreeTableNode)currentNode.getChildAt(childIndex); Account account = (Account)child.getUserObject(); @@ -436,6 +437,8 @@ public class AccountViewHandler implements ServiceListener { model.removeNodeFromParent(lastNode); } catch (UsedAccountException e) { errorHelper.showErrorMessage(t("lima.account.remove.error.usedAccount", e.getAccountNumber())); + } catch (UnexistingAccount unexistingAccount) { + errorHelper.showErrorMessage(t("lima.account.remove.error.unexistingAcount", unexistingAccount.getAccountNumber())); } } } diff --git a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties index 29d8443..9022472 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties @@ -11,6 +11,7 @@ lima.account.import.description=Choose an accounting plan lima.account.number=Account number lima.account.remove.confirm=Do you really want to remove %s account ? lima.account.remove.confirm.title=Delete account +lima.account.remove.error.unexistingAcount=Unexisting account %1$s, it can not be removed lima.account.remove.error.usedAccount=There are financial statement on this account lima.account.update.error.invalidAccountNumber=Invalid account number\: %1$s lima.account.update.form=Update account diff --git a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties index 4f261ab..541d2e3 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties @@ -14,6 +14,7 @@ lima.account.label=Libellé lima.account.number=Numéro de compte lima.account.remove.confirm=Voulez-vous supprimer le compte %s ? lima.account.remove.confirm.title=Suppression d'un compte +lima.account.remove.error.unexistingAcount=Le compte %1$s n'existe pas, le compte ne peut donc pas être supprimé lima.account.remove.error.usedAccount=Il exist des transactions sur ce compte lima.account.update.error.invalidAccountNumber=Le numéro du compte %1$s n'est pas valide lima.account.update.form=Modification d'un compte -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 82499b6691e3a1f7d7c6bd00b0f5d3c2ef948fd3 Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 18:59:37 2016 +0200 refs #1314 mise à jour urls --- lima-business-api/src/site/site.xml | 4 ++-- lima-business/src/site/site.xml | 4 ++-- lima-server/src/main/assembly/bin.xml | 4 ++-- src/site/site.xml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lima-business-api/src/site/site.xml b/lima-business-api/src/site/site.xml index 0daf60c..fb2f2f5 100644 --- a/lima-business-api/src/site/site.xml +++ b/lima-business-api/src/site/site.xml @@ -23,9 +23,9 @@ <project name="${project.name}" - xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"> <body> diff --git a/lima-business/src/site/site.xml b/lima-business/src/site/site.xml index cbf1bb9..a1619a5 100644 --- a/lima-business/src/site/site.xml +++ b/lima-business/src/site/site.xml @@ -23,9 +23,9 @@ <project name="${project.name}" - xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"> <body> diff --git a/lima-server/src/main/assembly/bin.xml b/lima-server/src/main/assembly/bin.xml index 671d1d1..990369c 100644 --- a/lima-server/src/main/assembly/bin.xml +++ b/lima-server/src/main/assembly/bin.xml @@ -21,9 +21,9 @@ #L% --> -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd"> <id>bin</id> <formats> <format>zip</format> diff --git a/src/site/site.xml b/src/site/site.xml index ee0883f..4d656d4 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -22,9 +22,9 @@ --> <project name="${project.name}" - xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"> <bannerLeft> <name>${project.name}</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit f2039b71c3306df1ee78a48ff93ef0b0e7d2ebe6 Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 19:01:02 2016 +0200 refs #1207 afficahge du nom du thread de l'exception --- lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java b/lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java index bf21c57..f8169fa 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java @@ -53,7 +53,7 @@ public class LimaExceptionHandler implements Thread.UncaughtExceptionHandler { protected void handleException(String tname, Throwable ex) { if (log.isErrorEnabled()) { - log.error("Global application exception", ex); + log.error(String.format("Global application exception on %s", tname), ex); } ErrorHelper errorHelper = new ErrorHelper(LimaSwingConfig.getInstance()); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit b698a649c2b4b1f598ed1bc92cf9db2c963f32cb Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 19:02:14 2016 +0200 refs #1174 ajout d'une exception pour gérer le cas ou l'on essaye de supprimer un compte qui 'existe pas --- .../test/java/org/chorem/lima/business/AccountServiceImplTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java b/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java index 9cf9a7a..26df6ff 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java @@ -27,6 +27,7 @@ import org.chorem.lima.business.exceptions.InvalidAccountNumberException; import org.chorem.lima.business.exceptions.LimaException; import org.chorem.lima.business.exceptions.NotAllowedLabelException; import org.chorem.lima.business.exceptions.NotNumberAccountNumberException; +import org.chorem.lima.business.exceptions.UnexistingAccount; import org.chorem.lima.business.exceptions.UsedAccountException; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.AccountImpl; @@ -345,8 +346,8 @@ public class AccountServiceImplTest extends AbstractLimaTest { * * @throws UsedAccountException */ - @Test(expected = Exception.class) - public void removeUnexistedAccountTest() throws UsedAccountException { + @Test(expected = UnexistingAccount.class) + public void removeUnexistedAccountTest() throws UsedAccountException, UnexistingAccount { Account account4 = new AccountImpl(); account4.setAccountNumber("422"); account4.setLabel("Unsaved account"); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit a88940fa95542bc7f2174f944fedd7a02f448ff9 Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 19:16:21 2016 +0200 refs #1207 retrait de la signature de méthode des exceptions non remontées --- .../org/chorem/lima/business/AbstractLimaTest.java | 19 +++---------------- .../chorem/lima/business/ImportExportServiceTest.java | 10 ++++++++-- .../chorem/lima/report/service/DocumentService.java | 2 +- .../src/main/java/org/chorem/lima/LimaMain.java | 5 ++--- .../org/chorem/lima/LimaSwingApplicationContext.java | 3 +-- 5 files changed, 15 insertions(+), 24 deletions(-) diff --git a/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java b/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java index 6ddf862..bbfeb59 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java @@ -55,14 +55,12 @@ import org.chorem.lima.entity.FiscalPeriodImpl; import org.chorem.lima.entity.LimaCallaoEntityEnum; import org.chorem.lima.entity.LimaCallaoTopiaApplicationContext; import org.hibernate.cfg.Environment; -import org.junit.After; import org.junit.Before; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.topia.persistence.TopiaApplicationContextCache; import java.io.File; -import java.io.IOException; import java.math.BigDecimal; import java.text.DateFormat; import java.util.Date; @@ -122,15 +120,14 @@ public abstract class AbstractLimaTest { context = createNewTestApplicationContext(); } - protected void setUpLocale() throws Exception { + protected void setUpLocale() { I18n.init(new ClassPathI18nInitializer(), Locale.UK); } /** * Init services after i18n#init(). - * @throws java.io.IOException */ - protected void initServices() throws IOException { + protected void initServices() { if(accountService == null) { LimaServiceFactory.initFactory(LimaBusinessConfig.getInstance().getConfig()); accountService = LimaServiceFactory.getService(AccountService.class); @@ -169,11 +166,6 @@ public abstract class AbstractLimaTest { return testProperties; } - @After - public void cleanDatabase() throws Exception { - //context.dropSchema(); - } - /** * Method to use only for class that need a context to be tester. @@ -200,13 +192,9 @@ public abstract class AbstractLimaTest { * Not called by default (<code>@Before</code>) to allow init test with * CSV or EBP import. * - * @throws org.chorem.lima.business.exceptions.LimaException - * @throws java.text.ParseException */ - protected void initTestDatabase() throws Exception { - + protected void initTestDatabase() { context.createSchema(); - } /** @@ -345,5 +333,4 @@ public abstract class AbstractLimaTest { return transaction; } - } diff --git a/lima-business/src/test/java/org/chorem/lima/business/ImportExportServiceTest.java b/lima-business/src/test/java/org/chorem/lima/business/ImportExportServiceTest.java index d76cd5e..4e147a7 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/ImportExportServiceTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/ImportExportServiceTest.java @@ -29,7 +29,6 @@ import org.apache.commons.lang3.StringUtils; import org.chorem.lima.LimaTechnicalException; import org.chorem.lima.business.exceptions.AlreadyExistEntryBookException; import org.chorem.lima.business.exceptions.BeginAfterEndFiscalPeriodException; -import org.chorem.lima.business.exceptions.ImportEbpException; import org.chorem.lima.business.exceptions.ImportFileException; import org.chorem.lima.business.exceptions.LimaException; import org.chorem.lima.business.exceptions.MoreOneUnlockFiscalPeriodException; @@ -46,6 +45,7 @@ import org.chorem.lima.entity.FiscalPeriodImpl; import org.chorem.lima.entity.Identity; import org.chorem.lima.entity.IdentityImpl; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; import java.io.BufferedWriter; @@ -615,7 +615,7 @@ public class ImportExportServiceTest extends AbstractLimaTest { } protected void importEBPData() throws IOException, ParseException, BeginAfterEndFiscalPeriodException, - NotBeginNextDayOfLastFiscalPeriodException, MoreOneUnlockFiscalPeriodException, ImportEbpException { + NotBeginNextDayOfLastFiscalPeriodException, MoreOneUnlockFiscalPeriodException { // create fiscal period (mandatory for import) FiscalPeriod fiscalPeriod = new FiscalPeriodImpl(); @@ -673,4 +673,10 @@ public class ImportExportServiceTest extends AbstractLimaTest { Assert.assertNotNull(compteTiers); Assert.assertNotNull(employeAccount); } + + @Test + @Ignore + public void getLimaTestDefaultConfFilename() { + context.showCreateSchema(); + } } diff --git a/lima-report/src/main/java/org/chorem/lima/report/service/DocumentService.java b/lima-report/src/main/java/org/chorem/lima/report/service/DocumentService.java index 4ce1035..fffb871 100644 --- a/lima-report/src/main/java/org/chorem/lima/report/service/DocumentService.java +++ b/lima-report/src/main/java/org/chorem/lima/report/service/DocumentService.java @@ -154,7 +154,7 @@ public class DocumentService { financialReport = constructHtmlHeader(""); //Split list by financialstatement type - List<List<FinancialStatementAmounts>> listList = new ArrayList<List<FinancialStatementAmounts>>(); + List<List<FinancialStatementAmounts>> listList = new ArrayList<>(); Boolean first = true; int min = 0; int size = financialStatementAmounts.size(); diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java index 4cec550..95b0f59 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java @@ -25,8 +25,8 @@ package org.chorem.lima; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.LimaServiceFactory; +import org.chorem.lima.business.api.AccountService; import org.chorem.lima.server.LimaServer; import org.chorem.lima.ui.MainView; import org.chorem.lima.ui.MainViewHandler; @@ -35,7 +35,6 @@ import org.chorem.lima.ui.opening.OpeningView; import javax.swing.*; import java.util.Arrays; import java.util.Date; -import java.util.Locale; import static org.nuiton.i18n.I18n.t; @@ -117,7 +116,7 @@ public class LimaMain { return context; } - protected static void launch(LimaSwingApplicationContext context) throws Exception { + protected static void launch(LimaSwingApplicationContext context) { // prepare ui look&feel and load ui properties try { diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java b/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java index d4a3c55..bbbea34 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java @@ -133,9 +133,8 @@ public class LimaSwingApplicationContext extends DefaultApplicationContext { /** * close the application's context. * - * @throws Exception if any pb while closing */ - public void close() throws Exception { + public void close() { if (log.isDebugEnabled()) { log.debug("closing context " + this); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 80bf13b2f443abea30b874072e7848e6c3ed650d Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 19:17:35 2016 +0200 refs #1207 fource le charset à UTF8 --- .../java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java | 4 ++-- .../ui/fiscalControlExport/FiscalControlExportViewHandler.java | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java index d9f78d1..bf5e4f8 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java @@ -208,12 +208,12 @@ public abstract class AbstractLimaModel<E> extends AbstractImportModel<E> { } }; - protected static final String getFinancialStatementFullPath(FinancialStatement value) { + protected static String getFinancialStatementFullPath(FinancialStatement value) { String result = value.getMasterFinancialStatement() != null ? getFinancialStatementFullPath(value.getMasterFinancialStatement()) + "/" + value.getLabel() : value.getLabel(); return result; } - protected static final String getVatFullPath(VatStatement value) { + protected static String getVatFullPath(VatStatement value) { String result = value.getMasterVatStatement() != null ? getVatFullPath(value.getMasterVatStatement()) + "/" + value.getLabel() : value.getLabel(); return result; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/fiscalControlExport/FiscalControlExportViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/fiscalControlExport/FiscalControlExportViewHandler.java index 4bcca2a..21381b5 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/fiscalControlExport/FiscalControlExportViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/fiscalControlExport/FiscalControlExportViewHandler.java @@ -41,15 +41,14 @@ import org.chorem.lima.ui.importexport.ImportExportWaitView; import org.chorem.lima.util.ErrorHelper; import org.jdesktop.swingx.painter.BusyPainter; -import javax.swing.JFileChooser; -import javax.swing.JOptionPane; -import javax.swing.SwingWorker; -import java.awt.Color; +import javax.swing.*; +import java.awt.*; import java.io.BufferedWriter; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; +import java.nio.charset.Charset; import java.rmi.server.ExportException; import java.util.List; @@ -182,7 +181,7 @@ public class FiscalControlExportViewHandler { if (exportExceptions == null || exportExceptions.isEmpty()) { BufferedWriter out = null; try { - out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(exportFile))); + out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(exportFile), Charset.forName("UTF-8"))); out.write(exportResult.getExportData()); out.flush(); out.close(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 6d64b200cf34205b89ab173b6b2c0467cec2face Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 19:18:48 2016 +0200 refs #1207 utilisation de la variable sauveagarder plutot que celle à sauvegarder --- .../FinancialTransactionUnbalancedViewHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java index 38422d5..65fa7ce 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java @@ -170,9 +170,9 @@ public class FinancialTransactionUnbalancedViewHandler { newEntry.setVoucher(entry.getVoucher()); newEntry.setDescription(entry.getDescription()); - tableModel.addEntry(newEntry); + Entry savedNewEntry = tableModel.addEntry(newEntry); //select the new line - int row = tableModel.indexOf(newEntry.getFinancialTransaction()) + newEntry.getFinancialTransaction().sizeEntry() - 1; + int row = tableModel.indexOf(savedNewEntry.getFinancialTransaction()) + savedNewEntry.getFinancialTransaction().sizeEntry() - 1; ListSelectionModel selectionModel = table.getSelectionModel(); selectionModel.setSelectionInterval( row, row); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 73bc6aff801c7cfe8d3f94ebfb429fb66692038d Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 19:19:45 2016 +0200 refs #1207 [ISO] suppression d'un appel non utilisé --- .../java/org/chorem/lima/ui/opening/OpeningViewHandler.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java index 7f87e4f..5f634e5 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java @@ -82,7 +82,6 @@ public class OpeningViewHandler { } public void previous() { - ImportExport importExport = new ImportExport(view); JPanel panel = view.getPanel(); panel.removeAll(); step = step - 2; @@ -225,27 +224,27 @@ public class OpeningViewHandler { switch (defaultAccountsChartEnum) { case IMPORT_EBP: importExport.importExport(ImportExportEnum.EBP_ACCOUNTCHARTS_IMPORT, - null, defaultAccountsChartEnum.getDefaultFileURL(), false); + null, defaultAccountsChartEnum.getDefaultFileURL(), false); break; default: importExport.importExport(ImportExportEnum.CSV_ACCOUNTCHARTS_IMPORT, - null, defaultAccountsChartEnum.getDefaultFileURL(), false); + null, defaultAccountsChartEnum.getDefaultFileURL(), false); break; } //Import financialstatement switch (defaultAccountsChartEnum) { case SHORTENED: importExport.importExport(ImportExportEnum.CSV_FINANCIALSTATEMENTS_IMPORT, - null, defaultAccountsChartEnum.getDefaultFileURL(), false); + null, defaultAccountsChartEnum.getDefaultFileURL(), false); break; case DEVELOPED: importExport.importExport(ImportExportEnum.CSV_FINANCIALSTATEMENTS_IMPORT, - null, FinancialStatementsChartEnum.DEVELOPED.getDefaultFileUrl() , false); + null, FinancialStatementsChartEnum.DEVELOPED.getDefaultFileUrl() , false); break; default: importExport.importExport(ImportExportEnum.CSV_FINANCIALSTATEMENTS_IMPORT, - null, FinancialStatementsChartEnum.BASE.getDefaultFileUrl(), false); + null, FinancialStatementsChartEnum.BASE.getDefaultFileUrl(), false); break; } //Import vatstatement -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit ca0f1490c0b51139c02fbaedc7c4cfb274aa4e82 Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 19:21:11 2016 +0200 refs #1207 [ISO] suppression d'une méthode morte --- .../src/main/java/org/chorem/lima/business/api/EntryService.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/api/EntryService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/EntryService.java index a13442e..01a023e 100644 --- a/lima-business-api/src/main/java/org/chorem/lima/business/api/EntryService.java +++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/EntryService.java @@ -37,13 +37,6 @@ public interface EntryService { Entry createEntry(Entry entry); /** - * Return Entry of financial transaction related to the given ClosedPeriodicEntryBook - * @param closedPeriodicEntryBook The ClosedPeriodicEntryBook - * @return All Entry related to the ClosedPeriodicEntryBook - */ - List<Entry> findAllEntryByDateForEntryBook(ClosedPeriodicEntryBook closedPeriodicEntryBook); - - /** * Return values of financial transaction related to the given ClosedPeriodicEntryBook * @param closedPeriodicEntryBook The ClosedPeriodicEntryBook from where financial transaction are returned * @return list of tables of 0: boolean (true:credit), 1: amount -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 970f2cda7c040bc63635dadc7eab908075d8f9d5 Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 19:22:18 2016 +0200 refs #1207 [ISO] Nettoyage, petite corrections --- .../chorem/lima/business/LimaServiceFactory.java | 2 +- .../lima/business/ServiceMonitorableHandler.java | 28 +++++----- .../chorem/lima/business/api/ImportService.java | 4 +- .../accountingrules/FranceAccountingRules.java | 2 +- .../chorem/lima/business/ejb/EntryServiceImpl.java | 9 ---- .../lima/business/ejb/ExportServiceImpl.java | 7 ++- .../business/ejb/FinancialPeriodServiceImpl.java | 4 +- .../ejb/FinancialStatementServiceImpl.java | 2 +- .../ejb/FinancialTransactionServiceImpl.java | 62 +++++++++++----------- .../lima/business/ejb/FiscalPeriodServiceImpl.java | 14 +++-- .../lima/business/ejb/ImportServiceImpl.java | 13 ++--- .../lima/business/ejb/ReportServiceImpl.java | 4 +- .../lima/business/ejb/VatStatementServiceImpl.java | 2 +- .../chorem/lima/business/ejb/csv/EntryModel.java | 2 +- .../lima/business/ejb/ebp/EntryBookEBPModel.java | 2 +- .../business/ejb/report/CommonsDocumentReport.java | 11 ++-- .../FinancialTransactionServiceImplTest.java | 10 ++-- .../accountingrules/TestAccountingRules.java | 2 +- .../main/java/org/chorem/lima/beans/Condition.java | 4 +- .../lima/beans/FinancialTransactionCondition.java | 2 +- .../main/java/org/chorem/lima/beans/Labeled.java | 2 +- .../org/chorem/lima/beans/VisitorCondition.java | 24 ++++----- .../main/java/org/chorem/lima/clause/Clause.java | 2 +- .../java/org/chorem/lima/clause/DateClause.java | 2 +- .../java/org/chorem/lima/clause/NumberClause.java | 2 +- .../java/org/chorem/lima/clause/SetClause.java | 2 +- .../java/org/chorem/lima/clause/StringClause.java | 2 +- .../org/chorem/lima/clause/SubFilterClause.java | 2 +- .../java/org/chorem/lima/clause/VisitorClause.java | 18 +++---- .../main/java/org/chorem/lima/filter/Filter.java | 6 +-- .../org/chorem/lima/filter/FilterGenerator.java | 19 ++++--- .../java/org/chorem/lima/filter/VisitorFilter.java | 8 +-- .../chorem/lima/report/DocumentReportTypes.java | 2 +- .../chorem/lima/report/service/JasperReports.java | 2 +- .../java/org/chorem/lima/ui/MainViewHandler.java | 4 +- .../ui/accountViewer/AccountViewerViewHandler.java | 9 ++-- .../chorem/lima/ui/importexport/ImportExport.java | 2 +- .../org/chorem/lima/util/BigDecimalToString.java | 1 - .../java/org/chorem/lima/util/ErrorHelper.java | 2 +- 39 files changed, 144 insertions(+), 153 deletions(-) diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/LimaServiceFactory.java b/lima-business-api/src/main/java/org/chorem/lima/business/LimaServiceFactory.java index f5396c1..36b4a6f 100644 --- a/lima-business-api/src/main/java/org/chorem/lima/business/LimaServiceFactory.java +++ b/lima-business-api/src/main/java/org/chorem/lima/business/LimaServiceFactory.java @@ -50,7 +50,7 @@ public class LimaServiceFactory { private static LimaServiceFactory instance; /** Service cache. */ - protected Map<Class, Object> services = new HashMap<Class, Object>(); + protected Map<Class, Object> services = new HashMap<>(); /** EJB container. */ protected static EJBContainer container; diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/ServiceMonitorableHandler.java b/lima-business-api/src/main/java/org/chorem/lima/business/ServiceMonitorableHandler.java index 3d7386b..432ecca 100644 --- a/lima-business-api/src/main/java/org/chorem/lima/business/ServiceMonitorableHandler.java +++ b/lima-business-api/src/main/java/org/chorem/lima/business/ServiceMonitorableHandler.java @@ -57,23 +57,27 @@ public class ServiceMonitorableHandler implements InvocationHandler { public ServiceMonitorableHandler(Object service) { this.service = service; - listeners = new ArrayList<ServiceListener>(); + listeners = new ArrayList<>(); } @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { Object result = null; - if (method.getName().equals("addServiceListener")) { - addServiceListener((ServiceListener) args[0]); - } else if (method.getName().equals("removeServiceListener")) { - removeServiceListener((ServiceListener) args[0]); - } else { - try { - result = method.invoke(service, args); - } catch (InvocationTargetException eee) { - throw eee.getCause(); - } - notifyMethod(method); + switch (method.getName()) { + case "addServiceListener": + addServiceListener((ServiceListener) args[0]); + break; + case "removeServiceListener": + removeServiceListener((ServiceListener) args[0]); + break; + default: + try { + result = method.invoke(service, args); + } catch (InvocationTargetException eee) { + throw eee.getCause(); + } + notifyMethod(method); + break; } return result; } diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/api/ImportService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/ImportService.java index 08cd68b..bbccb51 100644 --- a/lima-business-api/src/main/java/org/chorem/lima/business/api/ImportService.java +++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/ImportService.java @@ -23,8 +23,6 @@ package org.chorem.lima.business.api; */ import org.chorem.lima.business.ImportExportResults; -import org.chorem.lima.business.exceptions.AlreadyExistAccountException; -import org.chorem.lima.business.exceptions.InvalidAccountNumberException; /** * Created by davidcosse on 03/06/14. @@ -45,7 +43,7 @@ public interface ImportService { ImportExportResults importVATStatementsAsCSV(String contents); - ImportExportResults importBackup(String entryBooks, String transactions, String fiscalPeriods, String accounts, String entries, String identity) throws AlreadyExistAccountException, InvalidAccountNumberException; + ImportExportResults importBackup(String entryBooks, String transactions, String fiscalPeriods, String accounts, String entries, String identity); //####################################### EBP ############################################## diff --git a/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java b/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java index 81f56f2..d9e6980 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java +++ b/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java @@ -112,7 +112,7 @@ public class FranceAccountingRules extends DefaultAccountingRules { BeginAfterEndFiscalPeriodException { super.createFiscalPeriodRules(fiscalPeriod); - List<FinancialPeriod> financialPeriods = new ArrayList<FinancialPeriod>(); + List<FinancialPeriod> financialPeriods = new ArrayList<>(); FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryServiceImpl.java index 742b4b0..e32cb48 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryServiceImpl.java @@ -52,15 +52,6 @@ public class EntryServiceImpl extends AbstractLimaService implements EntryServic } @Override - public List<Entry> findAllEntryByDateForEntryBook(ClosedPeriodicEntryBook closedPeriodicEntryBook) { - EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); - List<Entry> result = entryTopiaDao.findAllEntryByDateForEntryBook(closedPeriodicEntryBook.getEntryBook(), - closedPeriodicEntryBook.getFinancialPeriod().getBeginDate(), - closedPeriodicEntryBook.getFinancialPeriod().getEndDate()); - return result; - } - - @Override public List<Object[]> findDebitCreditOfTransaction(ClosedPeriodicEntryBook closedPeriodicEntryBook) { EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); List<Object[]> result = entryTopiaDao.getDebitCreditOfTransaction(closedPeriodicEntryBook.getEntryBook(), diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java index 066d259..4a1f4bf 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java @@ -200,14 +200,13 @@ public class ExportServiceImpl extends AbstractLimaService implements ExportServ return results; } - protected List<FinancialStatement> getAllSubFinancialStatements(List<FinancialStatement> result, Collection<FinancialStatement> subFinancialStatements) { + protected void addAllSubFinancialStatements(List<FinancialStatement> result, Collection<FinancialStatement> subFinancialStatements) { if (subFinancialStatements != null) { for (FinancialStatement subFinancialStatement : subFinancialStatements) { result.add(subFinancialStatement); - getAllSubFinancialStatements(result, subFinancialStatement.getSubFinancialStatements()); + addAllSubFinancialStatements(result, subFinancialStatement.getSubFinancialStatements()); } } - return result; } @Override @@ -219,7 +218,7 @@ public class ExportServiceImpl extends AbstractLimaService implements ExportServ if (rootFinancialStatements != null) { FinancialStatementModel model = new FinancialStatementModel(); List<FinancialStatement> financialStatements = new ArrayList<>(); - getAllSubFinancialStatements(financialStatements, rootFinancialStatements); + addAllSubFinancialStatements(financialStatements, rootFinancialStatements); try { exportResult.setExportData(Export.exportToString(model, financialStatements, Charset.forName(charset), true)); } catch (Exception e) { diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java index 86551c9..593bae3 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java @@ -101,8 +101,8 @@ public class FinancialPeriodServiceImpl extends AbstractLimaService implements F getDaoHelper().getClosedPeriodicEntryBookDao(); // reload object in current transaction - result = closedPeriodicEntryBookTopiaDao.findByTopiaId( - closedPeriodicEntryBook.getTopiaId()); + result = closedPeriodicEntryBookTopiaDao.forTopiaIdEquals( + closedPeriodicEntryBook.getTopiaId()).findUnique(); result.setLocked(true); result = closedPeriodicEntryBookTopiaDao.update(result); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java index 12458ea..13b1f7d 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java @@ -224,7 +224,7 @@ public class FinancialStatementServiceImpl extends AbstractLimaService implement BigDecimal grossAmount = BigDecimal.ZERO, provisionDeprecationAmount = BigDecimal.ZERO; - List<FinancialStatementAmounts> subResult = new ArrayList<FinancialStatementAmounts>(); + List<FinancialStatementAmounts> subResult = new ArrayList<>(); for (FinancialStatement subFinancialStatement : financialStatements) { FinancialStatementAmounts financialStatementAmounts = financialStatementAmounts(subFinancialStatement, selectedBeginDate, selectedEndDate); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java index cd0d9c2..b8fbabd 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java @@ -65,6 +65,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.function.Function; import static org.nuiton.i18n.I18n.t; @@ -94,6 +95,35 @@ public class FinancialTransactionServiceImpl extends AbstractLimaService impleme @EJB protected FinancialTransactionService financialTransactionService; + public static final Function<String, String> LETTERS_AFTER = new Function<String, String>() { + + @Override + public String apply(String letters) { + String letterAfter; + + /* "" -> "A" */ + if (StringUtils.isEmpty(letters)) { + + letterAfter = "A"; + + } else { + char endChar = letters.charAt(letters.length() - 1); + + if (endChar < 'Z') { + + /* si la lettre n'est pas un 'Z' on ajout a la reste de la chaine le caratère suivant */ + letterAfter = letters.substring(0, letters.length() -1) + ((char) (endChar + 1)); + } else { + /* si non on réitére sur le reste de la chaine en ajoutant "A" a la nouvelle chaine */ + letterAfter = LETTERS_AFTER.apply(letters.substring(0, letters.length() - 1)) + 'A'; + + } + + } + return letterAfter; + } + }; + @Override public FinancialTransaction createNewFinancialTransaction(){ FinancialTransactionTopiaDao financialtransactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); @@ -158,42 +188,14 @@ public class FinancialTransactionServiceImpl extends AbstractLimaService impleme EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); - List<String> letters = new ArrayList<String>(entryTopiaDao.findLetters()); + List<String> letters = new ArrayList<>(entryTopiaDao.findLetters()); String lastActualLetters = findLastLetter(letters); - String nextLetters = lettersAfter(lastActualLetters); + String nextLetters = LETTERS_AFTER.apply(lastActualLetters); return nextLetters; } - - public static String lettersAfter(String letters) { - - String letterAfter; - - /* "" -> "A" */ - if (StringUtils.isEmpty(letters)) { - - letterAfter = "A"; - - } else { - char endChar = letters.charAt(letters.length() - 1); - - if (endChar < 'Z') { - - /* si la lettre n'est pas un 'Z' on ajout a la reste de la chaine le caratère suivant */ - letterAfter = letters.substring(0, letters.length() -1) + ((char) (endChar + 1)); - } else { - /* si non on réitére sur le reste de la chaine en ajoutant "A" a la nouvelle chaine */ - letterAfter = lettersAfter(letters.substring(0, letters.length() -1)) + 'A'; - - } - - } - return letterAfter; - - } - @Override public List<String> getAllLetters() { diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java index ff04a1c..529158f 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java @@ -78,7 +78,6 @@ import java.math.BigDecimal; import java.util.Calendar; import java.util.Collection; import java.util.Date; -import java.util.Iterator; import java.util.List; import static org.nuiton.i18n.I18n.t; @@ -337,8 +336,7 @@ public class FiscalPeriodServiceImpl extends AbstractLimaService implements Fisc //look for the last financial period from the previous fiscal year //check if the last financial period isn't blocked - FinancialPeriod lastFPeriod = null; - lastFPeriod = getLastFinancialPeriodFromPreviousYear(localFiscalPeriod, lastFPeriod); + FinancialPeriod lastFPeriod = getLastFinancialPeriodFromPreviousYear(localFiscalPeriod); Date beginDateNextFiscalPeriod = DateUtils.addDays(localFiscalPeriod.getEndDate(), 1); @@ -463,11 +461,11 @@ public class FiscalPeriodServiceImpl extends AbstractLimaService implements Fisc return beginFinancialPeriod; } - protected FinancialPeriod getLastFinancialPeriodFromPreviousYear(FiscalPeriod localFiscalPeriod, FinancialPeriod lastFPeriod) { + protected FinancialPeriod getLastFinancialPeriodFromPreviousYear(FiscalPeriod localFiscalPeriod) { Collection<FinancialPeriod> fperiod = localFiscalPeriod.getFinancialPeriod(); - Iterator<FinancialPeriod> itr = fperiod.iterator(); - while (itr.hasNext()) { - lastFPeriod = itr.next(); + FinancialPeriod lastFPeriod = null; + for (FinancialPeriod aFperiod : fperiod) { + lastFPeriod = aFperiod; } return lastFPeriod; } @@ -493,7 +491,7 @@ public class FiscalPeriodServiceImpl extends AbstractLimaService implements Fisc return endRetainedAccount; } - protected Account createAccount(String accountNumber, String label) throws AlreadyExistAccountException, InvalidAccountNumberException, NotNumberAccountNumberException, NotAllowedLabelException { + protected Account createAccount(String accountNumber, String label) throws AlreadyExistAccountException, InvalidAccountNumberException, NotNumberAccountNumberException { Account endRetainedAccount; endRetainedAccount = new AccountImpl(); endRetainedAccount.setAccountNumber(accountNumber); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java index e9b4e0c..173f4e3 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java @@ -55,7 +55,6 @@ import org.chorem.lima.business.ejb.ebp.EntryBookEBPModel; import org.chorem.lima.business.ejb.ebp.EntryEBPModel; import org.chorem.lima.business.exceptions.AfterLastFiscalPeriodException; import org.chorem.lima.business.exceptions.AlreadyAffectedVatBoxException; -import org.chorem.lima.business.exceptions.AlreadyExistAccountException; import org.chorem.lima.business.exceptions.AlreadyExistEntryBookException; import org.chorem.lima.business.exceptions.AlreadyExistFinancialStatementException; import org.chorem.lima.business.exceptions.AlreadyExistVatStatementException; @@ -368,11 +367,7 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ result.increaseCreated(); } } catch (Exception e) { - if (e instanceof LimaException) { - result.addInitException((LimaException) e); - } else { - result.addInitException(new ImportFileException(e.getMessage())); - } + result.addInitException(new ImportFileException(e.getMessage())); results.setErrors(true); } finally { IOUtils.closeQuietly(contentStream); @@ -537,7 +532,7 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ } } - private FinancialStatement getRootFinancialStatement(Map<String, FinancialStatement> orderedFinancialStatements, final FinancialStatementImport financialStatementBean, final FinancialStatement financialStatement) throws AlreadyExistFinancialStatementException, NotAllowedLabelException { + private FinancialStatement getRootFinancialStatement(Map<String, FinancialStatement> orderedFinancialStatements, final FinancialStatementImport financialStatementBean, final FinancialStatement financialStatement) { FinancialStatement rootFinancialStatement = orderedFinancialStatements.get(financialStatementBean.getLabel()); if (rootFinancialStatement == null) { @@ -593,7 +588,7 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ return alreadyCreated; } - protected FinancialStatement createRootFinancialStatement(Map<String, FinancialStatement> orderedFinancialStatements, String rootMasterName, FinancialStatement rootFinancialStatement) throws AlreadyExistFinancialStatementException, NotAllowedLabelException { + protected FinancialStatement createRootFinancialStatement(Map<String, FinancialStatement> orderedFinancialStatements, String rootMasterName, FinancialStatement rootFinancialStatement) { if (rootFinancialStatement == null) { rootFinancialStatement = financialStatementService.newFinancialStatement(); rootFinancialStatement.setLabel(rootMasterName); @@ -799,7 +794,7 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ } @Override - public ImportExportResults importBackup(String entryBooks, String financialTransactions, String fiscalPeriods, String accounts, String entries, String identity) throws AlreadyExistAccountException, InvalidAccountNumberException { + public ImportExportResults importBackup(String entryBooks, String financialTransactions, String fiscalPeriods, String accounts, String entries, String identity) { ImportExportResults globalResult = importAccountAsCSV(accounts); if (globalResult.isErrors()){ return globalResult; diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java index ce9e57e..3dc4429 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java @@ -84,7 +84,7 @@ public class ReportServiceImpl extends AbstractLimaService implements ReportServ BigDecimal credit = BigDecimal.ZERO; BigDecimal debit = BigDecimal.ZERO; BigDecimal solde = BigDecimal.ZERO; - List<Entry> entries = new ArrayList<Entry>(); + List<Entry> entries = new ArrayList<>(); ReportsDatas reportsDatas = generateSubAccountReports(account, beginDate, endDate); @@ -400,7 +400,7 @@ public class ReportServiceImpl extends AbstractLimaService implements ReportServ */ @Override public List<Object> generateVat(FiscalPeriod fiscalPeriod) { - List<Object> list = new ArrayList<Object>(); + List<Object> list = new ArrayList<>(); //lists all accounts AccountTopiaDao accountTopiaDao = getDaoHelper().getAccountDao(); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java index f792e18..8abfa75 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java @@ -287,7 +287,7 @@ public class VatStatementServiceImpl extends AbstractLimaService implements VatS BigDecimal amount = BigDecimal.ZERO; List<VatStatementAmounts> subResult = - new ArrayList<VatStatementAmounts>(); + new ArrayList<>(); for (VatStatement subVatStatement : vatStatements) { VatStatementAmounts vatStatementAmounts = vatStatementAmounts(subVatStatement, diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryModel.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryModel.java index d99f696..0a1e236 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryModel.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryModel.java @@ -195,5 +195,5 @@ public class EntryModel extends AbstractLimaModel<Entry> implements ExportModel< } return result; } - }; + } } diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/ebp/EntryBookEBPModel.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/ebp/EntryBookEBPModel.java index 6ebe971..f63d44f 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/ebp/EntryBookEBPModel.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/ebp/EntryBookEBPModel.java @@ -63,7 +63,7 @@ public class EntryBookEBPModel extends AbstractLimaModel<EntryBook> implements E @Override public Iterable<ExportableColumn<EntryBook, Object>> getColumnsForExport() { - ModelBuilder<EntryBook> modelBuilder = new ModelBuilder<EntryBook>(); + ModelBuilder<EntryBook> modelBuilder = new ModelBuilder<>(); modelBuilder.newColumnForExport("Code", EntryBook.PROPERTY_CODE); modelBuilder.newColumnForExport("Libelle", EntryBook.PROPERTY_LABEL); return (Iterable) modelBuilder.getColumnsForExport(); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/CommonsDocumentReport.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/CommonsDocumentReport.java index 4b4654a..e0e60e1 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/CommonsDocumentReport.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/CommonsDocumentReport.java @@ -40,11 +40,14 @@ import static org.nuiton.i18n.I18n.t; */ public class CommonsDocumentReport { - public static SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd/MM/yyyy"); - public static SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("HH:mm"); + public static final String DATE_FOMRAT ="dd/MM/yyyy"; + public static final String TIME_FORMAT = "HH:mm"; protected static DocumentReport getDocumentReport(String reportName, Date from, Date to, JasperReport subReport, DecimalFormat bigDecimalFormat, IdentityService identityService) { Date currentDate = new Date(); + SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FOMRAT); + SimpleDateFormat timeFormat = new SimpleDateFormat(TIME_FORMAT); + DocumentReport documentReport = new DocumentReportImpl(); documentReport.setSubReport(subReport); documentReport.setFormatter(bigDecimalFormat); @@ -68,8 +71,8 @@ public class CommonsDocumentReport { documentReport.setTitleCompanySiretLabel(t("lima-business.document.titleCompanySiretLabel")); documentReport.setTitleCompanyPhoneLabel(t("lima-business.document.titleCompanyPhoneLabel")); - documentReport.setTitleCurrentDate(t("lima-business.document.titleCurrentDate", DATE_FORMAT.format(currentDate), TIME_FORMAT.format(currentDate))); - documentReport.setTitleFromToDate(t("lima-business.document.titleFromToDate", DATE_FORMAT.format(from), DATE_FORMAT.format(to))); + documentReport.setTitleCurrentDate(t("lima-business.document.titleCurrentDate", dateFormat.format(currentDate), dateFormat.format(currentDate))); + documentReport.setTitleFromToDate(t("lima-business.document.titleFromToDate", timeFormat.format(from), timeFormat.format(to))); documentReport.setHeaderSelectedAccountsLabel(t("lima-business.document.headerSelectedAccountsLabel")); documentReport.setHeaderCurrencyLabel(t("lima-business.document.headerCurrencyLabel")); diff --git a/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java b/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java index 5650f35..0ebf319 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java @@ -786,11 +786,11 @@ public class FinancialTransactionServiceImplTest extends AbstractLimaTest { @Test public void testLettersAfter() { - Assert.assertEquals("A", FinancialTransactionServiceImpl.lettersAfter(null)); - Assert.assertEquals("A", FinancialTransactionServiceImpl.lettersAfter("")); - Assert.assertEquals("E", FinancialTransactionServiceImpl.lettersAfter("D")); - Assert.assertEquals("AA", FinancialTransactionServiceImpl.lettersAfter("Z")); - Assert.assertEquals("ASDGUAAAA", FinancialTransactionServiceImpl.lettersAfter("ASDGTZZZZ")); + Assert.assertEquals("A", FinancialTransactionServiceImpl.LETTERS_AFTER.apply(null)); + Assert.assertEquals("A", FinancialTransactionServiceImpl.LETTERS_AFTER.apply("")); + Assert.assertEquals("E", FinancialTransactionServiceImpl.LETTERS_AFTER.apply("D")); + Assert.assertEquals("AA", FinancialTransactionServiceImpl.LETTERS_AFTER.apply("Z")); + Assert.assertEquals("ASDGUAAAA", FinancialTransactionServiceImpl.LETTERS_AFTER.apply("ASDGTZZZZ")); } diff --git a/lima-business/src/test/java/org/chorem/lima/business/accountingrules/TestAccountingRules.java b/lima-business/src/test/java/org/chorem/lima/business/accountingrules/TestAccountingRules.java index d7c3c0e..240165a 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/accountingrules/TestAccountingRules.java +++ b/lima-business/src/test/java/org/chorem/lima/business/accountingrules/TestAccountingRules.java @@ -65,7 +65,7 @@ public class TestAccountingRules extends DefaultAccountingRules { NotBeginNextDayOfLastFiscalPeriodException, BeginAfterEndFiscalPeriodException { super.createFiscalPeriodRules(fiscalPeriod); - List<FinancialPeriod> financialPeriods = new ArrayList<FinancialPeriod>(); + List<FinancialPeriod> financialPeriods = new ArrayList<>(); FiscalPeriodTopiaDao fiscalPeriodDAO = getDaoHelper().getFiscalPeriodDao(); //Checks if is not the first fiscalperiod to create diff --git a/lima-callao/src/main/java/org/chorem/lima/beans/Condition.java b/lima-callao/src/main/java/org/chorem/lima/beans/Condition.java index 1316aa9..ea43243 100644 --- a/lima-callao/src/main/java/org/chorem/lima/beans/Condition.java +++ b/lima-callao/src/main/java/org/chorem/lima/beans/Condition.java @@ -31,8 +31,8 @@ public interface Condition { * Accept the condition if there is benefice to execute it * @return true if the condition is valid */ - public boolean validCondition(); + boolean validCondition(); - public void accept(VisitorCondition v); + void accept(VisitorCondition v); } diff --git a/lima-callao/src/main/java/org/chorem/lima/beans/FinancialTransactionCondition.java b/lima-callao/src/main/java/org/chorem/lima/beans/FinancialTransactionCondition.java index 36c5a13..5e25e0d 100644 --- a/lima-callao/src/main/java/org/chorem/lima/beans/FinancialTransactionCondition.java +++ b/lima-callao/src/main/java/org/chorem/lima/beans/FinancialTransactionCondition.java @@ -36,7 +36,7 @@ public class FinancialTransactionCondition implements Condition, Serializable { protected List<Condition> conditions; public FinancialTransactionCondition() { - conditions = new ArrayList<Condition>(); + conditions = new ArrayList<>(); } public boolean isAllConditions() { diff --git a/lima-callao/src/main/java/org/chorem/lima/beans/Labeled.java b/lima-callao/src/main/java/org/chorem/lima/beans/Labeled.java index 481829e..dfb777b 100644 --- a/lima-callao/src/main/java/org/chorem/lima/beans/Labeled.java +++ b/lima-callao/src/main/java/org/chorem/lima/beans/Labeled.java @@ -27,5 +27,5 @@ package org.chorem.lima.beans; */ public interface Labeled { - public String getLabel(); + String getLabel(); } diff --git a/lima-callao/src/main/java/org/chorem/lima/beans/VisitorCondition.java b/lima-callao/src/main/java/org/chorem/lima/beans/VisitorCondition.java index bb6727b..128092d 100644 --- a/lima-callao/src/main/java/org/chorem/lima/beans/VisitorCondition.java +++ b/lima-callao/src/main/java/org/chorem/lima/beans/VisitorCondition.java @@ -27,27 +27,27 @@ package org.chorem.lima.beans; */ public interface VisitorCondition { - public void visitDateCondition(DateCondition condition); + void visitDateCondition(DateCondition condition); - public void visitDateIntervalCondition(DateIntervalCondition condition); + void visitDateIntervalCondition(DateIntervalCondition condition); - public void visitEntryBookCondition(EntryBookCondition condition); + void visitEntryBookCondition(EntryBookCondition condition); - public void visitFinancialPeriodCondition(FinancialPeriodCondition condition); + void visitFinancialPeriodCondition(FinancialPeriodCondition condition); - public void visitFinancialTransactionCondition(FinancialTransactionCondition condition); + void visitFinancialTransactionCondition(FinancialTransactionCondition condition); - public void visitFiscalPeriodCondition(FiscalPeriodCondition condition); + void visitFiscalPeriodCondition(FiscalPeriodCondition condition); - public void visitDescriptionCondition(DescriptionCondition descriptionCondition); + void visitDescriptionCondition(DescriptionCondition descriptionCondition); - public void visitVoucherCondition(VoucherCondition voucherCondition); + void visitVoucherCondition(VoucherCondition voucherCondition); - public void visitLetteringCondition(LetteringCondition letteringCondition); + void visitLetteringCondition(LetteringCondition letteringCondition); - public void visitAccountCondition(AccountCondition accountCondition); + void visitAccountCondition(AccountCondition accountCondition); - public void visitDebitCondition(DebitCondition debitCondition); + void visitDebitCondition(DebitCondition debitCondition); - public void visitCreditCondition(CreditCondition creditCondition); + void visitCreditCondition(CreditCondition creditCondition); } diff --git a/lima-callao/src/main/java/org/chorem/lima/clause/Clause.java b/lima-callao/src/main/java/org/chorem/lima/clause/Clause.java index ff3177a..6a9c3f9 100644 --- a/lima-callao/src/main/java/org/chorem/lima/clause/Clause.java +++ b/lima-callao/src/main/java/org/chorem/lima/clause/Clause.java @@ -27,7 +27,7 @@ package org.chorem.lima.clause; */ public interface Clause { - public void accept(VisitorClause v); + void accept(VisitorClause v); } diff --git a/lima-callao/src/main/java/org/chorem/lima/clause/DateClause.java b/lima-callao/src/main/java/org/chorem/lima/clause/DateClause.java index fb68c45..635b9ca 100644 --- a/lima-callao/src/main/java/org/chorem/lima/clause/DateClause.java +++ b/lima-callao/src/main/java/org/chorem/lima/clause/DateClause.java @@ -73,7 +73,7 @@ public class DateClause implements Clause { SAME, AFTER, PREVIOUS, - DIFFERENT; + DIFFERENT } } diff --git a/lima-callao/src/main/java/org/chorem/lima/clause/NumberClause.java b/lima-callao/src/main/java/org/chorem/lima/clause/NumberClause.java index 44c5b44..eb7f4b6 100644 --- a/lima-callao/src/main/java/org/chorem/lima/clause/NumberClause.java +++ b/lima-callao/src/main/java/org/chorem/lima/clause/NumberClause.java @@ -73,6 +73,6 @@ public class NumberClause implements Clause { UPPER, UPPER_OR_EQUAL, LOWER, - LOWER_OR_EQUAL; + LOWER_OR_EQUAL } } diff --git a/lima-callao/src/main/java/org/chorem/lima/clause/SetClause.java b/lima-callao/src/main/java/org/chorem/lima/clause/SetClause.java index 34e9b75..2ff7ea4 100644 --- a/lima-callao/src/main/java/org/chorem/lima/clause/SetClause.java +++ b/lima-callao/src/main/java/org/chorem/lima/clause/SetClause.java @@ -61,7 +61,7 @@ public class SetClause<T> extends HashSet<T> implements Clause { public enum Operand { IN, - NOT_IN; + NOT_IN } diff --git a/lima-callao/src/main/java/org/chorem/lima/clause/StringClause.java b/lima-callao/src/main/java/org/chorem/lima/clause/StringClause.java index e66db8d..2df6785 100644 --- a/lima-callao/src/main/java/org/chorem/lima/clause/StringClause.java +++ b/lima-callao/src/main/java/org/chorem/lima/clause/StringClause.java @@ -83,6 +83,6 @@ public class StringClause implements Clause { NOT_EQUAL, BEGIN, ENDING, - CONTAIN; + CONTAIN } } diff --git a/lima-callao/src/main/java/org/chorem/lima/clause/SubFilterClause.java b/lima-callao/src/main/java/org/chorem/lima/clause/SubFilterClause.java index 00e04ab..f9d7038 100644 --- a/lima-callao/src/main/java/org/chorem/lima/clause/SubFilterClause.java +++ b/lima-callao/src/main/java/org/chorem/lima/clause/SubFilterClause.java @@ -72,7 +72,7 @@ public class SubFilterClause implements Clause { public enum Multiplicity { ONE, - MANY; + MANY } } diff --git a/lima-callao/src/main/java/org/chorem/lima/clause/VisitorClause.java b/lima-callao/src/main/java/org/chorem/lima/clause/VisitorClause.java index 1c4a18d..4b5e6dc 100644 --- a/lima-callao/src/main/java/org/chorem/lima/clause/VisitorClause.java +++ b/lima-callao/src/main/java/org/chorem/lima/clause/VisitorClause.java @@ -27,21 +27,21 @@ package org.chorem.lima.clause; */ public interface VisitorClause { - public void visitDateClause(DateClause dateClause); + void visitDateClause(DateClause dateClause); - public void visitAndClause(AndClause andClause); + void visitAndClause(AndClause andClause); - public void visitBooleanClause(BooleanClause booleanClause); + void visitBooleanClause(BooleanClause booleanClause); - public void visitNumberClause(NumberClause numberClause); + void visitNumberClause(NumberClause numberClause); - public void visitOrClause(OrClause orClause); + void visitOrClause(OrClause orClause); - public void visitNotClause(NotClause notClause); + void visitNotClause(NotClause notClause); - public void visitSetClause(SetClause setClause); + void visitSetClause(SetClause setClause); - public void visitStringClause(StringClause stringClause); + void visitStringClause(StringClause stringClause); - public void visitSubFilterClause(SubFilterClause subFilterClause); + void visitSubFilterClause(SubFilterClause subFilterClause); } diff --git a/lima-callao/src/main/java/org/chorem/lima/filter/Filter.java b/lima-callao/src/main/java/org/chorem/lima/filter/Filter.java index 9877f4e..2c061e1 100644 --- a/lima-callao/src/main/java/org/chorem/lima/filter/Filter.java +++ b/lima-callao/src/main/java/org/chorem/lima/filter/Filter.java @@ -29,10 +29,10 @@ import org.chorem.lima.clause.Clause; */ public interface Filter { - public void accept(VisitorFilter v); + void accept(VisitorFilter v); - public Clause getClause(); + Clause getClause(); - public Class getEntityClass(); + Class getEntityClass(); } diff --git a/lima-callao/src/main/java/org/chorem/lima/filter/FilterGenerator.java b/lima-callao/src/main/java/org/chorem/lima/filter/FilterGenerator.java index 8b02962..f5a3fb3 100644 --- a/lima-callao/src/main/java/org/chorem/lima/filter/FilterGenerator.java +++ b/lima-callao/src/main/java/org/chorem/lima/filter/FilterGenerator.java @@ -67,8 +67,8 @@ public class FilterGenerator implements VisitorCondition { protected EntryFilter entryFilter; public FilterGenerator() { - clauses = new ArrayList<Clause>(); - entryClauses = new ArrayList<Clause>(); + clauses = new ArrayList<>(); + entryClauses = new ArrayList<>(); } @@ -216,13 +216,12 @@ public class FilterGenerator implements VisitorCondition { } } - protected EntryFilter getEntryFilter() { + protected void setupEntryFilter() { if (entryFilter == null) { SubFilterClause subFilterClause = filter.newEntryFilterClause(); clauses.add(subFilterClause); entryFilter = (EntryFilter) subFilterClause.getSubFilter(); } - return entryFilter; } protected StringClause.Operand getStringClauseOperand(AbstractStringCondition.Operand operand) { @@ -253,7 +252,7 @@ public class FilterGenerator implements VisitorCondition { if (descriptionCondition != null && descriptionCondition.getOperand() != null && StringUtils.isNotBlank(descriptionCondition.getValue())) { - getEntryFilter(); + setupEntryFilter(); StringClause stringClause = entryFilter.newDescriptionClause(); AbstractStringCondition.Operand operand = descriptionCondition.getOperand(); @@ -270,7 +269,7 @@ public class FilterGenerator implements VisitorCondition { @Override public void visitVoucherCondition(VoucherCondition voucherCondition) { - getEntryFilter(); + setupEntryFilter(); StringClause stringClause = entryFilter.newVoucherClause(); AbstractStringCondition.Operand operand = voucherCondition.getOperand(); @@ -290,7 +289,7 @@ public class FilterGenerator implements VisitorCondition { if (letteringCondition != null && letteringCondition.getOperand() != null && StringUtils.isNotBlank(letteringCondition.getValue())){ - getEntryFilter(); + setupEntryFilter(); StringClause stringClause = entryFilter.newLetteringClause(); AbstractStringCondition.Operand operand = letteringCondition.getOperand(); @@ -311,7 +310,7 @@ public class FilterGenerator implements VisitorCondition { if (accountCondition != null && accountCondition.getAccount() != null && accountCondition.getAccount().getAccountNumber() != null){ - getEntryFilter(); + setupEntryFilter(); SubFilterClause subFilterClause = entryFilter.newAccountFilterClause(); AccountFilter accountFilter = (AccountFilter) subFilterClause.getSubFilter(); StringClause stringClause = accountFilter.newAccountNumberClause(); @@ -357,7 +356,7 @@ public class FilterGenerator implements VisitorCondition { if (debitCondition != null && debitCondition.getOperand() != null && debitCondition.getValue() != null){ - getEntryFilter(); + setupEntryFilter(); BooleanClause debitClause = entryFilter.newDebitClause(); @@ -380,7 +379,7 @@ public class FilterGenerator implements VisitorCondition { @Override public void visitCreditCondition(CreditCondition creditCondition) { if (creditCondition != null && creditCondition.getOperand() != null && creditCondition.getValue() != null) { - getEntryFilter(); + setupEntryFilter(); BooleanClause debitClause = entryFilter.newDebitClause(); NotClause creditClause = new NotClause(); diff --git a/lima-callao/src/main/java/org/chorem/lima/filter/VisitorFilter.java b/lima-callao/src/main/java/org/chorem/lima/filter/VisitorFilter.java index af51d60..47b0cc7 100644 --- a/lima-callao/src/main/java/org/chorem/lima/filter/VisitorFilter.java +++ b/lima-callao/src/main/java/org/chorem/lima/filter/VisitorFilter.java @@ -27,11 +27,11 @@ package org.chorem.lima.filter; */ public interface VisitorFilter { - public void visitAccountFilter(AccountFilter accountFilter); + void visitAccountFilter(AccountFilter accountFilter); - public void visitEntryBookFilter(EntryBookFilter entryBookFilter); + void visitEntryBookFilter(EntryBookFilter entryBookFilter); - public void visitEntryFilter(EntryFilter entryFilter); + void visitEntryFilter(EntryFilter entryFilter); - public void visitFinancialTransactionFilter(FinancialTransactionFilter financialTransactionFilter); + void visitFinancialTransactionFilter(FinancialTransactionFilter financialTransactionFilter); } diff --git a/lima-report/src/main/java/org/chorem/lima/report/DocumentReportTypes.java b/lima-report/src/main/java/org/chorem/lima/report/DocumentReportTypes.java index 6dafd4c..190ed67 100644 --- a/lima-report/src/main/java/org/chorem/lima/report/DocumentReportTypes.java +++ b/lima-report/src/main/java/org/chorem/lima/report/DocumentReportTypes.java @@ -42,5 +42,5 @@ public enum DocumentReportTypes { GENERAL_ENTRY_BOOK_ENTRIES, LEDGER, LEDGER_GENERAL_LEDGERS, - LEDGER_ENTRIES; + LEDGER_ENTRIES } diff --git a/lima-report/src/main/java/org/chorem/lima/report/service/JasperReports.java b/lima-report/src/main/java/org/chorem/lima/report/service/JasperReports.java index 2a1242d..52174d1 100644 --- a/lima-report/src/main/java/org/chorem/lima/report/service/JasperReports.java +++ b/lima-report/src/main/java/org/chorem/lima/report/service/JasperReports.java @@ -129,7 +129,7 @@ public class JasperReports { try { JasperReport report = reportsByDocumentType.get(reportType); if (report != null) { - Map<String, Object> parameters = new HashMap<String, Object>(); + Map<String, Object> parameters = new HashMap<>(); JRBeanCollectionDataSource dataSource = new JRBeanCollectionDataSource(reports); JasperPrint jasperPrint = JasperFillManager.fillReport(report, parameters, dataSource); JasperExportManager.exportReportToPdfFile(jasperPrint, path); diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java index 91d18ba..9dbdc02 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java @@ -230,7 +230,7 @@ public class MainViewHandler { helper.addOption(LimaSwingConfig.Option.LOCALE); helper.setOptionShortLabel(LimaSwingConfig.Option.LOCALE.getLabel()); - JComboBox<Character> comboBoxSeparator = new JComboBox<Character>(LimaSwingConfig.NUMBER_SEPARATOR.toArray(new Character[LimaSwingConfig.NUMBER_SEPARATOR.size()])); + JComboBox<Character> comboBoxSeparator = new JComboBox<>(LimaSwingConfig.NUMBER_SEPARATOR.toArray(new Character[LimaSwingConfig.NUMBER_SEPARATOR.size()])); DefaultCellEditor separatorEditor = new DefaultCellEditor(comboBoxSeparator); comboBoxSeparator.setRenderer(new NumberSeparatorCellRenderer()); NumberSeparatorTableCellRenderer separatorRenderer = new NumberSeparatorTableCellRenderer(); @@ -242,7 +242,7 @@ public class MainViewHandler { helper.setOptionRenderer(separatorRenderer); helper.setOptionEditor(separatorEditor); - JComboBox<Integer> comboBoxDecimal = new JComboBox<Integer>(LimaSwingConfig.NUMBER_DECIMALS.toArray(new Integer[LimaSwingConfig.NUMBER_DECIMALS.size()])); + JComboBox<Integer> comboBoxDecimal = new JComboBox<>(LimaSwingConfig.NUMBER_DECIMALS.toArray(new Integer[LimaSwingConfig.NUMBER_DECIMALS.size()])); DefaultCellEditor decimalEditor = new DefaultCellEditor(comboBoxDecimal); helper.addOption(optionsService.getScaleOption()); helper.setOptionShortLabel(optionsService.getScaleOption().getLabel()); diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerViewHandler.java index a281089..8a9659f 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerViewHandler.java @@ -77,6 +77,8 @@ import static org.nuiton.i18n.I18n.t; */ public class AccountViewerViewHandler { + public static final String YEAR_DATE_FORMAT = "yyyy"; + protected AccountViewerView view; protected AccountService accountService; @@ -98,7 +100,6 @@ public class AccountViewerViewHandler { private static final Log log = LogFactory.getLog(AccountViewerViewHandler.class); protected boolean initializationComplete; - public static final SimpleDateFormat YYYY = new SimpleDateFormat("yyyy"); public AccountViewerViewHandler(AccountViewerView view) { @@ -593,7 +594,8 @@ public class AccountViewerViewHandler { if (previousPeriodFilter != null) { if (editModel.getPeriodChoice().equals(PeriodChoice.FISCAL_PERIOD)) { String summaryLabel = t("lima.accountingView.summaryFiscalPeriodLabel"); - view.getBeginPeriodSummary().setText(String.format(t(summaryLabel), YYYY.format(previousPeriodFilter.getDateStart()))); + SimpleDateFormat yearFormat = new SimpleDateFormat(YEAR_DATE_FORMAT); + view.getBeginPeriodSummary().setText(String.format(t(summaryLabel), yearFormat.format(previousPeriodFilter.getDateStart()))); } else { String summaryLabel = t("lima.accountingView.summaryLabel"); view.getBeginPeriodSummary().setText(String.format(t(summaryLabel), getDateFormat().format(previousPeriodFilter.getDateStart()), getDateFormat().format(getDayMinus1Calendar(previousPeriodFilter.getDateEnd()).getTime()))); @@ -617,7 +619,8 @@ public class AccountViewerViewHandler { protected void setViewActualSold(LetteringFilter actualPeriodFilter) { if (editModel.getPeriodChoice().equals(PeriodChoice.FISCAL_PERIOD)) { String summaryLabel = t("lima.accountingView.summaryFiscalPeriodLabel"); - view.getEndPeriodSummary().setText(String.format(t(summaryLabel), YYYY.format(actualPeriodFilter.getDateEnd()))); + SimpleDateFormat yearFormat = new SimpleDateFormat("yyyy"); + view.getEndPeriodSummary().setText(String.format(t(summaryLabel), yearFormat.format(actualPeriodFilter.getDateEnd()))); } else { String summaryLabel = t("lima.accountingView.summaryLabel"); view.getEndPeriodSummary().setText(String.format(t(summaryLabel), getDateFormat().format(actualPeriodFilter.getDateStart()), getDateFormat().format(actualPeriodFilter.getDateEnd()))); diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java index 6dfe168..970d1b1 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java @@ -515,7 +515,7 @@ public class ImportExport { JFileChooser chooser = new JFileChooser(); //Encoding option - JComboBox comboBox = new JComboBox<String>(EncodingEnum.descriptions()); + JComboBox comboBox = new JComboBox<>(EncodingEnum.descriptions()); if (importExportMethod.getEncodingOption()) { JPanel panel = new JPanel(); diff --git a/lima-swing/src/main/java/org/chorem/lima/util/BigDecimalToString.java b/lima-swing/src/main/java/org/chorem/lima/util/BigDecimalToString.java index c1ccea3..8eeff91 100644 --- a/lima-swing/src/main/java/org/chorem/lima/util/BigDecimalToString.java +++ b/lima-swing/src/main/java/org/chorem/lima/util/BigDecimalToString.java @@ -27,7 +27,6 @@ import org.chorem.lima.LimaSwingConfig; import java.math.BigDecimal; import java.text.DecimalFormat; -import java.text.DecimalFormatSymbols; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java b/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java index 8a1a184..e338782 100644 --- a/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java +++ b/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java @@ -122,7 +122,7 @@ public class ErrorHelper implements ErrorReporter { // message configuration message.append(formatMessage("Configuration", null)); - List<String> propertiesNames = new ArrayList<String>(config.getOptions().stringPropertyNames()); + List<String> propertiesNames = new ArrayList<>(config.getOptions().stringPropertyNames()); Collections.sort(propertiesNames); for (String propertyName : propertiesNames) { // security, don't send string containing password : -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm