Author: dcosse Date: 2014-08-07 23:37:22 +0200 (Thu, 07 Aug 2014) New Revision: 3906 Url: http://forge.chorem.org/projects/lima/repository/revisions/3906 Log: refactoring sonar Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryModel.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FinancialTransactionModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AccountTableCellEditor.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryBookTableCellEditor.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTable.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2014-08-07 20:17:41 UTC (rev 3905) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2014-08-07 21:37:22 UTC (rev 3906) @@ -74,9 +74,9 @@ setOption(TopiaMigrationService.MIGRATION_SHOW_SQL, Boolean.TRUE.toString()); setOption(TopiaMigrationService.MIGRATION_SHOW_PROGRESSION, Boolean.TRUE.toString()); - config = new ApplicationConfig(LIMA_DEFAULT_CONF_FILENAME); - config.loadDefaultOptions(ServiceConfigOption.values()); - config.parse(); + LimaConfig.config = new ApplicationConfig(LIMA_DEFAULT_CONF_FILENAME); + LimaConfig.config.loadDefaultOptions(ServiceConfigOption.values()); + LimaConfig.config.parse(); } catch (ArgumentsParserException ex) { throw new LimaTechnicalException("Can't read configuration", ex); @@ -108,7 +108,7 @@ Class<?> accountingRulesClass = config.getOptionAsClass(ServiceConfigOption.RULES_NATIONALTY.key); if (accountingRulesClass == null) { if (log.isErrorEnabled()) { - log.error("No accounting rules defined for:" + accountingRulesClass); + log.error("No accounting rules defined for:" + ServiceConfigOption.RULES_NATIONALTY.key); } accountingRules = new FranceAccountingRules(); } else { @@ -127,8 +127,8 @@ } public void setAccountingRule(String accountingRule) { - accountingRules = null; // clear cache - config.setOption(ServiceConfigOption.RULES_NATIONALTY.key, accountingRule); + LimaConfig.accountingRules = null; // clear cache + LimaConfig.config.setOption(ServiceConfigOption.RULES_NATIONALTY.key, accountingRule); } public File getDataDir() { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2014-08-07 20:17:41 UTC (rev 3905) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2014-08-07 21:37:22 UTC (rev 3906) @@ -132,8 +132,6 @@ AccountTopiaDao accountDao = getDaoHelper().getAccountDao(); while (account == null && accountNumber.length() > 1) { - - accountNumber = accountNumber.substring(0); account = accountDao.forAccountNumberEquals(accountNumber).findUniqueOrNull(); } return account; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java 2014-08-07 20:17:41 UTC (rev 3905) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java 2014-08-07 21:37:22 UTC (rev 3906) @@ -65,6 +65,17 @@ super(separator); } + public AbstractLimaModel(char separator, EntryBookService entryBookService) { + super(separator); + AbstractLimaModel.entryBookService = entryBookService; + } + + public AbstractLimaModel(char separator, AccountService accountService, FinancialTransactionService financialTransactionService, Boolean humanReadable) { + super(separator); + AbstractLimaModel.accountService = accountService; + AbstractLimaModel.financialTransactionService = financialTransactionService; + AbstractLimaModel.humanReadable = humanReadable; + } /** * String to integer converter. */ @@ -195,7 +206,7 @@ public String format(Date value) { String result; if (value != null) { - result = simpleDateFormat.format(value); + result = AbstractLimaModel.simpleDateFormat.format(value); } else { result = ""; } @@ -211,7 +222,7 @@ public Date parse(String value) throws ParseException { Date result = null; if (!Strings.isNullOrEmpty(value)) { - result = simpleDateFormat.parse(value); + result = AbstractLimaModel.simpleDateFormat.parse(value); } return result; } @@ -236,7 +247,7 @@ public EntryBook parse(String value) { EntryBook result; if (StringUtils.isNotBlank(value)) { - result = entryBookService.getEntryBookByCode(value); + result = AbstractLimaModel.entryBookService.getEntryBookByCode(value); } else { result = null; } @@ -289,7 +300,7 @@ public Account parse(String value) { Account result; if (StringUtils.isNotBlank(value)) { - result = accountService.getAccountByNumber(value); + result = AbstractLimaModel.accountService.getAccountByNumber(value); } else { result = null; } @@ -302,7 +313,7 @@ public String format(FinancialTransaction value) { String result; if (value != null) { - result = humanReadable ? simpleDateFormat.format(value.getTransactionDate()) : value.getTopiaId(); + result = AbstractLimaModel.humanReadable ? AbstractLimaModel.simpleDateFormat.format(value.getTransactionDate()) : value.getTopiaId(); } else { result = ""; } @@ -316,7 +327,7 @@ public FinancialTransaction parse(String value) { Preconditions.checkArgument(!Strings.isNullOrEmpty(value)); FinancialTransaction result; - result = financialTransactionService.getFinancialTransactionWithId(value); + result = AbstractLimaModel.financialTransactionService.getFinancialTransactionWithId(value); return result; } }; @@ -402,7 +413,7 @@ public String format(FinancialTransaction value) { String result; if (value != null) { - result = simpleDateFormat.format(value.getTransactionDate()); + result = AbstractLimaModel.simpleDateFormat.format(value.getTransactionDate()); } else { result = ""; } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryModel.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryModel.java 2014-08-07 20:17:41 UTC (rev 3905) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryModel.java 2014-08-07 21:37:22 UTC (rev 3906) @@ -36,10 +36,7 @@ public class EntryModel extends AbstractLimaModel<Entry> implements ExportModel<Entry> { public EntryModel(AccountService accountService, FinancialTransactionService financialTransactionService, boolean humanReadable) { - super(';'); - AbstractLimaModel.accountService = accountService; - AbstractLimaModel.financialTransactionService = financialTransactionService; - AbstractLimaModel.humanReadable = humanReadable; + super(';', accountService, financialTransactionService, humanReadable); newMandatoryColumn("account", Entry.PROPERTY_ACCOUNT, ACCOUNT_NUMBER_TO_ACCOUNT_TRANSACTION_PARSER); newOptionalColumn("amount", Entry.PROPERTY_AMOUNT, BIG_DECIMAL_WITH_NULL_PARSER); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FinancialTransactionModel.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FinancialTransactionModel.java 2014-08-07 20:17:41 UTC (rev 3905) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FinancialTransactionModel.java 2014-08-07 21:37:22 UTC (rev 3906) @@ -35,8 +35,7 @@ public class FinancialTransactionModel extends AbstractLimaModel<FinancialTransaction> implements ExportModel<FinancialTransaction> { public FinancialTransactionModel(EntryBookService entryBookService) { - super(';'); - AbstractLimaModel.entryBookService = entryBookService; + super(';', entryBookService); newMandatoryColumn("id", FinancialTransaction.PROPERTY_TOPIA_ID); newOptionalColumn("transactionDate", FinancialTransaction.PROPERTY_TRANSACTION_DATE, DATE_PARSER); newOptionalColumn("entryBook", FinancialTransaction.PROPERTY_ENTRY_BOOK, ENTRY_BOOK_CODE_TO_ENTRY_BOOK_PARSER); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionHandler.java 2014-08-07 20:17:41 UTC (rev 3905) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionHandler.java 2014-08-07 21:37:22 UTC (rev 3906) @@ -79,7 +79,7 @@ try { conditionView.setSelected(true); } catch (PropertyVetoException e) { - + log.error(e); } conditionPanel.validate(); conditionPanel.repaint(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2014-08-07 20:17:41 UTC (rev 3905) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2014-08-07 21:37:22 UTC (rev 3906) @@ -227,7 +227,7 @@ helper.addOption(LimaConfig.Option.LOCALE); helper.setOptionShortLabel(LimaConfig.Option.LOCALE.getLabel()); - JComboBox<Character> comboBoxSeparator = new JComboBox<Character>(LimaConfig.NUMBER_SEPARATOR.toArray(new Character[0])); + JComboBox<Character> comboBoxSeparator = new JComboBox<Character>(LimaConfig.NUMBER_SEPARATOR.toArray(new Character[LimaConfig.NUMBER_SEPARATOR.size()])); DefaultCellEditor separatorEditor = new DefaultCellEditor(comboBoxSeparator); comboBoxSeparator.setRenderer(new NumberSeparatorCellRenderer()); NumberSeparatorTableCellRenderer separatorRenderer = new NumberSeparatorTableCellRenderer(); @@ -236,7 +236,7 @@ helper.setOptionRenderer(separatorRenderer); helper.setOptionEditor(separatorEditor); - JComboBox<Integer> comboBoxDecimal = new JComboBox<Integer>(LimaConfig.NUMBER_DECIMALS.toArray(new Integer[0])); + JComboBox<Integer> comboBoxDecimal = new JComboBox<Integer>(LimaConfig.NUMBER_DECIMALS.toArray(new Integer[LimaConfig.NUMBER_DECIMALS.size()])); DefaultCellEditor decimalEditor = new DefaultCellEditor(comboBoxDecimal); helper.addOption(LimaConfig.Option.SCALE); helper.setOptionShortLabel(LimaConfig.Option.SCALE.getLabel()); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2014-08-07 20:17:41 UTC (rev 3905) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2014-08-07 21:37:22 UTC (rev 3906) @@ -139,6 +139,8 @@ String binding = "new-account"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -2627651616597622057L; + @Override public void actionPerformed(ActionEvent e) { addAccount(); @@ -149,6 +151,8 @@ binding = "remove-account"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 8244969229065970041L; + @Override public void actionPerformed(ActionEvent e) { removeAccount(); @@ -159,6 +163,8 @@ binding = "modify-account"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_M, KeyEvent.CTRL_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -1287526862158662714L; + @Override public void actionPerformed(ActionEvent e) { updateAccount(); @@ -238,6 +244,8 @@ String binding = "dispose"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -4829115532909638962L; + @Override public void actionPerformed(ActionEvent e) { accountForm.dispose(); @@ -353,6 +361,8 @@ String binding = "dispose"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -2123621815991309210L; + @Override public void actionPerformed(ActionEvent e) { accountForm.dispose(); @@ -441,6 +451,8 @@ String binding = "dispose"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -1756820018546487410L; + @Override public void actionPerformed(ActionEvent e) { form.performCancel(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AccountTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AccountTableCellEditor.java 2014-08-07 20:17:41 UTC (rev 3905) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AccountTableCellEditor.java 2014-08-07 21:37:22 UTC (rev 3906) @@ -34,12 +34,10 @@ import org.chorem.lima.widgets.JWideComboBox; import org.jdesktop.swingx.autocomplete.AutoCompleteDecorator; -import javax.swing.AbstractCellEditor; -import javax.swing.JTable; -import javax.swing.SwingUtilities; +import javax.swing.*; import javax.swing.table.TableCellEditor; import javax.swing.text.JTextComponent; -import java.awt.Component; +import java.awt.*; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.awt.event.MouseEvent; @@ -116,7 +114,7 @@ }); } } - keyPressed = false; + AccountTableCellEditor.keyPressed = false; return !(evt instanceof MouseEvent) || ((MouseEvent) evt).getClickCount() == 1; } @@ -135,7 +133,7 @@ JTextComponent edit = (JTextComponent) comboBox.getEditor().getEditorComponent(); // Met en place le curseur et la selection après la première lettre edit.select(1, edit.getText().length()); - keyPressed = true; + AccountTableCellEditor.keyPressed = true; } // delegate popup list menu Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java 2014-08-07 20:17:41 UTC (rev 3905) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java 2014-08-07 21:37:22 UTC (rev 3906) @@ -40,15 +40,15 @@ public static String format(BigDecimal value) { LimaConfig config = LimaContext.getContext().getConfig(); - String scale = ""; + StringBuilder scale = new StringBuilder(); for (int i = 0; i < config.getScale(); i++) { - scale += "0"; + scale.append("0"); } String currency = ""; if (config.getCurrency()) { currency = " ¤"; } - DecimalFormat formatter = new DecimalFormat("##0." + scale + currency); + DecimalFormat formatter = new DecimalFormat("##0." + scale.toString() + currency); DecimalFormatSymbols symbol = new DecimalFormatSymbols(); //set decimalSeparator and thousandSeparator preferences symbol.setDecimalSeparator(config.getDecimalSeparator()); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryBookTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryBookTableCellEditor.java 2014-08-07 20:17:41 UTC (rev 3905) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryBookTableCellEditor.java 2014-08-07 21:37:22 UTC (rev 3906) @@ -134,7 +134,7 @@ } } // Remet à faux pour la premiere lettre tapée au clavier - keyPressed = false; + EntryBookTableCellEditor.keyPressed = false; return !(evt instanceof MouseEvent) || ((MouseEvent) evt).getClickCount() == 1; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2014-08-07 20:17:41 UTC (rev 3905) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2014-08-07 21:37:22 UTC (rev 3906) @@ -86,6 +86,8 @@ String binding = "new-entryBook"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -2195732334248213712L; + @Override public void actionPerformed(ActionEvent e) { addEntryBook(); @@ -96,6 +98,8 @@ binding = "remove-entryBook"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -4932713296274387513L; + @Override public void actionPerformed(ActionEvent e) { deleteEntryBook(); @@ -106,6 +110,8 @@ binding = "modify-entryBook"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_M, KeyEvent.CTRL_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -761841876399286500L; + @Override public void actionPerformed(ActionEvent e) { updateEntryBook(); @@ -153,6 +159,8 @@ String binding = "dispose"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -8206425963136985592L; + @Override public void actionPerformed(ActionEvent e) { entryBookForm.performCancel(); @@ -198,6 +206,8 @@ String binding = "dispose"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 4869740774851185380L; + @Override public void actionPerformed(ActionEvent e) { entryBookForm.performCancel(); @@ -264,6 +274,8 @@ String binding = "dispose"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -1659538823979223871L; + @Override public void actionPerformed(ActionEvent e) { form.performCancel(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java 2014-08-07 20:17:41 UTC (rev 3905) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java 2014-08-07 21:37:22 UTC (rev 3906) @@ -94,6 +94,8 @@ String binding = "close-FinancialPeriod"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_B, KeyEvent.CTRL_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 4933544189561608564L; + @Override public void actionPerformed(ActionEvent e) { blockFinancialPeriod(); @@ -132,47 +134,54 @@ closedPeriodicEntryBook = financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodicEntryBook); model.setValue(selectedRow, closedPeriodicEntryBook); } catch (UnbalancedFinancialTransactionsException e) { - String message = t("lima.ui.financialperiod.block.error.unbalanced.main"); + StringBuilder message = new StringBuilder(t("lima.ui.financialperiod.block.error.unbalanced.main")); for (FinancialTransaction transaction : e.getFinancialTransactions()) { - message += "\n - " + t("lima.ui.financialperiod.block.error.unbalanced.transaction", + message.append("\n - "); + message.append(t("lima.ui.financialperiod.block.error.unbalanced.transaction", transaction.getTransactionDate(), BigDecimalTableCellRenderer.format(transaction.getAmountDebit()), - BigDecimalTableCellRenderer.format(transaction.getAmountCredit())); + BigDecimalTableCellRenderer.format(transaction.getAmountCredit()))); } - errorHelper.showErrorMessage(message); + errorHelper.showErrorMessage(message.toString()); } catch (UnfilledEntriesException e) { - String message = t("lima.ui.financialperiod.block.error.unfilled.main"); + StringBuilder message = new StringBuilder(t("lima.ui.financialperiod.block.error.unfilled.main")); for (Entry entry : e.getEntries()) { - message += "\n - " + t("lima.ui.financialperiod.block.error.unfilled.entry", + message.append("\n - "); + message.append(t("lima.ui.financialperiod.block.error.unfilled.entry", entry.getFinancialTransaction().getTransactionDate(), - BigDecimalTableCellRenderer.format(entry.getAmount())); + BigDecimalTableCellRenderer.format(entry.getAmount()))); if (entry.getAccount() == null) { - message += "\n - " + t("lima.ui.financialperiod.block.error.unfilled.noAccount"); + message.append("\n - "); + message.append(t("lima.ui.financialperiod.block.error.unfilled.noAccount")); } if (StringUtils.isBlank(entry.getVoucher())) { - message += "\n - " + t("lima.ui.financialperiod.block.error.unfilled.noVoucher"); + message.append("\n - " ); + message.append(t("lima.ui.financialperiod.block.error.unfilled.noVoucher")); } if (StringUtils.isBlank(entry.getDescription())) { - message += "\n - " + t("lima.ui.financialperiod.block.error.unfilled.noDescription"); + message.append("\n - "); + message.append(t("lima.ui.financialperiod.block.error.unfilled.noDescription")); } } - errorHelper.showErrorMessage(message); + errorHelper.showErrorMessage(message.toString()); } catch (WithoutEntryBookFinancialTransactionsException e) { - String message = t("lima.ui.financialperiod.block.error.withoutEntryBook.main"); + StringBuilder message = new StringBuilder(t("lima.ui.financialperiod.block.error.withoutEntryBook.main")); for (FinancialTransaction transaction : e.getFinancialTransactions()) { - message += "\n - " + t("lima.ui.financialperiod.block.error.withoutEntryBook.transaction", + message.append("\n - "); + message.append(t("lima.ui.financialperiod.block.error.withoutEntryBook.transaction", transaction.getTransactionDate(), - BigDecimalTableCellRenderer.format(transaction.getAmountCredit())); + BigDecimalTableCellRenderer.format(transaction.getAmountCredit()))); } - errorHelper.showErrorMessage(message); + errorHelper.showErrorMessage(message.toString()); } catch (NotLockedClosedPeriodicEntryBooksException e) { - String message = t("lima.ui.financialperiod.block.error.noLockedPreviousEntryBook.main"); + StringBuilder message = new StringBuilder(t("lima.ui.financialperiod.block.error.noLockedPreviousEntryBook.main")); for (ClosedPeriodicEntryBook previousClosedPeriodicEntryBook : e.getClosedPeriodicEntryBooks()) { - message += "\n - " + t("lima.ui.financialperiod.block.error.noLockedPreviousEntryBook.previousEntryBook", + message.append("\n - "); + message.append(t("lima.ui.financialperiod.block.error.noLockedPreviousEntryBook.previousEntryBook", previousClosedPeriodicEntryBook.getFinancialPeriod().getBeginDate(), - previousClosedPeriodicEntryBook.getFinancialPeriod().getEndDate()); + previousClosedPeriodicEntryBook.getFinancialPeriod().getEndDate())); } - errorHelper.showErrorMessage(message); + errorHelper.showErrorMessage(message.toString()); } } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2014-08-07 20:17:41 UTC (rev 3905) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2014-08-07 21:37:22 UTC (rev 3906) @@ -88,6 +88,8 @@ String binding = "add-FinancialStatementHeader"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_DOWN_MASK + InputEvent.SHIFT_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -7788186392450704736L; + @Override public void actionPerformed(ActionEvent e) { addFinancialStatementHeader(); @@ -98,6 +100,8 @@ binding = "add-FinancialStatementMovement"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -2024337652917520114L; + @Override public void actionPerformed(ActionEvent e) { addFinancialStatementMovement(); @@ -108,6 +112,8 @@ binding = "update-FinancialStatement"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_M, KeyEvent.CTRL_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 38900830693943289L; + @Override public void actionPerformed(ActionEvent e) { updateFinancialStatement(); @@ -118,6 +124,8 @@ binding = "remove-FinancialStatement"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 5281128699359433458L; + @Override public void actionPerformed(ActionEvent e) { removeFinancialStatement(); @@ -128,6 +136,8 @@ binding = "import-FinancialStatement"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_I, KeyEvent.CTRL_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -8953401784332356894L; + @Override public void actionPerformed(ActionEvent e) { importFinancialStatementChart(); @@ -138,6 +148,8 @@ binding = "check-FinancialStatement"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_K, KeyEvent.CTRL_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 4940041938090472686L; + @Override public void actionPerformed(ActionEvent e) { financialStatementChartCheck(); @@ -164,6 +176,8 @@ String binding = "dispose"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 743244863218861378L; + @Override public void actionPerformed(ActionEvent e) { financialStatementHeaderForm.performCancel(); @@ -209,6 +223,8 @@ String binding = "dispose"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 4247772767239546785L; + @Override public void actionPerformed(ActionEvent e) { financialStatementMovementForm.performCancel(); @@ -266,6 +282,8 @@ String binding = "dispose"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 3175340724715264379L; + @Override public void actionPerformed(ActionEvent e) { financialStatementHeaderForm.performCancel(); @@ -288,6 +306,8 @@ String binding = "dispose"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -3722767598494135172L; + @Override public void actionPerformed(ActionEvent e) { financialStatementMovementForm.performCancel(); @@ -352,6 +372,8 @@ String binding = "dispose"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -8291208693591479867L; + @Override public void actionPerformed(ActionEvent e) { form.performCancel(); @@ -393,9 +415,6 @@ /** * Permet d'afficher une boite de dialogue avec rapport * - * @param message - * @param parent - * @param title */ public void showReportDialog(String message, String title, Component parent) { ReportDialogView reportDialogView = new ReportDialogView(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2014-08-07 20:17:41 UTC (rev 3905) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2014-08-07 21:37:22 UTC (rev 3906) @@ -150,6 +150,8 @@ binding = "new-transaction"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_DOWN_MASK + KeyEvent.SHIFT_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -1664378625712266838L; + @Override public void actionPerformed(ActionEvent e) { addFinancialTransaction(); @@ -160,6 +162,8 @@ binding = "delete-transaction"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, KeyEvent.CTRL_DOWN_MASK + KeyEvent.SHIFT_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 7621389371928432410L; + @Override public void actionPerformed(ActionEvent e) { deleteSelectedTransaction(); @@ -170,6 +174,8 @@ binding = "copy-transaction"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_C, KeyEvent.CTRL_DOWN_MASK + KeyEvent.SHIFT_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -982724612254422140L; + @Override public void actionPerformed(ActionEvent e) { copyTransaction(); @@ -180,6 +186,8 @@ binding = "paste-transaction"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_V, KeyEvent.CTRL_DOWN_MASK + KeyEvent.SHIFT_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 3981745985282030673L; + @Override public void actionPerformed(ActionEvent e) { pasteTransaction(); @@ -190,6 +198,8 @@ binding = "new-entry"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 6099897253355058899L; + @Override public void actionPerformed(ActionEvent e) { addEntry(); @@ -200,6 +210,8 @@ binding = "delete-entry"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, KeyEvent.CTRL_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 5137178343047269716L; + @Override public void actionPerformed(ActionEvent e) { deleteSelectedEntry(); @@ -210,6 +222,8 @@ binding = "copy-entry"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_C, KeyEvent.CTRL_DOWN_MASK + KeyEvent.ALT_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -1866038141590067940L; + @Override public void actionPerformed(ActionEvent e) { copyEntry(); @@ -220,6 +234,8 @@ binding = "paste-entry"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_V, KeyEvent.CTRL_DOWN_MASK + KeyEvent.ALT_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -3996645480884548643L; + @Override public void actionPerformed(ActionEvent e) { pasteEntry(); @@ -230,6 +246,8 @@ binding = "balance"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_B, KeyEvent.CTRL_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 5070872946843797639L; + @Override public void actionPerformed(ActionEvent e) { balanceTransaction(); @@ -240,6 +258,8 @@ binding = "assign-all"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.CTRL_DOWN_MASK + KeyEvent.ALT_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 4993025324310374283L; + @Override public void actionPerformed(ActionEvent e) { assignAllEntries(); @@ -715,7 +735,6 @@ int indexSelectedRow = table.getSelectedRow(); if (indexSelectedRow >= 0) { - Entry entry = tableModel.get(indexSelectedRow); TableCellEditor cellEditor = table.getCellEditor(); if (cellEditor != null) { cellEditor.cancelCellEditing(); @@ -755,7 +774,6 @@ public void assignAllEntries() { FinancialTransactionTable table = view.getFinancialTransactionTable(); FinancialTransactionTableModel tableModel = view.getFinancialTransactionTableModel(); - ListSelectionModel selectionModel = table.getSelectionModel(); table.exit(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2014-08-07 20:17:41 UTC (rev 3905) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2014-08-07 21:37:22 UTC (rev 3906) @@ -72,8 +72,6 @@ /** Transaction service. */ protected final FinancialTransactionService financialTransactionService; - protected Object clipBoard; - protected FinancialTransactionSearchViewHandler(FinancialTransactionSearchView view) { this.view = view; @@ -95,6 +93,8 @@ binding = "refresh"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0) , binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 5877340693755869036L; + @Override public void actionPerformed(ActionEvent e) { refresh(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java 2014-08-07 20:17:41 UTC (rev 3905) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java 2014-08-07 21:37:22 UTC (rev 3906) @@ -94,6 +94,8 @@ binding = "delete-transaction"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, KeyEvent.CTRL_DOWN_MASK + KeyEvent.SHIFT_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -226644303576583765L; + @Override public void actionPerformed(ActionEvent e) { deleteSelectedTransaction(); @@ -104,6 +106,8 @@ binding = "new-entry"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -6435906445215486356L; + @Override public void actionPerformed(ActionEvent e) { addEntry(); @@ -114,6 +118,8 @@ binding = "delete-entry"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, KeyEvent.CTRL_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 4178423543503694499L; + @Override public void actionPerformed(ActionEvent e) { deleteSelectedEntry(); @@ -124,6 +130,8 @@ binding = "balance"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_B, KeyEvent.CTRL_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 1311386081937821318L; + @Override public void actionPerformed(ActionEvent e) { balanceTransaction(); @@ -134,6 +142,8 @@ binding = "refresh"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0) , binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -1045374983643252166L; + @Override public void actionPerformed(ActionEvent e) { refresh(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2014-08-07 20:17:41 UTC (rev 3905) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2014-08-07 21:37:22 UTC (rev 3906) @@ -104,6 +104,8 @@ String binding = "new-FiscalPeriod"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 3174253799898553603L; + @Override public void actionPerformed(ActionEvent e) { addFiscalPeriod(); @@ -466,7 +468,6 @@ selectedRow = listSelectionEvent.getLastIndex(); } - FiscalPeriodTable table = view.getFiscalPeriodTable(); FiscalPeriodTableModel tableModel = view.getFiscalPeriodTableModel(); if (tableModel.getRowCount() != selectedRow) { FiscalPeriod fiscalPeriodAt = tableModel.get(selectedRow); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java 2014-08-07 20:17:41 UTC (rev 3905) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java 2014-08-07 21:37:22 UTC (rev 3906) @@ -89,27 +89,27 @@ int ebSize = entryBooks.size(); if (ebSize > 0) { setBackground(GREEN_BACKGROUND); - String entryBooksString; + StringBuilder entryBooksString = new StringBuilder(); if (ebSize == 1) { - entryBooksString = t("lima.home.entryBooks.info.one", ebSize) - + "<br/>" + entryBooks.get(0).getLabel() - + "<br/><br/><a href='#entrybookschart'>" - + t("lima.home.entryBooks.modify") + "</a>"; + entryBooksString.append(t("lima.home.entryBooks.info.one", ebSize)); + entryBooksString.append("<br/>").append(entryBooks.get(0).getLabel()); + entryBooksString.append("<br/><br/><a href='#entrybookschart'>"); + entryBooksString.append(t("lima.home.entryBooks.modify")).append("</a>"); } else { - entryBooksString = t("lima.home.entryBooks.info", ebSize) + "<ul>"; + entryBooksString.append(t("lima.home.entryBooks.info", ebSize)).append("<ul>"); for (int i = 0; i < ebSize && i < 3; i++) { // for (EntryBook entryBook : entryBooks) { EntryBook entryBook = entryBooks.get(i); - entryBooksString += "<li>" + entryBook.getCode() + - " - " + entryBook.getLabel() + "</li>"; + entryBooksString.append("<li>").append(entryBook.getCode()); + entryBooksString.append(" - ").append(entryBook.getLabel()).append("</li>"); } if (ebSize > 3) { - entryBooksString += "<li> ... </li>"; + entryBooksString.append("<li> ... </li>"); } - entryBooksString += "</ul></p><p horizontal-align:'center'>" - + "<a href='#entrybookschart'>" - + t("lima.home.entryBooks.modify") + "</a>"; + entryBooksString.append("</ul></p><p horizontal-align:'center'>"); + entryBooksString.append("<a href='#entrybookschart'>"); + entryBooksString.append(t("lima.home.entryBooks.modify")).append("</a>"); } //set Text setText(htmlBegin + entryBooksString + htmlEnd); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2014-08-07 20:17:41 UTC (rev 3905) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2014-08-07 21:37:22 UTC (rev 3906) @@ -128,6 +128,8 @@ binding = "lettering"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_L, KeyEvent.CTRL_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 397305388204489988L; + @Override public void actionPerformed(ActionEvent e) { addLetter(); @@ -138,6 +140,8 @@ binding = "un-lettering"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 6493175994438339351L; + @Override public void actionPerformed(ActionEvent e) { removeLetter(); @@ -148,6 +152,8 @@ binding = "balance"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_B, KeyEvent.CTRL_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = 5997811877503911744L; + @Override public void actionPerformed(ActionEvent e) { roundAndCreateEntry(); @@ -158,6 +164,8 @@ binding = "refresh"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0), binding); actionMap.put(binding, new AbstractAction() { + private static final long serialVersionUID = -7192846839712951680L; + @Override public void actionPerformed(ActionEvent e) { updateAllEntries(); @@ -360,8 +368,7 @@ protected List<Entry> findAllEntries(LetteringFilterImpl filter){ if (filter != null) { - List<Entry> entries = - financialTransactionService.getAllEntrieByDatesAndAccountAndLettering(filter); + List<Entry> entries = financialTransactionService.getAllEntrieByDatesAndAccountAndLettering(filter); return entries; } return null; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTable.java 2014-08-07 20:17:41 UTC (rev 3905) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTable.java 2014-08-07 21:37:22 UTC (rev 3906) @@ -33,8 +33,7 @@ import org.jdesktop.swingx.treetable.TreeTableModel; import javax.swing.tree.TreePath; -import java.awt.Color; -import java.awt.Component; +import java.awt.*; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.awt.event.MouseEvent; @@ -49,7 +48,7 @@ protected VatChartViewHandler handler; //protected Color colorSelectionFocus; - private Highlighter colorLine; + private transient Highlighter colorLine; public VatChartTreeTable(VatChartViewHandler handler) { this.handler = handler; @@ -86,8 +85,7 @@ return highlighted; } }; - colorLine = - new ColorHighlighter(predicate, new Color(255, 198, 209), null); + colorLine = new ColorHighlighter(predicate, new Color(255, 198, 209), null); addHighlighter(colorLine); }