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

r3710 - in trunk/lima-business/src: main/java/org/chorem/lima/business/ejb main/java/org/chorem/lima/business/utils test/java/org/chorem/lima/business
by Bavencoff＠users.chorem.org 11 Oct '13

11 Oct '13

Author: Bavencoff Date: 2013-10-11 15:56:17 +0200 (Fri, 11 Oct 2013) New Revision: 3710 Url: http://chorem.org/projects/lima/repository/revisions/3710 Log: refs #735 : [lettrage]Mauvaise incr?\195?\169mentation des lettres Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2013-09-27 14:03:11 UTC (rev 3709) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2013-10-11 13:56:17 UTC (rev 3710) @@ -25,6 +25,9 @@ package org.chorem.lima.business.ejb; +import com.google.common.base.Predicate; +import com.google.common.collect.Collections2; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.Filter.FilterGenerator; @@ -58,6 +61,7 @@ import javax.ejb.TransactionAttribute; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.List; @@ -149,49 +153,37 @@ throw new LimaException("Can't get new letters", ex); } - /**Increment letter alphabetically*/ - int indexCharToIncrement = 0; - int lastActualLettersLength = lastActualLetters.length(); - String findLastLetters; - String findFirstLetters =""; - int numberOfA; + nextLetters = lettersAfter(lastActualLetters); - /*Searching which letter is 'Z', and so must be incremented*/ - for (int i = 0; i < lastActualLettersLength; i++) { - if (lastActualLetters.charAt(i) != 'Z') { - indexCharToIncrement = i; - } - } + return nextLetters; + } - /*When no letter, just set 'A'*/ - if (lastActualLettersLength != 0) { - /*Get first letter(s), only if we have more of one letter (One letter = letter to increment)*/ - String firstPartActualLetters = lastActualLetters.substring(0, indexCharToIncrement); - if (firstPartActualLetters.length() > 1) { - findFirstLetters = firstPartActualLetters; - } + public static String lettersAfter(String letters) { - /*Get the letters after the correct letter to increment and - *increment it (Using 'indexCharToIncrement') - * */ - findLastLetters = lastActualLetters.substring(indexCharToIncrement+1, lastActualLettersLength); - if (lastActualLetters.charAt(indexCharToIncrement) != 'Z') { - /*Last letters transform to x 'A' (x = Number of 'Z'), if they are 'Z'*/ - if (findLastLetters.length() > 0) { - if (findLastLetters.charAt(0) == 'Z') { - numberOfA = findLastLetters.length(); - findLastLetters=getCharsA(numberOfA); - } - } - nextLetters = findFirstLetters + String.valueOf( (char) (lastActualLetters.charAt(indexCharToIncrement) + 1)) + findLastLetters; - } + String letterAfter = null; + /* "" -> "A" */ + if (StringUtils.isEmpty(letters)) { + + letterAfter = "A"; + } else { - numberOfA = lastActualLettersLength +1; - nextLetters = getCharsA(numberOfA); + char endChar = letters.charAt(letters.length() - 1); + + if (endChar < 'Z') { + + /* si la lettre n'est pas un 'Z' on ajout a la reste de la chaine le caratère suivant */ + letterAfter = letters.substring(0, letters.length() -1) + ((char) (endChar + 1)); + } else { + /* si non on réitére sur le reste de la chaine en ajoutant "A" a la nouvelle chaine */ + letterAfter = lettersAfter(letters.substring(0, letters.length() -1)) + 'A'; + + } + } - return nextLetters; + return letterAfter; + } @Override @@ -320,26 +312,24 @@ costOrProductEntry.setAccount(costOrProductAccount); } - protected String getCharsA(int numberOfA) { - String charsA=""; - for (int j = 0; j < numberOfA; j++) { - charsA = charsA+"A"; - } - return charsA; - } - public String findLastLetter(List<String> letters) { String result; - Collections.sort(letters, new LetteringComparator()); - Collections.reverse(letters); + /** filtre sur les valeurs potentiellement généré */ + Collection<String> generatedLetters = Collections2.filter(letters, new Predicate<String>() { + @Override + public boolean apply(String input) { + return input != null && + input.matches("[A-Z]+"); + } + }); - if (letters.isEmpty()) { + if (generatedLetters.isEmpty()) { result = ""; } else { - result = letters.get(0); + result = Collections.max(generatedLetters, new LetteringComparator()); } return result; } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java 2013-09-27 14:03:11 UTC (rev 3709) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java 2013-10-11 13:56:17 UTC (rev 3710) @@ -35,16 +35,16 @@ int lengthFirstString = firstString.length(); int lengthSecondString = secondString.length(); + int result = 0; + if (lengthFirstString < lengthSecondString) { - return -1; + result = -1; } else if (lengthFirstString > lengthSecondString) { - return 1; + result = 1; } else { - if (firstString.charAt(0) < secondString.charAt(0)) { - return -1; - } else { - return 1; - } + result = firstString.compareTo(secondString); } + + return result; } } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java 2013-09-27 14:03:11 UTC (rev 3709) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java 2013-10-11 13:56:17 UTC (rev 3710) @@ -37,6 +37,7 @@ import java.math.BigDecimal; import java.text.ParseException; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -146,20 +147,31 @@ } @Test + public void testLettersAfter() { + + Assert.assertEquals("A", FinancialTransactionServiceImpl.lettersAfter(null)); + Assert.assertEquals("A", FinancialTransactionServiceImpl.lettersAfter("")); + Assert.assertEquals("E", FinancialTransactionServiceImpl.lettersAfter("D")); + Assert.assertEquals("AA", FinancialTransactionServiceImpl.lettersAfter("Z")); + Assert.assertEquals("ASDGUAAAA", FinancialTransactionServiceImpl.lettersAfter("ASDGTZZZZ")); + + } + + @Test public void testFindLastLetter() { - List<String> letters = Arrays.asList("A", "BZ", "ZZZ", "C", "Z", "E"); - FinancialTransactionServiceImpl instance = new FinancialTransactionServiceImpl(); - String nextLetter = instance.findLastLetter(letters); + String nextLetter = instance.findLastLetter(Arrays.asList("A", "BZ", "ZZZ", "C", "Z", "E")); Assert.assertEquals("ZZZ", nextLetter); - Assert.assertEquals("A", letters.get(5)); - Assert.assertEquals("C", letters.get(4)); - Assert.assertEquals("E", letters.get(3)); - Assert.assertEquals("Z", letters.get(2)); - Assert.assertEquals("BZ", letters.get(1)); - Assert.assertEquals("ZZZ", letters.get(0)); + nextLetter = instance.findLastLetter(Arrays.asList("sfvq", "sfvr")); + Assert.assertEquals("", nextLetter); + + nextLetter = instance.findLastLetter(Arrays.asList("zzz", "ABC", "DEF")); + Assert.assertEquals("DEF", nextLetter); + + nextLetter = instance.findLastLetter(new ArrayList<String>()); + Assert.assertEquals("", nextLetter); } }

