Author: mallon Date: 2012-08-08 15:04:04 +0200 (Wed, 08 Aug 2012) New Revision: 3574 Url: http://chorem.org/repositories/revision/lima/3574 Log: fixes #745 Apres modification du fichier pom de lima-callao, afin de prendre en compte le plugin i18n, les valeurs s'affichent correctement. Added: trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java Removed: trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java Modified: trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties trunk/lima-callao/pom.xml trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.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-business/src/main/resources/i18n/lima-business_en_GB.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-08-08 13:04:04 UTC (rev 3574) @@ -100,3 +100,4 @@ lima.config.rulesnationality.description=Rules Nationality lima.config.scale.description=Scale lima.config.serveraddress.description=Server Address +lima.ui.lettering.accountRegularization= 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 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-08-08 13:04:04 UTC (rev 3574) @@ -100,3 +100,4 @@ lima.config.rulesnationality.description=Règles nationales lima.config.scale.description=Précision lima.config.serveraddress.description=Addresse serveur +lima.ui.lettering.accountRegularization= Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-callao/pom.xml 2012-08-08 13:04:04 UTC (rev 3574) @@ -102,6 +102,18 @@ </dependency> </dependencies> </plugin> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> Deleted: trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java 2012-08-08 13:04:04 UTC (rev 3574) @@ -1,68 +0,0 @@ -/* - * #%L - * Lima callao - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima; - -import static org.nuiton.i18n.I18n._; - -public enum FinancialStatementWayEnum { - - BOTH(_("lima.enum.comboboxamount.both")), - DEBIT(_("lima.enum.comboboxamount.debit")), - CREDIT(_("lima.enum.comboboxamount.credit")); - - private final String description; - - FinancialStatementWayEnum(String description) { - this.description = description; - } - - public String getDescription() { - return description; - } - - public static String[] descriptions(){ - int nbElts = FinancialStatementWayEnum.values().length; - String[] descriptions = new String[nbElts]; - FinancialStatementWayEnum[] enums = FinancialStatementWayEnum.values(); - for (int i = 0; i < nbElts; i++) { - descriptions[i] = enums[i].getDescription(); - } - return descriptions; - } - - public static FinancialStatementWayEnum valueOfDescription(String description){ - FinancialStatementWayEnum value = null; - - for (FinancialStatementWayEnum enums : FinancialStatementWayEnum.values()) { - if (description.equals(enums.description)){ - value = enums; - break; - } - } - return value; - } - -} Added: trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java (rev 0) +++ trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java 2012-08-08 13:04:04 UTC (rev 3574) @@ -0,0 +1,68 @@ +/* + * #%L + * Lima callao + * + * $Id: FinancialStatementWayEnum.java 3289 2011-09-17 12:55:16Z tchemit $ + * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-callao/src/main/java/org/chorem/li... $ + * %% + * Copyright (C) 2008 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package org.chorem.lima; + +import static org.nuiton.i18n.I18n._; + +public enum FinancialStatementWayEnum { + + BOTH(_("lima.enum.comboboxamount.both")), + DEBIT(_("lima.enum.comboboxamount.debit")), + CREDIT(_("lima.enum.comboboxamount.credit")); + + private final String description; + + FinancialStatementWayEnum(String description) { + this.description = description; + } + + public String getDescription() { + return description; + } + + public static String[] descriptions(){ + int nbElts = FinancialStatementWayEnum.values().length; + String[] descriptions = new String[nbElts]; + FinancialStatementWayEnum[] enums = FinancialStatementWayEnum.values(); + for (int i = 0; i < nbElts; i++) { + descriptions[i] = enums[i].getDescription(); + } + return descriptions; + } + + public static FinancialStatementWayEnum valueOfDescription(String description){ + FinancialStatementWayEnum value = null; + + for (FinancialStatementWayEnum enums : FinancialStatementWayEnum.values()) { + if (description.equals(enums.description)){ + value = enums; + break; + } + } + return value; + } + +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx 2012-08-08 13:04:04 UTC (rev 3574) @@ -28,10 +28,10 @@ onWindowClosing="performCancel();"> <import> - javax.swing.text.Document - org.chorem.lima.FinancialStatementWayEnum - org.chorem.lima.entity.FinancialStatement - org.chorem.lima.entity.FinancialStatementImpl + javax.swing.text.Document + org.chorem.lima.FinancialStatementWayEnum + org.chorem.lima.entity.FinancialStatement + org.chorem.lima.entity.FinancialStatementImpl </import> <FinancialStatement id="financialStatement" javaBean='null'/> <Boolean id="addState" javaBean='true'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx 2012-08-08 13:04:04 UTC (rev 3574) @@ -25,17 +25,17 @@ <Table> <import> - java.awt.Dimension - javax.swing.ListSelectionModel - javax.swing.text.Document - org.chorem.lima.enums.ComboBoxPeriodEnum - org.chorem.lima.enums.ComboBoxAccountsEnum - org.chorem.lima.enums.ComboBoxEntryBooksEnum - org.chorem.lima.enums.ComboBoxLetterEnum - org.chorem.lima.FinancialStatementWayEnum - org.chorem.lima.enums.ComboBoxOperatorsEnum - org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchTableModel - org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchTable + java.awt.Dimension + javax.swing.ListSelectionModel + javax.swing.text.Document + org.chorem.lima.enums.ComboBoxPeriodEnum + org.chorem.lima.enums.ComboBoxAccountsEnum + org.chorem.lima.enums.ComboBoxEntryBooksEnum + org.chorem.lima.enums.ComboBoxLetterEnum + org.chorem.lima.FinancialStatementWayEnum + org.chorem.lima.enums.ComboBoxOperatorsEnum + org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchTableModel + org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchTable </import> <FinancialTransactionSearchViewHandler id="handler" javaBean="new FinancialTransactionSearchViewHandler(this)"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2012-08-08 13:04:04 UTC (rev 3574) @@ -37,7 +37,6 @@ import org.chorem.lima.FinancialStatementWayEnum; import org.chorem.lima.beans.FinancialTransactionSearch; import org.chorem.lima.beans.FinancialTransactionSearchImpl; -import org.chorem.lima.business.LimaException; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; @@ -67,8 +66,6 @@ protected FinancialTransactionSearchTableModel tableModel; - protected FiscalPeriodComboBoxModel comboBoxModel; - /** Transaction service. */ protected final FinancialTransactionService financialTransactionService; 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 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-08-08 13:04:04 UTC (rev 3574) @@ -104,6 +104,9 @@ lima.enum.comboboxaccount.account=Account lima.enum.comboboxaccount.accountlist=Account list lima.enum.comboboxaccount.allaccount=All accounts +lima.enum.comboboxamount.both=All +lima.enum.comboboxamount.credit=Credit +lima.enum.comboboxamount.debit=Debit lima.enum.comboboxentrybook.all=All entrybooks lima.enum.comboboxentrybook.select_one=EntryBook lima.enum.comboboxletter.all=All letters 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 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-08-08 13:04:04 UTC (rev 3574) @@ -104,6 +104,9 @@ lima.enum.comboboxaccount.account=Compte lima.enum.comboboxaccount.accountlist=Liste de comptes lima.enum.comboboxaccount.allaccount=Tous les comptes +lima.enum.comboboxamount.both=Tous +lima.enum.comboboxamount.credit=Crédit +lima.enum.comboboxamount.debit=Débit lima.enum.comboboxentrybook.all=Tous les journaux lima.enum.comboboxentrybook.select_one=Journal lima.enum.comboboxletter.all=Toutes les lettres