[Fudaa-svn-commit] SF.net SVN: fudaa:[8356] trunk/soft/fudaa-crue/crue-config/src

[<de...@us...>]

Revision: 8356
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8356&view=rev
Author:   deniger
Date:     2013-03-21 16:01:07 +0000 (Thu, 21 Mar 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java
    trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java

Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java	2013-03-21 09:07:53 UTC (rev 8355)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java	2013-03-21 16:01:07 UTC (rev 8356)
@@ -31,7 +31,11 @@
     if ("nbr".equalsIgnoreCase(natureNom) || "num".equalsIgnoreCase(natureNom)) {
       return null;
     }
-    int nbDec = Math.abs((int) Math.floor(Math.log10(nature.getEpsilon().getEpsilon(presentionOrComparison))));
+    double epsilon = nature.getEpsilon().getEpsilon(presentionOrComparison);
+    if (DecimalFormatEpsilonEnum.COMPARISON.equals(presentionOrComparison)) {
+      epsilon = epsilon / 10;
+    }
+    int nbDec = Math.abs((int) Math.floor(Math.log10(epsilon)));
     NumberFormat numberFormat = this.nbDecFormat.get(nbDec);
     if (numberFormat == null) {
       numberFormat = new DecimalFormat();

Modified: trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java	2013-03-21 09:07:53 UTC (rev 8355)
+++ trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java	2013-03-21 16:01:07 UTC (rev 8356)
@@ -17,10 +17,10 @@
 
   @Test
   public void testCreateFormatter() {
-    test(1e-2, 2, 1e-3, 3);
-    test(1e-10, 10, 1e-22, 22);
-    test(2e-2, 2, 2e-3, 3);
-    test(3e-10, 10, 3e-22, 22);
+    test(1e-2, 3, 1e-3, 3);
+    test(1e-10, 11, 1e-22, 22);
+    test(2e-2, 3, 2e-3, 3);
+    test(3e-10, 11, 3e-22, 22);
   }
 
   protected void test(double comparaison, int comparaisonFractionDigits, double presentation, int presentationFractionDigits) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.