November 2013 - Lima-commits - mailman.cloud.codelutin.com

r3717 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/entrybook resources/icons
by sbavencoff＠users.chorem.org 22 Nov '13

22 Nov '13

Author: sbavencoff Date: 2013-11-22 17:49:26 +0100 (Fri, 22 Nov 2013) New Revision: 3717 Url: http://chorem.org/projects/lima/repository/revisions/3717 Log: [Entry Book] : move button into toolBar add shortcuts add icons Added: trunk/lima-swing/src/main/resources/icons/action-entryBook-edit.png trunk/lima-swing/src/main/resources/icons/action-entryBook-import.png trunk/lima-swing/src/main/resources/icons/action-entryBook-new.png trunk/lima-swing/src/main/resources/icons/action-entryBook-remove.png Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx 2013-11-22 16:48:35 UTC (rev 3716) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx 2013-11-22 16:49:26 UTC (rev 3717) @@ -49,7 +49,7 @@ <JLabel text="lima.ui.entrybook.code"/> </cell> <cell> - <JTextField id="entryBookCodeField" text="{getEntryBook().getCode()}" editable='{isAddState()}' /> + <JTextField id="entryBookCodeField" text="{getEntryBook().getCode()}" enabled='{isAddState()}' /> <Document javaBean="getEntryBookCodeField().getDocument()" onInsertUpdate='getEntryBook().setCode(getEntryBookCodeField().getText())' onRemoveUpdate='getEntryBook().setCode(getEntryBookCodeField().getText())'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx 2013-11-22 16:48:35 UTC (rev 3716) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx 2013-11-22 16:49:26 UTC (rev 3717) @@ -41,7 +41,37 @@ ]]></script> <row> - <cell fill="both" weightx="1" weighty="1" rows='4'> + <cell fill="horizontal"> + <JToolBar floatable="false"> + + <JButton id="addButton" + toolTipText="{ _("lima.ui.entrybook.add") + " (Ctrl+N)"}" + actionIcon='entryBook-new' + onActionPerformed="handler.addEntryBook()"/> + + <JButton id="updateButton" + toolTipText="{ _("lima.ui.entrybook.update") + " (Ctrl+M)"}" + actionIcon='entryBook-edit' + onActionPerformed="handler.updateEntryBook()" + enabled="{isSelectedRow()}"/> + + <JButton id="removeButton" + toolTipText="{ _("lima.ui.entrybook.remove") + " (Del)"}" + actionIcon='entryBook-remove' + onActionPerformed="handler.deleteEntryBook()" + enabled="{isSelectedRow()}"/> + + <JButton id="importButton" + actionIcon='entryBook-import' + toolTipText="lima.ui.importexport.import" + onActionPerformed="handler.importEntryBooks()"/> + + </JToolBar> + </cell> + </row> + + <row> + <cell fill="both" weightx="1" weighty="1"> <JScrollPane> <EntryBookTable id="entryBooksTable" rowHeight="24" constructorParams="getHandler()" @@ -52,29 +82,5 @@ onValueChanged="setSelectedRow(entryBooksTable.getSelectedRow() != -1)"/> </JScrollPane> </cell> - <cell fill="horizontal"> - <JButton id="addButton" text="lima.ui.entrybook.add" - onActionPerformed="getHandler().addEntryBook()"/> - </cell> </row> - <row> - <cell fill="horizontal"> - <JButton id="updateButton" text="lima.ui.entrybook.update" - enabled="{isSelectedRow()}" - onActionPerformed="getHandler().updateEntryBook()"/> - </cell> - </row> - <row> - <cell fill="horizontal"> - <JButton id="removeButton" text="lima.ui.entrybook.remove" - enabled="{isSelectedRow()}" - onActionPerformed="getHandler().deleteEntryBook()"/> - </cell> - </row> - <row> - <cell fill="horizontal" anchor="north" weighty="1"> - <JButton id="importButton" text="lima.ui.importexport.import" - onActionPerformed="getHandler().importEntryBooks()"/> - </cell> - </row> </Table> 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 2013-11-22 16:48:35 UTC (rev 3716) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2013-11-22 16:49:26 UTC (rev 3717) @@ -25,12 +25,6 @@ package org.chorem.lima.ui.entrybook; -import static org.nuiton.i18n.I18n._; - -import java.util.List; - -import javax.swing.JOptionPane; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.ServiceListener; @@ -44,6 +38,15 @@ import org.chorem.lima.ui.importexport.ImportExport; import org.jdesktop.swingx.JXTable; +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.List; + +import static org.nuiton.i18n.I18n._; + /** * Handler for entry book view. * @@ -68,6 +71,51 @@ } public void init() { + + InputMap inputMap = view.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + ActionMap actionMap = view.getActionMap(); + + // add action on Ctrl + N + String binding = "new-entryBook"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_DOWN_MASK), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + addEntryBook(); + } + }); + + // add action on Delete + binding = "remove-entryBook"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + deleteEntryBook(); + } + }); + + // add action on Ctrl + M + binding = "modify-entryBook"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_M, KeyEvent.CTRL_DOWN_MASK), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + updateEntryBook(); + } + }); + + EntryBookTable table = view.getEntryBooksTable(); + + table.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + if (e.getClickCount() == 2 ) { + updateEntryBook(); + } + } + }); + loadAllEntryBooks(); } @@ -92,7 +140,19 @@ public void addEntryBook() { EntryBook newEntryBook = new EntryBookImpl(); - EntryBookForm entryBookForm = new EntryBookForm(view); + final EntryBookForm entryBookForm = new EntryBookForm(view); + + InputMap inputMap = entryBookForm.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + ActionMap actionMap = entryBookForm.getRootPane().getActionMap(); + String binding = "dispose"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + entryBookForm.performCancel(); + } + }); + entryBookForm.setEntryBook(newEntryBook); entryBookForm.setLocationRelativeTo(view); entryBookForm.setVisible(true); @@ -121,7 +181,19 @@ int selectedRow = entryBookTable.getSelectedRow(); EntryBook selectedEntryBook = entryBookTableModel.getEntryBookAtRow(selectedRow); - EntryBookForm entryBookForm = new EntryBookForm(view); + final EntryBookForm entryBookForm = new EntryBookForm(view); + + InputMap inputMap = entryBookForm.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + ActionMap actionMap = entryBookForm.getRootPane().getActionMap(); + String binding = "dispose"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + entryBookForm.performCancel(); + } + }); + entryBookForm.setAddState(false); entryBookForm.setEntryBook(selectedEntryBook); entryBookForm.setLocationRelativeTo(view); @@ -169,7 +241,19 @@ */ public void importEntryBooks() { - EntryBookImportForm form = new EntryBookImportForm(view); + final EntryBookImportForm form = new EntryBookImportForm(view); + + InputMap inputMap = form.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + ActionMap actionMap = form.getRootPane().getActionMap(); + String binding = "dispose"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + form.performCancel(); + } + }); + form.setLocationRelativeTo(view); form.setVisible(true); Copied: trunk/lima-swing/src/main/resources/icons/action-entryBook-edit.png (from rev 3714, trunk/lima-swing/src/main/resources/icons/action-account-edit.png) =================================================================== (Binary files differ) Copied: trunk/lima-swing/src/main/resources/icons/action-entryBook-import.png (from rev 3714, trunk/lima-swing/src/main/resources/icons/action-account-import.png) =================================================================== (Binary files differ) Copied: trunk/lima-swing/src/main/resources/icons/action-entryBook-new.png (from rev 3714, trunk/lima-swing/src/main/resources/icons/action-account-new.png) =================================================================== (Binary files differ) Copied: trunk/lima-swing/src/main/resources/icons/action-entryBook-remove.png (from rev 3714, trunk/lima-swing/src/main/resources/icons/action-account-remove.png) =================================================================== (Binary files differ)

