Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[5706] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2010-03-08 00:27:39
|
Revision: 5706
http://fudaa.svn.sourceforge.net/fudaa/?rev=5706&view=rev
Author: deniger
Date: 2010-03-08 00:27:31 +0000 (Mon, 08 Mar 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueErrorManager.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ExecuteComparaison.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterResultatCalcul.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/ResultatTest.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterORES.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoORES.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureORES.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/CrueIODico.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBSequentialReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBValueObject.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHContainer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHConteneur.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHSection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CommentaireContainer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHConteneurDeSousModele.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSousModele.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumRegle.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ObjetNomme.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResBrancheBarrageFilEau.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResBrancheBarrageGenerique.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResBrancheOrifice.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResBranchePdc.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResBrancheSaintVenant.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResBrancheSeuilLateral.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResBrancheSeuilTransversal.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResBrancheStrickler.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResCasierProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResNoeudNiveauContinu.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResSectionIdem.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResSectionInterpolee.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResSectionProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResSectionSansGeometrie.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMHBrancheContientSection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResCalcul.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelperPredicate.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/LoiFactory.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/SimpleClassNameComparator.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioExporterCrue10.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue10.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaverCrue10.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaverCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/PropertyValidator.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateModeleScenarioWithSchema.java
trunk/soft/fudaa-crue/dodico/src/main/resources/default.ores.xml
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/common/commonMessages.properties
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-ores-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueORESFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/TestEMHPropertiesValidator.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.ores.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3bis.ores.xml
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/EMHManagerBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueProjet.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioComparaisonUI.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheScenario.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleEMH.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleScenarioManager.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractResCalSection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CommentaireItem.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CommentairesManager.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumRegime.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ObjetWithID.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdRes.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResCalBrancheBarrageFilEau.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResCalBrancheBarrageGenerique.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResCalBrancheOrifice.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResCalBranchePdc.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResCalBrancheSaintVenant.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResCalBrancheSeuilLateral.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResCalBrancheSeuilTransversal.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResCalBrancheStrickler.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResCalBrancheWithRegime.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResCalCasierProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResCalNoeudNiveauContinu.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResCalSectionIdem.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResCalSectionInterpolee.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResCalSectionProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResCalSectionSansGeometrie.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/AbstractCrueValidator.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/CrueValidator.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/DelegateValidatorEMHContentRelations.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ScenarioWriterForXSDValidation.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateEMHTreeWalker.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidatorForCrue9Export.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidatorForIDCrue10.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidatorForIDCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidatorForValuesAndContents.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidatorHelper.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/VariableBuilder.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.ores.xml.in
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.ores.xml.out
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Commentaires.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ContentEMHValidator.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/Crue9Validator.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/IdValidatorForCrue10.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/IdValidatorForCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/PropertyValidatorBuilder.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ScenarioWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateEMHProperties.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValueValidator.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/VariableBuilder.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/validation/validation.txt
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueErrorManager.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueErrorManager.java 2010-03-06 01:30:55 UTC (rev 5705)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueErrorManager.java 2010-03-08 00:27:31 UTC (rev 5706)
@@ -80,12 +80,33 @@
return analyser;
}
+ public void addAll(List<CtuluAnalyze> in) {
+ if (in == null) { return; }
+ for (CtuluAnalyze ctuluAnalyze : in) {
+ addAnalyzer(ctuluAnalyze);
+ }
+ }
+
+ public void addNotEmptyLogs(List<CtuluAnalyze> in) {
+ if (in == null) { return; }
+ for (CtuluAnalyze ctuluAnalyze : in) {
+ if (ctuluAnalyze != null && !ctuluAnalyze.isEmpty()) {
+ addAnalyzer(ctuluAnalyze);
+ }
+ }
+ }
+
public String getMainDesc() {
return mainAnalyze.getDesc();
}
+ /**
+ * @param analyze ajoute si non null;
+ */
public void addAnalyzer(CtuluAnalyze analyze) {
- analyser.add(analyze);
+ if (analyze != null) {
+ analyser.add(analyze);
+ }
}
/**
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ExecuteComparaison.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ExecuteComparaison.java 2010-03-06 01:30:55 UTC (rev 5705)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ExecuteComparaison.java 2010-03-08 00:27:31 UTC (rev 5706)
@@ -42,7 +42,7 @@
convertCompare.setFactory(factory);
}
- public static class ExecuteComparaisonResult {
+ public static class ExecuteComparaisonResult implements Comparable<ExecuteComparaisonResult> {
private CtuluAnalyze analyze;
/**
@@ -68,6 +68,11 @@
return nbObjectTested;
}
+ public int compareTo(ExecuteComparaisonResult o) {
+ if (o == null) { return 1; }
+ return id.compareTo(o.id);
+ }
+
private ResultatTest res;
private String id;
private String msg;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java 2010-03-06 01:30:55 UTC (rev 5705)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java 2010-03-08 00:27:31 UTC (rev 5706)
@@ -16,7 +16,7 @@
import org.fudaa.dodico.crue.common.CustomPropertyUtilsBeanInstaller;
import org.fudaa.dodico.crue.comparaison.common.ComparaisonMessages;
import org.fudaa.dodico.crue.metier.emh.InfosEMH;
-import org.fudaa.dodico.crue.metier.emh.ObjetNomme;
+import org.fudaa.dodico.crue.metier.emh.ObjetWithID;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -181,7 +181,10 @@
private void addDiff(final Object o1, final ResultatTest res, final String propName, final Object a, final Object b) {
if (res != null) {
- String pref = (o1 instanceof ObjetNomme) ? ((ObjetNomme) o1).getId() + ": " : StringUtils.EMPTY;
+ String pref = StringUtils.EMPTY;
+ if (o1 instanceof ObjetWithID) {
+ pref = ((ObjetWithID) o1).getId() + ": ";
+ }
final ResultatTest item = new ResultatTest(a, b, pref
+ ComparaisonMessages.getString("compare.property.diff", propName));
item.updatePrint();
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterResultatCalcul.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterResultatCalcul.java 2010-03-06 01:30:55 UTC (rev 5705)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterResultatCalcul.java 2010-03-08 00:27:31 UTC (rev 5706)
@@ -5,7 +5,7 @@
import org.fudaa.dodico.crue.common.DoubleComparator;
import org.fudaa.dodico.crue.io.neuf.FCBSequentialReader.ResultatCalcul;
import org.fudaa.dodico.crue.io.neuf.FCBSequentialReader.ResultatCalculPasDeTemps;
-import org.fudaa.dodico.crue.io.neuf.FCBValueObject.AbstractRes;
+import org.fudaa.dodico.crue.metier.emh.ResCalcul;
/**
* @author denf01a
@@ -51,8 +51,8 @@
int pos1 = i;
int pos2 = posFound.intValue();
try {
- AbstractRes read1 = o1.read(pos1);
- AbstractRes read2 = o2.read(pos2);
+ ResCalcul read1 = o1.read(pos1);
+ ResCalcul read2 = o2.read(pos2);
ResultatTest resLocal = new ResultatTest("", "", "compare.resultat.diff", pdt);
if (!beanTester.isSame(read1, read2, resLocal, context)) {
res.addDiff(resLocal);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/ResultatTest.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/ResultatTest.java 2010-03-06 01:30:55 UTC (rev 5705)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/ResultatTest.java 2010-03-08 00:27:31 UTC (rev 5706)
@@ -5,6 +5,7 @@
import java.util.List;
import org.apache.commons.collections.CollectionUtils;
+import org.fudaa.dodico.crue.metier.emh.ObjetWithID;
import org.fudaa.dodico.crue.metier.emh.ObjetNomme;
/**
@@ -81,14 +82,14 @@
public void updatePrint() {
if (getPrintA() == null) {
- if (objetA instanceof ObjetNomme) {
+ if (objetA instanceof ObjetWithID) {
setPrintA(((ObjetNomme) objetA).getNom());
} else if (objetA != null) {
setPrintA(objetA.getClass().getSimpleName() + ": " + objetA);
}
}
if (getPrintB() == null) {
- if (objetB instanceof ObjetNomme) {
+ if (objetB instanceof ObjetWithID) {
setPrintB(((ObjetNomme) objetB).getNom());
} else if (objetB != null) {
setPrintB(objetB.getClass().getSimpleName() + ": " + objetB);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterORES.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterORES.java 2010-03-06 01:30:55 UTC (rev 5705)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterORES.java 2010-03-08 00:27:31 UTC (rev 5706)
@@ -5,10 +5,26 @@
import java.util.ArrayList;
+import com.memoire.fu.FuLogCrue;
+
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.common.CrueData;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureORES.*;
-import org.fudaa.dodico.crue.metier.emh.*;
+import org.fudaa.dodico.crue.metier.emh.OrdRes;
+import org.fudaa.dodico.crue.metier.emh.OrdResBrancheBarrageFilEau;
+import org.fudaa.dodico.crue.metier.emh.OrdResBrancheBarrageGenerique;
+import org.fudaa.dodico.crue.metier.emh.OrdResBrancheOrifice;
+import org.fudaa.dodico.crue.metier.emh.OrdResBranchePdc;
+import org.fudaa.dodico.crue.metier.emh.OrdResBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.OrdResBrancheSeuilLateral;
+import org.fudaa.dodico.crue.metier.emh.OrdResBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.metier.emh.OrdResBrancheStrickler;
+import org.fudaa.dodico.crue.metier.emh.OrdResCasierProfil;
+import org.fudaa.dodico.crue.metier.emh.OrdResNoeudNiveauContinu;
+import org.fudaa.dodico.crue.metier.emh.OrdResScenario;
+import org.fudaa.dodico.crue.metier.emh.OrdResSectionIdem;
+import org.fudaa.dodico.crue.metier.emh.OrdResSectionInterpolee;
+import org.fudaa.dodico.crue.metier.emh.OrdResSectionProfil;
+import org.fudaa.dodico.crue.metier.emh.OrdResSectionSansGeometrie;
/**
* Classe qui se charge de remplir les structures DAO du fichier ORES avec les donnees metier et inversement.
@@ -28,161 +44,166 @@
final OrdResScenario metier = new OrdResScenario();
- // Noeuds
- if (dao.OrdResNoeuds == null || dao.OrdResNoeuds.size() == 0) {
- CrueHelper.emhEmpty("Noeuds", analyser);
- } else {
- final NoeudNiveauContinuPersist eltPersist = dao.OrdResNoeuds.get(0);
- final OrdResNoeudNiveauContinu eltMetier = new OrdResNoeudNiveauContinu();
- eltMetier.setDdeZ(eltPersist.DdeZ);
- eltMetier.setDdeHmin(eltPersist.DdeHmin);
- eltMetier.setDdeHmax(eltPersist.DdeHmax);
- metier.setOrdResNoeudNiveauContinu(eltMetier);
- }
+ try {
+ // Noeuds
+ if (dao.OrdResNoeuds == null || dao.OrdResNoeuds.size() == 0) {
+ CrueHelper.emhEmpty("Noeuds", analyser);
+ } else {
+ // final NoeudNiveauContinuPersist eltPersist = dao.OrdResNoeuds.get(0);
+ // final OrdResNoeudNiveauContinu eltMetier = new OrdResNoeudNiveauContinu();
+ // eltMetier.setDdeZ(eltPersist.DdeZ);
+ // eltMetier.setDdeHmin(eltPersist.DdeHmin);
+ // eltMetier.setDdeHmax(eltPersist.DdeHmax);
+ metier.setOrdResNoeudNiveauContinu((OrdResNoeudNiveauContinu) dao.OrdResNoeuds.get(0).clone());
+ }
- // Casiers
- if (dao.OrdResCasiers == null || dao.OrdResCasiers.size() == 0) {
- CrueHelper.emhEmpty("Casiers", analyser);
- } else {
- for (final CasierAbstractPersist eltPersist : dao.OrdResCasiers) {
- if (eltPersist instanceof CasierProfilPersist) {
+ // Casiers
+ if (dao.OrdResCasiers == null || dao.OrdResCasiers.size() == 0) {
+ CrueHelper.emhEmpty("Casiers", analyser);
+ } else {
+ for (final OrdRes eltPersist : dao.OrdResCasiers) {
+ if (eltPersist instanceof OrdResCasierProfil) {
- final CasierProfilPersist eltPersistCaste = (CasierProfilPersist) eltPersist;
- final OrdResCasierProfil eltMetier = new OrdResCasierProfil();
- eltMetier.setDdeSplan(eltPersistCaste.DdeSplan);
- eltMetier.setDdeVol(eltPersistCaste.DdeVol);
- metier.setOrdResCasierProfil(eltMetier);
+ // final CasierProfilPersist eltPersistCaste = (CasierProfilPersist) eltPersist;
+ // final OrdResCasierProfil eltMetier = new OrdResCasierProfil();
+ // eltMetier.setDdeSplan(eltPersistCaste.DdeSplan);
+ // eltMetier.setDdeVol(eltPersistCaste.DdeVol);
+ metier.setOrdResCasierProfil((OrdResCasierProfil) eltPersist.clone());
- // } else if (eltPersist instanceof CasierMNTPersist) {
+ // } else if (eltPersist instanceof CasierMNTPersist) {
+ }
}
}
- }
- // Sections
- if (dao.OrdResSections == null || dao.OrdResSections.size() == 0) {
- CrueHelper.emhEmpty("Sections", analyser);
- } else {
- for (final SectionAbstractPersist eltPersist : dao.OrdResSections) {
- if (eltPersist instanceof SectionProfilPersist) {
+ // Sections
+ if (dao.OrdResSections == null || dao.OrdResSections.size() == 0) {
+ CrueHelper.emhEmpty("Sections", analyser);
+ } else {
+ for (final OrdRes eltPersist : dao.OrdResSections) {
+ if (eltPersist instanceof OrdResSectionProfil) {
+ //
+ // final SectionProfilPersist eltPersistCaste = (SectionProfilPersist) eltPersist;
+ // final OrdResSectionProfil eltMetier = new OrdResSectionProfil();
+ // eltMetier.setDdeQ(eltPersistCaste.DdeQ);
+ // eltMetier.setDdeZ(eltPersistCaste.DdeZ);
+ // eltMetier.setDdeH(eltPersistCaste.DdeH);
+ // eltMetier.setDdeZf(eltPersistCaste.DdeZf);
+ // eltMetier.setDdeZc(eltPersistCaste.DdeZc);
+ // eltMetier.setDdeZn(eltPersistCaste.DdeZn);
+ // eltMetier.setDdeYc(eltPersistCaste.DdeYc);
+ // eltMetier.setDdeYn(eltPersistCaste.DdeYn);
+ // eltMetier.setDdeVact(eltPersistCaste.DdeVact);
+ // eltMetier.setDdeVtot(eltPersistCaste.DdeVtot);
+ // eltMetier.setDdeVc(eltPersistCaste.DdeVc);
+ // eltMetier.setDdeFr(eltPersistCaste.DdeFr);
+ // eltMetier.setDdeLact(eltPersistCaste.DdeLact);
+ // eltMetier.setDdeLtot(eltPersistCaste.DdeLtot);
+ // eltMetier.setDdeSact(eltPersistCaste.DdeSact);
+ // eltMetier.setDdeStot(eltPersistCaste.DdeStot);
+ // eltMetier.setDdeDact(eltPersistCaste.DdeDact);
+ // eltMetier.setDdeDtot(eltPersistCaste.DdeDtot);
+ metier.setOrdResSectionProfil((OrdResSectionProfil) eltPersist.clone());
- final SectionProfilPersist eltPersistCaste = (SectionProfilPersist) eltPersist;
- final OrdResSectionProfil eltMetier = new OrdResSectionProfil();
- eltMetier.setDdeQ(eltPersistCaste.DdeQ);
- eltMetier.setDdeZ(eltPersistCaste.DdeZ);
- eltMetier.setDdeH(eltPersistCaste.DdeH);
- eltMetier.setDdeZf(eltPersistCaste.DdeZf);
- eltMetier.setDdeZc(eltPersistCaste.DdeZc);
- eltMetier.setDdeZn(eltPersistCaste.DdeZn);
- eltMetier.setDdeYc(eltPersistCaste.DdeYc);
- eltMetier.setDdeYn(eltPersistCaste.DdeYn);
- eltMetier.setDdeVact(eltPersistCaste.DdeVact);
- eltMetier.setDdeVtot(eltPersistCaste.DdeVtot);
- eltMetier.setDdeVc(eltPersistCaste.DdeVc);
- eltMetier.setDdeFr(eltPersistCaste.DdeFr);
- eltMetier.setDdeLact(eltPersistCaste.DdeLact);
- eltMetier.setDdeLtot(eltPersistCaste.DdeLtot);
- eltMetier.setDdeSact(eltPersistCaste.DdeSact);
- eltMetier.setDdeStot(eltPersistCaste.DdeStot);
- eltMetier.setDdeDact(eltPersistCaste.DdeDact);
- eltMetier.setDdeDtot(eltPersistCaste.DdeDtot);
- metier.setOrdResSectionProfil(eltMetier);
+ } else if (eltPersist instanceof OrdResSectionIdem) {
- } else if (eltPersist instanceof SectionIdemPersist) {
+ // final SectionIdemPersist eltPersistCaste = (SectionIdemPersist) eltPersist;
+ // final OrdResSectionIdem eltMetier = new OrdResSectionIdem();
+ // eltMetier.setDdeQ(eltPersistCaste.DdeQ);
+ // eltMetier.setDdeZ(eltPersistCaste.DdeZ);
+ metier.setOrdResSectionIdem((OrdResSectionIdem) eltPersist.clone());
- final SectionIdemPersist eltPersistCaste = (SectionIdemPersist) eltPersist;
- final OrdResSectionIdem eltMetier = new OrdResSectionIdem();
- eltMetier.setDdeQ(eltPersistCaste.DdeQ);
- eltMetier.setDdeZ(eltPersistCaste.DdeZ);
- metier.setOrdResSectionIdem(eltMetier);
+ } else if (eltPersist instanceof OrdResSectionInterpolee) {
+ //
+ // final SectionInterpoleePersist eltPersistCaste = (SectionInterpoleePersist) eltPersist;
+ // final OrdResSectionInterpolee eltMetier = new OrdResSectionInterpolee();
+ // eltMetier.setDdeQ(eltPersistCaste.DdeQ);
+ // eltMetier.setDdeZ(eltPersistCaste.DdeZ);
+ metier.setOrdResSectionInterpolee((OrdResSectionInterpolee) eltPersist.clone());
- } else if (eltPersist instanceof SectionInterpoleePersist) {
+ } else if (eltPersist instanceof OrdResSectionSansGeometrie) {
- final SectionInterpoleePersist eltPersistCaste = (SectionInterpoleePersist) eltPersist;
- final OrdResSectionInterpolee eltMetier = new OrdResSectionInterpolee();
- eltMetier.setDdeQ(eltPersistCaste.DdeQ);
- eltMetier.setDdeZ(eltPersistCaste.DdeZ);
- metier.setOrdResSectionInterpolee(eltMetier);
-
- } else if (eltPersist instanceof SectionSansGeometriePersist) {
-
- final SectionSansGeometriePersist eltPersistCaste = (SectionSansGeometriePersist) eltPersist;
- final OrdResSectionSansGeometrie eltMetier = new OrdResSectionSansGeometrie();
- eltMetier.setDdeQ(eltPersistCaste.DdeQ);
- eltMetier.setDdeZ(eltPersistCaste.DdeZ);
- metier.setOrdResSectionSansGeometrie(eltMetier);
+ // final SectionSansGeometriePersist eltPersistCaste = (SectionSansGeometriePersist) eltPersist;
+ // final OrdResSectionSansGeometrie eltMetier = new OrdResSectionSansGeometrie();
+ // eltMetier.setDdeQ(eltPersistCaste.DdeQ);
+ // eltMetier.setDdeZ(eltPersistCaste.DdeZ);
+ metier.setOrdResSectionSansGeometrie((OrdResSectionSansGeometrie) eltPersist.clone());
+ }
}
}
- }
- // Branches
- if (dao.OrdResBranches == null || dao.OrdResBranches.size() == 0) {
- CrueHelper.emhEmpty("Branches", analyser);
- } else {
- for (final BrancheAbstractPersist eltPersist : dao.OrdResBranches) {
- if (eltPersist instanceof BranchePdcPersist) {
+ // Branches
+ if (dao.OrdResBranches == null || dao.OrdResBranches.size() == 0) {
+ CrueHelper.emhEmpty("Branches", analyser);
+ } else {
+ for (final OrdRes eltPersist : dao.OrdResBranches) {
+ if (eltPersist instanceof OrdResBranchePdc) {
- final BranchePdcPersist eltPersistCaste = (BranchePdcPersist) eltPersist;
- final OrdResBranchePdc eltMetier = new OrdResBranchePdc();
- eltMetier.setDdeDz(eltPersistCaste.DdeDz);
- metier.setOrdResBranchePdc(eltMetier);
+ // final BranchePdcPersist eltPersistCaste = (BranchePdcPersist) eltPersist;
+ // final OrdResBranchePdc eltMetier = new OrdResBranchePdc();
+ // eltMetier.setDdeDz(eltPersistCaste.DdeDz);
+ metier.setOrdResBranchePdc((OrdResBranchePdc) eltPersist.clone());
- } else if (eltPersist instanceof BrancheSeuilTransversalPersist) {
+ } else if (eltPersist instanceof OrdResBrancheSeuilTransversal) {
- final BrancheSeuilTransversalPersist eltPersistCaste = (BrancheSeuilTransversalPersist) eltPersist;
- final OrdResBrancheSeuilTransversal eltMetier = new OrdResBrancheSeuilTransversal();
- eltMetier.setDdeRegime(eltPersistCaste.DdeRegime);
- metier.setOrdResBrancheSeuilTransversal(eltMetier);
+ // final BrancheSeuilTransversalPersist eltPersistCaste = (BrancheSeuilTransversalPersist) eltPersist;
+ // final OrdResBrancheSeuilTransversal eltMetier = new OrdResBrancheSeuilTransversal();
+ // eltMetier.setDdeRegime(eltPersistCaste.DdeRegime);
+ metier.setOrdResBrancheSeuilTransversal((OrdResBrancheSeuilTransversal) eltPersist);
- } else if (eltPersist instanceof BrancheSeuilLateralPersist) {
+ } else if (eltPersist instanceof OrdResBrancheSeuilLateral) {
- final BrancheSeuilLateralPersist eltPersistCaste = (BrancheSeuilLateralPersist) eltPersist;
- final OrdResBrancheSeuilLateral eltMetier = new OrdResBrancheSeuilLateral();
- eltMetier.setDdeRegime(eltPersistCaste.DdeRegime);
- metier.setOrdResBrancheSeuilLateral(eltMetier);
+ // final BrancheSeuilLateralPersist eltPersistCaste = (BrancheSeuilLateralPersist) eltPersist;
+ // final OrdResBrancheSeuilLateral eltMetier = new OrdResBrancheSeuilLateral();
+ // eltMetier.setDdeRegime(eltPersistCaste.DdeRegime);
+ metier.setOrdResBrancheSeuilLateral((OrdResBrancheSeuilLateral) eltPersist.clone());
- } else if (eltPersist instanceof BrancheOrificePersist) {
+ } else if (eltPersist instanceof OrdResBrancheOrifice) {
- final BrancheOrificePersist eltPersistCaste = (BrancheOrificePersist) eltPersist;
- final OrdResBrancheOrifice eltMetier = new OrdResBrancheOrifice();
- eltMetier.setDdeRegime(eltPersistCaste.DdeRegime);
- eltMetier.setDdeCoefCtr(eltPersistCaste.DdeCoefCtr);
- eltMetier.setDdeOuv(eltPersistCaste.DdeOuv);
- metier.setOrdResBrancheOrifice(eltMetier);
+ // final BrancheOrificePersist eltPersistCaste = (BrancheOrificePersist) eltPersist;
+ // final OrdResBrancheOrifice eltMetier = new OrdResBrancheOrifice();
+ // eltMetier.setDdeRegime(eltPersistCaste.DdeRegime);
+ // eltMetier.setDdeCoefCtr(eltPersistCaste.DdeCoefCtr);
+ // eltMetier.setDdeOuv(eltPersistCaste.DdeOuv);
+ metier.setOrdResBrancheOrifice((OrdResBrancheOrifice) eltPersist.clone());
- } else if (eltPersist instanceof BrancheStricklerPersist) {
+ } else if (eltPersist instanceof OrdResBrancheStrickler) {
+ //
+ // final BrancheStricklerPersist eltPersistCaste = (BrancheStricklerPersist) eltPersist;
+ // final OrdResBrancheStrickler eltMetier = new OrdResBrancheStrickler();
+ // eltMetier.setDdeSplan(eltPersistCaste.DdeSplan);
+ // eltMetier.setDdeVol(eltPersistCaste.DdeVol);
+ metier.setOrdResBrancheStrickler((OrdResBrancheStrickler) eltPersist.clone());
- final BrancheStricklerPersist eltPersistCaste = (BrancheStricklerPersist) eltPersist;
- final OrdResBrancheStrickler eltMetier = new OrdResBrancheStrickler();
- eltMetier.setDdeSplan(eltPersistCaste.DdeSplan);
- eltMetier.setDdeVol(eltPersistCaste.DdeVol);
- metier.setOrdResBrancheStrickler(eltMetier);
+ } else if (eltPersist instanceof OrdResBrancheBarrageGenerique) {
- } else if (eltPersist instanceof BrancheBarrageGeneriquePersist) {
+ // final BrancheBarrageGeneriquePersist eltPersistCaste = (BrancheBarrageGeneriquePersist) eltPersist;
+ // final OrdResBrancheBarrageGenerique eltMetier = new OrdResBrancheBarrageGenerique();
+ // eltMetier.setDdeRegime(eltPersistCaste.DdeRegime);
+ metier.setOrdResBrancheBarrageGenerique((OrdResBrancheBarrageGenerique) eltPersist.clone());
- final BrancheBarrageGeneriquePersist eltPersistCaste = (BrancheBarrageGeneriquePersist) eltPersist;
- final OrdResBrancheBarrageGenerique eltMetier = new OrdResBrancheBarrageGenerique();
- eltMetier.setDdeRegime(eltPersistCaste.DdeRegime);
- metier.setOrdResBrancheBarrageGenerique(eltMetier);
+ } else if (eltPersist instanceof OrdResBrancheBarrageFilEau) {
+ //
+ // final BrancheBarrageFilEauPersist eltPersistCaste = (BrancheBarrageFilEauPersist) eltPersist;
+ // final OrdResBrancheBarrageFilEau eltMetier = new OrdResBrancheBarrageFilEau();
+ // eltMetier.setDdeRegime(eltPersistCaste.DdeRegime);
+ metier.setOrdResBrancheBarrageFilEau((OrdResBrancheBarrageFilEau) eltPersist.clone());
- } else if (eltPersist instanceof BrancheBarrageFilEauPersist) {
+ } else if (eltPersist instanceof OrdResBrancheSaintVenant) {
+ //
+ // final BrancheSaintVenantPersist eltPersistCaste = (BrancheSaintVenantPersist) eltPersist;
+ // final OrdResBrancheSaintVenant eltMetier = new OrdResBrancheSaintVenant();
+ // eltMetier.setDdeQlat(eltPersistCaste.DdeQlat);
+ // eltMetier.setDdeSplan(eltPersistCaste.DdeSplan);
+ // eltMetier.setDdeVol(eltPersistCaste.DdeVol);
+ metier.setOrdResBrancheSaintVenant((OrdResBrancheSaintVenant) eltPersist.clone());
- final BrancheBarrageFilEauPersist eltPersistCaste = (BrancheBarrageFilEauPersist) eltPersist;
- final OrdResBrancheBarrageFilEau eltMetier = new OrdResBrancheBarrageFilEau();
- eltMetier.setDdeRegime(eltPersistCaste.DdeRegime);
- metier.setOrdResBrancheBarrageFilEau(eltMetier);
-
- } else if (eltPersist instanceof BrancheSaintVenantPersist) {
-
- final BrancheSaintVenantPersist eltPersistCaste = (BrancheSaintVenantPersist) eltPersist;
- final OrdResBrancheSaintVenant eltMetier = new OrdResBrancheSaintVenant();
- eltMetier.setDdeQlat(eltPersistCaste.DdeQlat);
- eltMetier.setDdeSplan(eltPersistCaste.DdeSplan);
- eltMetier.setDdeVol(eltPersistCaste.DdeVol);
- metier.setOrdResBrancheSaintVenant(eltMetier);
-
- // } else if (eltPersist instanceof BrancheEnchainementPersist) {
+ // } else if (eltPersist instanceof BrancheEnchainementPersist) {
+ }
}
}
+ } catch (CloneNotSupportedException e) {
+ FuLogCrue.error(e);
+
}
if (dataLinked != null) {
dataLinked.setOrdRes(metier);
@@ -198,135 +219,135 @@
final CrueDaoORES res = new CrueDaoORES();
- res.OrdResNoeuds = new ArrayList<NoeudNiveauContinuPersist>();
- res.OrdResCasiers = new ArrayList<CasierAbstractPersist>();
- res.OrdResSections = new ArrayList<SectionAbstractPersist>();
- res.OrdResBranches = new ArrayList<BrancheAbstractPersist>();
+ res.OrdResNoeuds = new ArrayList<OrdRes>();
+ res.OrdResCasiers = new ArrayList<OrdRes>();
+ res.OrdResSections = new ArrayList<OrdRes>();
+ res.OrdResBranches = new ArrayList<OrdRes>();
final OrdResNoeudNiveauContinu noeudNivContinu = metier.getOrdResNoeudNiveauContinu();
if (noeudNivContinu != null) {
- final NoeudNiveauContinuPersist eltPersist = new NoeudNiveauContinuPersist();
- eltPersist.DdeZ = noeudNivContinu.getDdeZ();
- eltPersist.DdeHmin = noeudNivContinu.getDdeHmin();
- eltPersist.DdeHmax = noeudNivContinu.getDdeHmax();
- res.OrdResNoeuds.add(eltPersist);
+ // final NoeudNiveauContinuPersist eltPersist = new NoeudNiveauContinuPersist();
+ // eltPersist.DdeZ = noeudNivContinu.getDdeZ();
+ // eltPersist.DdeHmin = noeudNivContinu.getDdeHmin();
+ // eltPersist.DdeHmax = noeudNivContinu.getDdeHmax();
+ res.OrdResNoeuds.add(noeudNivContinu);
}
final OrdResCasierProfil casierProfil = metier.getOrdResCasierProfil();
if (casierProfil != null) {
- final CasierProfilPersist eltPersist = new CasierProfilPersist();
- eltPersist.DdeSplan = casierProfil.getDdeSplan();
- eltPersist.DdeVol = casierProfil.getDdeVol();
- res.OrdResCasiers.add(eltPersist);
+ // final CasierProfilPersist eltPersist = new CasierProfilPersist();
+ // eltPersist.DdeSplan = casierProfil.getDdeSplan();
+ // eltPersist.DdeVol = casierProfil.getDdeVol();
+ res.OrdResCasiers.add(casierProfil);
}
final OrdResSectionProfil sectionProfil = metier.getOrdResSectionProfil();
if (sectionProfil != null) {
- final SectionProfilPersist eltPersist = new SectionProfilPersist();
- eltPersist.DdeQ = sectionProfil.getDdeQ();
- eltPersist.DdeZ = sectionProfil.getDdeZ();
- eltPersist.DdeH = sectionProfil.getDdeH();
- eltPersist.DdeZf = sectionProfil.getDdeZf();
- eltPersist.DdeZc = sectionProfil.getDdeZc();
- eltPersist.DdeZn = sectionProfil.getDdeZn();
- eltPersist.DdeYc = sectionProfil.getDdeYc();
- eltPersist.DdeYn = sectionProfil.getDdeYn();
- eltPersist.DdeVact = sectionProfil.getDdeVact();
- eltPersist.DdeVtot = sectionProfil.getDdeVtot();
- eltPersist.DdeVc = sectionProfil.getDdeVc();
- eltPersist.DdeFr = sectionProfil.getDdeFr();
- eltPersist.DdeLact = sectionProfil.getDdeLact();
- eltPersist.DdeLtot = sectionProfil.getDdeLtot();
- eltPersist.DdeSact = sectionProfil.getDdeSact();
- eltPersist.DdeStot = sectionProfil.getDdeStot();
- eltPersist.DdeDact = sectionProfil.getDdeDact();
- eltPersist.DdeDtot = sectionProfil.getDdeDtot();
- res.OrdResSections.add(eltPersist);
+ // final SectionProfilPersist eltPersist = new SectionProfilPersist();
+ // eltPersist.DdeQ = sectionProfil.getDdeQ();
+ // eltPersist.DdeZ = sectionProfil.getDdeZ();
+ // eltPersist.DdeH = sectionProfil.getDdeH();
+ // eltPersist.DdeZf = sectionProfil.getDdeZf();
+ // eltPersist.DdeZc = sectionProfil.getDdeZc();
+ // eltPersist.DdeZn = sectionProfil.getDdeZn();
+ // eltPersist.DdeYc = sectionProfil.getDdeYc();
+ // eltPersist.DdeYn = sectionProfil.getDdeYn();
+ // eltPersist.DdeVact = sectionProfil.getDdeVact();
+ // eltPersist.DdeVtot = sectionProfil.getDdeVtot();
+ // eltPersist.DdeVc = sectionProfil.getDdeVc();
+ // eltPersist.DdeFr = sectionProfil.getDdeFr();
+ // eltPersist.DdeLact = sectionProfil.getDdeLact();
+ // eltPersist.DdeLtot = sectionProfil.getDdeLtot();
+ // eltPersist.DdeSact = sectionProfil.getDdeSact();
+ // eltPersist.DdeStot = sectionProfil.getDdeStot();
+ // eltPersist.DdeDact = sectionProfil.getDdeDact();
+ // eltPersist.DdeDtot = sectionProfil.getDdeDtot();
+ res.OrdResSections.add(sectionProfil);
}
final OrdResSectionIdem sectionIdem = metier.getOrdResSectionIdem();
if (sectionIdem != null) {
- final SectionIdemPersist eltPersist = new SectionIdemPersist();
- eltPersist.DdeQ = sectionIdem.getDdeQ();
- eltPersist.DdeZ = sectionIdem.getDdeZ();
- res.OrdResSections.add(eltPersist);
+ // final SectionIdemPersist eltPersist = new SectionIdemPersist();
+ // eltPersist.DdeQ = sectionIdem.getDdeQ();
+ // eltPersist.DdeZ = sectionIdem.getDdeZ();
+ res.OrdResSections.add(sectionIdem);
}
final OrdResSectionInterpolee sectionInterpolee = metier.getOrdResSectionInterpolee();
if (sectionInterpolee != null) {
- final SectionInterpoleePersist eltPersist = new SectionInterpoleePersist();
- eltPersist.DdeQ = sectionInterpolee.getDdeQ();
- eltPersist.DdeZ = sectionInterpolee.getDdeZ();
- res.OrdResSections.add(eltPersist);
+ // final SectionInterpoleePersist eltPersist = new SectionInterpoleePersist();
+ // eltPersist.DdeQ = sectionInterpolee.getDdeQ();
+ // eltPersist.DdeZ = sectionInterpolee.getDdeZ();
+ res.OrdResSections.add(sectionInterpolee);
}
final OrdResSectionSansGeometrie sectionSsGeom = metier.getOrdResSectionSansGeometrie();
if (sectionSsGeom != null) {
- final SectionSansGeometriePersist eltPersist = new SectionSansGeometriePersist();
- eltPersist.DdeQ = sectionSsGeom.getDdeQ();
- eltPersist.DdeZ = sectionSsGeom.getDdeZ();
- res.OrdResSections.add(eltPersist);
+ // final SectionSansGeometriePersist eltPersist = new SectionSansGeometriePersist();
+ // eltPersist.DdeQ = sectionSsGeom.getDdeQ();
+ // eltPersist.DdeZ = sectionSsGeom.getDdeZ();
+ res.OrdResSections.add(sectionSsGeom);
}
final OrdResBranchePdc branchePdc = metier.getOrdResBranchePdc();
if (branchePdc != null) {
- final BranchePdcPersist eltPersist = new BranchePdcPersist();
- eltPersist.DdeDz = branchePdc.isDdeDz();
- res.OrdResBranches.add(eltPersist);
+ // final BranchePdcPersist eltPersist = new BranchePdcPersist();
+ // eltPersist.DdeDz = branchePdc.getDdeDz();
+ res.OrdResBranches.add(branchePdc);
}
final OrdResBrancheSeuilTransversal brancheSeuilT = metier.getOrdResBrancheSeuilTransversal();
if (brancheSeuilT != null) {
- final BrancheSeuilTransversalPersist eltPersist = new BrancheSeuilTransversalPersist();
- eltPersist.DdeRegime = brancheSeuilT.getDdeRegime();
- res.OrdResBranches.add(eltPersist);
+ // final BrancheSeuilTransversalPersist eltPersist = new BrancheSeuilTransversalPersist();
+ // eltPersist.DdeRegime = brancheSeuilT.getDdeRegime();
+ res.OrdResBranches.add(brancheSeuilT);
}
final OrdResBrancheSeuilLateral brancheSeuilL = metier.getOrdResBrancheSeuilLateral();
if (brancheSeuilL != null) {
- final BrancheSeuilLateralPersist eltPersist = new BrancheSeuilLateralPersist();
- eltPersist.DdeRegime = brancheSeuilL.getDdeRegime();
- res.OrdResBranches.add(eltPersist);
+ // final BrancheSeuilLateralPersist eltPersist = new BrancheSeuilLateralPersist();
+ // eltPersist.DdeRegime = brancheSeuilL.getDdeRegime();
+ res.OrdResBranches.add(brancheSeuilL);
}
final OrdResBrancheOrifice brancheOrifice = metier.getOrdResBrancheOrifice();
if (brancheOrifice != null) {
- final BrancheOrificePersist eltPersist = new BrancheOrificePersist();
- eltPersist.DdeRegime = brancheOrifice.isDdeRegime();
- eltPersist.DdeCoefCtr = brancheOrifice.isDdeCoefCtr();
- eltPersist.DdeOuv = brancheOrifice.isDdeOuv();
- res.OrdResBranches.add(eltPersist);
+ // final BrancheOrificePersist eltPersist = new BrancheOrificePersist();
+ // eltPersist.DdeRegime = brancheOrifice.getDdeRegime();
+ // eltPersist.DdeCoefCtr = brancheOrifice.getDdeCoefCtr();
+ // eltPersist.DdeOuv = brancheOrifice.getDdeOuv();
+ res.OrdResBranches.add(brancheOrifice);
}
final OrdResBrancheStrickler brancheStric = metier.getOrdResBrancheStrickler();
if (brancheStric != null) {
- final BrancheStricklerPersist eltPersist = new BrancheStricklerPersist();
- eltPersist.DdeSplan = brancheStric.getDdeSplan();
- eltPersist.DdeVol = brancheStric.getDdeVol();
- res.OrdResBranches.add(eltPersist);
+ // final BrancheStricklerPersist eltPersist = new BrancheStricklerPersist();
+ // eltPersist.DdeSplan = brancheStric.getDdeSplan();
+ // eltPersist.DdeVol = brancheStric.getDdeVol();
+ res.OrdResBranches.add(brancheStric);
}
final OrdResBrancheBarrageGenerique brancheBarrageG = metier.getOrdResBrancheBarrageGenerique();
if (brancheBarrageG != null) {
- final BrancheBarrageGeneriquePersist eltPersist = new BrancheBarrageGeneriquePersist();
- eltPersist.DdeRegime = brancheBarrageG.isDdeRegime();
- res.OrdResBranches.add(eltPersist);
+ // final BrancheBarrageGeneriquePersist eltPersist = new BrancheBarrageGeneriquePersist();
+ // eltPersist.DdeRegime = brancheBarrageG.getDdeRegime();
+ res.OrdResBranches.add(brancheBarrageG);
}
final OrdResBrancheBarrageFilEau brancheBarrageFil = metier.getOrdResBrancheBarrageFilEau();
if (brancheBarrageFil != null) {
- final BrancheBarrageFilEauPersist eltPersist = new BrancheBarrageFilEauPersist();
- eltPersist.DdeRegime = brancheBarrageFil.isDdeRegime();
- res.OrdResBranches.add(eltPersist);
+ // final BrancheBarrageFilEauPersist eltPersist = new BrancheBarrageFilEauPersist();
+ // eltPersist.DdeRegime = brancheBarrageFil.getDdeRegime();
+ res.OrdResBranches.add(brancheBarrageFil);
}
final OrdResBrancheSaintVenant brancheStVenant = metier.getOrdResBrancheSaintVenant();
if (brancheStVenant != null) {
- final BrancheSaintVenantPersist eltPersist = new BrancheSaintVenantPersist();
- eltPersist.DdeQlat = brancheStVenant.getDdeQlat();
- eltPersist.DdeSplan = brancheStVenant.getDdeSplan();
- eltPersist.DdeVol = brancheStVenant.getDdeVol();
- res.OrdResBranches.add(eltPersist);
+ // final BrancheSaintVenantPersist eltPersist = new BrancheSaintVenantPersist();
+ // eltPersist.DdeQlat = brancheStVenant.getDdeQlat();
+ // eltPersist.DdeSplan = brancheStVenant.getDdeSplan();
+ // eltPersist.DdeVol = brancheStVenant.getDdeVol();
+ res.OrdResBranches.add(brancheStVenant);
}
if (res.OrdResCasiers.isEmpty()) {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoORES.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoORES.java 2010-03-06 01:30:55 UTC (rev 5705)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoORES.java 2010-03-08 00:27:31 UTC (rev 5706)
@@ -5,10 +5,7 @@
import java.util.List;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureORES.BrancheAbstractPersist;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureORES.CasierAbstractPersist;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureORES.NoeudNiveauContinuPersist;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureORES.SectionAbstractPersist;
+import org.fudaa.dodico.crue.metier.emh.OrdRes;
/**
* Classe persistante qui reprend la meme structure que le fichier XML ORES - Fichier des donnees portant sur les
@@ -20,12 +17,12 @@
public class CrueDaoORES extends AbstractCrueDao {
/** Représente la balise portant le même nom dans le fichier XML */
- public List<NoeudNiveauContinuPersist> OrdResNoeuds;
+ public List<OrdRes> OrdResNoeuds;
/** Représente la balise portant le même nom dans le fichier XML */
- public List<CasierAbstractPersist> OrdResCasiers;
+ public List<OrdRes> OrdResCasiers;
/** Représente la balise portant le même nom dans le fichier XML */
- public List<SectionAbstractPersist> OrdResSections;
+ public List<OrdRes> OrdResSections;
/** Représente la balise portant le même nom dans le fichier XML */
- public List<BrancheAbstractPersist> OrdResBranches;
+ public List<OrdRes> OrdResBranches;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureORES.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureORES.java 2010-03-06 01:30:55 UTC (rev 5705)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureORES.java 2010-03-08 00:27:31 UTC (rev 5706)
@@ -3,10 +3,30 @@
*/
package org.fudaa.dodico.crue.io.dao;
+import java.beans.PropertyDescriptor;
+import java.util.ArrayList;
+import java.util.List;
+
import com.thoughtworks.xstream.XStream;
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.common.CrueFileType;
+import org.fudaa.dodico.crue.metier.emh.OrdResBrancheBarrageFilEau;
+import org.fudaa.dodico.crue.metier.emh.OrdResBrancheBarrageGenerique;
+import org.fudaa.dodico.crue.metier.emh.OrdResBrancheOrifice;
+import org.fudaa.dodico.crue.metier.emh.OrdResBranchePdc;
+import org.fudaa.dodico.crue.metier.emh.OrdResBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.OrdResBrancheSeuilLateral;
+import org.fudaa.dodico.crue.metier.emh.OrdResBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.metier.emh.OrdResBrancheStrickler;
+import org.fudaa.dodico.crue.metier.emh.OrdResCasierProfil;
+import org.fudaa.dodico.crue.metier.emh.OrdResNoeudNiveauContinu;
+import org.fudaa.dodico.crue.metier.emh.OrdResSectionIdem;
+import org.fudaa.dodico.crue.metier.emh.OrdResSectionInterpolee;
+import org.fudaa.dodico.crue.metier.emh.OrdResSectionProfil;
+import org.fudaa.dodico.crue.metier.emh.OrdResSectionSansGeometrie;
import org.fudaa.dodico.crue.property.CrueProperties;
/**
@@ -21,23 +41,52 @@
xstream.alias(CrueFileType.ORES.toString(), CrueDaoORES.class);
- xstream.alias("OrdResNoeudNiveauContinu", NoeudNiveauContinuPersist.class);
- xstream.alias("OrdResCasierProfil", CasierProfilPersist.class);
- xstream.alias("OrdResCasierMNT", CasierMNTPersist.class);
- xstream.alias("OrdResSectionProfil", SectionProfilPersist.class);
- xstream.alias("OrdResSectionIdem", SectionIdemPersist.class);
- xstream.alias("OrdResSectionInterpolee", SectionInterpoleePersist.class);
- xstream.alias("OrdResSectionSansGeometrie", SectionSansGeometriePersist.class);
- xstream.alias("OrdResBranchePdc", BranchePdcPersist.class);
- xstream.alias("OrdResBrancheSeuilTransversal", BrancheSeuilTransversalPersist.class);
- xstream.alias("OrdResBrancheSeuilLateral", BrancheSeuilLateralPersist.class);
- xstream.alias("OrdResBrancheOrifice", BrancheOrificePersist.class);
- xstream.alias("OrdResBrancheStrickler", BrancheStricklerPersist.class);
- xstream.alias("OrdResBrancheBarrageGenerique", BrancheBarrageGeneriquePersist.class);
- xstream.alias("OrdResBrancheBarrageFilEau", BrancheBarrageFilEauPersist.class);
- xstream.alias("OrdResBrancheSaintVenant", BrancheSaintVenantPersist.class);
- xstream.alias("OrdResBrancheNiveauxAssocies", BrancheNiveauxAssociesPersist.class);
- xstream.alias("OrdResBrancheEnchainement", BrancheEnchainementPersist.class);
+ // xstream.alias("OrdResNoeudNiveauContinu", NoeudNiveauContinuPersist.class);
+ // xstream.alias("OrdResCasierProfil", CasierProfilPersist.class);
+ // xstream.alias("OrdResCasierMNT", CasierMNTPersist.class);
+ // xstream.alias("OrdResSectionProfil", SectionProfilPersist.class);
+ // xstream.alias("OrdResSectionIdem", SectionIdemPersist.class);
+ // xstream.alias("OrdResSectionInterpolee", SectionInterpoleePersist.class);
+ // xstream.alias("OrdResSectionSansGeometrie", SectionSansGeometriePersist.class);
+ // xstream.alias("OrdResBranchePdc", BranchePdcPersist.class);
+ // xstream.alias("OrdResBrancheSeuilTransversal", BrancheSeuilTransversalPersist.class);
+ // xstream.alias("OrdResBrancheSeuilLateral", BrancheSeuilLateralPersist.class);
+ // xstream.alias("OrdResBrancheOrifice", BrancheOrificePersist.class);
+ // xstream.alias("OrdResBrancheStrickler", BrancheStricklerPersist.class);
+ // xstream.alias("OrdResBrancheBarrageGenerique", BrancheBarrageGeneriquePersist.class);
+ // xstream.alias("OrdResBrancheBarrageFilEau", BrancheBarrageFilEauPersist.class);
+ // xstream.alias("OrdResBrancheSaintVenant", BrancheSaintVenantPersist.class);
+ // xstream.alias("OrdResBrancheNiveauxAssocies", BrancheNiveauxAssociesPersist.class);
+ // xstream.alias("OrdResBrancheEnchainement", BrancheEnchainementPersist.class);
+ List<Class> ordres = new ArrayList<Class>();
+ ordres.add(OrdResNoeudNiveauContinu.class);
+ ordres.add(OrdResCasierProfil.class);
+ ordres.add(OrdResSectionProfil.class);
+ ordres.add(OrdResSectionIdem.class);
+ ordres.add(OrdResSectionInterpolee.class);
+ ordres.add(OrdResSectionSansGeometrie.class);
+ ordres.add(OrdResBranchePdc.class);
+ ordres.add(OrdResBrancheSeuilTransversal.class);
+ ordres.add(OrdResBrancheSeuilLateral.class);
+ ordres.add(OrdResBrancheOrifice.class);
+ ordres.add(OrdResBrancheStrickler.class);
+ ordres.add(OrdResBrancheBarrageGenerique.class);
+ ordres.add(OrdResBrancheBarrageFilEau.class);
+ ordres.add(OrdResBrancheSaintVenant.class);
+ for (Class ordClass : ordres) {
+ xstream.alias(ordClass.getSimpleName(), ordClass);
+ PropertyDescriptor[] propertyDescriptors = PropertyUtils.getPropertyDescriptors(ordClass);
+ for (PropertyDescriptor descriptor : propertyDescriptors) {
+ String name = descriptor.getName();
+ if (name.startsWith("dde")) {
+ xstream.aliasField(StringUtils.capitalize(name), ordClass, name);
+ } else {
+ xstream.omitField(ordClass, name);
+ }
+
+ }
+
+ }
}
/**
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/CrueIODico.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/CrueIODico.java 2010-03-06 01:30:55 UTC (rev 5705)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/CrueIODico.java 2010-03-08 00:27:31 UTC (rev 5706)
@@ -151,6 +151,8 @@
CARTE_DH.add(TOL_Z_INIT);
cartesBranche.add(BRANCHE_TYPE);
+ cartesBranche.add("ZIMPO");
+ cartesBranche.add("DZ/Q");
cartesBranche.add(BRANCHE_DISTANCE);
cartesBranche.add(BRANCHE_PROF);
cartesBranche.add(BRANCHE_DISTMAX);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java 2010-03-06 01:30:55 UTC (rev 5705)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java 2010-03-08 00:27:31 UTC (rev 5706)
@@ -1988,7 +1988,9 @@
readCasiers(metier);
} else {
- analyze_.addFatalError("io.dc.carteNotRecognized", in_.getLineNumber(), element);
+ if (StringUtils.isNotBlank(element)) {
+ analyze_.addFatalError("io.dc.carteNotRecognized", in_.getLineNumber(), element);
+ }
// return null;
lireSuite();
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBSequentialReader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBSequentialReader.java 2010-03-06 01:30:55 UTC (rev 5705)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBSequentialReader.java 2010-03-08 00:27:31 UTC (rev 5706)
@@ -19,6 +19,7 @@
import org.fudaa.dodico.crue.metier.emh.EMH;
import org.fudaa.dodico.crue.metier.emh.EnumInfosEMH;
import org.fudaa.dodico.crue.metier.emh.InfosEMH;
+import org.fudaa.dodico.crue.metier.emh.ResCalcul;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -341,8 +342,9 @@
* @return le resultat lu
* @throws IOException
*/
- public R read(final int idxPdt, final R inout) throws IOException {
- return entete.read(idxPdt, position, inout);
+ public ResCalcul read(final int idxPdt, final R inout) throws IOException {
+ R read = entete.read(idxPdt, position, inout);
+ return read == null ? null : read.createRes(emh);
}
/**
@@ -350,8 +352,9 @@
* @return
* @throws IOException
*/
- public R read(final int idxPdt) throws IOException {
- return entete.read(idxPdt, position, null);
+ public ResCalcul read(final int idxPdt) throws IOException {
+ R read = entete.read(idxPdt, position, null);
+ return read == null ? null : read.createRes(emh);
}
public void setEmh(EMH emh) {}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBValueObject.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBValueObject.java 2010-03-06 01:30:55 UTC (rev 5705)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBValueObject.java 2010-03-08 00:27:31 UTC (rev 5706)
@@ -2,6 +2,19 @@
import java.nio.ByteBuffer;
+import org.fudaa.dodico.crue.metier.emh.AbstractResCalSection;
+import org.fudaa.dodico.crue.metier.emh.EMH;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionIdem;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionInterpolee;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionSansGeometrie;
+import org.fudaa.dodico.crue.metier.emh.ResCalBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.ResCalCasierProfil;
+import org.fudaa.dodico.crue.metier.emh.ResCalSectionIdem;
+import org.fudaa.dodico.crue.metier.emh.ResCalSectionInterpolee;
+import org.fudaa.dodico.crue.metier.emh.ResCalSectionProfil;
+import org.fudaa.dodico.crue.metier.emh.ResCalSectionSansGeometrie;
+import org.fudaa.dodico.crue.metier.emh.ResCalcul;
+
/**
* @author denf01a
* @creation 27 mai 2009
@@ -11,6 +24,8 @@
public static abstract class AbstractRes {
protected abstract void read(ByteBuffer buf);
+
+ protected abstract ResCalcul createRes(EMH emhDest);
}
/**
@@ -131,6 +146,17 @@
}
+ @Override
+ public ResCalcul createRes(EMH emhDest) {
+ ResCalBrancheSaintVenant res = new ResCalBrancheSaintVenant();
+ res.setSplanMin(su1bra);
+ res.setSplanMaj(su2bra);
+ res.setSplanSto(su4bra);
+ res.setVol(volbra);
+ return res;
+
+ }
+
/**
* @return surface du lit mineur de la branche ib r4
*/
@@ -190,7 +216,14 @@
qcas = buf.getFloat();
scas = buf.getFloat();
vcas = buf.getFloat();
+ }
+ @Override
+ protected ResCalcul createRes(EMH emhDest) {
+ ResCalCasierProfil res = new ResCalCasierProfil();
+ res.setSplan(scas);
+ res.setVol(vcas);
+ return res;
}
/**
@@ -254,7 +287,26 @@
stot = bf.getFloat();
vit = bf.getFloat();
vcrit = bf.getFloat();
+ }
+ @Override
+ protected ResCalcul createRes(EMH emhDest) {
+ AbstractResCalSection res;
+ if (emhDest instanceof EMHSectionIdem) {
+ res = new ResCalSectionIdem();
+ } else if (emhDest instanceof EMHSectionInterpolee) {
+ res = new ResCalSectionInterpolee();
+ } else if (emhDest instanceof EMHSectionSansGeometrie) {
+ res = new ResCalSectionSansGeometrie();
+ } else {
+ res = new ResCalSectionProfil();
+ }
+ res.setStot(stot);
+ res.setVact(vit);
+ res.setVc(vcrit);
+ res.setZ(ccz);
+ res.setQ(ccq);
+ return res;
}
/**
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHContainer.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodi...
[truncated message content] |