1 0

r3709 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/lettering resources/i18n resources/icons
by Bavencoff＠users.chorem.org 27 Sep '13

27 Sep '13

Author: Bavencoff Date: 2013-09-27 16:03:11 +0200 (Fri, 27 Sep 2013) New Revision: 3709 Url: http://chorem.org/projects/lima/repository/revisions/3709 Log: lettrage : am?\195?\169lioration des l'ergonomie, ajout de racourcis clavier Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/TypeEntry.java trunk/lima-swing/src/main/resources/icons/action-choose-account.png trunk/lima-swing/src/main/resources/icons/action-choose-entry.png trunk/lima-swing/src/main/resources/icons/action-un-lettering.png Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2013-08-09 10:06:55 UTC (rev 3708) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2013-09-27 14:03:11 UTC (rev 3709) @@ -25,7 +25,6 @@ package org.chorem.lima.ui.lettering; -import org.chorem.lima.LimaConfig; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.ui.celleditor.AccountTableCellEditor; @@ -35,11 +34,8 @@ import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor; import org.jdesktop.swingx.JXTable; -import javax.swing.DefaultCellEditor; -import javax.swing.InputMap; -import javax.swing.JComponent; -import javax.swing.JTextField; -import javax.swing.KeyStroke; +import javax.swing.*; +import java.awt.event.ActionEvent; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import java.math.BigDecimal; @@ -56,15 +52,49 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3133690382049594727L; - protected LetteringViewHandler handler; + protected final LetteringViewHandler handler; - public LetteringTable(LetteringTableModel letteringTableModel) { + public LetteringTable(LetteringTableModel letteringTableModel, final LetteringViewHandler handler) { super(letteringTableModel); + this.handler = handler; + //To block reaction of the dual key 'ctrl+a' (Selection of all lines) - InputMap im = getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); - im.put(KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK), "none"); + InputMap inputMap = getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + ActionMap actionMap = getActionMap(); + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK), "none"); + // add action on Ctrl + L + String binding = "lettering"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_L, KeyEvent.CTRL_DOWN_MASK), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + handler.addLetter(); + } + }); + + // add action on Ctrl + Delete + binding = "un-lettering"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + handler.removeLetter(); + } + }); + + // add action on Ctrl + B + binding = "balance"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_B, KeyEvent.CTRL_DOWN_MASK), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + handler.roundAndCreateEntry(); + } + }); + + //Get new date editor setDefaultEditor(Date.class, new DateTableCellEditor()); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2013-08-09 10:06:55 UTC (rev 3708) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2013-09-27 14:03:11 UTC (rev 3709) @@ -28,6 +28,7 @@ <import> org.chorem.lima.ui.common.AccountComboBoxModel org.chorem.lima.ui.common.FinancialPeriodComboBoxModel + org.chorem.lima.ui.lettering.TypeEntry org.chorem.lima.entity.Account javax.swing.ListSelectionModel org.jdesktop.swingx.JXDatePicker @@ -53,136 +54,114 @@ </script> <row> - <cell> - <JPanel layout='{new BorderLayout()}' id="panelAccountComboBox" border='{new TitledBorder(_("lima.ui.lettering.account"))}'> - <org.chorem.lima.ui.common.AccountComboBoxModel id="accountComboBoxModel"/> - <JComboBox id="accountComboBox" model="{accountComboBoxModel}" - renderer="{new org.chorem.lima.ui.common.AccountListRenderer()}" - onActionPerformed="filterModel.setAccount((Account)accountComboBoxModel.getSelectedItem())" - constraints='BorderLayout.WEST'/> - <JButton id="backCount" text="lima.ui.account.buttonback" - onActionPerformed="handler.back(accountComboBox)" - constraints='BorderLayout.CENTER'/> - <JButton id="nextCount" text="lima.ui.account.buttonnext" - onActionPerformed="handler.next(accountComboBox)" - constraints='BorderLayout.EAST'/> - </JPanel> - </cell> - <cell> - <JPanel id="panelFinancialPeriodComboBox" layout='{new BorderLayout()}' border='{new TitledBorder(_("lima.ui.lettering.period"))}'> - <Table constraints='BorderLayout.NORTH'> - <row> - <cell> - <JLabel text="lima.ui.lettering.beginFinancialPeriod"/> - </cell> - <cell> - <JXDatePicker id="pickerDebut" - onActionPerformed="filterModel.setDateStart(pickerDebut.getDate())"/> - </cell> - </row> - <row> - <cell> - <JLabel text="lima.ui.lettering.endFinancialPeriod"/> - </cell> - <cell> - <JXDatePicker id="pickerFin" - onActionPerformed="filterModel.setDateEnd(pickerFin.getDate())"/> - </cell> - </row> - </Table> - </JPanel> - </cell> - <cell> - <JPanel id="entryPanel" layout='{new BorderLayout()}' border='{new TitledBorder(_("lima.ui.lettering.entry"))}'> - <Table constraints='BorderLayout.NORTH'> - <row> - <cell> - <JRadioButton id="lettredEntryCheckBox" buttonGroup="letteredCheckGroup" - onActionPerformed="filterModel.setDisplayLettered(true) ; filterModel.setDisplayUnlettred(false)"/> - </cell> - <cell> - <JLabel text="lima.ui.lettering.checkLettredEntry"/> - </cell> - </row> - <row> - <cell> - <JRadioButton id="noLettredEntryCheckBox" selected="true" buttonGroup="letteredCheckGroup" - onActionPerformed="filterModel.setDisplayUnlettred(true); filterModel.setDisplayLettered(false)"/> - </cell> - <cell> - <JLabel text="lima.ui.lettering.checkNoLettredEntry"/> - </cell> - </row> - <row> - <cell> - <JRadioButton id="allCheckBox" buttonGroup="letteredCheckGroup" - onActionPerformed="filterModel.setDisplayLettered(false) ; filterModel.setDisplayUnlettred(false)"/> - </cell> - <cell> - <JLabel text="lima.ui.lettering.checkAll"/> - </cell> - </row> - </Table> - </JPanel> - </cell> + <cell fill="horizontal"> + <JToolBar floatable="false"> + + <JButton id="lettered" + toolTipText="{ _("lima.ui.lettering.buttonLettered") + " (Ctrl+L)"}" + enabled="{editModel.isLettred()}" + actionIcon='lettering' + onActionPerformed="handler.addLetter()"/> + + <JButton id="noLettered" + toolTipText="{ _("lima.ui.lettering.buttonNoLettered") + " (Del)"}" + enabled="{editModel.isUnLettred()}" + actionIcon='un-lettering' + onActionPerformed="handler.removeLetter()"/> + + <JButton id="round" + toolTipText="{ _("lima.ui.lettering.buttonEqualize") + " (Ctrl+B)"}" + enabled="{editModel.isEqualized()}" + actionIcon='balance' + onActionPerformed="handler.roundAndCreateEntry()"/> + + <JToolBar.Separator/> + + <JLabel actionIcon='choose-account' + labelFor='{accountComboBox}'/> + <org.chorem.lima.ui.common.AccountComboBoxModel id="accountComboBoxModel"/> + <JComboBox id="accountComboBox" + model="{accountComboBoxModel}" + toolTipText="lima.ui.lettering.account" + renderer="{new org.chorem.lima.ui.common.AccountListRenderer()}" + onItemStateChanged="filterModel.setAccount((Account)accountComboBoxModel.getSelectedItem())" /> + <JButton id="back" actionIcon="previous" + toolTipText="lima.ui.account.buttonback" + onActionPerformed="handler.back(accountComboBox)"/> + <JButton id="next" actionIcon="next" + toolTipText="lima.ui.account.buttonnext" + onActionPerformed="handler.next(accountComboBox)"/> + + <JToolBar.Separator/> + + <JLabel text="lima.ui.lettering.beginFinancialPeriod" + labelFor='{pickerDebut}'/> + <JXDatePicker id="pickerDebut" + onActionPerformed="filterModel.setDateStart(pickerDebut.getDate())"/> + + <JLabel text="lima.ui.lettering.endFinancialPeriod" + labelFor="{pickerFin}"/> + <JXDatePicker id="pickerFin" + onActionPerformed="filterModel.setDateEnd(pickerFin.getDate())"/> + + <JToolBar.Separator/> + + <JLabel actionIcon='choose-entry' + labelFor='{lettredEntryComboBox}'/> + <EnumEditor id='lettredEntryComboBox' + genericType='TypeEntry' + constructorParams='TypeEntry.class' + toolTipText="lima.ui.lettering.entry" + onItemStateChanged="filterModel.setDisplayLettered(lettredEntryComboBox.getSelectedItem().isLettered()) ; filterModel.setDisplayUnlettred(lettredEntryComboBox.getSelectedItem().isNoLettered()) " /> + + <JToolBar.Separator/> + + <JButton id="refresh" + toolTipText="{ _("lima.ui.lettering.buttonRefresh") + " (F5)"}" + actionIcon='refresh' + onActionPerformed="handler.updateAllEntries()"/> + + </JToolBar> + </cell> </row> <row> - <cell fill="horizontal" columns="4"> - <JPanel id="selectedEntry" layout='{new BorderLayout()}' border='{new TitledBorder(_("lima.ui.lettering.selectEntry"))}'> - <Table constraints='BorderLayout.NORTH'> - <row> - <cell anchor="center" weightx="0.6"> - <JLabel text="lima.ui.lettering.selectDebit" labelFor='{debitTexttField}'/> - </cell> - <cell fill="horizontal" weightx="0.6"> - <JTextField id="debitTexttField" editable="false" text="{editModel.getDebit().toString()}" - focusable="false"/> - </cell> - <cell anchor="center" weightx="0.6"> - <JLabel text="lima.ui.lettering.selectCredit" labelFor='{creditTextField}'/> - </cell> - <cell fill="horizontal" weightx="0.6"> - <JTextField id="creditTextField" editable="false" text="{editModel.getCredit().toString()}" - focusable="false"/> - </cell> - <cell anchor="center" weightx="0.6"> - <JLabel text="lima.ui.lettering.selectSolde" labelFor='{soldeTextField}'/> - </cell> - <cell fill="horizontal" weightx="0.6"> - <JTextField id="soldeTextField" editable="false" text="{editModel.getSolde().toString()}" - focusable="false"/> - </cell> - </row> - </Table> - </JPanel> + <cell fill="horizontal" > + <JToolBar floatable="false"> + <JLabel text="lima.ui.lettering.selectDebit" + labelFor='{debitTexttField}'/> + <JTextField id="debitTexttField" + enabled="false" + text="{editModel.getDebit().toString()}" + focusable="false"/> + + <JToolBar.Separator/> + + <JLabel text="lima.ui.lettering.selectCredit" + labelFor='{creditTextField}'/> + <JTextField id="creditTextField" + enabled="false" + text="{editModel.getCredit().toString()}" + focusable="false"/> + + <JToolBar.Separator/> + + <JLabel text="lima.ui.lettering.selectSolde" + labelFor='{soldeTextField}'/> + <JTextField id="soldeTextField" + enabled="false" + text="{editModel.getSolde().toString()}" + focusable="false"/> + + </JToolBar> </cell> </row> <row> - <cell anchor="center" columns='4'> - <JPanel id="actionsPanel"> - <JButton id="lettered" text="lima.ui.lettering.buttonLettered" - enabled="{editModel.isLettred()}" - onActionPerformed="handler.addLetter()"/> - <JButton id="noLettered" text="lima.ui.lettering.buttonNoLettered" - enabled="{editModel.isUnLettred()}" - onActionPerformed="handler.removeLetter()"/> - <JButton id="refresh" text="lima.ui.lettering.buttonRefresh" - enabled="true" - onActionPerformed="handler.updateAllEntries()"/> - <JButton id="round" text="lima.ui.lettering.buttonEqualize" - enabled="{editModel.isEqualized()}" - onActionPerformed="handler.roundAndCreateEntry()"/> - </JPanel> - </cell> - </row> - <row> - <cell fill="both" weightx="1" weighty="1" columns="4"> + <cell fill="both" weightx="1" weighty="1" > <JScrollPane> <LetteringTable id="table" sortable="false" rowHeight="22" - constructorParams="getTableModel()" - selectionModel="{lettringSelectionModel}" - /> + constructorParams="getTableModel(), handler" + selectionModel="{lettringSelectionModel}" /> </JScrollPane> </cell> </row> 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 2013-08-09 10:06:55 UTC (rev 3708) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2013-09-27 14:03:11 UTC (rev 3709) @@ -336,7 +336,7 @@ LetteringTableModel tableModel = view.getTableModel(); int[] selectedRows = view.getTable().getSelectedRows(); - if (selectedRows.length == 2) { + if (editModel.isEqualized() && selectedRows.length == 2) { /*Treatment only if one of values contains decimals*/ Entry firstSelectedEntry = tableModel.getEntryAt(selectedRows[0]); Entry secondSelectedEntry = tableModel.getEntryAt(selectedRows[1]); @@ -400,15 +400,19 @@ /**Add a group of three letters to n entries*/ public void addLetter() { - String newLetters = financialTransactionService.getNextLetters(); - changeLetter(newLetters); - onButtonModeChanged(ButtonMode.DELETTRED); + if (editModel.isLettred()) { + String newLetters = financialTransactionService.getNextLetters(); + changeLetter(newLetters); + onButtonModeChanged(ButtonMode.DELETTRED); + } } /**Remove a group of three letters to n entries*/ public void removeLetter() { - changeLetter(null); - onButtonModeChanged(ButtonMode.LETTRED); + if (editModel.isUnLettred()) { + changeLetter(null); + onButtonModeChanged(ButtonMode.LETTRED); + } } /**Add or remove a group of three letters to n entries*/ Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/TypeEntry.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/TypeEntry.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/TypeEntry.java 2013-09-27 14:03:11 UTC (rev 3709) @@ -0,0 +1,54 @@ +package org.chorem.lima.ui.lettering; + +import static org.nuiton.i18n.I18n._; + +/** + * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + */ +public enum TypeEntry { + + LETTERED(true, false), + + NO_LETTERED(false, true), + + ALL(true, true); + + private boolean lettered; + + private boolean noLettered; + + private TypeEntry(boolean lettered, boolean noLettered) { + this.lettered = lettered; + this.noLettered = noLettered; + } + + + @Override + public String toString() { + + String result = ""; + + switch (this) { + case LETTERED: + result = _("lima.ui.lettering.checkLettredEntry"); + break; + case NO_LETTERED: + result = _("lima.ui.lettering.checkNoLettredEntry"); + break; + case ALL: + result = _("lima.ui.lettering.checkAll"); + break; + } + + return result; + + } + + public boolean isLettered() { + return lettered; + } + + public boolean isNoLettered() { + return noLettered; + } +} Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2013-08-09 10:06:55 UTC (rev 3708) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2013-09-27 14:03:11 UTC (rev 3709) @@ -392,7 +392,9 @@ lima.ui.lettering.buttonRefresh=Refresh lima.ui.lettering.checkAll=All lima.ui.lettering.checkLettredEntry=Lettered +lima.ui.lettering.checkLettredEntrye= lima.ui.lettering.checkNoLettredEntry=Unlettered +lima.ui.lettering.checkNoLettredEntrye= lima.ui.lettering.endFinancialPeriod=To lima.ui.lettering.entry=Entries lima.ui.lettering.period=Periods Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2013-08-09 10:06:55 UTC (rev 3708) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2013-09-27 14:03:11 UTC (rev 3709) @@ -382,7 +382,9 @@ lima.ui.lettering.buttonRefresh=Rafraîchir lima.ui.lettering.checkAll=Toutes lima.ui.lettering.checkLettredEntry=Lettrées +lima.ui.lettering.checkLettredEntrye= lima.ui.lettering.checkNoLettredEntry=Non-lettrées +lima.ui.lettering.checkNoLettredEntrye= lima.ui.lettering.endFinancialPeriod=A lima.ui.lettering.entry=Écritures lima.ui.lettering.period=Périodes Copied: trunk/lima-swing/src/main/resources/icons/action-choose-account.png (from rev 3708, trunk/lima-swing/src/main/resources/icons/action-filter-transaction-account.png) =================================================================== (Binary files differ) Added: trunk/lima-swing/src/main/resources/icons/action-choose-entry.png =================================================================== (Binary files differ) Property changes on: trunk/lima-swing/src/main/resources/icons/action-choose-entry.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/lima-swing/src/main/resources/icons/action-un-lettering.png =================================================================== (Binary files differ) Property changes on: trunk/lima-swing/src/main/resources/icons/action-un-lettering.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r3708 - in trunk: . lima-business lima-business-api lima-callao lima-swing
by tchemit＠users.chorem.org 09 Aug '13

