July 2016 - Lima-commits - mailman.cloud.codelutin.com

02/10: refs #1316 changement de comportement, il est possible de rechercher un compte tant qu'aucune correspondance a été trouvée, une fois une correspondance unique trouvée la recherche est intérompue (peut-être reprise avec F12) et l'utilisateur peut alors passer sur une autre cellule
by chorem.org scm 05 Jul '16

05 Jul '16

This is an automated email from the git hooks/post-receive script. New commit to branch feature/1316-Rendre-utilisable-la-selection-de-compte in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 5da06cc2c3f01f0dbc08277be1bad7634172d85d Author: dcosse <cosse(a)codelutin.com> Date: Sat Feb 20 17:43:00 2016 +0100 refs #1316 changement de comportement, il est possible de rechercher un compte tant qu'aucune correspondance a été trouvée, une fois une correspondance unique trouvée la recherche est intérompue (peut-être reprise avec F12) et l'utilisateur peut alors passer sur une autre cellule --- .../lima/ui/celleditor/AccountTableCellEditor.java | 37 ++++++++++++++++++---- 1 file changed, 30 insertions(+), 7 deletions(-) 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 5d6e734..799a1d0 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 @@ -61,29 +61,52 @@ public class AccountTableCellEditor extends AbstractCellEditor implements TableC accountComboBox.setShowDecorator(false); final JComboBox comboBox = accountComboBox.getCombobox(); - comboBox.getEditor().getEditorComponent().addKeyListener(new KeyAdapter() { + final ComboBoxEditor editor = comboBox.getEditor(); + + editor.getEditorComponent().addKeyListener(new KeyAdapter() { + @Override public void keyReleased(KeyEvent e) { + if (log.isDebugEnabled()) { + log.debug("keyReleased:" + e.getKeyCode()); + log.debug("items:" + comboBox.getItemCount()); + } + // in case of unique chose available this one is auto-selected if (accountComboBox.isEnterToSelectUniqueUniverse() && comboBox.getItemCount() == 1) { - // auto-select the account + if (log.isDebugEnabled()) { - log.debug("Auto-select unique result with *ENTER* or *TAB* key"); + log.debug("Auto-select unique result"); } e.consume(); - // edition is done + if (log.isDebugEnabled()) { + log.debug("setEditable false"); + } + + // set the account into the combobox + // disabled edition to avoid user taping other chars and unvolontary start a new research + // User can press Tab or Enter to leave the combo or F12 to edit it again + comboBox.getItemAt(0); comboBox.setSelectedIndex(0); - comboBox.getModel().setSelectedItem(comboBox.getSelectedItem()); - comboBox.hidePopup(); + editor.setItem(comboBox.getSelectedItem()); + comboBox.setEditable(false); + } } }); + } @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - if (value instanceof Account) { + // focus reach the combo by either coming into it or pressing F12 + // cell is set editable for user to be able to start a new research + accountComboBox.getCombobox().setEditable(true); + if (value != null && (value instanceof Account)) { + if (log.isDebugEnabled()) { + log.debug("set account:" + ((Account) value).getAccountNumber()); + } accountComboBox.setSelectedItem(value); } return accountComboBox; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/10: refs #1316 ajout de logs
by chorem.org scm 05 Jul '16

05 Jul '16