1 0

r3716 - in trunk/lima-business/src/main: java/org/chorem/lima/business/ejb resources/i18n
by sbavencoff＠users.chorem.org 22 Nov '13

22 Nov '13

Author: sbavencoff Date: 2013-11-22 17:48:35 +0100 (Fri, 22 Nov 2013) New Revision: 3716 Url: http://chorem.org/projects/lima/repository/revisions/3716 Log: [Entry Book] : fix check if entry already exist fix error message Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2013-11-22 16:39:28 UTC (rev 3715) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2013-11-22 16:48:35 UTC (rev 3716) @@ -68,11 +68,11 @@ // check if entrybook with is name already exist EntryBookDAO entryBookDAO = getDaoHelper().getEntryBookDAO(); EntryBook existingEntryBook = - entryBookDAO.findByLabel(entryBook.getCode()); + entryBookDAO.findByCode(entryBook.getCode()); if (existingEntryBook != null) { throw new LimaBusinessException( _("lima-business.entrybook.entrybookalreadyexist", - entryBook.getLabel())); + entryBook.getCode())); } // creation du EntryBook Modified: trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2013-11-22 16:39:28 UTC (rev 3715) +++ trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2013-11-22 16:48:35 UTC (rev 3716) @@ -64,7 +64,7 @@ lima-business.document.vatnumber=VAT N° lima-business.document.voucher=Voucher lima-business.document.zipcode= -lima-business.entrybook.entrybookalreadyexist=An EntryBook already exists with this label \: %s +lima-business.entrybook.entrybookalreadyexist=An EntryBook already exists with this code \: %s lima-business.financialstatement.check.nothing=Not found \: %s - %s \n lima-business.financialstatement.check.warn=Warning this function is just an help.\n Many accounts must no calculate on Financial statement.\n Some account marked not found is normally.\n\n lima-business.financialtransaction.retainedearnings.description=Retained earnings Modified: trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2013-11-22 16:39:28 UTC (rev 3715) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2013-11-22 16:48:35 UTC (rev 3716) @@ -66,7 +66,7 @@ lima-business.document.vatnumber=N° TVA lima-business.document.voucher=Pièce comptable lima-business.document.zipcode=Code postal -lima-business.entrybook.entrybookalreadyexist=Un journal existe déjà avec ce libellé \: %s +lima-business.entrybook.entrybookalreadyexist=Un journal existe déjà avec ce code \: %s lima-business.financialstatement.check.nothing=Introuvable \: %s - %s \n lima-business.financialstatement.check.warn=Attention cette fonctionnalité n'est qu'une aide utilisateur.\n Certains comptes ne doivent pas être présent au bilan et compte de résultat.\n Il est donc normal que des comptes sont marqués comme introuvable.\n\n lima-business.financialtransaction.retainedearnings.description=Report à nouveau