09 Aug '13

Author: tchemit Date: 2013-08-09 12:06:55 +0200 (Fri, 09 Aug 2013) New Revision: 3708 Url: http://chorem.org/projects/lima/repository/revisions/3708 Log: - updates mavenpom to 4.0 - reformat poms Modified: trunk/lima-business-api/pom.xml trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2013-08-04 08:45:53 UTC (rev 3707) +++ trunk/lima-business/pom.xml 2013-08-09 10:06:55 UTC (rev 3708) @@ -1,8 +1,6 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> -  -  -  + <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> @@ -11,9 +9,7 @@ <groupId>org.chorem.lima</groupId> <artifactId>lima-business</artifactId> -  -  -  + <name>Lima :: business</name> <description>Business module for lima</description> @@ -111,9 +107,7 @@ <artifactId>openejb-ejbd</artifactId> </dependency> </dependencies> -  -  -  + <build> <pluginManagement> <plugins> Modified: trunk/lima-business-api/pom.xml =================================================================== --- trunk/lima-business-api/pom.xml 2013-08-04 08:45:53 UTC (rev 3707) +++ trunk/lima-business-api/pom.xml 2013-08-09 10:06:55 UTC (rev 3708) @@ -1,8 +1,6 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> -  -  -  + <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> @@ -11,9 +9,7 @@ <groupId>org.chorem.lima</groupId> <artifactId>lima-business-api</artifactId> -  -  -  + <name>Lima :: business API</name> <description>Business API module for lima</description> @@ -29,9 +25,7 @@ <scope>provided</scope> </dependency> </dependencies> -  -  -  + <profiles> <profile> <id>reporting</id> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2013-08-04 08:45:53 UTC (rev 3707) +++ trunk/lima-callao/pom.xml 2013-08-09 10:06:55 UTC (rev 3708) @@ -1,8 +1,6 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> -  -  -  + <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> @@ -11,9 +9,7 @@ <groupId>org.chorem.lima</groupId> <artifactId>lima-callao</artifactId> -  -  -  + <name>Lima :: callao</name> <description>Module persistence de Lima (Callao)</description> @@ -53,9 +49,7 @@ <artifactId>h2</artifactId> </dependency> </dependencies> -  -  -  + <build> <plugins>  Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2013-08-04 08:45:53 UTC (rev 3707) +++ trunk/lima-swing/pom.xml 2013-08-09 10:06:55 UTC (rev 3708) @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> -  -  -  + <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> @@ -12,14 +10,10 @@ <groupId>org.chorem.lima</groupId> <artifactId>lima-swing</artifactId> -  -  -  + <name>Lima :: Swing</name> <description>Lima main interface in Swing</description> -  -  -  + <properties>  <maven.jar.main.class>org.chorem.lima.LimaMain</maven.jar.main.class> @@ -29,9 +23,11 @@ </redmine.releaseFiles> <license.generateBundle>true</license.generateBundle> - <license.bundleLicensePath>META-INF/lima-LICENSE.txt + <license.bundleLicensePath> + META-INF/lima-LICENSE.txt </license.bundleLicensePath> - <license.bundleThirdPartyPath>META-INF/lima-THIRD-PARTY.txt + <license.bundleThirdPartyPath> + META-INF/lima-THIRD-PARTY.txt </license.bundleThirdPartyPath> <i18n.bundles>fr_FR,en_GB</i18n.bundles> @@ -41,6 +37,9 @@ <signatureArtifactId>java16-sun</signatureArtifactId> <signatureVersion>1.10</signatureVersion> +  + <skipPostRelease>false</skipPostRelease> + </properties> <dependencies> @@ -306,9 +305,7 @@ </plugin> </plugins> </build> -  -  -  + <profiles> <profile> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-04 08:45:53 UTC (rev 3707) +++ trunk/pom.xml 2013-08-09 10:06:55 UTC (rev 3708) @@ -1,27 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> -  -  -  <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.13</version> + <version>4.0</version> </parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> <version>0.8-SNAPSHOT</version> - -  -  -  <packaging>pom</packaging> -  -  -  + <name>Lima</name> <description>Lima project super pom</description> <url>http://maven-site.chorem.org/lima</url> @@ -33,6 +26,7 @@ <distribution>repo</distribution> </license> </licenses> +  <developers> <developer> @@ -137,9 +131,7 @@ <module>lima-business</module> <module>lima-swing</module> </modules> -  -  -  + <scm> <connection>scm:svn:http://svn.chorem.org/svn/lima/trunk</connection> <developerConnection>