This is an automated email from the git hooks/post-receive script. New commit to branch feature/1316-Rendre-utilisable-la-selection-de-compte in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit e099d71c2da0ed961a46ce9ed97008d7191ea4fe Author: dcosse <cosse(a)codelutin.com> Date: Sat Feb 20 17:39:23 2016 +0100 refs #1316 ajout de logs --- .../src/main/java/org/chorem/lima/ui/combobox/AccountComboBox.java | 7 +++++-- .../src/main/java/org/chorem/lima/ui/common/AbstractLimaTable.java | 4 ++++ .../org/chorem/lima/ui/financialtransaction/AccountColumn.java | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) 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 916e6c1..be46e16 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 @@ -24,6 +24,8 @@ package org.chorem.lima.ui.combobox; import jaxx.runtime.JAXXContext; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.LimaServiceFactory; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.AccountService; @@ -40,6 +42,8 @@ import java.util.List; */ public class AccountComboBox extends BeanFilterableComboBox<Account> implements ServiceListener { + private static final Log log = LogFactory.getLog(AccountComboBox.class); + protected AccountService accountService; protected boolean leafAccounts; @@ -55,8 +59,7 @@ public class AccountComboBox extends BeanFilterableComboBox<Account> implements private void initializeAccountComboBox() { leafAccounts = false; - accountService = - LimaServiceFactory.getService(AccountService.class); + accountService = LimaServiceFactory.getService(AccountService.class); LimaServiceFactory.addServiceListener(AccountService.class, this); LimaServiceFactory.addServiceListener(ImportService.class, this); init(DecoratorUtil.newMultiJXPathDecorator(Account.class, "${" + Account.PROPERTY_ACCOUNT_NUMBER + "}$s##${" + Account.PROPERTY_LABEL + "}$s", "##", " - "), getDataList()); diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTable.java b/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTable.java index 9a36e58..ad9a46b 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTable.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTable.java @@ -22,6 +22,8 @@ package org.chorem.lima.ui.common; * #L% */ +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.ui.celleditor.AccountTableCellEditor; @@ -46,6 +48,8 @@ import java.util.Date; */ public abstract class AbstractLimaTable<H> extends JXTable { + protected static final Log log = LogFactory.getLog(AbstractLimaTable.class); + private static final long serialVersionUID = -4195941654485008887L; protected H handler; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java index 33e567a..0cca0cd 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java @@ -23,6 +23,8 @@ package org.chorem.lima.ui.financialtransaction; */ import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; import org.chorem.lima.ui.celleditor.AccountTableCellEditor; @@ -36,6 +38,8 @@ import static org.nuiton.i18n.I18n.t; */ public class AccountColumn extends AbstractColumn<FinancialTransactionTableModel> { + protected static final Log log = LogFactory.getLog(AccountColumn.class); + public AccountColumn() { super(Account.class, t("lima.entry.account"), true); setCellEditor(new AccountTableCellEditor()); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/1316-Rendre-utilisable-la-selection-de-compte updated (4b664d5 -> 69d3dd3)
by chorem.org scm 05 Jul '16

05 Jul '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/1316-Rendre-utilisable-la-selection-de-compte in repository lima. See https://gitlab.nuiton.org/chorem/lima.git discards 4b664d5 Merge branch 'feature/1316-Rendre-utilisable-la-selection-de-compte' of https://gitlab.nuiton.org/chorem/lima into feature/1316-Rendre-utilisable-la-selection-de-compte discards 92d48e6 refs #1317 déclaration de licences manquante discards 61b8330 refs #1317 déclaration de licences manquante discards 0bc6b5b refs #1317 déclaration de licences manquante discards b9125c4 refs #1316 changement de comportement, il est possible de rechercher un compte tant qu'aucune correspondance a été trouvée, une fois une correspondance unique trouvée la recherche est intérompue (peut-être reprise avec F12) et l'utilisateur peut alors passer sur une autre cellule discards f131e28 refs #1316 ajout de logs new c6a5d18 refs #1317 déclaration de licences manquante new e6ca96c refs #1317 déclaration de licences manquante new 3506749 refs #1317 déclaration de licences manquante new ead9029 refs #1317 déclaration de licences manquante new 69d3dd3 refs #1317 déclaration de licences manquante This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (4b664d5) \ N -- N -- N refs/heads/feature/1316-Rendre-utilisable-la-selection-de-compte (69d3dd3) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 69d3dd342ea4d1288c96766a16fc4a53a1f207d8 Author: David Cossé <cosse(a)codelutin.com> Date: Tue Jul 5 13:49:45 2016 +0200 refs #1317 déclaration de licences manquante commit ead9029a081ee792962ea3f0a58e536f30243c47 Author: David Cossé <cosse(a)codelutin.com> Date: Tue Jul 5 13:44:08 2016 +0200 refs #1317 déclaration de licences manquante commit 3506749fa00956545b70bf8de7b2244f5e8cf24e Author: David Cossé <cosse(a)codelutin.com> Date: Tue Jul 5 13:49:45 2016 +0200 refs #1317 déclaration de licences manquante commit e6ca96c61c3ffb3133b66ec923b74bb8a483fa93 Author: David Cossé <cosse(a)codelutin.com> Date: Tue Jul 5 13:44:08 2016 +0200 refs #1317 déclaration de licences manquante commit c6a5d186a92e38dc3b91b428709a8f966855f8ba Author: David Cossé <cosse(a)codelutin.com> Date: Tue Jul 5 13:36:48 2016 +0200 refs #1317 déclaration de licences manquante Summary of changes: -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 5

branch feature/1316-Rendre-utilisable-la-selection-de-compte updated (92d48e6 -> 4b664d5)
by chorem.org scm 05 Jul '16

