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

r3108 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport
by vsalaun＠users.chorem.org May 12, 2011

May 12, 2011

Author: vsalaun Date: 2011-05-12 10:32:13 +0200 (Thu, 12 May 2011) New Revision: 3108 Url: http://chorem.org/repositories/revision/lima/3108 Log: #267 ajout du renderer pour les objets de type BigDecimal dans l'edition du bilan et compte de resultat Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableCellRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableCellRenderer.java 2011-05-12 08:27:34 UTC (rev 3107) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableCellRenderer.java 2011-05-12 08:32:13 UTC (rev 3108) @@ -27,10 +27,16 @@ import java.awt.Component; import java.awt.Font; +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; import javax.swing.JTable; +import javax.swing.SwingConstants; import javax.swing.table.DefaultTableCellRenderer; +import org.chorem.lima.LimaConfig; +import org.chorem.lima.LimaContext; import org.chorem.lima.beans.FinancialStatementAmounts; @@ -75,8 +81,33 @@ } } } + + if (object instanceof BigDecimal) { + setHorizontalAlignment(SwingConstants.LEFT); + setValue(value); + } return this; } + + public void setValue(Object aValue) { + Object result = aValue; + if (( aValue != null) && (aValue instanceof BigDecimal)) { + LimaConfig config = LimaContext.getContext().getConfig(); + String scale = ""; + for (int i = 0; i < config.getScale(); i++) { + scale += "0"; + } + DecimalFormat formatter = new DecimalFormat("##0." + scale); + DecimalFormatSymbols symbol = new DecimalFormatSymbols(); + symbol.setDecimalSeparator(config.getDecimalSeparator()); + symbol.setGroupingSeparator(config.getThousandSeparator()); + formatter.setDecimalFormatSymbols(symbol); + formatter.setGroupingUsed(true); + formatter.setGroupingSize(3); + result = formatter.format(result); + } + super.setValue(result); + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java 2011-05-12 08:27:34 UTC (rev 3107) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java 2011-05-12 08:32:13 UTC (rev 3108) @@ -119,7 +119,30 @@ public int getColumnCount() { return 4; } + + @Override + public Class<?> getColumnClass(int column) { + Class<?> result = null; + + switch (column) { + case 0: + result = String.class; + break; + case 1: + result = BigDecimal.class; + break; + case 2: + result = BigDecimal.class; + break; + case 3: + result = BigDecimal.class; + break; + } + + return result; + } + @Override public String getColumnName(int column) { String res = "n/a"; @@ -154,12 +177,12 @@ FinancialStatementAmounts currentRow = (FinancialStatementAmounts) result; BigDecimal grossAmount = currentRow.getGrossAmount(); if (grossAmount == null ){ - grossAmount = new BigDecimal(0); + grossAmount = BigDecimal.ZERO; } BigDecimal provisionDeprecationAmount = currentRow.getProvisionDeprecationAmount(); if (provisionDeprecationAmount == null ){ - provisionDeprecationAmount = new BigDecimal(0); + provisionDeprecationAmount = BigDecimal.ZERO; } switch (column) { case 0: @@ -173,7 +196,7 @@ } break; case 1: - if (grossAmount == BigDecimal.ZERO){ + if (grossAmount.compareTo(BigDecimal.ZERO) == 0){ result = null; } else { @@ -181,7 +204,7 @@ } break; case 2: - if (provisionDeprecationAmount == BigDecimal.ZERO){ + if (provisionDeprecationAmount.compareTo(BigDecimal.ZERO) == 0){ result = null; } else { @@ -190,7 +213,7 @@ break; case 3: BigDecimal solde = grossAmount.subtract(provisionDeprecationAmount); - if (solde == BigDecimal.ZERO) { + if (solde.compareTo(BigDecimal.ZERO) == 0) { result = null; } else {

1 0

r3107 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports
by vsalaun＠users.chorem.org May 12, 2011

May 12, 2011

