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

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

Revision: 8474
          http://sourceforge.net/p/fudaa/svn/8474
Author:   deniger
Date:     2013-08-29 08:50:50 +0000 (Thu, 29 Aug 2013)
Log Message:
-----------
correction r?\195?\169gressions

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/TransformerEMHHelper.java
    trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingLaunchRunOptionsAction.java

Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/TransformerEMHHelper.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/TransformerEMHHelper.java	2013-08-29 06:25:19 UTC (rev 8473)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/TransformerEMHHelper.java	2013-08-29 08:50:50 UTC (rev 8474)
@@ -113,6 +113,9 @@
 
   private static String doFormatFromNature(final PropertyNature nature, Object value, CrueConfigMetier ccm, DecimalFormatEpsilonEnum type) {
     if (nature.isEnum()) {
+      if (value.getClass().isEnum()) {
+        return value.toString();
+      }
       return new EnumNumberFormatter(nature).format((Double) value);
     }
     if (nature.isDuration()) {

Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java	2013-08-29 06:25:19 UTC (rev 8473)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java	2013-08-29 08:50:50 UTC (rev 8474)
@@ -1,5 +1,6 @@
 package org.fudaa.fudaa.crue.loi.common;
 
+import org.fudaa.dodico.crue.metier.transformer.EnumNumberFormatter;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingLaunchRunOptionsAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingLaunchRunOptionsAction.java	2013-08-29 06:25:19 UTC (rev 8473)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingLaunchRunOptionsAction.java	2013-08-29 08:50:50 UTC (rev 8474)
@@ -7,7 +7,6 @@
 import javax.swing.Action;
 import org.fudaa.dodico.crue.projet.create.RunCreatorOptions;
 import org.fudaa.fudaa.crue.common.helper.DialogHelper;
-import org.fudaa.fudaa.crue.common.services.ModellingScenarioService;
 import org.fudaa.fudaa.crue.modelling.services.ModellingScenarioModificationService;
 import org.fudaa.fudaa.crue.study.actions.RunOptionPanelBuilder;
 import org.fudaa.fudaa.crue.study.services.EMHProjetServiceImpl;

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