Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4695] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2009-04-30 05:21:16
|
Revision: 4695
http://fudaa.svn.sourceforge.net/fudaa/?rev=4695&view=rev
Author: deniger
Date: 2009-04-30 05:21:13 +0000 (Thu, 30 Apr 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormat.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/AbstractCrueDao.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPNUM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoDCLM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoDLHY.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoETU.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoOCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoOPTG.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/CrueDaoPCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoPNUM.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/CrueDaoStructureCommon.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/CrueXmlReaderWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/DonPrtCIniCasierProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueContrat.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/TestCrueDCSPFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDFRTFile.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/TestCrueDPTGFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDPTIFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDRSOFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueETUFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueOPTGFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueORESFile.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/AppCrueTest.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/
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/CrueConverterDFRT.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/CrueConverterDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterETU.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/CrueConverterOPTG.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/CrueHelper.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/ErrorHandlerDefault.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/ValidatorXml.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/AbstractTest.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/AppCrueTest.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/RemplissageData.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/TestCrueDH.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/TestCruePCALFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCruePNUMFile.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/AbstractCrueDao.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDCLM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDLHY.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterETU.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterOCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterOPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterORES.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterPCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterPNUM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDCLM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDLHY.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoETU.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoOCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoOPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoORES.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPNUM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructure.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructureCommon.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructureDCLM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructureDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructureDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructureDLHY.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructureDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructureDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructureDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructureETU.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructureOCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructureOPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructureORES.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructurePCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructurePNUM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueXmlReaderWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueXmlReaderWriterImpl.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/DonPrtCIniCasierProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/ErrorHandlerDefault.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/ValidatorXml.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/CrueConverterDFRT.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/CrueConverterDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterETU.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/CrueConverterOPTG.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/CrueHelper.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/ValidatorXml.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/AbstractTest.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/AppCrueTest.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/RemplissageData.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueContrat.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDC.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDCLMFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDCSPFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDFRTFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDH.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDLHYFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDPTGFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDPTIFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDRSOFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueETUFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueOCALFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueOPTGFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueORESFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCruePCALFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCruePNUMFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/AbstractTest.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/AppCrueTest.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/RemplissageData.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/TestCrueDH.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/TestCruePCALFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCruePNUMFile.java
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/AbstractCrueDao.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/AbstractCrueDao.java 2009-04-29 21:44:22 UTC (rev 4694)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/AbstractCrueDao.java 2009-04-30 05:21:13 UTC (rev 4695)
@@ -1,23 +0,0 @@
-package org.fudaa.dodico.crue.dao;
-
-/**
- * classe dao persist qui représente la structure xml à persister.
- *
- * @author Adrien Hadoux FIXME pourquoi ne pas mettre Verision et commentaire.
- */
-public class AbstractCrueDao {
-
- /**
- * En tete xsd
- */
- protected String xmlns = "http://www.fudaa.fr/xsd/crue";
- protected String xmlnsxsi = "http://www.w3.org/2001/XMLSchema-instance";
- protected String xsischemaLocation;
-
- public AbstractCrueDao() {}
-
- protected void setXsdName(final String xsdFile) {
- xsischemaLocation = "http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/" + xsdFile;
- }
-
-}
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverter.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverter.java 2009-04-29 21:44:22 UTC (rev 4694)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverter.java 2009-04-30 05:21:13 UTC (rev 4695)
@@ -1,40 +0,0 @@
-/**
- * Licence GPL
- * Copyright Genesis
- */
-package org.fudaa.dodico.crue.dao;
-
-import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.dodico.crue.metier.emh.CrueData;
-
-/**
- * @author deniger Interface pour les converter entre les objet dao et les objet metier
- * @param <D> Represente la structure DAO
- * @param <M> Represente le modele Metier
- */
-public interface CrueConverter<D extends AbstractCrueDao, M> {
-
- /**
- * Remplit les infos de la classe persistantes avec les données métier appropriées. Cette méthode est appelée dans le
- * constructeur.
- *
- * @param dao
- * @param analyser
- * @param dataLinked
- * @return l'objet metier
- */
- // CrueIOData<M> convertDaoToMetier(D dao, Object dataLinked, CtuluAnalyze analyser);
- M convertDaoToMetier(D dao, CrueData dataLinked, CtuluAnalyze analyser);
-
- /**
- * Crée une structure métier à partir des informations persistantes. Utiliser pour le remplissage de la structure
- * métier apr�s lecture du fichier xml. Utilise en plus des données liées.
- *
- * @param metier
- * @param analyser
- * @return l'objet DAO
- */
- // D convertMetierToDao(CrueIOData<M> metier, CtuluAnalyze analyser);
- D convertMetierToDao(M metier, CtuluAnalyze analyser);
-
-}
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDCLM.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDCLM.java 2009-04-29 21:44:22 UTC (rev 4694)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDCLM.java 2009-04-30 05:21:13 UTC (rev 4695)
@@ -1,971 +0,0 @@
-/**
- * Licence GPL
- * Copyright Genesis
- */
-package org.fudaa.dodico.crue.dao;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.dodico.crue.common.CrueResource;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.*;
-import org.fudaa.dodico.crue.metier.emh.*;
-import org.fudaa.dodico.crue.metier.helper.EMHBrancheHelper;
-import org.fudaa.dodico.crue.metier.helper.EMHCasierHelper;
-import org.fudaa.dodico.crue.metier.helper.EMHNoeudHelper;
-import org.fudaa.dodico.crue.metier.helper.LoiHelper;
-
-/**
- * Converter qui remplit les structures dao avec les objets metier et inversement.
- *
- * @author deniger, CDE
- */
-public class CrueConverterDCLM implements CrueConverter<CrueDaoDCLM, DonCLimMScenario> {
-
- /** Incrémente le nombre d'erreurs dans l'objet CtuluAnlayse * */
- // public static int cptEntries = 1; ne sert à rien !
- /**
- * Convertit les objets persistants en objets métier
- */
- public DonCLimMScenario convertDaoToMetier(final CrueDaoDCLM dao, final CrueData dataLinked,
- final CtuluAnalyze analyser) {
-
- if (dataLinked == null) {
- analyser
- .addFatalError(CrueResource
- .getS("Impossible de récupérer les données réseaux (DRSO) et (DLHY). Les références du fichier DCLM ne pourront etre utilisées."));
- return null;
- }
-
- final DonCLimMScenario donnees = CrueConverterDCLM.remplirDonCLimMScenarioAvecPersistanceDCLM(dao.listeCalculs,
- dataLinked, analyser);
-
- return donnees;
- }
-
- /**
- * Convertit les objets métier en objets persistants
- */
- public CrueDaoDCLM convertMetierToDao(final DonCLimMScenario metier, final CtuluAnalyze analyser) {
-
- final CrueDaoDCLM res = new CrueDaoDCLM();
-
- res.listeCalculs = new ArrayList<CalculAbstractPersist>();
-
- List<CalculAbstractPersist> listeCalculs = remplirPersistanceDCLMAvecCalculsPermanents(metier
- .getListeCalculsPermanents(), analyser);
- res.listeCalculs.addAll(listeCalculs);
-
- listeCalculs = remplirPersistanceDCLMAvecCalculsTransitoires(metier.getListeCalculsTransitoires(), analyser);
- res.listeCalculs.addAll(listeCalculs);
-
- return res;
- }
-
- /**
- * @param calculsPersist
- * @param dataLinked
- * @param analyzer
- * @return
- */
- private static DonCLimMScenario remplirDonCLimMScenarioAvecPersistanceDCLM(
- final List<CalculAbstractPersist> calculsPersist, final CrueData dataLinked, final CtuluAnalyze analyzer) {
-
- final DonCLimMScenario metier = new DonCLimMScenario();
-
- final List<CalculPermanent> listeCalculsPermanents = new ArrayList<CalculPermanent>();
- final List<CalculTransitoire> listeCalculsTransitoires = new ArrayList<CalculTransitoire>();
- metier.setListeCalculsPermanents(listeCalculsPermanents);
- metier.setListeCalculsTransitoires(listeCalculsTransitoires);
-
- if (calculsPersist == null || calculsPersist.size() == 0) {
- analyzer.addError(CrueResource.getS("Il n'y a pas de calculs (permanents ou transitoires) dans DCLM"));
- } else {
-
- for (final CalculAbstractPersist calculPersist : calculsPersist) {
-
- if (calculPersist instanceof CalculPermanentPersist) {
-
- remplirDonCLimMScenarioAvecPersistanceCalculPermanent(listeCalculsPermanents,
- (CalculPermanentPersist) calculPersist, dataLinked, analyzer);
-
- } else if (calculPersist instanceof CalculTransitoirePersist) {
-
- remplirDonCLimMScenarioAvecPersistanceCalculTransitoire(listeCalculsTransitoires,
- (CalculTransitoirePersist) calculPersist, dataLinked, analyzer);
- }
-
- }
- }
-
- return metier;
- }
-
- /**
- * @param listeMetier
- * @param calculPermPersist
- * @param dataLinked
- * @param analyzer
- */
- private static void remplirDonCLimMScenarioAvecPersistanceCalculPermanent(final List<CalculPermanent> listeMetier,
- final CalculPermanentPersist calculPermPersist, final CrueData dataLinked, final CtuluAnalyze analyzer) {
-
- final CalculPermanent calculPermMetier = new CalculPermanent();
- calculPermMetier.setNom(calculPermPersist.Nom);
- calculPermMetier.setDescription(calculPermPersist.Description);
- calculPermMetier.setMethodeCalcul(calculPermPersist.MethodeCalcul);
-
- // *** Gestion des elements d'un calcul permanent
- if (calculPermPersist.listeElementsCalculPermanent == null
- || calculPermPersist.listeElementsCalculPermanent.size() == 0) {
- analyzer.addError(CrueResource.getS("Il n'y a pas de calculs permanents dans DCLM"));
- } 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>());
-
- for (final RefDCLMAbstractPersist eltRefPersist : calculPermPersist.listeElementsCalculPermanent) {
- if (eltRefPersist instanceof NoeudNiveauContinuQappPersist) {
-
- final NoeudNiveauContinuQappPersist eltPersist = (NoeudNiveauContinuQappPersist) eltRefPersist;
- final CatEMHNoeud noeudMetier = getEMHNoeudFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
- if (noeudMetier != null) {
- final CalculPermanentNoeudNiveauContinuQapp eltMetier = new CalculPermanentNoeudNiveauContinuQapp();
- eltMetier.setNomCalculParent(calculPermMetier.getNom());
- eltMetier.setQapp(eltPersist.Qapp);
- listeDonCLimMNoeudNiveauContinu.add(eltMetier);
- noeudMetier.addDCLM(eltMetier);
- calculPermMetier.getListeRefs().add(noeudMetier);
- }
-
- } else if (eltRefPersist instanceof NoeudNiveauContinuZimposePersist) {
-
- final NoeudNiveauContinuZimposePersist eltPersist = (NoeudNiveauContinuZimposePersist) eltRefPersist;
- final CatEMHNoeud noeudMetier = getEMHNoeudFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
- if (noeudMetier != null) {
- final CalculPermanentNoeudNiveauContinuZimpose eltMetier = new CalculPermanentNoeudNiveauContinuZimpose();
- eltMetier.setNomCalculParent(calculPermMetier.getNom());
- eltMetier.setZImpose(eltPersist.Z);
- listeDonCLimMNoeudNiveauContinu.add(eltMetier);
- noeudMetier.addDCLM(eltMetier);
- calculPermMetier.getListeRefs().add(noeudMetier);
- }
-
- } else if (eltRefPersist instanceof BrancheOrificeOuvPersist) {
-
- final BrancheOrificeOuvPersist eltPersist = (BrancheOrificeOuvPersist) eltRefPersist;
- final CatEMHBranche brancheMetier = getEMHBrancheFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
- if (brancheMetier != null) {
- final CalculPermanentBrancheOrificeOuv eltMetier = new CalculPermanentBrancheOrificeOuv();
- eltMetier.setNomCalculParent(calculPermMetier.getNom());
- eltMetier.setOuv(eltPersist.Ouv);
- eltMetier.setSensOuv(eltPersist.SensOuv);
- listeDonCLimMBrancheOrifice.add(eltMetier);
- brancheMetier.addDCLM(eltMetier);
- calculPermMetier.getListeRefs().add(brancheMetier);
- }
-
- } else if (eltRefPersist instanceof BrancheSaintVenantQruisPersist) {
-
- final BrancheSaintVenantQruisPersist eltPersist = (BrancheSaintVenantQruisPersist) eltRefPersist;
- final CatEMHBranche brancheMetier = getEMHBrancheFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
- if (brancheMetier != null) {
- final CalculPermanentBrancheSaintVenantQruis eltMetier = new CalculPermanentBrancheSaintVenantQruis();
- eltMetier.setNomCalculParent(calculPermMetier.getNom());
- eltMetier.setQruis(eltPersist.Qruis);
- listeDonCLimMBrancheSaintVenant.add(eltMetier);
- brancheMetier.addDCLM(eltMetier);
- calculPermMetier.getListeRefs().add(brancheMetier);
- }
-
- } else if (eltRefPersist instanceof CasierProfilQruisPersist) {
-
- final CasierProfilQruisPersist eltPersist = (CasierProfilQruisPersist) eltRefPersist;
- final CatEMHCasier casierMetier = getEMHCasierFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
- if (casierMetier != null) {
- final CalculPermanentCasierProfilQruis eltMetier = new CalculPermanentCasierProfilQruis();
- eltMetier.setNomCalculParent(calculPermMetier.getNom());
- eltMetier.setQruis(eltPersist.Qruis);
- listeDonCLimMCasierProfil.add(eltMetier);
- casierMetier.addDCLM(eltMetier);
- calculPermMetier.getListeRefs().add(casierMetier);
- }
-
- }
- }
- calculPermMetier.setListeDonCLimMNoeudNiveauContinu(listeDonCLimMNoeudNiveauContinu);
- calculPermMetier.setListeDonCLimMBrancheOrifice(listeDonCLimMBrancheOrifice);
- calculPermMetier.setListeDonCLimMBrancheSaintVenant(listeDonCLimMBrancheSaintVenant);
- calculPermMetier.setListeDonCLimMCasierProfil(listeDonCLimMCasierProfil);
- }
-
- listeMetier.add(calculPermMetier);
- }
-
- /**
- * @param listeMetier
- * @param calculTransPersist
- * @param dataLinked
- * @param analyzer
- */
- private static void remplirDonCLimMScenarioAvecPersistanceCalculTransitoire(
- final List<CalculTransitoire> listeMetier, final CalculTransitoirePersist calculTransPersist,
- final CrueData dataLinked, final CtuluAnalyze analyzer) {
-
- final CalculTransitoire calculTransMetier = new CalculTransitoire();
- calculTransMetier.setNom(calculTransPersist.Nom);
- calculTransMetier.setDescription(calculTransPersist.Description);
-
- // *** Gestion des elements d'un calcul transitoire
- if (calculTransPersist.listeElementsCalculTransitoire == null
- || calculTransPersist.listeElementsCalculTransitoire.size() == 0) {
- analyzer.addError(CrueResource.getS("Il n'y a pas de calculs transitoires dans DCLM"));
- } 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>());
-
- for (final RefDCLMAbstractPersist eltRefPersist : calculTransPersist.listeElementsCalculTransitoire) {
-
- if (eltRefPersist instanceof NoeudNiveauContinuHydrogrammePersist) {
-
- final NoeudNiveauContinuHydrogrammePersist eltPersist = (NoeudNiveauContinuHydrogrammePersist) eltRefPersist;
- final CatEMHNoeud noeudMetier = getEMHNoeudFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
- if (noeudMetier != null) {
- final CalculTransitoireNoeudNiveauContinuHydrogramme eltMetier = new CalculTransitoireNoeudNiveauContinuHydrogramme();
- eltMetier.setNomCalculParent(calculTransMetier.getNom());
- final List<LoiDF> loisDF = new ArrayList<LoiDF>();
-
- if (eltPersist.listeHydrogrammes == null || eltPersist.listeHydrogrammes.size() == 0) {
- analyzer.addError(CrueHelper.emhEmpty("Calcul Transitoire - NoeudNiveauContinu - Hydrogrammes"));
- } else {
- for (final HydrogrammePersist hydroPersist : eltPersist.listeHydrogrammes) {
-
- final Loi loi = getLoiFromReferenceDLHY(hydroPersist.NomRef, dataLinked, analyzer);
- if (loi != null && loi instanceof LoiDF) {
- loisDF.add((LoiDF) loi);
- }
- }
- }
- eltMetier.setHydrogrammes(loisDF);
- listeDonCLimMNoeudNiveauContinu.add(eltMetier);
- noeudMetier.addDCLM(eltMetier);
- calculTransMetier.getListeRefs().add(noeudMetier);
- }
-
- } else if (eltRefPersist instanceof NoeudNiveauContinuLimnigrammePersist) {
-
- final NoeudNiveauContinuLimnigrammePersist eltPersist = (NoeudNiveauContinuLimnigrammePersist) eltRefPersist;
- final CatEMHNoeud noeudMetier = getEMHNoeudFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
- if (noeudMetier != null) {
- final CalculTransitoireNoeudNiveauContinuLimnigramme eltMetier = new CalculTransitoireNoeudNiveauContinuLimnigramme();
- eltMetier.setNomCalculParent(calculTransMetier.getNom());
-
- final List<LoiDF> loisDF = new ArrayList<LoiDF>();
-
- if (eltPersist.listeLimnigrammes == null || eltPersist.listeLimnigrammes.size() == 0) {
- analyzer.addError(CrueHelper.emhEmpty("Calcul Transitoire - NoeudNiveauContinu - Limnigrammes"));
- } else {
- for (final LimnigrammePersist limniPersist : eltPersist.listeLimnigrammes) {
-
- 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);
- }
-
- } else if (eltRefPersist instanceof NoeudNiveauContinuTarragePersist) {
-
- final NoeudNiveauContinuTarragePersist eltPersist = (NoeudNiveauContinuTarragePersist) eltRefPersist;
- final CatEMHNoeud noeudMetier = getEMHNoeudFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
- if (noeudMetier != null) {
- final CalculTransitoireNoeudNiveauContinuTarrage eltMetier = new CalculTransitoireNoeudNiveauContinuTarrage();
- eltMetier.setNomCalculParent(calculTransMetier.getNom());
-
- final List<LoiFF> loisFF = new ArrayList<LoiFF>();
-
- if (eltPersist.listeTarrages == null || eltPersist.listeTarrages.size() == 0) {
- analyzer.addError(CrueHelper.emhEmpty("Calcul Transitoire - NoeudNiveauContinu - Tarrages"));
- } 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);
- }
- }
- }
- eltMetier.setTarrages(loisFF);
- listeDonCLimMNoeudNiveauContinu.add(eltMetier);
- noeudMetier.addDCLM(eltMetier);
- calculTransMetier.getListeRefs().add(noeudMetier);
- }
-
- } else if (eltRefPersist instanceof BrancheOrificeManoeuvrePersist) {
-
- final BrancheOrificeManoeuvrePersist eltPersist = (BrancheOrificeManoeuvrePersist) eltRefPersist;
- final CatEMHBranche brancheMetier = getEMHBrancheFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
- if (brancheMetier != null) {
- final CalculTransitoireBrancheOrificeManoeuvre eltMetier = new CalculTransitoireBrancheOrificeManoeuvre();
- eltMetier.setNomCalculParent(calculTransMetier.getNom());
-
- final List<LoiDF> loisDF = new ArrayList<LoiDF>();
-
- if (eltPersist.listeManoeuvres == null || eltPersist.listeManoeuvres.size() == 0) {
-
- analyzer.addError(CrueHelper.emhEmpty("Calcul Transitoire - BrancheOrificeManoeuvre - Manoeuvres"));
- } 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);
- }
- }
- }
- eltMetier.setManoeuvres(loisDF);
- eltMetier.setSensOuv(eltPersist.SensOuv);
- listeDonCLimMBrancheOrifice.add(eltMetier);
- brancheMetier.addDCLM(eltMetier);
- calculTransMetier.getListeRefs().add(brancheMetier);
- }
-
- } else if (eltRefPersist instanceof BrancheSaintVenantHydrogrammeRuisPersist) {
-
- final BrancheSaintVenantHydrogrammeRuisPersist eltPersist = (BrancheSaintVenantHydrogrammeRuisPersist) eltRefPersist;
- final CatEMHBranche brancheMetier = getEMHBrancheFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
- if (brancheMetier != null) {
- final CalculTransitoireBrancheSaintVenantHydrogrammeRuis eltMetier = new CalculTransitoireBrancheSaintVenantHydrogrammeRuis();
- eltMetier.setNomCalculParent(calculTransMetier.getNom());
-
- final List<LoiDF> loisDF = new ArrayList<LoiDF>();
-
- if (eltPersist.listeHydrogrammesRuis == null || eltPersist.listeHydrogrammesRuis.size() == 0) {
-
- analyzer.addError(CrueHelper
- .emhEmpty("Calcul Transitoire - BrancheSaintVenantHydrogrammeRuis - HydrogrammesRuis"));
- } else {
- for (final HydrogrammeRuisPersist hydroRuisPersist : eltPersist.listeHydrogrammesRuis) {
-
- final Loi loi = getLoiFromReferenceDLHY(hydroRuisPersist.NomRef, dataLinked, analyzer);
- if (loi != null && loi instanceof LoiDF) {
- loisDF.add((LoiDF) loi);
- }
- }
- }
- eltMetier.setHydrogrammesRuis(loisDF);
- listeDonCLimMBrancheSaintVenant.add(eltMetier);
- brancheMetier.addDCLM(eltMetier);
- calculTransMetier.getListeRefs().add(brancheMetier);
- }
-
- } else if (eltRefPersist instanceof CasierProfilHydrogrammeRuisPersist) {
-
- final CasierProfilHydrogrammeRuisPersist eltPersist = (CasierProfilHydrogrammeRuisPersist) eltRefPersist;
- final CatEMHCasier casierMetier = getEMHCasierFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
- if (casierMetier != null) {
- final CalculTransitoireCasierProfilHydrogrammeRuis eltMetier = new CalculTransitoireCasierProfilHydrogrammeRuis();
- eltMetier.setNomCalculParent(calculTransMetier.getNom());
-
- final List<LoiDF> loisDF = new ArrayList<LoiDF>();
-
- if (eltPersist.listeHydrogrammesRuis == null || eltPersist.listeHydrogrammesRuis.size() == 0) {
-
- analyzer.addError(CrueHelper
- .emhEmpty("Calcul Transitoire - CasierProfilHydrogrammeRuis - HydrogrammesRuis"));
- } else {
- for (final HydrogrammeRuisPersist hydroRuisPersist : eltPersist.listeHydrogrammesRuis) {
-
- final Loi loi = getLoiFromReferenceDLHY(hydroRuisPersist.NomRef, dataLinked, analyzer);
- if (loi != null && loi instanceof LoiDF) {
- loisDF.add((LoiDF) loi);
- }
- }
- }
- eltMetier.setHydrogrammesRuis(loisDF);
- listeDonCLimMCasierProfil.add(eltMetier);
- casierMetier.addDCLM(eltMetier);
- calculTransMetier.getListeRefs().add(casierMetier);
- }
-
- }
- }
-
- calculTransMetier.setListeDonCLimMNoeudNiveauContinu(listeDonCLimMNoeudNiveauContinu);
- calculTransMetier.setListeDonCLimMBrancheOrifice(listeDonCLimMBrancheOrifice);
- calculTransMetier.setListeDonCLimMBrancheSaintVenant(listeDonCLimMBrancheSaintVenant);
- calculTransMetier.setListeDonCLimMCasierProfil(listeDonCLimMCasierProfil);
-
- }
-
- listeMetier.add(calculTransMetier);
- }
-
- /**
- * Recherche la loi correspondant au nom passé en paramètre parmi l'ensemble des lois métiers
- *
- * @param nomRef
- * @param dataLinked
- * @param analyzer
- * @return
- */
- private static Loi getLoiFromReferenceDLHY(final String nomRef, final CrueData dataLinked, final CtuluAnalyze analyzer) {
-
- Loi loi = null;
- String reference = nomRef;
-
- if (!reference.startsWith(CrueDaoDLHY.PREFIXE_REF_DLHY)) {
- analyzer.addFatalError(CrueResource.getS("Le préfixe attendu pour la référence " + reference
- + " du fichier DCLM est " + CrueDaoDLHY.PREFIXE_REF_DLHY + "."));
- return null;
- }
-
- reference = reference.substring(CrueDaoDLHY.PREFIXE_REF_DLHY.length());
- loi = LoiHelper.findByReference(reference, dataLinked.getLois());
- if (loi == null) {
- analyzer.addFatalError(CrueResource.getS("La référence " + CrueDaoDLHY.PREFIXE_REF_DLHY + reference
- + " du fichier DCLM n'a pas été trouvée."));
- return null;
- }
-
- return loi;
- }
-
- /**
- * Recherche le noeud EMH correspondant au nom passé en paramètre parmi l'ensemble des noeuds métiers
- *
- * @param nomRef
- * @param dataLinked
- * @param analyser
- * @return
- */
- private static CatEMHNoeud getEMHNoeudFromReferenceDRSO(final String nomRef, final CrueData dataLinked,
- final CtuluAnalyze analyzer) {
-
- CatEMHNoeud noeudMetier = null;
- String reference = nomRef;
-
- if (!reference.startsWith(CrueDaoDRSO.SUFFIXE_REF_DRSO)) {
- analyzer.addFatalError(CrueResource.getS("Le préfixe attendu pour la référence " + reference
- + " du fichier DCLM est " + CrueDaoDRSO.SUFFIXE_REF_DRSO + "."));
- return null;
- }
-
- reference = reference.substring(CrueDaoDRSO.SUFFIXE_REF_DRSO.length());
- noeudMetier = EMHNoeudHelper.findByReference(reference, dataLinked);
- if (noeudMetier == null) {
- analyzer.addFatalError(CrueResource.getS("La référence " + CrueDaoDRSO.SUFFIXE_REF_DRSO + reference
- + " du NoeudNiveauContinu du fichier DCLM n'a pas été trouvée."));
- return null;
- }
-
- return noeudMetier;
- }
-
- /**
- * Recherche la branche EMH correspondant au nom passé en paramètre parmi l'ensemble des branches métiers
- *
- * @param nomRef
- * @param dataLinked
- * @param analyser
- * @return
- */
- private static CatEMHBranche getEMHBrancheFromReferenceDRSO(final String nomRef, final CrueData dataLinked,
- final CtuluAnalyze analyzer) {
-
- CatEMHBranche brancheMetier = null;
- String reference = nomRef;
-
- if (!reference.startsWith(CrueDaoDRSO.SUFFIXE_REF_DRSO)) {
- analyzer.addFatalError(CrueResource.getS("Le préfixe attendu pour la référence " + reference
- + " du fichier DCLM est " + CrueDaoDRSO.SUFFIXE_REF_DRSO + "."));
- return null;
- }
-
- reference = reference.substring(CrueDaoDRSO.SUFFIXE_REF_DRSO.length());
- brancheMetier = EMHBrancheHelper.findByReference(reference, dataLinked);
- if (brancheMetier == null) {
- analyzer.addFatalError(CrueResource.getS("La référence " + CrueDaoDRSO.SUFFIXE_REF_DRSO + reference
- + " de BrancheOrifice ou BrancheSaintVenant du fichier DCLM n'a pas été trouvée."));
- return null;
- }
-
- return brancheMetier;
- }
-
- /**
- * Recherche le casier EMH correspondant au nom passé en paramètre parmi l'ensemble des casiers métiers
- *
- * @param nomRef
- * @param dataLinked
- * @param analyser
- * @return
- */
- private static CatEMHCasier getEMHCasierFromReferenceDRSO(final String nomRef, final CrueData dataLinked,
- final CtuluAnalyze analyzer) {
-
- CatEMHCasier casierMetier = null;
- String reference = nomRef;
-
- if (!reference.startsWith(CrueDaoDRSO.SUFFIXE_REF_DRSO)) {
- analyzer.addFatalError(CrueResource.getS("Le préfixe attendu pour la référence " + reference
- + " du fichier DCLM est " + CrueDaoDRSO.SUFFIXE_REF_DRSO + "."));
- return null;
- }
-
- reference = reference.substring(CrueDaoDRSO.SUFFIXE_REF_DRSO.length());
- casierMetier = EMHCasierHelper.findByReference(reference, dataLinked);
- if (casierMetier == null) {
- analyzer.addFatalError(CrueResource.getS("La référence " + CrueDaoDRSO.SUFFIXE_REF_DRSO + reference
- + " de CasierProfil du fichier DCLM n'a pas été trouvée."));
- return null;
- }
-
- return casierMetier;
- }
-
- /**
- * Chaque calcul permanent contient une liste de références EMH qui sont utilisées pour ce calcul; Chaque référence
- * EMH (de DRSO) contient une liste d'objets métier de DCLM qui sont de types métier différents mais référencent le
- * même objet EMH de DRSO. On écrit alors dans la persistance, l'objet métier qui correspond à un type possible pour
- * ce calcul et surtout au nom du calcul en cours
- *
- * @param data
- * @param analyser
- * @return
- */
- private static List<CalculAbstractPersist> remplirPersistanceDCLMAvecCalculsPermanents(
- final List<CalculPermanent> data, final CtuluAnalyze analyser) {
-
- final List<CalculAbstractPersist> listePersistante = new ArrayList<CalculAbstractPersist>();
-
- if (data == null || data.size() == 0) {
- analyser.addError(CrueResource.getS("Il n'y a pas de calculs permanents dans DCLM."));
- } else {
-
- for (final CalculPermanent calculMetier : data) {
-
- final CalculPermanentPersist calculPersist = new CalculPermanentPersist();
- calculPersist.Nom = calculMetier.getNom();
- calculPersist.Description = calculMetier.getDescription();
- calculPersist.MethodeCalcul = calculMetier.getMethodeCalcul();
-
- calculPersist.listeElementsCalculPermanent = new ArrayList<RefDCLMAbstractPersist>();
- final List<NoeudNiveauContinuQappPersist> listePersistNNCQapp = new ArrayList<NoeudNiveauContinuQappPersist>();
- final List<NoeudNiveauContinuZimposePersist> listePersistNNCZ = new ArrayList<NoeudNiveauContinuZimposePersist>();
- final List<BrancheOrificeOuvPersist> listePersistBrancheOr = new ArrayList<BrancheOrificeOuvPersist>();
- final List<BrancheSaintVenantQruisPersist> listePersistBrancheQRuis = new ArrayList<BrancheSaintVenantQruisPersist>();
- final List<CasierProfilQruisPersist> listePersistCasierQRuis = new ArrayList<CasierProfilQruisPersist>();
-
- 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 CalculPermanentNoeudNiveauContinuQapp) {
-
- final CalculPermanentNoeudNiveauContinuQapp noeudNivContQapp = (CalculPermanentNoeudNiveauContinuQapp) dataCliM;
- if (noeudNivContQapp.getNomCalculParent() != null
- && noeudNivContQapp.getNomCalculParent().equals(calculPersist.Nom)) {
- final NoeudNiveauContinuQappPersist NNCQappPersist = new NoeudNiveauContinuQappPersist();
- NNCQappPersist.NomRef = CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom();
- NNCQappPersist.Qapp = noeudNivContQapp.getQapp();
-
- listePersistNNCQapp.add(NNCQappPersist);
- trouve = true;
- break;
- }
-
- } else if (dataCliM instanceof CalculPermanentNoeudNiveauContinuZimpose) {
-
- final CalculPermanentNoeudNiveauContinuZimpose noeudNivContZ = (CalculPermanentNoeudNiveauContinuZimpose) dataCliM;
- if (noeudNivContZ.getNomCalculParent() != null
- && noeudNivContZ.getNomCalculParent().equals(calculPersist.Nom)) {
- final NoeudNiveauContinuZimposePersist NNCZPersist = new NoeudNiveauContinuZimposePersist();
- NNCZPersist.NomRef = CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom();
- NNCZPersist.Z = noeudNivContZ.getZImpose();
-
- listePersistNNCZ.add(NNCZPersist);
- trouve = true;
- break;
- }
- }
- }
- if (!trouve) {
- analyser.addError(CrueResource
- .getS("CalculPermanent - NoeudNiveauContinu : Donnee DCLM correspondant à la référence"
- + CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom() + " non trouvée"));
- }
-
- } // 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 CalculPermanentBrancheOrificeOuv) {
-
- final CalculPermanentBrancheOrificeOuv brancheCast = (CalculPermanentBrancheOrificeOuv) dataCliM;
- if (brancheCast.getNomCalculParent() != null
- && brancheCast.getNomCalculParent().equals(calculPersist.Nom)) {
- final BrancheOrificeOuvPersist brancheOrPersist = new BrancheOrificeOuvPersist();
- brancheOrPersist.NomRef = CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom();
- brancheOrPersist.SensOuv = brancheCast.getSensOuv();
- brancheOrPersist.Ouv = brancheCast.getOuv();
-
- listePersistBrancheOr.add(brancheOrPersist);
- trouve = true;
- break;
- }
-
- }
- }
- if (!trouve) {
- analyser.addError(CrueResource
- .getS("CalculPermanent - BrancheOrificeOuv : Donnee DCLM correspondant à la référence"
- + CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom() + " non trouvée"));
- }
-
- } // 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 CalculPermanentBrancheSaintVenantQruis) {
- final CalculPermanentBrancheSaintVenantQruis brancheCast = (CalculPermanentBrancheSaintVenantQruis) dataCliM;
- if (brancheCast.getNomCalculParent() != null
- && brancheCast.getNomCalculParent().equals(calculPersist.Nom)) {
- final BrancheSaintVenantQruisPersist brancheQruisPersist = new BrancheSaintVenantQruisPersist();
- brancheQruisPersist.NomRef = CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom();
- brancheQruisPersist.Qruis = brancheCast.getQruis();
-
- listePersistBrancheQRuis.add(brancheQruisPersist);
- trouve = true;
- break;
- }
- }
- }
- if (!trouve) {
- analyser.addError(CrueResource
- .getS("CalculPermanent - BrancheSaintVenantQruis : Donnee DCLM correspondant à la référence"
- + CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom() + " non trouvée"));
- }
-
- } // 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 CalculPermanentCasierProfilQruis) {
- final CalculPermanentCasierProfilQruis casierCast = (CalculPermanentCasierProfilQruis) dataCliM;
- if (casierCast.getNomCalculParent() != null
- && casierCast.getNomCalculParent().equals(calculPersist.Nom)) {
- final CasierProfilQruisPersist casierPersist = new CasierProfilQruisPersist();
- casierPersist.NomRef = CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom();
- casierPersist.Qruis = casierCast.getQruis();
-
- listePersistCasierQRuis.add(casierPersist);
- trouve = true;
- break;
- }
- }
-
- }
- if (!trouve) {
- analyser.addError(CrueResource
- .getS("CalculPermanent - CasierProfilQruis : Donnee DCLM correspondant à la référence"
- + CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom() + " non trouvée"));
- }
-
- }
- } // Fin For getListeRefs
-
- calculPersist.listeElementsCalculPermanent.addAll(listePersistNNCQapp);
- calculPersist.listeElementsCalculPermanent.addAll(listePersistNNCZ);
- calculPersist.listeElementsCalculPermanent.addAll(listePersistBrancheOr);
- calculPersist.listeElementsCalculPermanent.addAll(listePersistBrancheQRuis);
- calculPersist.listeElementsCalculPermanent.addAll(listePersistCasierQRuis);
-
- listePersistante.add(calculPersist);
-
- }// Fin for listeCalculsPermanents
-
- }
-
- return listePersistante;
- }
-
- /**
- * Chaque calcul transitoire contient une liste de références EMH qui sont utilisées pour ce calcul; Chaque référence
- * EMH (de DRSO) contient une liste d'objets métier de DCLM qui sont de types métier différents mais référencent le
- * même objet EMH de DRSO. On écrit alors dans la persistance, l'objet métier qui correspond à un type possible pour
- * ce calcul et surtout au nom du calcul en cours
- *
- * @param data
- * @param analyser
- * @return
- */
- private static List<CalculAbstractPersist> remplirPersistanceDCLMAvecCalculsTransitoires(
- final List<CalculTransitoire> data, final CtuluAnalyze analyser) {
-
- final List<CalculAbstractPersist> listePersistante = new ArrayList<CalculAbstractPersist>();
- if (data == null || data.size() == 0) {
- analyser.addError(CrueResource.getS("Il n'y a pas de calculs transitoires dans DCLM."));
- } else {
-
- for (final CalculTransitoire calculMetier : data) {
-
- final CalculTransitoirePersist calculPersist = new CalculTransitoirePersist();
- calculPersist.Nom = calculMetier.getNom();
- calculPersist.Description = calculMetier.getDescription();
-
- calculPersist.listeElementsCalculTransitoire = new ArrayList<RefDCLMAbstractPersist>();
- final List<NoeudNiveauContinuHydrogrammePersist> listePersistNNCH = new ArrayList<NoeudNiveauContinuHydrogrammePersist>();
- final List<NoeudNiveauContinuLimnigrammePersist> listePersistNNCL = new ArrayList<NoeudNiveauContinuLimnigrammePersist>();
- final List<NoeudNiveauContinuTarragePersist> listePersistNNCT = new ArrayList<NoeudNiveauContinuTarragePersist>();
- final List<BrancheOrificeManoeuvrePersist> listePersistBrancheOr = new ArrayList<BrancheOrificeManoeuvrePersist>();
- final List<BrancheSaintVenantHydrogrammeRuisPersist> listePersistBrancheHRuis = new ArrayList<BrancheSaintVenantHydrogrammeRuisPersist>();
- final List<CasierProfilHydrogrammeRuisPersist> listePersistCasierHRuis = new ArrayList<CasierProfilHydrogrammeRuisPersist>();
-
- 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 CalculTransitoireNoeudNiveauContinuHydrogramme) {
-
- final CalculTransitoireNoeudNiveauContinuHydrogramme noeudNivContH = (CalculTransitoireNoeudNiveauContinuHydrogramme) dataCliM;
- if (noeudNivContH.getNomCalculParent() != null
- && noeudNivContH.getNomCalculParent().equals(calculPersist.Nom)) {
- final NoeudNiveauContinuHydrogrammePersist NNCHPersist = new NoeudNiveauContinuHydrogrammePersist();
- NNCHPersist.NomRef = CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom();
- NNCHPersist.listeHydrogrammes = new ArrayList<HydrogrammePersist>();
- for (final LoiDF loiDF : noeudNivContH.getHydrogrammes()) {
- final HydrogrammePersist HPersist = new HydrogrammePersist();
- HPersist.NomRef = CrueDaoDLHY.PREFIXE_REF_DLHY + loiDF.getNom();
- NNCHPersist.listeHydrogrammes.add(HPersist);
- }
- listePersistNNCH.add(NNCHPersist);
- trouve = true;
- break;
- }
-
- } else if (dataCliM instanceof CalculTransitoireNoeudNiveauContinuLimnigramme) {
-
- final CalculTransitoireNoeudNiveauContinuLimnigramme noeudNivContL = (CalculTransitoireNoeudNiveauContinuLimnigramme) dataCliM;
- if (noeudNivContL.getNomCalculParent() != null
- && noeudNivContL.getNomCalculParent().equals(calculPersist.Nom)) {
- final NoeudNiveauContinuLimnigrammePersist NNCLPersist = new NoeudNiveauContinuLimnigrammePersist();
- NNCLPersist.NomRef = CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom();
- NNCLPersist.listeLimnigrammes = new ArrayList<LimnigrammePersist>();
- for (final LoiDF loiDF : noeudNivContL.getLimnigrammes()) {
- final LimnigrammePersist LPersist = new LimnigrammePersist();
- LPersist.NomRef = CrueDaoDLHY.PREFIXE_REF_DLHY + loiDF.getNom();
- NNCLPersist.listeLimnigrammes.add(LPersist);
- }
- listePersistNNCL.add(NNCLPersist);
- trouve = true;
- break;
- }
-
- } else if (dataCliM instanceof CalculTransitoireNoeudNiveauContinuTarrage) {
-
- final CalculTransitoireNoeudNiveauContinuTarrage noeudNivContT = (CalculTransitoireNoeudNiveauContinuTarrage) dataCliM;
- if (noeudNivContT.getNomCalculParent() != null
- && noeudNivContT.getNomCalculParent().equals(calculPersist.Nom)) {
- final NoeudNiveauContinuTarragePersist NNCTPersist = new NoeudNiveauContinuTarragePersist();
- NNCTPersist.NomRef = CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom();
- NNCTPersist.listeTarrages = new ArrayList<TarragePersist>();
- for (final LoiFF loiFF : noeudNivContT.getTarrages()) {
- final TarragePersist TPersist = new TarragePersist();
- TPersist.NomRef = CrueDaoDLHY.PREFIXE_REF_DLHY + loiFF.getNom();
- NNCTPersist.listeTarrages.add(TPersist);
- }
- listePersistNNCT.add(NNCTPersist);
- trouve = true;
- break;
- }
- }
- }
- if (!trouve) {
- analyser.addError(CrueResource
- .getS("CalculTransitoire - NoeudNiveauContinu : Donnee DCLM correspondant à la référence"
- + CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom() + " non trouvée"));
- }
-
- }// Fin if CatEMHNoeud
- 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 CalculTransitoireBrancheOrificeManoeuvre) {
-
- final CalculTransitoireBrancheOrificeManoeuvre brancheCast = (CalculTransitoireBrancheOrificeManoeuvre) dataCliM;
- if (brancheCast.getNomCalculParent() != null
- && brancheCast.getNomCalculParent().equals(calculPersist.Nom)) {
- final BrancheOrificeManoeuvrePersist brancheOrPersist = new BrancheOrificeManoeuvrePersist();
- brancheOrPersist.NomRef = CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom();
- brancheOrPersist.SensOuv = brancheCast.getSensOuv();
-
- brancheOrPersist.listeManoeuvres = new ArrayList<ManoeuvrePersist>();
- for (final L...
[truncated message content] |