Author: vsalaun Date: 2011-05-12 10:27:34 +0200 (Thu, 12 May 2011) New Revision: 3107 Url: http://chorem.org/repositories/revision/lima/3107 Log: #267 ajout du renderer pour les objets de type BigDecimal dans l'edition du journal Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java 2011-05-12 08:25:46 UTC (rev 3106) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java 2011-05-12 08:27:34 UTC (rev 3107) @@ -27,8 +27,11 @@ import java.awt.Color; import java.awt.Component; +import java.math.BigDecimal; + import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.FinancialTransaction; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.ColorHighlighter; import org.jdesktop.swingx.decorator.ComponentAdapter; @@ -58,6 +61,8 @@ this.handler = handler; this.model = model; highlighterReportsDatasBoolean=true; + //Get new BigDecimal renderer + setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); //highlight financial financial transactions addColorReportsDatas(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java 2011-05-12 08:25:46 UTC (rev 3106) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java 2011-05-12 08:27:34 UTC (rev 3107) @@ -26,12 +26,18 @@ package org.chorem.lima.ui.entrybooksreports; import static org.nuiton.i18n.I18n._; + +import java.math.BigDecimal; import java.text.SimpleDateFormat; +import java.util.Date; + import javax.swing.table.AbstractTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.ReportsDatas; +import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; +import org.chorem.lima.entity.Letter; /** @@ -65,7 +71,39 @@ public int getColumnCount() { return 7; } + + @Override + public Class<?> getColumnClass(int column) { + Class<?> result = null; + + switch (column) { + case 0: + result = Date.class; + break; + case 1: + result = Account.class; + break; + case 2: + result = String.class; + break; + case 3: + result = String.class; + break; + case 4: + result = Letter.class; + break; + case 5: + result = BigDecimal.class; + break; + case 6: + result = BigDecimal.class; + break; + } + + return result; + } + @Override public String getColumnName(int column) { String res = "n/a"; @@ -131,10 +169,10 @@ } break; case 5: - result = currentRow.getDebit() ? currentRow.getAmount() : 0; + result = currentRow.getDebit() ? currentRow.getAmount() : BigDecimal.ZERO; break; case 6: - result = currentRow.getDebit() ? 0 : currentRow.getAmount(); + result = currentRow.getDebit() ? BigDecimal.ZERO : currentRow.getAmount(); break; } }

1 0

r3106 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance
by vsalaun＠users.chorem.org May 12, 2011

May 12, 2011

Author: vsalaun Date: 2011-05-12 10:25:46 +0200 (Thu, 12 May 2011) New Revision: 3106 Url: http://chorem.org/repositories/revision/lima/3106 Log: #267 ajout du renderer pour les objets de type BigDecimal dans l'edition de la balance Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTable.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTable.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTable.java 2011-05-12 08:25:46 UTC (rev 3106) @@ -0,0 +1,30 @@ +package org.chorem.lima.ui.balance; + +import java.math.BigDecimal; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; +import org.chorem.lima.ui.balance.BalanceViewHandler; +import org.jdesktop.swingx.JXTable; + +public class BalanceTable extends JXTable { + + /** serialVersionUID. */ + private static final long serialVersionUID = 6093850347322834480L; + + /** log. */ + private static final Log log = LogFactory + .getLog(BalanceTable.class); + + protected BalanceViewHandler handler; + + public BalanceTable(BalanceViewHandler handler) { + + this.handler = handler; + + //Get new BigDecimal renderer + setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); + + } + +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java 2011-05-12 08:23:54 UTC (rev 3105) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java 2011-05-12 08:25:46 UTC (rev 3106) @@ -26,12 +26,15 @@ package org.chorem.lima.ui.balance; import static org.nuiton.i18n.I18n._; + +import java.math.BigDecimal; import java.util.List; import javax.swing.table.AbstractTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.BalanceTrial; import org.chorem.lima.beans.ReportsDatas; +import org.chorem.lima.entity.Account; /** @@ -62,7 +65,36 @@ public int getColumnCount() { return 6; } + + @Override + public Class<?> getColumnClass(int column) { + Class<?> result = null; + + switch (column) { + case 0: + result = Account.class; + break; + case 1: + result = String.class; + break; + case 2: + result = BigDecimal.class; + break; + case 3: + result = BigDecimal.class; + break; + case 4: + result = BigDecimal.class; + break; + case 5: + result = BigDecimal.class; + break; + } + + return result; + } + @Override public String getColumnName(int column) { String res = "n/a"; @@ -113,7 +145,7 @@ result = currentRow.getAmountSolde(); } else { - result = 0; + result = BigDecimal.ZERO; } break; case 5: // solde credit @@ -121,7 +153,7 @@ result = currentRow.getAmountSolde(); } else { - result = 0; + result = BigDecimal.ZERO; } break; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx 2011-05-12 08:23:54 UTC (rev 3105) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx 2011-05-12 08:25:46 UTC (rev 3106) @@ -71,7 +71,8 @@ <row> <cell fill="both" weightx="1" weighty="1" columns="8"> <JScrollPane> - <org.jdesktop.swingx.JXTable id="balanceTable" rowHeight="24" + <org.chorem.lima.ui.balance.BalanceTable id="balanceTable" rowHeight="24" + constructorParams="getHandler()" model="{getModelBalanceTable()}" highlighters="{org.jdesktop.swingx.decorator.HighlighterFactory.createSimpleStriping(new java.awt.Color(222,222,222))}" selectionMode="{ListSelectionModel.SINGLE_SELECTION}" Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2011-05-12 08:23:54 UTC (rev 3105) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2011-05-12 08:25:46 UTC (rev 3106) @@ -72,6 +72,8 @@ /** Text field Accounts */ protected String selectedAccounts; + + protected BalanceTable table; protected BalanceTableModel model; @@ -151,7 +153,7 @@ String.valueOf(amountSolde)); - if (amountSolde == BigDecimal.ZERO){ + if (amountSolde.compareTo(BigDecimal.ZERO) == 0){ view.soldeLabel.setText(_("lima.common.solde")); } else {

