Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7434] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2012-07-02 19:50:52
|
Revision: 7434
http://fudaa.svn.sourceforge.net/fudaa/?rev=7434&view=rev
Author: deniger
Date: 2012-07-02 19:50:45 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
maj listes d'EMH
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/LogIdProperty.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListAjoutNoeudProcess.java
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
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListSectionTopComponent.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListRelationSectionProcess.java
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/LogIdProperty.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/LogIdProperty.java 2012-07-02 19:49:06 UTC (rev 7433)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/LogIdProperty.java 2012-07-02 19:50:45 UTC (rev 7434)
@@ -22,7 +22,7 @@
public LogIdProperty(CtuluLogRecord record) {
super(ID, String.class, getDefaultDisplayName(),
- getDescription());
+ getDescription());
this.record = record;
PropertyCrueUtils.configureNoCustomEditor(this);
}
@@ -46,11 +46,11 @@
@Override
public String toString() {
- return Integer.toString(record.getId());
+ return record.getId();
}
@Override
public String getValue() throws IllegalAccessException, InvocationTargetException {
- return Integer.toString(record.getId());
+ return record.getId();
}
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListAjoutNoeudProcess.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListAjoutNoeudProcess.java 2012-07-02 19:49:06 UTC (rev 7433)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListAjoutNoeudProcess.java 2012-07-02 19:50:45 UTC (rev 7434)
@@ -9,8 +9,6 @@
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.edition.CreationCasierData;
import org.fudaa.dodico.crue.edition.CreationNoeudData;
import org.fudaa.dodico.crue.edition.EditionCreateEMH;
import org.fudaa.dodico.crue.metier.emh.EMH;
@@ -19,7 +17,6 @@
import org.fudaa.dodico.crue.metier.emh.EnumNoeudType;
import org.fudaa.dodico.crue.metier.transformer.TransformerHelper;
import org.fudaa.dodico.crue.validation.ValidationPatternHelper;
-import org.fudaa.fudaa.crue.modelling.list.AbstractListContent;
import org.fudaa.fudaa.crue.modelling.list.ListNoeudContent;
import org.fudaa.fudaa.crue.modelling.list.ListNoeudContentAddNode;
import org.fudaa.fudaa.crue.modelling.perspective.PerspectiveServiceModelling;
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 2012-07-02 19:49:06 UTC (rev 7433)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListCasierModificationProcess.java 2012-07-02 19:50:45 UTC (rev 7434)
@@ -38,6 +38,13 @@
protected ModellingScenarioModificationService modellingScenarioModificationService = Lookup.getDefault().lookup(
ModellingScenarioModificationService.class);
+ /**
+ *
+ * @param emhSousModele
+ * @param casiers
+ * @param dataByUid
+ * @return le bilan logs / contient erreur bloquante.
+ */
public Pair<CtuluLog, Boolean> applyCasier(EMHSousModele emhSousModele, List<CatEMHCasier> casiers,
TLongObjectHashMap<CasierData> dataByUid) {
Pair<CtuluLog, Boolean> res = new Pair<CtuluLog, Boolean>(new CtuluLog(), Boolean.TRUE);
Added: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListRelationSectionProcess.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListRelationSectionProcess.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListRelationSectionProcess.java 2012-07-02 19:50:45 UTC (rev 7434)
@@ -0,0 +1,63 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.modelling.edition;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.CtuluLog;
+import org.fudaa.dodico.crue.metier.emh.EMHSousModele;
+import org.fudaa.fudaa.crue.common.helper.DialogHelper;
+import org.fudaa.fudaa.crue.modelling.list.*;
+import org.openide.nodes.Node;
+import org.openide.util.NbBundle;
+
+/**
+ *
+ * @author Frédéric Deniger
+ */
+public class ListRelationSectionProcess {
+
+ protected List<ListRelationSectionContent> getContentList(Node[] newNoeuds) {
+ List<ListRelationSectionContent> contents = new ArrayList<ListRelationSectionContent>();
+ for (Node node : newNoeuds) {
+ ListRelationSectionContent content = node.getLookup().lookup(ListRelationSectionContent.class);
+ if (content != null) {
+ contents.add(content);
+ }
+ }
+ return contents;
+
+
+ }
+
+ public void processModification(Node[] newRelationSection, EMHSousModele emhSousModele) {
+ DialogHelper.showWarn("Non encore finalisé car: comment traiter les sections pilotes, les données des relation branche saint venant,...");
+// List<ListRelationSectionContent> contents = getContentList(newRelationSection);
+// CtuluLog log = new CtuluLog();
+// for (Node node : newRelationSection) {
+// ListRelationSectionContent content = node.getLookup().lookup(ListRelationSectionContent.class);
+// ListRelationSectionContentNode contentNode = (ListRelationSectionContentNode) node;
+// boolean error = false;
+// String nom = content.getNom();
+// List<String> msgs = new ArrayList<String>();
+// //cette verification est inutile car normalement la liste de section assure que les noms sont utilisés une seule fois.
+// if (ListModificationProcess.nameUsed(content, contents)) {
+// error = true;
+// String msg = NbBundle.getMessage(ListAjoutCasierProcess.class, "AddEMH.NameAlreadyUsedInNewEMH", nom);
+// msgs.add(msg);
+// log.addSevereError(msg);
+// }
+// contentNode.setContainError(error);
+//
+// if (msgs.isEmpty()) {
+// contentNode.setShortDescription(StringUtils.EMPTY);
+// } else {
+// contentNode.setShortDescription("<html><body>" + StringUtils.join(msgs, "<br>") + "</body></html>");
+// }
+// }
+
+ }
+}
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 2012-07-02 19:49:06 UTC (rev 7433)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListRelationSectionContentNode.java 2012-07-02 19:50:45 UTC (rev 7434)
@@ -91,18 +91,21 @@
CrueConfigMetier propDefinition = modellingScenarioService.getSelectedProjet().getPropDefinition();
ItemVariable property = propDefinition.getProperty(CrueConfigMetier.CONST_Xp);
- PropertySupportReflection abscisseHydraulique = PropertySupportReflectionDouble.createDouble(this, relationSectionContent,
- ListRelationSectionContent.PROP_ABSCISSE_HYDRAULIQUE,
- ListRelationSectionContent.PROP_ABSCISSE_HYDRAULIQUE, getAbsicsseHydrauliqueDisplay(), property);
+ if (StringUtils.isNotBlank(relationSectionContent.getBrancheNom())) {
+ PropertySupportReflection abscisseHydraulique = PropertySupportReflectionDouble.createDouble(this, relationSectionContent,
+ ListRelationSectionContent.PROP_ABSCISSE_HYDRAULIQUE,
+ ListRelationSectionContent.PROP_ABSCISSE_HYDRAULIQUE, getAbsicsseHydrauliqueDisplay(), property);
- PropertyCrueUtils.configureNoCustomEditor(abscisseHydraulique);
- set.put(abscisseHydraulique);
- Node.Property abscisseSchematique = new PropertyStringReadOnly(relationSectionContent.getAbscisseSchematique(),
- ListRelationSectionContent.PROP_ABSCISSE_SCHEMATIQUE,
- getAbscisseSchematiqueDisplay(),
- null);
- PropertyCrueUtils.configureNoCustomEditor(abscisseSchematique);
- set.put(abscisseSchematique);
+ PropertyCrueUtils.configureNoCustomEditor(abscisseHydraulique);
+ set.put(abscisseHydraulique);
+ Node.Property abscisseSchematique = new PropertyStringReadOnly(relationSectionContent.getAbscisseSchematique(),
+ ListRelationSectionContent.PROP_ABSCISSE_SCHEMATIQUE,
+ getAbscisseSchematiqueDisplay(),
+ null);
+ PropertyCrueUtils.configureNoCustomEditor(abscisseSchematique);
+ set.put(abscisseSchematique);
+ }
+
//commentaire
Node.Property commentaire = new PropertySupportReadWrite<ListRelationSectionContent, String>(this, relationSectionContent, String.class, PROP_NAME,
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListSectionTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListSectionTopComponent.java 2012-07-02 19:49:06 UTC (rev 7433)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListSectionTopComponent.java 2012-07-02 19:50:45 UTC (rev 7434)
@@ -7,6 +7,7 @@
import java.util.List;
import org.fudaa.dodico.crue.metier.emh.EMH;
import org.fudaa.dodico.crue.metier.emh.EMHSousModele;
+import org.fudaa.fudaa.crue.modelling.edition.ListRelationSectionProcess;
import org.openide.nodes.Node;
import org.openide.util.NbBundle;
import org.openide.windows.TopComponent;
@@ -37,7 +38,7 @@
@Override
public void valideModification() {
-// Node[] nodes = em.getRootContext().getChildren().getNodes();
+ Node[] nodes = em.getRootContext().getChildren().getNodes();
// List<CatEMHBranche> noeuds = new ArrayList<CatEMHBranche>();
// for (Node node : nodes) {
// CatEMHBranche branche = node.getLookup().lookup(CatEMHBranche.class);
@@ -45,7 +46,7 @@
// noeuds.add(branche);
// }
//
-// new ListModificationProcess().reorderNodes((EMHSousModele) getEMHInLookup(), noeuds);
+ new ListRelationSectionProcess().processModification(nodes, getSousModele());
setModified(false);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
