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 f98a9f825e47eeb4ab6adab9bb497ec90985dd31 Author: David Cossé <cosse@codelutin.com> Date: Fri Oct 27 01:07:55 2017 +0200 refs #1394 petites amméliorations --- .../src/main/java/org/chorem/lima/ui/MainViewHandler.java | 12 +++--------- .../chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java | 4 ++-- .../FinancialTransactionViewHandler.java | 6 +++--- .../fiscalControlExport/FiscalControlExportViewHandler.java | 2 +- .../org/chorem/lima/ui/home/FinancialTransactionsPane.java | 8 ++++---- .../org/chorem/lima/ui/lettering/LetteringEditModel.java | 4 ++-- 6 files changed, 15 insertions(+), 21 deletions(-) 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 97123a23..b3c764e0 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 @@ -483,21 +483,15 @@ public class MainViewHandler { case CSV_ALL_IMPORT: mainView.setMainUiRefreshComponent(MainUiRefreshComponent.ALL); break; - case CSV_ENTRYBOOKS_IMPORT: - mainView.setMainUiRefreshComponent(MainUiRefreshComponent.ENTRY_BOOK_PANE); - break; - case CSV_ENTRIES_IMPORT: - mainView.setMainUiRefreshComponent(MainUiRefreshComponent.FINANCIAL_TRANSACTION_PANE); - break; - case CSV_FINANCIALSTATEMENTS_IMPORT: - mainView.setMainUiRefreshComponent(MainUiRefreshComponent.FINANCIAL_TRANSACTION_PANE); - break; case EBP_ACCOUNTCHARTS_IMPORT: mainView.setMainUiRefreshComponent(MainUiRefreshComponent.ACCOUNT_PANE); break; + case CSV_ENTRIES_IMPORT: + case CSV_FINANCIALSTATEMENTS_IMPORT: case EBP_ENTRIES_IMPORT: mainView.setMainUiRefreshComponent(MainUiRefreshComponent.FINANCIAL_TRANSACTION_PANE); break; + case CSV_ENTRYBOOKS_IMPORT: case EBP_ENTRYBOOKS_IMPORT: mainView.setMainUiRefreshComponent(MainUiRefreshComponent.ENTRY_BOOK_PANE); break; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java b/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java index a2451a4e..82202d36 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java @@ -3,7 +3,7 @@ package org.chorem.lima.ui.celleditor; * #%L * Lima :: Swing * %% - * Copyright (C) 2012 CodeLutin + * Copyright (C) 2017 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -80,7 +80,7 @@ public class BigDecimalTableCellEditor extends StringTableCellEditor { String valueToConvert; - int pointIndex = stringValue.indexOf("."); + int pointIndex = stringValue.indexOf('.'); if (pointIndex != -1) { LimaSwingConfig config = LimaSwingApplicationContext.getContext().getConfig(); String actualDecimals = stringValue.substring(pointIndex, stringValue.length() - 1); diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java index 33592a7d..a9c5dc1e 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java @@ -2,7 +2,7 @@ * #%L * Lima :: Swing * %% - * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric + * Copyright (C) 2008 - 2017 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -693,13 +693,13 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo String defaultAccount; //TODO dcosse pas de valeur en dur //Actual (2017) tva percentage : 20% - BigDecimal tvaPercentAdd = new BigDecimal(0.2); + BigDecimal tvaPercentAdd = BigDecimal.valueOf(0.2); BigDecimal tvaTax = null; //Calculation of tva tax only if first entry is a sale if (lastEntry != null && lastEntry.getAccount() != null) { defaultAccount = lastEntry.getAccount().getAccountNumber(); - if (defaultAccount.equals("410") || defaultAccount.equals("418")) { + if ("410".equals(defaultAccount) || "418".equals(defaultAccount)) { tvaTax = (lastEntry.getAmount()).multiply(tvaPercentAdd); } } 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 21381b50..6fa44dd7 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 @@ -4,7 +4,7 @@ package org.chorem.lima.ui.fiscalControlExport; * #%L * Lima :: Swing * %% - * Copyright (C) 2008 - 2015 CodeLutin + * Copyright (C) 2008 - 2017 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java b/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java index 9a3aef59..430e0862 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java @@ -2,7 +2,7 @@ * #%L * Lima :: Swing * %% - * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric + * Copyright (C) 2008 - 2017 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -102,11 +102,11 @@ public class FinancialTransactionsPane extends AbstractHomePane implements Servi List<EntryBook> entryBooks = entryBookService.getAllEntryBooks(); //Au moins un exercice ouvert et un journal ouvert - if (unblockedFiscalPeriods.size() != 0 && entryBooks.size() != 0) { + if (!unblockedFiscalPeriods.isEmpty() && !entryBooks.isEmpty()) { List<FinancialTransaction> financialTransactionsInexact = financialTransactionService. getAllInexactFinancialTransactions(unblockedFiscalPeriods.get(0)); - if (financialTransactionsInexact.size() > 0) { + if (!financialTransactionsInexact.isEmpty()) { setBackground(RED_BACKGROUND); String transactionsString = t("lima.home.entries.error", financialTransactionsInexact.size()) + "<br/><br/><a href='#financialtransactionunbalanced'>" @@ -117,7 +117,7 @@ public class FinancialTransactionsPane extends AbstractHomePane implements Servi List<FinancialTransaction> financialTransactionsBal = financialTransactionService.getAllFinancialTransactionsBalanced(unblockedFiscalPeriods.get(0)); - if (financialTransactionsBal.size() > 0) { + if (!financialTransactionsBal.isEmpty()) { setBackground(GREEN_BACKGROUND); String transactionsString = t("lima.home.entries.balanced", financialTransactionsBal.size()) + "<br/><br/><a href='#financialtransactionbalanced'>" diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java index d75c09c7..72e34b3e 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java @@ -2,7 +2,7 @@ * #%L * Lima :: Swing * %% - * Copyright (C) 2012 CodeLutin + * Copyright (C) 2017 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -76,7 +76,7 @@ public class LetteringEditModel implements Serializable { public void setLettered(boolean lettered) { boolean oldLettrer = isLettered(); - this.lettered = lettered && (BigDecimal.ZERO.equals(sold) || sold.doubleValue() == 0) && lettered; + this.lettered = lettered && (BigDecimal.ZERO.equals(sold) || sold.doubleValue() == 0); firePropertyChange(PROPERTY_LETTERED, oldLettrer, this.lettered); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.