1 0

r3105 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports
by vsalaun＠users.chorem.org May 12, 2011

May 12, 2011

Author: vsalaun Date: 2011-05-12 10:23:54 +0200 (Thu, 12 May 2011) New Revision: 3105 Url: http://chorem.org/repositories/revision/lima/3105 Log: #267 ajout du renderer pour les objets de type BigDecimal dans l'edition des comptes Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTable.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTable.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTable.java 2011-05-12 08:23:54 UTC (rev 3105) @@ -0,0 +1,32 @@ +package org.chorem.lima.ui.accountsreports; + +import java.math.BigDecimal; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.ui.accountsreports.AccountsReportsTable; +import org.chorem.lima.ui.accountsreports.AccountsReportsViewHandler; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; +import org.jdesktop.swingx.JXTable; + +public class AccountsReportsTable extends JXTable { + + /** serialVersionUID. */ + private static final long serialVersionUID = 6093850347322834480L; + + /** log. */ + private static final Log log = LogFactory + .getLog(AccountsReportsTable.class); + + protected AccountsReportsViewHandler handler; + + public AccountsReportsTable(AccountsReportsViewHandler handler) { + + this.handler = handler; + + //Get new BigDecimal renderer + setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); + + } + +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java 2011-05-12 08:15:34 UTC (rev 3104) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java 2011-05-12 08:23:54 UTC (rev 3105) @@ -26,12 +26,18 @@ package org.chorem.lima.ui.accountsreports; import static org.nuiton.i18n.I18n._; + +import java.math.BigDecimal; import java.text.SimpleDateFormat; +import java.util.Date; + import javax.swing.table.AbstractTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.ReportsDatas; +import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; +import org.chorem.lima.entity.Letter; /** * Entry book table model. @@ -67,7 +73,43 @@ public int getColumnCount() { return 8; } + + @Override + public Class<?> getColumnClass(int column) { + Class<?> result = null; + + switch (column) { + case 0: + result = Account.class; + break; + case 1: + result = Date.class; + break; + case 2: + result = Entry.class; + break; + case 3: + result = String.class; + break; + case 4: + result = String.class; + break; + case 5: + result = Letter.class; + break; + case 6: + result = BigDecimal.class; + break; + case 7: + result = BigDecimal.class; + break; + } + + return result; + } + + @Override public String getColumnName(int column) { String res = "n/a"; @@ -139,10 +181,10 @@ } break; case 6: - result = currentRow.getDebit() ? currentRow.getAmount() : 0; + result = currentRow.getDebit() ? currentRow.getAmount() : BigDecimal.ZERO; break; case 7: - result = currentRow.getDebit() ? 0 : currentRow.getAmount(); + result = currentRow.getDebit() ? BigDecimal.ZERO : currentRow.getAmount(); break; } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsView.jaxx 2011-05-12 08:15:34 UTC (rev 3104) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsView.jaxx 2011-05-12 08:23:54 UTC (rev 3105) @@ -65,7 +65,8 @@ <row> <cell fill="both" weightx="1" weighty="1" columns="6"> <JScrollPane> - <org.jdesktop.swingx.JXTable id="accountsReportsTable" rowHeight="24" + <org.chorem.lima.ui.accountsreports.AccountsReportsTable id="accountsReportsTable" rowHeight="24" + constructorParams="getHandler()" model="{getModelAccountsReportsTable()}" highlighters="{org.jdesktop.swingx.decorator.HighlighterFactory.createSimpleStriping(new java.awt.Color(222,222,222))}" selectionMode="{ListSelectionModel.SINGLE_SELECTION}" Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2011-05-12 08:15:34 UTC (rev 3104) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2011-05-12 08:23:54 UTC (rev 3105) @@ -51,6 +51,8 @@ protected AccountsReportsView view; + protected AccountsReportsTable table; + protected AccountsReportsTableModel tableModel; protected AccountComboBoxModel comboBoxModel;

1 0

r3104 - in trunk/lima-swing/src/main/java/org/chorem/lima: . ui
by vsalaun＠users.chorem.org May 12, 2011