1 0

r3707 - in trunk: . lima-business lima-business-api lima-callao lima-swing
by maven-release＠users.chorem.org 04 Aug '13

04 Aug '13

Author: maven-release Date: 2013-08-04 10:45:53 +0200 (Sun, 04 Aug 2013) New Revision: 3707 Url: http://chorem.org/projects/lima/repository/revisions/3707 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/lima-business-api/pom.xml trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2013-08-04 08:45:51 UTC (rev 3706) +++ trunk/lima-business/pom.xml 2013-08-04 08:45:53 UTC (rev 3707) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-business-api/pom.xml =================================================================== --- trunk/lima-business-api/pom.xml 2013-08-04 08:45:51 UTC (rev 3706) +++ trunk/lima-business-api/pom.xml 2013-08-04 08:45:53 UTC (rev 3707) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2013-08-04 08:45:51 UTC (rev 3706) +++ trunk/lima-callao/pom.xml 2013-08-04 08:45:53 UTC (rev 3707) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2013-08-04 08:45:51 UTC (rev 3706) +++ trunk/lima-swing/pom.xml 2013-08-04 08:45:53 UTC (rev 3707) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-04 08:45:51 UTC (rev 3706) +++ trunk/pom.xml 2013-08-04 08:45:53 UTC (rev 3707) @@ -13,7 +13,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7</version> + <version>0.8-SNAPSHOT</version>   @@ -141,11 +141,11 @@   <scm> - <connection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.7</connection> + <connection>scm:svn:http://svn.chorem.org/svn/lima/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.7 + scm:svn:http://svn.chorem.org/svn/lima/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/lima/tags/lima-0.7</url> + <url>http://www.chorem.org/repositories/browse/lima/trunk</url> </scm> <distributionManagement> <site>

