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>.