May 12, 2011

Author: vsalaun Date: 2011-05-12 10:15:34 +0200 (Thu, 12 May 2011) New Revision: 3104 Url: http://chorem.org/repositories/revision/lima/3104 Log: #267 ajout des options pour l'affichage des objets type BigDecimal Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2011-05-06 16:08:00 UTC (rev 3103) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2011-05-12 08:15:34 UTC (rev 3104) @@ -69,7 +69,7 @@ * @return copyright text */ public String getCopyrightText() { - return "Version " + getVersion() + " Codelutin @ 2008-2010"; + return "Version " + getVersion() + " Codelutin @ 2008-2011"; } /** @@ -180,6 +180,90 @@ } /** + * Get application decimal separator + * + * @return configuration application decimal separator + */ + public char getDecimalSeparator() { + char decimalSeparator = getOption(Option.DECIMAL_SEPARATOR.key).charAt(0); + return decimalSeparator; + } + + /** + * Change decimal separator + * Save user file. + * + * @param decimalSeparator new DecimalSeparator + */ + public void setDecimalSeparator(String decimalSeparator) { + setOption(Option.DECIMAL_SEPARATOR.key, decimalSeparator); + saveForUser(); + firePropertyChange("decimalSeparator", null, decimalSeparator); + } + + /** + * Get application scale + * + * @return configuration application scale + */ + public int getScale() { + return getOptionAsInt(Option.SCALE.key); + } + + /** + * Change scale + * Save user file. + * + * @param scale new Scale + */ + public void setScale(String scale) { + setOption(Option.SCALE.key, scale); + saveForUser(); + firePropertyChange("scale", null, scale); + } + + /** + * Get application thousand separator + * + * @return configuration application thousand separator + */ + public char getThousandSeparator() { + return getOption(Option.THOUSAND_SEPARATOR.key).charAt(0); + } + + /** + * Change the thousand separator + * Save user file. + * + * @param thousandSeparator new thousandSeparator + */ + public void setThousandSeparator(String thousandSeparator) { + setOption(Option.THOUSAND_SEPARATOR.key, thousandSeparator); + saveForUser(); + firePropertyChange("thousandSeparator", null, thousandSeparator); + } + + /** + * currency configuration boolean + * + * @return {@code true} if the currency must be displayed + */ + public boolean getCurrency() { + return getOptionAsBoolean(Option.CURRENCY.key); + } + + /** + * Change the currency displaying + * + * @param currency + */ + public void setCurrency(String currency) { + setOption(Option.CURRENCY.key, currency); + saveForUser(); + firePropertyChange("currency", null, currency); + } + + /** * Launch ui configuration value. * * @return {@code true} if ui must be displayed @@ -242,7 +326,7 @@ /** * Used in ???? */ - public static final String[] DEFAULT_JAXX_PCS = { "fullScreen", "locale" }; + public static final String[] DEFAULT_JAXX_PCS = { "fullScreen", "locale", "decimalSeparator", "scale", "thousandSeparator", "currency" }; /** * Used in ???? @@ -276,6 +360,10 @@ CONFIG_FILE(CONFIG_FILE_NAME, _("lima.config.configFileName.description"), "lima-config.properties", String.class, true, true), LOCALE("locale", _("lima.config.locale.description"), "fr_FR", Locale.class, false, false), + DECIMAL_SEPARATOR("lima.config.decimalseparator", _("lima.config.decimalseparator.description"), ",", String.class, false, false), + SCALE("scale", _("lima.config.scale.description"), "2", Integer.class, false, false), + THOUSAND_SEPARATOR("thousandSeparator", _("limma.config.thousandseparator.description"), " ", String.class, false, false), + CURRENCY("currency", _("lima.config.currency.description"), "none", Boolean.class, false, false), FULL_SCREEN("lima.ui.fullscreen", _("lima.config.ui.fullscreen.description"), "false", Boolean.class, false, false), LAUNCH_UI("lima.ui.launchui", _("lima.config.ui.flaunchui.description"), "true", Boolean.class, true, true), SUPPORT_EMAIL("lima.misc.supportemail", _("lima.misc.supportemail.description"), "", String.class, false, false), Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2011-05-06 16:08:00 UTC (rev 3103) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2011-05-12 08:15:34 UTC (rev 3104) @@ -167,6 +167,10 @@ helper.addCategory(_("lima.config.category.other"), _("lima.config.category.other.description")); helper.addOption(LimaConfig.Option.FULL_SCREEN); helper.addOption(LimaConfig.Option.LOCALE); + helper.addOption(LimaConfig.Option.DECIMAL_SEPARATOR); + helper.addOption(LimaConfig.Option.SCALE); + helper.addOption(LimaConfig.Option.THOUSAND_SEPARATOR); + helper.addOption(LimaConfig.Option.CURRENCY); helper.buildUI(context, _("lima.config.category.directories")); helper.displayUI(ui, false); @@ -238,6 +242,7 @@ // show ui ui.setVisible(true); + showHomeView(rootContext); } /**