1 0

r3706 - in tags: . lima-0.7
by maven-release＠users.chorem.org 04 Aug '13

04 Aug '13

Author: maven-release Date: 2013-08-04 10:45:51 +0200 (Sun, 04 Aug 2013) New Revision: 3706 Url: http://chorem.org/projects/lima/repository/revisions/3706 Log: [maven-release-plugin] copy for tag lima-0.7 Added: tags/lima-0.7/ Property changes on: tags/lima-0.7 ___________________________________________________________________ Added: svn:ignore + *.log target bin .classpath .project *.ipr *.iws *.iml .settings .idea Added: svn:mergeinfo +

1 0

r3705 - in trunk: . lima-business lima-business-api lima-callao lima-swing
by maven-release＠users.chorem.org 04 Aug '13

04 Aug '13

Author: maven-release Date: 2013-08-04 10:45:48 +0200 (Sun, 04 Aug 2013) New Revision: 3705 Url: http://chorem.org/projects/lima/repository/revisions/3705 Log: [maven-release-plugin] prepare release lima-0.7 Modified: trunk/lima-business-api/pom.xml trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2013-08-04 08:01:12 UTC (rev 3704) +++ trunk/lima-business/pom.xml 2013-08-04 08:45:48 UTC (rev 3705) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-business-api/pom.xml =================================================================== --- trunk/lima-business-api/pom.xml 2013-08-04 08:01:12 UTC (rev 3704) +++ trunk/lima-business-api/pom.xml 2013-08-04 08:45:48 UTC (rev 3705) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2013-08-04 08:01:12 UTC (rev 3704) +++ trunk/lima-callao/pom.xml 2013-08-04 08:45:48 UTC (rev 3705) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2013-08-04 08:01:12 UTC (rev 3704) +++ trunk/lima-swing/pom.xml 2013-08-04 08:45:48 UTC (rev 3705) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-04 08:01:12 UTC (rev 3704) +++ trunk/pom.xml 2013-08-04 08:45:48 UTC (rev 3705) @@ -13,7 +13,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7</version>   @@ -141,11 +141,11 @@   <scm> - <connection>scm:svn:http://svn.chorem.org/svn/lima/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.7</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/lima/trunk + scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.7 </developerConnection> - <url>http://www.chorem.org/repositories/browse/lima/trunk</url> + <url>http://www.chorem.org/repositories/browse/lima/tags/lima-0.7</url> </scm> <distributionManagement> <site>