1 0

r3715 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/account
by sbavencoff＠users.chorem.org 22 Nov '13

22 Nov '13

Author: sbavencoff Date: 2013-11-22 17:39:28 +0100 (Fri, 22 Nov 2013) New Revision: 3715 Url: http://chorem.org/projects/lima/repository/revisions/3715 Log: [Account Plan] : fix shortcuts Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 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 2013-11-22 15:35:03 UTC (rev 3714) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2013-11-22 16:39:28 UTC (rev 3715) @@ -127,7 +127,7 @@ // add action on Ctrl + N String binding = "new-account"; - inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_L, KeyEvent.CTRL_DOWN_MASK), binding); + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_DOWN_MASK), binding); actionMap.put(binding, new AbstractAction() { @Override public void actionPerformed(ActionEvent e) {

1 0

r3714 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/account resources/icons
by sbavencoff＠users.chorem.org 22 Nov '13

22 Nov '13

Author: sbavencoff Date: 2013-11-22 16:35:03 +0100 (Fri, 22 Nov 2013) New Revision: 3714 Url: http://chorem.org/projects/lima/repository/revisions/3714 Log: [Account Plan] : move button into toolBar add shortcuts add icons Added: trunk/lima-swing/src/main/resources/icons/action-account-edit.png trunk/lima-swing/src/main/resources/icons/action-account-import.png trunk/lima-swing/src/main/resources/icons/action-account-new.png trunk/lima-swing/src/main/resources/icons/action-account-remove.png Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.jaxx Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx 2013-11-22 15:33:11 UTC (rev 3713) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx 2013-11-22 15:35:03 UTC (rev 3714) @@ -41,7 +41,37 @@ ]]></script> <row> - <cell fill="both" weightx="1" weighty="1" rows='4'> + <cell fill="horizontal"> + <JToolBar floatable="false"> + + <JButton id="addButton" + toolTipText="{ _("lima.ui.account.addaccount") + " (Ctrl+N)"}" + actionIcon='account-new' + onActionPerformed="handler.addAccount()"/> + + <JButton id="updateButton" + toolTipText="{ _("lima.ui.common.update") + " (Ctrl+M)"}" + actionIcon='account-edit' + onActionPerformed="handler.updateAccount()" + enabled="{isSelectedRow()}"/> + + <JButton id="removeButton" + toolTipText="{ _("lima.ui.common.remove") + " (Del)"}" + actionIcon='account-remove' + onActionPerformed="handler.removeAccount()" + enabled="{isSelectedRow()}"/> + + <JButton id="importButton" + actionIcon='account-import' + toolTipText="lima.ui.importexport.import" + onActionPerformed="handler.importAccountsChart()"/> + + </JToolBar> + </cell> + </row> + + <row> + <cell fill="both" weightx="1" weighty="1"> <JScrollPane> <JXTreeTable id="accountsTreeTable" selectionMode="{ListSelectionModel.SINGLE_SELECTION}" @@ -51,29 +81,5 @@ onValueChanged="setSelectedRow(accountsTreeTable.getSelectedRow() != -1)"/> </JScrollPane> </cell> - <cell fill="horizontal"> - <JButton id="addButton" text="lima.ui.account.addaccount" - onActionPerformed="handler.addAccount()"/> - </cell> </row> - <row> - <cell fill="horizontal"> - <JButton id="updateButton" text="lima.ui.common.update" - onActionPerformed="handler.updateAccount()" - enabled="{isSelectedRow()}"/> - </cell> - </row> - <row> - <cell fill="horizontal"> - <JButton id="removeButton" text="lima.ui.common.remove" - onActionPerformed="handler.removeAccount()" - enabled="{isSelectedRow()}"/> - </cell> - </row> - <row> - <cell fill="horizontal" anchor="north" weighty="1"> - <JButton id="importButton" text="lima.ui.importexport.import" - onActionPerformed="handler.importAccountsChart()"/> - </cell> - </row> </Table> 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 2013-11-22 15:33:11 UTC (rev 3713) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2013-11-22 15:35:03 UTC (rev 3714) @@ -25,25 +25,6 @@ package org.chorem.lima.ui.account; -import static org.nuiton.i18n.I18n._; - -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -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.Iterator; -import java.util.List; -import java.util.Map; -import java.util.SortedMap; -import java.util.TreeMap; - -import javax.swing.JOptionPane; -import javax.swing.tree.TreePath; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.ServiceListener; @@ -60,6 +41,25 @@ import org.jdesktop.swingx.treetable.MutableTreeTableNode; import org.jdesktop.swingx.treetable.TreeTableNode; +import javax.swing.*; +import javax.swing.tree.TreePath; +import java.awt.event.ActionEvent; +import java.awt.event.InputEvent; +import java.awt.event.KeyEvent; +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.Iterator; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; + +import static org.nuiton.i18n.I18n._; + /** * Handler associated with account view. * @@ -119,22 +119,42 @@ */ public void init() { JXTreeTable table = view.getAccountsTreeTable(); - table.addKeyListener(new KeyAdapter() { - /** - * for each action combination key are think - * for extend keyboard and laptop keyboard - */ + + //To block reaction of the dual key 'ctrl+a' (Selection of all lines) + InputMap inputMap = view.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + ActionMap actionMap = view.getActionMap(); + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK), "none"); + + // add action on Ctrl + N + String binding = "new-account"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_L, KeyEvent.CTRL_DOWN_MASK), binding); + actionMap.put(binding, new AbstractAction() { @Override - public void keyPressed(KeyEvent e) { - JXTreeTable source = (JXTreeTable) e.getSource(); - // clear row selection with the key: escape - if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { - if (!source.isEditing()) { - source.clearSelection(); - } - } + public void actionPerformed(ActionEvent e) { + addAccount(); } }); + + // add action on Delete + binding = "remove-account"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + removeAccount(); + } + }); + + // add action on Ctrl + M + binding = "modify-account"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_M, KeyEvent.CTRL_DOWN_MASK), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + updateAccount(); + } + }); + table.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent e) { @@ -143,6 +163,13 @@ source.clearSelection(); } } + + @Override + public void mouseClicked(MouseEvent e) { + if (e.getClickCount() == 2 ) { + updateAccount(); + } + } }); loadAllAccounts(); @@ -193,7 +220,19 @@ * Display add account view */ public void addAccount() { - AccountForm accountForm = new AccountForm(view); + final AccountForm accountForm = new AccountForm(view); + + InputMap inputMap = accountForm.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + ActionMap actionMap = accountForm.getRootPane().getActionMap(); + String binding = "dispose"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + accountForm.dispose(); + } + }); + accountForm.setLocationRelativeTo(view); accountForm.setVisible(true); } @@ -288,7 +327,20 @@ Account selectedAccount = (Account)lastPathComponent.getUserObject(); // display edit form - UpdateAccountForm accountForm = new UpdateAccountForm(view); + final UpdateAccountForm accountForm = new UpdateAccountForm(view); + + InputMap inputMap = accountForm.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + ActionMap actionMap = accountForm.getRootPane().getActionMap(); + String binding = "dispose"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + accountForm.dispose(); + } + }); + + accountForm.setAccount(selectedAccount); accountForm.setLocationRelativeTo(view); accountForm.setVisible(true); @@ -355,7 +407,19 @@ public void importAccountsChart() { - AccountImportForm form = new AccountImportForm(view); + final AccountImportForm form = new AccountImportForm(view); + + InputMap inputMap = form.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + ActionMap actionMap = form.getRootPane().getActionMap(); + String binding = "dispose"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + form.performCancel(); + } + }); + form.setLocationRelativeTo(view); form.setVisible(true); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.jaxx 2013-11-22 15:33:11 UTC (rev 3713) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.jaxx 2013-11-22 15:35:03 UTC (rev 3714) @@ -48,7 +48,8 @@ <JLabel text="lima.ui.account.number" labelFor='{numberTextField}'/> </cell> <cell fill="horizontal"> - <JTextField id="numberTextField" editable='{false}' + <JTextField id="numberTextField" + enabled="false" text="{getAccount().getAccountNumber()}"/> </cell> </row> Added: trunk/lima-swing/src/main/resources/icons/action-account-edit.png =================================================================== (Binary files differ) Property changes on: trunk/lima-swing/src/main/resources/icons/action-account-edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/lima-swing/src/main/resources/icons/action-account-import.png =================================================================== (Binary files differ) Property changes on: trunk/lima-swing/src/main/resources/icons/action-account-import.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/lima-swing/src/main/resources/icons/action-account-new.png =================================================================== (Binary files differ) Property changes on: trunk/lima-swing/src/main/resources/icons/action-account-new.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/lima-swing/src/main/resources/icons/action-account-remove.png =================================================================== (Binary files differ) Property changes on: trunk/lima-swing/src/main/resources/icons/action-account-remove.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r3713 - in trunk/lima-business/src/main: java/org/chorem/lima/business/accountingrules resources/i18n
by sbavencoff＠users.chorem.org 22 Nov '13