1 0

May 6, 2011

Author: vsalaun Date: 2011-05-06 18:08:00 +0200 (Fri, 06 May 2011) New Revision: 3103 Url: http://chorem.org/repositories/revision/lima/3103 Log: #364 remplacement des toutes les occurences de double utilisees dans les calculs par des BigDecimal Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -422,7 +422,7 @@ c.setHorizontalAlignment(Element.ALIGN_LEFT); t.addCell(c); //cell2 - if (grossAmount.doubleValue() != 0){ + if (grossAmount != BigDecimal.ZERO){ phrase = new Phrase(String.valueOf( grossAmount), normalFont); } @@ -431,7 +431,7 @@ } t.addCell(phrase); //cell 3 - if (provisionDeprecationAmount.doubleValue() != 0){ + if (provisionDeprecationAmount != BigDecimal.ZERO){ phrase = new Phrase(String.valueOf( provisionDeprecationAmount), normalFont); } @@ -442,7 +442,7 @@ //cell 4 BigDecimal solde = grossAmount; solde = solde.subtract(provisionDeprecationAmount); - if (solde.doubleValue() != 0){ + if (solde != BigDecimal.ZERO){ phrase = new Phrase(solde.toString(), normalFont); } else { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -246,7 +246,7 @@ entry.setAccount(account); BigDecimal debit = new BigDecimal(entryEBP.getDebit()); BigDecimal credit = new BigDecimal(entryEBP.getCredit()); - if (debit.doubleValue() == 0) { + if (debit == BigDecimal.ZERO) { entry.setDebit(false); entry.setAmount(credit); } else { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -146,7 +146,7 @@ solde = solde.add(debit); solde = solde.subtract(credit); - if (solde.doubleValue() > 0){ + if (solde.compareTo(BigDecimal.ZERO) == 1){ reportsDatas.setSoldeDebit(true); } solde = solde.abs(); @@ -235,7 +235,7 @@ solde = solde.add(debit); solde = solde.subtract(credit); - if (solde.doubleValue() > 0){ + if (solde.compareTo(BigDecimal.ZERO) == 1){ reportsDatas.setSoldeDebit(true); } solde = solde.abs(); @@ -308,7 +308,7 @@ solde = solde.add(debit); solde = solde.subtract(credit); - if (solde.doubleValue() > 0){ + if (solde.compareTo(BigDecimal.ZERO) == 1){ reportsDatas.setSoldeDebit(true); } @@ -385,7 +385,7 @@ //solde = debit - credit; solde = solde.add(debit); solde = solde.subtract(credit); - if (solde.doubleValue() > 0){ + if (solde.compareTo(BigDecimal.ZERO) == 1){ reportsDatas.setSoldeDebit(true); } solde = solde.abs(); @@ -484,7 +484,8 @@ amount = new BigDecimal(0); } if (movementedFilter){ - if (reportsDatas.getAmountCredit().doubleValue() != 0 || reportsDatas.getAmountDebit().doubleValue() != 0){ + if (reportsDatas.getAmountCredit() != BigDecimal.ZERO + || reportsDatas.getAmountDebit() != BigDecimal.ZERO) { // add balance sheet to balance trial balanceTrial.addReportsDatas(reportsDatas); } @@ -505,7 +506,7 @@ //solde = debit - credit; solde = solde.add(debit); solde = solde.subtract(credit); - if (solde.doubleValue() > 0){ + if (solde.compareTo(BigDecimal.ZERO) == 1){ balanceTrial.setSoldeDebit(true); } solde = solde.abs(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -138,7 +138,7 @@ view.amountSoldeLabel.setText(amountSolde.toString()); - if (amountSolde.doubleValue() == 0){ + if (amountSolde == BigDecimal.ZERO){ view.soldeLabel.setText(_("lima.common.solde")); } else { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -151,7 +151,7 @@ String.valueOf(amountSolde)); - if (amountSolde.doubleValue() == 0){ + if (amountSolde == BigDecimal.ZERO){ view.soldeLabel.setText(_("lima.common.solde")); } else { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -157,7 +157,7 @@ BigDecimal amountSolde = datasList.getAmountSolde(); view.amountSoldeLabel.setText(String.valueOf(amountSolde)); - if (amountSolde.doubleValue() == 0){ + if (amountSolde == BigDecimal.ZERO){ view.soldeLabel.setText(_("lima.common.solde")); } else { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -173,7 +173,7 @@ } break; case 1: - if (grossAmount.doubleValue() == 0){ + if (grossAmount == BigDecimal.ZERO){ result = null; } else { @@ -181,7 +181,7 @@ } break; case 2: - if (provisionDeprecationAmount.doubleValue() == 0){ + if (provisionDeprecationAmount == BigDecimal.ZERO){ result = null; } else { @@ -190,7 +190,7 @@ break; case 3: BigDecimal solde = grossAmount.subtract(provisionDeprecationAmount); - if (solde.doubleValue() == 0){ + if (solde == BigDecimal.ZERO) { result = null; } else { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -131,7 +131,7 @@ Object value = adapter.getValueAt(adapter.row, 8); if (value instanceof BigDecimal) { BigDecimal currentBalance = (BigDecimal) value; - if (currentBalance.doubleValue() != 0) { + if (currentBalance != BigDecimal.ZERO) { isHighlighted = true; } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -169,10 +169,10 @@ result = Letter.class; break; case 6: - result = Double.class; + result = BigDecimal.class; break; case 7: - result = Double.class; + result = BigDecimal.class; break; case 8: result = BigDecimal.class; @@ -515,11 +515,11 @@ case 6: //FIXME jpepin 20101231 transtypage "superflu" pour éviter un bug de getColumnName // qui ne fonctionne plus avec les BigDecimal - currentEntry.setAmount(new BigDecimal((Double)value)); + currentEntry.setAmount(new BigDecimal((Long)value)); currentEntry.setDebit(true); break; case 7: - currentEntry.setAmount(new BigDecimal((Double)value)); + currentEntry.setAmount(new BigDecimal((Long)value)); currentEntry.setDebit(false); break; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -118,7 +118,7 @@ Object value = adapter.getValueAt(adapter.row, 8); if (value instanceof BigDecimal) { BigDecimal currentBalance = (BigDecimal) value; - if (currentBalance.doubleValue() != 0) { + if (currentBalance != BigDecimal.ZERO) { isHighlighted = true; } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -123,7 +123,7 @@ Object value = adapter.getValueAt(adapter.row, 8); if (value instanceof BigDecimal) { BigDecimal currentBalance = (BigDecimal) value; - if (currentBalance.doubleValue() != 0) { + if (currentBalance != BigDecimal.ZERO) { isHighlighted = true; } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -175,10 +175,10 @@ result = String.class; break; case 5: - result = Double.class; + result = BigDecimal.class; break; case 6: - result = Double.class; + result = BigDecimal.class; break; case 7: result = BigDecimal.class; @@ -435,11 +435,11 @@ case 5 : //FIXME jpepin 20101231 transtypage "superflu" pour éviter un bug de getColumnName // qui ne fonctionne plus avec les BigDecimal - currentEntry.setAmount(new BigDecimal((Double)value)); + currentEntry.setAmount(new BigDecimal((Long)value)); currentEntry.setDebit(true); break; case 6: - currentEntry.setAmount(new BigDecimal((Double)value)); + currentEntry.setAmount(new BigDecimal((Long)value)); currentEntry.setDebit(false); break; case 8: Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -172,7 +172,7 @@ view.amountSoldeLabel.setText( String.valueOf(amountSolde)); - if (amountSolde.doubleValue() == 0){ + if (amountSolde == BigDecimal.ZERO){ view.soldeLabel.setText(_("lima.common.solde")); } else { 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 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -132,7 +132,7 @@ Object value = adapter.getValueAt(adapter.row, 8); if (value instanceof BigDecimal) { BigDecimal currentBalance = (BigDecimal) value; - if (currentBalance.doubleValue() != 0) { + if (currentBalance != BigDecimal.ZERO) { isHighlighted = true; } }