1 0

r3704 - tags
by tchemit＠users.chorem.org 04 Aug '13

04 Aug '13

Author: tchemit Date: 2013-08-04 10:01:12 +0200 (Sun, 04 Aug 2013) New Revision: 3704 Url: http://chorem.org/projects/lima/repository/revisions/3704 Log: bad reelase (try again) Removed: tags/0.7/

1 0

r3703 - in trunk: . lima-business lima-business-api lima-callao lima-swing
by maven-release＠users.chorem.org 02 Aug '13

02 Aug '13

Author: maven-release Date: 2013-08-02 19:10:11 +0200 (Fri, 02 Aug 2013) New Revision: 3703 Url: http://chorem.org/projects/lima/repository/revisions/3703 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/lima-business-api/pom.xml trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2013-08-02 17:10:01 UTC (rev 3702) +++ trunk/lima-business/pom.xml 2013-08-02 17:10:11 UTC (rev 3703) @@ -1,6 +1,4 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>   @@ -8,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-business-api/pom.xml =================================================================== --- trunk/lima-business-api/pom.xml 2013-08-02 17:10:01 UTC (rev 3702) +++ trunk/lima-business-api/pom.xml 2013-08-02 17:10:11 UTC (rev 3703) @@ -1,6 +1,4 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>   @@ -8,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2013-08-02 17:10:01 UTC (rev 3702) +++ trunk/lima-callao/pom.xml 2013-08-02 17:10:11 UTC (rev 3703) @@ -1,6 +1,4 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>   @@ -8,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2013-08-02 17:10:01 UTC (rev 3702) +++ trunk/lima-swing/pom.xml 2013-08-02 17:10:11 UTC (rev 3703) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>   @@ -9,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-02 17:10:01 UTC (rev 3702) +++ trunk/pom.xml 2013-08-02 17:10:11 UTC (rev 3703) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>  @@ -15,7 +13,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.8-SNAPSHOT</version>

