|
From: <de...@us...> - 2014-06-15 21:23:57
|
Revision: 8764
http://sourceforge.net/p/fudaa/svn/8764
Author: deniger
Date: 2014-06-15 21:23:52 +0000 (Sun, 15 Jun 2014)
Log Message:
-----------
CRUE-628
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListCasierModificationProcess.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListRelationSectionContentNode.java
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListCasierModificationProcess.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListCasierModificationProcess.java 2014-06-10 22:29:37 UTC (rev 8763)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListCasierModificationProcess.java 2014-06-15 21:23:52 UTC (rev 8764)
@@ -5,6 +5,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.dodico.crue.common.Pair;
import org.fudaa.dodico.crue.common.transformer.TransformerHelper;
@@ -55,6 +56,7 @@
//on vérifie les noms
boolean casierNameChanged = false;
boolean casierRelationNoeudChanged = false;
+
List<CatEMHNoeud> noeuds = emhSousModele.getNoeuds();
List<EMH> casierFromOtherSousModeles = emhSousModele.getParent().getParent().getIdRegistry().getEMHs(EnumCatEMH.CASIER);
casierFromOtherSousModeles.removeAll(casiers);
@@ -91,6 +93,7 @@
newCasierName));
}
}
+
if (newData.noeudName != null && newData.casierName != null) {
String casierNameForNoeud = CruePrefix.getNomAvecPrefixFor(newData.noeudName, EnumCatEMH.CASIER);
if (!casierNameForNoeud.equals(newData.casierName)) {
@@ -107,6 +110,7 @@
boolean reorderDone = ReorderEMHProcess.reorder(emhSousModele, casiers, EnumCatEMH.CASIER);
boolean activeModified = false;
+ boolean commentaireModified = false;
for (CatEMHCasier casier : casiers) {
CasierData newData = dataByUid.get(casier.getUiId());
if (newData != null) {
@@ -115,6 +119,10 @@
//le changement du caractère actif sera propage par la suite.
activeModified = true;
}
+ if (!StringUtils.equals(newData.commentaire, casier.getCommentaire())) {
+ casier.setCommentaire(newData.commentaire);
+ commentaireModified = true;
+ }
}
}
@@ -153,6 +161,9 @@
if (casierRelationNoeudChanged) {
modifications.add(EnumModification.EMH_RELATION);
}
+ if (commentaireModified) {
+ modifications.add(EnumModification.COMMENTAIRE);
+ }
boolean modification = !modifications.isEmpty();
if (modification && modellingScenarioModificationService != null) {//pour les tests:
modellingScenarioModificationService.setScenarioModified(new ScenarioModificationEvent(modifications));
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListRelationSectionContentNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListRelationSectionContentNode.java 2014-06-10 22:29:37 UTC (rev 8763)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListRelationSectionContentNode.java 2014-06-15 21:23:52 UTC (rev 8764)
@@ -127,7 +127,8 @@
//commentaire
- Node.Property commentaire = new PropertySupportReadWrite<ListRelationSectionContent, String>(this, relationSectionContent, String.class, PROP_NAME,
+ Node.Property commentaire = new PropertySupportReadWrite<ListRelationSectionContent, String>(this, relationSectionContent, String.class,
+ ListCommonProperties.PROP_COMMENTAIRE,
AbstractListContentNode.getCommentDisplay()) {
@Override
protected void setValueInInstance(String newVal) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|