1 0

r3102 - in trunk: . lima-business lima-business/src/main/java/org/chorem/lima/business lima-business/src/main/java/org/chorem/lima/business/migration
by vsalaun＠users.chorem.org May 6, 2011

May 6, 2011

Author: vsalaun Date: 2011-05-06 15:50:36 +0200 (Fri, 06 May 2011) New Revision: 3102 Url: http://chorem.org/repositories/revision/lima/3102 Log: Changements dans la base de donnees Added: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java Modified: trunk/lima-business/pom.xml trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2011-05-06 08:30:13 UTC (rev 3101) +++ trunk/lima-business/pom.xml 2011-05-06 13:50:36 UTC (rev 3102) @@ -54,6 +54,10 @@ <artifactId>topia-persistence</artifactId> </dependency> <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-migration</artifactId> + </dependency> + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency> Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2011-05-06 08:30:13 UTC (rev 3101) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2011-05-06 13:50:36 UTC (rev 3102) @@ -30,7 +30,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.accountingrules.DefaultAccountingRules; +import org.chorem.lima.business.migration.DatabaseMigrationClass; import org.chorem.lima.entity.LimaCallaoDAOHelper; +import org.nuiton.topia.migration.TopiaMigrationEngine; +import org.nuiton.topia.migration.TopiaMigrationService; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ArgumentsParserException; @@ -60,6 +63,11 @@ for (Option o : Option.values()) { setDefaultOption(o.key, o.defaultValue); } + + setOption(TopiaMigrationService.TOPIA_SERVICE_NAME, TopiaMigrationEngine.class.getName()); + setOption(TopiaMigrationService.MIGRATION_CALLBACK, DatabaseMigrationClass.class.getName()); + setOption(TopiaMigrationService.MIGRATION_SHOW_SQL, Boolean.TRUE.toString()); + setOption(TopiaMigrationService.MIGRATION_SHOW_PROGRESSION, Boolean.TRUE.toString()); } public static LimaConfig getInstance() { Added: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java 2011-05-06 13:50:36 UTC (rev 3102) @@ -0,0 +1,51 @@ +package org.chorem.lima.business.migration; + +import java.util.List; + +import org.chorem.lima.entity.LimaCallaoDAOHelper; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersionResolver; +import org.nuiton.util.Version; + +public class DatabaseMigrationClass extends TopiaMigrationCallbackByClass { + + protected static final Version VERSION_0_5 = new Version("0.5"); + + + public DatabaseMigrationClass() { + super(new MigrationResolver()); + } + + protected static class MigrationResolver implements MigrationCallBackForVersionResolver { + + @Override + public Class<? extends MigrationCallBackForVersion> getCallBack(Version version) { + Class<? extends MigrationCallBackForVersion> result = null; + + if (version.equals(VERSION_0_5)) { + result = MigrationV0V0_5.class; + } + return result; + } + + } + + @Override + public Version[] getAvailableVersions() { + Version[] result = new Version[] { VERSION_0_5 }; + return result; + } + + @Override + public Version getApplicationVersion() { + Version appVersion = new Version(LimaCallaoDAOHelper.getModelVersion()); + return appVersion; + } + + @Override + public boolean askUser(Version dbVersion, List<Version> versions) { + return true; + } + + } Added: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java 2011-05-06 13:50:36 UTC (rev 3102) @@ -0,0 +1,24 @@ +package org.chorem.lima.business.migration; + +import java.util.List; + +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion; +import org.nuiton.util.Version; + +public class MigrationV0V0_5 extends MigrationCallBackForVersion { + + public MigrationV0V0_5(Version version, TopiaMigrationCallbackByClass callBack) { + super(version, callBack); + // TODO Auto-generated constructor stub + } + + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, + List<String> queries, boolean showSql, boolean showProgression) + throws TopiaException { + queries.add("Alter table record alter AMOUNT clob;"); + } +} Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-06 08:30:13 UTC (rev 3101) +++ trunk/pom.xml 2011-05-06 13:50:36 UTC (rev 3102) @@ -81,6 +81,13 @@ </dependency> <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-migration</artifactId> + <version>2.5.3</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <version>1.2.137</version>