05 Jul '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/1316-Rendre-utilisable-la-selection-de-compte in repository lima. See https://gitlab.nuiton.org/chorem/lima.git from 92d48e6 refs #1317 déclaration de licences manquante adds 5e23e95 refs #1315 Ajout des nouvelles écritures aux écritures non vérouillées new ed48b14 refs #1316 ajout de logs new 778746f refs #1316 changement de comportement, il est possible de rechercher un compte tant qu'aucune correspondance a été trouvée, une fois une correspondance unique trouvée la recherche est intérompue (peut-être reprise avec F12) et l'utilisateur peut alors passer sur une autre cellule new 87a3af7 refs #1317 déclaration de licences manquante new 7c75065 refs #1317 déclaration de licences manquante new ae5775b refs #1317 déclaration de licences manquante new 4b664d5 Merge branch 'feature/1316-Rendre-utilisable-la-selection-de-compte' of https://gitlab.nuiton.org/chorem/lima into feature/1316-Rendre-utilisable-la-selection-de-compte The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 4b664d58810cf071b9c35c2deb23ec882d15d74f Merge: ae5775b 92d48e6 Author: David Cossé <cosse(a)codelutin.com> Date: Tue Jul 5 13:55:04 2016 +0200 Merge branch 'feature/1316-Rendre-utilisable-la-selection-de-compte' of https://gitlab.nuiton.org/chorem/lima into feature/1316-Rendre-utilisable-la-selection-de-compte commit ae5775b2bd98311606ac921ce49c59bdb3af4cb4 Author: David Cossé <cosse(a)codelutin.com> Date: Tue Jul 5 13:49:45 2016 +0200 refs #1317 déclaration de licences manquante commit 7c7506507a7f0f5bc0c30881731420a2be926b9f Author: David Cossé <cosse(a)codelutin.com> Date: Tue Jul 5 13:44:08 2016 +0200 refs #1317 déclaration de licences manquante commit 87a3af70ff8210bf66633f0b30034b967467b2dc Author: David Cossé <cosse(a)codelutin.com> Date: Tue Jul 5 13:36:48 2016 +0200 refs #1317 déclaration de licences manquante commit 778746f5fadaa59c72f971a72f5eb55e7ff3603c Author: dcosse <cosse(a)codelutin.com> Date: Sat Feb 20 17:43:00 2016 +0100 refs #1316 changement de comportement, il est possible de rechercher un compte tant qu'aucune correspondance a été trouvée, une fois une correspondance unique trouvée la recherche est intérompue (peut-être reprise avec F12) et l'utilisateur peut alors passer sur une autre cellule commit ed48b142590a2de402b0bf83f7f872a4635bffc2 Author: dcosse <cosse(a)codelutin.com> Date: Sat Feb 20 17:39:23 2016 +0100 refs #1316 ajout de logs Summary of changes: .../main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java | 3 +++ 1 file changed, 3 insertions(+) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 6

branch feature/1316-Rendre-utilisable-la-selection-de-compte updated (b9125c4 -> 92d48e6)
by chorem.org scm 05 Jul '16

05 Jul '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/1316-Rendre-utilisable-la-selection-de-compte in repository lima. See https://gitlab.nuiton.org/chorem/lima.git from b9125c4 refs #1316 changement de comportement, il est possible de rechercher un compte tant qu'aucune correspondance a été trouvée, une fois une correspondance unique trouvée la recherche est intérompue (peut-être reprise avec F12) et l'utilisateur peut alors passer sur une autre cellule new 0bc6b5b refs #1317 déclaration de licences manquante new 61b8330 refs #1317 déclaration de licences manquante new 92d48e6 refs #1317 déclaration de licences manquante The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 92d48e62682b1df9c86b3744e94cd82688589e56 Author: David Cossé <cosse(a)codelutin.com> Date: Tue Jul 5 13:49:45 2016 +0200 refs #1317 déclaration de licences manquante commit 61b83304e050d9258941f17e565642b169c0a2cf Author: David Cossé <cosse(a)codelutin.com> Date: Tue Jul 5 13:44:08 2016 +0200 refs #1317 déclaration de licences manquante commit 0bc6b5becf3e6c71df747953707c3dbb3f3f9faf Author: David Cossé <cosse(a)codelutin.com> Date: Tue Jul 5 13:36:48 2016 +0200 refs #1317 déclaration de licences manquante Summary of changes: lima-server/src/license/THIRD-PARTY.properties | 3 ++- lima-swing/src/license/THIRD-PARTY.properties | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3