Thread: [Fudaa-svn-commit] SF.net SVN: fudaa:[9452] trunk/soft/fudaa-crue (Page 12)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 9452
          http://sourceforge.net/p/fudaa/svn/9452
Author:   deniger
Date:     2016-10-24 14:43:39 +0000 (Mon, 24 Oct 2016)
Log Message:
-----------
code plus securis?\195?\169 pour la gestion des traductions.

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ui/OrdCalcScenarioUiState.java
    trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/helper/OrdCalcCloner.java
    trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/pdt/DurationPropertyEditor.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingComputeDataTopComponent.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingSaveAction.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CalculDuplicateNodeAction.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CalculNodeFactory.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties

Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ui/OrdCalcScenarioUiState.java
===================================================================

--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ui/OrdCalcScenarioUiState.java	2016-10-24 14:43:04 UTC (rev 9451)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ui/OrdCalcScenarioUiState.java	2016-10-24 14:43:39 UTC (rev 9452)
@@ -20,7 +20,7 @@
   private final LinkedHashMap<String, CalcOrdCalcUiState> calcOrdCalcUiStates = new LinkedHashMap<>();
 
   public void addCalcOrdCalcUiStates(String calcId, OrdCalc calcOrdCalcUiState) {
-    calcOrdCalcUiStates.put(calcId, new CalcOrdCalcUiState(calcId, calcOrdCalcUiState));
+    calcOrdCalcUiStates.put(calcId.toUpperCase(), new CalcOrdCalcUiState(calcId, calcOrdCalcUiState));
   }
 
   /**
@@ -31,6 +31,12 @@
     return new ArrayList<>(calcOrdCalcUiStates.keySet());
   }
 
+  public void addAll(OrdCalcScenarioUiState other) {
+    if (other != null) {
+      calcOrdCalcUiStates.putAll(other.calcOrdCalcUiStates);
+    }
+  }
+
   /**
    *
    * @return la liste des ordCalc UI dans l'ordre

Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/helper/OrdCalcCloner.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/helper/OrdCalcCloner.java	2016-10-24 14:43:04 UTC (rev 9451)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/helper/OrdCalcCloner.java	2016-10-24 14:43:39 UTC (rev 9452)
@@ -108,7 +108,7 @@
 
   protected Result sortCalcWithSavedUi(OrdCalcScenario ocal, List<Calc> clonedCalcs, OrdCalcScenarioUiState uiOCalData) {
     Result res = new Result();
-    Map<String, Calc> clonedCalcsByName = TransformerHelper.toMapOfNom(clonedCalcs);
+    Map<String, Calc> clonedCalcsByName = TransformerHelper.toMapOfId(clonedCalcs);
     final List<String> calcNameInOrder = uiOCalData.getCalcNameInOrder();
     boolean isCoherent = isUiSavedCalcAccordingToCalcs(clonedCalcs, calcNameInOrder);
     if (!isCoherent) {
@@ -118,9 +118,9 @@
     List<OrdCalc> ordCalcsInScenario = ocal.getOrdCalc();
     Set<String> namesOfActiveCalcul = new HashSet<>();
     for (OrdCalc ordCalc : ordCalcsInScenario) {
-      String calcName = ordCalc.getCalc().getNom();
-      namesOfActiveCalcul.add(calcName);
-      final Calc calc = clonedCalcsByName.get(calcName);
+      String calcId = ordCalc.getCalc().getId();
+      namesOfActiveCalcul.add(calcId);
+      final Calc calc = clonedCalcsByName.get(calcId);
       res.ordCalcs.add(ordCalc.deepCloneButNotCalc(calc));
     }
     final List<CalcOrdCalcUiState> uiStates = uiOCalData.getUiStates();
@@ -128,13 +128,13 @@
       final String calcName = uiState.getCalcId();
       if (!namesOfActiveCalcul.contains(calcName)) {
         final OrdCalc ordCalcSaved = uiState.getOrdCalc();
-        final Calc calc = clonedCalcsByName.get(calcName);
+        final Calc calc = clonedCalcsByName.get(calcName.toUpperCase());
         assert calc != null : "uiOrdCalc: should not be null as the method isUiSavedCalcAccordingToCalcs should have tested it";
         res.ordCalcsInUI.add(ordCalcSaved.deepCloneButNotCalc(calc));
       }
     }
     for (String calcName : calcNameInOrder) {
-      final Calc calc = clonedCalcsByName.get(calcName);
+      final Calc calc = clonedCalcsByName.get(calcName.toUpperCase());
       assert calc != null : "should not be null as the method isUiSavedCalcAccordingToCalcs should have tested it";
       res.calcs.add(calc);
     }
@@ -149,10 +149,10 @@
    */
   protected boolean isUiSavedCalcAccordingToCalcs(Collection<Calc> clonedCalcs, final Collection<String> calcNameInOrder) {
     //on va d'abord voir si le tout est cohérent:
-    Map<String, Calc> clonedCalcsByName = TransformerHelper.toMapOfNom(clonedCalcs);
     if (clonedCalcs.size() == calcNameInOrder.size()) {
+      Map<String, Calc> clonedCalcsByName = TransformerHelper.toMapOfId(clonedCalcs);
       for (String string : calcNameInOrder) {
-        if (!clonedCalcsByName.containsKey(string)) {
+        if (!clonedCalcsByName.containsKey(string.toUpperCase())) {
           return false;
         }
       }

Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/pdt/DurationPropertyEditor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/pdt/DurationPropertyEditor.java	2016-10-24 14:43:04 UTC (rev 9451)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/pdt/DurationPropertyEditor.java	2016-10-24 14:43:39 UTC (rev 9452)
@@ -49,7 +49,7 @@
 
   @Override
   public void propertyChange(PropertyChangeEvent evt) {
-    if (PropertyEnv.PROP_STATE.equals(evt.getPropertyName())
+    if (durationEditor != null && PropertyEnv.PROP_STATE.equals(evt.getPropertyName())
             && evt.getNewValue() == PropertyEnv.STATE_VALID) {
       setValue(durationEditor.getDuration());
     }

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingComputeDataTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingComputeDataTopComponent.java	2016-10-24 14:43:04 UTC (rev 9451)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingComputeDataTopComponent.java	2016-10-24 14:43:39 UTC (rev 9452)
@@ -7,6 +7,8 @@
 import java.beans.PropertyChangeEvent;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 import org.fudaa.ctulu.CtuluLogGroup;
@@ -129,21 +131,40 @@
   @Override
   public void valideModificationHandler() {
     Node[] nodes = getExplorerManager().getRootContext().getChildren().getNodes();
+    //contiendra tous les calculs. Dans un premier temps ne contient que les permanents
     List<Calc> newCalcs = new ArrayList<>();
+    //que les transitoires
+    List<Calc> newCalcsTransitoire = new ArrayList<>();
+    //contiendra tous les ordres de calcul. Dans un premier temps ne contient que les permanents
     List<OrdCalc> newOrdCalcs = new ArrayList<>();
-    //contiendra les données persistées dans l'éditeur ( données ui uniquement).
+    //que les transitoires
+    List<OrdCalc> newOrdCalcsTransitoire = new ArrayList<>();
+    //contiendra les données persistées dans l'éditeur ( données ui uniquement). Ne contient que les permanents au début
     OrdCalcScenarioUiState uiStates = new OrdCalcScenarioUiState();
+    //que les tansitoires
+    OrdCalcScenarioUiState uiStatesTransitoire = new OrdCalcScenarioUiState();
     for (Node node : nodes) {
       CalculNode calculNode = (CalculNode) node;
-      newCalcs.add(calculNode.getCalc());
+      final boolean isCalculPermanent = calculNode.getCalc().isPermanent();
+      OrdCalcScenarioUiState uiStatesToUse = isCalculPermanent ? uiStates : uiStatesTransitoire;
+      List<Calc> newCalcsToUse = isCalculPermanent ? newCalcs : newCalcsTransitoire;
+      List<OrdCalc> newOrdCalcsToUse = isCalculPermanent ? newOrdCalcs : newOrdCalcsTransitoire;
+      newCalcsToUse.add(calculNode.getCalc());
       CalculOcalNode ocalNode = calculNode.getOcalNode();
       if (ocalNode != null) {
-        newOrdCalcs.add(ocalNode.getOrdCalc());
-        uiStates.addCalcOrdCalcUiStates(calculNode.getCalc().getId(), ocalNode.getOrdCalc());
+        newOrdCalcsToUse.add(ocalNode.getOrdCalc());
+        uiStatesToUse.addCalcOrdCalcUiStates(calculNode.getCalc().getId(), ocalNode.getOrdCalc());
       } else if (calculNode.getOldUsedOrdCalc() != null) {
-        uiStates.addCalcOrdCalcUiStates(calculNode.getCalc().getId(), calculNode.getOldUsedOrdCalc());
+        uiStatesToUse.addCalcOrdCalcUiStates(calculNode.getCalc().getId(), calculNode.getOldUsedOrdCalc());
+      } else {
+        Logger.getLogger(ModellingComputeDataTopComponent.class.getName()).log(Level.SEVERE, "calc without ocal data");
       }
     }
+    //pour mettre dans l'ordre les permanents puis les transitoires
+    uiStates.addAll(uiStatesTransitoire);
+    newOrdCalcs.addAll(newOrdCalcsTransitoire);
+    newCalcs.addAll(newCalcsTransitoire);
+
     OrdCalcScenario ocalTemp = new OrdCalcScenario();
     DonCLimMScenario dclmTemp = new DonCLimMScenario();
     for (OrdCalc ordCalc : newOrdCalcs) {
@@ -281,11 +302,11 @@
       fac.addNewCalc(calc);
     }
   }
+
   private class CalcNodeListener implements NodeListener {
 
     public void reorderChildren() {
       expandedNodesManager.saveState();
-      //on s'assure que les permanents sont avant les transitoire
       setModified(true);
       expandedNodesManager.restoreState();
     }
@@ -348,10 +369,8 @@
     public boolean canMoveEndBeAdded(Node[] selectedNodes) {
       for (Node node : selectedNodes) {
         if (!node.getClass().equals(CalculNode.class)) {
-
           return false;
         }
-        return ((CalculNode) node).isActivated();
       }
       return true;
     }

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingSaveAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingSaveAction.java	2016-10-24 14:43:04 UTC (rev 9451)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingSaveAction.java	2016-10-24 14:43:39 UTC (rev 9452)
@@ -72,6 +72,9 @@
       PerspectiveServiceModelling perpective = Lookup.getDefault().lookup(PerspectiveServiceModelling.class);
       perpective.setDirty(false);
 
+    } else {
+      DialogHelper.showError(NbBundle.getMessage(ModellingSaveAction.class, "ModellingSaveAction.ErrorMessage",
+              scenarioService.getManagerScenarioLoaded().getNom()));
     }
 
 

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CalculDuplicateNodeAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CalculDuplicateNodeAction.java	2016-10-24 14:43:04 UTC (rev 9451)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CalculDuplicateNodeAction.java	2016-10-24 14:43:39 UTC (rev 9452)
@@ -40,7 +40,7 @@
     calc.setNom(nameFinder.findUniqueName(nodesName, calc.getNom(), 2));
     CalculNodeFactory fac = new CalculNodeFactory(targetNode.outlineView);
     CalculOcalNode ocalNode = targetNode.getOcalNode();
-    OrdCalc ordCalc = null;
+    OrdCalc ordCalc;
     if (ocalNode != null) {
       ordCalc = ocalNode.getOrdCalc();
     } else {

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CalculNodeFactory.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CalculNodeFactory.java	2016-10-24 14:43:04 UTC (rev 9451)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CalculNodeFactory.java	2016-10-24 14:43:39 UTC (rev 9452)
@@ -22,6 +22,7 @@
 import org.fudaa.dodico.crue.metier.emh.DonLoiHYConteneur;
 import org.fudaa.dodico.crue.metier.emh.Loi;
 import org.fudaa.dodico.crue.metier.emh.OrdCalc;
+import org.fudaa.dodico.crue.metier.factory.OrdCalcFactory;
 import org.fudaa.dodico.crue.metier.helper.CalcHelper;
 import org.fudaa.dodico.crue.metier.helper.OrdCalcCloner;
 import org.fudaa.dodico.crue.metier.helper.OrdCalcCloner.Result;
@@ -95,7 +96,12 @@
       CalculNode node = new CalculNode(outlineView, createChildren(calc, ordCalcByCalc, donLoiHYConteneurCloned), calc, ccm,
               perspectiveServiceModelling);
       if (!node.isActivated()) {
-        node.setOldUsedOrdCalc(uiOrdCalcByCalc.get(calc));
+        OrdCalc saved = uiOrdCalcByCalc.get(calc);
+        if (saved == null) {
+          saved = OrdCalcFactory.createDefaultOcal(calc, ccm);
+        }
+        node.setOldUsedOrdCalc(saved);
+        
       }
       nodes.add(node);
     }
@@ -109,6 +115,7 @@
       node = new CalculNode(outlineView, createChildren(newCalc, Collections.<Calc, OrdCalc>emptyMap(), donLoiHYConteneurCloned), newCalc,
               ccm,
               perspectiveServiceModelling);
+      node.setOldUsedOrdCalc(OrdCalcFactory.createDefaultOcal(newCalc, ccm));
       ExplorerManager newManager = ExplorerManager.find(outlineView);
       final Node[] newNodeArray = new Node[]{node};
       newManager.getRootContext().getChildren().add(newNodeArray);

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties	2016-10-24 14:43:04 UTC (rev 9451)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties	2016-10-24 14:43:39 UTC (rev 9452)
@@ -19,6 +19,7 @@
 Export.EndMessageDetails=Fichiers g\u00e9n\u00e9r\u00e9s {0}
 ExportCrue10.EndMessageDetails=Fichiers g\u00e9n\u00e9r\u00e9s {0} dans la version de grammaire {1}
 ModellingSaveAction.SucceedMessage=Sc\u00e9nario {0} sauv\u00e9
+ModellingSaveAction.ErrorMessage=Echec lors de la sauvegarde du sc\u00e9nario {0}. V\u00e9rifier le compte-rendu d''op\u00e9ration.
 ModellingCloseAction.ActivatedIsModified=La vue active contient des donn\u00e9es non valid\u00e9es
 ModellingCloseAction.IsModified=Des donn\u00e9es ne sont pas enregistr\u00e9es
 ModellingCloseAction.Confirm=Voulez-vous ignorer les modifications et fermer le sc\u00e9nario ?

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





Thread: [Fudaa-svn-commit] SF.net SVN: fudaa:[9452] trunk/soft/fudaa-crue (Page 12)

https://gitlab.com/fudaa

fudaa-svn-commit