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

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

Revision: 8593
          http://sourceforge.net/p/fudaa/svn/8593
Author:   deniger
Date:     2014-01-31 18:19:15 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
CRUE-599

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java

Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java	2014-01-31 18:18:49 UTC (rev 8592)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java	2014-01-31 18:19:15 UTC (rev 8593)
@@ -551,7 +551,7 @@
     double oldX = ptEvol.getPtEvolutionFF().getAbscisse();
     double oldY = ptEvol.getPtEvolutionFF().getOrdonnee();
     if (configLoi.getVarAbscisse().getEpsilon().isSame(oldX, newX)
-            && configLoi.getVarAbscisse().getEpsilon().isSame(oldY, newY)) {
+            && configLoi.getVarOrdonnee().getEpsilon().isSame(oldY, newY)) {
       return false;
     }
     if (!isRangeValid(newX, newY)) {

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java	2014-01-31 18:18:49 UTC (rev 8592)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java	2014-01-31 18:19:15 UTC (rev 8593)
@@ -31,6 +31,7 @@
 import org.fudaa.dodico.crue.validation.ValidatorNomProfilCasierContent;
 import org.fudaa.ebli.commun.EbliActionSimple;
 import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
+import org.fudaa.dodico.crue.config.ccm.CrueConfigMetierConstants;
 import org.fudaa.fudaa.crue.common.helper.DialogHelper;
 import org.fudaa.fudaa.crue.common.helper.ObjetNommeCellRenderer;
 import org.fudaa.fudaa.crue.common.log.LogIconTranslationProvider;
@@ -205,7 +206,6 @@
     cbProfils.setRenderer(cellRenderer);
 
     //boutons
-
     btDown = new JButton(ImageUtilities.loadImageIcon("org/fudaa/fudaa/crue/modelling/icons/down.png", false));
     btUp = new JButton(ImageUtilities.loadImageIcon("org/fudaa/fudaa/crue/modelling/icons/up.png", false));
     btDown.setToolTipText(NbBundle.getMessage(ProfilSectionTopComponent.class, "ProfilSection.SelectNext.Tooltip"));
@@ -263,7 +263,7 @@
       return null;
     }
     try {
-      return Double.parseDouble(text);
+      return getCcm().getProperty(CrueConfigMetierConstants.PROP_DISTANCE).getNormalizedValue(Double.parseDouble(text));
     } catch (NumberFormatException numberFormatException) {
     }
     return null;
@@ -297,29 +297,29 @@
   private void createActions() {
     delete = new EbliActionSimple(NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "Delete.DisplayName"), BuResource.BU.getIcon("enlever"),
             "DELETE") {
-      @Override
-      public void actionPerformed(ActionEvent _e) {
-        delete();
-      }
-    };
+              @Override
+              public void actionPerformed(ActionEvent _e) {
+                delete();
+              }
+            };
     delete.putValue(Action.SHORT_DESCRIPTION, NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "Delete.Description"));
 
     duplicate = new EbliActionSimple(NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "Duplicate.DisplayName"), BuResource.BU.getIcon(
             "dupliquer"), "DUPLICATE") {
-      @Override
-      public void actionPerformed(ActionEvent _e) {
-        duplicate();
-      }
-    };
+              @Override
+              public void actionPerformed(ActionEvent _e) {
+                duplicate();
+              }
+            };
     duplicate.putValue(Action.SHORT_DESCRIPTION, NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "Duplicate.Description"));
 
     create = new EbliActionSimple(NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "Create.DisplayName"), BuResource.BU.getIcon("creer"),
             "CREATE") {
-      @Override
-      public void actionPerformed(ActionEvent _e) {
-        create();
-      }
-    };
+              @Override
+              public void actionPerformed(ActionEvent _e) {
+                create();
+              }
+            };
     create.putValue(Action.SHORT_DESCRIPTION, NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "Create.Description"));
   }
 
@@ -606,6 +606,7 @@
     newProfilCasier.setNom(getEditingNom());
     final Double longueur = getLongueur();
     if (longueur != null) {
+
       newProfilCasier.setDistance(longueur);
     }
     return newProfilCasier;
@@ -725,7 +726,7 @@
     txtNomProfilCasier.setText(StringUtils.EMPTY);
     if (profilCasier != null) {
       txtCommentaire.setText(profilCasier.getCommentaire());
-      txtLongeur.setText(TransformerEMHHelper.formatFromPropertyName("longeur", profilCasier.getDistance(), getCcm(),
+      txtLongeur.setText(getCcm().getProperty(CrueConfigMetierConstants.PROP_DISTANCE).format(profilCasier.getDistance(),
               DecimalFormatEpsilonEnum.COMPARISON));
       uptateTxtLongueurTooltip();
       String desc = StringUtils.defaultString(profilCasier.getNom());

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