Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4807] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2009-05-27 01:09:35
|
Revision: 4807
http://fudaa.svn.sourceforge.net/fudaa/?rev=4807&view=rev
Author: deniger
Date: 2009-05-27 01:09:20 +0000 (Wed, 27 May 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/.pmd
trunk/soft/fudaa-crue/dodico/pmd.xml
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractDaoLoi.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDLHY.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructure.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDCLM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDLHY.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureETU.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOPTG.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/dao/CrueDaoStructurePCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructurePNUM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueXmlReaderWriterImpl.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/SingleConverterPointFF.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/AbstractCrue9Reader.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/DCFileWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/CrueData.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/CrueDataImpl.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPerm.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermBrancheOrificeManoeuvre.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermBrancheSaintVenantQruis.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermCasierProfilQruis.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermNoeudNiveauContinuQapp.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermNoeudNiveauContinuZimpose.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTrans.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransBrancheOrificeManoeuvre.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransBrancheSaintVenantQruis.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransCasierProfilQruis.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuLimnigramme.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuTarrage.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/DonCLimMScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrt.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheBarrageFilEau.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheBarrageGenerique.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheNiveauxAssocies.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheOrifice.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSaintVenant.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSeuilLateral.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSeuilTransversal.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHCasierProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSectionProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ElemOrifice.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/LoiDF.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/LoiFF.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/LoiHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/EMHValidatorModele.java
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-dclm-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-dcsp-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/MockCrueData.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDC.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDCLMFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDCSPFile.java
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/TestCrueDLHYFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueOCALFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueValidationModele.java
trunk/soft/fudaa-crue/fudaa/.pmd
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/EMHGeneralBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoader.java
trunk/soft/fudaa-crue/src/main/config/pmd.xml
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/AbstractSingleConverter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/EnumsConverter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractCalc.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractCatEMHActivable.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractDonCLimM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractDonCalcSansPrtBrancheQ.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractDonCalcSansPrtBrancheSeuil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractLoi.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermItem.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransItem.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuQapp.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBranchePdc.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumFormulePdc.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumInfosEMH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumLoiExtrapol.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumMethodeInterpolation.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumPositionSection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumSensOrifice.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumSensOuv.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumVariable.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumVerbosite.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/HelperInfosEMH.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AssociationScenarCalculPermanent.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuHydrogramme.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuRegulBarrage.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuRegulUsine.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuRegulUsineBarrage.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuRegulUsineBarrage2.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Calcul.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMBrancheOrifice.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMBrancheSaintVenant.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMCasierProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMNoeudNiveauContinu.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBranchePDC.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtSection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonClimM.java
Modified: trunk/soft/fudaa-crue/.pmd
===================================================================
--- trunk/soft/fudaa-crue/.pmd 2009-05-26 17:48:07 UTC (rev 4806)
+++ trunk/soft/fudaa-crue/.pmd 2009-05-27 01:09:20 UTC (rev 4807)
@@ -236,10 +236,6 @@
<ruleset>Controversial Rules</ruleset>
</rule>
<rule>
- <name>DataflowAnomalyAnalysis</name>
- <ruleset>Controversial Rules</ruleset>
- </rule>
- <rule>
<name>AvoidUsingShortType</name>
<ruleset>Controversial Rules</ruleset>
</rule>
Modified: trunk/soft/fudaa-crue/dodico/pmd.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/pmd.xml 2009-05-26 17:48:07 UTC (rev 4806)
+++ trunk/soft/fudaa-crue/dodico/pmd.xml 2009-05-27 01:09:20 UTC (rev 4807)
@@ -243,6 +243,8 @@
<rule ref="rulesets/design.xml/EmptyMethodInAbstractClassShouldBeAbstract"/>
<rule ref="rulesets/design.xml/SingularField"/>
<rule ref="rulesets/design.xml/ReturnEmptyArrayRatherThanNull"/>
- <rule ref="rulesets/design.xml/AbstractClassWithoutAnyMethod"/>
+ <rule ref="rulesets/design.xml/AbstractClassWithoutAnyMethod">
+ <priority>4</priority>
+ </rule>
<rule ref="rulesets/design.xml/TooFewBranchesForASwitchStatement"/>
</ruleset>
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java 2009-05-26 17:48:07 UTC (rev 4806)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java 2009-05-27 01:09:20 UTC (rev 4807)
@@ -162,6 +162,11 @@
addErrorFromFile(_m, _index);
}
+ public void addFatalError(final String _m, final Object arg) {
+ // TODO a continuer
+ addError(_m);
+ }
+
/**
* Initialise le champ "erreur fatale". Si une erreur fatale a deja ete initialisee, ne fait rien.
*
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java 2009-05-26 17:48:07 UTC (rev 4806)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java 2009-05-27 01:09:20 UTC (rev 4807)
@@ -22,8 +22,8 @@
new CrueXmlReaderWriterImpl<CrueDaoDFRT, List<DonFrt>>(CrueHelper.DFRT, new CrueConverterDFRT(),
new CrueDaoStructureDFRT()));
- private final static Crue10FileFormat<List<Loi>> DLHY = new Crue10FileFormat<List<Loi>>(
- new CrueXmlReaderWriterImpl<CrueDaoDLHY, List<Loi>>(CrueHelper.DLHY, new CrueConverterDLHY(),
+ private final static Crue10FileFormat<List<AbstractLoi>> DLHY = new Crue10FileFormat<List<AbstractLoi>>(
+ new CrueXmlReaderWriterImpl<CrueDaoDLHY, List<AbstractLoi>>(CrueHelper.DLHY, new CrueConverterDLHY(),
new CrueDaoStructureDLHY()));
private final static Crue10FileFormat<CrueData> DPTG = new Crue10FileFormat<CrueData>(
@@ -89,7 +89,7 @@
/**
* @return DLHY : objet CrueFileFormat qui contient le DAO et le métier de DLHY
*/
- public static Crue10FileFormat<List<Loi>> getDLHYFileFormat() {
+ public static Crue10FileFormat<List<AbstractLoi>> getDLHYFileFormat() {
return DLHY;
}
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/AbstractSingleConverter.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/AbstractSingleConverter.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/AbstractSingleConverter.java 2009-05-27 01:09:20 UTC (rev 4807)
@@ -0,0 +1,51 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.io.common;
+
+import com.thoughtworks.xstream.converters.SingleValueConverter;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+
+/**
+ * @author deniger
+ */
+public abstract class AbstractSingleConverter implements SingleValueConverter {
+
+ protected CtuluAnalyze analyse;
+
+ /**
+ *
+ */
+ public AbstractSingleConverter() {
+ super();
+ }
+
+ /**
+ * @return the analyse
+ */
+ public CtuluAnalyze getAnalyse() {
+ return analyse;
+ }
+
+ /**
+ * TODO a continuer pour prendre en compte option
+ *
+ * @param code
+ * @param option
+ */
+ protected void addFatalError(final String code, final Object option) {
+ if (analyse != null) {
+ analyse.addFatalError(code, option);
+ }
+ }
+
+ /**
+ * @param analyse the analyse to set
+ */
+ public final void setAnalyse(final CtuluAnalyze analyse) {
+ this.analyse = analyse;
+ }
+
+}
\ No newline at end of file
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/EnumsConverter.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/EnumsConverter.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/EnumsConverter.java 2009-05-27 01:09:20 UTC (rev 4807)
@@ -0,0 +1,180 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.io.common;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.thoughtworks.xstream.converters.SingleValueConverter;
+
+import org.apache.commons.collections.bidimap.DualHashBidiMap;
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.metier.emh.EnumFormulePdc;
+import org.fudaa.dodico.crue.metier.emh.EnumSensOrifice;
+import org.fudaa.dodico.crue.metier.emh.EnumSensOuv;
+
+/**
+ * Gestion des converter pour les enums
+ *
+ * @author deniger
+ */
+public final class EnumsConverter {
+
+ /**
+ * Code d'erreur a utiliser lorsqu'un enum ne peut etre reconstruit
+ */
+ public static final String CODE_CONVERT_ENUM_ERROR = "io.convert.enum.error";
+
+ private EnumsConverter() {
+
+ }
+
+ protected static class DefaultEnumConverter extends AbstractSingleConverter {
+ /**
+ *
+ */
+
+ private final DualHashBidiMap enumString;
+ private final Class classAccepted;
+
+ /**
+ * @param enumString la map Enum<->String
+ * @param classAccepted la classe de l'enum
+ * @param analyze l'analyze recevant les erreur.
+ */
+ public DefaultEnumConverter(final DualHashBidiMap enumString, final Class classAccepted, final CtuluAnalyze analyze) {
+ super();
+ this.enumString = enumString;
+ this.classAccepted = classAccepted;
+ setAnalyse(analyze);
+ }
+
+ public boolean canConvert(final Class arg0) {
+ return classAccepted.equals(arg0);
+ }
+
+ public Object fromString(final String arg0) {
+ final Object res = enumString.getKey(arg0);
+ if (res == null) {
+ addFatalError(CODE_CONVERT_ENUM_ERROR, arg0);
+ }
+ return res;
+ }
+
+ public String toString(final Object arg0) {
+ final String res = (String) enumString.get(arg0);
+ if (res == null) {
+ addFatalError(CODE_CONVERT_ENUM_ERROR, arg0);
+ }
+ return res;
+
+ }
+
+ }
+
+ private static final Map<Class, DualHashBidiMap> CRUE10_CONVERTER = new HashMap<Class, DualHashBidiMap>();
+ private static final Map<Class, DualHashBidiMap> CRUE9_CONVERTER = new HashMap<Class, DualHashBidiMap>();
+ static {
+ CRUE10_CONVERTER.put(EnumFormulePdc.class, createEnumFormulePdcMap());
+ CRUE9_CONVERTER.put(EnumFormulePdc.class, createEnumFormulePdcMapCrue9());
+ CRUE10_CONVERTER.put(EnumSensOrifice.class, createEnumSensOrificeMap());
+ CRUE9_CONVERTER.put(EnumSensOrifice.class, createEnumSensOrificeMapCrue9());
+ CRUE10_CONVERTER.put(EnumSensOuv.class, createEnumSensOuvMap());
+ CRUE9_CONVERTER.put(EnumSensOuv.class, createEnumSensOuvMapCrue9());
+ }
+
+ /**
+ * a voir pour utiliser une sauvegarde eventuelle.
+ *
+ * @return
+ */
+ private static DualHashBidiMap createEnumFormulePdcMap() {
+ final DualHashBidiMap res = new DualHashBidiMap();
+ res.put(EnumFormulePdc.BORDA, "Borda");
+ res.put(EnumFormulePdc.DIVERGENT, "Divergent");
+ return res;
+ }
+
+ /**
+ * @return une dual map enum<->String pour Crue 9.
+ */
+ private static DualHashBidiMap createEnumFormulePdcMapCrue9() {
+ final DualHashBidiMap res = new DualHashBidiMap();
+ res.put(EnumFormulePdc.BORDA, "1");
+ res.put(EnumFormulePdc.DIVERGENT, "0");
+ return res;
+ }
+
+ /**
+ * @return une dual map enum<->String pour Crue 9.
+ */
+ private static DualHashBidiMap createEnumSensOrificeMapCrue9() {
+ final DualHashBidiMap res = new DualHashBidiMap();
+ res.put(EnumSensOrifice.BIDIRECT, "0");
+ res.put(EnumSensOrifice.DIRECT, "1");
+ res.put(EnumSensOrifice.INDIRECT, "-1");
+ return res;
+ }
+
+ /**
+ * @return une dual map enum<->String pour Crue 9.
+ */
+ private static DualHashBidiMap createEnumSensOrificeMap() {
+ final DualHashBidiMap res = new DualHashBidiMap();
+ res.put(EnumSensOrifice.BIDIRECT, "Bidirect");
+ res.put(EnumSensOrifice.DIRECT, "Direct");
+ res.put(EnumSensOrifice.INDIRECT, "Indirect");
+ return res;
+ }
+
+ /**
+ * EnumSensOuv
+ *
+ * @return une dual map enum<->String pour Crue 9.
+ */
+ private static DualHashBidiMap createEnumSensOuvMapCrue9() {
+ final DualHashBidiMap res = new DualHashBidiMap();
+ res.put(EnumSensOuv.OUV_VERS_BAS, "42");
+ res.put(EnumSensOuv.OUV_VERS_HAUT, "41");
+ return res;
+ }
+
+ /**
+ * @return une dual map enum<->String pour Crue 9.
+ */
+ private static DualHashBidiMap createEnumSensOuvMap() {
+ final DualHashBidiMap res = new DualHashBidiMap();
+ res.put(EnumSensOuv.OUV_VERS_HAUT, "OuvVersHaut");
+ res.put(EnumSensOuv.OUV_VERS_BAS, "OuvVersBas");
+ return res;
+ }
+
+ /**
+ * @param enumClass la classe de l'enum
+ * @param analyze l'analyze
+ * @return le converter pour EnumFormulePdc
+ */
+ public static SingleValueConverter createEnumConverter(final Class enumClass, final CtuluAnalyze analyze) {
+ return createEnumConverter(CRUE10_CONVERTER, enumClass, analyze);
+
+ }
+
+ /**
+ * @param enumClass la classe de l'enum
+ * @param analyze l'analyze
+ * @return le converter pour l'enum enumClass pour Crue9
+ */
+ public static SingleValueConverter createCrue9EnumConverter(final Class enumClass, final CtuluAnalyze analyze) {
+ return createEnumConverter(CRUE9_CONVERTER, enumClass, analyze);
+
+ }
+
+ private static SingleValueConverter createEnumConverter(final Map<Class, DualHashBidiMap> map, final Class enumClass,
+ final CtuluAnalyze analyze) {
+ return new DefaultEnumConverter(map.get(enumClass), enumClass, analyze);
+
+ }
+
+}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractDaoLoi.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractDaoLoi.java 2009-05-26 17:48:07 UTC (rev 4806)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractDaoLoi.java 2009-05-27 01:09:20 UTC (rev 4807)
@@ -2,10 +2,9 @@
import com.thoughtworks.xstream.XStream;
+import org.fudaa.dodico.crue.metier.emh.AbstractLoi;
import org.fudaa.dodico.crue.metier.emh.EvolutionFF;
-import org.fudaa.dodico.crue.metier.emh.Loi;
import org.fudaa.dodico.crue.metier.emh.PtEvolutionFF;
-import org.fudaa.dodico.crue.metier.emh.VariableOrdonnee;
import org.fudaa.dodico.crue.metier.helper.LoiHelper;
/**
@@ -48,15 +47,15 @@
* @param outLoi
* @param inLoi
*/
- protected static void daoToMetierLoi(final Loi outLoi, final AbstractDaoLoi inLoi) {
+ protected static void daoToMetierLoi(final AbstractLoi outLoi, final AbstractDaoLoi inLoi) {
outLoi.setNom(inLoi.Nom);
outLoi.setDescription(inLoi.Description);
- VariableOrdonnee varOrdonnee = new VariableOrdonnee();
- varOrdonnee.setType(inLoi.VarAbscisse);
- outLoi.setMVariableAbscisse(varOrdonnee);
- varOrdonnee = new VariableOrdonnee();
- varOrdonnee.setType(inLoi.VarOrdonnee);
- outLoi.setMVariableOrdonnee(varOrdonnee);
+ // VariableOrdonnee varOrdonnee = new VariableOrdonnee();
+ // varOrdonnee.setType(inLoi.VarAbscisse);
+ outLoi.setVarAbscisse(inLoi.VarAbscisse);
+ // varOrdonnee = new VariableOrdonnee();
+ // varOrdonnee.setType(inLoi.VarOrdonnee);
+ outLoi.setVarOrdonnee(inLoi.VarOrdonnee);
outLoi.setEvolutionFF(inLoi.EvolutionFF);
}
@@ -66,11 +65,11 @@
* @param listePersistante
* @param dataMetier
*/
- protected static void metierToDaoLoi(final AbstractDaoLoi outLoi, final Loi inLoi) {
+ protected static void metierToDaoLoi(final AbstractDaoLoi outLoi, final AbstractLoi inLoi) {
outLoi.Nom = inLoi.getNom();
outLoi.Description = inLoi.getDescription();
- outLoi.VarAbscisse = inLoi.getMVariableAbscisse().getType();
- outLoi.VarOrdonnee = inLoi.getMVariableOrdonnee().getType();
+ outLoi.VarAbscisse = inLoi.getVarAbscisse();
+ outLoi.VarOrdonnee = inLoi.getVarOrdonnee();
outLoi.EvolutionFF = inLoi.getEvolutionFF();
}
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java 2009-05-26 17:48:07 UTC (rev 4806)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java 2009-05-27 01:09:20 UTC (rev 4807)
@@ -7,6 +7,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.collections.CollectionUtils;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.*;
import org.fudaa.dodico.crue.metier.CrueData;
@@ -49,11 +50,11 @@
res.listeCalculs = new ArrayList<CalculAbstractPersist>();
- List<CalculAbstractPersist> listeCalculs = remplirPersistanceDCLMAvecCalculsPermanents(metier
- .getListeCalculsPermanents(), analyser);
+ List<CalculAbstractPersist> listeCalculs = remplirPersistanceDCLMAvecCalculsPermanents(metier.getCalcPseudoPerm(),
+ analyser);
res.listeCalculs.addAll(listeCalculs);
- listeCalculs = remplirPersistanceDCLMAvecCalculsTransitoires(metier.getListeCalculsTransitoires(), analyser);
+ listeCalculs = remplirPersistanceDCLMAvecCalculsTransitoires(metier.getCalcTrans(), analyser);
res.listeCalculs.addAll(listeCalculs);
return res;
@@ -72,10 +73,10 @@
final List<CalcPseudoPerm> listeCalculsPermanents = new ArrayList<CalcPseudoPerm>();
final List<CalcTrans> listeCalculsTransitoires = new ArrayList<CalcTrans>();
- metier.setListeCalculsPermanents(listeCalculsPermanents);
- metier.setListeCalculsTransitoires(listeCalculsTransitoires);
-
- if (calculsPersist == null || calculsPersist.size() == 0) {
+ metier.setCalcPseudoPerm(listeCalculsPermanents);
+ metier.setCalcTrans(listeCalculsTransitoires);
+ // TODO est-ce une erreur
+ if (CollectionUtils.isEmpty(calculsPersist)) {
analyzer.addError("io.dclm.no.calcul");
} else {
@@ -110,7 +111,7 @@
final CalcPseudoPerm calculPermMetier = new CalcPseudoPerm();
calculPermMetier.setNom(calculPermPersist.Nom);
calculPermMetier.setDescription(calculPermPersist.Description);
- calculPermMetier.setMethodeCalcul(calculPermPersist.MethodeCalcul);
+ // calculPermMetier.setMethodeCalcul(calculPermPersist.MethodeCalcul);
// *** Gestion des elements d'un calcul permanent
if (calculPermPersist.listeElementsCalculPermanent == null
@@ -118,11 +119,13 @@
analyzer.addError("io.dclm.no.calcul.perm");
} else {
- final List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu = new ArrayList<DonCLimMNoeudNiveauContinu>();
- final List<DonCLimMBrancheOrifice> listeDonCLimMBrancheOrifice = new ArrayList<DonCLimMBrancheOrifice>();
- final List<DonCLimMBrancheSaintVenant> listeDonCLimMBrancheSaintVenant = new ArrayList<DonCLimMBrancheSaintVenant>();
- final List<DonCLimMCasierProfil> listeDonCLimMCasierProfil = new ArrayList<DonCLimMCasierProfil>();
- calculPermMetier.setListeRefs(new ArrayList<EMH>());
+ // final List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu = new
+ // ArrayList<DonCLimMNoeudNiveauContinu>();
+ // final List<DonCLimMBrancheOrifice> listeDonCLimMBrancheOrifice = new ArrayList<DonCLimMBrancheOrifice>();
+ // final List<DonCLimMBrancheSaintVenant> listeDonCLimMBrancheSaintVenant = new
+ // ArrayList<DonCLimMBrancheSaintVenant>();
+ // final List<DonCLimMCasierProfil> listeDonCLimMCasierProfil = new ArrayList<DonCLimMCasierProfil>();
+ // calculPermMetier.setListeRefs(new ArrayList<EMH>());
for (final RefDCLMAbstractPersist eltRefPersist : calculPermPersist.listeElementsCalculPermanent) {
if (eltRefPersist instanceof CalcPseudoPermNoeudNiveauContinuQappPersist) {
@@ -133,9 +136,12 @@
final CalcPseudoPermNoeudNiveauContinuQapp eltMetier = new CalcPseudoPermNoeudNiveauContinuQapp();
eltMetier.setNomCalculParent(calculPermMetier.getNom());
eltMetier.setQapp(eltPersist.Qapp);
- listeDonCLimMNoeudNiveauContinu.add(eltMetier);
+ calculPermMetier.addCalcPseudoPermNoeudNiveauContinuQapp(eltMetier);
+ // listeDonCLimMNoeudNiveauContinu.add(eltMetier);
noeudMetier.addDCLM(eltMetier);
- calculPermMetier.getListeRefs().add(noeudMetier);
+ // TODO a modifier et a mettre dans addDCLM
+ eltMetier.setNomEMH(noeudMetier.getNom());
+ // calculPermMetier.getListeRefs().add(noeudMetier);
}
} else if (eltRefPersist instanceof CalcPseudoPermNoeudNiveauContinuZimposePersist) {
@@ -145,10 +151,10 @@
if (noeudMetier != null) {
final CalcPseudoPermNoeudNiveauContinuZimpose eltMetier = new CalcPseudoPermNoeudNiveauContinuZimpose();
eltMetier.setNomCalculParent(calculPermMetier.getNom());
- eltMetier.setZImpose(eltPersist.Zimpose);
- listeDonCLimMNoeudNiveauContinu.add(eltMetier);
+ eltMetier.setZimpose(eltPersist.Zimpose);
+ calculPermMetier.addCalcPseudoPermNoeudNiveauContinuZimpose(eltMetier);
noeudMetier.addDCLM(eltMetier);
- calculPermMetier.getListeRefs().add(noeudMetier);
+ eltMetier.setNomEMH(noeudMetier.getNom());
}
} else if (eltRefPersist instanceof CalcPseudoPermBrancheOrificeManoeuvrePersist) {
@@ -160,9 +166,10 @@
eltMetier.setNomCalculParent(calculPermMetier.getNom());
eltMetier.setOuv(eltPersist.Ouv);
eltMetier.setSensOuv(eltPersist.SensOuv);
- listeDonCLimMBrancheOrifice.add(eltMetier);
+ calculPermMetier.addCalcPseudoPermBrancheOrificeManoeuvre(eltMetier);
brancheMetier.addDCLM(eltMetier);
- calculPermMetier.getListeRefs().add(brancheMetier);
+ eltMetier.setNomEMH(brancheMetier.getNom());
+ // calculPermMetier.getListeRefs().add(brancheMetier);
}
} else if (eltRefPersist instanceof CalcPseudoPermBrancheBrancheSaintVenantQruisPersist) {
@@ -173,9 +180,11 @@
final CalcPseudoPermBrancheSaintVenantQruis eltMetier = new CalcPseudoPermBrancheSaintVenantQruis();
eltMetier.setNomCalculParent(calculPermMetier.getNom());
eltMetier.setQruis(eltPersist.Qruis);
- listeDonCLimMBrancheSaintVenant.add(eltMetier);
+ calculPermMetier.addCalcPseudoPermBrancheSaintVenantQruis(eltMetier);
+ // listeDonCLimMBrancheSaintVenant.add(eltMetier);
brancheMetier.addDCLM(eltMetier);
- calculPermMetier.getListeRefs().add(brancheMetier);
+ eltMetier.setNomEMH(brancheMetier.getNom());
+ // calculPermMetier.getListeRefs().add(brancheMetier);
}
} else if (eltRefPersist instanceof CalcPseudoPermBrancheCasierProfilQruisPersist) {
@@ -186,17 +195,18 @@
final CalcPseudoPermCasierProfilQruis eltMetier = new CalcPseudoPermCasierProfilQruis();
eltMetier.setNomCalculParent(calculPermMetier.getNom());
eltMetier.setQruis(eltPersist.Qruis);
- listeDonCLimMCasierProfil.add(eltMetier);
+ calculPermMetier.addCalcPseudoPermCasierProfilQruis(eltMetier);
+ // listeDonCLimMCasierProfil.add(eltMetier);
casierMetier.addDCLM(eltMetier);
- calculPermMetier.getListeRefs().add(casierMetier);
+ eltMetier.setNomEMH(casierMetier.getNom());
}
}
}
- calculPermMetier.setListeDonCLimMNoeudNiveauContinu(listeDonCLimMNoeudNiveauContinu);
- calculPermMetier.setListeDonCLimMBrancheOrifice(listeDonCLimMBrancheOrifice);
- calculPermMetier.setListeDonCLimMBrancheSaintVenant(listeDonCLimMBrancheSaintVenant);
- calculPermMetier.setListeDonCLimMCasierProfil(listeDonCLimMCasierProfil);
+ // calculPermMetier.setListeDonCLimMNoeudNiveauContinu(listeDonCLimMNoeudNiveauContinu);
+ // calculPermMetier.setListeDonCLimMBrancheOrifice(listeDonCLimMBrancheOrifice);
+ // calculPermMetier.setListeDonCLimMBrancheSaintVenant(listeDonCLimMBrancheSaintVenant);
+ // calculPermMetier.setListeDonCLimMCasierProfil(listeDonCLimMCasierProfil);
}
listeMetier.add(calculPermMetier);
@@ -221,11 +231,13 @@
analyzer.addError("io.dclm.no.calcul.trans");
} else {
- final List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu = new ArrayList<DonCLimMNoeudNiveauContinu>();
- final List<DonCLimMBrancheOrifice> listeDonCLimMBrancheOrifice = new ArrayList<DonCLimMBrancheOrifice>();
- final List<DonCLimMBrancheSaintVenant> listeDonCLimMBrancheSaintVenant = new ArrayList<DonCLimMBrancheSaintVenant>();
- final List<DonCLimMCasierProfil> listeDonCLimMCasierProfil = new ArrayList<DonCLimMCasierProfil>();
- calculTransMetier.setListeRefs(new ArrayList<EMH>());
+ // final List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu = new
+ // ArrayList<DonCLimMNoeudNiveauContinu>();
+ // final List<DonCLimMBrancheOrifice> listeDonCLimMBrancheOrifice = new ArrayList<DonCLimMBrancheOrifice>();
+ // final List<DonCLimMBrancheSaintVenant> listeDonCLimMBrancheSaintVenant = new
+ // ArrayList<DonCLimMBrancheSaintVenant>();
+ // final List<DonCLimMCasierProfil> listeDonCLimMCasierProfil = new ArrayList<DonCLimMCasierProfil>();
+ // calculTransMetier.setListeRefs(new ArrayList<EMH>());
for (final RefDCLMAbstractPersist eltRefPersist : calculTransPersist.listeElementsCalculTransitoire) {
@@ -234,25 +246,19 @@
final NoeudNiveauContinuHydrogrammePersist eltPersist = (NoeudNiveauContinuHydrogrammePersist) eltRefPersist;
final CatEMHNoeud noeudMetier = getEMHNoeudFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (noeudMetier != null) {
- final CalcTransNoeudNiveauContinuHydrogramme eltMetier = new CalcTransNoeudNiveauContinuHydrogramme();
+ final CalcTransNoeudNiveauContinuQapp eltMetier = new CalcTransNoeudNiveauContinuQapp();
eltMetier.setNomCalculParent(calculTransMetier.getNom());
- final List<LoiDF> loisDF = new ArrayList<LoiDF>();
+ LoiDF loi = null;
- if (eltPersist.listeHydrogrammes == null || eltPersist.listeHydrogrammes.size() == 0) {
+ if (eltPersist.HydrogrammeQapp == null) {
CrueHelper.emhEmpty("Calcul Transitoire - NoeudNiveauContinu - Hydrogrammes", analyzer);
} else {
- for (final HydrogrammeQappPersist hydroPersist : eltPersist.listeHydrogrammes) {
-
- final Loi loi = getLoiFromReferenceDLHY(hydroPersist.NomRef, dataLinked, analyzer);
- if (loi != null && loi instanceof LoiDF) {
- loisDF.add((LoiDF) loi);
- }
- }
+ loi = (LoiDF) getLoiFromReferenceDLHY(eltPersist.HydrogrammeQapp.NomRef, dataLinked, analyzer);
}
- eltMetier.setHydrogrammes(loisDF);
- listeDonCLimMNoeudNiveauContinu.add(eltMetier);
+ eltMetier.setHydrogrammeQapp(loi);
noeudMetier.addDCLM(eltMetier);
- calculTransMetier.getListeRefs().add(noeudMetier);
+ eltMetier.setNomEMH(noeudMetier.getNom());
+ calculTransMetier.addCalcTransNoeudNiveauContinuQapp(eltMetier);
}
} else if (eltRefPersist instanceof NoeudNiveauContinuLimnigrammePersist) {
@@ -262,24 +268,20 @@
if (noeudMetier != null) {
final CalcTransNoeudNiveauContinuLimnigramme eltMetier = new CalcTransNoeudNiveauContinuLimnigramme();
eltMetier.setNomCalculParent(calculTransMetier.getNom());
+ noeudMetier.addDCLM(eltMetier);
+ eltMetier.setNomEMH(noeudMetier.getNom());
- final List<LoiDF> loisDF = new ArrayList<LoiDF>();
+ LoiDF loi = null;
- if (eltPersist.listeLimnigrammes == null || eltPersist.listeLimnigrammes.size() == 0) {
+ if (eltPersist.Limnigramme == null) {
CrueHelper.emhEmpty("Calcul Transitoire - NoeudNiveauContinu - Limnigrammes", analyzer);
} else {
- for (final LimnigrammePersist limniPersist : eltPersist.listeLimnigrammes) {
+ loi = (LoiDF) getLoiFromReferenceDLHY(eltPersist.Limnigramme.NomRef, dataLinked, analyzer);
+ }
+ eltMetier.setLimnigramme(loi);
+ // listeDonCLimMNoeudNiveauContinu.add(eltMetier);
- final Loi loi = getLoiFromReferenceDLHY(limniPersist.NomRef, dataLinked, analyzer);
- if (loi != null && loi instanceof LoiDF) {
- loisDF.add((LoiDF) loi);
- }
- }
- }
- eltMetier.setLimnigrammes(loisDF);
- listeDonCLimMNoeudNiveauContinu.add(eltMetier);
- noeudMetier.addDCLM(eltMetier);
- calculTransMetier.getListeRefs().add(noeudMetier);
+ calculTransMetier.addCalcTransNoeudNiveauContinuLimnigramme(eltMetier);
}
} else if (eltRefPersist instanceof NoeudNiveauContinuTarragePersist) {
@@ -289,24 +291,18 @@
if (noeudMetier != null) {
final CalcTransNoeudNiveauContinuTarrage eltMetier = new CalcTransNoeudNiveauContinuTarrage();
eltMetier.setNomCalculParent(calculTransMetier.getNom());
+ noeudMetier.addDCLM(eltMetier);
+ eltMetier.setNomEMH(noeudMetier.getNom());
- final List<LoiFF> loisFF = new ArrayList<LoiFF>();
+ LoiFF loi = null;
- if (eltPersist.listeTarrages == null || eltPersist.listeTarrages.size() == 0) {
+ if (eltPersist.Tarrage == null) {
CrueHelper.emhEmpty("Calcul Transitoire - NoeudNiveauContinu - Tarrages", analyzer);
} else {
- for (final TarragePersist tarragePersist : eltPersist.listeTarrages) {
-
- final Loi loi = getLoiFromReferenceDLHY(tarragePersist.NomRef, dataLinked, analyzer);
- if (loi != null && loi instanceof LoiFF) {
- loisFF.add((LoiFF) loi);
- }
- }
+ loi = (LoiFF) getLoiFromReferenceDLHY(eltPersist.Tarrage.NomRef, dataLinked, analyzer);
}
- eltMetier.setTarrages(loisFF);
- listeDonCLimMNoeudNiveauContinu.add(eltMetier);
- noeudMetier.addDCLM(eltMetier);
- calculTransMetier.getListeRefs().add(noeudMetier);
+ eltMetier.setTarrage(loi);
+ calculTransMetier.addCalcTransNoeudNiveauContinuTarrage(eltMetier);
}
} else if (eltRefPersist instanceof BrancheOrificeManoeuvrePersist) {
@@ -316,25 +312,18 @@
if (brancheMetier != null) {
final CalcTransBrancheOrificeManoeuvre eltMetier = new CalcTransBrancheOrificeManoeuvre();
eltMetier.setNomCalculParent(calculTransMetier.getNom());
+ brancheMetier.addDCLM(eltMetier);
+ eltMetier.setNomEMH(brancheMetier.getNom());
+ LoiDF loi = null;
- final List<LoiDF> loisDF = new ArrayList<LoiDF>();
-
- if (eltPersist.listeManoeuvres == null || eltPersist.listeManoeuvres.size() == 0) {
+ if (eltPersist.Manoeuvre == null) {
CrueHelper.emhEmpty("Calcul Transitoire - BrancheOrificeManoeuvre - Manoeuvres", analyzer);
} else {
- for (final ManoeuvrePersist manoeuvrePersist : eltPersist.listeManoeuvres) {
-
- final Loi loi = getLoiFromReferenceDLHY(manoeuvrePersist.NomRef, dataLinked, analyzer);
- if (loi != null && loi instanceof LoiDF) {
- loisDF.add((LoiDF) loi);
- }
- }
+ loi = (LoiDF) getLoiFromReferenceDLHY(eltPersist.Manoeuvre.NomRef, dataLinked, analyzer);
}
- eltMetier.setManoeuvres(loisDF);
+ eltMetier.setManoeuvre(loi);
eltMetier.setSensOuv(eltPersist.SensOuv);
- listeDonCLimMBrancheOrifice.add(eltMetier);
- brancheMetier.addDCLM(eltMetier);
- calculTransMetier.getListeRefs().add(brancheMetier);
+ calculTransMetier.addCalcTransBrancheOrificeManoeuvre(eltMetier);
}
} else if (eltRefPersist instanceof BrancheSaintVenantHydrogrammeRuisPersist) {
@@ -344,26 +333,18 @@
if (brancheMetier != null) {
final CalcTransBrancheSaintVenantQruis eltMetier = new CalcTransBrancheSaintVenantQruis();
eltMetier.setNomCalculParent(calculTransMetier.getNom());
+ brancheMetier.addDCLM(eltMetier);
+ eltMetier.setNomEMH(brancheMetier.getNom());
+ LoiDF loi = null;
- final List<LoiDF> loisDF = new ArrayList<LoiDF>();
-
- if (eltPersist.listeHydrogrammesRuis == null || eltPersist.listeHydrogrammesRuis.size() == 0) {
-
+ if (eltPersist.HydrogrammeQruis == null) {
CrueHelper
.emhEmpty("Calcul Transitoire - BrancheSaintVenantHydrogrammeRuis - HydrogrammesRuis", analyzer);
} else {
- for (final HydrogrammeQruisPersist hydroRuisPersist : eltPersist.listeHydrogrammesRuis) {
-
- final Loi loi = getLoiFromReferenceDLHY(hydroRuisPersist.NomRef, dataLinked, analyzer);
- if (loi != null && loi instanceof LoiDF) {
- loisDF.add((LoiDF) loi);
- }
- }
+ loi = (LoiDF) getLoiFromReferenceDLHY(eltPersist.HydrogrammeQruis.NomRef, dataLinked, analyzer);
}
- eltMetier.setHydrogrammesRuis(loisDF);
- listeDonCLimMBrancheSaintVenant.add(eltMetier);
- brancheMetier.addDCLM(eltMetier);
- calculTransMetier.getListeRefs().add(brancheMetier);
+ eltMetier.setHydrogrammeQruis(loi);
+ calculTransMetier.addCalcTransBrancheSaintVenantQruis(eltMetier);
}
} else if (eltRefPersist instanceof CasierProfilHydrogrammeRuisPersist) {
@@ -373,34 +354,28 @@
if (casierMetier != null) {
final CalcTransCasierProfilQruis eltMetier = new CalcTransCasierProfilQruis();
eltMetier.setNomCalculParent(calculTransMetier.getNom());
+ casierMetier.addDCLM(eltMetier);
+ eltMetier.setNomEMH(casierMetier.getNom());
+ LoiDF loi = null;
- final List<LoiDF> loisDF = new ArrayList<LoiDF>();
+ if (eltPersist.HydrogrammeQruis == null) {
- if (eltPersist.listeHydrogrammesRuis == null || eltPersist.listeHydrogrammesRuis.size() == 0) {
-
CrueHelper.emhEmpty("Calcul Transitoire - CasierProfilHydrogrammeRuis - HydrogrammesRuis", analyzer);
} else {
- for (final HydrogrammeQruisPersist hydroRuisPersist : eltPersist.listeHydrogrammesRuis) {
- final Loi loi = getLoiFromReferenceDLHY(hydroRuisPersist.NomRef, dataLinked, analyzer);
- if (loi != null && loi instanceof LoiDF) {
- loisDF.add((LoiDF) loi);
- }
- }
+ loi = (LoiDF) getLoiFromReferenceDLHY(eltPersist.HydrogrammeQruis.NomRef, dataLinked, analyzer);
}
- eltMetier.setHydrogrammesRuis(loisDF);
- listeDonCLimMCasierProfil.add(eltMetier);
- casierMetier.addDCLM(eltMetier);
- calculTransMetier.getListeRefs().add(casierMetier);
+ eltMetier.setHydrogrammeQruis(loi);
+ calculTransMetier.addCalcTransCasierProfilQruis(eltMetier);
}
}
}
- calculTransMetier.setListeDonCLimMNoeudNiveauContinu(listeDonCLimMNoeudNiveauContinu);
- calculTransMetier.setListeDonCLimMBrancheOrifice(listeDonCLimMBrancheOrifice);
- calculTransMetier.setListeDonCLimMBrancheSaintVenant(listeDonCLimMBrancheSaintVenant);
- calculTransMetier.setListeDonCLimMCasierProfil(listeDonCLimMCasierProfil);
+ // calculTransMetier.setListeDonCLimMNoeudNiveauContinu(listeDonCLimMNoeudNiveauContinu);
+ // calculTransMetier.setListeDonCLimMBrancheOrifice(listeDonCLimMBrancheOrifice);
+ // calculTransMetier.setListeDonCLimMBrancheSaintVenant(listeDonCLimMBrancheSaintVenant);
+ // calculTransMetier.setListeDonCLimMCasierProfil(listeDonCLimMCasierProfil);
}
@@ -415,9 +390,10 @@
* @param analyzer
* @return
*/
- private static Loi getLoiFromReferenceDLHY(final String nomRef, final CrueData dataLinked, final CtuluAnalyze analyzer) {
+ private static AbstractLoi getLoiFromReferenceDLHY(final String nomRef, final CrueData dataLinked,
+ final CtuluAnalyze analyzer) {
- final Loi loi = LoiHelper.findByReference(nomRef, dataLinked.getLois());
+ final AbstractLoi loi = LoiHelper.findByReference(nomRef, dataLinked.getLois());
if (loi == null) {
analyzer.addError("io.dclm.ref.loi", CrueHelper.createMapNom(nomRef));
}
@@ -506,160 +482,204 @@
final CalculPermanentPersist calculPersist = new CalculPermanentPersist();
calculPersist.Nom = calculMetier.getNom();
calculPersist.Description = calculMetier.getDescription();
- calculPersist.MethodeCalcul = calculMetier.getMethodeCalcul();
+ // calculPersist.MethodeCalcul = calculMetier.getMethodeCalcul();
calculPersist.listeElementsCalculPermanent = new ArrayList<RefDCLMAbstractPersist>();
- final List<CalcPseudoPermNoeudNiveauContinuQappPersist> listePersistNNCQapp = new ArrayList<CalcPseudoPermNoeudNiveauContinuQappPersist>();
- final List<CalcPseudoPermNoeudNiveauContinuZimposePersist> listePersistNNCZ = new ArrayList<CalcPseudoPermNoeudNiveauContinuZimposePersist>();
- final List<CalcPseudoPermBrancheOrificeManoeuvrePersist> listePersistBrancheOr = new ArrayList<CalcPseudoPermBrancheOrificeManoeuvrePersist>();
- final List<CalcPseudoPermBrancheBrancheSaintVenantQruisPersist> listePersistBrancheQRuis = new ArrayList<CalcPseudoPermBrancheBrancheSaintVenantQruisPersist>();
- final List<CalcPseudoPermBrancheCasierProfilQruisPersist> listePersistCasierQRuis = new ArrayList<CalcPseudoPermBrancheCasierProfilQruisPersist>();
+ // final List<CalcPseudoPermNoeudNiveauContinuQappPersist> listePersistNNCQapp = new
+ // ArrayList<CalcPseudoPermNoeudNiveauContinuQappPersist>();
+ // final List<CalcPseudoPermNoeudNiveauContinuZimposePersist> listePersistNNCZ = new
+ // ArrayList<CalcPseudoPermNoeudNiveauContinuZimposePersist>();
+ // final List<CalcPseudoPermBrancheOrificeManoeuvrePersist> listePersistBrancheOr = new
+ // ArrayList<CalcPseudoPermBrancheOrificeManoeuvrePersist>();
+ // final List<CalcPseudoPermBrancheBrancheSaintVenantQruisPersist> listePersistBrancheQRuis = new
+ // ArrayList<CalcPseudoPermBrancheBrancheSaintVenantQruisPersist>();
+ // final List<CalcPseudoPermBrancheCasierProfilQruisPersist> listePersistCasierQRuis = new
+ // ArrayList<CalcPseudoPermBrancheCasierProfilQruisPersist>();
- for (final EMH emh : calculMetier.getListeRefs()) {
- if (emh instanceof CatEMHNoeud) {
+ for (CalcPseudoPermNoeudNiveauContinuQapp in : calculMetier.getCalcPseudoPermNoeudNiveauContinuQapp()) {
+ final CalcPseudoPermNoeudNiveauContinuQappPersist dao = new CalcPseudoPermNoeudNiveauContinuQappPersist();
+ dao.NomRef = in.getNomEMH();
+ dao.Qapp = in.getValue();
+ calculPersist.listeElementsCalculPermanent.add(dao);
+ }
+ for (CalcPseudoPermNoeudNiveauContinuZimpose in : calculMetier.getCalcPseudoPermNoeudNiveauContinuZimpose()) {
+ final CalcPseudoPermNoeudNiveauContinuZimposePersist dao = new CalcPseudoPermNoeudNiveauContinuZimposePersist();
+ dao.NomRef = in.getNomEMH();
+ dao.Zimpose = in.getValue();
+ calculPersist.listeElementsCalculPermanent.add(dao);
+ }
+ for (CalcPseudoPermBrancheOrificeManoeuvre in : calculMetier.getCalcPseudoPermBrancheOrificeManoeuvre()) {
+ final CalcPseudoPermBrancheOrificeManoeuvrePersist dao = new CalcPseudoPermBrancheOrificeManoeuvrePersist();
+ dao.NomRef = in.getNomEMH();
+ dao.Ouv = in.getValue();
+ dao.SensOuv = in.getSensOuv();
+ calculPersist.listeElementsCalculPermanent.add(dao);
+ }
+ for (CalcPseudoPermBrancheSaintVenantQruis in : calculMetier.getCalcPseudoPermBrancheSaintVenantQruis()) {
+ final CalcPseudoPermBrancheBrancheSaintVenantQruisPersist dao = new CalcPseudoPermBrancheBrancheSaintVenantQruisPersist();
+ dao.NomRef = in.getNomEMH();
+ dao.Qruis = in.getValue();
+ calculPersist.listeElementsCalculPermanent.add(dao);
+ }
+ for (CalcPseudoPermCasierProfilQruis in : calculMetier.getCalcPseudoPermCasierProfilQruis()) {
+ final CalcPseudoPermBrancheCasierProfilQruisPersist dao = new CalcPseudoPermBrancheCasierProfilQruisPersist();
+ dao.NomRef = in.getNomEMH();
+ dao.Qruis = in.getValue();
+ calculPersist.listeElementsCalculPermanent.add(dao);
+ }
- final List<DonClimM> listeDoncClimM = emh.getDCLM();
- if (listeDoncClimM == null) {
- continue;
- }
+ // for (final EMH emh : calculMetier.getListeRefs()) {
+ // if (emh instanceof CatEMHNoeud) {
+ //
+ // final List<DonCLimM> listeDoncClimM = emh.getDCLM();
+ // if (listeDoncClimM == null) {
+ // continue;
+ // }
+ //
+ // // boolean trouve = false;
+ //
+ // for (final DonCLimM dataCliM : listeDoncClimM) {
+ // if (dataCliM instanceof CalcPseudoPermNoeudNiveauContinuQapp) {
+ //
+ // final CalcPseudoPermNoeudNiveauContinuQapp noeudNivContQapp = (CalcPseudoPermNoeudNiveauContinuQapp)
+ // dataCliM;
+ // if (noeudNivContQapp.getNomCalculParent() != null
+ // && noeudNivContQapp.getNomCalculParent().equals(calculPersist.Nom)) {
+ // final CalcPseudoPermNoeudNiveauContinuQappPersist NNCQappPersist = new
+ // CalcPseudoPermNoeudNiveauContinuQappPersist();
+ // NNCQappPersist.NomRef = noeudNivContQapp.getNomEMH();
+ // NNCQappPersist.Qapp = noeudNivContQapp.getQapp();
+ //
+ // calculPersist.listeElementsCalculPermanent.add(NNCQappPersist);
+ // // trouve = true;
+ // // break;
+ // }
+ //
+ // } else if (dataCliM instanceof CalcPseudoPermNoeudNiveauContinuZimpose) {
+ //
+ // final CalcPseudoPermNoeudNiveauContinuZimpose noeudNivContZ = (CalcPseudoPermNoeudNiveauContinuZimpose)
+ // dataCliM;
+ // if (noeudNivContZ.getNomCalculParent() != null
+ // && noeudNivContZ.getNomCalculParent().equals(calculPersist.Nom)) {
+ // final CalcPseudoPermNoeudNiveauContinuZimposePersist NNCZPersist = new
+ // CalcPseudoPermNoeudNiveauContinuZimposePersist();
+ // NNCZPersist.NomRef = noeudNivContZ.getNomEMH();
+ // NNCZPersist.Zimpose = noeudNivContZ.getZimpose();
+ //
+ // calculPersist.listeElementsCalculPermanent.add(NNCZPersist);
+ // // trouve = true;
+ // // break;
+ // }
+ // }
+ // }
+ // // if (!trouve) {
+ // // analyser.addError("io.dclm.data.nnc.notfound", CrueHelper.createMapNom(emh.getNom()));
+ // // }
+ //
+ // } // Fin if EMHNoeudNiveauContinu
+ // else if (emh instanceof CatEMHBranche) {
+ //
+ // if (emh instanceof EMHBrancheOrifice) {
+ //
+ // final List<DonCLimM> listeDoncClimM = emh.getDCLM();
+ // if (listeDoncClimM == null) {
+ // continue;
+ // }
+ //
+ // // boolean trouve = false;
+ // for (final DonCLimM dataCliM : listeDoncClimM) {
+ // if (dataCliM instanceof CalcPseudoPermBrancheOrificeManoeuvre) {
+ //
+ // final CalcPseudoPermBrancheOrificeManoeuvre brancheCast = (CalcPseudoPermBrancheOrificeManoeuvre) dataCliM;
+ // if (brancheCast.getNomCalculParent() != null
+ // && brancheCast.getNomCalculParent().equals(calculPersist.Nom)) {
+ // final CalcPseudoPermBrancheOrificeManoeuvrePersist brancheOrPersist = new
+ // CalcPseudoPermBrancheOrificeManoeuvrePersist();
+ // brancheOrPersist.NomRef = brancheCast.getNomEMH();
+ // brancheOrPersist.SensOuv = brancheCast.getSensOuv();
+ // brancheOrPersist.Ouv = brancheCast.getOuv();
+ //
+ // calculPersist.listeElementsCalculPermanent.add(brancheOrPersist);
+ // // trouve = true;
+ // // break;
+ // }
+ //
+ // }
+ // }
+ // // if (!trouve) {
+ // // analyser.addError("io.dclm.data.brancheo.notfound", CrueHelper.createMapNom(emh.getNom()));
+ // // }
+ //
+ // } // Fin if EMHBrancheOrifice
+ // else if (emh instanceof EMHBrancheSaintVenant) {
+ //
+ // final List<DonCLimM> listeDoncClimM = emh.getDCLM();
+ // if (listeDoncClimM == null) {
+ // continue;
+ // }
+ //
+ // // boolean trouve = false;
+ // for (final DonCLimM dataCliM : listeDoncClimM) {
+ // if (dataCliM instanceof CalcPseudoPermBrancheSaintVenantQruis) {
+ // final CalcPseudoPermBrancheSaintVenantQruis brancheCast = (CalcPseudoPermBrancheSaintVenantQruis) dataCliM;
+ // if (brancheCast.getNomCalculParent() != null
+ // && brancheCast.getNomCalculParent().equals(calculPersist.Nom)) {
+ // final CalcPseudoPermBrancheBrancheSaintVenantQruisPersist brancheQruisPersist = new
+ // CalcPseudoPermBrancheBrancheSaintVenantQruisPersist();
+ // brancheQruisPersist.NomRef = brancheCast.getNomEMH();
+ // brancheQruisPersist.Qruis = brancheCast.getQruis();
+ //
+ // calculPersist.listeElementsCalculPermanent.add(brancheQruisPersist);
+ // // trouve = true;
+ // // break;
+ // }
+ // }
+ // }
+ // // if (!trouve) {
+ // // analyser.addError("io.dclm.data.branchesv.notfound", CrueHelper.createMapNom(emh.getNom()));
+ // // }
+ //
+ // } // Fin if EMHBrancheSaintVenant
+ //
+ // } // Fin if CatEMHBranche
+ // else if (emh instanceof EMHCasierProfil) {
+ //
+ // final List<DonCLimM> listeDoncClimM = emh.getDCLM();
+ // if (listeDoncClimM == null) {
+ // continue;
+ // }
+ //
+ // // boolean trouve = false;
+ // for (final DonCLimM dataCliM : listeDoncClimM) {
+ // if (dataCliM instanceof CalcPseudoPermCasierProfilQruis) {
+ // final CalcPseudoPermCasierProfilQruis casierCast = (CalcPseudoPermCasierProfilQruis) dataCliM;
+ // if (casierCast.getNomCalculParent() != null
+ // && casierCast.getNomCalculParent().equals(calculPersist.Nom)) {
+ // final CalcPseudoPermBrancheCasierProfilQruisPersist casierPersist = new
+ // CalcPseudoPermBrancheCasierProfilQruisPersist();
+ // casierPersist.NomRef = casierCast.getNomEMH();
+ // casierPersist.Qruis = casierCast.getQruis();
+ //
+ // calculPersist.listeElementsCalculPermanent.add(casierPersist);
+ // // trouve = true;
+ // // break;
+ // }
+ // }
+ //
+ // }
+ // // if (!trouve) {
+ // // analyser.addError("io.dclm.data.casier.notfound", CrueHelper.createMapNom(emh.getNom()));
+ // // }
+ //
+ // }
+ // } // Fin For getListeRefs
- boolean trouve = false;
+ // calculPersist.listeElementsCalculPermanent.addAll(listePersistNNCQapp);
+ // calculPersist.listeElementsCalculPermanent.addAll(listePersistNNCZ);
+ // calculPersist.listeElementsCalculPermanent.addAll(listePersistBrancheOr);
+ // calculPersist.listeElementsCalculPermanent.addAll(listePersistBrancheQRuis);
+ // calculPersist.listeElementsCalculPermanent.addAll(listePersistCasierQRuis);
- for (final DonClimM dataCliM : listeDoncClimM) {
- if (dataCliM instanceof CalcPseudoPermNoeudNiveauContinuQapp) {
-
- final CalcPseudoPermNoeudNiveauContinuQapp noeudNivContQapp = (CalcPseudoPermNoeudNiveauContinuQapp) dataCliM;
- if (noeudNivContQapp.getNomCalculParent() != null
- && noeudNivContQapp.getNomCalculParent().equals(calculPersist.Nom)) {
- final CalcPseudoPermNoeudNiveauContinuQappPersist NNCQappPersist = new CalcPseudoPermNoeudNiveauContinuQappPersist();
- NNCQappPersist.NomRef = emh.getNom();
- NNCQappPersist.Qapp = noeudNivContQapp.getQapp();
-
- listePersistNNCQapp.add(NNCQappPersist);
- trouve = true;
- break;
- }
-
- } else if (dataCliM instanceof CalcPseudoPermNoeudNiveauContinuZimpose) {
-
- final CalcPseudoPermNoeudNiveauContinuZimpose noeudNivContZ = (CalcPseudoPermNoeudNiveauContinuZimpose) dataCliM;
- if (noeudNivContZ.getNomCalculParent() != null
- && noeudNivContZ.getNomCalculParent().equals(calculPersist.Nom)) {
- final CalcPseudoPermNoeudNiveauContinuZimposePersist NNCZPersist = new CalcPseudoPermNoeudNiveauContinuZimposePersist();
- NNCZPersist.NomRef = emh.getNom();
- NNCZPersist.Zimpose = noeudNivContZ.getZImpose();
-
- listePersistNNCZ.add(NNCZPersist);
- trouve = true;
- break;
- }
- }
- }
- if (!trouve) {
- analyser.addError("io.dclm.data.nnc.notfound", CrueHelper.createMapNom(emh.getNom()));
- }
-
- } // Fin if EMHNoeudNiveauContinu
- else if (emh instanceof CatEMHBranche) {
-
- if (emh instanceof EMHBrancheOrifice) {
-
- final List<DonClimM> listeDoncClimM = emh.getDCLM();
- if (listeDoncClimM == null) {
- continue;
- }
-
- boolean trouve = false;
- for (final DonClimM dataCliM : listeDoncClimM) {
- if (dataCliM instanceof CalcPseudoPermBrancheOrificeManoeuvre) {
-
- final CalcPseudoPermBrancheOrificeManoeuvre brancheCast = (CalcPseudoPermBrancheOrificeManoeuvre) dataCliM;
- if (brancheCast.getNomCalculParent() != null
- && brancheCast.getNomCalculParent().equals(calculPersist.Nom)) {
- final CalcPseudoPermBrancheOrificeManoeuvrePersist brancheOrPersist = new CalcPseudoPermBrancheOrificeManoeuvrePersist();
- brancheOrPersist.NomRef = emh.getNom();
- brancheOrPersist.SensOuv = brancheCast.getSensOuv();
- brancheOrPersist.Ouv = brancheCast.getOuv();
-
- ...
[truncated message content] |