1 0

r3101 - trunk/lima-business/src/main/assembly
by echatellier＠users.chorem.org May 6, 2011

May 6, 2011

Author: echatellier Date: 2011-05-06 10:30:13 +0200 (Fri, 06 May 2011) New Revision: 3101 Url: http://chorem.org/repositories/revision/lima/3101 Log: Update xml definition Modified: trunk/lima-business/src/main/assembly/bin.xml Modified: trunk/lima-business/src/main/assembly/bin.xml =================================================================== --- trunk/lima-business/src/main/assembly/bin.xml 2011-05-05 16:36:35 UTC (rev 3100) +++ trunk/lima-business/src/main/assembly/bin.xml 2011-05-06 08:30:13 UTC (rev 3101) @@ -24,7 +24,9 @@ #L% --> -<assembly 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/assembly-1.1.1.xsd"> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> <id>bin</id> <formats> <format>zip</format>

1 0

r3100 - trunk/lima-swing/src/main/java/org/chorem/lima/service
by echatellier＠users.chorem.org May 5, 2011

May 5, 2011

Author: echatellier Date: 2011-05-05 18:36:35 +0200 (Thu, 05 May 2011) New Revision: 3100 Url: http://chorem.org/repositories/revision/lima/3100 Log: Pesudo hack pour surcharger les options de logging par defaut de openejb Modified: trunk/lima-swing/src/main/java/org/chorem/lima/service/LimaServiceFactory.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/service/LimaServiceFactory.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/service/LimaServiceFactory.java 2011-05-05 13:56:23 UTC (rev 3099) +++ trunk/lima-swing/src/main/java/org/chorem/lima/service/LimaServiceFactory.java 2011-05-05 16:36:35 UTC (rev 3100) @@ -25,13 +25,18 @@ package org.chorem.lima.service; +import java.io.IOException; +import java.io.InputStream; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; +import java.util.HashMap; import java.util.Properties; -import java.util.HashMap; + import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; + +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.openejb.OpenEJB; @@ -63,6 +68,23 @@ // TODO EC-20100407 maybe put all options in LimaConfig and allow user to configure it (remove getFlatOptions use) Properties props = LimaMain.config.getFlatOptions(); + // transmission des options de logging a openejb + // sinon, il utilise son propre pattern interne + InputStream log4jFile = null; + try { + log4jFile = LimaServiceFactory.class.getResourceAsStream("/log4j.properties"); + Properties propsLog4j = new Properties(); + propsLog4j.load(log4jFile); + props.putAll(propsLog4j); + } catch (IOException ex) { + if (log.isErrorEnabled()) { + log.error("Can't find log4j properties file", ex); + } + } + finally { + IOUtils.closeQuietly(log4jFile); + } + // Context.INITIAL_CONTEXT_FACTORY is a mandatory option // containsKey() does'nt work :( if (!props.containsKey(Context.INITIAL_CONTEXT_FACTORY)) {