22 Nov '13

Author: sbavencoff Date: 2013-11-22 16:33:11 +0100 (Fri, 22 Nov 2013) New Revision: 3713 Url: http://chorem.org/projects/lima/repository/revisions/3713 Log: [Account Plan] fixes : check account number and error message Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2013-10-28 08:11:44 UTC (rev 3712) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2013-11-22 15:33:11 UTC (rev 3713) @@ -74,7 +74,7 @@ } // Check root account starts with 1 to 8 - if (accountNumber.length() == 1 && !accountNumber.matches("[1-8]")) { + if (accountNumber.length() >= 1 && !accountNumber.substring(0, 1).matches("[1-8]")) { throw new LimaBusinessException(_("lima-business.franceaccountingrules.accountstartnumbererror", account.getAccountNumber())); } @@ -94,7 +94,7 @@ } // Check root account starts with 1 to 8 - if (accountNumber.length() == 1 && accountNumber.matches("[1-8]")) { + if (accountNumber.length() >= 1 && !accountNumber.substring(0, 1).matches("[1-8]")) { throw new LimaBusinessException(_("lima-business.franceaccountingrules.accountstartnumbererror", account.getAccountNumber())); } Modified: trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2013-10-28 08:11:44 UTC (rev 3712) +++ trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2013-11-22 15:33:11 UTC (rev 3713) @@ -73,7 +73,7 @@ lima-business.fiscalperiod.newfinancialperioderror=Can't set financial period on the following fiscal year lima-business.fiscalperiod.previousfiscalperiodalreadyblocked=The last financial period from the fiscal period is blocked lima-business.franceaccountingrules.accountnumbernotnumeric=Account Number is not numeric \: %s -lima-business.franceaccountingrules.accountstartnumbererror=Master account is not a digit between 1 to 8 \: %d +lima-business.franceaccountingrules.accountstartnumbererror=Master account is not a digit between 1 to 8 \: %s lima-business.franceaccountingrules.antefinancialperiodnotblockedentrybook=The previous financial periods for this entrybook must be blocked before this lima-business.franceaccountingrules.antefiscalperiodnotblocked=The ante fiscal period is not locked lima-business.franceaccountingrules.fiscalperiodnotempty=The fiscal period is not empty \! Modified: trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2013-10-28 08:11:44 UTC (rev 3712) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2013-11-22 15:33:11 UTC (rev 3713) @@ -74,8 +74,8 @@ lima-business.fiscalperiod.fiscalperiodalreadyblocked=La période fiscale est déjà bloquée lima-business.fiscalperiod.newfinancialperioderror=Impossible de définir la période financière sur la période fiscale suivante lima-business.fiscalperiod.previousfiscalperiodalreadyblocked=La dernière période financière de la période fiscale est bloquée -lima-business.franceaccountingrules.accountnumbernotnumeric=Le numéro de copte n'est pas numéric \: %s -lima-business.franceaccountingrules.accountstartnumbererror=Le numéro du copte général n'est pas compris entre 1 et 8 \: %d +lima-business.franceaccountingrules.accountnumbernotnumeric=Le numéro de compte n'est pas numérique \: %s +lima-business.franceaccountingrules.accountstartnumbererror=Le numéro du compte général n'est pas compris entre 1 et 8 \: %s lima-business.franceaccountingrules.antefinancialperiodnotblockedentrybook=Les périodes financières précédentes pour ce journal doivent être bloquées avant lima-business.franceaccountingrules.antefiscalperiodnotblocked=La période fiscale précédente n'est pas bloquée lima-business.franceaccountingrules.fiscalperiodnotempty=La période fiscale à supprimer n'est pas vide \!

1 0