1 0

r3702 - in tags: . 0.7
by maven-release＠users.chorem.org 02 Aug '13

02 Aug '13

Author: maven-release Date: 2013-08-02 19:10:01 +0200 (Fri, 02 Aug 2013) New Revision: 3702 Url: http://chorem.org/projects/lima/repository/revisions/3702 Log: [maven-release-plugin] copy for tag 0.7 Added: tags/0.7/ Property changes on: tags/0.7 ___________________________________________________________________ Added: svn:ignore + *.log target bin .classpath .project *.ipr *.iws *.iml .settings .idea Added: svn:mergeinfo +

1 0

r3701 - in trunk: . lima-business lima-business-api lima-callao lima-swing lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition
by tchemit＠users.chorem.org 02 Aug '13

02 Aug '13

Author: tchemit Date: 2013-08-02 19:00:32 +0200 (Fri, 02 Aug 2013) New Revision: 3701 Url: http://chorem.org/projects/lima/repository/revisions/3701 Log: reformat poms fix webstart build do not use guava API Modified: trunk/lima-business-api/pom.xml trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2013-08-02 16:38:54 UTC (rev 3700) +++ trunk/lima-business/pom.xml 2013-08-02 17:00:32 UTC (rev 3701) @@ -1,6 +1,8 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - +    <parent> @@ -11,7 +13,7 @@ <groupId>org.chorem.lima</groupId> <artifactId>lima-business</artifactId> - +    <name>Lima :: business</name> @@ -111,7 +113,7 @@ <artifactId>openejb-ejbd</artifactId> </dependency> </dependencies> - +    <build> Modified: trunk/lima-business-api/pom.xml =================================================================== --- trunk/lima-business-api/pom.xml 2013-08-02 16:38:54 UTC (rev 3700) +++ trunk/lima-business-api/pom.xml 2013-08-02 17:00:32 UTC (rev 3701) @@ -1,6 +1,8 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - +    <parent> @@ -11,7 +13,7 @@ <groupId>org.chorem.lima</groupId> <artifactId>lima-business-api</artifactId> - +    <name>Lima :: business API</name> @@ -29,7 +31,7 @@ <scope>provided</scope> </dependency> </dependencies> - +    <profiles> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2013-08-02 16:38:54 UTC (rev 3700) +++ trunk/lima-callao/pom.xml 2013-08-02 17:00:32 UTC (rev 3701) @@ -1,6 +1,8 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - +    <parent> @@ -11,7 +13,7 @@ <groupId>org.chorem.lima</groupId> <artifactId>lima-callao</artifactId> - +    <name>Lima :: callao</name> @@ -31,7 +33,7 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> - + <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> @@ -53,7 +55,7 @@ <artifactId>h2</artifactId> </dependency> </dependencies> - +    <build> @@ -102,12 +104,12 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> </executions> </plugin> </plugins> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2013-08-02 16:38:54 UTC (rev 3700) +++ trunk/lima-swing/pom.xml 2013-08-02 17:00:32 UTC (rev 3701) @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - +    <parent> @@ -12,12 +14,12 @@ <groupId>org.chorem.lima</groupId> <artifactId>lima-swing</artifactId> - +    <name>Lima :: Swing</name> <description>Lima main interface in Swing</description> - +    <properties> @@ -29,16 +31,18 @@ </redmine.releaseFiles> <license.generateBundle>true</license.generateBundle> - <license.bundleLicensePath>META-INF/lima-LICENSE.txt</license.bundleLicensePath> - <license.bundleThirdPartyPath>META-INF/lima-THIRD-PARTY.txt</license.bundleThirdPartyPath> - + <license.bundleLicensePath>META-INF/lima-LICENSE.txt + </license.bundleLicensePath> + <license.bundleThirdPartyPath>META-INF/lima-THIRD-PARTY.txt + </license.bundleThirdPartyPath> + <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.bundleOutputName>lima</i18n.bundleOutputName>  <signatureArtifactId>java16-sun</signatureArtifactId> <signatureVersion>1.10</signatureVersion> - + </properties> <dependencies> @@ -138,10 +142,10 @@ <scope>runtime</scope> </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-widgets</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-widgets</artifactId> + </dependency> </dependencies> @@ -207,6 +211,14 @@ <include>org.eclipse.jetty.orbit:javax.servlet</include> </includes> </jnlpExtension> + <jnlpExtension> + <name>pdf-renderer</name> + <title>Jetty</title> + <vendor>Swing labs PDF renderer</vendor> + <includes> + <include>org.swinglabs:pdf-renderer</include> + </includes> + </jnlpExtension> </jnlpExtensions> </configuration> </plugin> @@ -229,7 +241,7 @@ </execution> </executions> </plugin> - + <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> @@ -255,7 +267,8 @@ </goals> <configuration> <generateCsvFile>true</generateCsvFile> - <bundleCsvFile>${project.build.directory}/lima-i18n.csv</bundleCsvFile> + <bundleCsvFile>${project.build.directory}/lima-i18n.csv + </bundleCsvFile> </configuration> </execution> </executions> @@ -295,7 +308,7 @@ </plugin> </plugins> </build> - +    <profiles> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java 2013-08-02 16:38:54 UTC (rev 3700) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java 2013-08-02 17:00:32 UTC (rev 3701) @@ -24,7 +24,6 @@ * #L% */ -import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.Condition; @@ -38,6 +37,8 @@ import javax.swing.*; import javax.swing.event.ListSelectionEvent; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -90,7 +91,7 @@ public void setEntryBook(ListSelectionEvent event) { JList entryBookList = view.getEntryBookList(); - List selectedValuesList = Lists.newArrayList(entryBookList.getSelectedValues()); + List selectedValuesList = new ArrayList(Arrays.asList(entryBookList.getSelectedValues())); condition.setEntryBooks(selectedValuesList); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java 2013-08-02 16:38:54 UTC (rev 3700) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java 2013-08-02 17:00:32 UTC (rev 3701) @@ -24,7 +24,6 @@ * #L% */ -import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.Condition; @@ -39,6 +38,8 @@ import javax.swing.*; import javax.swing.event.ListSelectionEvent; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -93,7 +94,7 @@ public void setFinancialPeriod(ListSelectionEvent event) { JList financialPeriodList = view.getFinancialPeriodList(); - List selectedValuesList = Lists.newArrayList(financialPeriodList.getSelectedValues()); + List selectedValuesList = new ArrayList(Arrays.asList(financialPeriodList.getSelectedValues())); condition.setFinancialPeriods(selectedValuesList); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java 2013-08-02 16:38:54 UTC (rev 3700) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java 2013-08-02 17:00:32 UTC (rev 3701) @@ -24,7 +24,6 @@ * #L% */ -import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.Condition; @@ -38,6 +37,8 @@ import javax.swing.*; import javax.swing.event.ListSelectionEvent; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; @@ -91,7 +92,7 @@ public void setFiscalPeriod(ListSelectionEvent event) { JList fiscalPeriodList = view.getFiscalPeriodList(); - List selectedValuesList = Lists.newArrayList(fiscalPeriodList.getSelectedValues()); + List selectedValuesList = new ArrayList(Arrays.asList(fiscalPeriodList.getSelectedValues())); condition.setFiscalPeriods(selectedValuesList); } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-02 16:38:54 UTC (rev 3700) +++ trunk/pom.xml 2013-08-02 17:00:32 UTC (rev 3701) @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - + +    <parent> @@ -12,11 +15,13 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.7-SNAPSHOT</version> + +    <packaging>pom</packaging> - +    <name>Lima</name> @@ -30,7 +35,7 @@ <distribution>repo</distribution> </license> </licenses> - +  <developers> <developer> <id>echatellier</id> @@ -134,7 +139,7 @@ <module>lima-business</module> <module>lima-swing</module> </modules> - +    <scm> @@ -158,10 +163,12 @@  <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <nuitonProfilingVersion>2.7</nuitonProfilingVersion> - <eugenePluginVersion>2.6.3</eugenePluginVersion>  - <topiaVersion>2.7.1</topiaVersion>  + <eugenePluginVersion>2.6.3</eugenePluginVersion> +  + <topiaVersion>2.7.1</topiaVersion> +  <jaxxVersion>2.5.23</jaxxVersion> <nuitonI18nVersion>2.5.1</nuitonI18nVersion> <openEjbVersion>4.5.2</openEjbVersion> @@ -228,7 +235,7 @@ <artifactId>commons-email</artifactId> <version>1.3.1</version> </dependency> - + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> @@ -313,10 +320,10 @@ <artifactId>openejb-core</artifactId> <version>${openEjbVersion}</version> <exclusions> - <exclusion> - <artifactId>slf4j-jdk14</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> + <exclusion> + <artifactId>slf4j-jdk14</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> </exclusions> <scope>compile</scope> </dependency>

1 0