1 0

r3099 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: balance entrybooksreports financialstatementreport ledger
by vsalaun＠users.chorem.org May 5, 2011

May 5, 2011

Author: vsalaun Date: 2011-05-05 15:56:23 +0200 (Thu, 05 May 2011) New Revision: 3099 Url: http://chorem.org/repositories/revision/lima/3099 Log: #315 Ajout d'un bouton pour generer les impressions de rapports Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx 2011-05-05 12:15:18 UTC (rev 3098) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx 2011-05-05 13:56:23 UTC (rev 3099) @@ -61,9 +61,12 @@ </cell> <cell> <EnumEditor id='DocumentEditor' - constructorParams='org.chorem.lima.business.utils.FormatsEnum.class' - onActionPerformed="getHandler().createDocument()"/> + constructorParams='org.chorem.lima.business.utils.FormatsEnum.class'/> </cell> + <cell> + <JButton text="lima.common.ok" + onActionPerformed="getHandler().createDocument()"/> + </cell> </row> <row> <cell fill="both" weightx="1" weighty="1" columns="8"> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsView.jaxx 2011-05-05 12:15:18 UTC (rev 3098) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsView.jaxx 2011-05-05 13:56:23 UTC (rev 3099) @@ -64,9 +64,12 @@ </cell> <cell> <EnumEditor id='DocumentEditor' - constructorParams='org.chorem.lima.business.utils.FormatsEnum.class' - onActionPerformed="getHandler().createDocument()"/> + constructorParams='org.chorem.lima.business.utils.FormatsEnum.class'/> </cell> + <cell> + <JButton text="lima.common.ok" + onActionPerformed="getHandler().createDocument()"/> + </cell> </row> <row> <cell fill="both" weightx="1" weighty="1" columns="7"> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx 2011-05-05 12:15:18 UTC (rev 3098) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx 2011-05-05 13:56:23 UTC (rev 3099) @@ -49,9 +49,12 @@ </row></Table></cell> <cell> <EnumEditor id='DocumentEditor' - constructorParams='org.chorem.lima.business.utils.FormatsEnum.class' - onActionPerformed="getHandler().createDocument()"/> + constructorParams='org.chorem.lima.business.utils.FormatsEnum.class'/> </cell> + <cell> + <JButton text="lima.common.ok" + onActionPerformed="getHandler().createDocument()"/> + </cell> </row> <row> <cell fill="both" weightx="1" weighty="1" columns="7"> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx 2011-05-05 12:15:18 UTC (rev 3098) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx 2011-05-05 13:56:23 UTC (rev 3099) @@ -60,9 +60,12 @@ </cell> <cell> <EnumEditor id='DocumentEditor' - constructorParams='org.chorem.lima.business.utils.FormatsEnum.class' - onActionPerformed="getHandler().createDocument()"/> + constructorParams='org.chorem.lima.business.utils.FormatsEnum.class'/> </cell> + <cell> + <JButton text="lima.common.ok" + onActionPerformed="getHandler().createDocument()"/> + </cell> </row> <row> <cell fill="both" weightx="1" weighty="1" columns="8">

1 0