r3561 - in trunk/lima-swing/src/main/java/org/chorem/lima: . ui/lettering - Lima-commits

2 Aug 2012

Author: mallon
Date: 2012-08-02 11:18:58 +0200 (Thu, 02 Aug 2012)
New Revision: 3561

Url: http://chorem.org/repositories/revision/lima/3561

Log:
fixes #724 Correction concernant la normalisation des clefs de la configuration.

Modified:
   trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java
===================================================================

--- trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java	2012-08-01 16:23:35 UTC (rev 3560)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java	2012-08-02 09:18:58 UTC (rev 3561)
@@ -417,21 +417,21 @@
         DATA_DIR("lima.data.dir", n_("lima.config.data.dir.description"), "${user.home}/.lima", File.class, false, false),
         RESOURCES_DIRECTORY("lima.resources.dir", n_("lima.config.resources.dir.description"), "${lima.data.dir}/resources-${application.version}", String.class, false, false),
         I18N_DIRECTORY("lima.i18n.dir", n_("lima.config.i18n.dir.description"), "${lima.resources.dir}/i18n", String.class, false, false),
-        LOCALE("locale", n_("lima.config.locale.description"), "fr_FR", Locale.class, false, false),
-        DECIMAL_SEPARATOR("lima.config.decimalseparator", n_("lima.config.decimalseparator.description"), ",", String.class, false, false),
-        SCALE("scale", n_("lima.config.scale.description"), "2", Integer.class, false, false),
-        THOUSAND_SEPARATOR("thousandSeparator", n_("limma.config.thousandseparator.description"), " ", String.class, false, false),
-        CURRENCY("currency", n_("lima.config.currency.description"), "none", Boolean.class, false, false),
+        LOCALE("lima.ui.locale", n_("lima.config.locale.description"), "fr_FR", Locale.class, false, false),
+        DECIMAL_SEPARATOR("lima.data.bigDecimal.decimalSeparator", n_("lima.config.decimalseparator.description"), ",", String.class, false, false),
+        SCALE("lima.data.bigDecimal.scale", n_("lima.config.scale.description"), "2", Integer.class, false, false),
+        THOUSAND_SEPARATOR("lima.thousandSeparator", n_("limma.config.thousandseparator.description"), " ", String.class, false, false),
+        CURRENCY("lima.config.currency", n_("lima.config.currency.description"), "none", Boolean.class, false, false),
         FULL_SCREEN("lima.ui.fullscreen", n_("lima.config.ui.fullscreen.description"), "false", Boolean.class, false, false),
         LAUNCH_UI("lima.ui.launchui", n_("lima.config.ui.flaunchui.description"), "true", Boolean.class, true, true),
         SUPPORT_EMAIL("lima.misc.supportemail", n_("lima.misc.supportemail.description"), "support@codelutin.com", String.class, false, false),
         OPENEJB_REMOTEMODE("lima.openejb.remotemode", n_("lima.openejb.remotemode.description"), "false", String.class, false, false),
         LIMA_HOST_ADDRESS("lima.host.address", n_("lima.config.host.adress"), "localhost", String.class, false, false),
-        LIMA_STATE_FILE("lima.state.file", n_("lima.config.state.file"), "${lima.data.dir}/limaState.xml", String.class, false, false),
-        COLOR_SELECTION_FOCUS("colorselectionfocus", _("lima.config.colorselectionfocus"), "#000000", Color.class, false, false),
-        COMPORTMENT_EDITING_CELL("comportmenteditingcell", _("lima.config.comportmenteditingcell"), "ALL", comportmentEditingCellEnum.class, false, false);
+        LIMA_STATE_FILE("lima.ui.state.file", n_("lima.config.state.file"), "${lima.data.dir}/limaState.xml", String.class, false, false),
+        COLOR_SELECTION_FOCUS("lima.ui.table.cell.colorSelectionFocus", _("lima.config.colorselectionfocus"), "#000000", Color.class, false, false),
+        COMPORTMENT_EDITING_CELL("lima.ui.table.cell.comportmentEditingCell", _("lima.config.comportmenteditingcell"), "ALL", comportmentEditingCellEnum.class, false, false);
 
-        public enum comportmentEditingCellEnum {ALL, NOTHING};
+        public enum comportmentEditingCellEnum {ALL, NOTHING}
 
         public final String key;
 

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	2012-08-01 16:23:35 UTC (rev 3560)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java	2012-08-02 09:18:58 UTC (rev 3561)
@@ -130,10 +130,21 @@
                 Entry firstSelectedEntry = tableModel.getEntryAt(selectedRows[0]);
                 Entry secondSelectedEntry = tableModel.getEntryAt(selectedRows[1]);
 
-                String decimalFirstEntrySelected = (firstSelectedEntry.getAmount().toString().split("\\."))[1];
-                String decimalSecondSelectedEntry = (secondSelectedEntry.getAmount().toString().split("\\."))[1];
-                if ( !decimalFirstEntrySelected.equals("00") || !decimalSecondSelectedEntry.equals("00")
-                     && secondSelectedEntry.getDebit() != firstSelectedEntry.getDebit()) {
+                BigDecimal [] amountFirstEntry = debitCreditCalculation(firstSelectedEntry);
+                BigDecimal amountFirst = amountFirstEntry[0].equals(BigDecimal.ZERO)?amountFirstEntry[1]:amountFirstEntry[0];
+                BigDecimal [] amountSecondEntry = debitCreditCalculation(secondSelectedEntry);
+                BigDecimal amountSecond = amountSecondEntry[0].equals(BigDecimal.ZERO)?amountSecondEntry[1]:amountSecondEntry[0];
+
+                if (log.isDebugEnabled()) {
+                    log.debug(amountFirst + " - " + amountSecond);
+                }
+
+                /*String decimalFirstEntrySelected = (firstSelectedEntry.getAmount().toString().split("\\."))[1];
+                String decimalSecondSelectedEntry = (secondSelectedEntry.getAmount().toString().split("\\."))[1];*/
+                if ( /*(!decimalFirstEntrySelected.equals("00") || !decimalSecondSelectedEntry.equals("00"))*/
+                     !amountFirst.equals(BigDecimal.ZERO) && !amountSecond.equals(BigDecimal.ZERO)
+                     && secondSelectedEntry.getDebit() != firstSelectedEntry.getDebit()
+                     && !amountFirst.equals(amountSecond)) {
                     onButtonModeChanged("equalized");
                 }
             }else {

    

r3561 - in trunk/lima-swing/src/main/java/org/chorem/lima: . ui/lettering

mallon＠users.chorem.org

tags

participants (1)