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 290db76458c77b42dab19cb6bef6cb1aedfdc97f Author: David Cossé <cosse@codelutin.com> Date: Wed Oct 25 22:59:42 2017 +0200 refs #1394 Analyse de code --- .../main/java/org/chorem/lima/LimaXAResource.java | 4 +-- .../ejb/FinancialTransactionServiceImpl.java | 2 +- .../lima/business/ejb/ReportServiceImpl.java | 2 +- .../lima/business/ejb/VatStatementServiceImpl.java | 2 +- .../lima/business/ejb/csv/AbstractLimaModel.java | 2 +- .../chorem/lima/business/ejb/csv/AccountModel.java | 2 +- .../lima/business/ejb/csv/EntryBookModel.java | 2 +- .../chorem/lima/business/ejb/csv/EntryModel.java | 14 +++++----- .../ejb/csv/FinancialTransactionModel.java | 4 +-- .../business/ejb/csv/FiscalControlExportModel.java | 18 ++++++------- .../lima/business/ejb/csv/FiscalPeriodModel.java | 2 +- .../ejb/report/BalanceReportServiceImpl.java | 7 +++-- .../org/chorem/lima/entity/GeneratorHQuery.java | 30 +++++++++++----------- .../org/chorem/lima/business/AbstractLimaTest.java | 2 +- .../FinancialTransactionServiceImplTest.java | 2 +- .../lima/business/ReportServiceImplTest.java | 3 --- .../AccountCondition/AccountConditionView.jaxx | 2 +- .../java/org/chorem/lima/ui/MainViewHandler.java | 22 +++++----------- .../chorem/lima/ui/account/AccountViewHandler.java | 10 ++------ .../lima/ui/celleditor/AccountTableCellEditor.java | 15 +++++------ .../ui/celleditor/AutoCompleteTableCellEditor.java | 7 +---- .../chorem/lima/ui/combobox/AccountComboBox.java | 3 +-- .../lima/ui/combobox/LeafAccountComboBoxModel.java | 5 ++-- .../lima/ui/common/AbstractLimaTableModel.java | 3 +-- .../ui/common/FinancialTransactionTableModel.java | 12 +++------ .../FinancialPeriodViewHandler.java | 2 +- .../chorem/lima/ui/lettering/LetteringView.jaxx | 2 +- .../lima/ui/lettering/LetteringViewHandler.java | 19 ++------------ .../lima/ui/vatchart/VatChartViewHandler.java | 22 +++++++--------- 29 files changed, 84 insertions(+), 138 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/LimaXAResource.java b/lima-business/src/main/java/org/chorem/lima/LimaXAResource.java index 20dd29da..b0eaac42 100644 --- a/lima-business/src/main/java/org/chorem/lima/LimaXAResource.java +++ b/lima-business/src/main/java/org/chorem/lima/LimaXAResource.java @@ -42,9 +42,9 @@ import javax.transaction.xa.Xid; */ public class LimaXAResource implements XAResource { - private static Log log = LogFactory.getLog(LimaXAResource.class); + private static final Log log = LogFactory.getLog(LimaXAResource.class); - protected TopiaTransaction transaction; + protected final TopiaTransaction transaction; protected int timeout; 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 a3417cbc..7cbb05e9 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 @@ -264,7 +264,7 @@ 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()); return letters; } 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 3dc44297..fc1a6a56 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 @@ -294,7 +294,7 @@ public class ReportServiceImpl extends AbstractLimaService implements ReportServ Boolean getEntries, Boolean movementedFilter) { BalanceTrial balanceTrial = new BalanceTrialImpl(); - balanceTrial.setReportsDatas(new ArrayList<ReportsDatas>()); + balanceTrial.setReportsDatas(new ArrayList<>()); BigDecimal credit = BigDecimal.ZERO; BigDecimal debit = BigDecimal.ZERO; BigDecimal balance = BigDecimal.ZERO; 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 8abfa752..c11a689a 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 @@ -355,7 +355,7 @@ public class VatStatementServiceImpl extends AbstractLimaService implements VatS //get all subVatStatement List<VatStatement> vatStatements = getAllChildrenVatStatement(vatStatement, - new ArrayList<VatStatement>()); + new ArrayList<>()); //if VatStatement have subVatStatement if (vatStatements.size() > 0) { 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 bf5e4f8a..aca5b8a8 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 @@ -45,7 +45,7 @@ import java.util.Date; */ public abstract class AbstractLimaModel<E> extends AbstractImportModel<E> { - protected static String DATE_FORMAT = "dd/MM/yyyy"; + protected static final String DATE_FORMAT = "dd/MM/yyyy"; public AbstractLimaModel(char separator) { super(separator); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AccountModel.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AccountModel.java index 4907c468..9e0f837c 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AccountModel.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AccountModel.java @@ -42,7 +42,7 @@ public class AccountModel extends AbstractLimaModel<Account> implements ExportMo @Override public Iterable<ExportableColumn<Account, Object>> getColumnsForExport() { - ModelBuilder<Account> modelBuilder = new ModelBuilder<Account>(); + ModelBuilder<Account> modelBuilder = new ModelBuilder<>(); modelBuilder.newColumnForExport("accountNumber", Account.PROPERTY_ACCOUNT_NUMBER); modelBuilder.newColumnForExport("label", Account.PROPERTY_LABEL); modelBuilder.newColumnForExport("thirdParty", Account.PROPERTY_THIRD_PARTY); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryBookModel.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryBookModel.java index 42df565e..4d081368 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryBookModel.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryBookModel.java @@ -41,7 +41,7 @@ public class EntryBookModel extends AbstractLimaModel<EntryBook> implements Expo @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("label", EntryBook.PROPERTY_LABEL); return (Iterable) modelBuilder.getColumnsForExport(); 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 0a1e236c..4b061907 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 @@ -51,10 +51,10 @@ public class EntryModel extends AbstractLimaModel<Entry> implements ExportModel< public static final String PROPERTY_ENTRY_BOOK = Entry.PROPERTY_FINANCIAL_TRANSACTION + "." + FinancialTransaction.PROPERTY_ENTRY_BOOK + "." + EntryBook.PROPERTY_CODE; public static final String PROPERTY_DATE = Entry.PROPERTY_FINANCIAL_TRANSACTION + "." + FinancialTransaction.PROPERTY_TRANSACTION_DATE; - protected FinancialTransactionService financialTransactionService; - protected AccountService accountService; - protected EntryBookService entryBookService; - protected boolean humanReadable; + protected final FinancialTransactionService financialTransactionService; + protected final AccountService accountService; + protected final EntryBookService entryBookService; + protected final boolean humanReadable; public EntryModel(AccountService accountService, EntryBookService entryBookService, FinancialTransactionService financialTransactionService, boolean humanReadable) { super(';'); @@ -105,7 +105,7 @@ public class EntryModel extends AbstractLimaModel<Entry> implements ExportModel< protected class FinancialTransactionParser implements ValueParser<FinancialTransaction> { - Map<Integer, FinancialTransaction> transactionByNums = Maps.newHashMap(); + final Map<Integer, FinancialTransaction> transactionByNums = Maps.newHashMap(); @Override public FinancialTransaction parse(String value) { @@ -141,7 +141,7 @@ public class EntryModel extends AbstractLimaModel<Entry> implements ExportModel< protected class EntryBookParser implements ValueParser<EntryBook> { - protected Map<String, EntryBook> entryBookByCode; + protected final Map<String, EntryBook> entryBookByCode; public EntryBookParser() { entryBookByCode = Maps.newHashMap(); @@ -164,7 +164,7 @@ public class EntryModel extends AbstractLimaModel<Entry> implements ExportModel< protected class financialTransactionFormatter implements ValueFormatter<FinancialTransaction> { - Map<FinancialTransaction, Integer> numByTransactions = Maps.newHashMap(); + final Map<FinancialTransaction, Integer> numByTransactions = Maps.newHashMap(); int nextNum = 0; diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FinancialTransactionModel.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FinancialTransactionModel.java index 1f75b67a..a234f47c 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FinancialTransactionModel.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FinancialTransactionModel.java @@ -38,7 +38,7 @@ import org.nuiton.csv.ValueParser; */ public class FinancialTransactionModel extends AbstractLimaModel<FinancialTransaction> implements ExportModel<FinancialTransaction> { - protected EntryBookService entryBookService; + protected final EntryBookService entryBookService; public FinancialTransactionModel(EntryBookService entryBookService) { super(';'); @@ -50,7 +50,7 @@ public class FinancialTransactionModel extends AbstractLimaModel<FinancialTransa @Override public Iterable<ExportableColumn<FinancialTransaction, Object>> getColumnsForExport() { - ModelBuilder<FinancialTransaction> modelBuilder = new ModelBuilder<FinancialTransaction>(); + ModelBuilder<FinancialTransaction> modelBuilder = new ModelBuilder<>(); modelBuilder.newColumnForExport("id", FinancialTransaction.PROPERTY_TOPIA_ID); modelBuilder.newColumnForExport("transactionDate", FinancialTransaction.PROPERTY_TRANSACTION_DATE, DATE_FORMATTER); modelBuilder.newColumnForExport("entryBook", FinancialTransaction.PROPERTY_ENTRY_BOOK, ENTRY_BOOK_TO_ENTRY_BOOK_CODE_FORMATTER); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalControlExportModel.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalControlExportModel.java index e1dcccb9..8390e0d3 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalControlExportModel.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalControlExportModel.java @@ -44,14 +44,14 @@ import java.util.Map; */ public class FiscalControlExportModel implements ExportModel<Entry> { - protected static String PROPERTY_ENTRY_BOOK_CODE = Entry.PROPERTY_FINANCIAL_TRANSACTION + "." + FinancialTransaction.PROPERTY_ENTRY_BOOK + "." + EntryBook.PROPERTY_CODE; - protected static String PROPERTY_ENTRY_BOOK_LABEL = Entry.PROPERTY_FINANCIAL_TRANSACTION + "." + FinancialTransaction.PROPERTY_ENTRY_BOOK + "." + EntryBook.PROPERTY_LABEL; - protected static String PROPERTY_DATE = Entry.PROPERTY_FINANCIAL_TRANSACTION + "." + FinancialTransaction.PROPERTY_TRANSACTION_DATE; - protected static String PROPERTY_ACCOUNT_NUMBER = Entry.PROPERTY_ACCOUNT + "." + Account.PROPERTY_ACCOUNT_NUMBER; - protected static String PROPERTY_ACCOUNT_LABEL = Entry.PROPERTY_ACCOUNT + "." + Account.PROPERTY_LABEL; + protected static final String PROPERTY_ENTRY_BOOK_CODE = Entry.PROPERTY_FINANCIAL_TRANSACTION + "." + FinancialTransaction.PROPERTY_ENTRY_BOOK + "." + EntryBook.PROPERTY_CODE; + protected static final String PROPERTY_ENTRY_BOOK_LABEL = Entry.PROPERTY_FINANCIAL_TRANSACTION + "." + FinancialTransaction.PROPERTY_ENTRY_BOOK + "." + EntryBook.PROPERTY_LABEL; + protected static final String PROPERTY_DATE = Entry.PROPERTY_FINANCIAL_TRANSACTION + "." + FinancialTransaction.PROPERTY_TRANSACTION_DATE; + protected static final String PROPERTY_ACCOUNT_NUMBER = Entry.PROPERTY_ACCOUNT + "." + Account.PROPERTY_ACCOUNT_NUMBER; + protected static final String PROPERTY_ACCOUNT_LABEL = Entry.PROPERTY_ACCOUNT + "." + Account.PROPERTY_LABEL; - protected static ValueGetter<Entry, String> EMPTY_GETTER = new ValueGetter<Entry, String>() { + protected static final ValueGetter<Entry, String> EMPTY_GETTER = new ValueGetter<Entry, String>() { @Override public String get(Entry object) throws Exception { return ""; @@ -80,7 +80,7 @@ public class FiscalControlExportModel implements ExportModel<Entry> { } }; - protected static ValueGetter<Entry, String> DEBIT_GETTER = new ValueGetter<Entry, String>() { + protected static final ValueGetter<Entry, String> DEBIT_GETTER = new ValueGetter<Entry, String>() { @Override public String get(Entry entry) throws Exception { String result = ""; @@ -91,7 +91,7 @@ public class FiscalControlExportModel implements ExportModel<Entry> { } }; - protected static ValueGetter<Entry, String> CREDIT_GETTER = new ValueGetter<Entry, String>() { + protected static final ValueGetter<Entry, String> CREDIT_GETTER = new ValueGetter<Entry, String>() { @Override public String get(Entry entry) throws Exception { String result = ""; @@ -137,7 +137,7 @@ public class FiscalControlExportModel implements ExportModel<Entry> { protected class FinancialTransactionFormatter implements ValueFormatter<FinancialTransaction> { - Map<FinancialTransaction, Integer> numByTransactions = Maps.newHashMap(); + final Map<FinancialTransaction, Integer> numByTransactions = Maps.newHashMap(); int nextNum = 0; @Override diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalPeriodModel.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalPeriodModel.java index 3d905618..66dd7303 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalPeriodModel.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalPeriodModel.java @@ -42,7 +42,7 @@ public class FiscalPeriodModel extends AbstractLimaModel<FiscalPeriod> implement @Override public Iterable<ExportableColumn<FiscalPeriod, Object>> getColumnsForExport() { - ModelBuilder<FiscalPeriod> modelBuilder = new ModelBuilder<FiscalPeriod>(); + ModelBuilder<FiscalPeriod> modelBuilder = new ModelBuilder<>(); modelBuilder.newColumnForExport("beginDate", FiscalPeriod.PROPERTY_BEGIN_DATE, DATE_FORMATTER); modelBuilder.newColumnForExport("endDate", FiscalPeriod.PROPERTY_END_DATE, DATE_FORMATTER); modelBuilder.newColumnForExport("locked", FiscalPeriod.PROPERTY_LOCKED, O_N_FORMATTER); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/BalanceReportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/BalanceReportServiceImpl.java index 9f3ec877..3cd5506c 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/BalanceReportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/BalanceReportServiceImpl.java @@ -32,7 +32,6 @@ import org.chorem.lima.beans.BalanceAccountImpl; import org.chorem.lima.beans.BalanceTrial; import org.chorem.lima.beans.BalanceTrialImpl; import org.chorem.lima.beans.DocumentReport; -import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.FinancialPeriodService; import org.chorem.lima.business.api.IdentityService; @@ -101,7 +100,7 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal BalanceGlobalResult balanceGlobalResult = new BalanceGlobalResult().invoke(); BalanceTrial balanceTrial = new BalanceTrialImpl(); - balanceTrial.setReportsDatas(new ArrayList<ReportsDatas>()); + balanceTrial.setReportsDatas(new ArrayList<>()); List<Account> accounts = getAccounts(selectedAccounts); @@ -148,7 +147,7 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal BalanceGlobalResult balanceGlobalResult = new BalanceGlobalResult().invoke(); BalanceTrial balanceTrial = new BalanceTrialImpl(); - balanceTrial.setReportsDatas(new ArrayList<ReportsDatas>()); + balanceTrial.setReportsDatas(new ArrayList<>()); List<Account> accounts = getAccounts(selectedAccounts); @@ -279,7 +278,7 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal accountSubAccounts = new BalanceAccountImpl(); accountSubAccounts.setFormatter(bigDecimalFormat); accountSubAccounts.setSubReport(subAccountsJasperReport); - accountSubAccounts.setSubAccounts(new ArrayList<BalanceAccount>()); + accountSubAccounts.setSubAccounts(new ArrayList<>()); accountsByClasses.put(accountClass, accountSubAccounts); returnedAccounts.add(accountSubAccounts); } diff --git a/lima-business/src/main/java/org/chorem/lima/entity/GeneratorHQuery.java b/lima-business/src/main/java/org/chorem/lima/entity/GeneratorHQuery.java index c3a528fb..c060724d 100644 --- a/lima-business/src/main/java/org/chorem/lima/entity/GeneratorHQuery.java +++ b/lima-business/src/main/java/org/chorem/lima/entity/GeneratorHQuery.java @@ -57,29 +57,29 @@ public class GeneratorHQuery implements VisitorFilter, VisitorClause { protected String whereClause; - protected Map<String, Object> parameters; + protected final Map<String, Object> parameters; - protected Map<String, Integer> parametersCount; + protected final Map<String, Integer> parametersCount; - protected Map<Filter, String> aliasMap; + protected final Map<Filter, String> aliasMap; - protected Map<String, Integer> aliasCount; + protected final Map<String, Integer> aliasCount; - protected Deque<String> fromClauseStack; - protected Deque<String> whereClauseStak; + protected final Deque<String> fromClauseStack; + protected final Deque<String> whereClauseStak; - protected Deque<Filter> filterStack; + protected final Deque<Filter> filterStack; public GeneratorHQuery() { fromClause = ""; whereClause = ""; - parameters = new HashMap<String, Object>(); - parametersCount = new HashMap<String, Integer>(); - aliasMap = new HashMap<Filter, String>(); - aliasCount = new HashMap<String, Integer>(); - filterStack = new LinkedList<Filter>(); - fromClauseStack = new LinkedList<String>(); - whereClauseStak = new LinkedList<String>(); + parameters = new HashMap<>(); + parametersCount = new HashMap<>(); + aliasMap = new HashMap<>(); + aliasCount = new HashMap<>(); + filterStack = new LinkedList<>(); + fromClauseStack = new LinkedList<>(); + whereClauseStak = new LinkedList<>(); } protected String addParameter(Object value) { @@ -117,7 +117,7 @@ public class GeneratorHQuery implements VisitorFilter, VisitorClause { } public List<Object> getArguments() { - List<Object> result = new ArrayList<Object>(); + List<Object> result = new ArrayList<>(); for (Map.Entry<String, Object> entry : parameters.entrySet()) { result.add(entry.getKey()); result.add(entry.getValue()); 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 a42dc57e..ae268673 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 @@ -83,7 +83,7 @@ public abstract class AbstractLimaTest { } }; - protected static DateFormat df = DateFormat.getDateInstance(DateFormat.LONG, Locale.ENGLISH); + protected static final DateFormat df = DateFormat.getDateInstance(DateFormat.LONG, Locale.ENGLISH); protected static final String LIMA_TEST_DEFAULT_CONF_FILENAME = "lima-test.properties"; protected AccountService accountService; 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 945df443..d2f08074 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 @@ -849,7 +849,7 @@ public class FinancialTransactionServiceImplTest extends AbstractLimaTest { nextLetter = instance.findLastLetter(Arrays.asList("zzz", "ABC", "DEF")); Assert.assertEquals("DEF", nextLetter); - nextLetter = instance.findLastLetter(new ArrayList<String>()); + nextLetter = instance.findLastLetter(new ArrayList<>()); Assert.assertEquals("", nextLetter); } } diff --git a/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java b/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java index 1907fdba..fab4b0a1 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java @@ -31,7 +31,6 @@ import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FinancialTransactionImpl; import org.junit.Assert; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import java.math.BigDecimal; @@ -40,10 +39,8 @@ import java.util.Date; /** * Test le service de génération des reports. * - * FIXME echatellier 20120424 les tests sont désactivés car le code qui genere * les rapports dans ReportService est commenté. */ -@Ignore public class ReportServiceImplTest extends AbstractLimaTest { @Before diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.jaxx index f50fecd6..6abd6aa2 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.jaxx @@ -36,6 +36,6 @@ <AccountComboBox id="accountComboBox" constraints="BorderLayout.CENTER" - onPropertyChange="{getHandler().accountComboBoxChange(event);}"/> + onPropertyChange="getHandler().accountComboBoxChange(event);"/> </JInternalFrame> 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 5cc9c320..0ae0c559 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 @@ -171,12 +171,7 @@ public class MainViewHandler { ConfigUIHelper helper = new ConfigUIHelper(config); - helper.registerCallBack(LimaSwingConfig.Option.COLOR_SELECTION_FOCUS.getKey(), t("lima.config.color.selection.focus"), new ImageIcon(), new Runnable() { - @Override - public void run() { - UIManager.put("Table.focusCellHighlightBorder", new BorderUIResource(new LineBorder(config.getColorSelectionFocus(), 2))); - } - }); + helper.registerCallBack(LimaSwingConfig.Option.COLOR_SELECTION_FOCUS.getKey(), t("lima.config.color.selection.focus"), new ImageIcon(), () -> UIManager.put("Table.focusCellHighlightBorder", new BorderUIResource(new LineBorder(config.getColorSelectionFocus(), 2)))); helper.addCategory(t("lima.config.category.directories"), t("lima.config.category.directories.description")); helper.addOption(LimaSwingConfig.Option.CONFIG_FILE); @@ -570,15 +565,12 @@ public class MainViewHandler { contentTabbedPane.setSelectedComponent(container); contentTabbedPane.setTabComponentAt( contentTabbedPane.indexOfTab(name), closableHeader); - closableHeader.getCloseTab().addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - JButton button = (JButton) e.getSource(); - ClosableTabHeader closableTab = - (ClosableTabHeader) button.getParent(); - String name = closableTab.getTitle(); - contentTabbedPane.remove(contentTabbedPane.indexOfTab(name)); - } + closableHeader.getCloseTab().addActionListener(e -> { + JButton button = (JButton) e.getSource(); + ClosableTabHeader closableTab = + (ClosableTabHeader) button.getParent(); + String name1 = closableTab.getTitle(); + contentTabbedPane.remove(contentTabbedPane.indexOfTab(name1)); }); // if contentTabbedPane contains tab } else { 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 39778692..8143b581 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 @@ -48,12 +48,7 @@ import org.jdesktop.swingx.treetable.DefaultTreeTableModel; import org.jdesktop.swingx.treetable.MutableTreeTableNode; import org.jdesktop.swingx.treetable.TreeTableNode; -import javax.swing.AbstractAction; -import javax.swing.ActionMap; -import javax.swing.InputMap; -import javax.swing.JComponent; -import javax.swing.JOptionPane; -import javax.swing.KeyStroke; +import javax.swing.*; import javax.swing.tree.TreePath; import java.awt.event.ActionEvent; import java.awt.event.InputEvent; @@ -62,7 +57,6 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -214,7 +208,7 @@ public class AccountViewHandler implements ServiceListener { protected void loadAllAccounts() { // default data load List<Account> accounts = accountService.getAllAccounts(); - Collections.sort(accounts, ACCOUNT_LENGTH_COMPARATOR); + accounts.sort(ACCOUNT_LENGTH_COMPARATOR); if (log.isDebugEnabled()) { log.debug(String.format("Loaded %d accounts from service", accounts.size())); } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AccountTableCellEditor.java b/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AccountTableCellEditor.java index 799a1d09..487075e3 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AccountTableCellEditor.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AccountTableCellEditor.java @@ -132,15 +132,12 @@ public class AccountTableCellEditor extends AbstractCellEditor implements TableC // Empèche la touche echap if (keyEvent.getKeyChar() != KeyEvent.VK_ESCAPE) { // Permet de placer le focus sur l'editor de la comboBox - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - accountComboBox.getCombobox().getEditor().getEditorComponent().requestFocus(); - JTextComponent edit = (JTextComponent) accountComboBox.getCombobox().getEditor().getEditorComponent(); - edit.requestFocus(); - if (!Character.isIdentifierIgnorable(keyEvent.getKeyChar())) { - edit.setText(Character.toString(keyEvent.getKeyChar())); - } + SwingUtilities.invokeLater(() -> { + accountComboBox.getCombobox().getEditor().getEditorComponent().requestFocus(); + JTextComponent edit = (JTextComponent) accountComboBox.getCombobox().getEditor().getEditorComponent(); + edit.requestFocus(); + if (!Character.isIdentifierIgnorable(keyEvent.getKeyChar())) { + edit.setText(Character.toString(keyEvent.getKeyChar())); } }); } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AutoCompleteTableCellEditor.java b/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AutoCompleteTableCellEditor.java index b642fada..8c39a877 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AutoCompleteTableCellEditor.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AutoCompleteTableCellEditor.java @@ -39,12 +39,7 @@ public class AutoCompleteTableCellEditor extends StringTableCellEditor { List<String> precedingValues; public AutoCompleteTableCellEditor(String id) { - precedingValues = PRECEDING_VALUES_BY_ID.get(id); - - if (precedingValues == null) { - precedingValues = Lists.newLinkedList(); - PRECEDING_VALUES_BY_ID.put(id, precedingValues); - } + precedingValues = PRECEDING_VALUES_BY_ID.computeIfAbsent(id, k -> Lists.newLinkedList()); AutoCompleteDecorator.decorate(getComponent(), precedingValues, false); } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBox.java b/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBox.java index be46e167..23b6896a 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBox.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBox.java @@ -34,7 +34,6 @@ import org.chorem.lima.business.utils.AccountComparator; import org.chorem.lima.entity.Account; import org.nuiton.decorator.DecoratorUtil; -import java.util.Collections; import java.util.List; /** @@ -75,7 +74,7 @@ public class AccountComboBox extends BeanFilterableComboBox<Account> implements public List<Account> getDataList() { List<Account> result = leafAccounts ? accountService.getAllLeafAccounts() : accountService.getAllAccounts(); - Collections.sort(result, new AccountComparator()); + result.sort(new AccountComparator()); return result; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LeafAccountComboBoxModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LeafAccountComboBoxModel.java index a8a9e553..2c98e042 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LeafAccountComboBoxModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LeafAccountComboBoxModel.java @@ -22,15 +22,14 @@ package org.chorem.lima.ui.combobox; +import org.chorem.lima.business.LimaServiceFactory; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.ImportService; import org.chorem.lima.business.utils.AccountComparator; import org.chorem.lima.entity.Account; -import org.chorem.lima.business.LimaServiceFactory; import javax.swing.*; -import java.util.Collections; import java.util.List; /** @@ -77,7 +76,7 @@ public class LeafAccountComboBoxModel extends AbstractListModel implements Combo public List<Account> getDataList() { List<Account> result = accountService.getAllLeafAccounts(); - Collections.sort(result, new AccountComparator()); + result.sort(new AccountComparator()); return result; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java index 29b0a63f..a05b0fb4 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java @@ -28,7 +28,6 @@ import org.chorem.lima.util.ErrorHelper; import javax.swing.table.AbstractTableModel; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -68,7 +67,7 @@ public abstract class AbstractLimaTableModel<E> extends AbstractTableModel { public void sort() { if (comparator != null) { - Collections.sort(values, comparator); + values.sort(comparator); fireTableDataChanged(); } } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialTransactionTableModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialTransactionTableModel.java index 6a677fb5..4b50b800 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialTransactionTableModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialTransactionTableModel.java @@ -216,15 +216,9 @@ public class FinancialTransactionTableModel extends TableModelWithGroup<Entry> i Boolean locked = isGlobalyLocked == null ? lockedByTransaction.get(transaction) : isGlobalyLocked; if (locked == null) { - ClosedPeriodicEntryBook closedPeriodicEntryBook = closedPeriodicEntryBookForTransaction.get(transaction); - - if (closedPeriodicEntryBook == null) { - closedPeriodicEntryBook = - closedPeriodicEntryBookService.getByEntryBookAndFinancialPeriod( - transaction.getEntryBook(), - transaction.getTransactionDate()); - closedPeriodicEntryBookForTransaction.put(transaction, closedPeriodicEntryBook); - } + ClosedPeriodicEntryBook closedPeriodicEntryBook = closedPeriodicEntryBookForTransaction.computeIfAbsent(transaction, t -> closedPeriodicEntryBookService.getByEntryBookAndFinancialPeriod( + t.getEntryBook(), + t.getTransactionDate())); if (log.isDebugEnabled()) { log.debug("transaction " + transaction.getTransactionDate() + " : " + closedPeriodicEntryBook.isLocked()); diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java index 4710d8e5..d17ced77 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java @@ -103,7 +103,7 @@ public class FinancialPeriodViewHandler implements ServiceListener { // get data from service List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks = financialPeriodService. getAllClosedPeriodicEntryBooksFromUnblockedFiscalPeriod(); - Collections.sort(closedPeriodicEntryBooks, new FinancialPeriodComparator()); + closedPeriodicEntryBooks.sort(new FinancialPeriodComparator()); if (log.isDebugEnabled()) { log.debug(String.format("Loaded %d closed periodic entry book", closedPeriodicEntryBooks.size())); } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx index cdb89e2e..a7796633 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx @@ -64,7 +64,7 @@ <JLabel id="accountLabel"/> <AccountComboBox id="accountComboBox" constraints="BorderLayout.CENTER" - onPropertyChange="{getHandler().accountComboBoxChange(event);}"/> + onPropertyChange="getHandler().accountComboBoxChange(event);"/> <JButton id="back" onActionPerformed="handler.back(accountComboBox)"/> <JButton id="next" diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java index 5c2df815..13c41389 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java @@ -22,8 +22,6 @@ package org.chorem.lima.ui.lettering; -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import jaxx.runtime.SwingUtil; import org.apache.commons.lang3.time.DateUtils; @@ -50,12 +48,7 @@ import org.chorem.lima.ui.combobox.AccountComboBox; import org.chorem.lima.util.BigDecimalToString; import org.chorem.lima.util.ErrorHelper; -import javax.swing.AbstractAction; -import javax.swing.ActionMap; -import javax.swing.InputMap; -import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.KeyStroke; +import javax.swing.*; import java.awt.event.ActionEvent; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; @@ -619,15 +612,7 @@ public class LetteringViewHandler{ for (final Entry entry : entries) { - Entry oldEntry = Iterables.find( - tableModel.getValues(), - new Predicate<Entry>() { - @Override - public boolean apply(Entry input) { - return input.getTopiaId().equals(entry.getTopiaId()); - } - }, - null); + Entry oldEntry = tableModel.getValues().stream().filter(input -> input.getTopiaId().equals(entry.getTopiaId())).findFirst().orElseGet(() -> null); if (oldEntry != null) { int indexEntry = tableModel.indexOf(oldEntry); diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java index 753c563e..0ca0dfed 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java @@ -191,20 +191,16 @@ public class VatChartViewHandler implements ServiceListener { if (colorLine != null) { view.getVatTreeTable().removeHighlighter(colorLine); } - HighlightPredicate predicate = new HighlightPredicate() { - @Override - public boolean isHighlighted(Component renderer, - ComponentAdapter adapter) { - JXTreeTable vatTreeTable = view.getVatTreeTable(); - TreePath treePath = vatTreeTable.getPathForRow(adapter.row); - MutableTreeTableNode vatStatementNode = (MutableTreeTableNode) treePath.getLastPathComponent(); - VatStatement vatStatement = (VatStatement) vatStatementNode.getUserObject(); - boolean highlighted = false; - if (!vatStatement.isHeader()) { - highlighted = StringUtils.isBlank(vatStatement.getBoxName()); - } - return highlighted; + HighlightPredicate predicate = (renderer, adapter) -> { + JXTreeTable vatTreeTable = view.getVatTreeTable(); + TreePath treePath = vatTreeTable.getPathForRow(adapter.row); + MutableTreeTableNode vatStatementNode = (MutableTreeTableNode) treePath.getLastPathComponent(); + VatStatement vatStatement = (VatStatement) vatStatementNode.getUserObject(); + boolean highlighted = false; + if (!vatStatement.isHeader()) { + highlighted = StringUtils.isBlank(vatStatement.getBoxName()); } + return highlighted; }; colorLine = new ColorHighlighter(predicate, new Color(255, 198, 209), null); view.getVatTreeTable().addHighlighter(colorLine); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.