Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2009-03-31 19:46:25
|
Revision: 4600
http://fudaa.svn.sourceforge.net/fudaa/?rev=4600&view=rev
Author: deniger
Date: 2009-03-31 19:46:20 +0000 (Tue, 31 Mar 2009)
Log Message:
-----------
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico-crue/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-03-31 19:47:12
|
Revision: 4601
http://fudaa.svn.sourceforge.net/fudaa/?rev=4601&view=rev
Author: deniger
Date: 2009-03-31 19:47:09 +0000 (Tue, 31 Mar 2009)
Log Message:
-----------
Added Paths:
-----------
trunk/soft/fudaa-crue/fudaa/
Removed Paths:
-------------
trunk/soft/fudaa-crue/fudaa-crue/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-03-31 20:31:46
|
Revision: 4602
http://fudaa.svn.sourceforge.net/fudaa/?rev=4602&view=rev
Author: deniger
Date: 2009-03-31 20:31:42 +0000 (Tue, 31 Mar 2009)
Log Message:
-----------
maj structure
Added Paths:
-----------
trunk/soft/fudaa-crue/.project
trunk/soft/fudaa-crue/dodico/lib/
trunk/soft/fudaa-crue/dodico/lib/ctulu.jar
trunk/soft/fudaa-crue/dodico/lib/dodico.jar
trunk/soft/fudaa-crue/dodico/lib/junit.jar
trunk/soft/fudaa-crue/dodico/lib/trove.jar
trunk/soft/fudaa-crue/dodico/lib/xstream-1.3.jar
trunk/soft/fudaa-crue/dodico/src/main/
trunk/soft/fudaa-crue/dodico/src/main/java/
trunk/soft/fudaa-crue/dodico/src/main/java/org/
trunk/soft/fudaa-crue/dodico/src/main/resources/
trunk/soft/fudaa-crue/dodico/src/test/
trunk/soft/fudaa-crue/dodico/src/test/java/
trunk/soft/fudaa-crue/dodico/src/test/resources/
trunk/soft/fudaa-crue/fudaa/lib/
trunk/soft/fudaa-crue/fudaa/lib/ebli.jar
trunk/soft/fudaa-crue/fudaa/lib/fudaa.jar
trunk/soft/fudaa-crue/fudaa/lib/looks.jar
trunk/soft/fudaa-crue/fudaa/lib/org-netbeans-api-visual.jar
trunk/soft/fudaa-crue/fudaa/src/main/
trunk/soft/fudaa-crue/fudaa/src/main/java/
trunk/soft/fudaa-crue/fudaa/src/main/java/org/
trunk/soft/fudaa-crue/fudaa/src/main/resources/
trunk/soft/fudaa-crue/fudaa/src/test/
trunk/soft/fudaa-crue/fudaa/src/test/java/
trunk/soft/fudaa-crue/fudaa/src/test/resources/
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/org/
trunk/soft/fudaa-crue/fudaa/src/org/
trunk/soft/fudaa-crue/fudaa/target/
Added: trunk/soft/fudaa-crue/.project
===================================================================
--- trunk/soft/fudaa-crue/.project (rev 0)
+++ trunk/soft/fudaa-crue/.project 2009-03-31 20:31:42 UTC (rev 4602)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Fudaa-Crue root</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Added: trunk/soft/fudaa-crue/dodico/lib/ctulu.jar
===================================================================
(Binary files differ)
Property changes on: trunk/soft/fudaa-crue/dodico/lib/ctulu.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/soft/fudaa-crue/dodico/lib/dodico.jar
===================================================================
(Binary files differ)
Property changes on: trunk/soft/fudaa-crue/dodico/lib/dodico.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/soft/fudaa-crue/dodico/lib/junit.jar
===================================================================
(Binary files differ)
Property changes on: trunk/soft/fudaa-crue/dodico/lib/junit.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/soft/fudaa-crue/dodico/lib/trove.jar
===================================================================
(Binary files differ)
Property changes on: trunk/soft/fudaa-crue/dodico/lib/trove.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/soft/fudaa-crue/dodico/lib/xstream-1.3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/soft/fudaa-crue/dodico/lib/xstream-1.3.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/soft/fudaa-crue/fudaa/lib/ebli.jar
===================================================================
(Binary files differ)
Property changes on: trunk/soft/fudaa-crue/fudaa/lib/ebli.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/soft/fudaa-crue/fudaa/lib/fudaa.jar
===================================================================
(Binary files differ)
Property changes on: trunk/soft/fudaa-crue/fudaa/lib/fudaa.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/soft/fudaa-crue/fudaa/lib/looks.jar
===================================================================
(Binary files differ)
Property changes on: trunk/soft/fudaa-crue/fudaa/lib/looks.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/soft/fudaa-crue/fudaa/lib/org-netbeans-api-visual.jar
===================================================================
(Binary files differ)
Property changes on: trunk/soft/fudaa-crue/fudaa/lib/org-netbeans-api-visual.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-03-31 22:42:48
|
Revision: 4603
http://fudaa.svn.sourceforge.net/fudaa/?rev=4603&view=rev
Author: deniger
Date: 2009-03-31 22:42:38 +0000 (Tue, 31 Mar 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/lib/dodico.jar
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryETU.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoParsing.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistETU.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistOPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersit.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatETU.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/validatorXml/ValidatorXml.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormatManager.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHInfosVersion.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHModeleBase.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHModeleEnchainement.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHModeleRun.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHProjectInfos.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHRun.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHproject.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/FichierCrue.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.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/ConditionLimite.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CrueData.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DefaultEMHValues.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/DonCalcSansPrtBarrageFilEau.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/DonCalcSansPrtBranchePDC.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/DonCalcSansPrtSection.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/DonFrt.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonGeoLoc.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBranche.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBranchePdc.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitNoeud.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitSection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtClInit.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeo.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoBrancheSaintVenant.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoCasierProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoProfilCommun.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoSectionIdem.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoSectionProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtReseau.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/EMHBrancheBarrageFilEau.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheBarrageGenerique.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheBarrageRhone.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheEnchainement.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheNiveauxAssocies.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheOrifice.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBranchePdc.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheSaintVenant.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheSeuilLongitudinale.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheSeuilTransversal.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheStrickler.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHCasierMNT.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/EMHNoeudNiveauContinu.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSectionIdem.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSectionInterpolee.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/EMHSectionSansGeometrie.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/ElemSeuil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ElemSeuilAvecPdc.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Evolution.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/LigneForce.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/LimAxeHydraulique.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/LitNomme.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/LitNumerote.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Loi.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ProfilCasier.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/PtProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResCalcul.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtClinit.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeo.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeoCasier.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeoSection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtReseau.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/StriRefC.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/StriRefH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/StriRefZ.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/VariableOrdonnee.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ZDeYprim.java
trunk/soft/fudaa-crue/fudaa/lib/ebli.jar
trunk/soft/fudaa-crue/fudaa/lib/fudaa.jar
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/Crue.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueCommomImplementation.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueApplicationManager.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueExplorer.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueFileRenderer.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueSupervisorImplementation.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueModeleBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueProjet.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueScenarioBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueSousModeleBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/AppCrueTest.java
Added Paths:
-----------
trunk/soft/fudaa-crue/bookmarks.xml
trunk/soft/fudaa-crue/dodico/.classpath
trunk/soft/fudaa-crue/dodico/.project
trunk/soft/fudaa-crue/dodico/lib/ctulu-src.jar
trunk/soft/fudaa-crue/dodico/lib/dodico-src.jar
trunk/soft/fudaa-crue/dodico/src/main/config/
trunk/soft/fudaa-crue/dodico/src/main/config/export-ctulu-src.jardesc
trunk/soft/fudaa-crue/dodico/src/main/config/export-dodico-src.jardesc
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueResource.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryCommon.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue09reader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10writer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue9writer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/FrottementPoint.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/fudaa/
trunk/soft/fudaa-crue/dodico/src/test/java/org/
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/
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/TestClasse.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/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/TestCrueETU.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueInterface.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/componentTestClasse.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/testXsd.java
trunk/soft/fudaa-crue/fudaa/.classpath
trunk/soft/fudaa-crue/fudaa/.project
trunk/soft/fudaa-crue/fudaa/classes/
trunk/soft/fudaa-crue/fudaa/classes/org/
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/Crue.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/CruePersistanceErrorManager$1.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/CruePersistanceErrorManager.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/common/
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/common/CrueCommomImplementation.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/common/CruePreferences.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/common/FCrueResource.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueApplicationManager$1.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueApplicationManager$2.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueApplicationManager$FudaaExecConsole.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueApplicationManager$FudaaExecCrueView.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueApplicationManager$FudaaExecTexte.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueApplicationManager.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueExplorer$1.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueExplorer$2.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueExplorer$3.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueExplorer$ExplorerMenuItem.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueExplorer.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueFileRenderer$1.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueFileRenderer$SpecificButton.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueFileRenderer.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueLauncher$1.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueLauncher$2.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueLauncher$3.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueLauncher$4.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueLauncher$5.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueLauncher.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueSupervisorImplementation$CrueAppliMainMenu.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueSupervisorImplementation.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/projet/
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/projet/CrueModeleBuilder.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/projet/CrueProjet.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/projet/CrueScenarioBuilder.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/projet/CrueSousModeleBuilder.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/AppCrueTest$1.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/AppCrueTest$2.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/AppCrueTest$3.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/AppCrueTest$4.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/AppCrueTest$5.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/AppCrueTest$6.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/AppCrueTest.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/MainTest.class
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/java/
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/java/org/
trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/java/org/fudaa/
trunk/soft/fudaa-crue/fudaa/lib/ebli-src.jar
trunk/soft/fudaa-crue/fudaa/lib/fudaa-src.jar
trunk/soft/fudaa-crue/fudaa/lib/swingx-0.9.3-src.zip
trunk/soft/fudaa-crue/fudaa/lib/swingx-0.9.3.jar
trunk/soft/fudaa-crue/fudaa/src/main/config/
trunk/soft/fudaa-crue/fudaa/src/main/config/export-ebli-src.jardesc
trunk/soft/fudaa-crue/fudaa/src/main/config/export-ebli.jardesc
trunk/soft/fudaa-crue/fudaa/src/main/config/export-fudaa-src.jardesc
trunk/soft/fudaa-crue/fudaa/src/main/config/export-fudaa.jardesc
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/CruePersistanceErrorManager.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CruePreferences.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/FCrueResource.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/MainTest.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue09reader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue10reader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue10writer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue9writer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/fileformat/
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CruePreferences.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueRessource.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryCommom.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CruePersistanceErrorManager.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/MainTest.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/TestClasse.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/TestCrueDCSPFile.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/TestCrueDFRTFile.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/TestCrueDPTGFile.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/TestCrueDPTIFile.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/TestCrueDRSOFile.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/TestCrueETU.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/TestCrueImplementation.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/TestCrueOPTGFile.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/componentTestClasse.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/testXsd.java
Added: trunk/soft/fudaa-crue/bookmarks.xml
===================================================================
--- trunk/soft/fudaa-crue/bookmarks.xml (rev 0)
+++ trunk/soft/fudaa-crue/bookmarks.xml 2009-03-31 22:42:38 UTC (rev 4603)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bookmarks>
+ <site url="http://downloads.open.collab.net/eclipse/update-site" selected="false" name="http://downloads.open.collab.net/eclipse/update-site"/>
+ <site url="http://downloads.open.collab.net/eclipse/update-site/e3.4" selected="true" name="http://downloads.open.collab.net/eclipse/update-site/e3.4"/>
+ <site url="http://eclipse.jcraft.com/" selected="true" name="http://eclipse.jcraft.com/"/>
+ <site url="http://eclipse.svnkit.com/1.2.x/" selected="true" name="http://eclipse.svnkit.com/1.2.x/"/>
+ <site url="http://findbugs.cs.umd.edu/eclipse" selected="true" name="http://findbugs.cs.umd.edu/eclipse"/>
+ <site url="http://mylyn-mantis.sourceforge.net/eclipse/update" selected="true" name=""/>
+ <site url="http://openextern.googlecode.com/svn/trunk/openextern_update/" selected="true" name="http://openextern.googlecode.com/svn/trunk/openextern_update/"/>
+ <site url="http://pmd.sourceforge.net/eclipse" selected="true" name="http://pmd.sourceforge.net/eclipse"/>
+ <site url="http://subclipse.tigris.org/update_1.4.x" selected="true" name="http://subclipse.tigris.org/update_1.4.x"/>
+ <site url="http://update.eclipse.org/updates/3.2" selected="false" name="http://update.eclipse.org/updates/3.2"/>
+ <site url="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-site/" selected="true" name="Subversive Connectors Update Site"/>
+</bookmarks>
Added: trunk/soft/fudaa-crue/dodico/.classpath
===================================================================
--- trunk/soft/fudaa-crue/dodico/.classpath (rev 0)
+++ trunk/soft/fudaa-crue/dodico/.classpath 2009-03-31 22:42:38 UTC (rev 4603)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test/java"/>
+ <classpathentry exported="true" kind="lib" path="lib/ctulu.jar" sourcepath="lib/ctulu-src.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/dodico.jar" sourcepath="lib/dodico-src.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/junit.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/trove.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/xstream-1.3.jar"/>
+ <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="classes"/>
+</classpath>
Added: trunk/soft/fudaa-crue/dodico/.project
===================================================================
--- trunk/soft/fudaa-crue/dodico/.project (rev 0)
+++ trunk/soft/fudaa-crue/dodico/.project 2009-03-31 22:42:38 UTC (rev 4603)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>dodico-crue</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: trunk/soft/fudaa-crue/dodico/lib/ctulu-src.jar
===================================================================
(Binary files differ)
Property changes on: trunk/soft/fudaa-crue/dodico/lib/ctulu-src.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/soft/fudaa-crue/dodico/lib/dodico-src.jar
===================================================================
(Binary files differ)
Property changes on: trunk/soft/fudaa-crue/dodico/lib/dodico-src.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/soft/fudaa-crue/dodico/lib/dodico.jar
===================================================================
(Binary files differ)
Added: trunk/soft/fudaa-crue/dodico/src/main/config/export-ctulu-src.jardesc
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/config/export-ctulu-src.jardesc (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/config/export-ctulu-src.jardesc 2009-03-31 22:42:38 UTC (rev 4603)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-15" standalone="no"?>
+<jardesc>
+ <jar path="C:/devel/fudaa/Fudaa-Crue/Fudaa-Crue root/dodico/lib/ctulu-src.jar"/>
+ <options buildIfNeeded="true" compress="true" descriptionLocation="/dodico-crue/export-ctulu-src.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
+ <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
+ <selectedProjects/>
+ <selectedElements exportClassFiles="false" exportJavaFiles="true" exportOutputFolder="false">
+ <file path="/ctulu/build.xml"/>
+ <file path="/ctulu/.project.defaults"/>
+ <file path="/ctulu/.classpath.defaults"/>
+ <javaElement handleIdentifier="=ctulu/src"/>
+ <file path="/ctulu/.classpath"/>
+ <file path="/ctulu/.project"/>
+ <file path="/ctulu/.cvsignore"/>
+ </selectedElements>
+ <fatjar builder="org.eclipse.jdt.ui.plain_jar_builder" launchConfig=""/>
+</jardesc>
Added: trunk/soft/fudaa-crue/dodico/src/main/config/export-dodico-src.jardesc
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/config/export-dodico-src.jardesc (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/config/export-dodico-src.jardesc 2009-03-31 22:42:38 UTC (rev 4603)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="ISO-8859-15" standalone="no"?>
+<jardesc>
+ <jar path="C:/devel/fudaa/Fudaa-Crue/Fudaa-Crue root/dodico/lib/dodico-src.jar"/>
+ <options buildIfNeeded="true" compress="true" descriptionLocation="/dodico-crue/export-dodico-src.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
+ <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
+ <selectedProjects/>
+ <selectedElements exportClassFiles="false" exportJavaFiles="true" exportOutputFolder="false">
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.mesure"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.mascaret"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.geodesie"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.metier.loi"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.loi"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.evenement"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.ef.decorator"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.ef.impl"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.planification"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.fortran"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.ef.interpolation"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.objet"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.probabilite"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.dunes.io"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.lido.conversion"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.interpolateur"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.casier"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.calageauto"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.metier.qualitedeau"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.lido"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.navmer"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.fichiers"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.navigation"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.metier.calageauto"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.dunes"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.ef.cubature"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.singularite"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.oscar"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.ef.operation"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.ef"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.metier"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.collection"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.metier.evenement"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.metier.casier"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.metier.singularite"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.commun"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.calcul"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.ef.serviceDunes"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.dico"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.qualitedeau"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.association"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.mathematiques"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.lido.conversion.hydro1d"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.olb"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.representation"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.metier.geometrie"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.boony"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.lido.conversion.lido"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.geometrie"/>
+ <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.dimduc"/>
+ </selectedElements>
+ <fatjar builder="org.eclipse.jdt.ui.plain_jar_builder" launchConfig=""/>
+</jardesc>
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue09reader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue09reader.java 2009-03-31 20:31:42 UTC (rev 4602)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue09reader.java 2009-03-31 22:42:38 UTC (rev 4603)
@@ -1,11 +0,0 @@
-package org.fudaa.dodico.crue.IO;
-/**
- * G\xE8re la lecteure du format crue 09.
- *
- * Utilise fortran reader
- * @author Adrien Hadoux
- *
- */
-public class Crue09reader {
-
-}
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue10reader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue10reader.java 2009-03-31 20:31:42 UTC (rev 4602)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue10reader.java 2009-03-31 22:42:38 UTC (rev 4603)
@@ -1,170 +0,0 @@
-package org.fudaa.dodico.crue.IO;
-
-import java.io.File;
-import java.util.List;
-
-import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.dodico.crue.common.CrueRessource;
-import org.fudaa.dodico.crue.dao.CrueDaoParsing;
-import org.fudaa.dodico.crue.dao.CrueDaoPersistDCSP;
-import org.fudaa.dodico.crue.dao.CrueDaoPersistDFRT;
-import org.fudaa.dodico.crue.dao.CrueDaoPersistDPTG;
-import org.fudaa.dodico.crue.dao.CrueDaoPersistDPTI;
-import org.fudaa.dodico.crue.dao.CrueDaoPersistDRSO;
-import org.fudaa.dodico.crue.dao.CrueDaoPersistETU;
-import org.fudaa.dodico.crue.dao.CrueDaoPersistOPTG;
-import org.fudaa.dodico.crue.dao.CrueDaoPersit;
-import org.fudaa.dodico.crue.dao.validatorXml.ValidatorXml;
-import org.fudaa.dodico.crue.metier.EMHproject;
-import org.fudaa.dodico.crue.metier.emh.CrueData;
-import org.fudaa.dodico.crue.metier.emh.DonFrt;
-import org.fudaa.dodico.crue.metier.emh.DonPrtReseau;
-import org.fudaa.dodico.crue.metier.emh.EMH;
-
-
-
-
-/**
- * G\xE8re la lecteure du format crue 10
- *
- * Utilise du parsing xml
- * @author Adrien Hadoux
- *
- */
-public class Crue10reader {
-
- /**
- * lit le fichier et remplit les infos d'erreurs et gestion des xsd.
- * @author Adrien Hadoux
- *
- */
- protected static class ReaderWithExtra<T>{
- CrueDaoPersit<T> data;
- CtuluAnalyze listeMessageError;
- Object dataLinked;
-
- public ReaderWithExtra(CrueDaoPersit<T> data,Object dataLinked,CtuluAnalyze listeMessageError){
- this.data=data;
- this.listeMessageError=listeMessageError;
- this.dataLinked=dataLinked;
- }
- /**
- * lit le fichier et le valide via la xsd.
- * @param fichier
- * @param validatorXSDfile
- * @return
- */
- public T read(File fichier,String validatorXSDfile){
-
- listeMessageError.setDesc(CrueRessource.getS(" Analyse du Fichier "+fichier.getName()));
-
- //-- evaluation du fichier avec la xsd --//
- if(!ValidatorXml.validXMLWithDOM(fichier.getAbsolutePath(), validatorXSDfile, listeMessageError) ){
- listeMessageError.addWarn( CrueRessource.getS("Fichier "+fichier.getName()+" non valid\xE9 par la XSD "+validatorXSDfile),0);
- }
-
- //-- lecture des donn\xE9es --//
- CrueDaoParsing<T> parser=new CrueDaoParsing<T>(data);
- T res= parser.getPersistData(dataLinked, fichier, listeMessageError);
-
-
-
- return res;
- }
-
- }
-
-
- /**
- * lit le fichier xml ETU
- * ETU - Le fichier ETU d\xE9crit les conditions initiales
- * et retourne les donn\xE9es m\xE9tier correspondantes.
- * Attention, il faut fournir en entree les structures de donnees DRSO
- * car le fichier ETU ne contient que des references vers les objets d\xE9crits dans DRSO.
- */
- public static EMHproject readETUFile( File fichierETU,CtuluAnalyze listeMessageError){
- return (new ReaderWithExtra<EMHproject>(new CrueDaoPersistETU(),null,listeMessageError)).read(fichierETU, ValidatorXml.xsdETU);
- }
-
-
-
-
- /**
- * lit le fichier xml DRSO
- * DRSO - Fichier des donn\xE9es du r\xE9seau (xml)
- * et retourne les donn\xE9es m\xE9tier correspondantes.
- * @param fichierDRSO
- * @return
- */
- public static CrueData readDRSOFile( File fichierDRSO,CtuluAnalyze listeMessageError){
-
- //-- remplissage des donnees m\xE9tier a partir des persistantes--//
- return (new ReaderWithExtra<CrueData>(new CrueDaoPersistDRSO(),null,listeMessageError)).read(fichierDRSO, ValidatorXml.xsdDRSO);
-
- }
-
-
- /**
- * lit le fichier xml DPTI
- * DPTI - Le fichier DPTI d\xE9crit les conditions initiales
- * et retourne les donn\xE9es m\xE9tier correspondantes.
- * Attention, il faut fournir en entree les structures de donnees DRSO
- * car le fichier DPTI ne contient que des references vers les objets d\xE9crits dans DRSO.
- */
- public static void readDPTIFile( File fichierDPTI,CrueData dataDRSO,CtuluAnalyze listeMessageError){
- (new ReaderWithExtra<CrueData>(new CrueDaoPersistDPTI(),dataDRSO,listeMessageError)).read(fichierDPTI, ValidatorXml.xsdDPTI);
- }
-
-
-
- /**
- * Lit le fichier xml \xE0 l'emplacement fichierDDPTG
- * DPTG - Fichier des donn\xE9es de pr\xE9traitement g\xE9om\xE9trique (xml)
- * a partir des donn\xE9es m\xE9tiers fournies.
- * ATTENTION: DPTG a besoin du fichier DRSO et DFRT car il contient des r\xE9f\xE9rences vers ces objets.
- */
- public static void readDPTGFile( File fichierDPTG,CrueData dataDRSOetDFRT, CtuluAnalyze listeMessageError){
-
- (new ReaderWithExtra<CrueData>(new CrueDaoPersistDPTG(),dataDRSOetDFRT,listeMessageError)).read(fichierDPTG, ValidatorXml.xsdDPTG);
- }
-
- /**
- * lit le fichier xml DSCP
- * DSCP - Le fichier DSCP d\xE9crit les variables de calculs pour les branches.
- * et retourne les donn\xE9es m\xE9tier correspondantes.
- * Attention, il faut fournir en entree les structures de donnees DRSO
- * car le fichier DSCP ne contient que des references vers les objets d\xE9crits dans DRSO.
- */
- public static void readDSCPFile( File fichierDSCP,List<EMH> dataDRSO,CtuluAnalyze listeMessageError){
- (new ReaderWithExtra<List<EMH>>(new CrueDaoPersistDCSP(),dataDRSO,listeMessageError)).read(fichierDSCP, ValidatorXml.xsdDCSP);
- }
-
- /**
- * lit le fichier xml DFRT
- * DFRT - Fichier des frottements (xml)
- * et retourne les donn\xE9es m\xE9tier correspondantes.
- * @param fichierDFRT
- * @return
- */
- public static List<DonFrt> readDFRTFile( File fichierDFRT,CtuluAnalyze listeMessageError){
- return (new ReaderWithExtra<List<DonFrt>>(new CrueDaoPersistDFRT(),null,listeMessageError)).read(fichierDFRT, ValidatorXml.xsdDFRT);
-
- }
-
- /**
- * lit le fichier xml OPTG
- * OPTG - Fichier des ordres pour le pr\xE9traitement g\xE9om\xE9trique (xml).
- * et retourne les donn\xE9es m\xE9tier correspondantes.
- * @param fichierOPTG
- * @return
- */
- public static DonPrtReseau readOPTGFile( File fichierOPTG,CtuluAnalyze listeMessageError){
- return (new ReaderWithExtra<DonPrtReseau>(new CrueDaoPersistOPTG(),null,listeMessageError)).read(fichierOPTG, ValidatorXml.xsdOPTG);
-
- }
-
-
-
-
-
-}
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue10writer.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue10writer.java 2009-03-31 20:31:42 UTC (rev 4602)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue10writer.java 2009-03-31 22:42:38 UTC (rev 4603)
@@ -1,133 +0,0 @@
-package org.fudaa.dodico.crue.IO;
-
-import java.io.File;
-import java.util.List;
-
-import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.dodico.crue.common.CrueRessource;
-import org.fudaa.dodico.crue.dao.CrueDaoParsing;
-import org.fudaa.dodico.crue.dao.CrueDaoPersistDCSP;
-import org.fudaa.dodico.crue.dao.CrueDaoPersistDFRT;
-import org.fudaa.dodico.crue.dao.CrueDaoPersistDPTG;
-import org.fudaa.dodico.crue.dao.CrueDaoPersistDPTI;
-import org.fudaa.dodico.crue.dao.CrueDaoPersistDRSO;
-import org.fudaa.dodico.crue.dao.CrueDaoPersistOPTG;
-import org.fudaa.dodico.crue.dao.CrueDaoPersit;
-import org.fudaa.dodico.crue.metier.emh.CrueData;
-import org.fudaa.dodico.crue.metier.emh.DonFrt;
-import org.fudaa.dodico.crue.metier.emh.DonPrtReseau;
-import org.fudaa.dodico.crue.metier.emh.EMH;
-
-
-
-/**
- * Writer qui g\xE8re l'io vers le format crue 10.
- *
- * Utilise du parsing xml
- * @author Adrien Hadoux
- *
- */
-public class Crue10writer {
-
-
- protected static class WriterWithExtra<T>{
-
- CrueDaoPersit<T> data;
- T dataMetier;
-
- public WriterWithExtra(CrueDaoPersit<T> data,T dataMetier){
- this.data=data;
- this.dataMetier=dataMetier;
- }
-
- public boolean write(CtuluAnalyze listeMessageError, File f){
-
- listeMessageError.setDesc(CrueRessource.getS(" Analyse du Fichier "+f.getName()));
-
- data.fillInfosWith(dataMetier,listeMessageError);
- CrueDaoParsing<T> parser=new CrueDaoParsing<T>(data);
- return parser.persistData(f,listeMessageError);
- }
-
- }
-
- /**
- * Ecrit le fichier xml \xE0 l'emplacement fichierDRSO
- * DRSO - Fichier des donn\xE9es du r\xE9seau (xml)
- * a partir des donn\xE9es m\xE9tiers fournies.
- */
- public static boolean writeDRSOFile(CrueData data, File fichierDRSO,CtuluAnalyze listeMessageError){
- return (new WriterWithExtra<CrueData>(new CrueDaoPersistDRSO(),data)).write(listeMessageError, fichierDRSO);
- }
-
-
- /**
- * Ecrit le fichier xml \xE0 l'emplacement fichierDDPTI
- * DPTI - Le fichier DPTI d\xE9crit les conditions initiales
- * a partir des donn\xE9es m\xE9tiers fournies.
- */
- public static boolean writeDPTIFile(CrueData data, File fichierDPTI,CtuluAnalyze listeMessageError){
-
-
- return (new WriterWithExtra<CrueData>(new CrueDaoPersistDPTI(),data)).write(listeMessageError, fichierDPTI);
- }
-
-
- /**
- * Ecrit le fichier xml \xE0 l'emplacement fichierDDPTI
- * DSCP - Le fichier DSCP d\xE9crit les variables de calcul pour les branches
- * a partir des donn\xE9es m\xE9tiers fournies.
- */
- public static boolean writeDSCPFile(List<EMH> data, File fichierDSCP,CtuluAnalyze listeMessageError){
- return (new WriterWithExtra<List<EMH>>(new CrueDaoPersistDCSP(),data)).write(listeMessageError, fichierDSCP);
- }
-
- /**
- * Ecrit le fichier xml \xE0 l'emplacement fichierDRSO
- * DFRT - Fichier des frottements (xml)
- * a partir des donn\xE9es m\xE9tiers fournies.
- */
- public static boolean writeDFRTFile(List<DonFrt> data, File fichierDFRT,CtuluAnalyze listeMessageError){
- return (new WriterWithExtra<List<DonFrt>>(new CrueDaoPersistDFRT(),data)).write(listeMessageError, fichierDFRT);
- }
-
-
- /**
- * Ecrit le fichier xml \xE0 l'emplacement fichierDDPTG
- * DPTG - Fichier des donn\xE9es de pr\xE9traitement g\xE9om\xE9trique (xml)
- * a partir des donn\xE9es m\xE9tiers fournies.
- */
- public static boolean writeDPTGFile(CrueData data, File fichierDPTG,CtuluAnalyze listeMessageError){
- return (new WriterWithExtra<CrueData>(new CrueDaoPersistDPTG(),data)).write(listeMessageError, fichierDPTG);
- }
-
- /**
- * ecrit le fichier xml OPTG
- * OPTG - Fichier des ordres pour le pr\xE9traitement g\xE9om\xE9trique (xml).
- * et retourne les donn\xE9es m\xE9tier correspondantes.
- * @param fichierOPTG
- * @return
- */
- public static boolean writeOPTGFile(DonPrtReseau data, File fichierOPTG,CtuluAnalyze listeMessageError){
- CrueDaoPersistOPTG dataPersistante=new CrueDaoPersistOPTG();
- return (new WriterWithExtra<DonPrtReseau>(new CrueDaoPersistOPTG(),data)).write(listeMessageError, fichierOPTG);
- }
-
- /**
- * Methode qui \xE9crit l'ensemble du projet au format crue.
- * TODO: adrien: il faut mettre en param d'entr\xE9e un emhScenario qui contient les noms de tous les fichiers.
- * @return
- */
- public static boolean writeProjetCrue10(){
- boolean ok=false;
- //TODO faire la methode.
-
-
-
-
- return ok;
- }
-
-
-
-}
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue9writer.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue9writer.java 2009-03-31 20:31:42 UTC (rev 4602)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue9writer.java 2009-03-31 22:42:38 UTC (rev 4603)
@@ -1,11 +0,0 @@
-package org.fudaa.dodico.crue.IO;
-
-/**
- * writer qui permet d'\xE9crier les structures de crue 09 dans les fichiers appropri\xE9s.
- * Utilise fortran writer
- * @author Adrien Hadoux
- *
- */
-public class Crue9writer {
-
-}
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CruePreferences.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CruePreferences.java 2009-03-31 20:31:42 UTC (rev 4602)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CruePreferences.java 2009-03-31 22:42:38 UTC (rev 4603)
@@ -1,30 +0,0 @@
-package org.fudaa.dodico.crue.common;
-
-import org.fudaa.fudaa.commun.FudaaPreferencesAbstract;
-/**
- * Preferences pour crue.
- * @author Adrien Hadoux
- *
- */
-public class CruePreferences extends FudaaPreferencesAbstract {
- public static final String KEY_SERVEUR_PREFIXE = "serveur";
- public static final String KEY_SERVEUR_SHOW_LOG = "serveur.log";
- public static final String KEY_CODE_ID = "crue.code.id";
-
-
-
- /**
- * Singleton.
- */
- public final static CruePreferences Crue = new CruePreferences();
-
- private CruePreferences() {
- super();
- }
-
- @Override
- public void applyOn(final Object _o) {
-
- }
-}
-
Copied: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueResource.java (from rev 4602, trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueRessource.java)
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueResource.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueResource.java 2009-03-31 22:42:38 UTC (rev 4603)
@@ -0,0 +1,69 @@
+package org.fudaa.dodico.crue.common;
+
+import org.fudaa.dodico.commun.DodicoResource;
+
+import com.memoire.bu.BuResource;
+
+/**
+ * TODO Fred a enlever Ressources crue. Utilit\xE9 ?
+ *
+ * @author Adrien Hadoux
+ */
+public class CrueResource extends DodicoResource {
+
+ public final static CrueResource CRUE = new CrueResource(DodicoResource.DODICO);
+ public final static String SOFTWARE_ID = "Crue";
+
+ private CrueResource(final BuResource _b) {
+ super(_b);
+ }
+
+ public static String getS(final String _s) {
+ return CRUE.getString(_s);
+ }
+
+ public static String getS(final String _s, final String _v0) {
+ return CRUE.getString(_s, _v0);
+ }
+
+ public static String getS(final String _s, final String _v0, final String _v1) {
+ return CRUE.getString(_s, _v0, _v1);
+ }
+
+ // public static BuIcon getLogo() {
+ // return EbliResource.EBLI.getIcon("logo-crue");
+ // }
+ //
+ // public BuIcon getIcon(String val) {
+ // return EbliResource.EBLI.getIcon(val);
+ // }
+ //
+ // // public static String getMeshName() {
+ // // return CrueRessource.getS("Meshview");
+ // // }
+ //
+ // public static BuIcon getSupervisorIcon() {
+ // return EbliResource.EBLI.getIcon("crystal16_browser.png");
+ // }
+ //
+ // public static BuIcon getCrueIcon() {
+ // return EbliResource.EBLI.getIcon("aproposde_32.gif");
+ // }
+ //
+ // public static BuIcon getScopIcon() {
+ // return EbliResource.EBLI.getIcon("curves");
+ // }
+
+ // public static String getCrueName() {
+ // return CrueResource.getS("Crue");
+ // }
+ //
+ // public static String getEditorName() {
+ // return CrueResource.getS("Editeur");
+ // }
+ //
+ // public static BuIcon getEditorIcon() {
+ // return EbliResource.EBLI.getIcon("texte");
+ // }
+
+}
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueRessource.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueRessource.java 2009-03-31 20:31:42 UTC (rev 4602)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueRessource.java 2009-03-31 22:42:38 UTC (rev 4603)
@@ -1,76 +0,0 @@
-package org.fudaa.dodico.crue.common;
-
-import org.fudaa.ebli.ressource.EbliResource;
-
-import org.fudaa.fudaa.ressource.FudaaResource;
-
-import com.memoire.bu.BuIcon;
-import com.memoire.bu.BuResource;
-
-/**
- * Ressources crue.
- *
- * @author Adrien Hadoux
- *
- */
-public class CrueRessource extends FudaaResource {
-
- public final static CrueRessource CRUE = new CrueRessource(BuResource.BU);
- public final static String SOFTWARE_ID="Crue";
- private CrueRessource(final BuResource _b) {
- super(_b);
- }
-
- public static String getS(final String _s) {
- return EbliResource.EBLI.getString(_s);
- }
-
- public static String getS(final String _s, final String _v0) {
- return EbliResource.EBLI.getString(_s, _v0);
- }
-
- public static String getS(final String _s, final String _v0,
- final String _v1) {
- return EbliResource.EBLI.getString(_s, _v0, _v1);
- }
-
- public static BuIcon getMeshIcon() {
- return EbliResource.EBLI.getIcon("crue");
- }
-
- public static BuIcon getLogo() {
- return EbliResource.EBLI.getIcon("logo-crue");
- }
-
- public BuIcon getIcon(String val) {
- return EbliResource.EBLI.getIcon(val);
- }
-// public static String getMeshName() {
-// return CrueRessource.getS("Meshview");
-// }
-
- public static BuIcon getSupervisorIcon() {
- return EbliResource.EBLI.getIcon("crystal16_browser.png");
- }
-
- public static BuIcon getCrueIcon() {
- return EbliResource.EBLI.getIcon("aproposde_32.gif");
- }
-
- public static BuIcon getScopIcon() {
- return EbliResource.EBLI.getIcon("curves");
- }
-
- public static String getCrueName() {
- return CrueRessource.getS("Crue");
- }
-
- public static String getEditorName() {
- return CrueRessource.getS("Editeur");
- }
-
- public static BuIcon getEditorIcon(){
- return EbliResource.EBLI.getIcon("texte");
- }
-
-}
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryCommom.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryCommom.java 2009-03-31 20:31:42 UTC (rev 4602)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryCommom.java 2009-03-31 22:42:38 UTC (rev 4603)
@@ -1,154 +0,0 @@
-package org.fudaa.dodico.crue.dao;
-
-import java.util.Date;
-import java.util.List;
-
-import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.dodico.crue.common.CrueRessource;
-import org.fudaa.dodico.crue.metier.emh.PtProfil;
-
-
-
-/**
- * Plusieurs m\xE9thodes et classes communes utilis\xE9es pour les factory.
- * @author Adrien Hadoux
- *
- */
-public class CrueDaoFactoryCommom {
-
- public static String VersionCrue="0.0";
- public static String Commentaire="Genere par Fudaa le "+new Date(System.currentTimeMillis());
-
- //-- listing des diff\xE9rents fichiers et leur noms utilis\xE9s --//
- public static String ETU="ETU";
-
- public static String DRSO="DRSO";
- public static String ORES="ORES";
- public static String OCAL="OCAL";
- public static String PCAL="PCAL";
- public static String DCLM="DCLM";
- public static String DLHY="DLHY";
- public static String OPTR="OPTR";
- public static String OPTG="OPTG";
- public static String OPTI="OPTI";
- public static String PNUM="PNUM";
- public static String DPTI="DPTI";
- public static String DCSP="DCSP";
- public static String DPTG="DPTG";
- public static String DFRT="DFRT";
- public static String DC="DC";
- public static String DH="DH";
-
-
- //-- fichiers de resultats --//
- public static String FICHIERRESULTAT="RESULTAT";
-
- public static String RPTR="RPTR";
- public static String RPTG="RPTG";
- public static String RPTI="RPTI";
- public static String RCAL="RCAL";
-
-
-
-
-
- /**
- * Construit un ptProfil a partir d'une chaine de caracteres.
- * Utilis\xE9 pour DPTG
- * @param buff
- * @param listeMessageError
- * @param nameError
- * @return
- */
- public static PtProfil createFormString(StringBuffer buff,CtuluAnalyze analyser,String nameError ){
- int indiceCesure=buff.lastIndexOf(" ");
- String val1=buff.substring(0, indiceCesure);
- String val2=buff.substring(indiceCesure+1, buff.length());
- double x=0;
- try{
- x=Double.parseDouble(val1);
-
- }catch(NumberFormatException e){
- analyser.addInfo(CrueRessource.getS("Profil: "+nameError+": impossible de r\xE9cup\xE9rer la lim debut du contenu: "+buff));
- }
- double y=0;
- try{
- y=Double.parseDouble(val2);
- }catch(NumberFormatException e){
- analyser.addInfo(CrueRessource.getS("Profil: "+nameError+": impossible de r\xE9cup\xE9rer la lim debut du contenu: "+buff));
- }
-
- PtProfil profil=new PtProfil(x,y);
- return profil;
- }
- public static PtProfil createFormString(String buff,CtuluAnalyze analyser,String nameError ){
- return createFormString(new StringBuffer(buff), analyser, nameError);
- }
-
-
- /**
- * Message qui indique la balise n'est pas reconnue par les structures de donn\xE9es EMH.
- * @param balise
- * @param nomRef
- * @return
- */
- public static String unknowEMH(String balise,String nomEMH){
- return CrueRessource.getS(balise+": Il n'existe pas de structure de donn\xE9e EMH pour l'objet "+nomEMH);
- }
-
-
- public static String unknowdataFromFile(String balise,String FileType,String nomEMH){
- return CrueRessource.getS(balise+": Il n'existe pas de structure de donn\xE9e "+FileType+" pour l'objet "+nomEMH);
- }
-
- /**
- * Message qui indique la balise n'est pas reconnue par les structures de donn\xE9es EMH.
- * @param balise
- * @param nomRef
- * @return
- */
- public static String unknowReference(String balise,String nomRef){
- return CrueRessource.getS(balise+": Impossible de trouver "+balise+" de r\xE9f\xE9rence "+nomRef);
-
- }
-
- /**
- * Envoie un message formatt\xE9 pour une erreur de doublons d'id
- * @param balise
- * @param nomRef
- * @return
- */
- public static String errorIdNonUnique(String balise,String nomRef){
- return CrueRessource.getS("<"+balise+">: l'id "+nomRef+" est en doublon, il ne sera donc pas ");
-
- }
-
-
- public static String messageBaliseError(String balise,String message){
- return CrueRessource.getS(balise+": "+message);
-
- }
-
-
- /**
- * Message qui indique la balise n'est pas reconnue par les structures de donn\xE9es EMH.
- * @param balise
- * @param nomRef
- * @return
- */
- public static String listEmpty(String balise){
- return CrueRessource.getS("Sections <"+balise+">: la liste est vide.");
-
- }
-
- public static String emhEmpty(String balise){
- return CrueRessource.getS("EMH: Aucune donn\xE9es EMH trouv\xE9e pour <"+balise+">.");
-
- }
-
-
-
-
-
-
-}
Copied: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryCommon.java (from rev 4602, trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryCommom.java)
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryCommon.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryCommon.java 2009-03-31 22:42:38 UTC (rev 4603)
@@ -0,0 +1,145 @@
+package org.fudaa.dodico.crue.dao;
+
+import java.util.Date;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.common.CrueResource;
+import org.fudaa.dodico.crue.metier.emh.PtProfil;
+
+/**
+ * Plusieurs m\xE9thodes et classes communes utilis\xE9es pour les factory.
+ *
+ * @author Adrien Hadoux
+ */
+public class CrueDaoFactoryCommon {
+
+ public static String VersionCrue = "0.0";
+ public static String Commentaire = "Genere par Fudaa le " + new Date(System.currentTimeMillis());
+
+ // -- listing des diff\xE9rents fichiers et leur noms utilis\xE9s --//
+ public static String ETU = "ETU";
+
+ public static String DRSO = "DRSO";
+ public static String ORES = "ORES";
+ public static String OCAL = "OCAL";
+ public static String PCAL = "PCAL";
+ public static String DCLM = "DCLM";
+ public static String DLHY = "DLHY";
+ public static String OPTR = "OPTR";
+ public static String OPTG = "OPTG";
+ public static String OPTI = "OPTI";
+ public static String PNUM = "PNUM";
+ public static String DPTI = "DPTI";
+ public static String DCSP = "DCSP";
+ public static String DPTG = "DPTG";
+ public static String DFRT = "DFRT";
+ public static String DC = "DC";
+ public static String DH = "DH";
+
+ // -- fichiers de resultats --//
+ public static String FICHIERRESULTAT = "RESULTAT";
+
+ public static String RPTR = "RPTR";
+ public static String RPTG = "RPTG";
+ public static String RPTI = "RPTI";
+ public static String RCAL = "RCAL";
+
+ /**
+ * Construit un ptProfil a partir d'une chaine de caracteres. Utilis\xE9 pour DPTG
+ *
+ * @param buff
+ * @param listeMessageError
+ * @param nameError
+ * @return
+ */
+ public static PtProfil createFormString(final StringBuffer buff, final CtuluAnalyze analyser, final String nameError) {
+ final int indiceCesure = buff.lastIndexOf(" ");
+ final String val1 = buff.substring(0, indiceCesure);
+ final String val2 = buff.substring(indiceCesure + 1, buff.length());
+ double x = 0;
+ try {
+ x = Double.parseDouble(val1);
+
+ } catch (final NumberFormatException e) {
+ analyser.addInfo(CrueResource.getS("Profil: " + nameError + ": impossible de r\xE9cup\xE9rer la lim debut du contenu: "
+ + buff));
+ }
+ double y = 0;
+ try {
+ y = Double.parseDouble(val2);
+ } catch (final NumberFormatException e) {
+ analyser.addInfo(CrueResource.getS("Profil: " + nameError + ": impossible de r\xE9cup\xE9rer la lim debut du contenu: "
+ + buff));
+ }
+
+ final PtProfil profil = new PtProfil(x, y);
+ return profil;
+ }
+
+ public static PtProfil createFormString(final String buff, final CtuluAnalyze analyser, final String nameError) {
+ return createFormString(new StringBuffer(buff), analyser, nameError);
+ }
+
+ /**
+ * Message qui indique la balise n'est pas reconnue par les structures de donn\xE9es EMH.
+ *
+ * @param balise
+ * @param nomRef
+ * @return
+ */
+ public static String unknowEMH(final String balise, final String nomEMH) {
+ return CrueResource.getS(balise + ": Il n'existe pas de structure de donn\xE9e EMH pour l'objet " + nomEMH);
+ }
+
+ public static String unknowdataFromFile(final String balise, final String File...
[truncated message content] |
|
From: <car...@us...> - 2009-04-02 18:35:21
|
Revision: 4610
http://fudaa.svn.sourceforge.net/fudaa/?rev=4610&view=rev
Author: caroledel
Date: 2009-04-02 18:35:17 +0000 (Thu, 02 Apr 2009)
Log Message:
-----------
ajout des sources dans le build path
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/.classpath
trunk/soft/fudaa-crue/fudaa/.classpath
Modified: trunk/soft/fudaa-crue/dodico/.classpath
===================================================================
--- trunk/soft/fudaa-crue/dodico/.classpath 2009-04-01 20:29:36 UTC (rev 4609)
+++ trunk/soft/fudaa-crue/dodico/.classpath 2009-04-02 18:35:17 UTC (rev 4610)
@@ -2,6 +2,8 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
+ <classpathentry kind="src" path="src/test/resources"/>
+ <classpathentry kind="src" path="src/main/resources"/>
<classpathentry exported="true" kind="lib" path="lib/ctulu.jar" sourcepath="lib/ctulu-src.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dodico.jar" sourcepath="lib/dodico-src.jar"/>
<classpathentry exported="true" kind="lib" path="lib/junit.jar"/>
Modified: trunk/soft/fudaa-crue/fudaa/.classpath
===================================================================
--- trunk/soft/fudaa-crue/fudaa/.classpath 2009-04-01 20:29:36 UTC (rev 4609)
+++ trunk/soft/fudaa-crue/fudaa/.classpath 2009-04-02 18:35:17 UTC (rev 4610)
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" path="src/test/resources"/>
<classpathentry kind="lib" path="lib/ebli.jar" sourcepath="lib/ebli-src.jar"/>
<classpathentry kind="lib" path="lib/fudaa.jar" sourcepath="lib/fudaa-src.jar"/>
<classpathentry kind="lib" path="lib/looks.jar"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2009-04-03 16:08:43
|
Revision: 4611
http://fudaa.svn.sourceforge.net/fudaa/?rev=4611&view=rev
Author: hadouxad
Date: 2009-04-03 16:08:15 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
* Refactorisation de l'application:
o les fichiers de tests sont dans le package des tests, plus de chemins en dur...
o Refactorisation des finder dans un package helper, ces m?\195?\169thodes statiques sont appel?\195?\169es pour r?\195?\169cup?\195?\169rer les emh.
o Rennomage de certaines classes (factory->converter...)
* Mise en place des tests unitaires
o Mise en place des tests unitaires dans le sous projet dodico
o Ecriture d'une interface qui d?\195?\169finit le contrat minimal de m?\195?\169thodes ?\195?\160 tester pour les tests unitaires (lecture,ecriture, les 2 , ecriture d'au moins une methode de test asser en lecture et ecriture)
o Mise en place du r?\195?\169pertoire de fichiers de tests utilis?\195?\169s par tous les tests unitaires : le r?\195?\169pertoire se nomme fichierTest et situe dans le package de test org.fudaa.dodico.crue.dao
o Exemples mis en place pour les tests DRSO et ETU.
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistETU.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistOPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatETU.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/validatorXml/ValidatorXml.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHSection.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/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/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/TestCrueETU.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueInterface.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueOPTGFile.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/dao/CrueDaoConverterCommon.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterETU.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHBrancheHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHCasierHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHNoeudHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHSectionHelper.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/fichierTest/
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/fichierTest/Etude.etu.xml
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryCommon.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryETU.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/java/org/fudaa/
Copied: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterCommon.java (from rev 4607, trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryCommon.java)
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterCommon.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterCommon.java 2009-04-03 16:08:15 UTC (rev 4611)
@@ -0,0 +1,145 @@
+package org.fudaa.dodico.crue.dao;
+
+import java.util.Date;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.common.CrueResource;
+import org.fudaa.dodico.crue.metier.emh.PtProfil;
+
+/**
+ * Plusieurs m\xE9thodes et classes communes utilis\xE9es pour les factory.
+ *
+ * @author Adrien Hadoux
+ */
+public class CrueDaoConverterCommon {
+
+ public static String VersionCrue = "0.0";
+ public static String Commentaire = "Genere par Fudaa le " + new Date(System.currentTimeMillis());
+
+ // -- listing des diff\xE9rents fichiers et leur noms utilis\xE9s --//
+ public static String ETU = "ETU";
+
+ public static String DRSO = "DRSO";
+ public static String ORES = "ORES";
+ public static String OCAL = "OCAL";
+ public static String PCAL = "PCAL";
+ public static String DCLM = "DCLM";
+ public static String DLHY = "DLHY";
+ public static String OPTR = "OPTR";
+ public static String OPTG = "OPTG";
+ public static String OPTI = "OPTI";
+ public static String PNUM = "PNUM";
+ public static String DPTI = "DPTI";
+ public static String DCSP = "DCSP";
+ public static String DPTG = "DPTG";
+ public static String DFRT = "DFRT";
+ public static String DC = "DC";
+ public static String DH = "DH";
+
+ // -- fichiers de resultats --//
+ public static String FICHIERRESULTAT = "RESULTAT";
+
+ public static String RPTR = "RPTR";
+ public static String RPTG = "RPTG";
+ public static String RPTI = "RPTI";
+ public static String RCAL = "RCAL";
+
+ /**
+ * Construit un ptProfil a partir d'une chaine de caracteres. Utilis\xE9 pour DPTG
+ *
+ * @param buff
+ * @param listeMessageError
+ * @param nameError
+ * @return
+ */
+ public static PtProfil createFormString(final StringBuffer buff, final CtuluAnalyze analyser, final String nameError) {
+ final int indiceCesure = buff.lastIndexOf(" ");
+ final String val1 = buff.substring(0, indiceCesure);
+ final String val2 = buff.substring(indiceCesure + 1, buff.length());
+ double x = 0;
+ try {
+ x = Double.parseDouble(val1);
+
+ } catch (final NumberFormatException e) {
+ analyser.addInfo(CrueResource.getS("Profil: " + nameError + ": impossible de r\xE9cup\xE9rer la lim debut du contenu: "
+ + buff));
+ }
+ double y = 0;
+ try {
+ y = Double.parseDouble(val2);
+ } catch (final NumberFormatException e) {
+ analyser.addInfo(CrueResource.getS("Profil: " + nameError + ": impossible de r\xE9cup\xE9rer la lim debut du contenu: "
+ + buff));
+ }
+
+ final PtProfil profil = new PtProfil(x, y);
+ return profil;
+ }
+
+ public static PtProfil createFormString(final String buff, final CtuluAnalyze analyser, final String nameError) {
+ return createFormString(new StringBuffer(buff), analyser, nameError);
+ }
+
+ /**
+ * Message qui indique la balise n'est pas reconnue par les structures de donn\xE9es EMH.
+ *
+ * @param balise
+ * @param nomRef
+ * @return
+ */
+ public static String unknowEMH(final String balise, final String nomEMH) {
+ return CrueResource.getS(balise + ": Il n'existe pas de structure de donn\xE9e EMH pour l'objet " + nomEMH);
+ }
+
+ public static String unknowdataFromFile(final String balise, final String FileType, final String nomEMH) {
+ return CrueResource.getS(balise + ": Il n'existe pas de structure de donn\xE9e " + FileType + " pour l'objet "
+ + nomEMH);
+ }
+
+ /**
+ * Message qui indique la balise n'est pas reconnue par les structures de donn\xE9es EMH.
+ *
+ * @param balise
+ * @param nomRef
+ * @return
+ */
+ public static String unknowReference(final String balise, final String nomRef) {
+ return CrueResource.getS(balise + ": Impossible de trouver " + balise + " de r\xE9f\xE9rence " + nomRef);
+
+ }
+
+ /**
+ * Envoie un message formatt\xE9 pour une erreur de doublons d'id
+ *
+ * @param balise
+ * @param nomRef
+ * @return
+ */
+ public static String errorIdNonUnique(final String balise, final String nomRef) {
+ return CrueResource.getS("<" + balise + ">: l'id " + nomRef + " est en doublon, il ne sera donc pas ");
+
+ }
+
+ public static String messageBaliseError(final String balise, final String message) {
+ return CrueResource.getS(balise + ": " + message);
+
+ }
+
+ /**
+ * Message qui indique la balise n'est pas reconnue par les structures de donn\xE9es EMH.
+ *
+ * @param balise
+ * @param nomRef
+ * @return
+ */
+ public static String listEmpty(final String balise) {
+ return CrueResource.getS("Sections <" + balise + ">: la liste est vide.");
+
+ }
+
+ public static String emhEmpty(final String balise) {
+ return CrueResource.getS("EMH: Aucune donn\xE9es EMH trouv\xE9e pour <" + balise + ">.");
+
+ }
+
+}
Property changes on: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterCommon.java
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDCSP.java (from rev 4607, trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryDCSP.java)
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDCSP.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDCSP.java 2009-04-03 16:08:15 UTC (rev 4611)
@@ -0,0 +1,670 @@
+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.CrueDaoStructuresFormatDCSP.BrancheAbstract;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.BrancheBarrageFilEau;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.BrancheBarrageFilEauAbstract;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.BrancheBarrageGenerique;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.BrancheBarrageRhone;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.BrancheClassiqueAbstract;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.BrancheOrifice;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.BranchePDCAbstract;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.BranchePdc;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.BrancheSaintVenant;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.BrancheSeuilAbstract;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.BrancheSeuilLateral;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.BrancheSeuilOrificeAbstract;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.BrancheSeuilTransversal;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.ElemSeuil;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.ElemSeuilOrifice;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.ElemSeuilPdc;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.SectionBrancheAbstract;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.SectionIdem;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.SectionInterpolee;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.SectionProfil;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.SectionSansGeometrie;
+import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
+import org.fudaa.dodico.crue.metier.emh.CatEMHSection;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrt;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBarrageFilEau;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheOrifice;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBranchePDC;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSeuilLateral;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtSection;
+import org.fudaa.dodico.crue.metier.emh.EMH;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageFilEau;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageGenerique;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageRhone;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheOrifice;
+import org.fudaa.dodico.crue.metier.emh.EMHBranchePdc;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilLongitudinale;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionIdem;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionInterpolee;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionProfil;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionSansGeometrie;
+import org.fudaa.dodico.crue.metier.emh.ElemSeuilAvecPdc;
+import org.fudaa.dodico.crue.metier.emh.Loi;
+import org.fudaa.dodico.crue.metier.helper.EMHBrancheHelper;
+import org.fudaa.dodico.crue.metier.helper.EMHSectionHelper;
+
+/**
+ * Factory qui se charge de remplir les structures DAO du ficheir DCSP avec les donn\xE9es m\xE9tier et inversement.
+ *
+ * @author Adrien Hadoux
+ */
+public class CrueDaoConverterDCSP {
+
+ public static int cptEntries = 1;
+
+ /**
+ * Remplit completement la structure persistante a partir des objets DSCP. Optimise le remplissage en listante les
+ * donn\xE9es emh une seule fois et en forwardant les objets aux bons endroits
+ *
+ * @param persistance
+ * @param data
+ * @param listeMessageError
+ */
+ public static void remplirPersistanceDCSP(final CrueDaoPersistDCSP persistance, final List<EMH> data,
+ final CtuluAnalyze analyser) {
+
+ persistance.Sections = new ArrayList<SectionBrancheAbstract>();
+ persistance.Branches = new ArrayList<BrancheAbstract>();
+
+ // CrueDaoFactoryDCSP.remplirPersistanceAvecBrancheDSCP(persistance.Branches,data,listeMessageError);
+
+ if (data == null || data.size() == 0) {
+ analyser.addError(CrueDaoConverterCommon.emhEmpty(CrueDaoConverterCommon.DCSP), cptEntries++);
+ } else for (final EMH emh : data) {
+ if (emh instanceof CatEMHBranche) {
+ // -- remplissage des sections de branches --//
+ final CatEMHBranche branche = (CatEMHBranche) emh;
+
+ final List<DonCalcSansPrt> listeDoncalc = branche.getDSCP();
+ for (final DonCalcSansPrt dataCalc : listeDoncalc) {
+ if (dataCalc != null) {
+ CrueDaoConverterDCSP.remplirPersistanceAvecBrancheDSCP(persistance.Branches, branche, dataCalc, analyser);
+ } else {
+ analyser.addError(CrueDaoConverterCommon.unknowdataFromFile("Branches", CrueDaoConverterCommon.DCSP, branche
+ .getNom()), cptEntries++);
+ }
+ }
+
+ } else if (emh instanceof CatEMHSection) {
+ final CatEMHSection section = (CatEMHSection) emh;
+ final List<DonCalcSansPrt> listeDoncalc = section.getDSCP();
+ for (final DonCalcSansPrt dataCalc : listeDoncalc) {
+ if (dataCalc != null && dataCalc instanceof DonCalcSansPrtSection) {
+ // -- remplissage des sections --//
+ remplirPersistanceAvecSectionsBrancheDSCP(persistance.Sections, section, (DonCalcSansPrtSection) dataCalc,
+ analyser);
+
+ } else {
+ analyser.addError(CrueDaoConverterCommon.unknowdataFromFile("Section", CrueDaoConverterCommon.DCSP, section
+ .getNom()), cptEntries++);
+ }
+
+ }
+
+ }
+
+ }
+
+ }
+
+ /**
+ * Remplit completement la structure metier a partir des objets persistants DSCP. Optimise le remplissage en listante
+ * les donn\xE9es emh une seule fois et en forwardant les objets aux bons endroits
+ *
+ * @param persistance
+ * @param data
+ * @param analyser
+ */
+ public static void remplirMetierDCSP(final CrueDaoPersistDCSP persistance, final List<EMH> data,
+ final CtuluAnalyze analyser) {
+
+ // -- remplissage des branches --//
+ CrueDaoConverterDCSP.remplirBrancheAvecPersistanceDSCP(persistance.Branches, data, analyser);
+
+ // -- remplissage des sections --//
+ CrueDaoConverterDCSP.remplirSectionsAvecPersistanceDSCP(persistance.Sections, data, analyser);
+
+ }
+
+ /**
+ * Methode qui remplit une arrayList d'objets persistants qui constituent le fichier fichier DSCP: les Branches.
+ *
+ * @param data
+ * @return
+ */
+ public static void remplirPersistanceAvecBrancheDSCP(final List<BrancheAbstract> listePersistante,
+ final CatEMHBranche branche, final DonCalcSansPrt dataCalc, final CtuluAnalyze analyser) {
+ final String suffixe = CrueDaoPersistDRSO.SUFFIXE_REF_DRSO;
+ BrancheAbstract branchePersist = null;
+ if (branche instanceof EMHBrancheBarrageFilEau) {
+ final EMHBrancheBarrageFilEau new_name = (EMHBrancheBarrageFilEau) branche;
+ branchePersist = new BrancheBarrageFilEau();
+
+ if (dataCalc instanceof DonCalcSansPrtBarrageFilEau) {
+ final BrancheBarrageFilEau br = (BrancheBarrageFilEau) branchePersist;
+
+ // -- recuperation de la formule --//
+ if (((DonCalcSansPrtBarrageFilEau) dataCalc).getRegimeDenove_Zam() != null) br.Loi = ((DonCalcSansPrtBarrageFilEau) dataCalc)
+ .getRegimeDenove_Zam().getNom();
+ br.QLimInf = ((DonCalcSansPrtBarrageFilEau) dataCalc).getQLimInf();
+ br.QLimSup = ((DonCalcSansPrtBarrageFilEau) dataCalc).getQLimSup();
+ // -- on remplit la liste des elements seuils --//
+
+ br.ElemSeuils = remplirPersistanceAvecSeuilsBarragesDSCP(((DonCalcSansPrtBarrageFilEau) dataCalc).getListElt());
+
+ } else {
+ analyser
+ .addError(
+ CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche barrage Fil d'eau) pour l'objet branche de r\xE9f\xE9rence"
+ + branche.getNom()), cptEntries++);
+ }
+
+ } else if (branche instanceof EMHBrancheBarrageGenerique) {
+ final EMHBrancheBarrageGenerique new_name = (EMHBrancheBarrageGenerique) branche;
+ branchePersist = new BrancheBarrageGenerique();
+ // -- recuperation de la donnee de calcul de la branche --//
+ if (dataCalc instanceof DonCalcSansPrtBarrageFilEau) {
+ final BrancheBarrageGenerique br = (BrancheBarrageGenerique) branchePersist;
+
+ // -- recuperation de la formule --//
+ if (((DonCalcSansPrtBarrageFilEau) dataCalc).getRegimeDenove_Zam() != null) br.Loi = ((DonCalcSansPrtBarrageFilEau) dataCalc)
+ .getRegimeDenove_Zam().getNom();
+ br.QLimInf = ((DonCalcSansPrtBarrageFilEau) dataCalc).getQLimInf();
+ br.QLimSup = ((DonCalcSansPrtBarrageFilEau) dataCalc).getQLimSup();
+ // -- on remplit la liste des elements seuils --//
+
+ br.ElemSeuils = remplirPersistanceAvecSeuilsBarragesDSCP(((DonCalcSansPrtBarrageFilEau) dataCalc).getListElt());
+
+ } else {
+ analyser
+ .addError(
+ CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche barrage Generique) pour l'objet branche de r\xE9f\xE9rence"
+ + branche.getNom()), cptEntries++);
+ }
+
+ } else if (branche instanceof EMHBrancheBarrageRhone) {
+ final EMHBrancheBarrageRhone new_name = (EMHBrancheBarrageRhone) branche;
+ branchePersist = new BrancheBarrageRhone();
+ // -- recuperation de la donnee de calcul de la branche --//
+
+ if (dataCalc instanceof DonCalcSansPrtBarrageFilEau) {
+ final BrancheBarrageRhone br = (BrancheBarrageRhone) branchePersist;
+
+ // -- recuperation de la formule --//
+ if (((DonCalcSansPrtBarrageFilEau) dataCalc).getRegimeDenove_Zam() != null) br.Loi = ((DonCalcSansPrtBarrageFilEau) dataCalc)
+ .getRegimeDenove_Zam().getNom();
+ br.QLimInf = ((DonCalcSansPrtBarrageFilEau) dataCalc).getQLimInf();
+ br.QLimSup = ((DonCalcSansPrtBarrageFilEau) dataCalc).getQLimSup();
+ // -- on remplit la liste des elements seuils --//
+
+ br.ElemSeuils = remplirPersistanceAvecSeuilsBarragesDSCP(((DonCalcSansPrtBarrageFilEau) dataCalc).getListElt());
+
+ } else {
+ analyser
+ .addError(
+ CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche barrage Rhone) pour l'objet branche de r\xE9f\xE9rence"
+ + branche.getNom()), cptEntries++);
+ }
+
+ }
+ // else if (branche instanceof EMHBrancheBarrageRhone) {
+ // EMHBrancheBarrageRhone new_name = (EMHBrancheBarrageRhone) branche;
+ // branchePersist=new main.java.org.fudaa.dodico.crue.dao.DaoStructuresFormatDSCP.BrancheBarrageRhone();
+ // }
+ // else if (branche instanceof EMHBrancheEnchainement) {
+ // EMHBrancheEnchainement new_name = (EMHBrancheEnchainement) branche;
+ // branchePersist=new main.java.org.fudaa.dodico.crue.dao.DaoStructuresFormatDSCP.BrancheEnchainement();
+ // }else if (branche instanceof EMHBrancheNiveauxAssocies) {
+ // EMHBrancheNiveauxAssocies new_name = (EMHBrancheNiveauxAssocies) branche;
+ // branchePersist=new main.java.org.fudaa.dodico.crue.dao.DaoStructuresFormatDSCP.BrancheNiveauxAssocies();
+ // }
+ else if (branche instanceof EMHBrancheOrifice) {
+
+ branchePersist = new BrancheOrifice();
+
+ // -- recuperation de la donnee de calcul de la branche --//
+
+ if (dataCalc instanceof DonCalcSansPrtBrancheOrifice) {
+ final BrancheOrifice br = (BrancheOrifice) branchePersist;
+
+ // -- recuperation de la formule --//
+ br.FormulePdc = ((DonCalcSansPrtBrancheOrifice) dataCalc).getFormulePdc();
+ // -- on remplit la liste des elements seuils --//
+ br.ElemOrifices = remplirPersistanceAvecOrificesSeuilsDSCP(((DonCalcSansPrtBrancheOrifice) dataCalc)
+ .getElement());
+ } else {
+ analyser
+ .addError(
+ CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche Orifice) pour l'objet branche de r\xE9f\xE9rence"
+ + branche.getNom()), cptEntries++);
+ }
+
+ } else if (branche instanceof EMHBranchePdc) {
+ final EMHBranchePdc new_name = (EMHBranchePdc) branche;
+ branchePersist = new BranchePdc();
+
+ // -- recuperation de la donnee de calcul de la branche --//
+
+ if (dataCalc instanceof DonCalcSansPrtBranchePDC) {
+ final BranchePdc br = (BranchePdc) branchePersist;
+
+ // -- recuperation de la formule --//
+ if (((DonCalcSansPrtBranchePDC) dataCalc).getPdc_DZ() != null) br.Loi = ((DonCalcSansPrtBranchePDC) dataCalc)
+ .getPdc_DZ().getNom();
+
+ } else {
+ analyser
+ .addError(
+ CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche seuil Longitudinal) pour l'objet branche de r\xE9f\xE9rence"
+ + branche.getNom()), cptEntries++);
+ }
+
+ } else if (branche instanceof EMHBrancheSaintVenant) {
+ final EMHBrancheSaintVenant new_name = (EMHBrancheSaintVenant) branche;
+ branchePersist = new BrancheSaintVenant();
+ // -- recuperation de la donnee de calcul de la branche --//
+
+ if (dataCalc instanceof DonCalcSansPrtBrancheSaintVenant) {
+ final BrancheClassiqueAbstract br = (BrancheClassiqueAbstract) branchePersist;
+
+ br.CoefBeta = ((DonCalcSansPrtBrancheSaintVenant) dataCalc).getCoeffBeta();
+ br.CoefRuis = ((DonCalcSansPrtBrancheSaintVenant) dataCalc).getCoefRuis();
+ br.CoefRuisQdm = ((DonCalcSansPrtBrancheSaintVenant) dataCalc).getCoeffRuisQdm();
+
+ // //-- remplissage des sections de branches --//
+ // br.Sections=remplirPersistanceAvecSectionsBrancheDSCP( branche.getListeSections(), analyser);
+ } else {
+ analyser
+ .addError(
+ CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche SaintVenant) pour l'objet branche de r\xE9f\xE9rence"
+ + branche.getNom()), cptEntries++);
+ }
+
+ } else if (branche instanceof EMHBrancheSeuilLongitudinale) {
+ final EMHBrancheSeuilLongitudinale new_name = (EMHBrancheSeuilLongitudinale) branche;
+ branchePersist = new BrancheSeuilLateral();
+
+ // -- recuperation de la donnee de calcul de la branche --//
+
+ if (dataCalc instanceof DonCalcSansPrtBrancheSeuilLateral) {
+ final BrancheSeuilLateral br = (BrancheSeuilLateral) branchePersist;
+
+ // -- recuperation de la formule --//
+ br.FormulePdc = ((DonCalcSansPrtBrancheSeuilLateral) dataCalc).getFormulePdc();
+ // -- on remplit la liste des elements seuils --//
+ br.ElemSeuils = remplirPersistanceAvecSeuilsDSCP(((DonCalcSansPrtBrancheSeuilLateral) dataCalc).getListElt());
+
+ } else {
+ analyser
+ .addError(
+ CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche seuil Longitudinal) pour l'objet branche de r\xE9f\xE9rence"
+ + branche.getNom()), cptEntries++);
+ }
+
+ } else if (branche instanceof EMHBrancheSeuilTransversal) {
+ final EMHBrancheSeuilTransversal new_name = (EMHBrancheSeuilTransversal) branche;
+ branchePersist = new BrancheSeuilTransversal();
+
+ // -- recuperation de la donnee de calcul de la branche --//
+
+ if (dataCalc instanceof DonCalcSansPrtBrancheSeuilTransversal) {
+ final BrancheSeuilTransversal br = (BrancheSeuilTransversal) branchePersist;
+ // -- recuperation de la formule --//
+ br.FormulePdc = ((DonCalcSansPrtBrancheSeuilTransversal) dataCalc).getFormulePdc();
+ // -- on remplit la liste des elements seuils --//
+ br.ElemSeuils = remplirPersistanceAvecSeuilsDSCP(((DonCalcSansPrtBrancheSeuilTransversal) dataCalc)
+ .getListElt());
+ } else {
+ analyser
+ .addError(
+ CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche seuil transversal) pour l'objet branche de r\xE9f\xE9rence"
+ + branche.getNom()), cptEntries++);
+ }
+
+ }
+ // else if (branche instanceof EMHBrancheStrickler) {
+ // EMHBrancheStrickler new_name = (EMHBrancheStrickler) branche;
+ // branchePersist=new main.java.org.fudaa.dodico.crue.dao.DaoStructuresFormatDSCP.BrancheStrickler();
+ // }
+
+ if (branchePersist != null) {
+ branchePersist.NomRef = suffixe + branche.getNom();
+
+ listePersistante.add(branchePersist);
+ } else {
+ analyser.addError(CrueDaoConverterCommon.unknowEMH("Branche", branche.getNom()), cptEntries++);
+ }
+
+ }
+
+ /**
+ * Genere une liste d'elements seuils persistante a partir de la liste m\xE9tier lue.
+ *
+ * @param listeEltSeuilsPersist
+ * @return
+ */
+ public static List<ElemSeuilPdc> remplirPersistanceAvecSeuilsDSCP(final List<ElemSeuilAvecPdc> listeEltSeuilsEMH) {
+ final List<ElemSeuilPdc> listeSeuilsPersist = new ArrayList<ElemSeuilPdc>();
+ for (final ElemSeuilAvecPdc seuilMetier : listeEltSeuilsEMH) {
+ final ElemSeuilPdc seuilPersist = new ElemSeuilPdc();
+ seuilPersist.CoefD = seuilMetier.getCoeffD();
+ seuilPersist.CoefPdc = seuilMetier.getCoeffPdc();
+ seuilPersist.Larg = seuilMetier.getLarg();
+ seuilPersist.Zseuil = seuilMetier.getZSeuil();
+
+ listeSeuilsPersist.add(seuilPersist);
+ }
+
+ return listeSeuilsPersist;
+ }
+
+ /**
+ * Genere une liste d'elements seuils persistante a partir de la liste m\xE9tier lue.
+ *
+ * @param listeEltSeuilsPersist
+ * @return
+ */
+ public static List<ElemSeuil> remplirPersistanceAvecSeuilsBarragesDSCP(
+ final List<org.fudaa.dodico.crue.metier.emh.ElemSeuil> listeEltSeuilsEMH) {
+ final List<ElemSeuil> listeSeuilsPersist = new ArrayList<ElemSeuil>();
+ for (final org.fudaa.dodico.crue.metier.emh.ElemSeuil seuilMetier : listeEltSeuilsEMH) {
+ final ElemSeuil seuilPersist = new ElemSeuil();
+ seuilPersist.CoefD = seuilMetier.getCoeffD();
+
+ seuilPersist.Larg = seuilMetier.getLarg();
+ seuilPersist.Zseuil = seuilMetier.getZSeuil();
+
+ listeSeuilsPersist.add(seuilPersist);
+ }
+
+ return listeSeuilsPersist;
+ }
+
+ /**
+ * Genere une liste d'elements seuils persistante a partir de la liste metier lue.
+ *
+ * @param listeEltSeuilsPersist
+ * @return
+ */
+ public static List<ElemSeuilOrifice> remplirPersistanceAvecOrificesSeuilsDSCP(
+ final List<org.fudaa.dodico.crue.metier.emh.ElemOrifice> listeEMhSeuils) {
+ final List<ElemSeuilOrifice> listeEltSeuilsPersist = new ArrayList<ElemSeuilOrifice>();
+ for (final org.fudaa.dodico.crue.metier.emh.ElemOrifice seuilMetier : listeEMhSeuils) {
+ final ElemSeuilOrifice seuilPersist = new ElemSeuilOrifice();
+ seuilPersist.CoefD = seuilMetier.getCoeffQ();
+ seuilPersist.Larg = seuilMetier.getLarg();
+ seuilPersist.Zseuil = seuilMetier.getZSeuil();
+
+ seuilPersist.CoefCtrLim = seuilMetier.getCoeffCtrLim();
+ seuilPersist.Sens = seuilMetier.getSens();
+
+ listeEltSeuilsPersist.add(seuilPersist);
+ }
+
+ return listeEltSeuilsPersist;
+ }
+
+ /**
+ * Methode qui remplit une arrayList d'objets persistants Sections qui sont contenues dans une branche: concerne le
+ * fichier fichier DSCP: les Branches.
+ *
+ * @param data
+ * @return
+ */
+ public static void remplirPersistanceAvecSectionsBrancheDSCP(final List<SectionBrancheAbstract> listePersistante,
+ final CatEMHSection section, final DonCalcSansPrtSection prtSection, final CtuluAnalyze analyser) {
+
+ SectionBrancheAbstract sectionPersist = null;
+ if (section instanceof EMHSectionIdem) {
+ sectionPersist = new SectionIdem();
+ } else if (section instanceof EMHSectionInterpolee) {
+ sectionPersist = new SectionInterpolee();
+ } else if (section instanceof EMHSectionProfil) {
+ sectionPersist = new SectionProfil();
+ } else if (section instanceof EMHSectionSansGeometrie) {
+ sectionPersist = new SectionSansGeometrie();
+ }
+
+ if (section.getDataCalcul() != null) {
+ sectionPersist.NomRef = CrueDaoPersistDRSO.SUFFIXE_REF_DRSO + section.getNom();
+ sectionPersist.CoefConv = prtSection.getCoeffConv();
+ sectionPersist.CoefDiv = prtSection.getCoeffDiv();
+ sectionPersist.CoefPond = prtSection.getCoeffPond();
+ }
+
+ listePersistante.add(sectionPersist);
+
+ }
+
+ /**
+ * Methode qui met a jour les objets m\xE9tier EMH branches a partir des donn\xE9es persistantes de DPTI et les
+ * pr\xE9chargements de DRSO
+ *
+ * @param data
+ * @return
+ */
+ public static void remplirBrancheAvecPersistanceDSCP(final List<BrancheAbstract> listePersistants,
+ final List<EMH> data, final CtuluAnalyze analyser) {
+ if (listePersistants == null || listePersistants.size() == 0) {
+ analyser.addError(CrueResource.getS("Branches: la liste est vide."), cptEntries++);
+ } else for (final Object persist : listePersistants) {
+ if (persist instanceof BrancheAbstract) {
+ final BrancheAbstract branchePersist = (BrancheAbstract) persist;
+ String reference = branchePersist.NomRef;
+ if (reference.contains(CrueDaoPersistDRSO.SUFFIXE_REF_DRSO)) {
+ reference = reference.replace(CrueDaoPersistDRSO.SUFFIXE_REF_DRSO, "");
+ }
+ final CatEMHBranche branche = EMHBrancheHelper.findByReference(reference, data);
+ if (branche == null) {
+ analyser.addError(CrueResource.getS("Branche : Impossible de trouver la branche de r\xE9f\xE9rence " + reference),
+ cptEntries++);
+ } else {
+ if (branchePersist instanceof BrancheClassiqueAbstract) {
+ final BrancheClassiqueAbstract br = (BrancheClassiqueAbstract) branchePersist;
+ final DonCalcSansPrtBrancheSaintVenant dataCalcul = new DonCalcSansPrtBrancheSaintVenant();
+ dataCalcul.setCoeffBeta(br.CoefBeta);
+ dataCalcul.setCoefRuis(br.CoefRuis);
+ dataCalcul.setCoeffRuisQdm(br.CoefRuisQdm);
+ branche.addDSCP(dataCalcul);
+ // -- remplissage des sections --//
+ // remplirSectionsAvecPersistanceDSCP(br.Sections, branche, analyser);
+ }
+ // -- branche seuil --//
+ else if (branchePersist instanceof BrancheSeuilAbstract) {
+ final BrancheSeuilAbstract br = (BrancheSeuilAbstract) branchePersist;
+
+ if ((branche instanceof EMHBrancheSeuilLongitudinale)) {
+ final DonCalcSansPrtBrancheSeuilLateral dataCalcul = new DonCalcSansPrtBrancheSeuilLateral();
+
+ // -- recuperation de la formule --//
+ dataCalcul.setFormulePdc(br.FormulePdc);
+ // -- on remplit la liste des elements seuils --//
+ dataCalcul.setListElt(remplirSeuilsAvecPersistanceDSCP(br.ElemSeuils));
+ branche.addDSCP(dataCalcul);
+ } else if ((branche instanceof EMHBrancheSeuilTransversal)) {
+ final DonCalcSansPrtBrancheSeuilTransversal dataCalcul = new DonCalcSansPrtBrancheSeuilTransversal();
+
+ // -- recuperation de la formule --//
+ dataCalcul.setFormulePdc(br.FormulePdc);
+ // -- on remplit la liste des elements seuils --//
+ dataCalcul.setListElt(remplirSeuilsAvecPersistanceDSCP(br.ElemSeuils));
+ branche.addDSCP(dataCalcul);
+ } else {
+ analyser.addError(CrueResource.getS("Branche : Les donnees de la branche de r\xE9f\xE9rence " + reference
+ + " doivent \xEAtre de type Transversal ou Longitudinal (liste de seuils+ formule pdc)"), cptEntries++);
+ }
+
+ }
+ // -- branche seuils orifices --//
+ else if (branchePersist instanceof BrancheSeuilOrificeAbstract) {
+ final BrancheSeuilOrificeAbstract br = (BrancheSeuilOrificeAbstract) branchePersist;
+ final DonCalcSansPrtBrancheOrifice dataCalcul = new DonCalcSansPrtBrancheOrifice();
+ // -- recuperation de la formule --//
+ dataCalcul.setFormulePdc(br.FormulePdc);
+ // -- on remplit la liste des elements seuils --//
+ dataCalcul.setElement(remplirOrificesSeuilsAvecPersistanceDSCP(br.ElemOrifices));
+ branche.addDSCP(dataCalcul);
+ }
+ // -- branche seuils PDC --//
+ else if (branchePersist instanceof BranchePDCAbstract) {
+ final BranchePDCAbstract br = (BranchePDCAbstract) branchePersist;
+ final DonCalcSansPrtBranchePDC dataCalcul = new DonCalcSansPrtBranchePDC();
+ // -- recuperation de la formule --//
+ final Loi newLoi = new Loi();
+ newLoi.setNom(br.Loi);
+ dataCalcul.setPdc_DZ(newLoi);
+ branche.addDSCP(dataCalcul);
+ } else if (branchePersist instanceof BrancheBarrageFilEauAbstract) {
+ final BrancheBarrageFilEauAbstract br = (BrancheBarrageFilEauAbstract) branchePersist;
+ final DonCalcSansPrtBarrageFilEau dataCalcul = new DonCalcSansPrtBarrageFilEau();
+
+ // -- recuperation de la formule --//
+ final Loi newLoi = new Loi();
+ newLoi.setNom(br.Loi);
+ dataCalcul.setRegimeDenove_Zam(newLoi);
+ dataCalcul.setQLimInf(br.QLimInf);
+ dataCalcul.setQLimSup(br.QLimSup);
+
+ // -- on remplit la liste des elements seuils --//
+ dataCalcul.setListElt(remplirSeuilsBarragesAvecPersistanceDSCP(br.ElemSeuils));
+ branche.addDSCP(dataCalcul);
+
+ }
+
+ else {
+ analyser.addError(CrueResource.getS("Branche : Donn\xE9es non correcte. La branche de r\xE9f\xE9rence " + reference
+ + " contient des \xE9l\xE9ments de calcul innatendu."), cptEntries++);
+ }
+ }
+
+ }
+ }
+
+ }
+
+ /**
+ * Genere une liste d'elements seuils persistante a partir de la liste m\xE9tier lue.
+ *
+ * @param listeEltSeuilsPersist
+ * @return
+ */
+ public static List<ElemSeuilAvecPdc> remplirSeuilsAvecPersistanceDSCP(final List<ElemSeuilPdc> listeSeuilsPersist) {
+ final List<ElemSeuilAvecPdc> listeEltSeuilsEMH = new ArrayList<ElemSeuilAvecPdc>();
+ for (final ElemSeuilPdc seuilPersist : listeSeuilsPersist) {
+ final ElemSeuilAvecPdc seuilMetier = new ElemSeuilAvecPdc();
+ seuilMetier.setCoeffD(seuilPersist.CoefD);
+ seuilMetier.setCoeffPdc(seuilPersist.CoefPdc);
+ seuilMetier.setLarg(seuilPersist.Larg);
+ seuilMetier.setZSeuil(seuilPersist.Zseuil);
+
+ listeEltSeuilsEMH.add(seuilMetier);
+ }
+
+ return listeEltSeuilsEMH;
+ }
+
+ /**
+ * Genere une liste d'elements seuils persistante a partir de la liste m\xE9tier lue.
+ *
+ * @param listeEltSeuilsPersist
+ * @return
+ */
+ public static List<org.fudaa.dodico.crue.metier.emh.ElemSeuil> remplirSeuilsBarragesAvecPersistanceDSCP(
+ final List<ElemSeuil> listeSeuilsPersist) {
+ final List<org.fudaa.dodico.crue.metier.emh.ElemSeuil> listeEltSeuilsEMH = new ArrayList<org.fudaa.dodico.crue.metier.emh.ElemSeuil>();
+ for (final ElemSeuil seuilPersist : listeSeuilsPersist) {
+ final org.fudaa.dodico.crue.metier.emh.ElemSeuil seuilMetier = new org.fudaa.dodico.crue.metier.emh.ElemSeuil();
+ seuilMetier.setCoeffD(seuilPersist.CoefD);
+
+ seuilMetier.setLarg(seuilPersist.Larg);
+ seuilMetier.setZSeuil(seuilPersist.Zseuil);
+
+ listeEltSeuilsEMH.add(seuilMetier);
+ }
+
+ return listeEltSeuilsEMH;
+ }
+
+ /**
+ * Genere une liste d'elements seuils m\xE9tier a partir de la liste persistante lue.
+ *
+ * @param listeEltSeuilsPersist
+ * @return
+ */
+ public static List<org.fudaa.dodico.crue.metier.emh.ElemOrifice> remplirOrificesSeuilsAvecPersistanceDSCP(
+ final List<ElemSeuilOrifice> listeEltSeuilsPersist) {
+ final List<org.fudaa.dodico.crue.metier.emh.ElemOrifice> listeEMhSeuils = new ArrayList<org.fudaa.dodico.crue.metier.emh.ElemOrifice>();
+ for (final ElemSeuilOrifice seuilPersist : listeEltSeuilsPersist) {
+ final org.fudaa.dodico.crue.metier.emh.ElemOrifice seuilMetier = new org.fudaa.dodico.crue.metier.emh.ElemOrifice();
+ seuilMetier.setCoeffQ(seuilPersist.CoefD);
+ seuilMetier.setLarg(seuilPersist.Larg);
+ seuilMetier.setZSeuil(seuilPersist.Zseuil);
+
+ seuilMetier.setCoeffCtrLim(seuilPersist.CoefCtrLim);
+ seuilMetier.setSens(seuilPersist.Sens);
+
+ listeEMhSeuils.add(seuilMetier);
+ }
+
+ return listeEMhSeuils;
+ }
+
+ /**
+ * Methode qui met a jour les objets m\xE9tier EMH sections de branches a partir des donn\xE9es persistantes qui constituent
+ * a quatrieme partie du fichier DSCP: les Sections.
+ *
+ * @param data
+ * @return
+ */
+ public static void remplirSectionsAvecPersistanceDSCP(final List<SectionBrancheAbstract> listePersistantsSection,
+ final List<EMH> data, final CtuluAnalyze analyser) {
+
+ if (listePersistantsSection == null || listePersistantsSection.size() == 0) {
+ analyser.addError(CrueResource.getS("Sections : la liste est vide."), cptEntries++);
+ } else for (final Object persist : listePersistantsSection) {
+ if (persist instanceof SectionBrancheAbstract) {
+ final SectionBrancheAbstract sectionPersist = (SectionBrancheAbstract) persist;
+
+ // -- on d\xE9clare une version abstraite EMH m\xE9tier du type --//
+ CatEMHSection section = null;
+ String reference = sectionPersist.NomRef;
+
+ if (reference.contains(CrueDaoPersistDRSO.SUFFIXE_REF_DRSO)) {
+ reference = reference.replace(CrueDaoPersistDRSO.SUFFIXE_REF_DRSO, "");
+ }
+ section = EMHSectionHelper.findByReference(reference, data);
+
+ if (section != null) {
+ final DonCalcSansPrtSection dataCalcul = new DonCalcSansPrtSection();
+
+ dataCalcul.setCoeffConv(sectionPersist.CoefConv);
+ dataCalcul.setCoeffDiv(sectionPersist.CoefDiv);
+ dataCalcul.setCoeffPond(sectionPersist.CoefPond);
+ section.addDSCP(dataCalcul);
+ } else analyser.addError(CrueDaoConverterCommon.unknowReference("Section", reference), cptEntries++);
+ }
+ }
+
+ }
+
+}
Property changes on: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDCSP.java
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDFRT.java (from rev 4607, trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryDFRT.java)
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDFRT.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDFRT.java 2009-04-03 16:08:15 UTC (rev 4611)
@@ -0,0 +1,112 @@
+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.CrueDaoStructuresFormatDFRT.StriRefCPersist;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDFRT.StriRefHPersist;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDFRT.StriRefPersist;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDFRT.StriRefZPersist;
+import org.fudaa.dodico.crue.metier.emh.DonFrt;
+import org.fudaa.dodico.crue.metier.emh.FrottementPoint;
+import org.fudaa.dodico.crue.metier.emh.StriRefC;
+import org.fudaa.dodico.crue.metier.emh.StriRefH;
+import org.fudaa.dodico.crue.metier.emh.StriRefZ;
+
+/**
+ * Factory qui se charge de remplir les structures DAO dufichier DFRT avec les donn\xE9es m\xE9tier et inversement.
+ *
+ * @author Adrien Hadoux
+ */
+public class CrueDaoConverterDFRT {
+
+ public static int cptEntries = 1;
+
+ /**
+ * remplir le fichier DFRT avec les frottemetns
+ *
+ * @param data
+ * @return
+ */
+ public static List<StriRefPersist> remplirPersistanceAvecFrottemetnsDFRT(final List<DonFrt> data,
+ final CtuluAnalyze analyser) {
+ final List<StriRefPersist> listeFrottement = new ArrayList<StriRefPersist>();
+ for (final DonFrt frt : data) {
+ StriRefPersist persist = null;
+ if (frt instanceof StriRefC) persist = new StriRefCPersist(frt.getNom());
+ else if (frt instanceof StriRefH) persist = new StriRefHPersist(frt.getNom());
+ else if (frt instanceof StriRefZ) persist = new StriRefZPersist(frt.getNom());
+
+ // -- commun --//
+ if (persist != null) {
+ if (frt.getListePoints() != null && frt.getListePoints().size() > 0) {
+ persist.listePoints = new ArrayList<String>();
+ for (final FrottementPoint pt : frt.getListePoints()) {
+ persist.listePoints.add(pt.getX() + " " + pt.getY());
+ }
+ }
+ listeFrottement.add(persist);
+ }
+
+ }
+ return listeFrottement;
+ }
+
+ /**
+ * remplir le fichier DFRT avec les frottemetns
+ *
+ * @param data
+ * @return
+ */
+ public static List<DonFrt> remplirFrottemetnsAvecPersistanceDFRT(final List<StriRefPersist> persistListe,
+ final CtuluAnalyze analyser) {
+ final List<DonFrt> data = new ArrayList<DonFrt>();
+ if (persistListe == null || persistListe.size() == 0) {
+ analyser.addError(CrueResource.getS("Frottements : la liste est vide."), cptEntries++);
+ } else for (final StriRefPersist persist : persistListe) {
+ DonFrt frt = null;
+ if (persist instanceof StriRefCPersist) frt = new StriRefC(persist.Nom);
+ else if (persist instanceof StriRefHPersist) frt = new StriRefH(persist.Nom);
+ else if (persist instanceof StriRefZPersist) frt = new StriRefZ(persist.Nom);
+
+ // -- commun --//
+ if (persist != null) {
+ if (persist.listePoints != null) {
+
+ final List<FrottementPoint> listePoints = new ArrayList<FrottementPoint>();
+ for (final String buff : persist.listePoints) {
+
+ final int indiceCesure = buff.lastIndexOf(" ");
+ final String val1 = buff.substring(0, indiceCesure);
+ final String val2 = buff.substring(indiceCesure + 1, buff.length());
+ double x = 0;
+ try {
+ x = Double.parseDouble(val1);
+
+ } catch (final NumberFormatException e) {
+ analyser.addError(CrueResource.getS("Frottement: " + frt.getNom()
+ + ": impossible de r\xE9cup\xE9rer le r\xE9el du contenu: " + buff), cptEntries++);
+ }
+ double y = 0;
+ try {
+ y = Double.parseDouble(val2);
+ } catch (final NumberFormatException e) {
+ analyser.addError(CrueResource.getS("Frottement: " + frt.getNom()
+ + ": impossible de r\xE9cup\xE9rer le r\xE9el du contenu: " + buff), cptEntries++);
+ }
+ listePoints.add(new FrottementPoint(x, y));
+
+ }
+
+ frt.setListePoints(listePoints);
+ }
+ data.add(frt);
+ }
+
+ }
+ return data;
+ }
+
+}
Property changes on: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDFRT.java
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDPTG.java (from rev 4607, trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryDPTG.java)
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDPTG.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDPTG.java 2009-04-03 16:08:15 UTC (rev 4611)
@@ -0,0 +1,366 @@
+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.CrueDaoStructuresFormatDPTG.BrancheSaintVenant;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTG.Frottement;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTG.Lit;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTG.ProfilCasier;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTG.ProfilSection;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTG.SectionIdem;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTG.profilDPTG;
+import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
+import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
+import org.fudaa.dodico.crue.metier.emh.CatEMHSection;
+import org.fudaa.dodico.crue.metier.emh.CrueData;
+import org.fudaa.dodico.crue.metier.emh.DonFrt;
+import org.fudaa.dodico.crue.metier.emh.DonPrtGeo;
+import org.fudaa.dodico.crue.metier.emh.DonPrtGeoBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.DonPrtGeoCasierProfil;
+import org.fudaa.dodico.crue.metier.emh.DonPrtGeoProfilCommun;
+import org.fudaa.dodico.crue.metier.emh.DonPrtGeoSectionIdem;
+import org.fudaa.dodico.crue.metier.emh.DonPrtGeoSectionProfil;
+import org.fudaa.dodico.crue.metier.emh.EMH;
+import org.fudaa.dodico.crue.metier.emh.EMHCasierProfil;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionProfil;
+import org.fudaa.dodico.crue.metier.emh.LitNumerote;
+import org.fudaa.dodico.crue.metier.emh.PtProfil;
+import org.fudaa.dodico.crue.metier.helper.EMHBrancheHelper;
+import org.fudaa.dodico.crue.metier.helper.EMHCasierHelper;
+import org.fudaa.dodico.crue.metier.helper.EMHSectionHelper;
+
+/**
+ * Factory qui se charge de remplir les structures DAO du fichier DPTG avec les donn\xE9es m\xE9tier et inversement.
+ *
+ * @author Adrien Hadoux
+ */
+public class CrueDaoConverterDPTG {
+
+ public static int cptEntries = 1;
+
+ /**
+ * Remplit completement la structure persistante a partir des objets donPrtGeo. Optimise le remplissage en listante
+ * les donn\xE9es emh une seule fois et en forwardant les objets aux bons endroits
+ *
+ * @param persistance
+ * @param data
+ * @param listeMessageError
+ */
+ public static void remplirPersistanceDPTG(final CrueDaoPersistDPTG persistance, final CrueData data,
+ final CtuluAnalyze analyser) {
+
+ // -- liste qui assure d'ajouter une seule r\xE9f\xE9rence de profil: car un meme profil peut etre referenc\xE9 plusieurs
+ // fois
+ final List<DonPrtGeoProfilCommun> listeProfilUniqueReference = new ArrayList<DonPrtGeoProfilCommun>();
+
+ persistance.Profils = new ArrayList<profilDPTG>();
+ persistance.Branches = new ArrayList<BrancheSaintVenant>();
+ persistance.Sections = new ArrayList<SectionIdem>();
+
+ if (data.getAllEMH() == null || data.getAllEMH().size() == 0) {
+ analyser.addError(CrueResource.getS("DPTG: la liste est vide."), cptEntries++);
+ } else for (final EMH emh : data.getAllEMH()) {
+ if (emh.getDPTG() != null) {
+
+ final List<DonPrtGeo> donnees = emh.getDPTG();
+
+ for (final DonPrtGeo donnee : donnees) {
+
+ // -- c'est un profil
+ if (donnee instanceof DonPrtGeoProfilCommun) {
+ if (!listeProfilUniqueReference.contains(donnee)) {
+ remplirPersistanceAvecProfilsDPTG(persistance.Profils, (DonPrtGeoProfilCommun) donnee, analyser);
+ // -- on enregistre la reference --//
+ listeProfilUniqueReference.add((DonPrtGeoProfilCommun) donnee);
+
+ }
+ } else if (donnee instanceof DonPrtGeoSectionIdem) {
+ remplirPersistanceAvecSectionsDPTG(persistance.Sections, (DonPrtGeoSectionIdem) donnee, emh, analyser);
+ } else if (donnee instanceof DonPrtGeoBrancheSaintVenant) {
+ remplirPersistanceAvecBranchesDPTG(persistance.Branches, emh, (DonPrtGeoBrancheSaintVenant) donnee,
+ analyser);
+ }
+
+ }
+ }
+ }
+ }
+
+ /**
+ * Remplit la premiere partie du fichier DPTG avec les 2 types d'objets: casiers profils ou sections profils.
+ *
+ * @param data
+ * @param analyser
+ * @return
+ */
+ public static void remplirPersistanceAvecProfilsDPTG(final List<profilDPTG> listePersistante,
+ final DonPrtGeoProfilCommun prtgeo, final CtuluAnalyze analyser) {
+
+ profilDPTG profilPersistant = null;
+ if (prtgeo instanceof DonPrtGeoCasierProfil) {
+ profilPersistant = new ProfilCasier();
+ // -- donneee specifique pour le profil casier --//
+ ((ProfilCasier) profilPersistant).Long = ((DonPrtGeoCasierProfil) prtgeo).getLongueur();
+
+ } else {
+ profilPersistant = new ProfilSection();
+ }
+ profilPersistant.Nom = prtgeo.getNom();
+
+ // -- Ecriture des lits numerotes --//
+ if (prtgeo.getMLitNumerotes() != null && prtgeo.getMLitNumerotes().size() > 0) {
+ profilPersistant.Lits = new ArrayList<Lit>();
+ for (final LitNumerote litMetier : prtgeo.getMLitNumerotes()) {
+ final Lit litPersist = new Lit();
+ litPersist.IsActif = litMetier.getEstActif();
+ litPersist.IsMineur = litMetier.getEstMineur();
+ if (litMetier.getDebut() != null) litPersist.LimDeb = "" + litMetier.getDebut().getYP() + " "
+ + litMetier.getDebut().getZ();
+ else litPersist.LimFin = "";
+ if (litMetier.getFin() != null) litPersist.LimFin = "" + litMetier.getFin().getYP() + " "
+ + litMetier.getFin().getZ();
+ else litPersist.LimFin = "";
+
+ if (litMetier.getMDonFrt() != null) {
+ litPersist.Frot = new Frottement();
+ // -- on ajoute le nom avec un suffixe --//
+ litPersist.Frot.NomRef = CrueDaoPersistDFRT.SUFFIXE_REF_DFRT + litMetier.getMDonFrt().getNom();
+ } else {
+ analyser.addError(CrueResource.getS("LitNumerote du casierProfil" + prtgeo.getNom()
+ + ": pas de frottement existant"), cptEntries++);
+ }
+
+ // -- ajout du lit persistant --//
+ profilPersistant.Lits.add(litPersist);
+ }
+
+ } else {
+ analyser.addError(CrueResource.getS("Profil " + prtgeo.getNom() + ": aucun litNumerotes existant"), cptEntries++);
+ }
+
+ // -- ecriture des series pt --//
+ if (prtgeo.getListeProfils() != null && prtgeo.getListeProfils().size() > 0) {
+ profilPersistant.Serie = new ArrayList<StringBuffer>();
+ for (final PtProfil serie : prtgeo.getListeProfils()) {
+ final StringBuffer buff = new StringBuffer("" + serie.getYP() + " " + serie.getZ());
+ profilPersistant.Serie.add(buff);
+ }
+ } else {
+ analyser.addError(CrueResource.getS("Profil " + prtgeo.getNom() + ": aucune s\xE9rie existante"), cptEntries++);
+ }
+
+ // -- ajout du profil persistant --//
+ listePersistante.add(profilPersistant);
+ }
+
+ public static void remplirPersistanceAvecSectionsDPTG(final List<SectionIdem> listePersistante,
+ final DonPrtGeoSectionIdem prtgeo, final EMH emh, final CtuluAnalyze analyser) {
+
+ final SectionIdem sectionPersist = new SectionIdem();
+ sectionPersist.NomRef = CrueDaoPersistDRSO.SUFFIXE_REF_DRSO + emh.getNom();
+ sectionPersist.Dz = prtgeo.getDW();
+ listePersistante.add(sectionPersist);
+ }
+
+ public static void remplirPersistanceAvecBranchesDPTG(final List<BrancheSaintVenant> listePersistante, final EMH emh,
+ final DonPrtGeoBrancheSaintVenant prtgeo, final CtuluAnalyze analyser) {
+ final BrancheSaintVenant branchePersist = new BrancheSaintVenant();
+ branchePersist.NomRef = CrueDaoPersistDRSO.SUFFIXE_REF_DRSO + emh.getNom();
+ branchePersist.CoefSinuo = prtgeo.getCoefSinuo();
+
+ listePersistante.add(branchePersist);
+
+ }
+
+ /**
+ * S'occupe de remplir les donn\xE9es m\xE9tier a partir des donn\xE9es persistantes. ATTENTION: n\xE9cessite de charger les
+ * fichiers DRSO et DFRT: ces donn\xE9es sont n\xE9cessaires car des r\xE9f\xE9rences sont pr\xE9sentes dans le fichier DPTG.
+ *
+ * @param persistance
+ * @param data
+ * @param frottements
+ * @param analyser
+ */
+ public static void remplirMetierDPTG(final CrueDaoPersistDPTG persistance, final CrueData data,
+ final CtuluAnalyze analyser) {
+ if (persistance == null) {
+ analyser.addError(CrueResource.getS("DPTG: Aucunes donn\xE9es DPTG."), cptEntries++);
+ } else {
+ // -- cas des Profils --//
+ remplirProfilsAvecPersistencaDPTG(persistance.Profils, data.getAllEMH(), data.getFrottements(), analyser);
+
+ // -- cas des Sections --//
+ remplirSectionsAvecPersistencaDPTG(persistance.Sections, data.getSections(), analyser);
+
+ // -- cas des branches --//
+ remplirBranchesAvecPersistanceDPTG(persistance.Branches, data.getBranches(), analyser);
+
+ }
+ }
+
+ public static void remplirProfilsAvecPersistencaDPTG(final List<profilDPTG> listePersistante, final List<EMH> data,
+ final List<DonFrt> frottements, final CtuluAnalyze analyser) {
+
+ if (listePersistante == null || listePersistante.size() == 0) {
+ analyser.addError(CrueResource.getS("DPTG: Aucunes donn\xE9es pour les profils."), cptEntries++);
+ return;
+ }
+ for (final profilDPTG profilPersist : listePersistante) {
+
+ // -- on recupere la branche qu'il faut --//
+ String profil = profilPersist.Nom;
+ if (profil.contains(CrueDaoPersistDRSO.SUFFIXE_REF_DRSO)) {
+ profil = profil.replace(CrueDaoPersistDRSO.SUFFIXE_REF_DRSO, "");
+ }
+ // -- on tente de trouver tous les objets referenc\xE9 par ce profil --//
+ final List<EMH> listeEMHUtilisantProfil = new ArrayList<EMH>();
+ final List<EMHCasierProfil> emhProfilcasier = EMHCasierHelper.findByProfil(profil, data);
+ final List<EMHSectionProfil> emhProfilsection = EMHSectionHelper.findByProfil(profil, data);
+
+ listeEMHUtilisantProfil.addAll(emhProfilcasier);
+ listeEMHUtilisantProfil.addAll(emhProfilsection);
+
+ if (listeEMHUtilisantProfil == null || listeEMHUtilisantProfil.size() == 0) {
+ analyser.addError(CrueResource.getS("Reference Profil DPTG : Impossible de trouver le profil de nom " + profil
+ + " dans la liste des casier profils et sections profils de DRSO."), cptEntries++);
+ } else {
+
+ // -- on r\xE9cup\xE8re le casier ou le profil et on le stocke dans le emh --//
+ DonPrtGeoProfilCommun profilGeo = null;
+ if (profilPersist instanceof ProfilCasier) {
+ profilGeo = new DonPrtGeoCasierProfil();
+ // -- donnee particulieres a ProfilCasier --//
+ ((DonPrtGeoCasierProfil) profilGeo).setLongueur(((ProfilCasier) profilPersist).Long);
+ } else profilGeo = new DonPrtGeoSectionProfil();
+
+ // -- on remplit son contenu --//
+ profilGeo.setNom(profilPersist.Nom);
+
+ // -- on remplit les litsNommes --//
+ if (profilPersist.Lits != null) {
+ final List<LitNumerote> listeLits = new ArrayList<LitNumerote>();
+
+ for (final Lit litPersis...
[truncated message content] |
|
From: <had...@us...> - 2009-04-06 15:33:34
|
Revision: 4612
http://fudaa.svn.sourceforge.net/fudaa/?rev=4612&view=rev
Author: hadouxad
Date: 2009-04-06 15:33:22 +0000 (Mon, 06 Apr 2009)
Log Message:
-----------
* Refactorisation du mod?\195?\168le m?\195?\169tier ?\195?\160 partir de PAMC
o le mod?\195?\168le est stabilis?\195?\169 par rapport aux derni?\195?\168res donn?\195?\169es fournies par P. Balayn
o les xsd, structures persistantes ont ?\195?\169galement ?\195?\169t?\195?\169 modifi?\195?\169es au fur et ?\195?\160 mesure
* ?\195?\169criture des structures et algo de parsing du format DCSP
o Test unitaires op?\195?\169rationnels
o xsd ?\195?\169crite
* ?\195?\169criture des structures et algo de parsing du format DPTI
o Test unitaires op?\195?\169rationnels
o xsd ?\195?\169crite
* Mise en place des objets relationEmh
o Utilisation des var args pour les arguments associ?\195?\169s ?\195?\160 l'emh en relation.
o Mise en place pour DRSO avec les noeuds des casiers et les sections des branches.
* ?\195?\169criture des structures et algo de parsing du format DRSO
o Test unitaires op?\195?\169rationnels
o xsd ?\195?\169crite
* Mise en place des noms r?\195?\169f?\195?\169rences pour les unicit?\195?\169s de structure : cf DRSO
* Mise en place du fichier DCLM
o Mise en place des structures DCLM
o Mise en place des converter, structures ,reader/writer et junit
o Explication du travail sur DCLM ?\195?\160 faire pour Carole.
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterCommon.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/validatorXml/valideDPTI.xsd
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/validatorXml/valideDRSO.xsd
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.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/DonCalcSansPrtBranchePDC.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBranche.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/ResPrtGeoCasier.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeoSection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/StriRefC.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/TestCrueDRSOFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueETU.java
trunk/soft/fudaa-crue/fudaa/Fichiers_donnees_Crue/Questions-ModelisationDonnees.txt
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/DonPrtCInitCasier.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalculPermanent.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalculTransitoire.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/DonCLimMNoeudNiveauContinu.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/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/DonPrtCInitBrancheSaintVenant.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EvolutionDF.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EvolutionFF.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/emh/PtEvolutionDF.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/PtEvolutionFF.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBarrageFilEau.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Evolution.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Loi.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestClasse.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/componentTestClasse.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/testXsd.java
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterCommon.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterCommon.java 2009-04-03 16:08:15 UTC (rev 4611)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterCommon.java 2009-04-06 15:33:22 UTC (rev 4612)
@@ -16,6 +16,11 @@
public static String VersionCrue = "0.0";
public static String Commentaire = "Genere par Fudaa le " + new Date(System.currentTimeMillis());
+ /**
+ * symbole de connexion utilis\xE9 pour les balises de relation P\xE8re/fils afin de pr\xE9server les contraintes d'unicit\xE9 de structure.
+ */
+ public final static String symboleConnection="-";
+
// -- listing des diff\xE9rents fichiers et leur noms utilis\xE9s --//
public static String ETU = "ETU";
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDCSP.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDCSP.java 2009-04-03 16:08:15 UTC (rev 4611)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDCSP.java 2009-04-06 15:33:22 UTC (rev 4612)
@@ -9,6 +9,7 @@
import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.BrancheBarrageFilEau;
import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.BrancheBarrageFilEauAbstract;
import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.BrancheBarrageGenerique;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.BrancheBarrageGeneriqueAbstract;
import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.BrancheBarrageRhone;
import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.BrancheClassiqueAbstract;
import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDCSP.BrancheOrifice;
@@ -30,7 +31,8 @@
import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
import org.fudaa.dodico.crue.metier.emh.CatEMHSection;
import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrt;
-import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBarrageFilEau;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheBarrageFilEau;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheBarrageGenerique;
import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheOrifice;
import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBranchePDC;
import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSaintVenant;
@@ -51,7 +53,7 @@
import org.fudaa.dodico.crue.metier.emh.EMHSectionProfil;
import org.fudaa.dodico.crue.metier.emh.EMHSectionSansGeometrie;
import org.fudaa.dodico.crue.metier.emh.ElemSeuilAvecPdc;
-import org.fudaa.dodico.crue.metier.emh.Loi;
+import org.fudaa.dodico.crue.metier.emh.LoiFF;
import org.fudaa.dodico.crue.metier.helper.EMHBrancheHelper;
import org.fudaa.dodico.crue.metier.helper.EMHSectionHelper;
@@ -152,19 +154,21 @@
final EMHBrancheBarrageFilEau new_name = (EMHBrancheBarrageFilEau) branche;
branchePersist = new BrancheBarrageFilEau();
- if (dataCalc instanceof DonCalcSansPrtBarrageFilEau) {
+ if (dataCalc instanceof DonCalcSansPrtBrancheBarrageFilEau) {
final BrancheBarrageFilEau br = (BrancheBarrageFilEau) branchePersist;
// -- recuperation de la formule --//
- if (((DonCalcSansPrtBarrageFilEau) dataCalc).getRegimeDenove_Zam() != null) br.Loi = ((DonCalcSansPrtBarrageFilEau) dataCalc)
- .getRegimeDenove_Zam().getNom();
- br.QLimInf = ((DonCalcSansPrtBarrageFilEau) dataCalc).getQLimInf();
- br.QLimSup = ((DonCalcSansPrtBarrageFilEau) dataCalc).getQLimSup();
+ if (((DonCalcSansPrtBrancheBarrageFilEau) dataCalc).getRegimeDenoye() != null) br.Loi = ((DonCalcSansPrtBrancheBarrageFilEau) dataCalc)
+ .getRegimeDenoye().getNom();
+ br.QLimInf = ((DonCalcSansPrtBrancheBarrageFilEau) dataCalc).getQLimInf();
+ br.QLimSup = ((DonCalcSansPrtBrancheBarrageFilEau) dataCalc).getQLimSup();
// -- on remplit la liste des elements seuils --//
- br.ElemSeuils = remplirPersistanceAvecSeuilsBarragesDSCP(((DonCalcSansPrtBarrageFilEau) dataCalc).getListElt());
+ br.ElemSeuils = remplirPersistanceAvecSeuilsBarragesDSCP(((DonCalcSansPrtBrancheBarrageFilEau) dataCalc).getListElt());
- } else {
+ }
+
+ else {
analyser
.addError(
CrueResource
@@ -172,22 +176,24 @@
+ branche.getNom()), cptEntries++);
}
- } else if (branche instanceof EMHBrancheBarrageGenerique) {
+ }
+
+
+ else if (branche instanceof EMHBrancheBarrageGenerique) {
final EMHBrancheBarrageGenerique new_name = (EMHBrancheBarrageGenerique) branche;
branchePersist = new BrancheBarrageGenerique();
// -- recuperation de la donnee de calcul de la branche --//
- if (dataCalc instanceof DonCalcSansPrtBarrageFilEau) {
+ if (dataCalc instanceof DonCalcSansPrtBrancheBarrageGenerique) {
final BrancheBarrageGenerique br = (BrancheBarrageGenerique) branchePersist;
// -- recuperation de la formule --//
- if (((DonCalcSansPrtBarrageFilEau) dataCalc).getRegimeDenove_Zam() != null) br.Loi = ((DonCalcSansPrtBarrageFilEau) dataCalc)
- .getRegimeDenove_Zam().getNom();
- br.QLimInf = ((DonCalcSansPrtBarrageFilEau) dataCalc).getQLimInf();
- br.QLimSup = ((DonCalcSansPrtBarrageFilEau) dataCalc).getQLimSup();
+ if (((DonCalcSansPrtBrancheBarrageGenerique) dataCalc).getRegimeNoye() != null) br.Loi = ((DonCalcSansPrtBrancheBarrageGenerique) dataCalc)
+ .getRegimeNoye().getNom();
+ br.QLimInf = ((DonCalcSansPrtBrancheBarrageGenerique) dataCalc).getQLimInf();
+ br.QLimSup = ((DonCalcSansPrtBrancheBarrageGenerique) dataCalc).getQLimSup();
// -- on remplit la liste des elements seuils --//
- br.ElemSeuils = remplirPersistanceAvecSeuilsBarragesDSCP(((DonCalcSansPrtBarrageFilEau) dataCalc).getListElt());
-
+
} else {
analyser
.addError(
@@ -201,17 +207,17 @@
branchePersist = new BrancheBarrageRhone();
// -- recuperation de la donnee de calcul de la branche --//
- if (dataCalc instanceof DonCalcSansPrtBarrageFilEau) {
+ if (dataCalc instanceof DonCalcSansPrtBrancheBarrageFilEau) {
final BrancheBarrageRhone br = (BrancheBarrageRhone) branchePersist;
// -- recuperation de la formule --//
- if (((DonCalcSansPrtBarrageFilEau) dataCalc).getRegimeDenove_Zam() != null) br.Loi = ((DonCalcSansPrtBarrageFilEau) dataCalc)
- .getRegimeDenove_Zam().getNom();
- br.QLimInf = ((DonCalcSansPrtBarrageFilEau) dataCalc).getQLimInf();
- br.QLimSup = ((DonCalcSansPrtBarrageFilEau) dataCalc).getQLimSup();
+ if (((DonCalcSansPrtBrancheBarrageFilEau) dataCalc).getRegimeDenoye() != null) br.Loi = ((DonCalcSansPrtBrancheBarrageFilEau) dataCalc)
+ .getRegimeDenoye().getNom();
+ br.QLimInf = ((DonCalcSansPrtBrancheBarrageFilEau) dataCalc).getQLimInf();
+ br.QLimSup = ((DonCalcSansPrtBrancheBarrageFilEau) dataCalc).getQLimSup();
// -- on remplit la liste des elements seuils --//
- br.ElemSeuils = remplirPersistanceAvecSeuilsBarragesDSCP(((DonCalcSansPrtBarrageFilEau) dataCalc).getListElt());
+ br.ElemSeuils = remplirPersistanceAvecSeuilsBarragesDSCP(((DonCalcSansPrtBrancheBarrageFilEau) dataCalc).getListElt());
} else {
analyser
@@ -530,18 +536,18 @@
final BranchePDCAbstract br = (BranchePDCAbstract) branchePersist;
final DonCalcSansPrtBranchePDC dataCalcul = new DonCalcSansPrtBranchePDC();
// -- recuperation de la formule --//
- final Loi newLoi = new Loi();
+ final LoiFF newLoi = new LoiFF();
newLoi.setNom(br.Loi);
dataCalcul.setPdc_DZ(newLoi);
branche.addDSCP(dataCalcul);
} else if (branchePersist instanceof BrancheBarrageFilEauAbstract) {
final BrancheBarrageFilEauAbstract br = (BrancheBarrageFilEauAbstract) branchePersist;
- final DonCalcSansPrtBarrageFilEau dataCalcul = new DonCalcSansPrtBarrageFilEau();
+ final DonCalcSansPrtBrancheBarrageFilEau dataCalcul = new DonCalcSansPrtBrancheBarrageFilEau();
// -- recuperation de la formule --//
- final Loi newLoi = new Loi();
+ final LoiFF newLoi = new LoiFF();
newLoi.setNom(br.Loi);
- dataCalcul.setRegimeDenove_Zam(newLoi);
+ dataCalcul.setRegimeDenoye(newLoi);
dataCalcul.setQLimInf(br.QLimInf);
dataCalcul.setQLimSup(br.QLimSup);
@@ -549,8 +555,20 @@
dataCalcul.setListElt(remplirSeuilsBarragesAvecPersistanceDSCP(br.ElemSeuils));
branche.addDSCP(dataCalcul);
- }
+ }else if(branchePersist instanceof BrancheBarrageGeneriqueAbstract) {
+ final BrancheBarrageGeneriqueAbstract br = (BrancheBarrageGeneriqueAbstract) branchePersist;
+ final DonCalcSansPrtBrancheBarrageGenerique dataCalcul = new DonCalcSansPrtBrancheBarrageGenerique();
+ // -- recuperation de la formule --//
+ final LoiFF newLoi = new LoiFF();
+ newLoi.setNom(br.Loi);
+ dataCalcul.setRegimeNoye(newLoi);
+ dataCalcul.setQLimInf(br.QLimInf);
+ dataCalcul.setQLimSup(br.QLimSup);
+ branche.addDSCP(dataCalcul);
+
+ }
+
else {
analyser.addError(CrueResource.getS("Branche : Donn\xE9es non correcte. La branche de r\xE9f\xE9rence " + reference
+ " contient des \xE9l\xE9ments de calcul innatendu."), cptEntries++);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDPTI.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDPTI.java 2009-04-03 16:08:15 UTC (rev 4611)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDPTI.java 2009-04-06 15:33:22 UTC (rev 4612)
@@ -5,28 +5,17 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.common.CrueResource;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheAbstract;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheBarrageFilEau;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheBarrageGenerique;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheBarrageRhone;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheEnchainement;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheNiveauxAssocies;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheOrifice;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BranchePdc;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheSaintVenant;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheSeuilLateral;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheSeuilTransversal;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheStrickler;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.CasierAbstract;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.CasierMNT;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.CasierProfil;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.NoeudNiveauContinu;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.*;
+
import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
+import org.fudaa.dodico.crue.metier.emh.CatEMHSection;
import org.fudaa.dodico.crue.metier.emh.DonPrtCInitBranche;
import org.fudaa.dodico.crue.metier.emh.DonPrtCInitBranchePdc;
+import org.fudaa.dodico.crue.metier.emh.DonPrtCInitBrancheSaintVenant;
import org.fudaa.dodico.crue.metier.emh.DonPrtCInitNoeud;
+import org.fudaa.dodico.crue.metier.emh.DonPrtCInitSection;
import org.fudaa.dodico.crue.metier.emh.DonPrtClInit;
import org.fudaa.dodico.crue.metier.emh.EMH;
import org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageFilEau;
@@ -42,9 +31,14 @@
import org.fudaa.dodico.crue.metier.emh.EMHBrancheStrickler;
import org.fudaa.dodico.crue.metier.emh.EMHCasierMNT;
import org.fudaa.dodico.crue.metier.emh.EMHCasierProfil;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionIdem;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionInterpolee;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionProfil;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionSansGeometrie;
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.EMHSectionHelper;
/**
* Factory qui se charge de remplir les structures DAO du fichier DPTI avec les donn\xE9es m\xE9tier et inversement.
@@ -52,285 +46,384 @@
* @author Adrien Hadoux
*/
public class CrueDaoConverterDPTI {
- public static int cptEntries = 1;
+ public static int cptEntries = 1;
- /**
- * Remplit les donn\xE9es persistante avec les conditions initiales des noeuds
- *
- * @param data
- * @param analyser
- * @return
- */
- public static List remplirPersistanceAvecNoeudDPTI(final List<CatEMHNoeud> data, final CtuluAnalyze analyser) {
- final List listePersistante = new ArrayList();
- if (data == null || data.size() == 0) {
- analyser.addError(CrueResource.getS("Noeuds: la liste est vide."), cptEntries++);
- } else for (final EMH emh : data) {
- if (emh instanceof CatEMHNoeud) {
- final CatEMHNoeud noeud = (CatEMHNoeud) emh;
+ /**
+ * Remplit les donn\xE9es persistante avec les conditions initiales des noeuds
+ *
+ * @param data
+ * @param analyser
+ * @return
+ */
+ public static List remplirPersistanceAvecNoeudDPTI(final List<CatEMHNoeud> data, final CtuluAnalyze analyser) {
+ final List listePersistante = new ArrayList();
+ if (data == null || data.size() == 0) {
+ analyser.addError(CrueResource.getS("Noeuds: la liste est vide."), cptEntries++);
+ } else for (final EMH emh : data) {
+ if (emh instanceof CatEMHNoeud) {
+ final CatEMHNoeud noeud = (CatEMHNoeud) emh;
- final List<DonPrtClInit> listeCond = noeud.getDPTI();
- if (listeCond != null && listeCond.size() != 0) {
+ final List<DonPrtClInit> listeCond = noeud.getDPTI();
+ if (listeCond != null && listeCond.size() != 0) {
- for (final DonPrtClInit conditionInit : listeCond) {
- if (conditionInit != null && (conditionInit instanceof DonPrtCInitNoeud)) {
- final org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.NoeudNiveauContinu noeudPersist = new org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.NoeudNiveauContinu();
- noeudPersist.NomRef = CrueDaoPersistDRSO.SUFFIXE_REF_DRSO + noeud.getNom();
- noeudPersist.Zini = ((DonPrtCInitNoeud) conditionInit).getZIni();
- listePersistante.add(noeudPersist);
+ for (final DonPrtClInit conditionInit : listeCond) {
+ if (conditionInit != null && (conditionInit instanceof DonPrtCInitNoeud)) {
+ final org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.NoeudNiveauContinu noeudPersist = new org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.NoeudNiveauContinu();
+ noeudPersist.NomRef = CrueDaoPersistDRSO.SUFFIXE_REF_DRSO + noeud.getNom();
+ noeudPersist.Zini = ((DonPrtCInitNoeud) conditionInit).getZIni();
+ listePersistante.add(noeudPersist);
- }
- }
- } else {
- analyser.addError(CrueResource.getS("Noeud: pas de condition initiale pour le noeud de reference "
- + noeud.getNom()), cptEntries++);
- }
- }
- }
- return listePersistante;
- }
+ }
+ }
+ } else {
+ analyser.addError(CrueResource.getS("Noeud: pas de condition initiale pour le noeud de reference "
+ + noeud.getNom()), cptEntries++);
+ }
+ }
+ }
+ return listePersistante;
+ }
- /**
- * Methode qui remplit une arrayList d'objets persistants qui constituent la deuxieme partie du fichier DRSO: les
- * Branches.
- *
- * @param data
- * @return
- */
- public static List<BrancheAbstract> remplirPersistanceAvecBrancheDPTI(final List<CatEMHBranche> data,
- final CtuluAnalyze analyser) {
- final String suffixe = CrueDaoPersistDRSO.SUFFIXE_REF_DRSO;
- final List<BrancheAbstract> listePersistante = new ArrayList<BrancheAbstract>();
- if (data == null || data.size() == 0) {
- analyser.addError(CrueResource.getS("Branches: la liste est vide."), cptEntries++);
- } else for (final EMH emh : data) {
- if (emh instanceof CatEMHBranche) {
- final CatEMHBranche branche = (CatEMHBranche) emh;
- BrancheAbstract branchePersist = null;
- if (branche instanceof EMHBrancheBarrageFilEau) {
- final EMHBrancheBarrageFilEau new_name = (EMHBrancheBarrageFilEau) branche;
- branchePersist = new BrancheBarrageFilEau();
- } else if (branche instanceof EMHBrancheBarrageGenerique) {
- final EMHBrancheBarrageGenerique new_name = (EMHBrancheBarrageGenerique) branche;
- branchePersist = new BrancheBarrageGenerique();
- } else if (branche instanceof EMHBrancheBarrageRhone) {
- final EMHBrancheBarrageRhone new_name = (EMHBrancheBarrageRhone) branche;
- branchePersist = new BrancheBarrageRhone();
- } else if (branche instanceof EMHBrancheEnchainement) {
- final EMHBrancheEnchainement new_name = (EMHBrancheEnchainement) branche;
- branchePersist = new BrancheEnchainement();
- } else if (branche instanceof EMHBrancheNiveauxAssocies) {
- final EMHBrancheNiveauxAssocies new_name = (EMHBrancheNiveauxAssocies) branche;
- branchePersist = new BrancheNiveauxAssocies();
- } else if (branche instanceof EMHBrancheOrifice) {
- final EMHBrancheOrifice new_name = (EMHBrancheOrifice) branche;
- branchePersist = new BrancheOrifice();
+
+ /**
+ * Remplit les donn\xE9es persistante avec les conditions initiales des noeuds
+ *
+ * @param data
+ * @param analyser
+ * @return
+ */
+ public static List<SectionAbstract> remplirPersistanceAvecSectionDPTI(final List<CatEMHSection> data, final CtuluAnalyze analyser) {
+ final List<SectionAbstract> listePersistante = new ArrayList<SectionAbstract>();
+ if (data == null || data.size() == 0) {
+
+ analyser.addError(CrueDaoConverterCommon.emhEmpty("section"), cptEntries++);
+ } else for (final EMH emh : data) {
+ if (emh instanceof CatEMHSection) {
+ final CatEMHSection section = (CatEMHSection) emh;
- // (( BrancheOrifice)branchePersist).OuvPasseDessous=new_name.getOuvPasseDessous();
+ final List<DonPrtClInit> listeCond = section.getDPTI();
+ if (listeCond != null && listeCond.size() != 0) {
- } else if (branche instanceof EMHBranchePdc) {
- final EMHBranchePdc new_name = (EMHBranchePdc) branche;
- branchePersist = new BranchePdc();
- } else if (branche instanceof EMHBrancheSaintVenant) {
- final EMHBrancheSaintVenant new_name = (EMHBrancheSaintVenant) branche;
- branchePersist = new BrancheSaintVenant();
- } else if (branche instanceof EMHBrancheSeuilLongitudinale) {
- final EMHBrancheSeuilLongitudinale new_name = (EMHBrancheSeuilLongitudinale) branche;
- branchePersist = new BrancheSeuilLateral();
- } else if (branche instanceof EMHBrancheSeuilTransversal) {
- final EMHBrancheSeuilTransversal new_name = (EMHBrancheSeuilTransversal) branche;
- branchePersist = new BrancheSeuilTransversal();
- } else if (branche instanceof EMHBrancheStrickler) {
- final EMHBrancheStrickler new_name = (EMHBrancheStrickler) branche;
- branchePersist = new BrancheStrickler();
- }
+ for (final DonPrtClInit conditionInit : listeCond) {
+ if (conditionInit != null && (conditionInit instanceof DonPrtCInitSection)) {
+ SectionAbstract sectionPersist=null;
+
+ if(section instanceof EMHSectionIdem )
+ sectionPersist = new SectionRefIdem();
+ else
+ if(section instanceof EMHSectionInterpolee)
+ sectionPersist = new SectionRefInterpolee();
+ else
+ if(section instanceof EMHSectionProfil)
+ sectionPersist = new SectionRefProfil();
+ else
+ if(section instanceof EMHSectionSansGeometrie)
+ sectionPersist = new SectionRefSansGeometrie();
+
+ sectionPersist.NomRef = CrueDaoPersistDRSO.SUFFIXE_REF_DRSO + section.getNom();
+ sectionPersist.Zini = ((DonPrtCInitSection) conditionInit).getZIni();
+ listePersistante.add(sectionPersist);
- if (branchePersist != null) {
- // -- commun --//
+ }
+ }
+ } else {
+ analyser.addError(CrueResource.getS("\xA8Sections: pas de condition initiale pour le noeud de reference "
+ + section.getNom()), cptEntries++);
+ }
+ }
+ }
+ return listePersistante;
+ }
- final List<DonPrtClInit> listeCond = branche.getDPTI();
- if (listeCond != null && listeCond.size() != 0) {
+
+
+ /**
+ * Methode qui remplit une arrayList d'objets persistants qui constituent la deuxieme partie du fichier DRSO: les
+ * Branches.
+ *
+ * @param data
+ * @return
+ */
+ public static List<BrancheAbstract> remplirPersistanceAvecBrancheDPTI(final List<CatEMHBranche> data,
+ final CtuluAnalyze analyser) {
+ final String suffixe = CrueDaoPersistDRSO.SUFFIXE_REF_DRSO;
+ final List<BrancheAbstract> listePersistante = new ArrayList<BrancheAbstract>();
+ if (data == null || data.size() == 0) {
+ analyser.addError(CrueResource.getS("Branches: la liste est vide."), cptEntries++);
+ } else for (final EMH emh : data) {
+ if (emh instanceof CatEMHBranche) {
+ final CatEMHBranche branche = (CatEMHBranche) emh;
+ BrancheAbstract branchePersist = null;
+ if (branche instanceof EMHBrancheBarrageFilEau) {
+ final EMHBrancheBarrageFilEau new_name = (EMHBrancheBarrageFilEau) branche;
+ branchePersist = new BrancheBarrageFilEau();
+ } else if (branche instanceof EMHBrancheBarrageGenerique) {
+ final EMHBrancheBarrageGenerique new_name = (EMHBrancheBarrageGenerique) branche;
+ branchePersist = new BrancheBarrageGenerique();
+ } else if (branche instanceof EMHBrancheBarrageRhone) {
+ final EMHBrancheBarrageRhone new_name = (EMHBrancheBarrageRhone) branche;
+ branchePersist = new BrancheBarrageRhone();
+ } else if (branche instanceof EMHBrancheEnchainement) {
+ final EMHBrancheEnchainement new_name = (EMHBrancheEnchainement) branche;
+ branchePersist = new BrancheEnchainement();
+ } else if (branche instanceof EMHBrancheNiveauxAssocies) {
+ final EMHBrancheNiveauxAssocies new_name = (EMHBrancheNiveauxAssocies) branche;
+ branchePersist = new BrancheNiveauxAssocies();
+ } else if (branche instanceof EMHBrancheOrifice) {
+ final EMHBrancheOrifice new_name = (EMHBrancheOrifice) branche;
+ branchePersist = new BrancheOrifice();
- for (final DonPrtClInit conditionInit : listeCond) {
+ // (( BrancheOrifice)branchePersist).OuvPasseDessous=new_name.getOuvPasseDessous();
- if (conditionInit != null && (conditionInit instanceof DonPrtCInitBranchePdc)) {
- final DonPrtCInitBranchePdc cinit = (DonPrtCInitBranchePdc) conditionInit;
+ } else if (branche instanceof EMHBranchePdc) {
+ final EMHBranchePdc new_name = (EMHBranchePdc) branche;
+ branchePersist = new BranchePdc();
+ } else if (branche instanceof EMHBrancheSaintVenant) {
+ final EMHBrancheSaintVenant new_name = (EMHBrancheSaintVenant) branche;
+ branchePersist = new BrancheSaintVenant();
+ } else if (branche instanceof EMHBrancheSeuilLongitudinale) {
+ final EMHBrancheSeuilLongitudinale new_name = (EMHBrancheSeuilLongitudinale) branche;
+ branchePersist = new BrancheSeuilLateral();
+ } else if (branche instanceof EMHBrancheSeuilTransversal) {
+ final EMHBrancheSeuilTransversal new_name = (EMHBrancheSeuilTransversal) branche;
+ branchePersist = new BrancheSeuilTransversal();
+ } else if (branche instanceof EMHBrancheStrickler) {
+ final EMHBrancheStrickler new_name = (EMHBrancheStrickler) branche;
+ branchePersist = new BrancheStrickler();
+ }
- branchePersist.NomRef = suffixe + branche.getNom();
- ((BrancheOrifice) branchePersist).OuvPasseDessous = cinit.getOuvPasseDessous();
- branchePersist.Qini = ((DonPrtCInitBranche) conditionInit).getQinit();
- branchePersist.Qruis = ((DonPrtCInitBranche) conditionInit).getQruis();
+ if (branchePersist != null) {
+ // -- commun --//
- listePersistante.add(branchePersist);
- } else if (conditionInit != null && (conditionInit instanceof DonPrtCInitBranche)) {
+ final List<DonPrtClInit> listeCond = branche.getDPTI();
+ if (listeCond != null && listeCond.size() != 0) {
- branchePersist.NomRef = suffixe + branche.getNom();
+ for (final DonPrtClInit conditionInit : listeCond) {
- branchePersist.Qini = ((DonPrtCInitBranche) conditionInit).getQinit();
- branchePersist.Qruis = ((DonPrtCInitBranche) conditionInit).getQruis();
+ if (conditionInit != null && (conditionInit instanceof DonPrtCInitBranchePdc)) {
+ final DonPrtCInitBranchePdc cinit = (DonPrtCInitBranchePdc) conditionInit;
- listePersistante.add(branchePersist);
+ branchePersist.NomRef = suffixe + branche.getNom();
+ if(branchePersist instanceof BrancheOrifice)
+ ((BrancheOrifice) branchePersist).OuvPasseDessous = cinit.getOuvPasseDessous();
+ else
+ if(branchePersist instanceof BranchePdc)
+ ((BranchePdc) branchePersist).OuvPasseDessous = cinit.getOuvPasseDessous();
+
+ branchePersist.Qini = ((DonPrtCInitBranche) conditionInit).getQinit();
+ //branchePersist.Qruis = ((DonPrtCInitBranche) conditionInit).getQruis();
- }
- }
- } else {
- analyser.addError(CrueResource.getS("Branche: pas de condition initiale pour la branche de reference "
- + branche.getNom()), cptEntries++);
- }
- }
- }
- }
- return listePersistante;
- }
+ listePersistante.add(branchePersist);
+ } else if (conditionInit != null && (conditionInit instanceof DonPrtCInitBrancheSaintVenant)) {
- /**
- * Methode qui remplit une arrayList d'objets persistants qui constituent la troisi\xE8me partie du fichier DRSO: les
- * Casier.
- *
- * @param data
- * @return
- */
- public static List<CasierAbstract> remplirPersistanceAvecCasierDPTI(final List<CatEMHCasier> data,
- final CtuluAnalyze analyser) {
- final List<CasierAbstract> listePersistante = new ArrayList<CasierAbstract>();
- for (final EMH emh : data) {
- if (emh instanceof CatEMHCasier) {
- final CatEMHCasier casier = (CatEMHCasier) emh;
- CasierAbstract casierPersist = null;
- if (casier instanceof EMHCasierMNT) {
- casierPersist = new CasierMNT();
- } else if (casier instanceof EMHCasierProfil) {
- casierPersist = new CasierProfil();
- }
- // -- commun --//
- if (casierPersist != null) {
+ branchePersist.NomRef = suffixe + branche.getNom();
- final List<DonPrtClInit> listeCond = casier.getDPTI();
- if (listeCond != null && listeCond.size() != 0) {
- for (final DonPrtClInit conditionInit : listeCond) {
- if (conditionInit != null && (conditionInit instanceof DonPrtCInitBranche)) {
- casierPersist.NomRef = CrueDaoPersistDRSO.SUFFIXE_REF_DRSO + casier.getNom();
- casierPersist.Qruis = ((DonPrtCInitBranche) conditionInit).getQruis();
- listePersistante.add(casierPersist);
- }
- }
- } else {
- analyser.addError(CrueResource.getS("Casier: pas de condition initiale pour le casier de reference "
- + casier.getNom()), cptEntries++);
- }
- }
- }
- }
- return listePersistante;
- }
+ branchePersist.Qini = ((DonPrtCInitBranche) conditionInit).getQinit();
+ ((BrancheSaintVenant)branchePersist).Qruis = ((DonPrtCInitBrancheSaintVenant) conditionInit).getQruis();
- /**
- * Methode qui met a jour les objets m\xE9tier EMH noeuds a partir des donn\xE9es persistantes de DPTI et les pr\xE9chargements
- * de DRSO
- *
- * @param data
- * @return
- */
- public static void remplirNoeudAvecPersistanceDPTI(final List<NoeudNiveauContinu> listePersistants,
- final List<CatEMHNoeud> data, final CtuluAnalyze analyser) {
- if (listePersistants == null || listePersistants.size() == 0) {
- analyser.addError(CrueResource.getS("Noeuds: la liste est vide."), cptEntries++);
- } else for (final Object persist : listePersistants) {
- if (persist instanceof NoeudNiveauContinu) {
- final NoeudNiveauContinu noeudPersist = (NoeudNiveauContinu) persist;
- String reference = noeudPersist.NomRef;
- if (reference.contains(CrueDaoPersistDRSO.SUFFIXE_REF_DRSO)) {
- reference = reference.replace(CrueDaoPersistDRSO.SUFFIXE_REF_DRSO, "");
- }
- final CatEMHNoeud noeud = EMHNoeudHelper.findByReference(reference, data);
- if (noeud == null) {
- analyser.addError(CrueResource.getS("Noeuds : Impossible de trouver le noeud de r\xE9f\xE9rence " + reference),
- cptEntries++);
- } else {
- final DonPrtCInitNoeud condInit = new DonPrtCInitNoeud();
- condInit.setZIni(noeudPersist.Zini);
- noeud.addDPTI(condInit);
- }
- }
- }
+ listePersistante.add(branchePersist);
- }
+ }
+ }
+ } else {
+ analyser.addError(CrueResource.getS("Branche: pas de condition initiale pour la branche de reference "
+ + branche.getNom()), cptEntries++);
+ }
+ }
+ }
+ }
+ return listePersistante;
+ }
- /**
- * Methode qui met a jour les objets m\xE9tier EMH branches a partir des donn\xE9es persistantes de DPTI et les
- * pr\xE9chargements de DRSO
- *
- * @param data
- * @return
- */
- public static void remplirBrancheAvecPersistanceDPTI(final List<BrancheAbstract> listePersistants,
- final List<CatEMHBranche> data, final CtuluAnalyze analyser) {
- if (listePersistants == null || listePersistants.size() == 0) {
- analyser.addError(CrueResource.getS("Branches: la liste est vide."), cptEntries++);
- } else for (final Object persist : listePersistants) {
- if (persist instanceof BrancheAbstract) {
- final BrancheAbstract branchePersist = (BrancheAbstract) persist;
- String reference = branchePersist.NomRef;
- if (reference.contains(CrueDaoPersistDRSO.SUFFIXE_REF_DRSO)) {
- reference = reference.replace(CrueDaoPersistDRSO.SUFFIXE_REF_DRSO, "");
- }
- final CatEMHBranche branche = EMHBrancheHelper.findByReference(reference, data);
- if (branche == null) {
- analyser.addError(CrueResource.getS("Branche : Impossible de trouver la branche de r\xE9f\xE9rence " + reference),
- cptEntries++);
- } else {
+ /**
+ * Methode qui remplit une arrayList d'objets persistants qui constituent la troisi\xE8me partie du fichier DRSO: les
+ * Casier.
+ *
+ * @param data
+ * @return
+ */
+ public static List<CasierAbstract> remplirPersistanceAvecCasierDPTI(final List<CatEMHCasier> data,
+ final CtuluAnalyze analyser) {
+ final List<CasierAbstract> listePersistante = new ArrayList<CasierAbstract>();
+ for (final EMH emh : data) {
+ if (emh instanceof CatEMHCasier) {
+ final CatEMHCasier casier = (CatEMHCasier) emh;
+ CasierAbstract casierPersist = null;
+ if (casier instanceof EMHCasierMNT) {
+ casierPersist = new CasierMNT();
+ } else if (casier instanceof EMHCasierProfil) {
+ casierPersist = new CasierProfil();
+ }
+ // -- commun --//
+ if (casierPersist != null) {
- DonPrtCInitBranche condInit = null;
- // -- cas particuliers --//
- if (branchePersist instanceof BrancheOrifice) {
- final EMHBrancheOrifice br = (EMHBrancheOrifice) branche;
- condInit = new DonPrtCInitBranchePdc();
- final BrancheOrifice orif = (BrancheOrifice) branchePersist;
- if (orif.OuvPasseDessous != null) ((DonPrtCInitBranchePdc) condInit)
- .setOuvPasseDessous(orif.OuvPasseDessous);
- }
- if (condInit == null) condInit = new DonPrtCInitBranche();
- if (branchePersist.Qini != null) condInit.setQinit(branchePersist.Qini);
- if (branchePersist.Qruis != null) condInit.setQruis(branchePersist.Qruis);
- branche.addDPTI(condInit);
- }
- }
- }
- }
+ final List<DonPrtClInit> listeCond = casier.getDPTI();
+ if (listeCond != null && listeCond.size() != 0) {
+ for (final DonPrtClInit conditionInit : listeCond) {
+ if (conditionInit != null && (conditionInit instanceof DonPrtCInitCasier)) {
+ casierPersist.NomRef = CrueDaoPersistDRSO.SUFFIXE_REF_DRSO + casier.getNom();
+ casierPersist.Qruis = ((DonPrtCInitCasier) conditionInit).getQruis();
+ listePersistante.add(casierPersist);
+ }
+ }
+ } else {
+ analyser.addError(CrueResource.getS("Casier: pas de condition initiale pour le casier de reference "
+ + casier.getNom()), cptEntries++);
+ }
+ }
+ }
+ }
+ return listePersistante;
+ }
- /**
- * Methode qui met a jour les objets m\xE9tier EMH noeuds a partir des donn\xE9es persistantes de DPTI et les pr\xE9chargements
- * de DRSO
- *
- * @param data
- * @return
- */
- public static void remplirCasierAvecPersistanceDPTI(final List<CasierAbstract> listePersistants,
- final List<CatEMHCasier> data, final CtuluAnalyze analyser) {
- if (listePersistants == null || listePersistants.size() == 0) {
- analyser.addError(CrueResource.getS("Casiers: la liste est vide."), cptEntries++);
- } else for (final Object persist : listePersistants) {
- if (persist instanceof CasierAbstract) {
- final CasierAbstract casierPersist = (CasierAbstract) persist;
- String reference = casierPersist.NomRef;
- if (reference.contains(CrueDaoPersistDRSO.SUFFIXE_REF_DRSO)) {
- reference = reference.replace(CrueDaoPersistDRSO.SUFFIXE_REF_DRSO, "");
- }
- final CatEMHCasier casier = EMHCasierHelper.findByReference(reference, data);
- if (casier == null) {
- analyser.addError(CrueResource.getS("Casiers : Impossible de trouver le casier de r\xE9f\xE9rence " + reference),
- cptEntries++);
- } else {
- if (casierPersist.Qruis != null) {
- final DonPrtCInitBranche condInit = new DonPrtCInitBranche();
- condInit.setQruis(casierPersist.Qruis);
- casier.addDPTI(condInit);
- }
+ /**
+ * Methode qui met a jour les objets m\xE9tier EMH noeuds a partir des donn\xE9es persistantes de DPTI et les pr\xE9chargements
+ * de DRSO
+ *
+ * @param data
+ * @return
+ */
+ public static void remplirNoeudAvecPersistanceDPTI(final List<NoeudNiveauContinu> listePersistants,
+ final List<CatEMHNoeud> data, final CtuluAnalyze analyser) {
+ if (listePersistants == null || listePersistants.size() == 0) {
+ analyser.addError(CrueResource.getS("Noeuds: la liste est vide."), cptEntries++);
+ } else for (final Object persist : listePersistants) {
+ if (persist instanceof NoeudNiveauContinu) {
+ final NoeudNiveauContinu noeudPersist = (NoeudNiveauContinu) persist;
+ String reference = noeudPersist.NomRef;
+ if (reference.contains(CrueDaoPersistDRSO.SUFFIXE_REF_DRSO)) {
+ reference = reference.replace(CrueDaoPersistDRSO.SUFFIXE_REF_DRSO, "");
+ }
+ final CatEMHNoeud noeud = EMHNoeudHelper.findByReference(reference, data);
+ if (noeud == null) {
+ analyser.addError(CrueResource.getS("Noeuds : Impossible de trouver le noeud de r\xE9f\xE9rence " + reference),
+ cptEntries++);
+ } else {
+ final DonPrtCInitNoeud condInit = new DonPrtCInitNoeud();
+ condInit.setZIni(noeudPersist.Zini);
+ noeud.addDPTI(condInit);
+ }
+ }
+ }
- }
- }
- }
+ }
+
+
+
+ /**
+ * Methode qui met a jour les objets m\xE9tier EMH sections a partir des donn\xE9es persistantes de DPTI et les pr\xE9chargements
+ * de DRSO
+ *
+ * @param data
+ * @return
+ */
+ public static void remplirSectionsAvecPersistanceDPTI(final List<SectionAbstract> listePersistants,
+ final List<CatEMHSection> data, final CtuluAnalyze analyser) {
+ if (listePersistants == null || listePersistants.size() == 0) {
+ analyser.addError(CrueDaoConverterCommon.emhEmpty("Sections"), cptEntries++);
+ } else for (final Object persist : listePersistants) {
+ if (persist instanceof SectionAbstract) {
+ final SectionAbstract sectionPersist = (SectionAbstract) persist;
+ String reference = sectionPersist.NomRef;
+ if (reference.contains(CrueDaoPersistDRSO.SUFFIXE_REF_DRSO)) {
+ reference = reference.replace(CrueDaoPersistDRSO.SUFFIXE_REF_DRSO, "");
+ }
+ final CatEMHSection section = EMHSectionHelper.findByReference(reference, data);
+ if (section == null) {
+ analyser.addError(CrueDaoConverterCommon.unknowReference("Section",reference),
+ cptEntries++);
+ } else {
+ final DonPrtCInitSection condInit = new DonPrtCInitSection();
+ condInit.setZIni(sectionPersist.Zini);
+ section.addDPTI(condInit);
+ }
+ }
+ }
- }
+ }
+ /**
+ * Methode qui met a jour les objets m\xE9tier EMH branches a partir des donn\xE9es persistantes de DPTI et les
+ * pr\xE9chargements de DRSO
+ *
+ * @param data
+ * @return
+ */
+ public static void remplirBrancheAvecPersistanceDPTI(final List<BrancheAbstract> listePersistants,
+ final List<CatEMHBranche> data, final CtuluAnalyze analyser) {
+ if (listePersistants == null || listePersistants.size() == 0) {
+ analyser.addError(CrueResource.getS("Branches: la liste est vide."), cptEntries++);
+ } else for (final Object persist : listePersistants) {
+ if (persist instanceof BrancheAbstract) {
+ final BrancheAbstract branchePersist = (BrancheAbstract) persist;
+ String reference = branchePersist.NomRef;
+ if (reference.contains(CrueDaoPersistDRSO.SUFFIXE_REF_DRSO)) {
+ reference = reference.replace(CrueDaoPersistDRSO.SUFFIXE_REF_DRSO, "");
+ }
+ final CatEMHBranche branche = EMHBrancheHelper.findByReference(reference, data);
+ if (branche == null) {
+ analyser.addError(CrueResource.getS("Branche : Impossible de trouver la branche de r\xE9f\xE9rence " + reference),
+ cptEntries++);
+ } else {
+
+ DonPrtCInitBranche condInit = null;
+ // -- cas particuliers Orifice--//
+ if (branchePersist instanceof BrancheOrifice) {
+ final EMHBrancheOrifice br = (EMHBrancheOrifice) branche;
+ condInit = new DonPrtCInitBranchePdc();
+ final BrancheOrifice orif = (BrancheOrifice) branchePersist;
+ if (orif.OuvPasseDessous != null) ((DonPrtCInitBranchePdc) condInit)
+ .setOuvPasseDessous(orif.OuvPasseDessous);
+ }else
+ // -- cas particuliers SaintVenant--//
+ if (branchePersist instanceof BrancheSaintVenant) {
+ final EMHBrancheSaintVenant br = (EMHBrancheSaintVenant) branche;
+ condInit = new DonPrtCInitBrancheSaintVenant();
+ final BrancheSaintVenant stVenant = (BrancheSaintVenant) branchePersist;
+ if (stVenant.Qruis != null) ((DonPrtCInitBrancheSaintVenant) condInit)
+ .setQruis(stVenant.Qruis);
+ }
+ if (condInit == null) condInit = new DonPrtCInitBranche();
+ if (branchePersist.Qini != null) condInit.setQinit(branchePersist.Qini);
+ branche.addDPTI(condInit);
+ }
+ }
+ }
+ }
+
+ /**
+ * Methode qui met a jour les objets m\xE9tier EMH noeuds a partir des donn\xE9es persistantes de DPTI et les pr\xE9chargements
+ * de DRSO
+ *
+ * @param data
+ * @return
+ */
+ public static void remplirCasierAvecPersistanceDPTI(final List<CasierAbstract> listePersistants,
+ final List<CatEMHCasier> data, final CtuluAnalyze analyser) {
+ if (listePersistants == null || listePersistants.size() == 0) {
+ analyser.addError(CrueResource.getS("Casiers: la liste est vide."), cptEntries++);
+ } else for (final Object persist : listePersistants) {
+ if (persist instanceof CasierAbstract) {
+ final CasierAbstract casierPersist = (CasierAbstract) persist;
+ String reference = casierPersist.NomRef;
+ if (reference.contains(CrueDaoPersistDRSO.SUFFIXE_REF_DRSO)) {
+ reference = reference.replace(CrueDaoPersistDRSO.SUFFIXE_REF_DRSO, "");
+ }
+ final CatEMHCasier casier = EMHCasierHelper.findByReference(reference, data);
+ if (casier == null) {
+ analyser.addError(CrueResource.getS("Casiers : Impossible de trouver le casier de r\xE9f\xE9rence " + reference),
+ cptEntries++);
+ } else {
+ if (casierPersist.Qruis != null) {
+ final DonPrtCInitCasier condInit = new DonPrtCInitCasier();
+ condInit.setQruis(casierPersist.Qruis);
+ casier.addDPTI(condInit);
+ }
+
+ }
+ }
+ }
+
+ }
+
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDRSO.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDRSO.java 2009-04-03 16:08:15 UTC (rev 4611)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDRSO.java 2009-04-06 15:33:22 UTC (rev 4612)
@@ -57,6 +57,8 @@
import org.fudaa.dodico.crue.metier.emh.EMHSectionInterpolee;
import org.fudaa.dodico.crue.metier.emh.EMHSectionProfil;
import org.fudaa.dodico.crue.metier.emh.EMHSectionSansGeometrie;
+import org.fudaa.dodico.crue.metier.emh.RelationEMH;
+import org.fudaa.dodico.crue.metier.helper.EMHHelper;
import org.fudaa.dodico.crue.metier.helper.EMHNoeudHelper;
import org.fudaa.dodico.crue.metier.helper.EMHSectionHelper;
@@ -435,9 +437,9 @@
* @param data
* @return
*/
- public static List<CatEMHSection> remplirSectionsBrancheAvecPersistanceDRSO(final List listePersistanteSections,
+ public static List<RelationEMH> remplirSectionsBrancheAvecPersistanceDRSO(final List listePersistanteSections,
final List<CatEMHSection> listeSections, final CtuluAnalyze analyser) {
- final List<CatEMHSection> listeEMH = new ArrayList<CatEMHSection>();
+ final List<RelationEMH> listeRelationEMH = new ArrayList<RelationEMH>();
if (listePersistanteSections == null || listePersistanteSections.size() == 0) {
analyser.addError(CrueDaoConverterCommon.listEmpty("Branches"), cptEntries++);
} else for (final Object persist : listePersistanteSections) {
@@ -451,17 +453,17 @@
// -- commun aux objets --//
if (section != null) {
+ RelationEMH relation=new RelationEMH(section,sectionPersist.Pos,new Double(sectionPersist.Xp));
+
- if (sectionPersist.Pos != null) section.setPosition(sectionPersist.Pos);
- section.setXp(sectionPersist.Xp);
- listeEMH.add(section);
+ listeRelationEMH.add(relation);
} else {
analyser.addError(CrueDaoConverterCommon.unknowReference("Sections", reference), cptEntries++);
}
}
}
- return listeEMH;
+ return listeRelationEMH;
}
/**
@@ -533,12 +535,12 @@
* @param data
* @return
*/
- public static List<SectionBrancheAbstract> remplirPersistanceAvecSectionsBrancheDRSO(final List<CatEMHSection> data,
+ public static List<SectionBrancheAbstract> remplirPersistanceAvecSectionsBrancheDRSO(final List<RelationEMH> data,
final CtuluAnalyze analyser) {
final List<SectionBrancheAbstract> listePersistante = new ArrayList<SectionBrancheAbstract>();
- for (final EMH emh : data) {
- if (emh instanceof CatEMHSection) {
- final CatEMHSection section = (CatEMHSection) emh;
+ for (final RelationEMH relation : data) {
+ if (relation.getEmh() instanceof CatEMHSection) {
+ final CatEMHSection section = (CatEMHSection) relation.getEmh();
SectionBrancheAbstract sectionPersist = null;
if (section instanceof EMHSectionIdem) {
sectionPersist = new SectionIdem();
@@ -555,9 +557,12 @@
if (sectionPersist != null) {
sectionPersist.NomRef = section.getNom();
- sectionPersist.Pos = section.getPosition();
- sectionPersist.Xp = section.getXp();
-
+ sectionPersist.Pos = (String) EMHHelper.getPositionSection(relation);
+ Object objet=EMHHelper.getXpSection(relation);
+ if(objet instanceof Integer)
+ sectionPersist.Xp = (Integer) objet;
+ else
+ sectionPersist.Xp = (Double) objet;
listePersistante.add(sectionPersist);
}
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTI.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTI.java 2009-04-03 16:08:15 UTC (rev 4611)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTI.java 2009-04-06 15:33:22 UTC (rev 4612)
@@ -57,7 +57,8 @@
Casiers = CrueDaoConverterDPTI.remplirPersistanceAvecCasierDPTI(data.getCasiers(), listeMessageError);
// -- etape 4: on remplit les infso des sections --//
- Sections = new ArrayList<SectionAbstract>();
+ Sections = CrueDaoConverterDPTI.remplirPersistanceAvecSectionDPTI(data.getSections(), listeMessageError);
+
}
@Override
@@ -81,6 +82,7 @@
CrueDaoConverterDPTI.remplirCasierAvecPersistanceDPTI(Casiers, dataCrue.getCasiers(), listeMessageError);
// -- remplissage des sections --//
+ CrueDaoConverterDPTI.remplirSectionsAvecPersistanceDPTI(Sections, dataCrue.getSections(), listeMessageError);
// TODO pour le moment rien mais il faudrait demander des pr\xE9cisions --//
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDCSP.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDCSP.java 2009-04-03 16:08:15 UTC (rev 4611)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDCSP.java 2009-04-06 15:33:22 UTC (rev 4612)
@@ -123,6 +123,14 @@
}
+
+ public static class BrancheBarrageGeneriqueAbstract extends BrancheAbstract {
+ public String Loi;
+ public double QLimInf;
+ public double QLimSup;
+
+ }
+
public static class BrancheSeuilOrificeAbstract extends BrancheAbstract {
public String FormulePdc;
@@ -167,7 +175,7 @@
public static class BranchePdc extends BranchePDCAbstract {}
- public static class BrancheBarrageGenerique extends BrancheBarrageFilEauAbstract {}
+ public static class BrancheBarrageGenerique extends BrancheBarrageGeneriqueAbstract {}
public static class BrancheBarrageRhone extends BrancheBarrageFilEauAbstract {}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDPTI.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDPTI.java 2009-04-03 16:08:15 UTC (rev 4611)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDPTI.java 2009-04-06 15:33:22 UTC (rev 4612)
@@ -34,7 +34,10 @@
xstream.useAttributeFor(NoeudNiveauContinu.class, "NomRef");
xstream.registerConverter(new NoeudNiveauContinuConverter());
}
+
+
+
/**
* Init le parser avec les infos des branches.
*
@@ -107,6 +110,9 @@
public Double Zini;
}
+
+
+
/**
* Il faut cr\xE9er et ajouter ce converter pour inclure le nom du noeud niveau continu dans le fichier xml
*/
@@ -126,6 +132,10 @@
}
}
+
+
+
+
// *************************GESTION DES BRANCHES *************************
/**
@@ -136,12 +146,16 @@
public static class BrancheAbstract {
public String NomRef;
public Double Qini;
- public Double Qruis;
}
- public static class BrancheSaintVenant extends BrancheAbstract {}
+
+
+ public static class BrancheSaintVenant extends BrancheAbstract {
+ public Double Qruis;
+ }
+
public static class BrancheSeuilLateral extends BrancheAbstract {}
public static class BrancheStrickler extends BrancheAbstract {}
@@ -154,7 +168,9 @@
public static class BrancheBarrageFilEau extends BrancheAbstract {}
- public static class BranchePdc extends BrancheAbstract {}
+ public static class BranchePdc extends BrancheAbstract {
+ public Double OuvPasseDessous;
+ }
public static class BrancheBarrageGenerique extends BrancheAbstract {}
@@ -326,6 +342,7 @@
// *************************GESTION DES SECTIONS *************************
public static class SectionAbstract {
public String NomRef;
+ public Double Zini;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDRSO.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDRSO.java 2009-04-03 16:08:15 UTC (rev 4611)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDRSO.java 2009-04-06 15:33:22 UTC (rev 4612)
@@ -164,11 +164,11 @@
// -- gestion des REFERENCES sections --//
// NOTE ADRIEN: on est foutu si il existe plusieurs balises de meme nom
// il faut donc suffixer par des -ref
- xstream.alias("SectionIdem-ref", SectionIdem.class);
- xstream.alias("SectionSansGeometrie-ref", SectionSansGeometrie.class);
- xstream.alias("SectionProfil-ref", SectionProfil.class);
- xstream.alias("SectionInterpolee-ref", SectionInterpolee.class);
- xstream.alias("SectionPilote-ref", SectionPilote.class);
+ xstream.alias("Branche"+CrueDaoConverterCommon.symboleConnection+"SectionIdem", SectionIdem.class);
+ xstream.alias("Branche"+CrueDaoConverterCommon.symboleConnection+"SectionSansGeometrie", SectionSansGeometrie.class);
+ xstream.alias("Branche"+CrueDaoConverterCommon.symboleConnection+"SectionProfil", SectionProfil.class);
+ xstream.alias("Branche"+CrueDaoConverterCommon.symboleConnection+"SectionInterpolee", SectionInterpolee.class);
+ xstream.alias("Branche"+CrueDaoConverterCommon.symboleConnection+"SectionPilote", SectionPilote.class);
xstream.useAttributeFor(SectionBrancheAbstract.class, "NomRef");
xstream.registerConverter(new SectionIdemConverter());
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/DonPrtCInitCasier.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/DonPrtCInitCasier.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/DonPrtCInitCasier.java 2009-04-06 15:33:22 UTC (rev 4612)
@@ -0,0 +1,19 @@
+package org.fudaa.dodico.crue.dao;
+
+import org.fudaa.dodico.crue.metier.emh.DonPrtClInit;
+/**
+ * Condition initiale DPTI des casiers
+ * @author Adrien Hadoux
+ *
+ */
+public class DonPrtCInitCasier implements DonPrtClInit {
+ private double Qruis;
+
+ public double getQruis() {
+ return Qruis;
+ }
+
+ public void setQruis(final double qruis) {
+ Qruis = qruis;
+ }
+}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/validatorXml/valideDPTI.xsd
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/validatorXml/valideDPTI.xsd 2009-04-03 16:08:15 UTC (rev 4611)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/validatorXml/valideDPTI.xsd 2009-04-06 15:33:22 UTC (rev 4612)
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <!-- description des Noeuds -->
+
<xs:complexType name="NoeudNiveauContinu">
<xs:sequence>
<xs:element name="Zini" type="xs:double"/>
@@ -13,32 +16,43 @@
</xs:choice>
</xs:complexType>
+
+
+<!-- description des branches -->
- <xs:complexType name="Branchetype">
+ <xs:complexType name="BranchetypeSaintVenant">
<xs:sequence>
<xs:element name="Qini" type="xs:double"/>
<xs:element name="Qruis" type="xs:double"/>
</xs:sequence>
<xs:attribute name="NomRef" type="xs:string"/>
</xs:complexType>
- <xs:complexType name="BrancheOrifice">
+
+ <xs:complexType name="BranchetypePdc">
<xs:sequence>
<xs:element name="Qini" type="xs:double"/>
- <xs:element name="Qruis" type="xs:double"/>
<xs:element name="OuvPasseDessous" type="xs:double"/>
</xs:sequence>
<xs:attribute name="NomRef" type="xs:string"/>
</xs:complexType>
+
+ <xs:complexType name="Branchetype">
+ <xs:sequence>
+ <xs:element name="Qini" type="xs:double"/...
[truncated message content] |
|
From: <de...@us...> - 2009-04-06 21:50:50
|
Revision: 4614
http://fudaa.svn.sourceforge.net/fudaa/?rev=4614&view=rev
Author: deniger
Date: 2009-04-06 21:50:20 +0000 (Mon, 06 Apr 2009)
Log Message:
-----------
maj
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDLHY.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.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/helper/EMHCasierHelper.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/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/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/TestCrueETU.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueOPTGFile.java
Added Paths:
-----------
trunk/soft/fudaa-crue/.pmd
trunk/soft/fudaa-crue/dodico/.pmd
trunk/soft/fudaa-crue/dodico/.ruleset
trunk/soft/fudaa-crue/fudaa/.pmd
trunk/soft/fudaa-crue/src/
trunk/soft/fudaa-crue/src/main/
trunk/soft/fudaa-crue/src/main/config/
trunk/soft/fudaa-crue/src/main/config/eclipse-cleanUp.xml
trunk/soft/fudaa-crue/src/main/config/eclipse-codetemplates.xml
trunk/soft/fudaa-crue/src/main/config/eclipse-format.xml
trunk/soft/fudaa-crue/src/main/config/pmd.xml
Added: trunk/soft/fudaa-crue/.pmd
===================================================================
--- trunk/soft/fudaa-crue/.pmd (rev 0)
+++ trunk/soft/fudaa-crue/.pmd 2009-04-06 21:50:20 UTC (rev 4614)
@@ -0,0 +1,952 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pmd>
+ <useProjectRuleSet>false</useProjectRuleSet>
+ <ruleSetFile>.ruleset</ruleSetFile>
+ <rules>
+ <rule>
+ <name>LooseCoupling</name>
+ <ruleset>Type Resolution Rules</ruleset>
+ </rule>
+ <rule>
+ <name>CloneMethodMustImplementCloneable</name>
+ <ruleset>Type Resolution Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UnusedImports</name>
+ <ruleset>Type Resolution Rules</ruleset>
+ </rule>
+ <rule>
+ <name>SignatureDeclareThrowsException</name>
+ <ruleset>Type Resolution Rules</ruleset>
+ </rule>
+ <rule>
+ <name>EmptyCatchBlock</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>EmptyIfStmt</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>EmptyWhileStmt</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>EmptyTryBlock</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>EmptyFinallyBlock</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>EmptySwitchStatements</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>JumbledIncrementer</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ForLoopShouldBeWhileLoop</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UnnecessaryConversionTemporary</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>OverrideBothEqualsAndHashcode</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>DoubleCheckedLocking</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ReturnFromFinallyBlock</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>EmptySynchronizedBlock</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UnnecessaryReturn</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>EmptyStaticInitializer</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UnconditionalIfStatement</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>EmptyStatementNotInLoop</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>BooleanInstantiation</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UnnecessaryFinalModifier</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>CollapsibleIfStatements</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UselessOverridingMethod</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ClassCastExceptionWithToArray</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidDecimalLiteralsInBigDecimalConstructor</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UselessOperationOnImmutable</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>MisplacedNullCheck</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UnusedNullCheckInEquals</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidThreadGroup</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>BrokenNullCheck</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>BigIntegerInstantiation</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidUsingOctalValues</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidUsingHardCodedIP</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>CheckResultSet</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidMultipleUnaryOperators</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>EmptyInitializer</name>
+ <ruleset>Basic Rules</ruleset>
+ </rule>
+ <rule>
+ <name>IfStmtsMustUseBraces</name>
+ <ruleset>Braces Rules</ruleset>
+ </rule>
+ <rule>
+ <name>WhileLoopsMustUseBraces</name>
+ <ruleset>Braces Rules</ruleset>
+ </rule>
+ <rule>
+ <name>IfElseStmtsMustUseBraces</name>
+ <ruleset>Braces Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ForLoopsMustUseBraces</name>
+ <ruleset>Braces Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UnusedPrivateField</name>
+ <ruleset>Unused Code Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UnusedLocalVariable</name>
+ <ruleset>Unused Code Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UnusedPrivateMethod</name>
+ <ruleset>Unused Code Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UnusedFormalParameter</name>
+ <ruleset>Unused Code Rules</ruleset>
+ </rule>
+ <rule>
+ <name>MoreThanOneLogger</name>
+ <ruleset>Java Logging Rules</ruleset>
+ </rule>
+ <rule>
+ <name>LoggerIsNotStaticFinal</name>
+ <ruleset>Java Logging Rules</ruleset>
+ </rule>
+ <rule>
+ <name>SystemPrintln</name>
+ <ruleset>Java Logging Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidPrintStackTrace</name>
+ <ruleset>Java Logging Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UnnecessaryConstructor</name>
+ <ruleset>Controversial Rules</ruleset>
+ </rule>
+ <rule>
+ <name>NullAssignment</name>
+ <ruleset>Controversial Rules</ruleset>
+ </rule>
+ <rule>
+ <name>OnlyOneReturn</name>
+ <ruleset>Controversial Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UnusedModifier</name>
+ <ruleset>Controversial Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AssignmentInOperand</name>
+ <ruleset>Controversial Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AtLeastOneConstructor</name>
+ <ruleset>Controversial Rules</ruleset>
+ </rule>
+ <rule>
+ <name>DontImportSun</name>
+ <ruleset>Controversial Rules</ruleset>
+ </rule>
+ <rule>
+ <name>SuspiciousOctalEscape</name>
+ <ruleset>Controversial Rules</ruleset>
+ </rule>
+ <rule>
+ <name>CallSuperInConstructor</name>
+ <ruleset>Controversial Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UnnecessaryParentheses</name>
+ <ruleset>Controversial Rules</ruleset>
+ </rule>
+ <rule>
+ <name>DefaultPackage</name>
+ <ruleset>Controversial Rules</ruleset>
+ </rule>
+ <rule>
+ <name>BooleanInversion</name>
+ <ruleset>Controversial Rules</ruleset>
+ </rule>
+ <rule>
+ <name>DataflowAnomalyAnalysis</name>
+ <ruleset>Controversial Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidFinalLocalVariable</name>
+ <ruleset>Controversial Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidUsingShortType</name>
+ <ruleset>Controversial Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidUsingVolatile</name>
+ <ruleset>Controversial Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidUsingNativeCode</name>
+ <ruleset>Controversial Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidAccessibilityAlteration</name>
+ <ruleset>Controversial Rules</ruleset>
+ </rule>
+ <rule>
+ <name>DoNotCallGarbageCollectionExplicitly</name>
+ <ruleset>Controversial Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidDuplicateLiterals</name>
+ <ruleset>String and StringBuffer Rules</ruleset>
+ </rule>
+ <rule>
+ <name>StringInstantiation</name>
+ <ruleset>String and StringBuffer Rules</ruleset>
+ </rule>
+ <rule>
+ <name>StringToString</name>
+ <ruleset>String and StringBuffer Rules</ruleset>
+ </rule>
+ <rule>
+ <name>InefficientStringBuffering</name>
+ <ruleset>String and StringBuffer Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UnnecessaryCaseChange</name>
+ <ruleset>String and StringBuffer Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UseStringBufferLength</name>
+ <ruleset>String and StringBuffer Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AppendCharacterWithChar</name>
+ <ruleset>String and StringBuffer Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ConsecutiveLiteralAppends</name>
+ <ruleset>String and StringBuffer Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UseIndexOfChar</name>
+ <ruleset>String and StringBuffer Rules</ruleset>
+ </rule>
+ <rule>
+ <name>InefficientEmptyStringCheck</name>
+ <ruleset>String and StringBuffer Rules</ruleset>
+ </rule>
+ <rule>
+ <name>InsufficientStringBufferDeclaration</name>
+ <ruleset>String and StringBuffer Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UselessStringValueOf</name>
+ <ruleset>String and StringBuffer Rules</ruleset>
+ </rule>
+ <rule>
+ <name>StringBufferInstantiationWithChar</name>
+ <ruleset>String and StringBuffer Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UseEqualsToCompareStrings</name>
+ <ruleset>String and StringBuffer Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidStringBufferField</name>
+ <ruleset>String and StringBuffer Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidCatchingThrowable</name>
+ <ruleset>Strict Exception Rules</ruleset>
+ </rule>
+ <rule>
+ <name>SignatureDeclareThrowsException</name>
+ <ruleset>Strict Exception Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ExceptionAsFlowControl</name>
+ <ruleset>Strict Exception Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidCatchingNPE</name>
+ <ruleset>Strict Exception Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidThrowingRawExceptionTypes</name>
+ <ruleset>Strict Exception Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidThrowingNullPointerException</name>
+ <ruleset>Strict Exception Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidRethrowingException</name>
+ <ruleset>Strict Exception Rules</ruleset>
+ </rule>
+ <rule>
+ <name>DoNotExtendJavaLangError</name>
+ <ruleset>Strict Exception Rules</ruleset>
+ </rule>
+ <rule>
+ <name>DoNotThrowExceptionInFinally</name>
+ <ruleset>Strict Exception Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ReplaceVectorWithList</name>
+ <ruleset>Migration Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ReplaceHashtableWithMap</name>
+ <ruleset>Migration Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ReplaceEnumerationWithIterator</name>
+ <ruleset>Migration Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidEnumAsIdentifier</name>
+ <ruleset>Migration Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidAssertAsIdentifier</name>
+ <ruleset>Migration Rules</ruleset>
+ </rule>
+ <rule>
+ <name>IntegerInstantiation</name>
+ <ruleset>Migration Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ByteInstantiation</name>
+ <ruleset>Migration Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ShortInstantiation</name>
+ <ruleset>Migration Rules</ruleset>
+ </rule>
+ <rule>
+ <name>LongInstantiation</name>
+ <ruleset>Migration Rules</ruleset>
+ </rule>
+ <rule>
+ <name>JUnit4TestShouldUseBeforeAnnotation</name>
+ <ruleset>Migration Rules</ruleset>
+ </rule>
+ <rule>
+ <name>JUnit4TestShouldUseAfterAnnotation</name>
+ <ruleset>Migration Rules</ruleset>
+ </rule>
+ <rule>
+ <name>JUnit4TestShouldUseTestAnnotation</name>
+ <ruleset>Migration Rules</ruleset>
+ </rule>
+ <rule>
+ <name>JUnit4SuitesShouldUseSuiteAnnotation</name>
+ <ruleset>Migration Rules</ruleset>
+ </rule>
+ <rule>
+ <name>JUnitUseExpected</name>
+ <ruleset>Migration Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UseProperClassLoader</name>
+ <ruleset>J2EE Rules</ruleset>
+ </rule>
+ <rule>
+ <name>MDBAndSessionBeanNamingConvention</name>
+ <ruleset>J2EE Rules</ruleset>
+ </rule>
+ <rule>
+ <name>RemoteSessionInterfaceNamingConvention</name>
+ <ruleset>J2EE Rules</ruleset>
+ </rule>
+ <rule>
+ <name>LocalInterfaceSessionNamingConvention</name>
+ <ruleset>J2EE Rules</ruleset>
+ </rule>
+ <rule>
+ <name>LocalHomeNamingConvention</name>
+ <ruleset>J2EE Rules</ruleset>
+ </rule>
+ <rule>
+ <name>RemoteInterfaceNamingConvention</name>
+ <ruleset>J2EE Rules</ruleset>
+ </rule>
+ <rule>
+ <name>DoNotCallSystemExit</name>
+ <ruleset>J2EE Rules</ruleset>
+ </rule>
+ <rule>
+ <name>StaticEJBFieldShouldBeFinal</name>
+ <ruleset>J2EE Rules</ruleset>
+ </rule>
+ <rule>
+ <name>DoNotUseThreads</name>
+ <ruleset>J2EE Rules</ruleset>
+ </rule>
+ <rule>
+ <name>LocalVariableCouldBeFinal</name>
+ <ruleset>Optimization Rules</ruleset>
+ </rule>
+ <rule>
+ <name>MethodArgumentCouldBeFinal</name>
+ <ruleset>Optimization Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidInstantiatingObjectsInLoops</name>
+ <ruleset>Optimization Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UseArrayListInsteadOfVector</name>
+ <ruleset>Optimization Rules</ruleset>
+ </rule>
+ <rule>
+ <name>SimplifyStartsWith</name>
+ <ruleset>Optimization Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UseStringBufferForStringAppends</name>
+ <ruleset>Optimization Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UseArraysAsList</name>
+ <ruleset>Optimization Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidArrayLoops</name>
+ <ruleset>Optimization Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UnnecessaryWrapperObjectCreation</name>
+ <ruleset>Optimization Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AddEmptyString</name>
+ <ruleset>Optimization Rules</ruleset>
+ </rule>
+ <rule>
+ <name>MethodReturnsInternalArray</name>
+ <ruleset>Security Code Guidelines</ruleset>
+ </rule>
+ <rule>
+ <name>ArrayIsStoredDirectly</name>
+ <ruleset>Security Code Guidelines</ruleset>
+ </rule>
+ <rule>
+ <name>CouplingBetweenObjects</name>
+ <ruleset>Coupling Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ExcessiveImports</name>
+ <ruleset>Coupling Rules</ruleset>
+ </rule>
+ <rule>
+ <name>LooseCoupling</name>
+ <ruleset>Coupling Rules</ruleset>
+ </rule>
+ <rule>
+ <name>DuplicateImports</name>
+ <ruleset>Import Statement Rules</ruleset>
+ </rule>
+ <rule>
+ <name>DontImportJavaLang</name>
+ <ruleset>Import Statement Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UnusedImports</name>
+ <ruleset>Import Statement Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ImportFromSamePackage</name>
+ <ruleset>Import Statement Rules</ruleset>
+ </rule>
+ <rule>
+ <name>TooManyStaticImports</name>
+ <ruleset>Import Statement Rules</ruleset>
+ </rule>
+ <rule>
+ <name>JUnitStaticSuite</name>
+ <ruleset>JUnit Rules</ruleset>
+ </rule>
+ <rule>
+ <name>JUnitSpelling</name>
+ <ruleset>JUnit Rules</ruleset>
+ </rule>
+ <rule>
+ <name>JUnitAssertionsShouldIncludeMessage</name>
+ <ruleset>JUnit Rules</ruleset>
+ </rule>
+ <rule>
+ <name>JUnitTestsShouldIncludeAssert</name>
+ <ruleset>JUnit Rules</ruleset>
+ </rule>
+ <rule>
+ <name>TestClassWithoutTestCases</name>
+ <ruleset>JUnit Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UnnecessaryBooleanAssertion</name>
+ <ruleset>JUnit Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UseAssertEqualsInsteadOfAssertTrue</name>
+ <ruleset>JUnit Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UseAssertSameInsteadOfAssertTrue</name>
+ <ruleset>JUnit Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UseAssertNullInsteadOfAssertTrue</name>
+ <ruleset>JUnit Rules</ruleset>
+ </rule>
+ <rule>
+ <name>SimplifyBooleanAssertion</name>
+ <ruleset>JUnit Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ShortVariable</name>
+ <ruleset>Naming Rules</ruleset>
+ </rule>
+ <rule>
+ <name>LongVariable</name>
+ <ruleset>Naming Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ShortMethodName</name>
+ <ruleset>Naming Rules</ruleset>
+ </rule>
+ <rule>
+ <name>VariableNamingConventions</name>
+ <ruleset>Naming Rules</ruleset>
+ </rule>
+ <rule>
+ <name>MethodNamingConventions</name>
+ <ruleset>Naming Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ClassNamingConventions</name>
+ <ruleset>Naming Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AbstractNaming</name>
+ <ruleset>Naming Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidDollarSigns</name>
+ <ruleset>Naming Rules</ruleset>
+ </rule>
+ <rule>
+ <name>MethodWithSameNameAsEnclosingClass</name>
+ <ruleset>Naming Rules</ruleset>
+ </rule>
+ <rule>
+ <name>SuspiciousHashcodeMethodName</name>
+ <ruleset>Naming Rules</ruleset>
+ </rule>
+ <rule>
+ <name>SuspiciousConstantFieldName</name>
+ <ruleset>Naming Rules</ruleset>
+ </rule>
+ <rule>
+ <name>SuspiciousEqualsMethodName</name>
+ <ruleset>Naming Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidFieldNameMatchingTypeName</name>
+ <ruleset>Naming Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidFieldNameMatchingMethodName</name>
+ <ruleset>Naming Rules</ruleset>
+ </rule>
+ <rule>
+ <name>NoPackage</name>
+ <ruleset>Naming Rules</ruleset>
+ </rule>
+ <rule>
+ <name>PackageCase</name>
+ <ruleset>Naming Rules</ruleset>
+ </rule>
+ <rule>
+ <name>MisleadingVariableName</name>
+ <ruleset>Naming Rules</ruleset>
+ </rule>
+ <rule>
+ <name>BooleanGetMethodName</name>
+ <ruleset>Naming Rules</ruleset>
+ </rule>
+ <rule>
+ <name>NPathComplexity</name>
+ <ruleset>Code Size Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ExcessiveMethodLength</name>
+ <ruleset>Code Size Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ExcessiveParameterList</name>
+ <ruleset>Code Size Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ExcessiveClassLength</name>
+ <ruleset>Code Size Rules</ruleset>
+ </rule>
+ <rule>
+ <name>CyclomaticComplexity</name>
+ <ruleset>Code Size Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ExcessivePublicCount</name>
+ <ruleset>Code Size Rules</ruleset>
+ </rule>
+ <rule>
+ <name>TooManyFields</name>
+ <ruleset>Code Size Rules</ruleset>
+ </rule>
+ <rule>
+ <name>NcssMethodCount</name>
+ <ruleset>Code Size Rules</ruleset>
+ </rule>
+ <rule>
+ <name>NcssTypeCount</name>
+ <ruleset>Code Size Rules</ruleset>
+ </rule>
+ <rule>
+ <name>NcssConstructorCount</name>
+ <ruleset>Code Size Rules</ruleset>
+ </rule>
+ <rule>
+ <name>TooManyMethods</name>
+ <ruleset>Code Size Rules</ruleset>
+ </rule>
+ <rule>
+ <name>EmptyFinalizer</name>
+ <ruleset>Finalizer Rules</ruleset>
+ </rule>
+ <rule>
+ <name>FinalizeOnlyCallsSuperFinalize</name>
+ <ruleset>Finalizer Rules</ruleset>
+ </rule>
+ <rule>
+ <name>FinalizeOverloaded</name>
+ <ruleset>Finalizer Rules</ruleset>
+ </rule>
+ <rule>
+ <name>FinalizeDoesNotCallSuperFinalize</name>
+ <ruleset>Finalizer Rules</ruleset>
+ </rule>
+ <rule>
+ <name>FinalizeShouldBeProtected</name>
+ <ruleset>Finalizer Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidCallingFinalize</name>
+ <ruleset>Finalizer Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UseCorrectExceptionLogging</name>
+ <ruleset>Jakarta Commons Logging Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ProperLogger</name>
+ <ruleset>Jakarta Commons Logging Rules</ruleset>
+ </rule>
+ <rule>
+ <name>BeanMembersShouldSerialize</name>
+ <ruleset>JavaBean Rules</ruleset>
+ </rule>
+ <rule>
+ <name>MissingSerialVersionUID</name>
+ <ruleset>JavaBean Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ProperCloneImplementation</name>
+ <ruleset>Clone Implementation Rules</ruleset>
+ </rule>
+ <rule>
+ <name>CloneThrowsCloneNotSupportedException</name>
+ <ruleset>Clone Implementation Rules</ruleset>
+ </rule>
+ <rule>
+ <name>CloneMethodMustImplementCloneable</name>
+ <ruleset>Clone Implementation Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UseSingleton</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>SimplifyBooleanReturns</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>SimplifyBooleanExpressions</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>SwitchStmtsShouldHaveDefault</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidDeeplyNestedIfStmts</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidReassigningParameters</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>SwitchDensity</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ConstructorCallsOverridableMethod</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AccessorClassGeneration</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>FinalFieldCouldBeStatic</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>CloseResource</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>NonStaticInitializer</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>DefaultLabelNotLastInSwitchStmt</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>NonCaseLabelInSwitchStatement</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>OptimizableToArrayCall</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>BadComparison</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>EqualsNull</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ConfusingTernary</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>InstantiationToGetClass</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>IdempotentOperations</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>SimpleDateFormatNeedsLocale</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ImmutableField</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UseLocaleWithCaseConversions</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidProtectedFieldInFinalClass</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AssignmentToNonFinalStatic</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>MissingStaticMethodInNonInstantiatableClass</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidSynchronizedAtMethodLevel</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>MissingBreakInSwitch</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UseNotifyAllInsteadOfNotify</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidInstanceofChecksInCatchClause</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AbstractClassWithoutAbstractMethod</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>SimplifyConditional</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>CompareObjectsWithEquals</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>PositionLiteralsFirstInComparisons</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UnnecessaryLocalBeforeReturn</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>NonThreadSafeSingleton</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UncommentedEmptyMethod</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UncommentedEmptyConstructor</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AvoidConstantsInterface</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UnsynchronizedStaticDateFormatter</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>PreserveStackTrace</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>UseCollectionIsEmpty</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ClassWithOnlyPrivateConstructorsShouldBeFinal</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>EmptyMethodInAbstractClassShouldBeAbstract</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>SingularField</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>ReturnEmptyArrayRatherThanNull</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>AbstractClassWithoutAnyMethod</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ <rule>
+ <name>TooFewBranchesForASwitchStatement</name>
+ <ruleset>Design Rules</ruleset>
+ </rule>
+ </rules>
+ <includeDerivedFiles>false</includeDerivedFiles>
+</pmd>
Added: trunk/soft/fudaa-crue/dodico/.pmd
===================================================================
--- trunk/soft/fudaa-crue/dodico/.pmd (rev 0)
+++ trunk/soft/fudaa-crue/dodico/.pmd 2009-04-06 21:50:20 UTC (rev 4614)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pmd>
+ <useProjectRuleSet>true</useProjectRuleSet>
+ <ruleSetFile>C:\devel\fudaa\Fudaa-Crue\Fudaa-Crue root\src\main\config\pmd.xml</ruleSetFile>
+ <includeDerivedFiles>false</includeDerivedFiles>
+</pmd>
Added: trunk/soft/fudaa-crue/dodico/.ruleset
===================================================================
--- trunk/soft/fudaa-crue/dodico/.ruleset (rev 0)
+++ trunk/soft/fudaa-crue/dodico/.ruleset 2009-04-06 21:50:20 UTC (rev 4614)
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<ruleset xmlns="http://pmd.sf.net/ruleset/1.0.0" name="pmd-eclipse" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd" xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd">
+ <description>PMD Plugin preferences rule set</description>
+ <rule ref="rulesets/typeresolution.xml/LooseCoupling"/>
+ <rule ref="rulesets/typeresolution.xml/CloneMethodMustImplementCloneable"/>
+ <rule ref="rulesets/typeresolution.xml/UnusedImports"/>
+ <rule ref="rulesets/typeresolution.xml/SignatureDeclareThrowsException"/>
+ <rule ref="rulesets/basic.xml/EmptyCatchBlock"/>
+ <rule ref="rulesets/basic.xml/EmptyIfStmt"/>
+ <rule ref="rulesets/basic.xml/EmptyWhileStmt"/>
+ <rule ref="rulesets/basic.xml/EmptyTryBlock"/>
+ <rule ref="rulesets/basic.xml/EmptyFinallyBlock"/>
+ <rule ref="rulesets/basic.xml/EmptySwitchStatements"/>
+ <rule ref="rulesets/basic.xml/JumbledIncrementer"/>
+ <rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>
+ <rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/>
+ <rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>
+ <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock">
+ <priority>4</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryReturn"/>
+ <rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>
+ <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>
+ <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>
+ <rule ref="rulesets/basic.xml/BooleanInstantiation">
+ <priority>4</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>
+ <rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>
+ <rule ref="rulesets/basic.xml/UselessOverridingMethod"/>
+ <rule ref="rulesets/basic.xml/ClassCastExceptionWithToArray"/>
+ <rule ref="rulesets/basic.xml/AvoidDecimalLiteralsInBigDecimalConstructor"/>
+ <rule ref="rulesets/basic.xml/UselessOperationOnImmutable"/>
+ <rule ref="rulesets/basic.xml/MisplacedNullCheck"/>
+ <rule ref="rulesets/basic.xml/UnusedNullCheckInEquals"/>
+ <rule ref="rulesets/basic.xml/AvoidThreadGroup"/>
+ <rule ref="rulesets/basic.xml/BrokenNullCheck"/>
+ <rule ref="rulesets/basic.xml/BigIntegerInstantiation"/>
+ <rule ref="rulesets/basic.xml/AvoidUsingOctalValues"/>
+ <rule ref="rulesets/basic.xml/AvoidUsingHardCodedIP"/>
+ <rule ref="rulesets/basic.xml/CheckResultSet"/>
+ <rule ref="rulesets/basic.xml/AvoidMultipleUnaryOperators"/>
+ <rule ref="rulesets/basic.xml/EmptyInitializer"/>
+ <rule ref="rulesets/braces.xml/IfStmtsMustUseBraces"/>
+ <rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces"/>
+ <rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces"/>
+ <rule ref="rulesets/braces.xml/ForLoopsMustUseBraces"/>
+ <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>
+ <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/>
+ <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>
+ <rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"/>
+ <rule ref="rulesets/logging-java.xml/MoreThanOneLogger"/>
+ <rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>
+ <rule ref="rulesets/logging-java.xml/SystemPrintln"/>
+ <rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>
+ <rule ref="rulesets/controversial.xml/UnnecessaryConstructor"/>
+ <rule ref="rulesets/controversial.xml/NullAssignment"/>
+ <rule ref="rulesets/controversial.xml/OnlyOneReturn"/>
+ <rule ref="rulesets/controversial.xml/UnusedModifier"/>
+ <rule ref="rulesets/controversial.xml/AssignmentInOperand"/>
+ <rule ref="rulesets/controversial.xml/AtLeastOneConstructor"/>
+ <rule ref="rulesets/controversial.xml/DontImportSun"/>
+ <rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>
+ <rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>
+ <rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>
+ <rule ref="rulesets/controversial.xml/DefaultPackage"/>
+ <rule ref="rulesets/controversial.xml/BooleanInversion"/>
+ <rule ref="rulesets/controversial.xml/DataflowAnomalyAnalysis"/>
+ <rule ref="rulesets/controversial.xml/AvoidFinalLocalVariable"/>
+ <rule ref="rulesets/controversial.xml/AvoidUsingShortType"/>
+ <rule ref="rulesets/controversial.xml/AvoidUsingVolatile"/>
+ <rule ref="rulesets/controversial.xml/AvoidUsingNativeCode"/>
+ <rule ref="rulesets/controversial.xml/AvoidAccessibilityAlteration"/>
+ <rule ref="rulesets/controversial.xml/DoNotCallGarbageCollectionExplicitly"/>
+ <rule ref="rulesets/strings.xml/AvoidDuplicateLiterals"/>
+ <rule ref="rulesets/strings.xml/StringInstantiation"/>
+ <rule ref="rulesets/strings.xml/StringToString"/>
+ <rule ref="rulesets/strings.xml/InefficientStringBuffering"/>
+ <rule ref="rulesets/strings.xml/UnnecessaryCaseChange"/>
+ <rule ref="rulesets/strings.xml/UseStringBufferLength"/>
+ <rule ref="rulesets/strings.xml/AppendCharacterWithChar"/>
+ <rule ref="rulesets/strings.xml/ConsecutiveLiteralAppends"/>
+ <rule ref="rulesets/strings.xml/UseIndexOfChar"/>
+ <rule ref="rulesets/strings.xml/InefficientEmptyStringCheck"/>
+ <rule ref="rulesets/strings.xml/InsufficientStringBufferDeclaration"/>
+ <rule ref="rulesets/strings.xml/UselessStringValueOf"/>
+ <rule ref="rulesets/strings.xml/StringBufferInstantiationWithChar"/>
+ <rule ref="rulesets/strings.xml/UseEqualsToCompareStrings"/>
+ <rule ref="rulesets/strings.xml/AvoidStringBufferField"/>
+ <rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable"/>
+ <rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException"/>
+ <rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl"/>
+ <rule ref="rulesets/strictexception.xml/AvoidCatchingNPE"/>
+ <rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes"/>
+ <rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException"/>
+ <rule ref="rulesets/strictexception.xml/AvoidRethrowingException"/>
+ <rule ref="rulesets/strictexception.xml/DoNotExtendJavaLangError"/>
+ <rule ref="rulesets/strictexception.xml/DoNotThrowExceptionInFinally"/>
+ <rule ref="rulesets/migrating.xml/ReplaceVectorWithList"/>
+ <rule ref="rulesets/migrating.xml/ReplaceHashtableWithMap"/>
+ <rule ref="rulesets/migrating.xml/ReplaceEnumerationWithIterator"/>
+ <rule ref="rulesets/migrating.xml/AvoidEnumAsIdentifier"/>
+ <rule ref="rulesets/migrating.xml/AvoidAssertAsIdentifier"/>
+ <rule ref="rulesets/migrating.xml/IntegerInstantiation"/>
+ <rule ref="rulesets/migrating.xml/ByteInstantiation"/>
+ <rule ref="rulesets/migrating.xml/ShortInstantiation"/>
+ <rule ref="rulesets/migrating.xml/LongInstantiation"/>
+ <rule ref="rulesets/migrating.xml/JUnit4TestShouldUseBeforeAnnotation"/>
+ <rule ref="rulesets/migrating.xml/JUnit4TestShouldUseAfterAnnotation"/>
+ <rule ref="rulesets/migrating.xml/JUnit4TestShouldUseTestAnnotation"/>
+ <rule ref="rulesets/migrating.xml/JUnit4SuitesShouldUseSuiteAnnotation"/>
+ <rule ref="rulesets/migrating.xml/JUnitUseExpected"/>
+ <rule ref="rulesets/j2ee.xml/UseProperClassLoader"/>
+ <rule ref="rulesets/j2ee.xml/MDBAndSessionBeanNamingConvention"/>
+ <rule ref="rulesets/j2ee.xml/RemoteSessionInterfaceNamingConvention"/>
+ <rule ref="rulesets/j2ee.xml/LocalInterfaceSessionNamingConvention"/>
+ <rule ref="rulesets/j2ee.xml/LocalHomeNamingConvention"/>
+ <rule ref="rulesets/j2ee.xml/RemoteInterfaceNamingConvention"/>
+ <rule ref="rulesets/j2ee.xml/DoNotCallSystemExit"/>
+ <rule ref="rulesets/j2ee.xml/StaticEJBFieldShouldBeFinal"/>
+ <rule ref="rulesets/j2ee.xml/DoNotUseThreads"/>
+ <rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal"/>
+ <rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal"/>
+ <rule ref="rulesets/optimizations.xml/AvoidInstantiatingObjectsInLoops"/>
+ <rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"/>
+ <rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/>
+ <rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends"/>
+ <rule ref="rulesets/optimizations.xml/UseArraysAsList"/>
+ <rule ref="rulesets/optimizations.xml/AvoidArrayLoops"/>
+ <rule ref="rulesets/optimizations.xml/UnnecessaryWrapperObjectCreation"/>
+ <rule ref="rulesets/optimizations.xml/AddEmptyString"/>
+ <rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray"/>
+ <rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly"/>
+ <rule ref="rulesets/coupling.xml/CouplingBetweenObjects"/>
+ <rule ref="rulesets/coupling.xml/ExcessiveImports"/>
+ <rule ref="rulesets/coupling.xml/LooseCoupling"/>
+ <rule ref="rulesets/imports.xml/DuplicateImports"/>
+ <rule ref="rulesets/imports.xml/DontImportJavaLang"/>
+ <rule ref="rulesets/imports.xml/UnusedImports"/>
+ <rule ref="rulesets/imports.xml/ImportFromSamePackage"/>
+ <rule ref="rulesets/imports.xml/TooManyStaticImports"/>
+ <rule ref="rulesets/junit.xml/JUnitStaticSuite"/>
+ <rule ref="rulesets/junit.xml/JUnitSpelling"/>
+ <rule ref="rulesets/junit.xml/JUnitAssertionsShouldIncludeMessage"/>
+ <rule ref="rulesets/junit.xml/JUnitTestsShouldIncludeAssert"/>
+ <rule ref="rulesets/junit.xml/TestClassWithoutTestCases"/>
+ <rule ref="rulesets/junit.xml/UnnecessaryBooleanAssertion"/>
+ <rule ref="rulesets/junit.xml/UseAssertEqualsInsteadOfAssertTrue"/>
+ <rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue"/>
+ <rule ref="rulesets/junit.xml/UseAssertNullInsteadOfAssertTrue"/>
+ <rule ref="rulesets/junit.xml/SimplifyBooleanAssertion"/>
+ <rule ref="rulesets/naming.xml/ShortVariable"/>
+ <rule ref="rulesets/naming.xml/LongVariable"/>
+ <rule ref="rulesets/naming.xml/ShortMethodName"/>
+ <rule ref="rulesets/naming.xml/VariableNamingConventions"/>
+ <rule ref="rulesets/naming.xml/MethodNamingConventions"/>
+ <rule ref="rulesets/naming.xml/ClassNamingConventions"/>
+ <rule ref="rulesets/naming.xml/AbstractNaming"/>
+ <rule ref="rulesets/naming.xml/AvoidDollarSigns"/>
+ <rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass"/>
+ <rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"/>
+ <rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"/>
+ <rule ref="rulesets/naming.xml/SuspiciousEqualsMethodName"/>
+ <rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName"/>
+ <rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName"/>
+ <rule ref="rulesets/naming.xml/NoPackage"/>
+ <rule ref="rulesets/naming.xml/PackageCase"/>
+ <rule ref="rulesets/naming.xml/MisleadingVariableName"/>
+ <rule ref="rulesets/naming.xml/BooleanGetMethodName"/>
+ <rule ref="rulesets/codesize.xml/NPathComplexity"/>
+ <rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>
+ <rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>
+ <rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>
+ <rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>
+ <rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>
+ <rule ref="rulesets/codesize.xml/TooManyFields"/>
+ <rule ref="rulesets/codesize.xml/NcssMethodCount"/>
+ <rule ref="rulesets/codesize.xml/NcssTypeCount"/>
+ <rule ref="rulesets/codesize.xml/NcssConstructorCount"/>
+ <rule ref="rulesets/codesize.xml/TooManyMethods"/>
+ <rule ref="rulesets/finalizers.xml/EmptyFinalizer"/>
+ <rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize"/>
+ <rule ref="rulesets/finalizers.xml/FinalizeOverloaded"/>
+ <rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize"/>
+ <rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected"/>
+ <rule ref="rulesets/finalizers.xml/AvoidCallingFinalize"/>
+ <rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/>
+ <rule ref="rulesets/logging-jakarta-commons.xml/ProperLogger"/>
+ <rule ref="rulesets/javabeans.xml/BeanMembersShouldSerialize"/>
+ <rule ref="rulesets/javabeans.xml/MissingSerialVersionUID"/>
+ <rule ref="rulesets/clone.xml/ProperCloneImplementation"/>
+ <rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException"/>
+ <rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable"/>
+ <rule ref="rulesets/design.xml/UseSingleton"/>
+ <rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
+ <rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
+ <rule ref="rulesets/design.xml/SwitchStmtsShouldHaveDefault"/>
+ <rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"/>
+ <rule ref="rulesets/design.xml/AvoidReassigningParameters"/>
+ <rule ref="rulesets/design.xml/SwitchDensity"/>
+ <rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/>
+ <rule ref="rulesets/design.xml/AccessorClassGeneration"/>
+ <rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>
+ <rule ref="rulesets/design.xml/CloseResource"/>
+ <rule ref="rulesets/design.xml/NonStaticInitializer"/>
+ <rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"/>
+ <rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement"/>
+ <rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
+ <rule ref="rulesets/design.xml/BadComparison"/>
+ <rule ref="rulesets/design.xml/EqualsNull"/>
+ <rule ref="rulesets/design.xml/ConfusingTernary"/>
+ <rule ref="rulesets/design.xml/InstantiationToGetClass"/>
+ <rule ref="rulesets/design.xml/IdempotentOperations"/>
+ <rule ref="rulesets/design.xml/SimpleDateFormatNeedsLocale"/>
+ <rule ref="rulesets/design.xml/ImmutableField"/>
+ <rule ref="rulesets/design.xml/UseLocaleWithCaseConversions"/>
+ <rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass"/>
+ <rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"/>
+ <rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/>
+ <rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel"/>
+ <rule ref="rulesets/design.xml/MissingBreakInSwitch"/>
+ <rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/>
+ <rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause"/>
+ <rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod"/>
+ <rule ref="rulesets/design.xml/SimplifyConditional"/>
+ <rule ref="rulesets/design.xml/CompareObjectsWithEquals"/>
+ <rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons"/>
+ <rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/>
+ <rule ref="rulesets/design.xml/NonThreadSafeSingleton"/>
+ <rule ref="rulesets/design.xml/UncommentedEmptyMethod"/>
+ <rule ref="rulesets/design.xml/UncommentedEmptyConstructor"/>
+ <rule ref="rulesets/design.xml/AvoidConstantsInterface"/>
+ <rule ref="rulesets/design.xml/UnsynchronizedStaticDateFormatter"/>
+ <rule ref="rulesets/design.xml/PreserveStackTrace"/>
+ <rule ref="rulesets/design.xml/UseCollectionIsEmpty"/>
+ <rule ref="rulesets/design.xml/ClassWithOnlyPrivateConstructorsShouldBeFinal"/>
+ <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/TooFewBranchesForASwitchStatement"/>
+</ruleset>
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDPTG.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDPTG.java 2009-04-06 15:57:43 UTC (rev 4613)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDPTG.java 2009-04-06 21:50:20 UTC (rev 4614)
@@ -13,7 +13,6 @@
import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTG.SectionIdem;
import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTG.profilDPTG;
import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
-import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
import org.fudaa.dodico.crue.metier.emh.CatEMHSection;
import org.fudaa.dodico.crue.metier.emh.CrueData;
import org.fudaa.dodico.crue.metier.emh.DonFrt;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDPTI.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDPTI.java 2009-04-06 15:57:43 UTC (rev 4613)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDPTI.java 2009-04-06 21:50:20 UTC (rev 4614)
@@ -5,8 +5,27 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.common.CrueResource;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.*;
-
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheAbstract;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheBarrageFilEau;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheBarrageGenerique;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheBarrageRhone;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheEnchainement;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheNiveauxAssocies;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheOrifice;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BranchePdc;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheSaintVenant;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheSeuilLateral;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheSeuilTransversal;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.BrancheStrickler;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.CasierAbstract;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.CasierMNT;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.CasierProfil;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.NoeudNiveauContinu;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.SectionAbstract;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.SectionRefIdem;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.SectionRefInterpolee;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.SectionRefProfil;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDPTI.SectionRefSansGeometrie;
import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDLHY.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDLHY.java 2009-04-06 15:57:43 UTC (rev 4613)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDLHY.java 2009-04-06 21:50:20 UTC (rev 4614)
@@ -3,7 +3,6 @@
import java.util.List;
import org.fudaa.ctulu.CtuluAnalyze;
-
import org.fudaa.dodico.crue.metier.emh.Loi;
import com.thoughtworks.xstream.XStream;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTI.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTI.java 2009-04-06 15:57:43 UTC (rev 4613)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTI.java 2009-04-06 21:50:20 UTC (rev 4614)
@@ -1,6 +1,5 @@
package org.fudaa.dodico.crue.dao;
-import java.util.ArrayList;
import java.util.List;
import org.fudaa.ctulu.CtuluAnalyze;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java 2009-04-06 15:57:43 UTC (rev 4613)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java 2009-04-06 21:50:20 UTC (rev 4614)
@@ -1,6 +1,5 @@
package org.fudaa.dodico.crue.metier.emh;
-import java.util.List;
/**
* @author Adrien Hadoux
Modified: 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/EMH.java 2009-04-06 15:57:43 UTC (rev 4613)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java 2009-04-06 21:50:20 UTC (rev 4614)
@@ -1,6 +1,5 @@
package org.fudaa.dodico.crue.metier.emh;
-import java.util.ArrayList;
import java.util.List;
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHCasierHelper.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHCasierHelper.java 2009-04-06 15:57:43 UTC (rev 4613)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHCasierHelper.java 2009-04-06 21:50:20 UTC (rev 4614)
@@ -2,6 +2,7 @@
import java.util.ArrayList;
import java.util.List;
+
import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
import org.fudaa.dodico.crue.metier.emh.CrueData;
import org.fudaa.dodico.crue.metier.emh.EMH;
Modified: 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/AppCrueTest.java 2009-04-06 15:57:43 UTC (rev 4613)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/AppCrueTest.java 2009-04-06 21:50:20 UTC (rev 4614)
@@ -1,18 +1,10 @@
package org.fudaa.dodico.crue.dao;
-import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
import java.io.File;
-import java.util.HashMap;
import java.util.Random;
-import java.util.Set;
-import javax.swing.BorderFactory;
-import javax.swing.JComboBox;
+
import javax.swing.JFileChooser;
-import javax.swing.JLabel;
import javax.swing.JOptionPane;
-import javax.swing.JPanel;
import javax.swing.JTextField;
import org.fudaa.ctulu.CtuluAnalyze;
Modified: 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/TestCrueDCSPFile.java 2009-04-06 15:57:43 UTC (rev 4613)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDCSPFile.java 2009-04-06 21:50:20 UTC (rev 4614)
@@ -13,164 +13,136 @@
import com.thoughtworks.xstream.XStream;
-public class TestCrueDCSPFile extends TestCase implements TestCrueInterface{
+public class TestCrueDCSPFile extends TestCase implements TestCrueInterface {
- public static boolean makeError=false;
+ public static boolean makeError = false;
- public void testTOXML(){
- //-- persistance xml --//
- CrueData jeuDonnees=remplissageDonneeTest();
- CrueDaoPersistDCSP dataPersistante=new CrueDaoPersistDCSP();
- dataPersistante.fillInfosWith(jeuDonnees.getAllEMH(),new CtuluAnalyze());
- XStream parser=dataPersistante.initXmlParser();
- System.out.println(parser.toXML(dataPersistante));
- }
+ public void testTOXML() {
+ // -- persistance xml --//
+ CrueData jeuDonnees = remplissageDonneeTest();
+ CrueDaoPersistDCSP dataPersistante = new CrueDaoPersistDCSP();
+ dataPersistante.fillInfosWith(jeuDonnees.getAllEMH(), new CtuluAnalyze());
+ XStream parser = dataPersistante.initXmlParser();
+ System.out.println(parser.toXML(dataPersistante));
+ }
+ public void testLectureEcriture() {
+ makeError = false;
+ lectureEcritureDSCP();
+ }
+ public void testLectureEcritureErreur() {
+ makeError = true;
+ lectureEcritureDSCP();
+ }
-
- public void testLectureEcriture(){
- makeError=false;
- lectureEcritureDSCP();
- }
+ /**
+ * Methode appel\xE9e JUNIT.
+ */
+ public CtuluAnalyze lectureEcritureDSCP() {
- public void testLectureEcritureErreur(){
- makeError=true;
- lectureEcritureDSCP();
- }
+ CrueData jeuDonnees = null;
- /**
- *
- * Methode appel\xE9e JUNIT.
- */
- public CtuluAnalyze lectureEcritureDSCP( ) {
+ if (!makeError) jeuDonnees = remplissageDonneeTest();
+ else jeuDonnees = remplissageDonneeTestErreur();
- CrueData jeuDonnees=null;
+ CtuluAnalyze analyzer = new CtuluAnalyze();
+ int cptFichier = 1;
- if(!makeError)
- jeuDonnees =remplissageDonneeTest();
- else
- jeuDonnees =remplissageDonneeTestErreur();
+ // if(notAjunitTest)
+ // AppCrueTest.getRepertoireTest();
+ File fichierDSCP1 = new File(AppCrueTest.pathRepertoireTest + File.separator + "EcritureDSCP" + cptFichier++);
+ File fichierDRSO1 = new File(AppCrueTest.pathRepertoireTest + File.separator + "EcritureDRSO" + cptFichier++);
+ // -- persistance xml --//
+ // -- ecriture--//
+ Crue10writer.writeDSCPFile(jeuDonnees.getAllEMH(), fichierDSCP1, analyzer);
+ Crue10writer.writeDRSOFile(jeuDonnees, fichierDRSO1, analyzer);
+ // --lecture --//
- CtuluAnalyze analyzer=new CtuluAnalyze();
- int cptFichier=1;
+ // -- on lit dabord le fichier DRSO --//
+ CrueData jeuDonneesLue = Crue10reader.readDRSOFile(fichierDRSO1, analyzer);
+ // -- on lit dabord le fichier DSCP --//
+ Crue10reader.readDSCPFile(fichierDSCP1, jeuDonneesLue.getAllEMH(), analyzer);
-// if(notAjunitTest)
-// AppCrueTest.getRepertoireTest();
+ // -- ecriture de nouveau--//
+ File fichierDRSO2 = new File(AppCrueTest.pathRepertoireTest +...
[truncated message content] |
|
From: <had...@us...> - 2009-04-07 14:01:43
|
Revision: 4615
http://fudaa.svn.sourceforge.net/fudaa/?rev=4615&view=rev
Author: hadouxad
Date: 2009-04-07 13:34:12 +0000 (Tue, 07 Apr 2009)
Log Message:
-----------
* Cr?\195?\169ation du File Format Crue g?\195?\169n?\195?\169rique et de ses m?\195?\169thodes associ?\195?\169es qui g?\195?\168re la d?\195?\169finition du type/validateur xsd/structures ?\195?\160 utiliser:
o g?\195?\168re le fichier xsd qui se charge de valider les fichiers xml
o fourni les reader/writer (utilisation des g?\195?\169n?\195?\169riques pour couvrir tous les cas)
o Fourni les structures dao au format de fichier
o Fourni les m?\195?\169thodes read et write en demandant les bonnes structures m?\195?\169tier associes au format
* Mise en place des file format:
o ETU
o DRSO
o DPTI
o DCSP
o DPTG
o DFRT
o OPTG
* Cr?\195?\169ation des test unitaires et mise en forme, ils constitueront un exemple a suivre pour les autres fichiers:
o test lecture/ecriture ?\195?\160 reprendre pour les autres fichiers
o les fichiers sont ?\195?\160 positionner dans le r?\195?\169pertoire ressource/fichierTest
o Les test unitaires sont ?\195?\169crits et a prendre pour exemple pour:
+ DRSO
+ ETU
+ DCSP
+ DFRT
+ DPTI
+ OPTG (reste DPTG ?\195?\160 faire)
* Le format DRSO est valide et op?\195?\169rationnel (mail envoy?\195?\169 ?\195?\160 Mr Balayn)
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/validatorXml/ValidatorXml.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/validatorXml/valideDRSO.xsd
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10writer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.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/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/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/TestCrueETU.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueInterface.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueOPTGFile.java
trunk/soft/fudaa-crue/fudaa/Fichiers_donnees_Crue/Modele 3/crue 10/Modele3.dclm.xml
trunk/soft/fudaa-crue/fudaa/Fichiers_donnees_Crue/Modele 3/crue 10/Modele3.dcsp.xml
trunk/soft/fudaa-crue/fudaa/Fichiers_donnees_Crue/Modele 3/crue 10/Modele3.dlhy.xml
trunk/soft/fudaa-crue/fudaa/Fichiers_donnees_Crue/Modele 3/crue 10/Modele3.dptg.xml
trunk/soft/fudaa-crue/fudaa/Fichiers_donnees_Crue/Modele 3/crue 10/Modele3.dpti.xml
trunk/soft/fudaa-crue/fudaa/Fichiers_donnees_Crue/Modele 3/crue 10/Modele3.drso.xml
trunk/soft/fudaa-crue/fudaa/Fichiers_donnees_Crue/Modele 3/crue 10/Modele3.optg.xml
trunk/soft/fudaa-crue/fudaa/Fichiers_donnees_Crue/Modele 3/crue 10/Modele3.pcal.xml
trunk/soft/fudaa-crue/fudaa/Fichiers_donnees_Crue/Modele 3/crue 10/Modele3.pnum.xml
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/inout/fileformat/DCSPFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DFRTFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTGFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTIFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DRSOFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/OPTGFileFormat.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/RemplissageData.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Etude.etu.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dcsp.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dfrt.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dlhy.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dptg.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dpti.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.drso.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.ocal.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.optg.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.opti.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.ores.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/org/
trunk/soft/fudaa-crue/dodico/src/test/resources/org/fudaa/
trunk/soft/fudaa-crue/dodico/src/test/resources/org/fudaa/dodico/
trunk/soft/fudaa-crue/dodico/src/test/resources/org/fudaa/dodico/crue/
trunk/soft/fudaa-crue/fudaa/Fichiers_donnees_Crue/Modele 3/crue 10/Modele3.ocal.xml
trunk/soft/fudaa-crue/fudaa/Fichiers_donnees_Crue/Modele 3/crue 10/Modele3.opti.xml
trunk/soft/fudaa-crue/fudaa/Fichiers_donnees_Crue/Modele 3/crue 10/Modele3.ores.xml
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/fichierTest/
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/validatorXml/ValidatorXml.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/validatorXml/ValidatorXml.java 2009-04-06 21:50:20 UTC (rev 4614)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/validatorXml/ValidatorXml.java 2009-04-07 13:34:12 UTC (rev 4615)
@@ -26,32 +26,15 @@
static final String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema";
static final String JAXP_SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
static boolean isValid = true;
- /**
- * ref vers le fichier xsd DFRT.
- */
- public static final String xsdDFRT = "valideDFRT.xsd";
- public static final String xsdDRSO = "valideDRSO.xsd";
- public static final String xsdDPTI = "valideDPTI.xsd";
- public static final String xsdDCSP = "valideDCSP.xsd";
- public static final String xsdOPTG = "valideOPTG.xsd";
- public static final String xsdDPTG = "valideDPTG.xsd";
- public static final String xsdETU = "valideETU.xsd";
- public static final String xsdTEST = "valideTest.xsd";
+
+
+
/**
* entete xml a mettre devant chaque fichier.
*/
public static final String enteteXml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
- /**
- * valide fichier dfrt
- *
- * @param xmlFile
- * @return
- */
- public static boolean validDFRT(final String xmlFile, final CtuluAnalyze listeMessageError) {
- return validXMLWithDOM(xmlFile, xsdDFRT, listeMessageError);
- }
/**
* Initialise le validator avec els infos et le bon fichier xsd
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/validatorXml/valideDRSO.xsd
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/validatorXml/valideDRSO.xsd 2009-04-06 21:50:20 UTC (rev 4614)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/validatorXml/valideDRSO.xsd 2009-04-07 13:34:12 UTC (rev 4615)
@@ -47,7 +47,7 @@
<xs:element name="NdAm" type="Reference"/>
<xs:element name="NdAv" type="Reference"/>
<xs:choice minOccurs="1" maxOccurs="unbounded">
- <xs:element name="Branche-Sections" type="SectionsBranches"/>
+ <xs:element name="Sections" type="SectionsBranches"/>
</xs:choice>
</xs:sequence>
<xs:attribute name="Nom" type="xs:string"/>
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java 2009-04-06 21:50:20 UTC (rev 4614)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java 2009-04-07 13:34:12 UTC (rev 4615)
@@ -15,6 +15,13 @@
import org.fudaa.dodico.crue.dao.CrueDaoPersistOPTG;
import org.fudaa.dodico.crue.dao.CrueDaoPersit;
import org.fudaa.dodico.crue.dao.validatorXml.ValidatorXml;
+import org.fudaa.dodico.crue.inout.fileformat.DCSPFileFormat;
+import org.fudaa.dodico.crue.inout.fileformat.DFRTFileFormat;
+import org.fudaa.dodico.crue.inout.fileformat.DPTGFileFormat;
+import org.fudaa.dodico.crue.inout.fileformat.DPTIFileFormat;
+import org.fudaa.dodico.crue.inout.fileformat.DRSOFileFormat;
+import org.fudaa.dodico.crue.inout.fileformat.EtuFileFormat;
+import org.fudaa.dodico.crue.inout.fileformat.OPTGFileFormat;
import org.fudaa.dodico.crue.metier.EMHproject;
import org.fudaa.dodico.crue.metier.emh.CrueData;
import org.fudaa.dodico.crue.metier.emh.DonFrt;
@@ -33,15 +40,15 @@
*
* @author Adrien Hadoux
*/
- protected static class ReaderWithExtra<T> {
+ public static class ReaderWithExtra<T> {
CrueDaoPersit<T> data;
CtuluAnalyze listeMessageError;
- Object dataLinked;
+ Object[] dataLinked;
- public ReaderWithExtra(final CrueDaoPersit<T> data, final Object dataLinked, final CtuluAnalyze listeMessageError) {
- this.data = data;
- this.listeMessageError = listeMessageError;
- this.dataLinked = dataLinked;
+ public ReaderWithExtra( final CtuluAnalyze analyzer) {
+
+ this.listeMessageError = analyzer;
+
}
/**
@@ -51,7 +58,7 @@
* @param validatorXSDfile
* @return
*/
- public T read(final File fichier, final String validatorXSDfile) {
+ public T read(final CrueDaoPersit<T> data, final File fichier, final String validatorXSDfile,final Object... dataLinked) {
listeMessageError.setDesc(CrueResource.getS(" Analyse du Fichier " + fichier.getName()));
@@ -76,9 +83,8 @@
* que des references vers les objets d\xE9crits dans DRSO.
*/
public static EMHproject readETUFile(final File fichierETU, final CtuluAnalyze listeMessageError) {
- return (new ReaderWithExtra<EMHproject>(new CrueDaoPersistETU(), null, listeMessageError)).read(fichierETU,
- ValidatorXml.xsdETU);
- }
+ return EtuFileFormat.getInstance().readData(fichierETU, listeMessageError, null);
+ }
/**
* lit le fichier xml DRSO DRSO - Fichier des donn\xE9es du r\xE9seau (xml) et retourne les donn\xE9es m\xE9tier correspondantes.
@@ -87,11 +93,7 @@
* @return
*/
public static CrueData readDRSOFile(final File fichierDRSO, final CtuluAnalyze listeMessageError) {
-
- // -- remplissage des donnees m\xE9tier a partir des persistantes--//
- return (new ReaderWithExtra<CrueData>(new CrueDaoPersistDRSO(), null, listeMessageError)).read(fichierDRSO,
- ValidatorXml.xsdDRSO);
-
+ return DRSOFileFormat.getInstance().readData(fichierDRSO, listeMessageError, null);
}
/**
@@ -100,8 +102,8 @@
* contient que des references vers les objets d\xE9crits dans DRSO.
*/
public static void readDPTIFile(final File fichierDPTI, final CrueData dataDRSO, final CtuluAnalyze listeMessageError) {
- (new ReaderWithExtra<CrueData>(new CrueDaoPersistDPTI(), dataDRSO, listeMessageError)).read(fichierDPTI,
- ValidatorXml.xsdDPTI);
+ (new ReaderWithExtra<CrueData>(listeMessageError)).read(new CrueDaoPersistDPTI(),fichierDPTI,
+ DPTIFileFormat.xsdDPTI,dataDRSO);
}
/**
@@ -112,8 +114,8 @@
public static void readDPTGFile(final File fichierDPTG, final CrueData dataDRSOetDFRT,
final CtuluAnalyze listeMessageError) {
- (new ReaderWithExtra<CrueData>(new CrueDaoPersistDPTG(), dataDRSOetDFRT, listeMessageError)).read(fichierDPTG,
- ValidatorXml.xsdDPTG);
+ (new ReaderWithExtra<CrueData>( listeMessageError)).read(new CrueDaoPersistDPTG(), fichierDPTG,
+ DPTGFileFormat.xsdDPTG,dataDRSOetDFRT);
}
/**
@@ -122,8 +124,8 @@
* DSCP ne contient que des references vers les objets d\xE9crits dans DRSO.
*/
public static void readDSCPFile(final File fichierDSCP, final List<EMH> dataDRSO, final CtuluAnalyze listeMessageError) {
- (new ReaderWithExtra<List<EMH>>(new CrueDaoPersistDCSP(), dataDRSO, listeMessageError)).read(fichierDSCP,
- ValidatorXml.xsdDCSP);
+ (new ReaderWithExtra<List<EMH>>(listeMessageError)).read(new CrueDaoPersistDCSP(),fichierDSCP,
+ DCSPFileFormat.xsdDCSP,dataDRSO);
}
/**
@@ -133,8 +135,8 @@
* @return
*/
public static List<DonFrt> readDFRTFile(final File fichierDFRT, final CtuluAnalyze listeMessageError) {
- return (new ReaderWithExtra<List<DonFrt>>(new CrueDaoPersistDFRT(), null, listeMessageError)).read(fichierDFRT,
- ValidatorXml.xsdDFRT);
+ return (new ReaderWithExtra<List<DonFrt>>( listeMessageError)).read(new CrueDaoPersistDFRT(),fichierDFRT,
+ DFRTFileFormat.xsdDFRT,null);
}
@@ -146,8 +148,8 @@
* @return
*/
public static DonPrtReseau readOPTGFile(final File fichierOPTG, final CtuluAnalyze listeMessageError) {
- return (new ReaderWithExtra<DonPrtReseau>(new CrueDaoPersistOPTG(), null, listeMessageError)).read(fichierOPTG,
- ValidatorXml.xsdOPTG);
+ return (new ReaderWithExtra<DonPrtReseau>( listeMessageError)).read(new CrueDaoPersistOPTG(),fichierOPTG,
+ OPTGFileFormat.xsdOPTG,null);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10writer.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10writer.java 2009-04-06 21:50:20 UTC (rev 4614)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10writer.java 2009-04-07 13:34:12 UTC (rev 4615)
@@ -25,23 +25,23 @@
*/
public class Crue10writer {
- protected static class WriterWithExtra<T> {
+ public static class WriterWithExtra<T> {
- CrueDaoPersit<T> data;
- T dataMetier;
+ CtuluAnalyze analyzer;
+
- public WriterWithExtra(final CrueDaoPersit<T> data, final T dataMetier) {
- this.data = data;
- this.dataMetier = dataMetier;
+ public WriterWithExtra( final CtuluAnalyze analyzer ) {
+ this.analyzer = analyzer;
+
}
- public boolean write(final CtuluAnalyze listeMessageError, final File f) {
+ public boolean write(final CrueDaoPersit<T> data,final T dataMetier, final File f) {
- listeMessageError.setDesc(CrueResource.getS(" Analyse du Fichier " + f.getName()));
+ analyzer.setDesc(CrueResource.getS(" Analyse du Fichier " + f.getName()));
- data.fillInfosWith(dataMetier, listeMessageError);
+ data.fillInfosWith(dataMetier, analyzer);
final CrueDaoParsing<T> parser = new CrueDaoParsing<T>(data);
- return parser.persistData(f, listeMessageError);
+ return parser.persistData(f, analyzer);
}
}
@@ -51,7 +51,7 @@
* m\xE9tiers fournies.
*/
public static boolean writeDRSOFile(final CrueData data, final File fichierDRSO, final CtuluAnalyze listeMessageError) {
- return (new WriterWithExtra<CrueData>(new CrueDaoPersistDRSO(), data)).write(listeMessageError, fichierDRSO);
+ return (new WriterWithExtra<CrueData>(listeMessageError)).write(new CrueDaoPersistDRSO(),data, fichierDRSO);
}
/**
@@ -60,7 +60,7 @@
*/
public static boolean writeDPTIFile(final CrueData data, final File fichierDPTI, final CtuluAnalyze listeMessageError) {
- return (new WriterWithExtra<CrueData>(new CrueDaoPersistDPTI(), data)).write(listeMessageError, fichierDPTI);
+ return (new WriterWithExtra<CrueData>(listeMessageError )).write(new CrueDaoPersistDPTI(), data, fichierDPTI);
}
/**
@@ -68,7 +68,7 @@
* branches a partir des donn\xE9es m\xE9tiers fournies.
*/
public static boolean writeDSCPFile(final List<EMH> data, final File fichierDSCP, final CtuluAnalyze listeMessageError) {
- return (new WriterWithExtra<List<EMH>>(new CrueDaoPersistDCSP(), data)).write(listeMessageError, fichierDSCP);
+ return (new WriterWithExtra<List<EMH>>(listeMessageError )).write(new CrueDaoPersistDCSP(), data, fichierDSCP);
}
/**
@@ -77,7 +77,7 @@
*/
public static boolean writeDFRTFile(final List<DonFrt> data, final File fichierDFRT,
final CtuluAnalyze listeMessageError) {
- return (new WriterWithExtra<List<DonFrt>>(new CrueDaoPersistDFRT(), data)).write(listeMessageError, fichierDFRT);
+ return (new WriterWithExtra<List<DonFrt>>(listeMessageError )).write(new CrueDaoPersistDFRT(), data, fichierDFRT);
}
/**
@@ -85,7 +85,7 @@
* partir des donn\xE9es m\xE9tiers fournies.
*/
public static boolean writeDPTGFile(final CrueData data, final File fichierDPTG, final CtuluAnalyze listeMessageError) {
- return (new WriterWithExtra<CrueData>(new CrueDaoPersistDPTG(), data)).write(listeMessageError, fichierDPTG);
+ return (new WriterWithExtra<CrueData>(listeMessageError )).write(new CrueDaoPersistDPTG(), data, fichierDPTG);
}
/**
@@ -98,7 +98,7 @@
public static boolean writeOPTGFile(final DonPrtReseau data, final File fichierOPTG,
final CtuluAnalyze listeMessageError) {
final CrueDaoPersistOPTG dataPersistante = new CrueDaoPersistOPTG();
- return (new WriterWithExtra<DonPrtReseau>(new CrueDaoPersistOPTG(), data)).write(listeMessageError, fichierOPTG);
+ return (new WriterWithExtra<DonPrtReseau>(listeMessageError )).write(new CrueDaoPersistOPTG(), data, fichierOPTG);
}
/**
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java 2009-04-06 21:50:20 UTC (rev 4614)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java 2009-04-07 13:34:12 UTC (rev 4615)
@@ -3,12 +3,16 @@
import java.io.File;
import java.util.Map;
+import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluIOOperationSynthese;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.fileformat.FileFormatUnique;
import org.fudaa.ctulu.fileformat.FileReadOperationAbstract;
import org.fudaa.ctulu.fileformat.FileWriteOperationAbstract;
import org.fudaa.dodico.commun.DodicoLib;
+import org.fudaa.dodico.crue.dao.CrueDaoPersit;
+import org.fudaa.dodico.crue.inout.Crue10reader.ReaderWithExtra;
+import org.fudaa.dodico.crue.inout.Crue10writer.WriterWithExtra;
import org.fudaa.dodico.mesure.EvolutionFileFormatVersion;
/**
@@ -16,63 +20,98 @@
* fichier donn\xE9. Contient une m\xE9thode statique tr\xE8s pratique qui permet de retourner automatiquement le bon FileFormat
* en fonction du type renvoy\xE9.
*
+ * T correspond \xE0 la structure m\xE9tier associ\xE9e au format du fichier
+ *
* @author Adrien Hadoux
*/
-public abstract class CrueFileFormat extends FileFormatUnique implements EvolutionFileFormatVersion {
+public abstract class CrueFileFormat<T> extends FileFormatUnique {
- /**
- * Le type du fichier (cf cruedaoCommomFactory.)
- */
- String type;
+ /**
+ * Le type du fichier (cf cruedaoCommomFactory.)
+ */
+ String type;
- protected CrueFileFormat(final String type) {
- super(1);
- extensions_ = getExtensions();
- id_ = "Crue";
- nom_ = "Crue";
- description_ = DodicoLib.getS("Fichier Crue");
- // software_ = FileFormatSoftware.TELEMAC_IS;
- this.type = type;
+ protected CrueFileFormat(final String type) {
+ super(1);
+ extensions_ = getExtensions();
+ id_ = "Crue";
+ nom_ = "Crue";
+ description_ = DodicoLib.getS("Fichier Crue");
+ // software_ = FileFormatSoftware.TELEMAC_IS;
+ this.type = type;
- }
+ }
- /**
- * retourne les extensions acceptables par le fichier
- */
- @Override
- public abstract String[] getExtensions();
+ /**
+ * retourne les extensions acceptables par le fichier
+ */
+ @Override
+ public abstract String[] getExtensions();
- /**
- * retourne l'infos : est du type crue 10 sinon 9.
- *
- * @return
- */
- public abstract boolean isCrue10();
+ /**
+ * retourne l'infos : est du type crue 10 sinon 9.
+ *
+ * @return
+ */
+ public abstract boolean isCrue10();
- /**
- * retourne le validator xsd.
- */
- public abstract String getXsdValidator();
+ /**
+ * retourne le validator xsd.
+ */
+ public abstract String getXsdValidator();
- /**
- * @return true si le fichier demand\xE9 s'auto-suffit. Si il a besoin d'autre fichiers (ref ou d\xE9pendances) retourne
- * false.
- */
- public abstract boolean isIndependant();
+ /**
+ * @return true si le fichier demand\xE9 s'auto-suffit. Si il a besoin d'autre fichiers (ref ou d\xE9pendances) retourne
+ * false.
+ */
+ public abstract boolean isIndependant();
- public FileReadOperationAbstract createReader() {
- // return new ScopeReaderSorT(this);
- return null;
- }
+ /**
+ * Obtenir le reader associ\xE9 au format DRSO
+ * @return
+ */
+ protected ReaderWithExtra<T> getReader( CtuluAnalyze analyzer ){
- public FileWriteOperationAbstract createWriter() {
- // return new ScopeWriterSorT(this);
- return null;
- }
+ return new ReaderWithExtra<T>(analyzer);
+ }
- public CtuluIOOperationSynthese readEvolutions(final File _f, final ProgressionInterface _prog, final Map _options) {
- // TODO Auto-generated method stub
- return null;
- }
+ /**
+ * MEthode qui permet d'\xE9crire les datas dans le fichier f sp\xE9cifi\xE9.
+ * @param data
+ * @param f
+ * @return
+ */
+ public abstract boolean writeData(T data, File f,CtuluAnalyze analyzer);
+ /**
+ * Lit les donn\xE9es dans le fichier f avec les donn\xE9es li\xE9es.
+ * @param dataLinked
+ * @return
+ */
+ public abstract T readData(final File f,CtuluAnalyze analyzer,final Object... dataLinked);
+ /**
+ * Obtenir le wtriter associ\xE9.
+ * @param data
+ * @param dataMetier
+ * @return
+ */
+ protected WriterWithExtra<T> getWriter(final CtuluAnalyze analyzer){
+ return new WriterWithExtra<T>(analyzer);
+ }
+
+
+
+
+ public FileReadOperationAbstract createReader() {
+ // return new ScopeReaderSorT(this);
+ return null;
+ }
+
+ public FileWriteOperationAbstract createWriter() {
+ // return new ScopeWriterSorT(this);
+ return null;
+ }
+
+
+
}
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DCSPFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DCSPFileFormat.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DCSPFileFormat.java 2009-04-07 13:34:12 UTC (rev 4615)
@@ -0,0 +1,67 @@
+package org.fudaa.dodico.crue.inout.fileformat;
+
+import java.io.File;
+import java.util.List;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.dao.CrueDaoConverterCommon;
+import org.fudaa.dodico.crue.dao.CrueDaoPersistDCSP;
+import org.fudaa.dodico.crue.metier.emh.EMH;
+
+
+/**
+ * File format pour DPTI.
+ * Le parametre template correspond \xE0 la donn\xE9es m\xE9tier attendue.
+ * @author Adrien Hadoux
+ *
+ */
+public class DCSPFileFormat extends CrueFileFormat<List<EMH>> {
+
+ public static final String xsdDCSP = "valideDCSP.xsd";
+ private static DCSPFileFormat INSTANCE;
+
+
+
+ protected DCSPFileFormat(String type) {
+ super(type);
+ }
+
+ public static CrueFileFormat<List<EMH>> getInstance() {
+ if (INSTANCE == null) INSTANCE = new DCSPFileFormat(CrueDaoConverterCommon.DCSP);
+ return INSTANCE;
+ }
+
+ @Override
+ public String[] getExtensions() {
+ return new String[] { "dcsp", "dcsp.xml" };
+ }
+
+ @Override
+ public String getXsdValidator() {
+ return xsdDCSP;
+ }
+
+ @Override
+ public boolean isCrue10() {
+ return true;
+ }
+
+ @Override
+ public boolean isIndependant() {
+ return false;
+ }
+
+ @Override
+ public List<EMH> readData(File f,CtuluAnalyze analyzer, Object... dataLinked) {
+ return getReader(analyzer).read(new CrueDaoPersistDCSP(), f, getXsdValidator(), dataLinked);
+
+ }
+
+ @Override
+ public boolean writeData(List<EMH> data, File f,CtuluAnalyze analyzer) {
+ return getWriter(analyzer).write(new CrueDaoPersistDCSP(), data, f);
+ }
+
+
+
+}
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DFRTFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DFRTFileFormat.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DFRTFileFormat.java 2009-04-07 13:34:12 UTC (rev 4615)
@@ -0,0 +1,65 @@
+package org.fudaa.dodico.crue.inout.fileformat;
+
+import java.io.File;
+import java.util.List;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.dao.CrueDaoConverterCommon;
+import org.fudaa.dodico.crue.dao.CrueDaoPersistDFRT;
+import org.fudaa.dodico.crue.metier.emh.DonFrt;
+
+/**
+ * Format de fichier DFRT.
+ * @author Adrien Hadoux
+ *
+ */
+public class DFRTFileFormat extends CrueFileFormat<List<DonFrt>> {
+
+ public static final String xsdDFRT = "valideDFRT.xsd";
+ private static DFRTFileFormat INSTANCE;
+
+
+
+ protected DFRTFileFormat(String type) {
+ super(type);
+ }
+
+ public static CrueFileFormat<List<DonFrt>> getInstance() {
+ if (INSTANCE == null) INSTANCE = new DFRTFileFormat(CrueDaoConverterCommon.DFRT);
+ return INSTANCE;
+ }
+
+ @Override
+ public String[] getExtensions() {
+ return new String[] { "dfrt", "dfrt.xml" };
+ }
+
+ @Override
+ public String getXsdValidator() {
+ return xsdDFRT;
+ }
+
+ @Override
+ public boolean isCrue10() {
+ return true;
+ }
+
+ @Override
+ public boolean isIndependant() {
+ return false;
+ }
+
+ @Override
+ public List<DonFrt> readData(File f,CtuluAnalyze analyzer, Object... dataLinked) {
+ return getReader(analyzer).read(new CrueDaoPersistDFRT(), f, getXsdValidator(), dataLinked);
+
+ }
+
+ @Override
+ public boolean writeData(List<DonFrt> data, File f,CtuluAnalyze analyzer) {
+ return getWriter(analyzer).write(new CrueDaoPersistDFRT(), data, f);
+ }
+
+
+
+}
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTGFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTGFileFormat.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTGFileFormat.java 2009-04-07 13:34:12 UTC (rev 4615)
@@ -0,0 +1,65 @@
+package org.fudaa.dodico.crue.inout.fileformat;
+
+import java.io.File;
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.dao.CrueDaoConverterCommon;
+import org.fudaa.dodico.crue.dao.CrueDaoPersistDPTG;
+import org.fudaa.dodico.crue.metier.emh.CrueData;
+
+
+/**
+ * Format DPTG.
+ * @author Adrien Hadoux
+ *
+ */
+public class DPTGFileFormat extends CrueFileFormat<CrueData> {
+
+
+ public static final String xsdDPTG = "valideDPTG.xsd";
+ private static DPTGFileFormat INSTANCE;
+
+
+
+ protected DPTGFileFormat(String type) {
+ super(type);
+ }
+
+ public static CrueFileFormat<CrueData> getInstance() {
+ if (INSTANCE == null) INSTANCE = new DPTGFileFormat(CrueDaoConverterCommon.DCSP);
+ return INSTANCE;
+ }
+
+ @Override
+ public String[] getExtensions() {
+ return new String[] { "dptg", "dptg.xml" };
+ }
+
+ @Override
+ public String getXsdValidator() {
+ return xsdDPTG;
+ }
+
+ @Override
+ public boolean isCrue10() {
+ return true;
+ }
+
+ @Override
+ public boolean isIndependant() {
+ return false;
+ }
+
+ @Override
+ public CrueData readData(File f,CtuluAnalyze analyzer, Object... dataLinked) {
+ return getReader(analyzer).read(new CrueDaoPersistDPTG(), f, getXsdValidator(), dataLinked);
+
+ }
+
+ @Override
+ public boolean writeData(CrueData data, File f,CtuluAnalyze analyzer) {
+ return getWriter(analyzer).write(new CrueDaoPersistDPTG(), data, f);
+ }
+
+
+
+}
\ No newline at end of file
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTIFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTIFileFormat.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTIFileFormat.java 2009-04-07 13:34:12 UTC (rev 4615)
@@ -0,0 +1,67 @@
+package org.fudaa.dodico.crue.inout.fileformat;
+
+import java.io.File;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.dao.CrueDaoConverterCommon;
+import org.fudaa.dodico.crue.dao.CrueDaoPersistDPTI;
+import org.fudaa.dodico.crue.metier.emh.CrueData;
+
+
+/**
+ * File format pour DPTI.
+ * Le parametre template correspond \xE0 la donn\xE9es m\xE9tier attendue.
+ * @author Adrien Hadoux
+ *
+ */
+
+public class DPTIFileFormat extends CrueFileFormat<CrueData> {
+
+ public static final String xsdDPTI = "valideDPTI.xsd";
+ private static DPTIFileFormat INSTANCE;
+
+
+
+ protected DPTIFileFormat(String type) {
+ super(type);
+ }
+
+ public static CrueFileFormat<CrueData> getInstance() {
+ if (INSTANCE == null) INSTANCE = new DPTIFileFormat(CrueDaoConverterCommon.DPTI);
+ return INSTANCE;
+ }
+
+ @Override
+ public String[] getExtensions() {
+ return new String[] { "dpti", "dpti.xml" };
+ }
+
+ @Override
+ public String getXsdValidator() {
+ return xsdDPTI;
+ }
+
+ @Override
+ public boolean isCrue10() {
+ return true;
+ }
+
+ @Override
+ public boolean isIndependant() {
+ return false;
+ }
+
+ @Override
+ public CrueData readData(File f,CtuluAnalyze analyzer, Object... dataLinked) {
+ return getReader(analyzer).read(new CrueDaoPersistDPTI(), f, getXsdValidator(), dataLinked);
+
+ }
+
+ @Override
+ public boolean writeData(CrueData data, File f,CtuluAnalyze analyzer) {
+ return getWriter(analyzer).write(new CrueDaoPersistDPTI(), data, f);
+ }
+
+
+
+}
\ No newline at end of file
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DRSOFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DRSOFileFormat.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DRSOFileFormat.java 2009-04-07 13:34:12 UTC (rev 4615)
@@ -0,0 +1,66 @@
+package org.fudaa.dodico.crue.inout.fileformat;
+
+import java.io.File;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.dao.CrueDaoConverterCommon;
+import org.fudaa.dodico.crue.dao.CrueDaoPersistDRSO;
+import org.fudaa.dodico.crue.metier.EMHproject;
+import org.fudaa.dodico.crue.metier.emh.CrueData;
+
+/**
+ * File format pour DRSO.
+ * Le parametre template correspond \xE0 la donn\xE9es m\xE9tier attendue.
+ * @author Adrien Hadoux
+ *
+ */
+public class DRSOFileFormat extends CrueFileFormat<CrueData> {
+
+ public static final String xsdDRSO = "valideDRSO.xsd";
+ private static DRSOFileFormat INSTANCE;
+
+
+
+ protected DRSOFileFormat(String type) {
+ super(type);
+ }
+
+ public static CrueFileFormat<CrueData> getInstance() {
+ if (INSTANCE == null) INSTANCE = new DRSOFileFormat(CrueDaoConverterCommon.DRSO);
+ return INSTANCE;
+ }
+
+ @Override
+ public String[] getExtensions() {
+ return new String[] { "drso", "drso.xml" };
+ }
+
+ @Override
+ public String getXsdValidator() {
+ return xsdDRSO;
+ }
+
+ @Override
+ public boolean isCrue10() {
+ return true;
+ }
+
+ @Override
+ public boolean isIndependant() {
+ return true;
+ }
+
+ @Override
+ public CrueData readData(File f,CtuluAnalyze analyzer, Object... dataLinked) {
+ return getReader(analyzer).read(new CrueDaoPersistDRSO(), f, getXsdValidator(), dataLinked);
+
+ }
+
+ @Override
+ public boolean writeData(CrueData data, File f,CtuluAnalyze analyzer) {
+ return getWriter(analyzer).write(new CrueDaoPersistDRSO(), data, f);
+ }
+
+
+
+}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java 2009-04-06 21:50:20 UTC (rev 4614)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java 2009-04-07 13:34:12 UTC (rev 4615)
@@ -1,7 +1,11 @@
package org.fudaa.dodico.crue.inout.fileformat;
+import java.io.File;
+
+import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.dao.CrueDaoConverterCommon;
import org.fudaa.dodico.crue.dao.validatorXml.ValidatorXml;
+import org.fudaa.dodico.crue.metier.EMHproject;
/**
* File format du fichier ETU. Permet de distinguer ce fichier des autres. Utilis\xE9 dans le crue superviseur pour le
@@ -9,8 +13,9 @@
*
* @author Adrien Hadoux
*/
-public class EtuFileFormat extends CrueFileFormat {
+public class EtuFileFormat extends CrueFileFormat<EMHproject> {
+ public static final String xsdETU = "valideETU.xsd";
private static EtuFileFormat INSTANCE;
private EtuFileFormat() {
@@ -24,7 +29,7 @@
@Override
public String getXsdValidator() {
- return ValidatorXml.xsdETU;
+ return xsdETU;
}
@Override
@@ -32,7 +37,7 @@
return true;
}
- public static CrueFileFormat getInstance() {
+ public static CrueFileFormat<EMHproject> getInstance() {
if (INSTANCE == null) INSTANCE = new EtuFileFormat();
return INSTANCE;
}
@@ -42,4 +47,16 @@
return true;
}
+@Override
+public EMHproject readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ // TODO Auto-generated method stub
+ return null;
}
+
+@Override
+public boolean writeData(EMHproject data, File f, CtuluAnalyze analyzer) {
+ // TODO Auto-generated method stub
+ return false;
+}
+
+}
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/OPTGFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/OPTGFileFormat.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/OPTGFileFormat.java 2009-04-07 13:34:12 UTC (rev 4615)
@@ -0,0 +1,62 @@
+package org.fudaa.dodico.crue.inout.fileformat;
+
+import java.io.File;
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.dao.CrueDaoConverterCommon;
+import org.fudaa.dodico.crue.dao.CrueDaoPersistOPTG;
+import org.fudaa.dodico.crue.metier.emh.DonPrtReseau;
+/**
+ * File format optg
+ * @author Adrien Hadoux
+ *
+ */
+public class OPTGFileFormat extends CrueFileFormat<DonPrtReseau> {
+
+ public static final String xsdOPTG = "valideOPTG.xsd";
+ private static OPTGFileFormat INSTANCE;
+
+
+
+ protected OPTGFileFormat(String type) {
+ super(type);
+ }
+
+ public static CrueFileFormat<DonPrtReseau> getInstance() {
+ if (INSTANCE == null) INSTANCE = new OPTGFileFormat(CrueDaoConverterCommon.DPTI);
+ return INSTANCE;
+ }
+
+ @Override
+ public String[] getExtensions() {
+ return new String[] { "optg", "optg.xml" };
+ }
+
+ @Override
+ public String getXsdValidator() {
+ return xsdOPTG;
+ }
+
+ @Override
+ public boolean isCrue10() {
+ return true;
+ }
+
+ @Override
+ public boolean isIndependant() {
+ return true;
+ }
+
+ @Override
+ public DonPrtReseau readData(File f,CtuluAnalyze analyzer, Object... dataLinked) {
+ return getReader(analyzer).read(new CrueDaoPersistOPTG(), f, getXsdValidator(), dataLinked);
+
+ }
+
+ @Override
+ public boolean writeData(DonPrtReseau data, File f,CtuluAnalyze analyzer) {
+ return getWriter(analyzer).write(new CrueDaoPersistOPTG(), data, f);
+ }
+
+
+
+}
Modified: 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/AppCrueTest.java 2009-04-06 21:50:20 UTC (rev 4614)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/AppCrueTest.java 2009-04-07 13:34:12 UTC (rev 4615)
@@ -28,7 +28,7 @@
* Chemin d'acc\xE8s au fichier ETU pour les test unitaires le concernant.
*/
//public static String pathFichierETU = pathRepertoireTest+File.separator+"Etude.etu.xml";
- public static String pathFichierETU = AppCrueTest.class.getResource("fichierTest/Etude.etu.xml").toString();
+
/**
* Specifie le repertoire de test ansq lequel seront sauvegard\xE9 et charg\xE9s les fichiers .
*/
Added: 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/RemplissageData.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/RemplissageData.java 2009-04-07 13:34:12 UTC (rev 4615)
@@ -0,0 +1,611 @@
+package org.fudaa.dodico.crue.dao;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
+import org.fudaa.dodico.crue.metier.emh.CrueData;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheBarrageFilEau;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheOrifice;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBranchePDC;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSeuilLateral;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtSection;
+import org.fudaa.dodico.crue.metier.emh.DonFrt;
+import org.fudaa.dodico.crue.metier.emh.DonPrtCInitBranche;
+import org.fudaa.dodico.crue.metier.emh.DonPrtCInitBranchePdc;
+import org.fudaa.dodico.crue.metier.emh.DonPrtCInitNoeud;
+import org.fudaa.dodico.crue.metier.emh.DonPrtGeoBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.DonPrtGeoCasierProfil;
+import org.fudaa.dodico.crue.metier.emh.DonPrtGeoSectionIdem;
+import org.fudaa.dodico.crue.metier.emh.DonPrtGeoSectionProfil;
+import org.fudaa.dodico.crue.metier.emh.DonPrtReseau;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageFilEau;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageGenerique;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheOrifice;
+import org.fudaa.dodico.crue.metier.emh.EMHBranchePdc;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilLongitudinale;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.metier.emh.EMHCasierMNT;
+import org.fudaa.dodico.crue.metier.emh.EMHCasierProfil;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionIdem;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionInterpolee;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionProfil;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionSansGeometrie;
+import org.fudaa.dodico.crue.metier.emh.ElemOrifice;
+import org.fudaa.dodico.crue.metier.emh.ElemSeuil;
+import org.fudaa.dodico.crue.metier.emh.ElemSeuilAvecPdc;
+import org.fudaa.dodico.crue.metier.emh.FrottementPoint;
+import org.fudaa.dodico.crue.metier.emh.LitNumerote;
+import org.fudaa.dodico.crue.metier.emh.LoiFF;
+import org.fudaa.dodico.crue.metier.emh.PtProfil;
+import org.fudaa.dodico.crue.metier.emh.RelationEMH;
+import org.fudaa.dodico.crue.metier.emh.StriRefC;
+import org.fudaa.dodico.crue.metier.emh.StriRefH;
+import org.fudaa.dodico.crue.metier.emh.StriRefZ;
+import org.fudaa.dodico.crue.metier.helper.EMHNoeudHelper;
+
+public class RemplissageData {
+
+
+ /**
+ * remplit l'ensemble des donn\xE9es pour faire les test. Methode a updgrader et a reutiliser poru centraliser les tests.
+ *
+ * @return
+ */
+ public static CrueData remplissageDonneeTest() {
+ CrueData data = new CrueData();
+
+ // -- cr\xE9ation de noeuds --//
+ DonPrtCInitNoeud condInitNoeud = null;
+ int cptNoeuds = 1;
+ while (cptNoeuds < 25) {
+ CatEMHNoeud noeud = new CatEMHNoeud("N" + cptNoeuds++);
+ // -- 2 condition init pour tous les noeuds --//
+ condInitNoeud = new DonPrtCInitNoeud();
+ condInitNoeud.setZIni(cptNoeuds);
+ noeud.addDPTI(condInitNoeud);
+
+ condInitNoeud = new DonPrtCInitNoeud();
+ condInitNoeud.setZIni(cptNoeuds + 25);
+ noeud.addDPTI(condInitNoeud);
+
+ data.getNoeuds().add(noeud);
+ }
+
+ // --Creation des donnees DONFRT --//
+ List<DonFrt> listeDonFrt = remplissageDonneeTestDFRT();
+
+ // -- creation des casiers--//
+ EMHCasierProfil casierProfil = new EMHCasierProfil("CASIER PROFIL 001");
+ casierProfil.setActive(false);
+ // -- Donnees DPTI --//
+ DonPrtCInitCasier condInitCasier = new DonPrtCInitCasier();
+ condInitCasier.setQruis(234.123);
+ casierProfil.addDPTI(condInitCasier);
+ // -- recherche du noeud 25 precedemment ins\xE9r\xE9 --//
+ CatEMHNoeud noeud25 = EMHNoeudHelper.findByReference("N22", data);
+ casierProfil.setNoeud(noeud25);
+ // -- Donnees DPTG --//
+ // -- Ajout de 3 donn\xE9es DPTG --//
+ DonPrtGeoCasierProfil geoCasier = new DonPrtGeoCasierProfil();
+ geoCasier.setListeProfils(remplirSeriesProfilsDPTG(2));
+ geoCasier.setLongueur(777);
+ geoCasier.setNom("PROFIL01 de 001");
+ geoCasier.setMLitNumerotes(remplirLitsDPTG(3, listeDonFrt.get(0), listeDonFrt.get(5)));
+ casierProfil.addDPTG(geoCasier);
+
+ geoCasier = new DonPrtGeoCasierProfil();
+ geoCasier.setListeProfils(remplirSeriesProfilsDPTG(8));
+ geoCasier.setLongueur(423);
+ geoCasier.setNom("PROFIL02 de 001");
+ geoCasier.setMLitNumerotes(remplirLitsDPTG(3, listeDonFrt.get(5), listeDonFrt.get(6)));
+ casierProfil.addDPTG(geoCasier);
+
+ geoCasier = new DonPrtGeoCasierProfil();
+ geoCasier.setListeProfils(remplirSeriesProfilsDPTG(1));
+ geoCasier.setLongueur(2);
+ geoCasier.setNom("PROFIL03 de 001");
+ geoCasier.setMLitNumerotes(remplirLitsDPTG(3, listeDonFrt.get(2), listeDonFrt.get(1)));
+ casierProfil.addDPTG(geoCasier);
+
+ data.add(casierProfil);
+
+ // -- ajout d'un autre casier profil qui utilise le meme profil DPTG --//
+ casierProfil = new EMHCasierProfil("CASIER PROFIL PIque DPTG");
+ casierProfil.setActive(false);
+ CatEMHNoeud noeud17 = EMHNoeudHelper.findByReference("N17", data);
+ casierProfil.setNoeud(noeud17);
+ // -- Donnees DPTG --//
+ casierProfil.addDPTG(geoCasier);
+ data.add(casierProfil);
+
+ EMHCasierMNT casierMNT = new EMHCasierMNT("CASIER MNT 002");
+ casierMNT.setActive(true);
+ // -- recherche du noeud 12 precedemment ins\xE9r\xE9 --//
+ CatEMHNoeud noeud12 = EMHNoeudHelper.findByReference("N12", data);
+ casierMNT.setNoeud(noeud12);
+ condInitCasier = new DonPrtCInitCasier();
+ condInitCasier.setQruis(12.11);
+ casierMNT.addDPTI(condInitCasier);
+ data.add(casierMNT);
+
+ // -- creation des sections --//
+ EMHSectionInterpolee interpol = new EMHSectionInterpolee("SEC INT");
+
+ // -- dscp --//
+ DonCalcSansPrtSection calculSection = new DonCalcSansPrtSection();
+ calculSection.setCoeffConv(12.25);
+ calculSection.setCoeffDiv(11.13);
+ calculSection.setCoeffPond(2.251524);
+ interpol.addDSCP(calculSection);
+
+ data.add(interpol);
+
+ // -- Section Profil --//
+ EMHSectionProfil profil = new EMHSectionProfil("SEC PROF");
+
+ // -- dscp --//
+ calculSection = new DonCalcSansPrtSection();
+ calculSection.setCoeffConv(09.11);
+ calculSection.setCoeffDiv(11);
+ calculSection.setCoeffPond(212.2);
+ profil.addDSCP(calculSection);
+
+ // -- Donnees DPTG --//
+ // -- Ajout de 3 donn\xE9es DPTG --//
+ DonPrtGeoSectionProfil geoSection = new DonPrtGeoSectionProfil();
+ geoSection.setListeProfils(remplirSeriesProfilsDPTG(2));
+ geoSection.setNom("PROFIL_SECTION_007");
+ geoSection.setMLitNumerotes(remplirLitsDPTG(3, listeDonFrt.get(0), listeDonFrt.get(5)));
+ profil.addDPTG(geoSection);
+ data.add(profil);
+
+ EMHSectionSansGeometrie geometrie = new EMHSectionSansGeometrie("SEC GEOM");
+
+ // -- dscp --//
+ calculSection = new DonCalcSansPrtSection();
+ calculSection.setCoeffConv(255);
+ calculSection.setCoeffDiv(999);
+ calculSection.setCoeffPond(777);
+ geometrie.addDSCP(calculSection);
+ data.add(geometrie);
+
+ // -- Section Idem --//
+ EMHSectionIdem sectionIdem = new EMHSectionIdem("SEC IDEM");
+
+ // -- dscp --//
+ DonCalcSansPrtSection calculSection2 = new DonCalcSansPrtSection();
+ calculSection2.setCoeffConv(12.25);
+ calculSection2.setCoeffDiv(11.13);
+ calculSection2.setCoeffPond(2.251524);
+ sectionIdem.addDSCP(calculSection2);
+
+ // -- DPTG --//
+ DonPrtGeoSectionIdem geoIdem = new DonPrtGeoSectionIdem();
+ geoIdem.setDW(65535);
+ sectionIdem.addDPTG(geoIdem);
+ data.add(sectionIdem);
+
+ // -- creation des branches --//
+ DonPrtCInitBranche condInitBranche1 = null;
+ DonPrtCInitBranchePdc condInitBranche2 = null;
+
+ // EMHBrancheSaintVenant
+ EMHBrancheSaintVenant branche1 = new EMHBrancheSaintVenant("BRANCHE VENANT1");
+ branche1.setActive(true);
+ branche1.setNoeudAmont(EMHNoeudHelper.findByReference("N12", data));
+ branche1.setNoeudAval(EMHNoeudHelper.findByReference("N1", data));
+
+ // -- donnees DPTI --//
+ condInitBranche1 = new DonPrtCInitBranche();
+ condInitBranche1.setQinit(12.5);
+ branche1.addDPTI(condInitBranche1);
+ // -- donnees DSCP --//
+ DonCalcSansPrtBrancheSaintVenant dataCalcul = new DonCalcSansPrtBrancheSaintVenant();
+ dataCalcul.setCoeffBeta(5.55);
+ dataCalcul.setCoefRuis(6.66);
+ dataCalcul.setCoeffRuisQdm(7.77);
+ branche1.addDSCP(dataCalcul);
+ List<RelationEMH> listeSections = new ArrayList<RelationEMH>();
+ listeSections.add(new RelationEMH(interpol, "POSITION SECTION INTERPOL", 123.4));
+ listeSections.add(new RelationEMH(geometrie, "POSITION SECTION GEOMETRIE", 123.4));
+ branche1.setListeSections(listeSections);
+
+ // -- Donnees DPTG --//
+ DonPrtGeoBrancheSaintVenant geoPrt = new DonPrtGeoBrancheSaintVenant();
+ geoPrt.setCoefSinuo(255);
+ branche1.addDPTG(geoPrt);
+
+ data.add(branche1);
+
+ // EMHBrancheBarrageGenerique
+ EMHBrancheBarrageGenerique branche2 = new EMHBrancheBarrageGenerique("BRANCHE CHANEL");
+ branche2.setActive(false);
+ branche2.setNoeudAmont(EMHNoeudHelper.findByReference("N5", data));
+ branche2.setNoeudAval(EMHNoeudHelper.findByReference("N7", data));
+
+ // -- donnees DPTI --//
+ condInitBranche1 = new DonPrtCInitBranche();
+ condInitBranche1.setQinit(2.5);
+
+ branche2.addDPTI(condInitBranche1);
+
+ // -- donnees DSCP --//
+ DonCalcSansPrtBrancheBarrageFilEau dataCalcul1 = new DonCalcSansPrtBrancheBarrageFilEau();
+ dataCalcul1.setQLimInf(144);
+ dataCalcul1.setQLimSup(441);
+ LoiFF loi = new LoiFF();
+ loi.setNom("Loi BRANCHE GENE");
+ dataCalcul1.setRegimeDenoye(loi);
+ dataCalcul1.setListElt(remplirListeSeuils());
+ branche2.addDSCP(dataCalcul1);
+
+ listeSections = new ArrayList<RelationEMH>();
+ listeSections.add(new RelationEMH(profil, "POSITION SECTION PROFIL", 212.121));
+ branche2.setListeSections(listeSections);
+ data.add(branche2);
+
+ // EMHBrancheOrifice
+ EMHBrancheOrifice branche3 = new EMHBrancheOrifice("BRANCHE ORIFICE");
+ branche3.setActive(false);
+ branche3.setNoeudAmont(EMHNoeudHelper.findByReference("N5", data));
+ branche3.setNoeudAval(EMHNoeudHelper.findByReference("N7", data));
+ // -- donnees DPTI --//
+ condInitBranche2 = new DonPrtCInitBranchePdc();
+ condInitBranche2.setQinit(65535);
+ condInitBranche2.setOuvPasseDessous(255);
+ branche3.addDPTI(condInitBranche2);
+ // -- donnees DSCP --//
+ // -- liste element orifices --//
+ DonCalcSansPrtBrancheOrifice dataCalcul2 = new DonCalcSansPrtBrancheOrifice();
+ dataCalcul2.setElement(remplirListeOrifices());
+ dataCalcul2.setFormulePdc("Formule PDC du siecle!");
+ branche3.addDSCP(dataCalcul2);
+
+ listeSections = new ArrayList<RelationEMH>();
+ listeSections.add(new RelationEMH(profil, "test", 777));
+ branche3.setListeSections(listeSections);
+ data.add(branche3);
+
+ // EMHBrancheSeuilTransversal
+ EMHBrancheSeuilTransversal branche4 = new EMHBrancheSeuilTransversal("BRANCHE TRANSVERSALE ELEMSEUIL");
+ branche4.setActive(false);
+ branche4.setNoeudAmont(EMHNoeudHelper.findByReference("N3", data));
+ branche4.setNoeudAval(EMHNoeudHelper.findByReference("N12", data));
+ // -- donnees DPTI --//
+ condInitBranche1 = new DonPrtCInitBranche();
+ condInitBranche1.setQinit(12.254);
+ branche4.addDPTI(condInitBranche1);
+
+ // -- donnees DSCP --//
+ // -- liste element orifices --//
+ DonCalcSansPrtBrancheSeuilTransversal dataCalcul3 = new DonCalcSansPrtBrancheSeuilTransversal();
+ dataCalcul3.setListElt(remplirListeSeuilsPDC());
+ dataCalcul3.setFormulePdc("Divergent");
+ branche4.addDSCP(dataCalcul3);
+
+ listeSections = new ArrayList<RelationEMH>();
+ listeSections.add(new RelationEMH(profil, "Profil test", 2548));
+ branche4.setListeSections(listeSections);
+ data.add(branche4);
+
+ // EMHBrancheSeuilLongitudinal
+ EMHBrancheSeuilLongitudinale branche5 = new EMHBrancheSeuilLongitudinale("BRANCHE LATERALE ELEMSEUIL");
+ branche5.setActive(false);
+ branche5.setNoeudAmont(EMHNoeudHelper.findByReference("N3", data));
+ branche5.setNoeudAval(EMHNoeudHelper.findByReference("N12", data));
+ // -- donnees DPTI --//
+ condInitBranche1 = new DonPrtCInitBranche();
+ condInitBranche1.setQinit(12.254);
+ branche5.addDPTI(condInitBranche1);
+
+ // -- donnees DSCP --//
+ // -- liste element orifices --//
+ DonCalcSansPrtBrancheSeuilLateral dataCalcul4 = new DonCalcSansPrtBrancheSeuilLateral();
+ dataCalcul4.setListElt(remplirListeSeuilsPDC());
+ dataCalcul4.setFormulePdc("Convergent");
+ branche5.addDSCP(dataCalcul4);
+
+ listeSections = new ArrayList<RelationEMH>();
+ listeSections.add(new RelationEMH(profil, "Profil test 3", 457));
+ branche5.setListeSections(listeSections);
+ data.add(branche5);
+
+ // EMHBrancheBarrageFilEau
+ EMHBrancheBarrageFilEau branche6 = new EMHBrancheBarrageFilEau("BRANCHE BARRAGE FIL EAU");
+ branche6.setActive(false);
+ branche6.setNoeudAmont(EMHNoeudHelper.findByReference("N3", data));
+ branche6.setNoeudAval(EMHNoeudHelper.findByReference("N12", data));
+ // -- donnees DPTI --//
+ condInitBranche1 = new DonPrtCInitBranche();
+ condInitBranche1.setQinit(12.254);
+ branche6.addDPTI(condInitBranche1);
+
+ // -- donnees DSCP --//
+ // -- liste element orifices --//
+ DonCalcSansPrtBrancheBarrageFilEau dataCalcul5 = new DonCalcSansPrtBrancheBarrageFilEau();
+ dataCalcul5.setQLimInf(144);
+ dataCalcul5.setQLimSup(441);
+ loi = new LoiFF();
+ loi.setNom("Loi Speciale");
+ dataCalcul5.setRegimeDenoye(loi);
+ dataCalcul5.setListElt(remplirListeSeuils());
+ branche6.addDSCP(dataCalcul5);
+
+ listeSections = new ArrayList<RelationEMH>();
+ listeSections.add(new RelationEMH(profil, "VAR TEST profil", 111));
+ branche6.setListeSections(listeSections);
+ data.add(branche6);
+
+ // EMHBranchePdc
+ EMHBranchePdc branche7 = new EMHBranchePdc("BRANCHE PDC");
+ branche7.setActive(false);
+ branche7.setNoeudAmont(EMHNoeudHelper.findByReference("N3", data));
+ branche7.setNoeudAval(EMHNoeudHelper.findByReference("N12", data));
+ // -- donnees DPTI --//
+ condInitBranche1 = new DonPrtCInitBranchePdc();
+ condInitBranche1.setQinit(12.254);
+ branche7.addDPTI(condInitBranche1);
+
+ // -- donnees DSCP --//
+ // -- liste element orifices --//
+ DonCalcSansPrtBranchePDC dataCalcul6 = new DonCalcSansPrtBranchePDC();
+
+ loi = new LoiFF();
+ loi.setNom("Loi du PDC");
+ dataCalcul6.setPdc_DZ(loi);
+ branche7.addDSCP(dataCalcul6);
+
+ listeSections = new ArrayList<RelationEMH>();
+ listeSections.add(new RelationEMH(profil, "profil section", 12345));
+ branche7.setListeSections(listeSections);
+ data.add(branche7);
+
+ return data;
+ }
+
+ public static List<LitNumerote> remplirLitsDPTG(int a, DonFrt don1, DonFrt don2) {
+ List<LitNumerote> listeLits = new ArrayList<LitNumerote>();
+
+ LitNumerote litNum = new LitNumerote();
+
+ litNum.setDebut(new PtProfil(13.2 * a, 101.2 * a));
+ litNum.setFin(new PtProfil(44.2 * a, 2000.2 * a));
+ litNum.setEstActif(true);
+ litNum.setEstMineur(false);
+ litNum.setMDonFrt(don1);
+ listeLits.add(litNum);
+
+ litNum = new LitNumerote();
+ litNum.setDebut(new PtProfil(200 * a, 11.2 * a));
+ litNum.setFin(new PtProfil(1000 * a, 13 * a));
+ litNum.setEstActif(false);
+ litNum.setEstMineur(true);
+ litNum.setMDonFrt(don2);
+ listeLits.add(litNum);
+
+ return listeLits;
+ }
+
+ public static List<PtProfil> remplirSeriesProfilsDPTG(int a) {
+ List<PtProfil> listeProfils = new ArrayList<PtProfil>();
+ listeProfils.add(new PtProfil(13.2 * a, 101.2 * a));
+ listeProfils.add(new PtProfil(1.2 * a, 12 * a));
+ listeProfils.add(new PtProfil(2.2 * a, 2 * a));
+ listeProfils.add(new PtProfil(123.2 * a, 10 * a));
+ listeProfils.add(new PtProfil(1003.2 * a, 11 * a));
+ listeProfils.add(new PtProfil(143.2 * a, 12 * a));
+ listeProfils.add(new PtProfil(1.2 * a, 111 * a));
+ listeProfils.add(new PtProfil(13.2 * a, 777 * a));
+ listeProfils.add(new PtProfil(0.2 * a, 5.2 * a));
+ listeProfils.add(new PtProfil(12.2 * a, 0.2 * a));
+ listeProfils.add(new PtProfil(5.2 * a, 1.2 * a));
+ listeProfils.add(new PtProfil(99.2 * a, 2.2 * a));
+ listeProfils.add(new PtProfil(102.2 * a, 111.2 * a));
+ return listeProfils;
+ }
+
+ public static List<ElemOrifice> remplirListeOrifices() {
+ List<ElemOrifice> listeEltSeuilsOrifices = new ArrayList<ElemOrifice>();
+ ElemOrifice orif = new ElemOrifice();
+ orif.setCoeffCtrLim(999);
+ orif.setCoeffQ(23);
+ orif.setLarg(11);
+ orif.setSens("Bidirect");
+ orif.setZSeuil(22.23);
+ listeEltSeuilsOrifices.add(orif);
+ orif = new ElemOrifice();
+ orif.setCoeffCtrLim(543);
+ orif.setCoeffQ(12345);
+ orif.setLarg(987);
+ orif.setSens("Uni");
+ orif.setZSeuil(1.9);
+ listeEltSeuilsOrifices.add(orif);
+ orif = new ElemOrifice();
+ orif.setCoeffCtrLim(2);
+ orif.setCoeffQ(3);
+ orif.setLarg(4);
+ orif.setSens("5 Uni");
+ orif.setZSeuil(6);
+ listeEltSeuilsOrifices.add(orif);
+ return listeEltSeuilsOrifices;
+ }
+
+ public static List<ElemSeuilAvecPdc> remplirListeSeuilsPDC() {
+ List<ElemSeuilAvecPdc> listeEltSeuils = new ArrayList<ElemSeuilAvecPdc>();
+ ElemSeuilAvecPdc orif = new ElemSeuilAvecPdc();
+ orif.setCoeffPdc(23);
+ orif.setCoeffD(23);
+ orif.setLarg(11);
+ orif.setZSeuil(22.23);
+ listeEltSeuils.add(orif);
+ orif = new ElemSeuilAvecPdc();
+ orif.setCoeffPdc(1.1);
+ orif.setCoeffD(12345);
+ orif.setLarg(987);
+ orif.setZSeuil(1.9);
+ listeEltSeuils.add(orif);
+ orif = new ElemSeuilAvecPdc();
+ orif.setCoeffPdc(99.9);
+ orif.setCoeffD(3);
+ orif.setLarg(4);
+ orif.setZSeuil(6);
+ listeEltSeuils.add(orif);
+ return listeEltSeuils;
+ }
+
+ public static List<ElemSeuil> remplirListeSeuils() {
+ List<ElemSeuil> listeEltSeuils = new ArrayList<ElemSeuil>();
+ ElemSeuil orif = new ElemSeuil();
+
+ orif.setCoeffD(23);
+ orif.setLarg(11);
+ orif.setZSeuil(22.23);
+ listeEltSeuils.add(orif);
+ orif = new ElemSeuil();
+
+ orif.setCoeffD(12345);
+ orif.setLarg(987);
+ orif.setZSeuil(1.9);
+ listeEltSeuils.add(orif);
+ orif = new ElemSeuil();
+
+ orif.setCoeffD(3);
+ orif.setLarg(4);
+ orif.setZSeuil(6);
+ listeEltSeuils.add(orif);
+ return listeEltSeuils;
+ }
+
+ public static CrueData remplissageDonneeTestErreur() {
+ CrueData res = remplissageDonneeTest();
+
+ res.getAllEMH().remove(EMHNoeudHelper.findByReference("N5", res));
+ res.getAllEMH().remove(EMHNoeudHelper.findByReference("N12", res));
+ res.getAllEMH().remove(EMHNoeudHelper.findByReference("N3", res));
+ res.getAllEMH().remove(EMHNoeudHelper.findByReference("N1", res));
+
+ return res;
+ }
+
+ /**
+ * remplit l'ensemble des donn\xE9es pour faire les test. Methode a updgrader et a reutiliser poru centraliser les tests.
+ * @return
+ */
+ public static List<DonFrt> remplissageDonneeTestDFRT(){
+ List<DonFrt> data=new ArrayList<DonFrt>();
+
+ DonFrt ref1=new StriRefC("ref#stric");
+ ref1.addPoint(new FrottementPoint(10,20));
+ data.add(ref1);
+ ref1=new StriRefZ("rsdfsf");
+ ref1.addPoint(new FrottementPoint(12,23));
+ ref1.addPoint(new FrottementPoint(452,1));
+ data.add(ref1);
+ ref1=new StriRefH("test");
+ ref1.addPoint(new FrottementPoint(1,1));
+ ref1.addPoint(new FrottementPoint(1222,2143));
+ data.add(ref1);
+ ref1=new StriRefC("@#hgf55");
+ ref1.addPoint(new FrottementPoint(10,20));
+ ref1.addPoint(new FrottementPoint(12,23));
+ data.add(ref1);
+ ref1=new StriRefH("12 235");
+ ref1.addPoint(new FrottementPoint(10,20));
+ ref1.addPoint(new FrottementPoint(1712,52253));
+ data.add(ref1);
+ ref1=new StriRefH("XIII");
+ ref1.addPoint(new FrottementPoint(10,20));
+ ref1.addPoint(new FrottementPoint(2,3));
+ data.add(ref1);
+ data.add(ref1);
+ ref1=new StriRefZ("ba28 d");
+ ref1.addPoint(new FrottementPoint(10,20));
+ ref1.addPoint(new FrottementPoint(666,555));
+ data.add(ref1);
+ data.add(ref1);
+ ref1=new StriRefZ("ref z");
+ ref1.addPoint(new FrottementPoint(14,16));
+ ref1.addPoint(new FrottementPoint(10,20));
+ data.add(ref1);
+ ref1=new StriRefZ("rh 132");
+ ref1.addPoint(new FrottementPoint(10,20));
+ ref1.addPoint(new FrottementPoint(12,23));
+ data.add(ref1);
+ ref1=new StriRefH("refh12");
+ ref1.addPoint(new FrottementPoint(10,20));
+ ref1.addPoint(new FrottementPoint(2112,3223));
+ data.add(ref1);
+
+ return data;
+ }
+
+
+
+ public static List<DonFrt> remplissageDonneeTestErreurDFRT(){
+ List<DonFrt> data=new ArrayList<DonFrt>();
+
+ DonFrt ref1=new StriRefC("ref#stric");
+ ref1.addPoint(new FrottementPoint(10,20));
+ data.add(ref1);
+ ref1=new StriRefZ("rsdfsf");
+ ref1.addPoint(new FrottementPoint(12,23));
+ data.add(ref1);
+ ref1=new StriRefH("test");
+ ref1.addPoint(new FrottementPoint(1,1));
+ data.add(ref1);
+ ref1=new StriRefC("@#hgf55");
+ ref1.addPoint(new FrottementPoint(10,20));
+ data.add(ref1);
+ ref1=new StriRefH("12 235");
+ ref1.addPoint(new FrottementPoint(10,20));
+ data.add(ref1);
+ ref1=new StriRefH("XIII");
+ ref1.addPoint(new FrottementPoint(10,20));
+ data.add(ref1);
+ ref1=new StriRefZ("ba28 d");
+ ref1.addPoint(new FrottementPoint(10,20));
+ data.add(ref1);
+ ref1=new StriRefZ("ref z");
+ ref1.addPoint(new FrottementPoint(10,20));
+ data.add(ref1);
+ ref1=new StriRefZ("rh 132");
+ ref1.addPoint(new FrottementPoint(10,20));
+ data.add(ref1);
+ ref1=new StriRefH("refh12");
+ ref1.addPoint(new FrottementPoint(10,20));
+ data.add(ref1);
+
+ return data;
+ }
+
+
+ /**
+ * remplit l'ensemble des donn\xE9es pour faire les test. Methode a updgrader et a reutiliser poru centraliser les tests.
+ *
+ * @return
+ */
+ public static DonPrtReseau remplissageDonneeTestOPTG() {
+ DonPrtReseau data = new DonPrtReseau();
+
+ data.setRegleDecal(1.2);
+ data.setRegleLargSeuil(2.3);
+ data.setReglePdxMax(3.4);
+ data.setReglePenteMax(4.5);
+ data.setReglePenteRupture(5.6);
+ data.setRegleProfPlat(6.7);
+ data.se...
[truncated message content] |
|
From: <de...@us...> - 2009-04-07 21:18:57
|
Revision: 4619
http://fudaa.svn.sourceforge.net/fudaa/?rev=4619&view=rev
Author: deniger
Date: 2009-04-07 21:18:54 +0000 (Tue, 07 Apr 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10writer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DCSPFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DFRTFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTGFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTIFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DRSOFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/OPTGFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalculPermanent.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalculTransitoire.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.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/DonCLimMBrancheOrifice.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/DonCLimMScenario.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/DonPrtCInitBranche.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBrancheSaintVenant.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/EvolutionDF.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EvolutionFF.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Loi.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/emh/PtEvolutionDF.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/PtEvolutionFF.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/StriRefC.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHBrancheHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHCasierHelper.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/EMHNoeudHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHSectionHelper.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/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/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/TestCrueETU.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueInterface.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueOPTGFile.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/AppCrueTest.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/resources/org/
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDRSO.xsd
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/ValidatorXml.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDRSO.xsd
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -10,11 +10,9 @@
import org.fudaa.dodico.crue.dao.CrueDaoPersistDFRT;
import org.fudaa.dodico.crue.dao.CrueDaoPersistDPTG;
import org.fudaa.dodico.crue.dao.CrueDaoPersistDPTI;
-import org.fudaa.dodico.crue.dao.CrueDaoPersistDRSO;
-import org.fudaa.dodico.crue.dao.CrueDaoPersistETU;
import org.fudaa.dodico.crue.dao.CrueDaoPersistOPTG;
import org.fudaa.dodico.crue.dao.CrueDaoPersit;
-import org.fudaa.dodico.crue.dao.validatorXml.ValidatorXml;
+import org.fudaa.dodico.crue.dao.ValidatorXml;
import org.fudaa.dodico.crue.inout.fileformat.DCSPFileFormat;
import org.fudaa.dodico.crue.inout.fileformat.DFRTFileFormat;
import org.fudaa.dodico.crue.inout.fileformat.DPTGFileFormat;
@@ -45,10 +43,10 @@
CtuluAnalyze listeMessageError;
Object[] dataLinked;
- public ReaderWithExtra( final CtuluAnalyze analyzer) {
-
+ public ReaderWithExtra(final CtuluAnalyze analyzer) {
+
this.listeMessageError = analyzer;
-
+
}
/**
@@ -58,12 +56,13 @@
* @param validatorXSDfile
* @return
*/
- public T read(final CrueDaoPersit<T> data, final File fichier, final String validatorXSDfile,final Object... dataLinked) {
+ public T read(final CrueDaoPersit<T> data, final File fichier, final String validatorXSDfile,
+ final Object... dataLinked) {
listeMessageError.setDesc(CrueResource.getS(" Analyse du Fichier " + fichier.getName()));
// -- evaluation du fichier avec la xsd --//
- if (!ValidatorXml.validXMLWithDOM(fichier.getAbsolutePath(), validatorXSDfile, listeMessageError)) {
+ if (!ValidatorXml.validXMLWithDOMFromFile(fichier, validatorXSDfile, listeMessageError)) {
listeMessageError.addWarn(CrueResource.getS("Fichier " + fichier.getName() + " non valid\xE9 par la XSD "
+ validatorXSDfile), 0);
}
@@ -83,8 +82,8 @@
* que des references vers les objets d\xE9crits dans DRSO.
*/
public static EMHproject readETUFile(final File fichierETU, final CtuluAnalyze listeMessageError) {
- return EtuFileFormat.getInstance().readData(fichierETU, listeMessageError, null);
- }
+ return EtuFileFormat.getInstance().readData(fichierETU, listeMessageError, null);
+ }
/**
* lit le fichier xml DRSO DRSO - Fichier des donn\xE9es du r\xE9seau (xml) et retourne les donn\xE9es m\xE9tier correspondantes.
@@ -93,7 +92,7 @@
* @return
*/
public static CrueData readDRSOFile(final File fichierDRSO, final CtuluAnalyze listeMessageError) {
- return DRSOFileFormat.getInstance().readData(fichierDRSO, listeMessageError, null);
+ return DRSOFileFormat.getInstance().readData(fichierDRSO, listeMessageError, null);
}
/**
@@ -102,8 +101,8 @@
* contient que des references vers les objets d\xE9crits dans DRSO.
*/
public static void readDPTIFile(final File fichierDPTI, final CrueData dataDRSO, final CtuluAnalyze listeMessageError) {
- (new ReaderWithExtra<CrueData>(listeMessageError)).read(new CrueDaoPersistDPTI(),fichierDPTI,
- DPTIFileFormat.xsdDPTI,dataDRSO);
+ (new ReaderWithExtra<CrueData>(listeMessageError)).read(new CrueDaoPersistDPTI(), fichierDPTI,
+ DPTIFileFormat.xsdDPTI, dataDRSO);
}
/**
@@ -114,8 +113,8 @@
public static void readDPTGFile(final File fichierDPTG, final CrueData dataDRSOetDFRT,
final CtuluAnalyze listeMessageError) {
- (new ReaderWithExtra<CrueData>( listeMessageError)).read(new CrueDaoPersistDPTG(), fichierDPTG,
- DPTGFileFormat.xsdDPTG,dataDRSOetDFRT);
+ (new ReaderWithExtra<CrueData>(listeMessageError)).read(new CrueDaoPersistDPTG(), fichierDPTG,
+ DPTGFileFormat.xsdDPTG, dataDRSOetDFRT);
}
/**
@@ -124,8 +123,8 @@
* DSCP ne contient que des references vers les objets d\xE9crits dans DRSO.
*/
public static void readDSCPFile(final File fichierDSCP, final List<EMH> dataDRSO, final CtuluAnalyze listeMessageError) {
- (new ReaderWithExtra<List<EMH>>(listeMessageError)).read(new CrueDaoPersistDCSP(),fichierDSCP,
- DCSPFileFormat.xsdDCSP,dataDRSO);
+ (new ReaderWithExtra<List<EMH>>(listeMessageError)).read(new CrueDaoPersistDCSP(), fichierDSCP,
+ DCSPFileFormat.xsdDCSP, dataDRSO);
}
/**
@@ -135,8 +134,8 @@
* @return
*/
public static List<DonFrt> readDFRTFile(final File fichierDFRT, final CtuluAnalyze listeMessageError) {
- return (new ReaderWithExtra<List<DonFrt>>( listeMessageError)).read(new CrueDaoPersistDFRT(),fichierDFRT,
- DFRTFileFormat.xsdDFRT,null);
+ return (new ReaderWithExtra<List<DonFrt>>(listeMessageError)).read(new CrueDaoPersistDFRT(), fichierDFRT,
+ DFRTFileFormat.xsdDFRT, null);
}
@@ -148,8 +147,8 @@
* @return
*/
public static DonPrtReseau readOPTGFile(final File fichierOPTG, final CtuluAnalyze listeMessageError) {
- return (new ReaderWithExtra<DonPrtReseau>( listeMessageError)).read(new CrueDaoPersistOPTG(),fichierOPTG,
- OPTGFileFormat.xsdOPTG,null);
+ return (new ReaderWithExtra<DonPrtReseau>(listeMessageError)).read(new CrueDaoPersistOPTG(), fichierOPTG,
+ OPTGFileFormat.xsdOPTG, null);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10writer.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10writer.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10writer.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -27,15 +27,14 @@
public static class WriterWithExtra<T> {
- CtuluAnalyze analyzer;
-
+ CtuluAnalyze analyzer;
- public WriterWithExtra( final CtuluAnalyze analyzer ) {
+ public WriterWithExtra(final CtuluAnalyze analyzer) {
this.analyzer = analyzer;
-
+
}
- public boolean write(final CrueDaoPersit<T> data,final T dataMetier, final File f) {
+ public boolean write(final CrueDaoPersit<T> data, final T dataMetier, final File f) {
analyzer.setDesc(CrueResource.getS(" Analyse du Fichier " + f.getName()));
@@ -51,7 +50,7 @@
* m\xE9tiers fournies.
*/
public static boolean writeDRSOFile(final CrueData data, final File fichierDRSO, final CtuluAnalyze listeMessageError) {
- return (new WriterWithExtra<CrueData>(listeMessageError)).write(new CrueDaoPersistDRSO(),data, fichierDRSO);
+ return (new WriterWithExtra<CrueData>(listeMessageError)).write(new CrueDaoPersistDRSO(), data, fichierDRSO);
}
/**
@@ -60,7 +59,7 @@
*/
public static boolean writeDPTIFile(final CrueData data, final File fichierDPTI, final CtuluAnalyze listeMessageError) {
- return (new WriterWithExtra<CrueData>(listeMessageError )).write(new CrueDaoPersistDPTI(), data, fichierDPTI);
+ return (new WriterWithExtra<CrueData>(listeMessageError)).write(new CrueDaoPersistDPTI(), data, fichierDPTI);
}
/**
@@ -68,7 +67,7 @@
* branches a partir des donn\xE9es m\xE9tiers fournies.
*/
public static boolean writeDSCPFile(final List<EMH> data, final File fichierDSCP, final CtuluAnalyze listeMessageError) {
- return (new WriterWithExtra<List<EMH>>(listeMessageError )).write(new CrueDaoPersistDCSP(), data, fichierDSCP);
+ return (new WriterWithExtra<List<EMH>>(listeMessageError)).write(new CrueDaoPersistDCSP(), data, fichierDSCP);
}
/**
@@ -77,7 +76,7 @@
*/
public static boolean writeDFRTFile(final List<DonFrt> data, final File fichierDFRT,
final CtuluAnalyze listeMessageError) {
- return (new WriterWithExtra<List<DonFrt>>(listeMessageError )).write(new CrueDaoPersistDFRT(), data, fichierDFRT);
+ return (new WriterWithExtra<List<DonFrt>>(listeMessageError)).write(new CrueDaoPersistDFRT(), data, fichierDFRT);
}
/**
@@ -85,7 +84,7 @@
* partir des donn\xE9es m\xE9tiers fournies.
*/
public static boolean writeDPTGFile(final CrueData data, final File fichierDPTG, final CtuluAnalyze listeMessageError) {
- return (new WriterWithExtra<CrueData>(listeMessageError )).write(new CrueDaoPersistDPTG(), data, fichierDPTG);
+ return (new WriterWithExtra<CrueData>(listeMessageError)).write(new CrueDaoPersistDPTG(), data, fichierDPTG);
}
/**
@@ -98,7 +97,7 @@
public static boolean writeOPTGFile(final DonPrtReseau data, final File fichierOPTG,
final CtuluAnalyze listeMessageError) {
final CrueDaoPersistOPTG dataPersistante = new CrueDaoPersistOPTG();
- return (new WriterWithExtra<DonPrtReseau>(listeMessageError )).write(new CrueDaoPersistOPTG(), data, fichierOPTG);
+ return (new WriterWithExtra<DonPrtReseau>(listeMessageError)).write(new CrueDaoPersistOPTG(), data, fichierOPTG);
}
/**
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -1,117 +1,111 @@
package org.fudaa.dodico.crue.inout.fileformat;
import java.io.File;
-import java.util.Map;
import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.ctulu.CtuluIOOperationSynthese;
-import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.fileformat.FileFormatUnique;
import org.fudaa.ctulu.fileformat.FileReadOperationAbstract;
import org.fudaa.ctulu.fileformat.FileWriteOperationAbstract;
import org.fudaa.dodico.commun.DodicoLib;
-import org.fudaa.dodico.crue.dao.CrueDaoPersit;
import org.fudaa.dodico.crue.inout.Crue10reader.ReaderWithExtra;
import org.fudaa.dodico.crue.inout.Crue10writer.WriterWithExtra;
-import org.fudaa.dodico.mesure.EvolutionFileFormatVersion;
/**
* File format customis\xE9 pour Crue. Indique si le fichier est de type crue 9 ou 10. Contient un validator xsd pour le
* fichier donn\xE9. Contient une m\xE9thode statique tr\xE8s pratique qui permet de retourner automatiquement le bon FileFormat
- * en fonction du type renvoy\xE9.
+ * en fonction du type renvoy\xE9. T correspond \xE0 la structure m\xE9tier associ\xE9e au format du fichier
*
- * T correspond \xE0 la structure m\xE9tier associ\xE9e au format du fichier
- *
* @author Adrien Hadoux
*/
-public abstract class CrueFileFormat<T> extends FileFormatUnique {
+public abstract class CrueFileFormat<T> extends FileFormatUnique {
- /**
- * Le type du fichier (cf cruedaoCommomFactory.)
- */
- String type;
+ /**
+ * Le type du fichier (cf cruedaoCommomFactory.)
+ */
+ String type;
- protected CrueFileFormat(final String type) {
- super(1);
- extensions_ = getExtensions();
- id_ = "Crue";
- nom_ = "Crue";
- description_ = DodicoLib.getS("Fichier Crue");
- // software_ = FileFormatSoftware.TELEMAC_IS;
- this.type = type;
+ protected CrueFileFormat(final String type) {
+ super(1);
+ extensions_ = getExtensions();
+ id_ = "Crue";
+ nom_ = "Crue";
+ description_ = DodicoLib.getS("Fichier Crue");
+ this.type = type;
- }
+ }
- /**
- * retourne les extensions acceptables par le fichier
- */
- @Override
- public abstract String[] getExtensions();
+ /**
+ * retourne les extensions acceptables par le fichier
+ */
+ @Override
+ public abstract String[] getExtensions();
- /**
- * retourne l'infos : est du type crue 10 sinon 9.
- *
- * @return
- */
- public abstract boolean isCrue10();
+ /**
+ * retourne l'infos : est du type crue 10 sinon 9.
+ *
+ * @return
+ */
+ public abstract boolean isCrue10();
- /**
- * retourne le validator xsd.
- */
- public abstract String getXsdValidator();
+ /**
+ * retourne le validator xsd.
+ */
+ public abstract String getXsdValidator();
- /**
- * @return true si le fichier demand\xE9 s'auto-suffit. Si il a besoin d'autre fichiers (ref ou d\xE9pendances) retourne
- * false.
- */
- public abstract boolean isIndependant();
+ /**
+ * @return true si le fichier demand\xE9 s'auto-suffit. Si il a besoin d'autre fichiers (ref ou d\xE9pendances) retourne
+ * false.
+ */
+ public abstract boolean isIndependant();
- /**
- * Obtenir le reader associ\xE9 au format DRSO
- * @return
- */
- protected ReaderWithExtra<T> getReader( CtuluAnalyze analyzer ){
+ /**
+ * Obtenir le reader associ\xE9 au format DRSO
+ *
+ * @return
+ */
+ protected ReaderWithExtra<T> getReader(CtuluAnalyze analyzer) {
- return new ReaderWithExtra<T>(analyzer);
- }
+ return new ReaderWithExtra<T>(analyzer);
+ }
- /**
- * MEthode qui permet d'\xE9crire les datas dans le fichier f sp\xE9cifi\xE9.
- * @param data
- * @param f
- * @return
- */
- public abstract boolean writeData(T data, File f,CtuluAnalyze analyzer);
+ /**
+ * MEthode qui permet d'\xE9crire les datas dans le fichier f sp\xE9cifi\xE9.
+ *
+ * @param data
+ * @param f
+ * @return
+ */
+ public abstract boolean writeData(T data, File f, CtuluAnalyze analyzer);
- /**
- * Lit les donn\xE9es dans le fichier f avec les donn\xE9es li\xE9es.
- * @param dataLinked
- * @return
- */
- public abstract T readData(final File f,CtuluAnalyze analyzer,final Object... dataLinked);
- /**
- * Obtenir le wtriter associ\xE9.
- * @param data
- * @param dataMetier
- * @return
- */
- protected WriterWithExtra<T> getWriter(final CtuluAnalyze analyzer){
- return new WriterWithExtra<T>(analyzer);
- }
+ // FIXME adrien a quoi sert dataLinked ?
+ //
+ /**
+ * Lit les donn\xE9es dans le fichier f avec les donn\xE9es li\xE9es.
+ *
+ * @param dataLinked
+ * @return
+ */
+ public abstract T readData(final File f, CtuluAnalyze analyzer, final Object... dataLinked);
+ /**
+ * Obtenir le wtriter associ\xE9.
+ *
+ * @param data
+ * @param dataMetier
+ * @return
+ */
+ protected WriterWithExtra<T> getWriter(final CtuluAnalyze analyzer) {
+ return new WriterWithExtra<T>(analyzer);
+ }
+ public FileReadOperationAbstract createReader() {
+ // return new ScopeReaderSorT(this);
+ return null;
+ }
+ public FileWriteOperationAbstract createWriter() {
+ // return new ScopeWriterSorT(this);
+ return null;
+ }
- public FileReadOperationAbstract createReader() {
- // return new ScopeReaderSorT(this);
- return null;
- }
-
- public FileWriteOperationAbstract createWriter() {
- // return new ScopeWriterSorT(this);
- return null;
- }
-
-
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DCSPFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DCSPFileFormat.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DCSPFileFormat.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -8,60 +8,54 @@
import org.fudaa.dodico.crue.dao.CrueDaoPersistDCSP;
import org.fudaa.dodico.crue.metier.emh.EMH;
-
/**
- * File format pour DPTI.
- * Le parametre template correspond \xE0 la donn\xE9es m\xE9tier attendue.
+ * File format pour DPTI. Le parametre template correspond \xE0 la donn\xE9es m\xE9tier attendue.
+ *
* @author Adrien Hadoux
- *
*/
public class DCSPFileFormat extends CrueFileFormat<List<EMH>> {
- public static final String xsdDCSP = "valideDCSP.xsd";
- private static DCSPFileFormat INSTANCE;
+ public static final String xsdDCSP = "valideDCSP.xsd";
+ private static DCSPFileFormat INSTANCE;
+ protected DCSPFileFormat(String type) {
+ super(type);
+ }
+ public static CrueFileFormat<List<EMH>> getInstance() {
+ if (INSTANCE == null) INSTANCE = new DCSPFileFormat(CrueDaoConverterCommon.DCSP);
+ return INSTANCE;
+ }
- protected DCSPFileFormat(String type) {
- super(type);
- }
+ @Override
+ public String[] getExtensions() {
+ return new String[] { "dcsp", "dcsp.xml" };
+ }
- public static CrueFileFormat<List<EMH>> getInstance() {
- if (INSTANCE == null) INSTANCE = new DCSPFileFormat(CrueDaoConverterCommon.DCSP);
- return INSTANCE;
- }
+ @Override
+ public String getXsdValidator() {
+ return xsdDCSP;
+ }
- @Override
- public String[] getExtensions() {
- return new String[] { "dcsp", "dcsp.xml" };
- }
+ @Override
+ public boolean isCrue10() {
+ return true;
+ }
- @Override
- public String getXsdValidator() {
- return xsdDCSP;
- }
+ @Override
+ public boolean isIndependant() {
+ return false;
+ }
- @Override
- public boolean isCrue10() {
- return true;
- }
+ @Override
+ public List<EMH> readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ return getReader(analyzer).read(new CrueDaoPersistDCSP(), f, getXsdValidator(), dataLinked);
- @Override
- public boolean isIndependant() {
- return false;
- }
+ }
- @Override
- public List<EMH> readData(File f,CtuluAnalyze analyzer, Object... dataLinked) {
- return getReader(analyzer).read(new CrueDaoPersistDCSP(), f, getXsdValidator(), dataLinked);
+ @Override
+ public boolean writeData(List<EMH> data, File f, CtuluAnalyze analyzer) {
+ return getWriter(analyzer).write(new CrueDaoPersistDCSP(), data, f);
+ }
- }
-
- @Override
- public boolean writeData(List<EMH> data, File f,CtuluAnalyze analyzer) {
- return getWriter(analyzer).write(new CrueDaoPersistDCSP(), data, f);
- }
-
-
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DFRTFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DFRTFileFormat.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DFRTFileFormat.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -10,56 +10,52 @@
/**
* Format de fichier DFRT.
+ *
* @author Adrien Hadoux
- *
*/
public class DFRTFileFormat extends CrueFileFormat<List<DonFrt>> {
- public static final String xsdDFRT = "valideDFRT.xsd";
- private static DFRTFileFormat INSTANCE;
+ public static final String xsdDFRT = "valideDFRT.xsd";
+ private static DFRTFileFormat INSTANCE;
+ protected DFRTFileFormat(String type) {
+ super(type);
+ }
+ public static CrueFileFormat<List<DonFrt>> getInstance() {
+ if (INSTANCE == null) INSTANCE = new DFRTFileFormat(CrueDaoConverterCommon.DFRT);
+ return INSTANCE;
+ }
- protected DFRTFileFormat(String type) {
- super(type);
- }
+ @Override
+ public String[] getExtensions() {
+ return new String[] { "dfrt", "dfrt.xml" };
+ }
- public static CrueFileFormat<List<DonFrt>> getInstance() {
- if (INSTANCE == null) INSTANCE = new DFRTFileFormat(CrueDaoConverterCommon.DFRT);
- return INSTANCE;
- }
+ @Override
+ public String getXsdValidator() {
+ return xsdDFRT;
+ }
- @Override
- public String[] getExtensions() {
- return new String[] { "dfrt", "dfrt.xml" };
- }
+ @Override
+ public boolean isCrue10() {
+ return true;
+ }
- @Override
- public String getXsdValidator() {
- return xsdDFRT;
- }
+ @Override
+ public boolean isIndependant() {
+ return false;
+ }
- @Override
- public boolean isCrue10() {
- return true;
- }
+ @Override
+ public List<DonFrt> readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ return getReader(analyzer).read(new CrueDaoPersistDFRT(), f, getXsdValidator(), dataLinked);
- @Override
- public boolean isIndependant() {
- return false;
- }
+ }
- @Override
- public List<DonFrt> readData(File f,CtuluAnalyze analyzer, Object... dataLinked) {
- return getReader(analyzer).read(new CrueDaoPersistDFRT(), f, getXsdValidator(), dataLinked);
+ @Override
+ public boolean writeData(List<DonFrt> data, File f, CtuluAnalyze analyzer) {
+ return getWriter(analyzer).write(new CrueDaoPersistDFRT(), data, f);
+ }
- }
-
- @Override
- public boolean writeData(List<DonFrt> data, File f,CtuluAnalyze analyzer) {
- return getWriter(analyzer).write(new CrueDaoPersistDFRT(), data, f);
- }
-
-
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTGFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTGFileFormat.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTGFileFormat.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -1,65 +1,60 @@
package org.fudaa.dodico.crue.inout.fileformat;
import java.io.File;
+
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.dao.CrueDaoConverterCommon;
import org.fudaa.dodico.crue.dao.CrueDaoPersistDPTG;
import org.fudaa.dodico.crue.metier.emh.CrueData;
-
/**
* Format DPTG.
+ *
* @author Adrien Hadoux
- *
*/
public class DPTGFileFormat extends CrueFileFormat<CrueData> {
+ public static final String xsdDPTG = "valideDPTG.xsd";
+ private static DPTGFileFormat INSTANCE;
- public static final String xsdDPTG = "valideDPTG.xsd";
- private static DPTGFileFormat INSTANCE;
+ protected DPTGFileFormat(String type) {
+ super(type);
+ }
+ public static CrueFileFormat<CrueData> getInstance() {
+ if (INSTANCE == null) INSTANCE = new DPTGFileFormat(CrueDaoConverterCommon.DCSP);
+ return INSTANCE;
+ }
+ @Override
+ public String[] getExtensions() {
+ return new String[] { "dptg", "dptg.xml" };
+ }
- protected DPTGFileFormat(String type) {
- super(type);
- }
+ @Override
+ public String getXsdValidator() {
+ return xsdDPTG;
+ }
- public static CrueFileFormat<CrueData> getInstance() {
- if (INSTANCE == null) INSTANCE = new DPTGFileFormat(CrueDaoConverterCommon.DCSP);
- return INSTANCE;
- }
+ @Override
+ public boolean isCrue10() {
+ return true;
+ }
- @Override
- public String[] getExtensions() {
- return new String[] { "dptg", "dptg.xml" };
- }
+ @Override
+ public boolean isIndependant() {
+ return false;
+ }
- @Override
- public String getXsdValidator() {
- return xsdDPTG;
- }
+ @Override
+ public CrueData readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ return getReader(analyzer).read(new CrueDaoPersistDPTG(), f, getXsdValidator(), dataLinked);
- @Override
- public boolean isCrue10() {
- return true;
- }
+ }
- @Override
- public boolean isIndependant() {
- return false;
- }
+ @Override
+ public boolean writeData(CrueData data, File f, CtuluAnalyze analyzer) {
+ return getWriter(analyzer).write(new CrueDaoPersistDPTG(), data, f);
+ }
- @Override
- public CrueData readData(File f,CtuluAnalyze analyzer, Object... dataLinked) {
- return getReader(analyzer).read(new CrueDaoPersistDPTG(), f, getXsdValidator(), dataLinked);
-
- }
-
- @Override
- public boolean writeData(CrueData data, File f,CtuluAnalyze analyzer) {
- return getWriter(analyzer).write(new CrueDaoPersistDPTG(), data, f);
- }
-
-
-
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTIFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTIFileFormat.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTIFileFormat.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -7,61 +7,55 @@
import org.fudaa.dodico.crue.dao.CrueDaoPersistDPTI;
import org.fudaa.dodico.crue.metier.emh.CrueData;
-
/**
- * File format pour DPTI.
- * Le parametre template correspond \xE0 la donn\xE9es m\xE9tier attendue.
+ * File format pour DPTI. Le parametre template correspond \xE0 la donn\xE9es m\xE9tier attendue.
+ *
* @author Adrien Hadoux
- *
*/
public class DPTIFileFormat extends CrueFileFormat<CrueData> {
- public static final String xsdDPTI = "valideDPTI.xsd";
- private static DPTIFileFormat INSTANCE;
+ public static final String xsdDPTI = "valideDPTI.xsd";
+ private static DPTIFileFormat INSTANCE;
+ protected DPTIFileFormat(String type) {
+ super(type);
+ }
+ public static CrueFileFormat<CrueData> getInstance() {
+ if (INSTANCE == null) INSTANCE = new DPTIFileFormat(CrueDaoConverterCommon.DPTI);
+ return INSTANCE;
+ }
- protected DPTIFileFormat(String type) {
- super(type);
- }
+ @Override
+ public String[] getExtensions() {
+ return new String[] { "dpti", "dpti.xml" };
+ }
- public static CrueFileFormat<CrueData> getInstance() {
- if (INSTANCE == null) INSTANCE = new DPTIFileFormat(CrueDaoConverterCommon.DPTI);
- return INSTANCE;
- }
+ @Override
+ public String getXsdValidator() {
+ return xsdDPTI;
+ }
- @Override
- public String[] getExtensions() {
- return new String[] { "dpti", "dpti.xml" };
- }
+ @Override
+ public boolean isCrue10() {
+ return true;
+ }
- @Override
- public String getXsdValidator() {
- return xsdDPTI;
- }
+ @Override
+ public boolean isIndependant() {
+ return false;
+ }
- @Override
- public boolean isCrue10() {
- return true;
- }
+ @Override
+ public CrueData readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ return getReader(analyzer).read(new CrueDaoPersistDPTI(), f, getXsdValidator(), dataLinked);
- @Override
- public boolean isIndependant() {
- return false;
- }
+ }
- @Override
- public CrueData readData(File f,CtuluAnalyze analyzer, Object... dataLinked) {
- return getReader(analyzer).read(new CrueDaoPersistDPTI(), f, getXsdValidator(), dataLinked);
+ @Override
+ public boolean writeData(CrueData data, File f, CtuluAnalyze analyzer) {
+ return getWriter(analyzer).write(new CrueDaoPersistDPTI(), data, f);
+ }
- }
-
- @Override
- public boolean writeData(CrueData data, File f,CtuluAnalyze analyzer) {
- return getWriter(analyzer).write(new CrueDaoPersistDPTI(), data, f);
- }
-
-
-
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DRSOFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DRSOFileFormat.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DRSOFileFormat.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -5,62 +5,56 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.dao.CrueDaoConverterCommon;
import org.fudaa.dodico.crue.dao.CrueDaoPersistDRSO;
-import org.fudaa.dodico.crue.metier.EMHproject;
import org.fudaa.dodico.crue.metier.emh.CrueData;
/**
- * File format pour DRSO.
- * Le parametre template correspond \xE0 la donn\xE9es m\xE9tier attendue.
+ * File format pour DRSO. Le parametre template correspond \xE0 la donn\xE9es m\xE9tier attendue.
+ *
* @author Adrien Hadoux
- *
*/
public class DRSOFileFormat extends CrueFileFormat<CrueData> {
- public static final String xsdDRSO = "valideDRSO.xsd";
- private static DRSOFileFormat INSTANCE;
+ public static final String xsdDRSO = "valideDRSO.xsd";
+ private static DRSOFileFormat INSTANCE;
+ protected DRSOFileFormat(String type) {
+ super(type);
+ }
+ public static CrueFileFormat<CrueData> getInstance() {
+ if (INSTANCE == null) INSTANCE = new DRSOFileFormat(CrueDaoConverterCommon.DRSO);
+ return INSTANCE;
+ }
- protected DRSOFileFormat(String type) {
- super(type);
- }
+ @Override
+ public String[] getExtensions() {
+ return new String[] { "drso", "drso.xml" };
+ }
- public static CrueFileFormat<CrueData> getInstance() {
- if (INSTANCE == null) INSTANCE = new DRSOFileFormat(CrueDaoConverterCommon.DRSO);
- return INSTANCE;
- }
+ @Override
+ public String getXsdValidator() {
+ return xsdDRSO;
+ }
- @Override
- public String[] getExtensions() {
- return new String[] { "drso", "drso.xml" };
- }
+ @Override
+ public boolean isCrue10() {
+ return true;
+ }
- @Override
- public String getXsdValidator() {
- return xsdDRSO;
- }
+ @Override
+ public boolean isIndependant() {
+ return true;
+ }
- @Override
- public boolean isCrue10() {
- return true;
- }
+ @Override
+ public CrueData readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ return getReader(analyzer).read(new CrueDaoPersistDRSO(), f, getXsdValidator(), dataLinked);
- @Override
- public boolean isIndependant() {
- return true;
- }
+ }
- @Override
- public CrueData readData(File f,CtuluAnalyze analyzer, Object... dataLinked) {
- return getReader(analyzer).read(new CrueDaoPersistDRSO(), f, getXsdValidator(), dataLinked);
+ @Override
+ public boolean writeData(CrueData data, File f, CtuluAnalyze analyzer) {
+ return getWriter(analyzer).write(new CrueDaoPersistDRSO(), data, f);
+ }
- }
-
- @Override
- public boolean writeData(CrueData data, File f,CtuluAnalyze analyzer) {
- return getWriter(analyzer).write(new CrueDaoPersistDRSO(), data, f);
- }
-
-
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -4,7 +4,6 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.dao.CrueDaoConverterCommon;
-import org.fudaa.dodico.crue.dao.validatorXml.ValidatorXml;
import org.fudaa.dodico.crue.metier.EMHproject;
/**
@@ -47,16 +46,16 @@
return true;
}
-@Override
-public EMHproject readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
- // TODO Auto-generated method stub
- return null;
-}
+ @Override
+ public EMHproject readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ // TODO Auto-generated method stub
+ return null;
+ }
-@Override
-public boolean writeData(EMHproject data, File f, CtuluAnalyze analyzer) {
- // TODO Auto-generated method stub
- return false;
-}
+ @Override
+ public boolean writeData(EMHproject data, File f, CtuluAnalyze analyzer) {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/OPTGFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/OPTGFileFormat.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/OPTGFileFormat.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -1,62 +1,60 @@
package org.fudaa.dodico.crue.inout.fileformat;
import java.io.File;
+
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.dao.CrueDaoConverterCommon;
import org.fudaa.dodico.crue.dao.CrueDaoPersistOPTG;
import org.fudaa.dodico.crue.metier.emh.DonPrtReseau;
+
/**
* File format optg
+ *
* @author Adrien Hadoux
- *
*/
public class OPTGFileFormat extends CrueFileFormat<DonPrtReseau> {
- public static final String xsdOPTG = "valideOPTG.xsd";
- private static OPTGFileFormat INSTANCE;
+ public static final String xsdOPTG = "valideOPTG.xsd";
+ private static OPTGFileFormat INSTANCE;
+ protected OPTGFileFormat(String type) {
+ super(type);
+ }
+ public static CrueFileFormat<DonPrtReseau> getInstance() {
+ if (INSTANCE == null) INSTANCE = new OPTGFileFormat(CrueDaoConverterCommon.DPTI);
+ return INSTANCE;
+ }
- protected OPTGFileFormat(String type) {
- super(type);
- }
+ @Override
+ public String[] getExtensions() {
+ return new String[] { "optg", "optg.xml" };
+ }
- public static CrueFileFormat<DonPrtReseau> getInstance() {
- if (INSTANCE == null) INSTANCE = new OPTGFileFormat(CrueDaoConverterCommon.DPTI);
- return INSTANCE;
- }
+ @Override
+ public String getXsdValidator() {
+ return xsdOPTG;
+ }
- @Override
- public String[] getExtensions() {
- return new String[] { "optg", "optg.xml" };
- }
+ @Override
+ public boolean isCrue10() {
+ return true;
+ }
- @Override
- public String getXsdValidator() {
- return xsdOPTG;
- }
+ @Override
+ public boolean isIndependant() {
+ return true;
+ }
- @Override
- public boolean isCrue10() {
- return true;
- }
+ @Override
+ public DonPrtReseau readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ return getReader(analyzer).read(new CrueDaoPersistOPTG(), f, getXsdValidator(), dataLinked);
- @Override
- public boolean isIndependant() {
- return true;
- }
+ }
- @Override
- public DonPrtReseau readData(File f,CtuluAnalyze analyzer, Object... dataLinked) {
- return getReader(analyzer).read(new CrueDaoPersistOPTG(), f, getXsdValidator(), dataLinked);
+ @Override
+ public boolean writeData(DonPrtReseau data, File f, CtuluAnalyze analyzer) {
+ return getWriter(analyzer).write(new CrueDaoPersistOPTG(), data, f);
+ }
- }
-
- @Override
- public boolean writeData(DonPrtReseau data, File f,CtuluAnalyze analyzer) {
- return getWriter(analyzer).write(new CrueDaoPersistOPTG(), data, f);
- }
-
-
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalculPermanent.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalculPermanent.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalculPermanent.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -4,58 +4,55 @@
/**
* Definition d'un calcul permanent
+ *
* @author Adrien Hadoux
- *
*/
public class CalculPermanent {
- String nom;
- String description;
- String methodeCalcul;
-
- List<DonCLimMBrancheOrifice> listeDonClimBrancheOrifice;
- List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu;
-
-
- public List<DonCLimMNoeudNiveauContinu> getListeDonCLimMNoeudNiveauContinu() {
- return listeDonCLimMNoeudNiveauContinu;
- }
+ String nom;
+ String description;
+ String methodeCalcul;
- public void setListeDonCLimMNoeudNiveauContinu(
- List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu) {
- this.listeDonCLimMNoeudNiveauContinu = listeDonCLimMNoeudNiveauContinu;
- }
+ List<DonCLimMBrancheOrifice> listeDonClimBrancheOrifice;
+ List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu;
- public String getNom() {
- return nom;
- }
+ public List<DonCLimMNoeudNiveauContinu> getListeDonCLimMNoeudNiveauContinu() {
+ return listeDonCLimMNoeudNiveauContinu;
+ }
- public void setNom(String nom) {
- this.nom = nom;
- }
+ public void setListeDonCLimMNoeudNiveauContinu(List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu) {
+ this.listeDonCLimMNoeudNiveauContinu = listeDonCLimMNoeudNiveauContinu;
+ }
- public String getDescription() {
- return description;
- }
+ public String getNom() {
+ return nom;
+ }
- public void setDescription(String description) {
- this.description = description;
- }
+ public void setNom(String nom) {
+ this.nom = nom;
+ }
- public String getMethodeCalcul() {
- return methodeCalcul;
- }
+ public String getDescription() {
+ return description;
+ }
- public void setMethodeCalcul(String methodeCalcul) {
- this.methodeCalcul = methodeCalcul;
- }
+ public void setDescription(String description) {
+ this.description = description;
+ }
- public List<DonCLimMBrancheOrifice> getListeDonClimBrancheOrifice() {
- return listeDonClimBrancheOrifice;
- }
+ public String getMethodeCalcul() {
+ return methodeCalcul;
+ }
- public void setListeDonClimBrancheOrifice(
- List<DonCLimMBrancheOrifice> listeDonClimBrancheOrifice) {
- this.listeDonClimBrancheOrifice = listeDonClimBrancheOrifice;
- }
-
+ public void setMethodeCalcul(String methodeCalcul) {
+ this.methodeCalcul = methodeCalcul;
+ }
+
+ public List<DonCLimMBrancheOrifice> getListeDonClimBrancheOrifice() {
+ return listeDonClimBrancheOrifice;
+ }
+
+ public void setListeDonClimBrancheOrifice(List<DonCLimMBrancheOrifice> listeDonClimBrancheOrifice) {
+ this.listeDonClimBrancheOrifice = listeDonClimBrancheOrifice;
+ }
+
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalculTransitoire.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalculTransitoire.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalculTransitoire.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -4,44 +4,46 @@
/**
* Calcul transitoire.
+ *
* @author Adrien Hadoux
- *
*/
public class CalculTransitoire {
- String nom;
- String description;
-
- List<DonCLimMBrancheOrifice> listeDonClimBrancheOrifice;
- List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu;
-
-
-
- public List<DonCLimMNoeudNiveauContinu> getListeDonCLimMNoeudNiveauContinu() {
- return listeDonCLimMNoeudNiveauContinu;
- }
- public void setListeDonCLimMNoeudNiveauContinu(
- List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu) {
- this.listeDonCLimMNoeudNiveauContinu = listeDonCLimMNoeudNiveauContinu;
- }
- public String getNom() {
- return nom;
- }
- public void setNom(String nom) {
- this.nom = nom;
- }
- public String getDescription() {
- return description;
- }
- public void setDescription(String description) {
- this.description = description;
- }
- public List<DonCLimMBrancheOrifice> getListeDonClimBrancheOrifice() {
- return listeDonClimBrancheOrifice;
- }
- public void setListeDonClimBrancheOrifice(
- List<DonCLimMBrancheOrifice> listeDonClimBrancheOrifice) {
- this.listeDonClimBrancheOrifice = listeDonClimBrancheOrifice;
- }
+ String nom;
+ String description;
+ List<DonCLimMBrancheOrifice> listeDonClimBrancheOrifice;
+ List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu;
+ public List<DonCLimMNoeudNiveauContinu> getListeDonCLimMNoeudNiveauContinu() {
+ return listeDonCLimMNoeudNiveauContinu;
+ }
+
+ public void setListeDonCLimMNoeudNiveauContinu(List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu) {
+ this.listeDonCLimMNoeudNiveauContinu = listeDonCLimMNoeudNiveauContinu;
+ }
+
+ public String getNom() {
+ return nom;
+ }
+
+ public void setNom(String nom) {
+ this.nom = nom;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public List<DonCLimMBrancheOrifice> getListeDonClimBrancheOrifice() {
+ return listeDonClimBrancheOrifice;
+ }
+
+ public void setListeDonClimBrancheOrifice(List<DonCLimMBrancheOrifice> listeDonClimBrancheOrifice) {
+ this.listeDonClimBrancheOrifice = listeDonClimBrancheOrifice;
+ }
+
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -20,19 +20,19 @@
private boolean isActive_;
-// /**
-// * Liste des sections d'une branche.
-// */
-// private List<CatEMHSection> listeSections_;
-//
-// /**
-// * noeud amont (DRSO)
-// */
-// private CatEMHNoeud noeudAmont_;
-// /**
-// * noeud aval (DRSO)
-// */
-// private CatEMHNoeud noeudAval_;
+ // /**
+ // * Liste des sections d'une branche.
+ // */
+ // private List<CatEMHSection> listeSections_;
+ //
+ // /**
+ // * noeud amont (DRSO)
+ // */
+ // private CatEMHNoeud noeudAmont_;
+ // /**
+ // * noeud aval (DRSO)
+ // */
+ // private CatEMHNoeud noeudAval_;
public CatEMHBranche(final String nom) {
super(nom);
@@ -43,9 +43,9 @@
return EMHHelper.getListeRelationsSections(this);
}
-public void setListeSections(List<RelationEMH> liste){
- EMHHelper.addListeSectionsToRelations(this,liste);
-}
+ public void setListeSections(List<RelationEMH> liste) {
+ EMHHelper.addListeSectionsToRelations(this, liste);
+ }
public boolean isActive() {
return isActive_;
@@ -60,17 +60,15 @@
}
public void setNoeudAmont(final CatEMHNoeud noeudAmont) {
- EMHHelper.addNoeudAmont(this, noeudAmont);
+ EMHHelper.addNoeudAmont(this, noeudAmont);
}
public CatEMHNoeud getNoeudAval() {
- return EMHHelper.getNoeudAval(this);
+ return EMHHelper.getNoeudAval(this);
}
public void setNoeudAval(final CatEMHNoeud noeudAval) {
- EMHHelper.addNoeudAval(this, noeudAval);
+ EMHHelper.addNoeudAval(this, noeudAval);
}
-
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -9,7 +9,6 @@
private boolean isActive_;
-
public CatEMHCasier(final String nom) {
super(nom);
// TODO Auto-generated constructor stub
@@ -31,7 +30,4 @@
EMHHelper.addNoeudCasier(this, noeud);
}
-
-
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -1,6 +1,5 @@
package org.fudaa.dodico.crue.metier.emh;
-
/**
* @author Adrien Hadoux
*/
@@ -11,6 +10,4 @@
}
-
-
}
Modified: 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/CatEMHSection.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHSection.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -10,11 +10,10 @@
*/
public class CatEMHSection extends EMH {
-
-// String position;
-//
-//
-// double xp;
+ // String position;
+ //
+ //
+ // double xp;
/**
* recuperer les donnees (DSCP)
@@ -36,21 +35,20 @@
// TODO Auto-generated constructor stub
}
-// public String getPosition() {
-// return position;
-// }
-//
-// public void setPosition(final String position) {
-// this.position = position;
-// }
-//
-// public double getXp() {
-// return xp;
-// }
-//
-// public void setXp(final double xp) {
-// this.xp = xp;
-// }
+ // public String getPosition() {
+ // return position;
+ // }
+ //
+ // public void setPosition(final String position) {
+ // this.position = position;
+ // }
+ //
+ // public double getXp() {
+ // return xp;
+ // }
+ //
+ // public void setXp(final double xp) {
+ // this.xp = xp;
+ // }
-
}
Modified: 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/DonCLimMBrancheOrifice.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMBrancheOrifice.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -1,8 +1,9 @@
package org.fudaa.dodico.crue.metier.emh;
+
/**
* Definitio n de la donclim branche
+ *
* @author Adrien Hadoux
- *
*/
public class DonCLimMBrancheOrifice extends DonClimM {
Modified: 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/DonCLimMNoeudNiveauContinu.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMNoeudNiveauContinu.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -4,7 +4,6 @@
* DonclimNoeudNiveuContinu.
*
* @author Adrien Hadoux
- *
*/
public class DonCLimMNoeudNiveauContinu {
Modified: 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/DonCLimMScenario.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMScenario.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -4,30 +4,28 @@
/**
* Scenario pour les fichier DCLM.
+ *
* @author Adrien Hadoux
*/
-public class DonCLimMScenario extends DonClimM{
+public class DonCLimMScenario extends DonClimM {
-
- public List<CalculPermanent> listeCalculPermanents;
- public List<CalculTransitoire> listeCalculTransitoire;
+ public List<CalculPermanent> listeCalculPermanents;
+ public List<CalculTransitoire> listeCalculTransitoire;
- public List<CalculTransitoire> getListeCalculTransitoire() {
- return listeCalculTransitoire;
- }
+ public List<CalculTransitoire> getListeCalculTransitoire() {
+ return listeCalculTransitoire;
+ }
- public void setListeCalculTransitoire(
- List<CalculTransitoire> listeCalculTransitoire) {
- this.listeCalculTransitoire = listeCalculTransitoire;
- }
+ public void setListeCalculTransitoire(List<CalculTransitoire> listeCalculTransitoire) {
+ this.listeCalculTransitoire = listeCalculTransitoire;
+ }
- public List<CalculPermanent> getListeCalculPermanents() {
- return listeCalculPermanents;
- }
+ public List<CalculPermanent> getListeCalculPermanents() {
+ return listeCalculPermanents;
+ }
- public void setListeCalculPermanents(List<CalculPermanent> listeCalculPermanents) {
- this.listeCalculPermanents = listeCalculPermanents;
- }
-
-
+ public void setListeCalculPermanents(List<CalculPermanent> listeCalculPermanents) {
+ this.listeCalculPermanents = listeCalculPermanents;
+ }
+
}
Modified: 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/DonCalcSansPrtBrancheBarrageGenerique.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheBarrageGenerique.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -1,37 +1,38 @@
package org.fudaa.dodico.crue.metier.emh;
/**
- * Classe de la branche de barrage g\xE9n\xE9rique.
- * Utilis\xE9e pour le fichier DCSP
+ * Classe de la branche de barrage g\xE9n\xE9rique. Utilis\xE9e pour le fichier DCSP
+ *
* @author Adrien Hadoux
- *
*/
public class DonCalcSansPrtBrancheBarrageGenerique implements DonCalcSansPrt {
- private double QLimInf;
- private double QLimSup;
- private LoiFF regimeNoye;
-
-
-
- public double getQLimInf() {
- return QLimInf;
- }
- public void setQLimInf(double limInf) {
- QLimInf = limInf;
- }
- public double getQLimSup() {
- return QLimSup;
- }
- public void setQLimSup(double limSup) {
- QLimSup = limSup;
- }
- public LoiFF getRegimeNoye() {
- return regimeNoye;
- }
- public void setRegimeNoye(LoiFF regimeNoye) {
- this.regimeNoye = regimeNoye;
- }
-
-
+ private double QLimInf;
+ private double QLimSup;
+ private LoiFF regimeNoye;
+
+ public double getQLimInf() {
+ return QLimInf;
+ }
+
+ public void setQLimInf(double limInf) {
+ QLimInf = limInf;
+ }
+
+ public double getQLimSup() {
+ return QLimSup;
+ }
+
+ public void setQLimSup(double limSup) {
+ QLimSup = limSup;
+ }
+
+ public LoiFF getRegimeNoye() {
+ return regimeNoye;
+ }
+
+ public void setRegimeNoye(LoiFF regimeNoye) {
+ this.regimeNoye = regimeNoye;
+ }
+
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBranche.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBranche.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBranche.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -5,7 +5,6 @@
*/
public class DonPrtCInitBranche implements DonPrtClInit {
private double Qinit;
-
public double getQinit() {
return Qinit;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBrancheSaintVenant.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBrancheSaintVenant.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBrancheSaintVenant.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -2,17 +2,17 @@
/**
* Condition init pour les branches Saint Venant.
+ *
* @author Adrien Hadoux
- *
*/
public class DonPrtCInitBrancheSaintVenant extends DonPrtCInitBranche {
- private double Qruis;
+ private double Qruis;
- public double getQruis() {
- return Qruis;
- }
+ public double getQruis() {
+ return Qruis;
+ }
- public void setQruis(final double qruis) {
- Qruis = qruis;
- }
+ public void setQruis(final double qruis) {
+ Qruis = qruis;
+ }
}
Modified: 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/EMH.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -86,7 +86,7 @@
* @param dataCalcul
*/
public void addDSCP(final DonCalcSansPrt dataCalcul) {
- EMHHelper.addDSCP(this, dataCalcul);
+ EMHHelper.addDSCP(this, dataCalcul);
}
/**
@@ -95,7 +95,7 @@
* @return
*/
public List<DonCalcSansPrt> getDSCP() {
- return EMHHelper.getDSCP(this);
+ return EMHHelper.getDSCP(this);
}
@@ -106,8 +106,8 @@
* @return
*/
public List<DonPrtClInit> getDPTI() {
-
- return EMHHelper.getDPTI(this);
+
+ return EMHHelper.getDPTI(this);
}
/**
@@ -116,7 +116,7 @@
* @param dataCalcul
*/
public void addDPTI(final DonPrtClInit conditionInit) {
- EMHHelper.addDPTI(this, conditionInit);
+ EMHHelper.addDPTI(this, conditionInit);
}
/**
@@ -125,8 +125,8 @@
* @return
*/
public List<DonPrtGeo> getDPTG() {
-
- return EMHHelper.getDPTG(this);
+
+ return EMHHelper.getDPTG(this);
}
/**
@@ -137,7 +137,7 @@
* @param dataCalcul
*/
public void addDPTG(final DonPrtGeo donnee) {
- EMHHelper.addDPTG(this, donnee);
+ EMHHelper.addDPTG(this, donnee);
}
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EvolutionDF.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EvolutionDF.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EvolutionDF.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -1,20 +1,18 @@
package org.fudaa.dodico.crue.metier.emh;
-
import java.util.List;
+
/**
- *
* @author Adrien Hadoux
- *
*/
public class EvolutionDF {
- List<PtEvolutionDF> mpoints;
+ List<PtEvolutionDF> mpoints;
- public List<PtEvolutionDF> getMpoints() {
- return mpoints;
- }
+ public List<PtEvolutionDF> getMpoints() {
+ return mpoints;
+ }
- public void setMpoints(final List<PtEvolutionDF> mpoints) {
- this.mpoints = mpoints;
- }
+ public void setMpoints(final List<PtEvolutionDF> mpoints) {
+ this.mpoints = mpoints;
+ }
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EvolutionFF.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EvolutionFF.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EvolutionFF.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -1,11 +1,11 @@
package org.fudaa.dodico.crue.metier.emh;
+import java.util.List;
-import java.util.List;
/**
* Point evolution FF.
+ *
* @author Adrien Hadoux
- *
*/
public class EvolutionFF {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Loi.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Loi.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Loi.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -2,8 +2,8 @@
/**
* Objet g\xE9n\xE9rique loi.
+ *
* @author Adrien Hadoux
- *
*/
public interface Loi {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/LoiDF.java
===========...
[truncated message content] |
|
From: <had...@us...> - 2009-04-09 06:29:40
|
Revision: 4623
http://fudaa.svn.sourceforge.net/fudaa/?rev=4623&view=rev
Author: hadouxad
Date: 2009-04-09 06:29:30 +0000 (Thu, 09 Apr 2009)
Log Message:
-----------
# Corrections des formats DPTI et DRSO
* Pour DRSO il y avait d'autres modifications suppl?\195?\169mentaires ?\195?\160 prendre en compte
* pour DPTI, des modifs a faire pour les qruis et quini
# Modification des xsd
# Mise en place du format DLHY pour aider Carole
* Ce format permet de faire les liens avec les xsd et donne les reader/writer.
# Corrections des fichiers sur les formats DRSO et DPTI.
# Modif des relationEMH: HashMap
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoParsing.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDLHY.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistETU.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistOPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersit.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DCSPFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DFRTFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTGFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTIFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DRSOFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/OPTGFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSectionIdem.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMH.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/EMHSectionHelper.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDFRT.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDRSO.xsd
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/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/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/TestCrueETU.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueOPTGFile.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.drso.xml
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/inout/fileformat/DLHYFileFormat.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueContrat.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueInterface.java
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDRSO.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDRSO.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDRSO.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -1,40 +1,12 @@
package org.fudaa.dodico.crue.dao;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.common.CrueResource;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheAbstract;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheBarrageFilEau;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheBarrageGenerique;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheBarrageRhone;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheEnchainement;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheNiveauxAssocies;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheOrifice;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BranchePdc;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheSaintVenant;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheSeuilLateral;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheSeuilTransversal;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheStrickler;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.CasierAbstract;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.CasierMNT;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.CasierProfil;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.NdAm;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.NdAv;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.NoeudNiveauContinu;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.ReferenceNoeud;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.ReferenceProfil;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.SectionAbstract;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.SectionBrancheAbstract;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.SectionIdem;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.SectionInterpolee;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.SectionProfil;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.SectionRefIdem;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.SectionRefInterpolee;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.SectionRefProfil;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.SectionRefSansGeometrie;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.SectionSansGeometrie;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.*;
import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
@@ -392,6 +364,9 @@
SectionAbstract sectionPersist = null;
if (section instanceof EMHSectionIdem) {
sectionPersist = new SectionRefIdem();
+ ((SectionRefIdem)sectionPersist).Section=new SectionReferenceeParIdem();
+ ((SectionRefIdem)sectionPersist).Section.NomRef=((EMHSectionIdem)section).getReference();
+
} else if (section instanceof EMHSectionInterpolee) {
sectionPersist = new SectionRefInterpolee();
} else if (section instanceof EMHSectionProfil) {
@@ -442,7 +417,7 @@
final List<RelationEMH> listeRelationEMH = new ArrayList<RelationEMH>();
if (listePersistanteSections == null || listePersistanteSections.size() == 0) {
analyser.addError(CrueDaoConverterCommon.listEmpty("Branches"), cptEntries++);
- } else for (final Object persist : listePersistanteSections) {
+ } else for (final Object persist : listePersistanteSections){
if (persist instanceof SectionBrancheAbstract) {
final SectionBrancheAbstract sectionPersist = (SectionBrancheAbstract) persist;
@@ -453,7 +428,14 @@
// -- commun aux objets --//
if (section != null) {
- RelationEMH relation = new RelationEMH(section, sectionPersist.Pos, new Double(sectionPersist.Xp));
+ HashMap<String,Object> map=new HashMap<String, Object>();
+ map.put(EMHHelper.Pos_section, sectionPersist.Pos);
+ map.put(EMHHelper.Xp_section, sectionPersist.Xp);
+ map.put(EMHHelper.Coeff_Pond, sectionPersist.CoefPond);
+ map.put(EMHHelper.Coeff_Div, sectionPersist.CoefDiv);
+ map.put(EMHHelper.Coeff_Conv, sectionPersist.CoefConv);
+
+ RelationEMH relation = new RelationEMH(section, map);
listeRelationEMH.add(relation);
} else {
@@ -486,6 +468,17 @@
// -- on recherche sa sp\xE9cialisation --//
if (sectionPersist instanceof SectionRefIdem) {
section = new EMHSectionIdem(nom);
+
+ SectionRefIdem sectionref=(SectionRefIdem)sectionPersist;
+ if(sectionref.Section!=null){
+ ((EMHSectionIdem)section).setReference(sectionref.Section.NomRef);
+
+ }
+ else{
+ analyser.addError(CrueDaoConverterCommon.unknowReference("Sections Idem", sectionPersist.Nom),
+ cptEntries++);
+ }
+
} else if (sectionPersist instanceof SectionRefInterpolee) {
section = new EMHSectionInterpolee(nom);
@@ -557,9 +550,14 @@
sectionPersist.NomRef = section.getNom();
sectionPersist.Pos = (String) EMHHelper.getPositionSection(relation);
- Object objet = EMHHelper.getXpSection(relation);
- if (objet instanceof Integer) sectionPersist.Xp = (Integer) objet;
- else sectionPersist.Xp = (Double) objet;
+
+ sectionPersist.Xp = EMHHelper.getXpSection(relation);
+
+ sectionPersist.CoefPond=EMHHelper.getPondSection(relation);
+ sectionPersist.CoefConv=EMHHelper.getConvSection(relation);
+ sectionPersist.CoefDiv=EMHHelper.getDivSection(relation);
+
+
listePersistante.add(sectionPersist);
}
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoParsing.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoParsing.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoParsing.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -44,7 +44,6 @@
contentXml = ValidatorXml.enteteXml + "\n" + contentXml;
writer.write(contentXml);
} catch (final IOException e) {
- // TODO Auto-generated catch block
FuLog.debug(e.getMessage());
analyser.addFatalError(CrueResource.getS("Erreur d'ecriture du fichier"));
isOk = false;
@@ -66,7 +65,7 @@
* @param fichier
* @return
*/
- public T getPersistData(final Object dataLinked, final File fichier, final CtuluAnalyze analyser) {
+ public T getPersistData( final File fichier, final CtuluAnalyze analyser,final Object... dataLinked) {
// -- la data a r\xE9cup\xE9rer --//
T newData = null;
try {
@@ -81,7 +80,7 @@
dataToPersist_ = (CrueDaoPersit<T>) resultat;
// -- on genere la donn\xE9es m\xE9tier a partir de la donnee persistante--//
- newData = dataToPersist_.fillInfosWithPersistant(dataLinked, analyser);
+ newData = dataToPersist_.fillInfosWithPersistant( analyser,dataLinked);
} catch (final XStreamException e) {
FuLog.debug(e.getMessage());
analyser.addFatalError(CrueResource.getS("Erreur d'ecriture du fichier"));
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDCSP.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDCSP.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDCSP.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -40,9 +40,9 @@
}
@Override
- List<EMH> fillInfosWithPersistant(final Object data, final CtuluAnalyze analyser) {
+ List<EMH> fillInfosWithPersistant( final CtuluAnalyze analyser,final Object data) {
- if (data == null || !(data instanceof List)) {
+ if (data == null || !(data instanceof List)) {
analyser
.addFatalError(CrueResource
.getS("Impossible de r\xE9cup\xE9rer les donn\xE9es r\xE9saux (DRSO). Les r\xE9f\xE9rences du fichier DSCP ne pourront etre utilis\xE9es."));
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDFRT.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDFRT.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDFRT.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -38,7 +38,7 @@
}
@Override
- public List<DonFrt> fillInfosWithPersistant(final Object data, final CtuluAnalyze analyser) {
+ public List<DonFrt> fillInfosWithPersistant( final CtuluAnalyze analyser,final Object data) {
return CrueDaoConverterDFRT.remplirFrottemetnsAvecPersistanceDFRT(listeFrottement, analyser);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDLHY.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDLHY.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDLHY.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -33,7 +33,7 @@
}
@Override
- List<Loi> fillInfosWithPersistant(Object dataLinked, CtuluAnalyze analyser) {
+ List<Loi> fillInfosWithPersistant( CtuluAnalyze analyser,Object dataLinked) {
final List<Loi> res = new ArrayList<Loi>();
CrueDaoConverterDLHY.cptEntries = 1;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTG.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTG.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTG.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -36,9 +36,9 @@
}
@Override
- public CrueData fillInfosWithPersistant(final Object dataLinked, final CtuluAnalyze listeMessageError) {
+ public CrueData fillInfosWithPersistant( final CtuluAnalyze listeMessageError,final Object dataLinked) {
// TODO Auto-generated method stub
- if (dataLinked instanceof CrueData) {
+ if (dataLinked!=null &&(dataLinked instanceof CrueData)) {
final CrueData structure = (CrueData) dataLinked;
CrueDaoConverterDPTG.remplirMetierDPTG(this, structure, listeMessageError);
return structure;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTI.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTI.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTI.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -61,15 +61,15 @@
}
@Override
- CrueData fillInfosWithPersistant(final Object data, final CtuluAnalyze listeMessageError) {
+ CrueData fillInfosWithPersistant( final CtuluAnalyze listeMessageError,final Object dataLinked) {
- if (data == null || !(data instanceof CrueData)) {
+ if (dataLinked == null || !(dataLinked instanceof CrueData)) {
listeMessageError
.addFatalError(CrueResource
.getS("Impossible de r\xE9cup\xE9rer les donn\xE9es r\xE9saux (DRSO). Les r\xE9f\xE9rences du fichier DPTI ne pourront etre utilis\xE9es."));
return null;
}
- final CrueData dataCrue = (CrueData) data;
+ final CrueData dataCrue = (CrueData) dataLinked;
// -- remplissage des noeuds --//
CrueDaoConverterDPTI.remplirNoeudAvecPersistanceDPTI(Noeuds, dataCrue.getNoeuds(), listeMessageError);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDRSO.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDRSO.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDRSO.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -78,7 +78,7 @@
}
@Override
- public CrueData fillInfosWithPersistant(final Object data, final CtuluAnalyze listeMessageError) {
+ public CrueData fillInfosWithPersistant( final CtuluAnalyze listeMessageError,final Object dataLinked) {
final CrueData res = new CrueData();
CrueDaoConverterDRSO.cptEntries = 1;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistETU.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistETU.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistETU.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -42,7 +42,7 @@
}
@Override
- public EMHproject fillInfosWithPersistant(final Object dataLinked, final CtuluAnalyze analyser) {
+ public EMHproject fillInfosWithPersistant( final CtuluAnalyze analyser,final Object dataLinked) {
// TODO Auto-generated method stub
return CrueDaoConverterETU.remplirMetierETU(this, analyser);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistOPTG.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistOPTG.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistOPTG.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -46,7 +46,7 @@
}
@Override
- public DonPrtReseau fillInfosWithPersistant(final Object data, final CtuluAnalyze listeMessageError) {
+ public DonPrtReseau fillInfosWithPersistant( final CtuluAnalyze listeMessageError,final Object dataLinked) {
final DonPrtReseau ordres = new DonPrtReseau();
ordres.setRegleProfPlat(RegleProfPlat);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersit.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersit.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersit.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -32,7 +32,7 @@
*
* @return
*/
- abstract T fillInfosWithPersistant(Object dataLinked, CtuluAnalyze analyser);
+ abstract T fillInfosWithPersistant( CtuluAnalyze analyser,Object dataLinked);
/**
* Execute la persistance des donn\xE9es dans le fichier donn\xE9 en parametre.
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDRSO.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDRSO.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDRSO.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -151,6 +151,10 @@
xstream.alias("SectionInterpolee", SectionRefInterpolee.class);
xstream.alias("SectionPilote", SectionRefPilote.class);
+ //-- cas particlier pour les sections --//
+ xstream.alias("Section", SectionReferenceeParIdem.class);
+ xstream.useAttributeFor( SectionReferenceeParIdem.class,"NomRef");
+
// -- implicite liste pour les references profils--//
xstream.addImplicitCollection(SectionRefProfil.class, "ProfilSection");
@@ -439,6 +443,9 @@
public String NomRef;
public String Pos;
public double Xp;
+ public double CoefPond;
+ public double CoefConv;
+ public double CoefDiv;
}
@@ -595,8 +602,14 @@
public String Nom;
}
+
+ public static class SectionReferenceeParIdem{
+ public String NomRef;
+ }
- public static class SectionRefIdem extends SectionAbstract {}
+ public static class SectionRefIdem extends SectionAbstract {
+ SectionReferenceeParIdem Section;
+ }
public static class SectionRefInterpolee extends SectionAbstract {}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -40,12 +40,12 @@
*/
public static class ReaderWithExtra<T> {
CrueDaoPersit<T> data;
- CtuluAnalyze listeMessageError;
+ CtuluAnalyze analyzer;
Object[] dataLinked;
public ReaderWithExtra(final CtuluAnalyze analyzer) {
- this.listeMessageError = analyzer;
+ this.analyzer = analyzer;
}
@@ -59,17 +59,17 @@
public T read(final CrueDaoPersit<T> data, final File fichier, final String validatorXSDfile,
final Object... dataLinked) {
- listeMessageError.setDesc(CrueResource.getS(" Analyse du Fichier " + fichier.getName()));
+ analyzer.setDesc(CrueResource.getS(" Analyse du Fichier " + fichier.getName()));
// -- evaluation du fichier avec la xsd --//
- if (!ValidatorXml.validXMLWithDOMFromFile(fichier, validatorXSDfile, listeMessageError)) {
- listeMessageError.addWarn(CrueResource.getS("Fichier " + fichier.getName() + " non valid\xE9 par la XSD "
+ if (!ValidatorXml.validXMLWithDOMFromFile(fichier, validatorXSDfile, analyzer)) {
+ analyzer.addWarn(CrueResource.getS("Fichier " + fichier.getName() + " non valid\xE9 par la XSD "
+ validatorXSDfile), 0);
}
// -- lecture des donn\xE9es --//
final CrueDaoParsing<T> parser = new CrueDaoParsing<T>(data);
- final T res = parser.getPersistData(dataLinked, fichier, listeMessageError);
+ final T res = parser.getPersistData( fichier, analyzer,dataLinked);
return res;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -85,7 +85,7 @@
* @param dataLinked
* @return
*/
- public abstract T readData(final File f, CtuluAnalyze analyzer, final Object... dataLinked);
+ public abstract T readData(final File f, CtuluAnalyze analyzer, final Object dataLinked);
/**
* Obtenir le wtriter associ\xE9.
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DCSPFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DCSPFileFormat.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DCSPFileFormat.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -48,7 +48,7 @@
}
@Override
- public List<EMH> readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ public List<EMH> readData(File f, CtuluAnalyze analyzer, Object dataLinked) {
return getReader(analyzer).read(new CrueDaoPersistDCSP(), f, getXsdValidator(), dataLinked);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DFRTFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DFRTFileFormat.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DFRTFileFormat.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -48,7 +48,7 @@
}
@Override
- public List<DonFrt> readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ public List<DonFrt> readData(File f, CtuluAnalyze analyzer, Object dataLinked) {
return getReader(analyzer).read(new CrueDaoPersistDFRT(), f, getXsdValidator(), dataLinked);
}
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DLHYFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DLHYFileFormat.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DLHYFileFormat.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -0,0 +1,62 @@
+package org.fudaa.dodico.crue.inout.fileformat;
+
+import java.io.File;
+import java.util.List;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.dao.CrueDaoConverterCommon;
+import org.fudaa.dodico.crue.dao.CrueDaoPersistDLHY;
+import org.fudaa.dodico.crue.metier.emh.Loi;
+
+public class DLHYFileFormat extends CrueFileFormat<List<Loi>>{
+
+ public static final String xsdDLHY = "valideDLHY.xsd";
+ private static DLHYFileFormat INSTANCE;
+
+
+ public static CrueFileFormat<List<Loi>> getInstance() {
+ if (INSTANCE == null) INSTANCE = new DLHYFileFormat(CrueDaoConverterCommon.DLHY);
+ return INSTANCE;
+ }
+
+ protected DLHYFileFormat(String type) {
+ super(type);
+ }
+
+
+ public String[] getExtensions() {
+
+ return new String[] { "dlhy", "dlhy.xml" };
+ }
+
+
+ public String getXsdValidator() {
+
+ return xsdDLHY;
+ }
+
+
+ public boolean isCrue10() {
+
+ return false;
+ }
+
+
+ public boolean isIndependant() {
+
+ return false;
+ }
+
+
+
+ public List<Loi> readData(File f, CtuluAnalyze analyzer, Object dataLinked) {
+ return getReader(analyzer).read(new CrueDaoPersistDLHY(), f, getXsdValidator(), dataLinked);
+
+ }
+
+
+ public boolean writeData(List<Loi> data, File f, CtuluAnalyze analyzer) {
+ return getWriter(analyzer).write(new CrueDaoPersistDLHY(), data, f);
+ }
+
+}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTGFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTGFileFormat.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTGFileFormat.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -47,7 +47,7 @@
}
@Override
- public CrueData readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ public CrueData readData(File f, CtuluAnalyze analyzer, Object dataLinked) {
return getReader(analyzer).read(new CrueDaoPersistDPTG(), f, getXsdValidator(), dataLinked);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTIFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTIFileFormat.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTIFileFormat.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -48,7 +48,7 @@
}
@Override
- public CrueData readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ public CrueData readData(File f, CtuluAnalyze analyzer, Object dataLinked) {
return getReader(analyzer).read(new CrueDaoPersistDPTI(), f, getXsdValidator(), dataLinked);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DRSOFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DRSOFileFormat.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DRSOFileFormat.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -47,7 +47,7 @@
}
@Override
- public CrueData readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ public CrueData readData(File f, CtuluAnalyze analyzer, Object dataLinked) {
return getReader(analyzer).read(new CrueDaoPersistDRSO(), f, getXsdValidator(), dataLinked);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -47,7 +47,7 @@
}
@Override
- public EMHproject readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ public EMHproject readData(File f, CtuluAnalyze analyzer, Object dataLinked) {
// TODO Auto-generated method stub
return null;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/OPTGFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/OPTGFileFormat.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/OPTGFileFormat.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -47,7 +47,7 @@
}
@Override
- public DonPrtReseau readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ public DonPrtReseau readData(File f, CtuluAnalyze analyzer, Object dataLinked) {
return getReader(analyzer).read(new CrueDaoPersistOPTG(), f, getXsdValidator(), dataLinked);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSectionIdem.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSectionIdem.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSectionIdem.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -7,7 +7,20 @@
*/
public class EMHSectionIdem extends CatEMHSection {
- public EMHSectionIdem(final String nom) {
+ /**
+ * Reference \xE0 la section.
+ */
+ String reference;
+
+ public String getReference() {
+ return reference;
+ }
+
+ public void setReference(String reference) {
+ this.reference = reference;
+ }
+
+public EMHSectionIdem(final String nom) {
super(nom);
// TODO Auto-generated constructor stub
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMH.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMH.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMH.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -1,6 +1,7 @@
package org.fudaa.dodico.crue.metier.emh;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
/**
@@ -12,31 +13,30 @@
public class RelationEMH {
EMH emh;
- List<Object> arguments;
+ HashMap<String,Object> arguments;
- public EMH getEmh() {
+ public EMH getEmh(){
return emh;
}
- public void setEmh(EMH emh) {
+ public void setEmh(EMH emh){
this.emh = emh;
}
- public RelationEMH(EMH emh, Object... objects) {
+ public RelationEMH(EMH emh, HashMap<String,Object> objects){
super();
this.emh = emh;
- arguments = new ArrayList<Object>();
+ arguments = objects;
- for (Object item : objects)
- arguments.add(item);
+
}
- public List<Object> getArguments() {
+ public HashMap<String,Object> getArguments() {
return arguments;
}
- public void setArguments(List<Object> arguments) {
+ public void setArguments(HashMap<String,Object> arguments) {
this.arguments = arguments;
}
Modified: 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/EMHHelper.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -1,6 +1,7 @@
package org.fudaa.dodico.crue.metier.helper;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
@@ -18,8 +19,11 @@
public final static String id_NOEUD_AMONT = "NOEUD_AMONT";
public final static String id_NOEUD_AVAL = "NOEUD_AVAL";
- public final static int Pos_section = 0;
- public final static int Xp_section = 1;
+ public final static String Pos_section = "Pos_section";
+ public final static String Xp_section ="Xp_section";
+ public final static String Coeff_Pond = "Coeff_Pond";
+ public final static String Coeff_Conv = "Coeff_Conv";
+ public final static String Coeff_Div = "Coeff_Div";
/**
* Ajoute une infos (DSCP)
@@ -150,7 +154,7 @@
if (emh.getRelationsAvecEMH() != null) {
for (RelationEMH relation : emh.getRelationsAvecEMH()) {
if (relation != null && relation.getEmh() != null && relation.getEmh() instanceof CatEMHNoeud) {
- if (relation.getArguments() != null && relation.getArguments().contains(id_NOEUD_AMONT)) return (CatEMHNoeud) relation
+ if (relation.getArguments() != null && relation.getArguments().get(id_NOEUD_AMONT)!=null) return (CatEMHNoeud) relation
.getEmh();
}
}
@@ -168,7 +172,7 @@
if (emh.getRelationsAvecEMH() != null) {
for (RelationEMH relation : emh.getRelationsAvecEMH()) {
if (relation != null && relation.getEmh() != null && relation.getEmh() instanceof CatEMHNoeud) {
- if (relation.getArguments() != null && relation.getArguments().contains(id_NOEUD_AVAL)) return (CatEMHNoeud) relation
+ if (relation.getArguments() != null && relation.getArguments().get(id_NOEUD_AVAL)!=null) return (CatEMHNoeud) relation
.getEmh();
}
}
@@ -177,34 +181,123 @@
}
public static void addNoeudAmont(EMH emh, CatEMHNoeud noeud) {
- RelationEMH relation = new RelationEMH(noeud, id_NOEUD_AMONT);
+
+ HashMap<String,Object> map=new HashMap<String, Object>();
+ map.put(id_NOEUD_AMONT, id_NOEUD_AMONT);
+ RelationEMH relation = new RelationEMH(noeud, map);
if (emh.getRelationsAvecEMH() == null) emh.setRelationsAvecEMH(new ArrayList<RelationEMH>());
emh.getRelationsAvecEMH().add(relation);
}
public static void addNoeudAval(EMH emh, CatEMHNoeud noeud) {
- RelationEMH relation = new RelationEMH(noeud, id_NOEUD_AVAL);
+ HashMap<String,Object> map=new HashMap<String, Object>();
+ map.put(id_NOEUD_AVAL, id_NOEUD_AVAL);
+ RelationEMH relation = new RelationEMH(noeud, map);
if (emh.getRelationsAvecEMH() == null) emh.setRelationsAvecEMH(new ArrayList<RelationEMH>());
emh.getRelationsAvecEMH().add(relation);
}
public static void addNoeudCasier(CatEMHCasier emh, CatEMHNoeud noeud) {
- RelationEMH relation = new RelationEMH(noeud);
+ RelationEMH relation = new RelationEMH(noeud,null);
if (emh.getRelationsAvecEMH() == null) emh.setRelationsAvecEMH(new ArrayList<RelationEMH>());
emh.getRelationsAvecEMH().add(relation);
}
- public static Object getPositionSection(RelationEMH relation) {
- if (relation != null && relation.getArguments() != null) return relation.getArguments().get(Pos_section);
+ /**
+ * Reserv\xE9 pour DRSO les sections des branches. Pos
+ * @param relation
+ * @return
+ */
+ public static String getPositionSection(RelationEMH relation) {
+ if (relation != null && relation.getArguments() != null && relation.getArguments().get(Pos_section)!=null && relation.getArguments().get(Pos_section) instanceof String) return (String)relation.getArguments().get(Pos_section);
return null;
}
- public static Object getXpSection(RelationEMH relation) {
- if (relation != null && relation.getArguments() != null && relation.getArguments().get(Xp_section) != null) return relation
- .getArguments().get(Xp_section);
+ /**
+ * Reserv\xE9 pour DRSO les sections des branches. Xp
+ * @param relation
+ * @return
+ */
+ public static Double getXpSection(RelationEMH relation) {
+ if (relation != null && relation.getArguments() != null && relation.getArguments().get(Xp_section) != null)
+ {
+ Object val=relation.getArguments().get(Xp_section);
+ if(val instanceof Integer)
+ return new Double((Integer)val);
+ else
+ if(val instanceof Double)
+ return (Double)val;
+ return null;
+ }
+
return null;
}
+
+ /**
+ * Reserv\xE9 pour DRSO les sections des branches. Pond
+ * @param relation
+ * @return
+ */
+ public static Double getPondSection(RelationEMH relation) {
+ if (relation != null && relation.getArguments() != null && relation.getArguments().get(Coeff_Pond) != null)
+ {
+ Object val=relation.getArguments().get(Coeff_Pond);
+ if(val instanceof Integer)
+ return new Double((Integer)val);
+ else
+ if(val instanceof Double)
+ return (Double)val;
+ return null;
+ }
+
+ return null;
+ }
+
+
+ /**
+ * Reserv\xE9 pour DRSO les sections des branches. Conv
+ * @param relation
+ * @return
+ */
+ public static Double getConvSection(RelationEMH relation) {
+ if (relation != null && relation.getArguments() != null && relation.getArguments().get(Coeff_Conv) != null)
+ {
+ Object val=relation.getArguments().get(Coeff_Conv);
+ if(val instanceof Integer)
+ return new Double((Integer)val);
+ else
+ if(val instanceof Double)
+ return (Double)val;
+ return null;
+ }
+
+ return null;
+ }
+
+
+ /**
+ * Reserv\xE9 pour DRSO les sections des branches. Div
+ * @param relation
+ * @return
+ */
+ public static Double getDivSection(RelationEMH relation) {
+ if (relation != null && relation.getArguments() != null && relation.getArguments().get(Coeff_Div) != null)
+ {
+ Object val=relation.getArguments().get(Coeff_Div);
+ if(val instanceof Integer)
+ return new Double((Integer)val);
+ else
+ if(val instanceof Double)
+ return (Double)val;
+ return null;
+ }
+
+ return null;
+ }
+
+
+
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHSectionHelper.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHSectionHelper.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHSectionHelper.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -7,6 +7,7 @@
import org.fudaa.dodico.crue.metier.emh.CrueData;
import org.fudaa.dodico.crue.metier.emh.EMH;
import org.fudaa.dodico.crue.metier.emh.EMHSectionProfil;
+import org.fudaa.dodico.crue.metier.emh.RelationEMH;
/**
* Helper pour les sections.
@@ -15,44 +16,63 @@
*/
public class EMHSectionHelper {
- /**
- * Recherche le noeud par rapport \xE0 la r\xE9f\xE9rence fournie.
- *
- * @param listeMetier
- * @return
- */
- public static CatEMHSection findByReference(final String reference, final List<? extends EMH> listeSections) {
- for (final EMH emh : listeSections) {
- if (emh instanceof CatEMHSection) {
- final CatEMHSection section = (CatEMHSection) emh;
- if (reference.equals(section.getNom())) { return section; }
- }
- }
- return null;
- }
+ /**
+ * Recherche le noeud par rapport \xE0 la r\xE9f\xE9rence fournie.
+ *
+ * @param listeMetier
+ * @return
+ */
+ public static CatEMHSection findByReference(final String reference, final List<? extends EMH> listeSections) {
+ for (final EMH emh : listeSections) {
+ if (emh instanceof CatEMHSection) {
+ final CatEMHSection section = (CatEMHSection) emh;
+ if (reference.equals(section.getNom())) { return section; }
+ }
+ }
+ return null;
+ }
- public static CatEMHSection findByReference(final String reference, final CrueData dataMetier) {
- return findByReference(reference, dataMetier.getSections());
- }
+/**
+ * Recherche dans les relations l'existance de la section.
+ * @param reference
+ * @param listeRelationsSections
+ * @return
+ */
+ public static CatEMHSection findByReferenceInRelation(final String reference, final List<RelationEMH> listeRelationsSections) {
+ for (final RelationEMH relation : listeRelationsSections) {
+ if(relation!=null && relation.getEmh()!=null && relation.getEmh() instanceof CatEMHSection){
+ EMH emh=relation.getEmh();
+ if (emh instanceof CatEMHSection) {
+ final CatEMHSection section = (CatEMHSection) emh;
+ if (reference.equals(section.getNom())) { return section; }
+ }
+ }
+ }
+ return null;
+ }
- /**
- * Retrouve les sections Profil reference par le profil. Le profil est r\xE9f\xE9renc\xE9 dans le fichier DRSO. Il est ensuite
- * appel\xE9 dans le fichier DPTG.
- *
- * @param referenceProfil
- * @param listeMetier
- * @return
- */
- public static List<EMHSectionProfil> findByProfil(final String referenceProfil, final List<EMH> listeMetier) {
- final List<EMHSectionProfil> listeEmhProfils = new ArrayList<EMHSectionProfil>();
- for (final EMH emh : listeMetier) {
- if (emh instanceof EMHSectionProfil) {
- final EMHSectionProfil section = (EMHSectionProfil) emh;
- if (section.getListeReferencesProfil() != null) for (final String refProf : section.getListeReferencesProfil())
- if (refProf.equals(referenceProfil)) listeEmhProfils.add(section);
- }
- }
- return listeEmhProfils;
- }
+ public static CatEMHSection findByReference(final String reference, final CrueData dataMetier) {
+ return findByReference(reference, dataMetier.getSections());
+ }
+ /**
+ * Retrouve les sections Profil reference par le profil. Le profil est r\xE9f\xE9renc\xE9 dans le fichier DRSO. Il est ensuite
+ * appel\xE9 dans le fichier DPTG.
+ *
+ * @param referenceProfil
+ * @param listeMetier
+ * @return
+ */
+ public static List<EMHSectionProfil> findByProfil(final String referenceProfil, final List<EMH> listeMetier) {
+ final List<EMHSectionProfil> listeEmhProfils = new ArrayList<EMHSectionProfil>();
+ for (final EMH emh : listeMetier) {
+ if (emh instanceof EMHSectionProfil) {
+ final EMHSectionProfil section = (EMHSectionProfil) emh;
+ if (section.getListeReferencesProfil() != null) for (final String refProf : section.getListeReferencesProfil())
+ if (refProf.equals(referenceProfil)) listeEmhProfils.add(section);
+ }
+ }
+ return listeEmhProfils;
+ }
+
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDFRT.xsd
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDFRT.xsd 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDFRT.xsd 2009-04-09 06:29:30 UTC (rev 4623)
@@ -2,23 +2,23 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:complexType name="StriRefZ">
- <xs:choice minOccurs="2" maxOccurs="unbounded">
+ <xs:sequence minOccurs="2" maxOccurs="unbounded">
<xs:element name="PointFF" type="xs:string"/>
- </xs:choice>
+ </xs:sequence>
<xs:attribute name="Nom" type="xs:string"/>
</xs:complexType>
<xs:complexType name="StriRefC">
- <xs:choice minOccurs="2" maxOccurs="unbounded">
+ <xs:sequence minOccurs="2" maxOccurs="unbounded">
<xs:element name="PointFF" type="xs:string"/>
- </xs:choice>
+ </xs:sequence>
<xs:attribute name="Nom" type="xs:string"/>
</xs:complexType>
<xs:complexType name="StriRefH">
- <xs:choice minOccurs="2" maxOccurs="unbounded">
+ <xs:sequence minOccurs="2" maxOccurs="unbounded">
<xs:element name="PointFF" type="xs:string"/>
- </xs:choice>
+ </xs:sequence>
<xs:attribute name="Nom" type="xs:string"/>
</xs:complexType>
@@ -26,13 +26,13 @@
<xs:element name="DFRT" >
<xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element name="VersionCrue" type="xs:string"/>
- <xs:element name="Commentaire" type="xs:string"/>
+ <xs:sequence >
+ <xs:element name="VersionCrue" type="xs:string" minOccurs="0"/>
+ <xs:element name="Commentaire" type="xs:string" minOccurs="0"/>
<xs:element name="StriRefZ" type="StriRefZ"/>
<xs:element name="StriRefC" type="StriRefC"/>
<xs:element name="StriRefH" type="StriRefH"/>
- </xs:choice>
+ </xs:sequence>
</xs:complexType>
</xs:element>
Modified: trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDRSO.xsd
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDRSO.xsd 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDRSO.xsd 2009-04-09 06:29:30 UTC (rev 4623)
@@ -23,6 +23,9 @@
<xs:sequence>
<xs:element name="Pos" type="xs:string"/>
<xs:element name="Xp" type="xs:double"/>
+ <xs:element name="CoefPond" type="xs:double" minOccurs="0"/>
+ <xs:element name="CoefConv" type="xs:double" minOccurs="0"/>
+ <xs:element name="CoefDiv" type="xs:double" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="NomRef" type="xs:string"/>
</xs:complexType>
@@ -114,9 +117,23 @@
<xs:attribute name="Nom" type="xs:string"/>
</xs:complexType>
+
+ <xs:complexType name="SectionIdem">
+ <xs:sequence>
+ <xs:element name="Section" type="SectionDeSectionIdem"/>
+ </xs:sequence>
+ <xs:attribute name="Nom" type="xs:string"/>
+ </xs:complexType>
+
+ <xs:complexType name="SectionDeSectionIdem">
+ <xs:attribute name="NomRef" type="xs:string"/>
+ </xs:complexType>
+
+
+
<xs:complexType name="Sections">
<xs:choice minOccurs="1" maxOccurs="unbounded">
- <xs:element name="SectionIdem" type="Section"/>
+ <xs:element name="SectionIdem" type="SectionIdem"/>
<xs:element name="SectionInterpolee" type="Section"/>
<xs:element name="SectionProfil" type="SectionProfil"/>
<xs:element name="SectionSansGeometrie" type="Section"/>
Modified: 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/RemplissageData.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/RemplissageData.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -1,6 +1,7 @@
package org.fudaa.dodico.crue.dao;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
@@ -45,6 +46,7 @@
import org.fudaa.dodico.crue.metier.emh.StriRefC;
import org.fudaa.dodico.crue.metier.emh.StriRefH;
import org.fudaa.dodico.crue.metier.emh.StriRefZ;
+import org.fudaa.dodico.crue.metier.helper.EMHHelper;
import org.fudaa.dodico.crue.metier.helper.EMHNoeudHelper;
public class RemplissageData {
@@ -209,8 +211,16 @@
dataCalcul.setCoeffRuisQdm(7.77);
branche1.addDSCP(dataCalcul);
List<RelationEMH> listeSections = new ArrayList<RelationEMH>();
- listeSections.add(new RelationEMH(interpol, "POSITION SECTION INTERPOL", 123.4));
- listeSections.add(new RelationEMH(geometrie, "POSITION SECTION GEOMETRIE", 123.4));
+ HashMap<String,Object> map=new HashMap<String, Object>();
+ map.put(EMHHelper.Pos_section, "POSITION SECTION INTERPOL");
+ map.put(EMHHelper.Xp_section, 123.4);
+
+ listeSections.add(new RelationEMH(interpol, map));
+ map=new HashMap<String, Object>();
+ map.put(EMHHelper.Pos_section, "POSITION SECTION GEOMETRIE");
+ map.put(EMHHelper.Xp_section, 123.4);
+
+ listeSections.add(new RelationEMH(geometrie, map));
branche1.setListeSections(listeSections);
// -- Donnees DPTG --//
@@ -243,7 +253,10 @@
branche2.addDSCP(dataCalcul1);
listeSections = new ArrayList<RelationEMH>();
- listeSections.add(new RelationEMH(profil, "POSITION SECTION PROFIL", 212.121));
+ map=new HashMap<String, Object>();
+ map.put(EMHHelper.Pos_section, "POSITION SECTION PROFIL");
+ map.put(EMHHelper.Xp_section, 212.121);
+ listeSections.add(new RelationEMH(profil,map));
branche2.setListeSections(listeSections);
data.add(branche2);
@@ -265,7 +278,10 @@
branche3.addDSCP(dataCalcul2);
listeSections = new ArrayList<RelationEMH>();
- listeSections.add(new RelationEMH(profil, "test", 777));
+ map=new HashMap<String, Object>();
+ map.put(EMHHelper.Pos_section, "Test");
+ map.put(EMHHelper.Xp_section, 777);
+ listeSections.add(new RelationEMH(profil, map));
branche3.setListeSections(listeSections);
data.add(branche3);
@@ -287,7 +303,10 @@
branche4.addDSCP(dataCalcul3);
listeSections = new ArrayList<RelationEMH>();
- listeSections.add(new RelationEMH(profil, "Profil test", 2548));
+ map=new HashMap<String, Object>();
+ map.put(EMHHelper.Pos_section, "Profil Test");
+ map.put(EMHHelper.Xp_section, 458);
+ listeSections.add(new RelationEMH(profil, map));
branche4.setListeSections(listeSections);
data.add(branche4);
@@ -309,7 +328,10 @@
branche5.addDSCP(dataCalcul4);
listeSections = new ArrayList<RelationEMH>();
- listeSections.add(new RelationEMH(profil, "Profil test 3", 457));
+ map=new HashMap<String, Object>();
+ map.put(EMHHelper.Pos_section, "Profil Test 3");
+ map.put(EMHHelper.Xp_section, 457);
+ listeSections.add(new RelationEMH(profil, map));
branche5.setListeSections(listeSections);
data.add(branche5);
@@ -335,7 +357,10 @@
branche6.addDSCP(dataCalcul5);
listeSections = new ArrayList<RelationEMH>();
- listeSections.add(new RelationEMH(profil, "VAR TEST profil", 111));
+ map=new HashMap<String, Object>();
+ map.put(EMHHelper.Pos_section, "VAR TEST profil");
+ map.put(EMHHelper.Xp_section, 111);
+ listeSections.add(new RelationEMH(profil, map));
branche6.setListeSections(listeSections);
data.add(branche6);
@@ -359,7 +384,10 @@
branche7.addDSCP(dataCalcul6);
listeSections = new ArrayList<RelationEMH>();
- listeSections.add(new RelationEMH(profil, "profil section", 12345));
+ map=new HashMap<String, Object>();
+ map.put(EMHHelper.Pos_section, "profil section");
+ map.put(EMHHelper.Xp_section, 12345);
+ listeSections.add(new RelationEMH(profil, map));
branche7.setListeSections(listeSections);
data.add(branche7);
Copied: trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueContrat.java (from rev 4621, trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueInterface.java)
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueContrat.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueContrat.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -0,0 +1,64 @@
+package org.fudaa.dodico.crue.dao;
+
+import java.io.File;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+
+/**
+ * Implementation crue qui centralise les methode importantes.
+ *
+ * @author Adrien Hadoux
+ */
+public interface TestCrueContrat {
+
+
+ /**
+ * test transformation en xml.
+ */
+ public void testToXml();
+
+ /**
+ * Test la validation xsd du fichier
+ *
+ * @param f
+ */
+ public void testXsdValidation();
+
+ /**
+ * Test lecture du fichier.
+ *
+ * @param f
+ */
+ public void testLecture();
+
+
+ /**
+ * Test ecriture du fichier.
+ *
+ * @param f
+ */
+ public void testConverterEMH();
+
+
+
+ /**
+ * R\xE9alise le cycle complet lecture/ecriture
+ */
+ public void testEcriture();
+
+ /**
+ * Execute la partie IHM du test: demande d'emplacement du fichier: dialog. Affiche les r\xE9sultats de l'analyse avec un
+ * arbre tree. .Reserv\xE9
+ */
+ public CtuluAnalyze execute();
+
+ /**
+ * Execute la partie IHM du test. realise une lecture ecriture simultan\xE9e. L'objet CtuluAnalyze retourn\xE9e indique les
+ * erreurs.
+ *
+ * @param fichierLecture
+ * @param fichierEcriture
+ */
+ public CtuluAnalyze testLectureEcriture(File fichierLecture, File fichierEcriture);
+
+}
Property changes on: trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueContrat.java
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: 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/TestCrueDCSPFile.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDCSPFile.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -13,7 +13,7 @@
import com.thoughtworks.xstream.XStream;
-public class TestCrueDCSPFile extends TestCase implements TestCrueInterface {
+public class TestCrueDCSPFile extends TestCase implements TestCrueContrat {
public static boolean makeError = false;
// TODO pourquoi static ?
@@ -27,7 +27,7 @@
public static File fichierExistant = new File(fileLecture);
public static File fichierEcriture = new File(fileEcriture);
- public CtuluAnalyze testLectureEcriture() {
+ public void testEcriture() {
CtuluAnalyze analyzer = new CtuluAnalyze();
// -- lecture --//
@@ -35,10 +35,13 @@
DCSPFileFormat.getInstance().readData(fichierExistant, analyzer, jeuDonneesLue);
AppCrueTest.ecrireErrorMsg(analyzer);
+
+
+
// -- ecriture--//
DCSPFileFormat.getInstance().writeData(jeuDonneesLue.getAllEMH(), fichierEcriture, analyzer);
AppCrueTest.ecrireErrorMsg(analyzer);
- return analyzer;
+
}
public void testAssertEcriture() {
@@ -59,7 +62,7 @@
assertNotNull(jeuDonneesLue);
}
- public void testEcriture() {
+ public void testConverterEMH() {
CtuluAnalyze analyzer = new CtuluAnalyze();
CrueData jeuDonnees = RemplissageData.remplissageDonneeTest();
boolean res = DCSPFileFormat.getInstance().writeData(jeuDonnees.getAllEMH(), fichierEcriture, analyzer);
@@ -117,7 +120,7 @@
}
public CtuluAnalyze execute() {
- // TODO Auto-generated method stub
- return testLectureEcriture();
+ testEcriture();
+ return null;
}
}
Modified: 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/TestCrueDFRTFile.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDFRTFile.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -14,7 +14,7 @@
import com.thoughtworks.xstream.XStream;
-public class TestCrueDFRTFile extends TestCase implements TestCrueInterface {
+public class TestCrueDFRTFile extends TestCase implements TestCrueContrat {
/**
*
@@ -41,8 +41,8 @@
}
public CtuluAnalyze execute() {
- // TODO Auto-generated method stub
- return testLectureEcriture();
+ testEcriture();
+ return null;
}
public void testAssertEcriture() {
@@ -64,7 +64,7 @@
}
- public void testEcriture() {
+ public void testConverterEMH() {
CtuluAnalyze analyse = new CtuluAnalyze();
List<DonFrt> jeuDonnees = RemplissageData.remplissageDonneeTestDFRT();
DFRTFileFormat.getInstance().writeData(jeuDonnees, fichierEcriture, analyse);
@@ -81,7 +81,7 @@
/**
* Methode appel\xE9e JUNIT.
*/
- public CtuluAnalyze testLectureEcriture() {
+ public void testEcriture() {
CtuluAnalyze analyzer = new CtuluAnalyze();
List<DonFrt> jeuDonnees = DFRTFileFormat.getInstance().readData(fichierExistant, analyzer, null);
@@ -91,7 +91,7 @@
boolean res = DFRTFileFormat.getInstance().writeData(jeuDonnees, fichierEcriture, analyzer);
}
- return analyzer;
+
}
public CtuluAnalyze testLectureEcriture(File fichierLecture, File fichierEcriture) {
Modified: 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/TestCrueDPTGFile.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDPTGFile.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -21,7 +21,7 @@
*
* @author Adrien Hadoux
*/
-public class TestCrueDPTGFile extends TestCase implements TestCrueInterface {
+public class TestCrueDPTGFile extends TestCase implements TestCrueContrat {
public static boolean makeError = false;
@@ -60,18 +60,18 @@
public void testAssertLecture() {}
- public void testEcriture() {
+ public void testConverterEMH() {
}
public void testXsdValidation() {}
- public CtuluAnalyze testLectureEcriture() {
- return null;
+ public void testEcriture() {
+
}
public CtuluAnalyze execute() {
- return testLectureEcriture();
+ return null;
}
public CtuluAnalyze testLectureEcriture(...
[truncated message content] |
|
From: <de...@us...> - 2009-04-11 00:01:00
|
Revision: 4631
http://fudaa.svn.sourceforge.net/fudaa/?rev=4631&view=rev
Author: deniger
Date: 2009-04-11 00:00:43 +0000 (Sat, 11 Apr 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/.project
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDLHYFile.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Etude.etu.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dcsp.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dfrt.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dlhy.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dptg.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dpti.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.drso.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.ocal.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.optg.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.opti.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.ores.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.dcsp.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.drso.xml
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/MainTest.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/.settings/
trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.core.resources.prefs
trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.jdt.core.prefs
trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.jdt.ui.prefs
trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.jst.jsp.core.prefs
trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.wst.html.core.prefs
trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.wst.validation.prefs
trunk/soft/fudaa-crue/dodico/src/main/config/eclipse-crue-catalog.xml
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/dclm-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/dcsp-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/dfrt-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/dlhy-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/dptg-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/dpti-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/drso-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/etu-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/ocal-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/optg-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/opti-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/ores-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/pcal-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/pnum-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dclm.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.pcal.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.pnum.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.dptg.xml
trunk/soft/fudaa-crue/fudaa/.settings/
trunk/soft/fudaa-crue/fudaa/.settings/org.eclipse.core.resources.prefs
trunk/soft/fudaa-crue/fudaa/.settings/org.eclipse.jdt.core.prefs
trunk/soft/fudaa-crue/fudaa/.settings/org.eclipse.jdt.ui.prefs
trunk/soft/fudaa-crue/src/main/config/crue-catalog.xml
trunk/soft/fudaa-crue/src/main/config/eclipse-bookmarks.xml
trunk/soft/fudaa-crue/src/main/config/eclipse-codeTemplates.xml
trunk/soft/fudaa-crue/src/site/
trunk/soft/fudaa-crue/src/site/resources/
trunk/soft/fudaa-crue/src/site/resources/Installer_Fudaa-Crue-eclipse.odt
Removed Paths:
-------------
trunk/soft/fudaa-crue/Installer_Fudaa-Crue-eclipse.odt
trunk/soft/fudaa-crue/bookmarks.xml
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDCSP.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDFRT.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDLHY.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDPTG.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDPTI.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDRSO.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideETU.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideOPTG.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideTest.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/valideDCSP.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/valideDFRT.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/valideDLHY.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/valideDPTG.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/valideDPTI.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/valideDRSO.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/valideETU.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/valideOPTG.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/valideTest.xsd
Deleted: trunk/soft/fudaa-crue/Installer_Fudaa-Crue-eclipse.odt
===================================================================
(Binary files differ)
Deleted: trunk/soft/fudaa-crue/bookmarks.xml
===================================================================
--- trunk/soft/fudaa-crue/bookmarks.xml 2009-04-10 16:14:08 UTC (rev 4630)
+++ trunk/soft/fudaa-crue/bookmarks.xml 2009-04-11 00:00:43 UTC (rev 4631)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bookmarks>
- <site url="http://downloads.open.collab.net/eclipse/update-site/e3.4" selected="true" name="http://downloads.open.collab.net/eclipse/update-site/e3.4"/>
- <site url="http://eclipse.jcraft.com/" selected="true" name="http://eclipse.jcraft.com/"/>
- <site url="http://eclipse.svnkit.com/1.2.x/" selected="true" name="http://eclipse.svnkit.com/1.2.x/"/>
- <site url="http://findbugs.cs.umd.edu/eclipse" selected="true" name="http://findbugs.cs.umd.edu/eclipse"/>
- <site url="http://mylyn-mantis.sourceforge.net/eclipse/update" selected="true" name=""/>
- <site url="http://openextern.googlecode.com/svn/trunk/openextern_update/" selected="true" name="http://openextern.googlecode.com/svn/trunk/openextern_update/"/>
- <site url="http://pmd.sourceforge.net/eclipse" selected="true" name="http://pmd.sourceforge.net/eclipse"/>
- <site url="http://subclipse.tigris.org/update_1.4.x" selected="true" name="http://subclipse.tigris.org/update_1.4.x"/>
-</bookmarks>
Modified: trunk/soft/fudaa-crue/dodico/.project
===================================================================
--- trunk/soft/fudaa-crue/dodico/.project 2009-04-10 16:14:08 UTC (rev 4630)
+++ trunk/soft/fudaa-crue/dodico/.project 2009-04-11 00:00:43 UTC (rev 4631)
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
Added: trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.core.resources.prefs (rev 0)
+++ trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.core.resources.prefs 2009-04-11 00:00:43 UTC (rev 4631)
@@ -0,0 +1,3 @@
+#Sat Apr 11 00:21:39 CEST 2009
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
Added: trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.jdt.core.prefs 2009-04-11 00:00:43 UTC (rev 4631)
@@ -0,0 +1,342 @@
+#Sat Apr 11 00:17:58 CEST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=HIGH,NORMAL,NORMAL,HIGH
+org.eclipse.jdt.core.compiler.taskTags=FIXME,TODO,XXX,HELP
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=2
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=true
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=true
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=2
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
Added: trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.jdt.ui.prefs (rev 0)
+++ trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.jdt.ui.prefs 2009-04-11 00:00:43 UTC (rev 4631)
@@ -0,0 +1,108 @@
+#Sat Apr 11 00:20:15 CEST 2009
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=true
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_blocks=false
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup_profile=_fudaa
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_Fudaa
+formatter_settings_version=11
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
Added: trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.jst.jsp.core.prefs
===================================================================
--- trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.jst.jsp.core.prefs (rev 0)
+++ trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.jst.jsp.core.prefs 2009-04-11 00:00:43 UTC (rev 4631)
@@ -0,0 +1,28 @@
+#Sat Apr 11 00:13:40 CEST 2009
+eclipse.preferences.version=1
+validateFragments=true
+validation.actions-missing-required-attribute=1
+validation.actions-non-empty-inline-tag=2
+validation.actions-unknown-attribute=2
+validation.directive-include-fragment-file-not-found=1
+validation.directive-include-fragment-file-not-specified=1
+validation.directive-taglib-duplicate-prefixes-different-uris=1
+validation.directive-taglib-duplicate-prefixes-same-uris=-1
+validation.directive-taglib-missing-prefix=1
+validation.directive-taglib-missing-uri-or-tagdir=1
+validation.directive-taglib-unresolvable-uri-or-tagdir=1
+validation.el-general-syntax=1
+validation.el-lexical-failure=-1
+validation.java-=-1
+validation.java-local-variable-is-never-used=-1
+validation.java-null-local-variable-reference=-1
+validation.java-potential-null-local-variable-reference=-1
+validation.java-unused-import=-1
+validation.translation-tag-class-not-found=2
+validation.translation-tei-class-not-found=2
+validation.translation-tei-class-not-instantiated=2
+validation.translation-tei-class-runtime-exception=2
+validation.translation-tei-message=1
+validation.translation-usebean-ambiguous-type-info=2
+validation.translation-usebean-invalid-id=1
+validation.translation-usebean-missing-type-info=1
Added: trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.wst.html.core.prefs
===================================================================
--- trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.wst.html.core.prefs (rev 0)
+++ trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.wst.html.core.prefs 2009-04-11 00:00:43 UTC (rev 4631)
@@ -0,0 +1,36 @@
+#Fri Apr 10 22:26:50 CEST 2009
+attrDuplicate=2
+attrInvalidName=2
+attrInvalidValue=2
+attrNameMismatch=2
+attrUndefName=2
+attrUndefValue=2
+attrValueMismatch=1
+attrValueUnclosed=2
+cdataInvalidContent=2
+cdataUnclosed=1
+commentInvalidContent=2
+commentUnclosed=1
+docDoctypeUnclosed=1
+docDuplicateTag=1
+docInvalidChar=2
+docInvalidContent=2
+eclipse.preferences.version=1
+elemCoexistence=2
+elemDuplicate=2
+elemEndInvalidCase=1
+elemInvalidContent=2
+elemInvalidDirective=1
+elemInvalidEmptyTag=2
+elemInvalidName=1
+elemMissingEnd=2
+elemMissingStart=1
+elemStartInvalidCase=2
+elemUnclosedEndTag=1
+elemUnclosedStartTag=1
+elemUnknownName=2
+elemUnnecessaryEnd=2
+piInvalidContent=2
+piUnclosed=1
+piUndefined=2
+refInvalidContent=2
Added: trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.wst.validation.prefs
===================================================================
--- trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.wst.validation.prefs (rev 0)
+++ trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.wst.validation.prefs 2009-04-11 00:00:43 UTC (rev 4631)
@@ -0,0 +1,16 @@
+#Fri Apr 10 22:26:24 CEST 2009
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.2.v200809050219
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.jst.jsf.ui.JSFAppConfigValidator/global=TF01
+vals/org.eclipse.jst.jsf.ui.JSFNonELAttributeValueValidator/global=TF01
+vals/org.eclipse.jst.jsp.core.JSPBatchValidator/global=TF01
+vals/org.eclipse.jst.jsp.core.JSPContentValidator/global=TF01
+vals/org.eclipse.wst.dtd.core.dtdDTDValidator/global=TF01
+vals/org.eclipse.wst.html.ui.HTMLValidator/global=TF01
+vals/org.eclipse.wst.wsdl.validation.wsdl/global=TF02158org.eclipse.wst.wsdl.validation.internal.eclipse.Validator
+vf.version=3
Added: trunk/soft/fudaa-crue/dodico/src/main/config/eclipse-crue-catalog.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/config/eclipse-crue-catalog.xml (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/config/eclipse-crue-catalog.xml 2009-04-11 00:00:43 UTC (rev 4631)
@@ -0,0 +1,50 @@
+<!DOCTYPE catalog
+ PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
+ prefer="public">
+ <uri name="http://www.fudaa.fr/xsd/crue/dclm-1.0.xsd"
+ uri="platform:/resource/dodico-crue/src/main/resources/xsd/dclm-1.0.xsd" />
+
+ <uri name="http://www.fudaa.fr/xsd/crue/dcsp-1.0.xsd"
+ uri="platform:/resource/dodico-crue/src/main/resources/xsd/dcsp-1.0.xsd" />
+
+ <uri name="http://www.fudaa.fr/xsd/crue/dfrt-1.0.xsd"
+ uri="platform:/resource/dodico-crue/src/main/resources/xsd/dfrt-1.0.xsd" />
+
+ <uri name="http://www.fudaa.fr/xsd/crue/dlhy-1.0.xsd"
+ uri="platform:/resource/dodico-crue/src/main/resources/xsd/dlhy-1.0.xsd" />
+
+ <uri name="http://www.fudaa.fr/xsd/crue/dptg-1.0.xsd"
+ uri="platform:/resource/dodico-crue/src/main/resources/xsd/dptg-1.0.xsd" />
+
+ <uri name="http://www.fudaa.fr/xsd/crue/dpti-1.0.xsd"
+ uri="platform:/resource/dodico-crue/src/main/resources/xsd/dpti-1.0.xsd" />
+
+ <uri name="http://www.fudaa.fr/xsd/crue/drso-1.0.xsd"
+ uri="platform:/resource/dodico-crue/src/main/resources/xsd/drso-1.0.xsd" />
+
+ <uri name="http://www.fudaa.fr/xsd/crue/etu-1.0.xsd"
+ uri="platform:/resource/dodico-crue/src/main/resources/xsd/etu-1.0.xsd" />
+
+ <uri name="http://www.fudaa.fr/xsd/crue/ocal-1.0.xsd"
+ uri="platform:/resource/dodico-crue/src/main/resources/xsd/ocal-1.0.xsd" />
+
+ <uri name="http://www.fudaa.fr/xsd/crue/optg-1.0.xsd"
+ uri="platform:/resource/dodico-crue/src/main/resources/xsd/optg-1.0.xsd" />
+
+ <uri name="http://www.fudaa.fr/xsd/crue/opti-1.0.xsd"
+ uri="platform:/resource/dodico-crue/src/main/resources/xsd/opti-1.0.xsd" />
+
+ <uri name="http://www.fudaa.fr/xsd/crue/ores-1.0.xsd"
+ uri="platform:/resource/dodico-crue/src/main/resources/xsd/ores-1.0.xsd" />
+
+ <uri name="http://www.fudaa.fr/xsd/crue/pcal-1.0.xsd"
+ uri="platform:/resource/dodico-crue/src/main/resources/xsd/pcal-1.0.xsd" />
+
+ <uri name="http://www.fudaa.fr/xsd/crue/pnum-1.0.xsd"
+ uri="platform:/resource/dodico-crue/src/main/resources/xsd/pnum-1.0.xsd" />
+
+
+
+</catalog>
Deleted: trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDCSP.xsd
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDCSP.xsd 2009-04-10 16:14:08 UTC (rev 4630)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDCSP.xsd 2009-04-11 00:00:43 UTC (rev 4631)
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-
-
-
- <xs:complexType name="BrancheClassique">
- <xs:sequence>
- <xs:element name="CoefBeta" type="xs:double"/>
- <xs:element name="CoefRuisQdm" type="xs:double"/>
- <xs:element name="CoefRuis" type="xs:double"/>
-
- </xs:sequence>
- <xs:attribute name="NomRef" type="xs:string"/>
- </xs:complexType>
-
- <xs:complexType name="BranchePDC">
- <xs:sequence>
- <xs:element name="Loi" type="xs:string"/>
- </xs:sequence>
- <xs:attribute name="NomRef" type="xs:string"/>
- </xs:complexType>
-
- <xs:complexType name="BrancheOrifice">
- <xs:sequence>
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="FormulePdc" type="xs:string"/>
- </xs:choice>
- <xs:choice minOccurs="1" maxOccurs="unbounded">
- <xs:element name="ElemOrifice" type="ElemOrifice"/>
- </xs:choice>
- </xs:sequence>
- <xs:attribute name="NomRef" type="xs:string"/>
- </xs:complexType>
-
-
- <xs:complexType name="BrancheSeuil">
- <xs:sequence>
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="FormulePdc" type="xs:string"/>
- </xs:choice>
- <xs:choice minOccurs="1" maxOccurs="unbounded">
- <xs:element name="ElemSeuilPdc" type="ElemSeuilPDC"/>
- </xs:choice>
- </xs:sequence>
- <xs:attribute name="NomRef" type="xs:string"/>
- </xs:complexType>
-
- <xs:complexType name="BrancheBarrageFilEau">
- <xs:sequence>
- <xs:element name="Loi" type="xs:string"/>
- <xs:element name="QLimInf" type="xs:double"/>
- <xs:element name="QLimSup" type="xs:double"/>
-
- <xs:choice minOccurs="1" maxOccurs="unbounded">
- <xs:element name="ElemSeuil" type="ElemSeuil"/>
- </xs:choice>
- </xs:sequence>
- <xs:attribute name="NomRef" type="xs:string"/>
- </xs:complexType>
-
-
- <xs:complexType name="Branches">
- <xs:choice minOccurs="1" maxOccurs="unbounded">
- <xs:element name="BrancheSaintVenant" type="BrancheClassique"/>
- <xs:element name="BrancheSeuilTransversal" type="BrancheSeuil"/>
- <xs:element name="BrancheSeuilLateral" type="BrancheSeuil"/>
- <!--<xs:element name="BrancheStrickler" type="BrancheClassique"/>-->
- <xs:element name="BrancheOrifice" type="BrancheOrifice"/>
- <xs:element name="BrancheBarrageFilEau" type="BrancheBarrageFilEau"/>
- <xs:element name="BranchePdc" type="BranchePDC"/>
- <xs:element name="BrancheBarrageGenerique" type="BrancheBarrageFilEau"/>
- <!--<xs:element name="BrancheBarrageRhone" type="BrancheClassique"/>-->
- <!--<xs:element name="BrancheEnchainement" type="BrancheClassique"/>-->
- <!--<xs:element name="BrancheNiveauxAssocies" type="BrancheClassique"/>-->
-
- </xs:choice>
- </xs:complexType>
-
-
- <!-- ELEMENT ORIFICE -->
- <xs:complexType name="ElemOrifice">
- <xs:sequence>
- <xs:element name="CoefCtrLim" type="xs:double"/>
- <xs:element name="Larg" type="xs:double"/>
- <xs:element name="Zseuil" type="xs:double"/>
- <xs:element name="Haut" type="xs:double"/>
- <xs:element name="CoefD" type="xs:double"/>
- <xs:element name="Sens" type="xs:string"/>
- </xs:sequence>
-
- </xs:complexType>
-
- <!-- ELEMENT SEUILS -->
- <xs:complexType name="ElemSeuilPDC">
- <xs:sequence>
- <xs:element name="Larg" type="xs:double"/>
- <xs:element name="Zseuil" type="xs:double"/>
- <xs:element name="CoefD" type="xs:double"/>
- <xs:element name="CoefPdc" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="ElemSeuil">
- <xs:sequence>
- <xs:element name="Larg" type="xs:double"/>
- <xs:element name="Zseuil" type="xs:double"/>
- <xs:element name="CoefD" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-
-
- <!-- section -->
- <xs:complexType name="Section">
- <xs:sequence>
- <xs:element name="CoefPond" type="xs:double"/>
- <xs:element name="CoefConv" type="xs:double"/>
- <xs:element name="CoefDiv" type="xs:double"/>
- </xs:sequence>
- <xs:attribute name="NomRef" type="xs:string"/>
- </xs:complexType>
-
- <xs:complexType name="Sections">
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element name="SectionIdem" type="Section"/>
- <xs:element name="SectionInterpolee" type="Section"/>
- <xs:element name="SectionProfil" type="Section"/>
- <xs:element name="SectionSansGeometrie" type="Section"/>
- <xs:element name="SectionPilote" type="Section"/>
- </xs:choice>
- </xs:complexType>
-
-
- <xs:element name="DCSP" >
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element name="VersionCrue" type="xs:string"/>
- <xs:element name="Commentaire" type="xs:string"/>
- <xs:element name="Sections" type="Sections"/>
- <xs:element name="Branches" type="Branches"/>
- </xs:choice>
- </xs:complexType>
- </xs:element>
-
-
- </xs:schema>
Deleted: trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDFRT.xsd
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDFRT.xsd 2009-04-10 16:14:08 UTC (rev 4630)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDFRT.xsd 2009-04-11 00:00:43 UTC (rev 4631)
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:complexType name="StriRefZ">
- <xs:sequence minOccurs="2" maxOccurs="unbounded">
- <xs:element name="PointFF" type="xs:string"/>
- </xs:sequence>
- <xs:attribute name="Nom" type="xs:string"/>
- </xs:complexType>
-
- <xs:complexType name="StriRefC">
- <xs:sequence minOccurs="2" maxOccurs="unbounded">
- <xs:element name="PointFF" type="xs:string"/>
- </xs:sequence>
- <xs:attribute name="Nom" type="xs:string"/>
- </xs:complexType>
-
- <xs:complexType name="StriRefH">
- <xs:sequence minOccurs="2" maxOccurs="unbounded">
- <xs:element name="PointFF" type="xs:string"/>
- </xs:sequence>
- <xs:attribute name="Nom" type="xs:string"/>
- </xs:complexType>
-
-
-
- <xs:element name="DFRT" >
- <xs:complexType>
- <xs:sequence >
- <xs:element name="VersionCrue" type="xs:string" minOccurs="0"/>
- <xs:element name="Commentaire" type="xs:string" minOccurs="0"/>
- <xs:element name="StriRefZ" type="StriRefZ"/>
- <xs:element name="StriRefC" type="StriRefC"/>
- <xs:element name="StriRefH" type="StriRefH"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
-
- </xs:schema>
Deleted: trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDLHY.xsd
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDLHY.xsd 2009-04-10 16:14:08 UTC (rev 4630)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDLHY.xsd 2009-04-11 00:00:43 UTC (rev 4631)
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-<!-- Gestion des HYDROGRAMMES -->
-
- <xs:complexType name="SerieDF">
- <xs:choice minOccurs="1" maxOccurs="unbounded">
- <xs:element name="PointDF" type="xs:string"/>
- </xs:choice>
- </xs:complexType>
-
- <xs:complexType name="LoiDF">
- <xs:sequence>
- <xs:element name="Description" type="xs:string"/>
- <xs:element name="VarAbscisse" type="xs:string"/>
- <xs:element name="VarOrdonnee" type="xs:string"/>
- <xs:element name="SerieChronologique" type="SerieDF"/>
- </xs:sequence>
- <xs:attribute name="Nom" type="xs:string"/>
- </xs:complexType>
-
- <xs:complexType name="Hydrogrammes">
- <xs:choice minOccurs="1" maxOccurs="unbounded">
- <xs:element name="Hydrogramme" type="LoiDF"/>
- </xs:choice>
- </xs:complexType>
-
-
- <!-- Gestion des LIMNIGRAMMES -->
-
- <xs:complexType name="Limnigrammes">
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element name="Limnigramme" type="LoiDF"/>
- </xs:choice>
- </xs:complexType>
-
-
- <!-- Gestion des MANOEUVRES -->
-
- <xs:complexType name="Manoeuvres">
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element name="VannePasseDessus" type="LoiDF"/>
- <xs:element name="VannePasseDessous" type="LoiDF"/>
- </xs:choice>
- </xs:complexType>
-
-
- <!-- Gestion des TARRAGES -->
-
- <xs:complexType name="Serie">
- <xs:choice minOccurs="1" maxOccurs="unbounded">
- <xs:element name="PointFF" type="xs:string"/>
- </xs:choice>
- </xs:complexType>
-
- <xs:complexType name="LoiFF">
- <xs:sequence>
- <xs:element name="Description" type="xs:string"/>
- <xs:element name="VarAbscisse" type="xs:string"/>
- <xs:element name="VarOrdonnee" type="xs:string"/>
- <xs:element name="Serie" type="Serie"/>
- </xs:sequence>
- <xs:attribute name="Nom" type="xs:string"/>
- </xs:complexType>
-
- <xs:complexType name="Tarrages">
- <xs:choice minOccurs="1" maxOccurs="unbounded">
- <xs:element name="Tarrage" type="LoiFF"/>
- </xs:choice>
- </xs:complexType>
-
-
- <!-- Gestion du DLHY -->
-
- <xs:element name="DLHY" >
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element name="VersionCrue" type="xs:string"/>
- <xs:element name="Commentaire" type="xs:string"/>
- <xs:element name="Hydrogrammes" type="Hydrogrammes"/>
- <xs:element name="Limnigrammes" type="Limnigrammes"/>
- <xs:element name="Manoeuvres" type="Manoeuvres"/>
- <xs:element name="Tarrages" type="Tarrages"/>
- </xs:choice>
- </xs:complexType>
- </xs:element>
-
-
- </xs:schema>
-
\ No newline at end of file
Deleted: trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDPTG.xsd
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDPTG.xsd 2009-04-10 16:14:08 UTC (rev 4630)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDPTG.xsd 2009-04-11 00:00:43 UTC (rev 4631)
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-
- <!-- PROFILS SECTIONS -->
- <xs:complexType name="Serie">
- <xs:choice minOccurs="1" maxOccurs="unbounded">
- <xs:element name="PointFF" type="xs:string"/>
- </xs:choice>
- <xs:attribute name="Nom" type="xs:string"/>
- </xs:complexType>
-
-
- <xs:complexType name="Frottement">
- <xs:attribute...
[truncated message content] |
|
From: <de...@us...> - 2009-04-15 03:10:54
|
Revision: 4640
http://fudaa.svn.sourceforge.net/fudaa/?rev=4640&view=rev
Author: deniger
Date: 2009-04-15 03:10:37 +0000 (Wed, 15 Apr 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/common-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/dclm-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/dcsp-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/dfrt-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/dlhy-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/dptg-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/dpti-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/drso-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/etu-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/ocal-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/optg-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/opti-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/ores-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/pcal-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/pnum-1.0.xsd
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/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/TestCrueOPTGFile.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.ores.xml
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueApplicationManager.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueExplorer.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueProjet.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/AppCrueTest.java
Added 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/CrueConverterOPTG.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/CrueDaoOPTG.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/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/CrueDaoStructureOPTG.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/io/
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue09reader.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/Crue9writer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CrueFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CrueFileFormatManager.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/fileformat/
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/TestCrueETUFile.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterCommon.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDLHY.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterETU.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoParsing.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDCLM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDLHY.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistETU.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistOPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersit.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDCLM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDLHY.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatETU.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue09reader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10writer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue9writer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormatManager.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DCSPFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DFRTFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DLHYFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTGFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTIFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DRSOFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/OPTGFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/fileformat/CrueFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/fileformat/CrueFileFormatManager.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/fileformat/DCSPFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/fileformat/DFRTFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/fileformat/DLHYFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/fileformat/DPTGFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/fileformat/DPTIFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/fileformat/DRSOFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/fileformat/EtuFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/fileformat/OPTGFileFormat.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueETU.java
Copied: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/AbstractCrueDao.java (from rev 4638, trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersit.java)
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/AbstractCrueDao.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/AbstractCrueDao.java 2009-04-15 03:10:37 UTC (rev 4640)
@@ -0,0 +1,32 @@
+package org.fudaa.dodico.crue.dao;
+
+
+/**
+ * classe dao persist qui représente la structure xml à persister.
+ *
+ * @author Adrien Hadoux
+ */
+public abstract class AbstractCrueDao {
+
+ // /**
+ // * Initiazlise le parser xstream avec les bons alias des noms de balises.
+ // *
+ // * @return
+ // */
+ // abstract XStream initXmlParser();
+
+ /**
+ * 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 data
+ */
+ // public abstract void fillFromMetier(T data, 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.
+ *
+ * @return
+ */
+ // abstract T convertToMetier(CtuluAnalyze analyser, Object dataLinked);
+}
Added: 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 (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverter.java 2009-04-15 03:10:37 UTC (rev 4640)
@@ -0,0 +1,37 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.dao;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+
+/**
+ * @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, 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
+ */
+ M convertDaoToMetier(D dao, Object 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(M metier, CtuluAnalyze analyser);
+
+}
Added: 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 (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDCLM.java 2009-04-15 03:10:37 UTC (rev 4640)
@@ -0,0 +1,23 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.dao;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.metier.emh.DonCLimMScenario;
+
+/**
+ * @author deniger
+ */
+public class CrueConverterDCLM implements CrueConverter<CrueDaoDCLM, DonCLimMScenario> {
+
+ public DonCLimMScenario convertDaoToMetier(CrueDaoDCLM dao, Object dataLinked, CtuluAnalyze analyser) {
+ return null;
+ }
+
+ public CrueDaoDCLM convertMetierToDao(DonCLimMScenario metier, CtuluAnalyze analyser) {
+ return null;
+ }
+
+}
Copied: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDCSP.java (from rev 4638, trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDCSP.java)
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDCSP.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDCSP.java 2009-04-15 03:10:37 UTC (rev 4640)
@@ -0,0 +1,927 @@
+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.CrueDaoStructureDCSP.BrancheAbstract;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.BrancheBarrageFilEau;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.BrancheBarrageFilEauAbstract;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.BrancheBarrageGenerique;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.BrancheBarrageGeneriqueAbstract;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.BrancheBarrageRhone;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.BrancheClassiqueAbstract;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.BrancheNiveauxAssocies;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.BrancheOrifice;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.BranchePDCAbstract;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.BranchePdc;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.BrancheSaintVenant;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.BrancheSeuilAbstract;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.BrancheSeuilLateral;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.BrancheSeuilOrificeAbstract;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.BrancheSeuilTransversal;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.ElemAvecSeuilPdc;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.ElemSeuil;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.ElemSeuilOrifice;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.Loi;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.Pdc;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.RegimeDenoye;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.RegimeNoye;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.SectionBrancheAbstract;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.SectionIdem;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.SectionInterpolee;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.SectionProfil;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.SectionSansGeometrie;
+import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
+import org.fudaa.dodico.crue.metier.emh.CatEMHSection;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrt;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheBarrageFilEau;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheBarrageGenerique;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheOrifice;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBranchePDC;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSeuilLateral;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtSection;
+import org.fudaa.dodico.crue.metier.emh.EMH;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageFilEau;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageGenerique;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageRhone;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheNiveauxAssocies;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheOrifice;
+import org.fudaa.dodico.crue.metier.emh.EMHBranchePdc;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilLongitudinale;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionIdem;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionInterpolee;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionProfil;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionSansGeometrie;
+import org.fudaa.dodico.crue.metier.emh.ElemSeuilAvecPdc;
+import org.fudaa.dodico.crue.metier.emh.EvolutionFF;
+import org.fudaa.dodico.crue.metier.emh.LoiFF;
+import org.fudaa.dodico.crue.metier.emh.PtEvolutionFF;
+import org.fudaa.dodico.crue.metier.emh.VariableOrdonnee;
+import org.fudaa.dodico.crue.metier.helper.EMHBrancheHelper;
+import org.fudaa.dodico.crue.metier.helper.EMHSectionHelper;
+
+/**
+ * Factory qui se charge de remplir les structures DAO du ficheir DCSP avec les donn�es m�tier et inversement.
+ *
+ * @author Adrien Hadoux
+ */
+public class CrueConverterDCSP implements CrueConverter<CrueDaoDCSP, List<EMH>> {
+
+ public static int cptEntries = 1;
+
+ public List<EMH> convertDaoToMetier(CrueDaoDCSP dao, Object dataLinked, CtuluAnalyze analyser) {
+ if (dataLinked == null || !(dataLinked instanceof List)) {
+ analyser
+ .addFatalError(CrueResource
+ .getS("Impossible de récupérer les donn�es résaux (DRSO). Les références du fichier DSCP ne pourront etre utilisées."));
+ return null;
+ }
+ final List<EMH> listeEMHDRSO = (List<EMH>) dataLinked;
+
+ // -- remplissage des branches --//
+ // CrueDaoFactoryDCSP.remplirBrancheAvecPersistanceDSCP(Branches, listeEMHDRSO,listeMessageError);
+ CrueConverterDCSP.toMetier(dao, listeEMHDRSO, analyser);
+ return listeEMHDRSO;
+ }
+
+ public CrueDaoDCSP convertMetierToDao(List<EMH> metier, CtuluAnalyze analyser) {
+ CrueDaoDCSP res = new CrueDaoDCSP();
+ CrueConverterDCSP.toDAO(res, metier, analyser);
+ return res;
+ }
+
+ /**
+ * Remplit completement la structure persistante a partir des objets DSCP. Optimise le remplissage en listante les
+ * donnees emh une seule fois et en forwardant les objets aux bons endroits
+ *
+ * @param persistance
+ * @param data
+ * @param listeMessageError
+ */
+ public static void toDAO(final CrueDaoDCSP persistance, final List<EMH> data, final CtuluAnalyze analyser) {
+
+ persistance.Sections = new ArrayList<SectionBrancheAbstract>();
+ persistance.Branches = new ArrayList<BrancheAbstract>();
+
+ // CrueDaoFactoryDCSP.remplirPersistanceAvecBrancheDSCP(persistance.Branches,data,listeMessageError);
+
+ if (data == null || data.size() == 0) {
+ analyser.addError(CrueHelper.emhEmpty(CrueHelper.DCSP), cptEntries++);
+ } else {
+ for (final EMH emh : data) {
+ if (emh instanceof CatEMHBranche) {
+ // -- remplissage des sections de branches --//
+ final CatEMHBranche branche = (CatEMHBranche) emh;
+
+ final List<DonCalcSansPrt> listeDoncalc = branche.getDSCP();
+ if (listeDoncalc != null) {
+ for (final DonCalcSansPrt dataCalc : listeDoncalc) {
+ if (dataCalc != null) {
+ CrueConverterDCSP.remplirPersistanceAvecBrancheDSCP(persistance.Branches, branche, dataCalc, analyser);
+ } else {
+ analyser.addError(CrueHelper.unknowdataFromFile("Branches", CrueHelper.DCSP, branche.getNom()),
+ cptEntries++);
+ }
+ }
+ }
+
+ } else if (emh instanceof CatEMHSection) {
+ final CatEMHSection section = (CatEMHSection) emh;
+ final List<DonCalcSansPrt> listeDoncalc = section.getDSCP();
+ if (listeDoncalc != null) {
+ for (final DonCalcSansPrt dataCalc : listeDoncalc) {
+ if (dataCalc != null && dataCalc instanceof DonCalcSansPrtSection) {
+ // -- remplissage des sections --//
+ remplirPersistanceAvecSectionsBrancheDSCP(persistance.Sections, section,
+ (DonCalcSansPrtSection) dataCalc, analyser);
+
+ } else {
+ analyser.addError(CrueHelper.unknowdataFromFile("Section", CrueHelper.DCSP, section.getNom()),
+ cptEntries++);
+ }
+
+ }
+ }
+
+ }
+
+ }
+ }
+
+ }
+
+ /**
+ * Remplit completement la structure metier a partir des objets persistants DSCP. Optimise le remplissage en listante
+ * les données emh une seule fois et en forwardant les objets aux bons endroits
+ *
+ * @param persistance
+ * @param data
+ * @param analyser
+ */
+ public static void toMetier(final CrueDaoDCSP persistance, final List<EMH> data, final CtuluAnalyze analyser) {
+
+ // -- remplissage des branches --//
+ CrueConverterDCSP.remplirBrancheAvecPersistanceDSCP(persistance.Branches, data, analyser);
+
+ // -- remplissage des sections --//
+ CrueConverterDCSP.remplirSectionsAvecPersistanceDSCP(persistance.Sections, data, analyser);
+
+ }
+
+ /**
+ * Methode qui remplit une arrayList d'objets persistants qui constituent le fichier fichier DSCP: les Branches.
+ *
+ * @param data
+ * @return
+ */
+ public static void remplirPersistanceAvecBrancheDSCP(final List<BrancheAbstract> listePersistante,
+ final CatEMHBranche branche, final DonCalcSansPrt dataCalc, final CtuluAnalyze analyser) {
+ final String suffixe = CrueDaoDRSO.SUFFIXE_REF_DRSO;
+ BrancheAbstract branchePersist = null;
+ if (branche instanceof EMHBrancheBarrageFilEau) {
+ final EMHBrancheBarrageFilEau new_name = (EMHBrancheBarrageFilEau) branche;
+ branchePersist = new BrancheBarrageFilEau();
+
+ if (dataCalc instanceof DonCalcSansPrtBrancheBarrageFilEau) {
+ final BrancheBarrageFilEau br = (BrancheBarrageFilEau) branchePersist;
+
+ // -- recuperation de la Loi Regime denoye --//
+ if (((DonCalcSansPrtBrancheBarrageFilEau) dataCalc).getRegimeDenoye() != null) {
+
+ // - remplissage de la loi RegimeDenoye--//
+ LoiFF loi = ((DonCalcSansPrtBrancheBarrageFilEau) dataCalc).getRegimeDenoye();
+ br.RegimeDenoye = new RegimeDenoye();
+ br.RegimeDenoye.VarAbscisse = loi.getMVariableAbscisse().getType();
+ br.RegimeDenoye.VarOrdonnee = loi.getMVariableOrdonnee().getType();
+ br.RegimeDenoye.Serie = new ArrayList<StringBuffer>();
+ if (loi.getMEvolution() != null && loi.getMEvolution().getMpoints() != null) {
+ for (PtEvolutionFF evol : loi.getMEvolution().getMpoints()) {
+ br.RegimeDenoye.Serie.add(new StringBuffer("" + evol.getX() + " " + evol.getY()));
+ }
+ }
+
+ }
+
+ br.QLimInf = ((DonCalcSansPrtBrancheBarrageFilEau) dataCalc).getQLimInf();
+ br.QLimSup = ((DonCalcSansPrtBrancheBarrageFilEau) dataCalc).getQLimSup();
+ // -- on remplit la liste des elements seuils --//
+
+ br.ElemSeuils = remplirPersistanceAvecSeuilsBarragesDSCP(((DonCalcSansPrtBrancheBarrageFilEau) dataCalc)
+ .getListElt());
+
+ }
+
+ else {
+ analyser
+ .addError(
+ CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche barrage Fil d'eau) pour l'objet branche de r�f�rence"
+ + branche.getNom()), cptEntries++);
+ }
+
+ }
+
+ else if (branche instanceof EMHBrancheBarrageGenerique) {
+ final EMHBrancheBarrageGenerique new_name = (EMHBrancheBarrageGenerique) branche;
+ branchePersist = new BrancheBarrageGenerique();
+ // -- recuperation de la donnee de calcul de la branche --//
+ if (dataCalc instanceof DonCalcSansPrtBrancheBarrageGenerique) {
+ final BrancheBarrageGenerique br = (BrancheBarrageGenerique) branchePersist;
+
+ // -- recuperation de la loi RegimeDenoye --//
+ if (((DonCalcSansPrtBrancheBarrageGenerique) dataCalc).getRegimeDeNoye() != null) {
+ LoiFF loi = ((DonCalcSansPrtBrancheBarrageGenerique) dataCalc).getRegimeDeNoye();
+ br.RegimeDenoye = new RegimeDenoye();
+ br.RegimeDenoye.VarAbscisse = loi.getMVariableAbscisse().getType();
+ br.RegimeDenoye.VarOrdonnee = loi.getMVariableOrdonnee().getType();
+ br.RegimeDenoye.Serie = new ArrayList<StringBuffer>();
+ if (loi.getMEvolution() != null && loi.getMEvolution().getMpoints() != null) {
+ for (PtEvolutionFF evol : loi.getMEvolution().getMpoints()) {
+ br.RegimeDenoye.Serie.add(new StringBuffer("" + evol.getX() + " " + evol.getY()));
+ }
+ }
+ }
+
+ // -- recuperation de la loi RegimeNoye --//
+ if (((DonCalcSansPrtBrancheBarrageGenerique) dataCalc).getRegimeNoye() != null) {
+
+ // - remplissage de la loi RegimeDenoye--//
+ LoiFF loi = ((DonCalcSansPrtBrancheBarrageGenerique) dataCalc).getRegimeNoye();
+ br.RegimeNoye = new RegimeNoye();
+ br.RegimeNoye.VarAbscisse = loi.getMVariableAbscisse().getType();
+ br.RegimeNoye.VarOrdonnee = loi.getMVariableOrdonnee().getType();
+ br.RegimeNoye.Serie = new ArrayList<StringBuffer>();
+ if (loi.getMEvolution() != null && loi.getMEvolution().getMpoints() != null) {
+ for (PtEvolutionFF evol : loi.getMEvolution().getMpoints()) {
+ br.RegimeNoye.Serie.add(new StringBuffer("" + evol.getX() + " " + evol.getY()));
+ }
+ }
+
+ }
+
+ br.QLimInf = ((DonCalcSansPrtBrancheBarrageGenerique) dataCalc).getQLimInf();
+ br.QLimSup = ((DonCalcSansPrtBrancheBarrageGenerique) dataCalc).getQLimSup();
+ // -- on remplit la liste des elements seuils --//
+
+ } else {
+ analyser
+ .addError(
+ CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche barrage Generique) pour l'objet branche de r�f�rence"
+ + branche.getNom()), cptEntries++);
+ }
+
+ } else if (branche instanceof EMHBrancheBarrageRhone) {
+ final EMHBrancheBarrageRhone new_name = (EMHBrancheBarrageRhone) branche;
+ branchePersist = new BrancheBarrageRhone();
+ // -- recuperation de la donnee de calcul de la branche --//
+
+ if (dataCalc instanceof DonCalcSansPrtBrancheBarrageFilEau) {
+ final BrancheBarrageRhone br = (BrancheBarrageRhone) branchePersist;
+
+ // -- recuperation de la formule --//
+ if (((DonCalcSansPrtBrancheBarrageFilEau) dataCalc).getRegimeDenoye() != null) {
+
+ // br.RegimeDenoye = ((DonCalcSansPrtBrancheBarrageFilEau) dataCalc).getRegimeDenoye().getNom();
+
+ }
+
+ br.QLimInf = ((DonCalcSansPrtBrancheBarrageFilEau) dataCalc).getQLimInf();
+ br.QLimSup = ((DonCalcSansPrtBrancheBarrageFilEau) dataCalc).getQLimSup();
+ // -- on remplit la liste des elements seuils --//
+
+ br.ElemSeuils = remplirPersistanceAvecSeuilsBarragesDSCP(((DonCalcSansPrtBrancheBarrageFilEau) dataCalc)
+ .getListElt());
+
+ } else {
+ analyser
+ .addError(
+ CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche barrage Rhone) pour l'objet branche de r�f�rence"
+ + branche.getNom()), cptEntries++);
+ }
+
+ }
+ // else if (branche instanceof EMHBrancheBarrageRhone) {
+ // EMHBrancheBarrageRhone new_name = (EMHBrancheBarrageRhone) branche;
+ // branchePersist=new main.java.org.fudaa.dodico.crue.dao.DaoStructuresFormatDSCP.BrancheBarrageRhone();
+ // }
+ // else if (branche instanceof EMHBrancheEnchainement) {
+ // EMHBrancheEnchainement new_name = (EMHBrancheEnchainement) branche;
+ // branchePersist=new main.java.org.fudaa.dodico.crue.dao.DaoStructuresFormatDSCP.BrancheEnchainement();
+ // }else if (branche instanceof EMHBrancheNiveauxAssocies) {
+ // EMHBrancheNiveauxAssocies new_name = (EMHBrancheNiveauxAssocies) branche;
+ // branchePersist=new main.java.org.fudaa.dodico.crue.dao.DaoStructuresFormatDSCP.BrancheNiveauxAssocies();
+ // }
+ else if (branche instanceof EMHBrancheOrifice) {
+
+ branchePersist = new BrancheOrifice();
+
+ // -- recuperation de la donnee de calcul de la branche --//
+
+ if (dataCalc instanceof DonCalcSansPrtBrancheOrifice) {
+ final BrancheOrifice br = (BrancheOrifice) branchePersist;
+
+ // -- on remplit la liste des elements seuils --//
+ br.ElemOrifices = remplirPersistanceAvecOrificesSeuilsDSCP(((DonCalcSansPrtBrancheOrifice) dataCalc)
+ .getElement());
+ } else {
+ analyser
+ .addError(
+ CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche Orifice) pour l'objet branche de r�f�rence"
+ + branche.getNom()), cptEntries++);
+ }
+
+ } else if (branche instanceof EMHBranchePdc) {
+ final EMHBranchePdc new_name = (EMHBranchePdc) branche;
+ branchePersist = new BranchePdc();
+
+ // -- recuperation de la donnee de calcul de la branche --//
+
+ if (dataCalc instanceof DonCalcSansPrtBranchePDC) {
+ final BranchePdc br = (BranchePdc) branchePersist;
+
+ // -- recuperation de la formule --//
+ if (((DonCalcSansPrtBranchePDC) dataCalc).getPdc_DZ() != null) {
+
+ // - remplissage de la loi RegimeDenoye--//
+ LoiFF loi = ((DonCalcSansPrtBranchePDC) dataCalc).getPdc_DZ();
+ br.Pdc = new Pdc();
+ br.Pdc.VarAbscisse = loi.getMVariableAbscisse().getType();
+ br.Pdc.VarOrdonnee = loi.getMVariableOrdonnee().getType();
+ br.Pdc.Serie = new ArrayList<StringBuffer>();
+ if (loi.getMEvolution() != null && loi.getMEvolution().getMpoints() != null) {
+ for (PtEvolutionFF evol : loi.getMEvolution().getMpoints()) {
+ br.Pdc.Serie.add(new StringBuffer("" + evol.getX() + " " + evol.getY()));
+ }
+ }
+
+ }
+
+ }
+
+ else {
+ analyser
+ .addError(
+ CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche seuil Longitudinal) pour l'objet branche de r�f�rence"
+ + branche.getNom()), cptEntries++);
+ }
+
+ } else if (branche instanceof EMHBrancheNiveauxAssocies) {
+ final EMHBrancheNiveauxAssocies new_name = (EMHBrancheNiveauxAssocies) branche;
+ branchePersist = new BrancheNiveauxAssocies();
+
+ // -- recuperation de la donnee de calcul de la branche --//
+
+ if (dataCalc instanceof DonCalcSansPrtBranchePDC) {
+ final BranchePdc br = (BranchePdc) branchePersist;
+
+ // -- recuperation de la formule --//
+ if (((DonCalcSansPrtBranchePDC) dataCalc).getPdc_DZ() != null) {
+
+ // - remplissage de la loi RegimeDenoye--//
+ LoiFF loi = ((DonCalcSansPrtBranchePDC) dataCalc).getPdc_DZ();
+ br.Pdc = new Pdc();
+ br.Pdc.VarAbscisse = loi.getMVariableAbscisse().getType();
+ br.Pdc.VarOrdonnee = loi.getMVariableOrdonnee().getType();
+ br.Pdc.Serie = new ArrayList<StringBuffer>();
+ if (loi.getMEvolution() != null && loi.getMEvolution().getMpoints() != null) {
+ for (PtEvolutionFF evol : loi.getMEvolution().getMpoints()) {
+ br.Pdc.Serie.add(new StringBuffer("" + evol.getX() + " " + evol.getY()));
+ }
+ }
+
+ }
+
+ }
+
+ else {
+ analyser
+ .addError(
+ CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche seuil Longitudinal) pour l'objet branche de r�f�rence"
+ + branche.getNom()), cptEntries++);
+ }
+ }
+
+ else if (branche instanceof EMHBrancheSaintVenant) {
+ final EMHBrancheSaintVenant new_name = (EMHBrancheSaintVenant) branche;
+ branchePersist = new BrancheSaintVenant();
+ // -- recuperation de la donnee de calcul de la branche --//
+
+ if (dataCalc instanceof DonCalcSansPrtBrancheSaintVenant) {
+ final BrancheClassiqueAbstract br = (BrancheClassiqueAbstract) branchePersist;
+
+ br.CoefBeta = ((DonCalcSansPrtBrancheSaintVenant) dataCalc).getCoeffBeta();
+ br.CoefRuis = ((DonCalcSansPrtBrancheSaintVenant) dataCalc).getCoefRuis();
+ br.CoefRuisQdm = ((DonCalcSansPrtBrancheSaintVenant) dataCalc).getCoeffRuisQdm();
+
+ // //-- remplissage des sections de branches --//
+ // br.Sections=remplirPersistanceAvecSectionsBrancheDSCP( branche.getListeSections(), analyser);
+ } else {
+ analyser
+ .addError(
+ CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche SaintVenant) pour l'objet branche de r�f�rence"
+ + branche.getNom()), cptEntries++);
+ }
+
+ } else if (branche instanceof EMHBrancheSeuilLongitudinale) {
+ final EMHBrancheSeuilLongitudinale new_name = (EMHBrancheSeuilLongitudinale) branche;
+ branchePersist = new BrancheSeuilLateral();
+
+ // -- recuperation de la donnee de calcul de la branche --//
+
+ if (dataCalc instanceof DonCalcSansPrtBrancheSeuilLateral) {
+ final BrancheSeuilLateral br = (BrancheSeuilLateral) branchePersist;
+
+ // -- recuperation de la formule --//
+ br.FormulePdc = ((DonCalcSansPrtBrancheSeuilLateral) dataCalc).getFormulePdc();
+ // -- on remplit la liste des elements seuils --//
+ br.ElemSeuils = remplirPersistanceAvecSeuilsDSCP(((DonCalcSansPrtBrancheSeuilLateral) dataCalc).getListElt());
+
+ } else {
+ analyser
+ .addError(
+ CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche seuil Longitudinal) pour l'objet branche de r�f�rence"
+ + branche.getNom()), cptEntries++);
+ }
+
+ } else if (branche instanceof EMHBrancheSeuilTransversal) {
+ final EMHBrancheSeuilTransversal new_name = (EMHBrancheSeuilTransversal) branche;
+ branchePersist = new BrancheSeuilTransversal();
+
+ // -- recuperation de la donnee de calcul de la branche --//
+
+ if (dataCalc instanceof DonCalcSansPrtBrancheSeuilTransversal) {
+ final BrancheSeuilTransversal br = (BrancheSeuilTransversal) branchePersist;
+ // -- recuperation de la formule --//
+ br.FormulePdc = ((DonCalcSansPrtBrancheSeuilTransversal) dataCalc).getFormulePdc();
+ // -- on remplit la liste des elements seuils --//
+ br.ElemSeuils = remplirPersistanceAvecSeuilsDSCP(((DonCalcSansPrtBrancheSeuilTransversal) dataCalc)
+ .getListElt());
+ } else {
+ analyser
+ .addError(
+ CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche seuil transversal) pour l'objet branche de r�f�rence"
+ + branche.getNom()), cptEntries++);
+ }
+
+ }
+ // else if (branche instanceof EMHBrancheStrickler) {
+ // EMHBrancheStrickler new_name = (EMHBrancheStrickler) branche;
+ // branchePersist=new main.java.org.fudaa.dodico.crue.dao.DaoStructuresFormatDSCP.BrancheStrickler();
+ // }
+
+ if (branchePersist != null) {
+ branchePersist.NomRef = suffixe + branche.getNom();
+
+ listePersistante.add(branchePersist);
+ } else {
+ analyser.addError(CrueHelper.unknowEMH("Branche", branche.getNom()), cptEntries++);
+ }
+
+ }
+
+ /**
+ * Genere une liste d'elements seuils persistante a partir de la liste m�tier lue.
+ *
+ * @param listeEltSeuilsPersist
+ * @return
+ */
+ public static List<ElemAvecSeuilPdc> remplirPersistanceAvecSeuilsDSCP(final List<ElemSeuilAvecPdc> listeEltSeuilsEMH) {
+ final List<ElemAvecSeuilPdc> listeSeuilsPersist = new ArrayList<ElemAvecSeuilPdc>();
+ for (final ElemSeuilAvecPdc seuilMetier : listeEltSeuilsEMH) {
+ final ElemAvecSeuilPdc seuilPersist = new ElemAvecSeuilPdc();
+ seuilPersist.CoefD = seuilMetier.getCoeffD();
+ seuilPersist.CoefPdc = seuilMetier.getCoeffPdc();
+ seuilPersist.Larg = seuilMetier.getLarg();
+ seuilPersist.Zseuil = seuilMetier.getZSeuil();
+
+ listeSeuilsPersist.add(seuilPersist);
+ }
+
+ return listeSeuilsPersist;
+ }
+
+ /**
+ * Genere une liste d'elements seuils persistante a partir de la liste m�tier lue.
+ *
+ * @param listeEltSeuilsPersist
+ * @return
+ */
+ public static List<ElemSeuil> remplirPersistanceAvecSeuilsBarragesDSCP(
+ final List<org.fudaa.dodico.crue.metier.emh.ElemSeuil> listeEltSeuilsEMH) {
+ final List<ElemSeuil> listeSeuilsPersist = new ArrayList<ElemSeuil>();
+ for (final org.fudaa.dodico.crue.metier.emh.ElemSeuil seuilMetier : listeEltSeuilsEMH) {
+ final ElemSeuil seuilPersist = new ElemSeuil();
+ seuilPersist.CoefD = seuilMetier.getCoeffD();
+
+ seuilPersist.Larg = seuilMetier.getLarg();
+ seuilPersist.Zseuil = seuilMetier.getZSeuil();
+
+ listeSeuilsPersist.add(seuilPersist);
+ }
+
+ return listeSeuilsPersist;
+ }
+
+ /**
+ * Genere une liste d'elements seuils persistante a partir de la liste metier lue.
+ *
+ * @param listeEltSeuilsPersist
+ * @return
+ */
+ public static List<ElemSeuilOrifice> remplirPersistanceAvecOrificesSeuilsDSCP(
+ final List<org.fudaa.dodico.crue.metier.emh.ElemOrifice> listeEMhSeuils) {
+ final List<ElemSeuilOrifice> listeEltSeuilsPersist = new ArrayList<ElemSeuilOrifice>();
+ for (final org.fudaa.dodico.crue.metier.emh.ElemOrifice seuilMetier : listeEMhSeuils) {
+ final ElemSeuilOrifice seuilPersist = new ElemSeuilOrifice();
+ seuilPersist.CoefD = seuilMetier.getCoeffQ();
+ seuilPersist.Larg = seuilMetier.getLarg();
+ seuilPersist.Zseuil = seuilMetier.getZSeuil();
+
+ seuilPersist.CoefCtrLim = seuilMetier.getCoeffCtrLim();
+ seuilPersist.Sens = seuilMetier.getSens();
+
+ listeEltSeuilsPersist.add(seuilPersist);
+ }
+
+ return listeEltSeuilsPersist;
+ }
+
+ /**
+ * Methode qui remplit une arrayList d'objets persistants Sections qui sont contenues dans une branche: concerne le
+ * fichier fichier DSCP: les Branches.
+ *
+ * @param data
+ * @return
+ */
+ public static void remplirPersistanceAvecSectionsBrancheDSCP(final List<SectionBrancheAbstract> listePersistante,
+ final CatEMHSection section, final DonCalcSansPrtSection prtSection, final CtuluAnalyze analyser) {
+
+ SectionBrancheAbstract sectionPersist = null;
+ if (section instanceof EMHSectionIdem) {
+ sectionPersist = new SectionIdem();
+ } else if (section instanceof EMHSectionInterpolee) {
+ sectionPersist = new SectionInterpolee();
+ } else if (section instanceof EMHSectionProfil) {
+ sectionPersist = new SectionProfil();
+ } else if (section instanceof EMHSectionSansGeometrie) {
+ sectionPersist = new SectionSansGeometrie();
+ }
+
+ if (section.getDataCalcul() != null) {
+ sectionPersist.NomRef = CrueDaoDRSO.SUFFIXE_REF_DRSO + section.getNom();
+ sectionPersist.CoefConv = prtSection.getCoeffConv();
+ sectionPersist.CoefDiv = prtSection.getCoeffDiv();
+ sectionPersist.CoefPond = prtSection.getCoeffPond();
+ }
+
+ listePersistante.add(sectionPersist);
+
+ }
+
+ /**
+ * Methode qui met a jour les objets m�tier EMH branches a partir des donn�es persistantes de DPTI et les
+ * pr�chargements de DRSO
+ *
+ * @param data
+ * @return
+ */
+ public static void remplirBrancheAvecPersistanceDSCP(final List<BrancheAbstract> listePersistants,
+ final List<EMH> data, final CtuluAnalyze analyser) {
+ if (listePersistants == null || listePersistants.size() == 0) {
+ analyser.addError(CrueResource.getS("Branches: la liste est vide."), cptEntries++);
+ } else {
+ for (final Object persist : listePersistants) {
+ if (persist instanceof BrancheAbstract) {
+ final BrancheAbstract branchePersist = (BrancheAbstract) persist;
+ String reference = branchePersist.NomRef;
+ if (reference.contains(CrueDaoDRSO.SUFFIXE_REF_DRSO)) {
+ reference = reference.replace(CrueDaoDRSO.SUFFIXE_REF_DRSO, "");
+ }
+ final CatEMHBranche branche = EMHBrancheHelper.findByReference(reference, data);
+ if (branche == null) {
+ analyser
+ .addError(CrueResource.getS("Branche : Impossible de trouver la branche de r�f�rence " + reference),
+ cptEntries++);
+ } else {
+ if (branchePersist instanceof BrancheClassiqueAbstract) {
+ final BrancheClassiqueAbstract br = (BrancheClassiqueAbstract) branchePersist;
+ final DonCalcSansPrtBrancheSaintVenant dataCalcul = new DonCalcSansPrtBrancheSaintVenant();
+ dataCalcul.setCoeffBeta(br.CoefBeta);
+ dataCalcul.setCoefRuis(br.CoefRuis);
+ dataCalcul.setCoeffRuisQdm(br.CoefRuisQdm);
+ branche.addDSCP(dataCalcul);
+ // -- remplissage des sections --//
+ // remplirSectionsAvecPersistanceDSCP(br.Sections, branche, analyser);
+ }
+ // -- branche seuil --//
+ else if (branchePersist instanceof BrancheSeuilAbstract) {
+ final BrancheSeuilAbstract br = (BrancheSeuilAbstract) branchePersist;
+
+ if ((branche instanceof EMHBrancheSeuilLongitudinale)) {
+ final DonCalcSansPrtBrancheSeuilLateral dataCalcul = new DonCalcSansPrtBrancheSeuilLateral();
+
+ // -- recuperation de la formule --//
+ dataCalcul.setFormulePdc(br.FormulePdc);
+ // -- on remplit la liste des elements seuils --//
+ dataCalcul.setListElt(remplirSeuilsAvecPersistanceDSCP(br.ElemSeuils));
+ branche.addDSCP(dataCalcul);
+ } else if ((branche instanceof EMHBrancheSeuilTransversal)) {
+ final DonCalcSansPrtBrancheSeuilTransversal dataCalcul = new DonCalcSansPrtBrancheSeuilTransversal();
+
+ // -- recuperation de la formule --//
+ dataCalcul.setFormulePdc(br.FormulePdc);
+ // -- on remplit la liste des elements seuils --//
+ dataCalcul.setListElt(remplirSeuilsAvecPersistanceDSCP(br.ElemSeuils));
+ branche.addDSCP(dataCalcul);
+ } else {
+ analyser
+ .addError(CrueResource.getS("Branche : Les donnees de la branche de r�f�rence " + reference
+ + " doivent �tre de type Transversal ou Longitudinal (liste de seuils+ formule pdc)"),
+ cptEntries++);
+ }
+
+ }
+ // -- branche seuils orifices --//
+ else if (branchePersist instanceof BrancheSeuilOrificeAbstract) {
+ final BrancheSeuilOrificeAbstract br = (BrancheSeuilOrificeAbstract) branchePersist;
+ final DonCalcSansPrtBrancheOrifice dataCalcul = new DonCalcSansPrtBrancheOrifice();
+ // -- on remplit la liste des elements seuils --//
+ dataCalcul.setElement(remplirOrificesSeuilsAvecPersistanceDSCP(br.ElemOrifices));
+ branche.addDSCP(dataCalcul);
+ }
+ // -- branche seuils PDC --//
+ else if (branchePersist instanceof BranchePDCAbstract) {
+ final BranchePDCAbstract br = (BranchePDCAbstract) branchePersist;
+ final DonCalcSansPrtBranchePDC dataCalcul = new DonCalcSansPrtBranchePDC();
+ // -- recuperation de la Loi PDC --//
+ if (br.Pdc != null) {
+ Loi loi = br.Pdc;
+ final LoiFF newLoi = new LoiFF();
+ VariableOrdonnee var = new VariableOrdonnee();
+ var.setType(loi.VarAbscisse);
+ newLoi.setMVariableAbscisse(var);
+ var = new VariableOrdonnee();
+ var.setType(loi.VarOrdonnee);
+ newLoi.setMVariableOrdonnee(var);
+ List<PtEvolutionFF> listePoints = new ArrayList<PtEvolutionFF>();
+ for (StringBuffer buff : loi.Serie) {
+ PtEvolutionFF evol = CrueHelper.createEvolutionFFfromString(buff, analyser, branchePersist.NomRef);
+ listePoints.add(evol);
+ }
+ EvolutionFF listeEvolution = new EvolutionFF();
+ listeEvolution.setMpoints(listePoints);
+ newLoi.setMEvolution(listeEvolution);
+ dataCalcul.setPdc_DZ(newLoi);
+
+ }
+
+ branche.addDSCP(dataCalcul);
+ }
+ // -- Branche niveau associé --//
+ else if (branchePersist instanceof BrancheNiveauxAssocies) {
+ final BrancheNiveauxAssocies br = (BrancheNiveauxAssocies) branchePersist;
+ final DonCalcSansPrtBranchePDC dataCalcul = new DonCalcSansPrtBranchePDC();
+ // -- recuperation de la Loi PDC --//
+ if (br.Pdc != null) {
+ Loi loi = br.Pdc;
+ final LoiFF newLoi = new LoiFF();
+ VariableOrdonnee var = new VariableOrdonnee();
+ var.setType(loi.VarAbscisse);
+ newLoi.setMVariableAbscisse(var);
+ var = new VariableOrdonnee();
+ var.setType(loi.VarOrdonnee);
+ newLoi.setMVariableOrdonnee(var);
+ List<PtEvolutionFF> listePoints = new ArrayList<PtEvolutionFF>();
+ for (StringBuffer buff : loi.Serie) {
+ PtEvolutionFF evol = CrueHelper.createEvolutionFFfromString(buff, analyser, branchePersist.NomRef);
+ listePoints.add(evol);
+ }
+ EvolutionFF listeEvolution = new EvolutionFF();
+ listeEvolution.setMpoints(listePoints);
+ newLoi.setMEvolution(listeEvolution);
+ dataCalcul.setPdc_DZ(newLoi);
+
+ }
+
+ branche.addDSCP(dataCalcul);
+ } else if (branchePersist instanceof BrancheBarrageFilEauAbstract) {
+ final BrancheBarrageFilEauAbstract br = (BrancheBarrageFilEauAbstract) branchePersist;
+ final DonCalcSansPrtBrancheBarrageFilEau dataCalcul = new DonCalcSansPrtBrancheBarrageFilEau();
+
+ // -- recuperation de la Loi RegimeDenoye --//
+ if (br.RegimeDenoye != null) {
+ Loi loi = br.RegimeDenoye;
+ final LoiFF newLoi = new LoiFF();
+ VariableOrdonnee var = new VariableOrdonnee();
+ var.setType(loi.VarAbscisse);
+ newLoi.setMVariableAbscisse(var);
+ var = new VariableOrdonnee();
+ var.setType(loi.VarOrdonnee);
+ newLoi.setMVariableOrdonnee(var);
+ List<PtEvolutionFF> listePoints = new ArrayList<PtEvolutionFF>();
+ for (StringBuffer buff : loi.Serie) {
+ PtEvolutionFF evol = CrueHelper.createEvolutionFFfromString(buff, analyser, branchePersist.NomRef);
+ listePoints.add(evol);
+ }
+ EvolutionFF listeEvolution = new EvolutionFF();
+ listeEvolution.setMpoints(listePoints);
+ newLoi.setMEvolution(listeEvolution);
+ dataCalcul.setRegimeDenoye(newLoi);
+
+ }
+ dataCalcul.setQLimInf(br.QLimInf);
+ dataCalcul.setQLimSup(br.QLimSup);
+
+ // -- on remplit la liste des elements seuils --//
+ dataCalcul.setListElt(remplirSeuilsBarragesAvecPersistanceDSCP(br.ElemSeuils));
+ branche.addDSCP(dataCalcul);
+
+ } else if (branchePersist instanceof BrancheBarrageGeneriqueAbstract) {
+ final BrancheBarrageGeneriqueAbstract br = (BrancheBarrageGeneriqueAbstract) branchePersist;
+ final DonCalcSansPrtBrancheBarrageGenerique dataCalcul = new DonCalcSansPrtBrancheBarrageGenerique();
+
+ // -- recuperation de la Loi RegimeDenoye --//
+ if (br.RegimeDenoye != null) {
+ Loi loi = br.RegimeDenoye;
+ final LoiFF newLoi = new LoiFF();
+ VariableOrdonnee var = new VariableOrdonnee();
+ var.setType(loi.VarAbscisse);
+ newLoi.setMVariableAbscisse(var);
+ var = new VariableOrdonnee();
+ var.setType(loi.VarOrdonnee);
+ newLoi.setMVariableOrdonnee(var);
+ List<PtEvolutionFF> listePoints = new ArrayList<PtEvolutionFF>();
+ for (StringBuffer buff : loi.Serie) {
+ PtEvolutionFF evol = CrueHelper.createEvolutionFFfromString(buff, analyser, branchePersist.NomRef);
+ listePoints.add(evol);
+ }
+ EvolutionFF listeEvolution = new EvolutionFF();
+ listeEvolution.setMpoints(listePoints);
+ newLoi.setMEvolution(listeEvolution);
+ dataCalcul.setRegimeDeNoye(newLoi);
+
+ }
+ // -- recuperation de la Loi RegimeNoye --//
+ if (br.RegimeNoye != null) {
+ Loi loi = br.RegimeNoye;
+ final LoiFF newLoi = new LoiFF();
+ VariableOrdonnee var = new VariableOrdonnee();
+ var.setType(loi.VarAbscisse);
+ newLoi.setMVariableAbscisse(var);
+ var = new VariableOrdonnee();
+ var.setType(loi.VarOrdonnee);
+ newLoi.setMVariableOrdonnee(var);
+ List<PtEvolutionFF> listePoints = new ArrayList<PtEvolutionFF>();
+ for (StringBuffer buff : loi.Serie) {
+ PtEvolutionFF evol = CrueHelper.createEvolutionFFfromString(buff, analyser, branchePersist.NomRef);
+ listePoints.add(evol);
+ }
+ EvolutionFF listeEvolution = new EvolutionFF();
+ listeEvolution.setMpoints(listePoints);
+ newLoi.setMEvolution(listeEvolution);
+ dataCalcul.setRegimeNoye(newLoi);
+
+ }
+
+ dataCalcul.setQLimInf(br.QLimInf);
+ dataCalcul.setQLimSup(br.QLimSup);
+ branche.addDSCP(dataCalcul);
+
+ }
+
+ else {
+ analyser.addError(CrueResource.getS("Branche : Donn�es non correcte. La branche de r�f�rence "
+ + reference + " contient des �l�ments de calcul innatendu."), cptEntries++);
+ }
+ }
+
+ }
+ }
+ }
+
+ }
+
+ /**
+ * Genere une liste d'elements seuils persistante a partir de la liste m�tier lue.
+ *
+ * @param listeEltSeuilsPersist
+ * @return
+ */
+ public static List<ElemSeuilAvecPdc> remplirSeuilsAvecPersistanceDSCP(final List<ElemAvecSeuilPdc> listeSeuilsPersist) {
+ final List<ElemSeuilAvecPdc> listeEltSeuilsEMH = new ArrayList<ElemSeuilAvecPdc>();
+ for (final ElemAvecSeuilPdc seuilPersist : listeSeuilsPersist) {
+ final ElemSeuilAvecPdc seuilMetier = new ElemSeuilAvecPdc();
+ seuilMetier.setCoeffD(seuilPersist.CoefD);
+ seuilMetier.setCoeffPdc(seuilPersist.CoefPdc);
+ seuilMetier.setLarg(seuilPersist.Larg);
+ seuilMetier.setZSeuil(seuilPersist.Zseuil);
+
+ listeEltSeuilsEMH.add(seuilMetier);
+ }
+
+ return listeEltSeuilsEMH;
+ }
+
+ /**
+ * Genere une liste d'elements seuils persistante a partir de la liste m�tier lue.
+ *
+ * @param listeEltSeuilsPersist
+ * @return
+ */
+ public static List<org.fudaa.dodico.crue.metier.emh.ElemSeuil> remplirSeuilsBarragesAvecPersistanceDSCP(
+ final List<ElemSeuil> listeSeuilsPersist) {
+ final List<org.fudaa.dodico.crue.metier.emh.ElemSeuil> listeEltSeuilsEMH = new ArrayList<org.fudaa.dodico.crue.metier.emh.ElemSeuil>();
+ for (final ElemSeuil seuilPersist : listeSeuilsPersist) {
+ final org.fudaa.dodico.crue.metier.emh.ElemSeuil seuilMetier = new org.fudaa.dodico.crue.metier.emh.ElemSeuil();
+ seuilMetier.setCoeffD(seuilPersist.CoefD);
+
+ seuilMetier.setLarg(seuilPersist.Larg);
+ seuilMetier.setZSeuil(seuilPersist.Zseuil);
+
+ listeEltSeuilsEMH.add(seuilMetier);
+ }
+
+ return listeEltSeuilsEMH;
+ }
+
+ /**
+ * Genere une liste d'elements seuils m�tier a partir de la liste persistante lue.
+ *
+ * @param listeEltSeuilsPersist
+ * @return
+ */
+ public static List<org.fudaa.dodico.crue.metier.emh.ElemOrifice> remplirOrificesSeuilsAvecPersistanceDSCP(
+ final List<ElemSeuilOrifice> listeEltSeuilsPersist) {
+ final List<org.fudaa.dodico.crue.metier.emh.ElemOrifice> listeEMhSeuils = new ArrayList<org.fudaa.dodico.crue.metier.emh.ElemOrifice>();
+ for (final ElemSeuilOrifice seuilPersist : listeEltSeuilsPersist) {
+ final org.fudaa.dodico.crue.metier.emh.ElemOrifice seuilMetier = new org.fudaa.dodico.crue.metier.emh.ElemOrifice();
+ seuilMetier.setCoeffQ(seuilPersist.CoefD);
+ seuilMetier.setLarg(seuilPersist.Larg);
+ seuilMetier.setZSeuil(seuilPersist.Zseuil);
+
+ seuilMetier.setCoeffCtrLim(seuilPersist.CoefCtrLim);
+ seuilMetier.setSens(seuilPersist.Sens);
+
+ listeEMhSeuils.add(seuilMetier);
+ }
+
+ return listeEMhSeuils;
+ }
+
+ /**
+ * Methode qui met a jour les objets m�tier EMH sections de branches a partir des donn�es persistantes qui constituent
+ * a quatrieme partie du fichier DSCP: les Sections.
+ *
+ * @param data
+ * @return
+ */
+ public static void remplirSectionsAvecPersistanceDSCP(final List<SectionBrancheAbstract> listePersistantsSection,
+ final List<EMH> data, final CtuluAnalyze analyser) {
+
+ if (listePersistantsSection == null || listePersistantsSection.size() == 0) {
+ analyser.addError(CrueResource.getS("Sections : la liste est vide."), cptEntries++);
+ } else {
+ for (final Object persist : listePersistantsSection) {
+ if (persist instanceof SectionBrancheAbstract) {
+ final SectionBrancheAbstract sectionPersist = (SectionBrancheAbstract) persist;
+
+ // -- on d�clare une version abstraite EMH m�tier du type --//
+ CatEMHSection section = null;
+ String reference = sectionPersist.NomRef;
+
+ if (reference.contains(CrueDaoDRSO.SUFFIXE_REF_DRSO)) {
+ reference = reference.replace(CrueDaoDRSO.SUFFIXE_REF_DRSO, "");
+ }
+ section = EMHSectionHelper.findByReference(reference, data);
+
+ if (section != null) {
+ final DonCalcSansPrtSection dataCalcul = new DonCalcSansPrtSection();
+
+ dataCalcul.setCoeffConv(sectionPersist.CoefConv);
+ dataCalcul.setCoeffDiv(sectionPersist.CoefDiv);
+ dataCalcul.setCoeffPond(sectionPersist.CoefPond);
+ section.addDSCP(dataCalcul);
+ } else {
+ analyser.addError(CrueHelper.unknowReference("Section", reference), cptEntries++);
+ }
+ }
+ }
+ }
+
+ }
+
+}
Copied: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDFRT.java (from rev 4638, trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDFRT.java)
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDFRT.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDFRT.java 2009-04-15 03:10:37 UTC (rev 4640)
@@ -0,0 +1,130 @@
+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.CrueDaoStructureDFRT.StriRefCPersist;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDFRT.StriRefHPersist;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDFRT.StriRefPersist;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDFRT.StriRefZPersist;
+import org.fudaa.dodico.crue.metier.emh.DonFrt;
+import org.fudaa.dodico.crue.metier.emh.FrottementPoint;
+import org.fudaa.dodico.crue.metier.emh.StriRefC;
+import org.fudaa.dodico.crue.metier.emh.StriRefH;
+import org.fudaa.dodico.crue.metier.emh.StriRefZ;
+
+/**
+ * Factory qui se charge de remplir les structures DAO dufichier DFRT avec les donn�es m�tier et inversement.
+ *
+ * @author Adrien Hadoux
+ */
+public class CrueConverterDFRT implements CrueConverter<CrueDaoDFRT, List<DonFrt>> {
+
+ public List<DonFrt> convertDaoToMetier(CrueDaoDFRT dao, Object dataLinked, CtuluAnalyze analyser) {
+ return CrueConverterDFRT.convertToEMH(dao.listeFrottement, analyser);
+ }
+
+ public CrueDaoDFRT convertMetierToDao(List<DonFrt> metier, CtuluAnalyze analyser) {
+ CrueDaoDFRT res = new CrueDaoDFRT();
+ res.listeFrottement = CrueConver...
[truncated message content] |
|
From: <de...@us...> - 2009-04-15 19:48:58
|
Revision: 4643
http://fudaa.svn.sourceforge.net/fudaa/?rev=4643&view=rev
Author: deniger
Date: 2009-04-15 19:48:46 +0000 (Wed, 15 Apr 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/.pmd
trunk/soft/fudaa-crue/dodico/.project
trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.jdt.core.prefs
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueResource.java
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/CrueDaoOPTG.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/TestCrueDFRTFile.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/fudaa/.pmd
trunk/soft/fudaa-crue/src/main/config/pmd.xml
Modified: trunk/soft/fudaa-crue/.pmd
===================================================================
--- trunk/soft/fudaa-crue/.pmd 2009-04-15 03:12:18 UTC (rev 4642)
+++ trunk/soft/fudaa-crue/.pmd 2009-04-15 19:48:46 UTC (rev 4643)
@@ -345,7 +345,7 @@
</rule>
<rule>
<name>SignatureDeclareThrowsException</name>
- <ruleset>Strict Exception Rules</ruleset>
+ <ruleset>Type Resolution Rules</ruleset>
</rule>
<rule>
<name>ExceptionAsFlowControl</name>
@@ -525,7 +525,7 @@
</rule>
<rule>
<name>LooseCoupling</name>
- <ruleset>Coupling Rules</ruleset>
+ <ruleset>Type Resolution Rules</ruleset>
</rule>
<rule>
<name>DuplicateImports</name>
@@ -537,7 +537,7 @@
</rule>
<rule>
<name>UnusedImports</name>
- <ruleset>Import Statement Rules</ruleset>
+ <ruleset>Type Resolution Rules</ruleset>
</rule>
<rule>
<name>ImportFromSamePackage</name>
@@ -592,10 +592,6 @@
<ruleset>Naming Rules</ruleset>
</rule>
<rule>
- <name>LongVariable</name>
- <ruleset>Naming Rules</ruleset>
- </rule>
- <rule>
<name>ShortMethodName</name>
<ruleset>Naming Rules</ruleset>
</rule>
@@ -753,7 +749,7 @@
</rule>
<rule>
<name>CloneMethodMustImplementCloneable</name>
- <ruleset>Clone Implementation Rules</ruleset>
+ <ruleset>Type Resolution Rules</ruleset>
</rule>
<rule>
<name>UseSingleton</name>
Modified: trunk/soft/fudaa-crue/dodico/.project
===================================================================
--- trunk/soft/fudaa-crue/dodico/.project 2009-04-15 03:12:18 UTC (rev 4642)
+++ trunk/soft/fudaa-crue/dodico/.project 2009-04-15 19:48:46 UTC (rev 4643)
@@ -15,8 +15,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
</natures>
</projectDescription>
Modified: trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.jdt.core.prefs 2009-04-15 03:12:18 UTC (rev 4642)
+++ trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.jdt.core.prefs 2009-04-15 19:48:46 UTC (rev 4643)
@@ -1,4 +1,4 @@
-#Sat Apr 11 00:17:58 CEST 2009
+#Wed Apr 15 21:37:15 CEST 2009
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
@@ -62,7 +62,7 @@
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueResource.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueResource.java 2009-04-15 03:12:18 UTC (rev 4642)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueResource.java 2009-04-15 19:48:46 UTC (rev 4643)
@@ -5,11 +5,11 @@
import com.memoire.bu.BuResource;
/**
- * TODO Fred a enlever Ressources crue. Utilit\xE9 ?
+ * TODO Fred a enlever Ressources crue. Utilit� ?
*
* @author Adrien Hadoux
*/
-public class CrueResource extends DodicoResource {
+public final class CrueResource extends DodicoResource {
public final static CrueResource CRUE = new CrueResource(DodicoResource.DODICO);
public final static String SOFTWARE_ID = "Crue";
Modified: 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-15 03:12:18 UTC (rev 4642)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/AbstractCrueDao.java 2009-04-15 19:48:46 UTC (rev 4643)
@@ -1,12 +1,11 @@
package org.fudaa.dodico.crue.dao;
-
/**
* classe dao persist qui représente la structure xml à persister.
*
* @author Adrien Hadoux
*/
-public abstract class AbstractCrueDao {
+class AbstractCrueDao {
// /**
// * Initiazlise le parser xstream avec les bons alias des noms de balises.
Modified: 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/CrueDaoOPTG.java 2009-04-15 03:12:18 UTC (rev 4642)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoOPTG.java 2009-04-15 19:48:46 UTC (rev 4643)
@@ -1,16 +1,16 @@
package org.fudaa.dodico.crue.dao;
-
/**
* Classe persistante qui reprend la meme structure que le fichier xml OPTG - Fichier des ordres pour le pr�traitement
* g�om�trique (xml). Cela permettra de persister plus facilement la donn�e via xstream
*
* @author Adrien Hadoux
*/
+@SuppressWarnings("PMD.VariableNamingConventions")
public class CrueDaoOPTG extends AbstractCrueDao {
- public String VersionCrue = CrueHelper.VersionCrue;
- public String Commentaire = CrueHelper.Commentaire;
+ protected String VersionCrue = CrueHelper.VersionCrue;
+ protected String Commentaire = CrueHelper.Commentaire;
double RegleProfPlat;
double ReglePenteRupture;
Modified: 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/AbstractTest.java 2009-04-15 03:12:18 UTC (rev 4642)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/AbstractTest.java 2009-04-15 19:48:46 UTC (rev 4643)
@@ -18,11 +18,12 @@
/**
* @author deniger
*/
+@SuppressWarnings("PMD.SystemPrintln")
public class AbstractTest extends TestCase {
- final List<String> files;
- final List<File> tempFiles = new ArrayList<File>();
- final CrueFileFormat format;
+ protected final List<String> files;
+ protected final List<File> tempFiles = new ArrayList<File>();
+ protected final CrueFileFormat format;
public AbstractTest(CrueFileFormat format, String... file) {
super();
Modified: 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/AppCrueTest.java 2009-04-15 03:12:18 UTC (rev 4642)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/AppCrueTest.java 2009-04-15 19:48:46 UTC (rev 4643)
@@ -14,6 +14,7 @@
/**
* Des methodes pour aider dans les tests
*/
+@SuppressWarnings("PMD.SystemPrintln")
public class AppCrueTest {
/**
@@ -24,11 +25,11 @@
: AppCrueTest.class.getResource("fichierTest").getFile();
/**
- * Chemin d'acc\xE8s au fichier ETU pour les test unitaires le concernant.
+ * Chemin d'acc�s au fichier ETU pour les test unitaires le concernant.
*/
// public static String pathFichierETU = pathRepertoireTest+File.separator+"Etude.etu.xml";
/**
- * Specifie le repertoire de test ansq lequel seront sauvegard\xE9 et charg\xE9s les fichiers .
+ * Specifie le repertoire de test ansq lequel seront sauvegard� et charg�s les fichiers .
*/
public static void getRepertoireTest() {
@@ -38,7 +39,7 @@
CtuluDialogPanel panel = new CtuluDialogPanel();
panel.add(field);
java.awt.Frame parent = null;
- int reponse = panel.afficheModale(parent, "R\xE9pertoire de test:");
+ int reponse = panel.afficheModale(parent, "R�pertoire de test:");
if (reponse == JOptionPane.OK_OPTION) {
String newPath = field.getText();
@@ -78,7 +79,7 @@
// -- on liste les warnings XSD --//
if (message.getWarnCanal() != null && message.getWarnCanal().getFields() != null
&& message.getWarnCanal().getFields().length != 0) {
- System.out.println(CrueResource.getS("Validateur XSD n'a pas valid\xE9 le fichier"));
+ System.out.println(CrueResource.getS("Validateur XSD n'a pas valid� le fichier"));
for (int i = 0; i < message.getWarnCanal().getFields().length; i++) {
System.out.println(message.getWarnCanal().getFields()[i].getMessage());
@@ -88,7 +89,7 @@
// -- on liste les erreurs de remplissage --//
if (message.getErrorCanal() != null && message.getErrorCanal().getFields() != null
&& message.getErrorCanal().getFields().length != 0) {
- System.out.println(CrueResource.getS("Erreurs dans les I/O structures de donn\xE9es"));
+ System.out.println(CrueResource.getS("Erreurs dans les I/O structures de donn�es"));
for (int i = 0; i < message.getErrorCanal().getFields().length; i++) {
System.out.println(message.getErrorCanal().getFields()[i].getMessage());
@@ -99,7 +100,7 @@
// -- on liste les informations de remplissage --//
if (message.getInfoCanal() != null && message.getInfoCanal().getFields() != null
&& message.getInfoCanal().getFields().length != 0) {
- System.out.println(CrueResource.getS("Infos supl\xE9mentaires sur les I/O structures de donn\xE9es"));
+ System.out.println(CrueResource.getS("Infos supl�mentaires sur les I/O structures de donn�es"));
for (int i = 0; i < message.getInfoCanal().getFields().length; i++) {
System.out.println(message.getInfoCanal().getFields()[i].getMessage());
Modified: 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/TestCrueDFRTFile.java 2009-04-15 03:12:18 UTC (rev 4642)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDFRTFile.java 2009-04-15 19:48:46 UTC (rev 4643)
@@ -8,6 +8,7 @@
import org.fudaa.dodico.crue.io.Crue10FileFormat;
import org.fudaa.dodico.crue.metier.emh.DonFrt;
+@SuppressWarnings("PMD.SystemPrintln")
public class TestCrueDFRTFile extends AbstractTest {
/**
Modified: 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/TestCrueDPTIFile.java 2009-04-15 03:12:18 UTC (rev 4642)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDPTIFile.java 2009-04-15 19:48:46 UTC (rev 4643)
@@ -19,6 +19,7 @@
*
* @author Adrien Hadoux
*/
+@SuppressWarnings("PMD.SystemPrintln")
public class TestCrueDPTIFile extends AbstractTest {
private static final String FICHIER_TEST_MODELE3_DPTI_XML = "/fichierTest/Modele3.dpti.xml";
Modified: 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/TestCrueDRSOFile.java 2009-04-15 03:12:18 UTC (rev 4642)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDRSOFile.java 2009-04-15 19:48:46 UTC (rev 4643)
@@ -15,15 +15,16 @@
*
* @author Adrien Hadoux
*/
+@SuppressWarnings("PMD.SystemPrintln")
public class TestCrueDRSOFile extends AbstractTest {
/**
- *
+ * path pour le fichier Modele4.drso.xml
*/
protected static final String FICHIER_TEST_MODELE4_DRSO_XML = "/fichierTest/Modele4.drso.xml";
/**
- *
+ * path pour le fichier Modele3.drso.xml
*/
protected static final String FICHIER_TEST_MODELE3_DRSO_XML = "/fichierTest/Modele3.drso.xml";
Modified: trunk/soft/fudaa-crue/fudaa/.pmd
===================================================================
--- trunk/soft/fudaa-crue/fudaa/.pmd 2009-04-15 03:12:18 UTC (rev 4642)
+++ trunk/soft/fudaa-crue/fudaa/.pmd 2009-04-15 19:48:46 UTC (rev 4643)
@@ -345,7 +345,7 @@
</rule>
<rule>
<name>SignatureDeclareThrowsException</name>
- <ruleset>Strict Exception Rules</ruleset>
+ <ruleset>Type Resolution Rules</ruleset>
</rule>
<rule>
<name>ExceptionAsFlowControl</name>
@@ -525,7 +525,7 @@
</rule>
<rule>
<name>LooseCoupling</name>
- <ruleset>Coupling Rules</ruleset>
+ <ruleset>Type Resolution Rules</ruleset>
</rule>
<rule>
<name>DuplicateImports</name>
@@ -537,7 +537,7 @@
</rule>
<rule>
<name>UnusedImports</name>
- <ruleset>Import Statement Rules</ruleset>
+ <ruleset>Type Resolution Rules</ruleset>
</rule>
<rule>
<name>ImportFromSamePackage</name>
@@ -592,10 +592,6 @@
<ruleset>Naming Rules</ruleset>
</rule>
<rule>
- <name>LongVariable</name>
- <ruleset>Naming Rules</ruleset>
- </rule>
- <rule>
<name>ShortMethodName</name>
<ruleset>Naming Rules</ruleset>
</rule>
@@ -753,7 +749,7 @@
</rule>
<rule>
<name>CloneMethodMustImplementCloneable</name>
- <ruleset>Clone Implementation Rules</ruleset>
+ <ruleset>Type Resolution Rules</ruleset>
</rule>
<rule>
<name>UseSingleton</name>
Modified: trunk/soft/fudaa-crue/src/main/config/pmd.xml
===================================================================
--- trunk/soft/fudaa-crue/src/main/config/pmd.xml 2009-04-15 03:12:18 UTC (rev 4642)
+++ trunk/soft/fudaa-crue/src/main/config/pmd.xml 2009-04-15 19:48:46 UTC (rev 4643)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<ruleset xmlns="http://pmd.sf.net/ruleset/1.0.0" name="pmd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd" xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd">
- <description>PMD For Fudaa-Crue</description>
+ <description>PMD Plugin preferences rule set</description>
<rule ref="rulesets/typeresolution.xml/LooseCoupling"/>
<rule ref="rulesets/typeresolution.xml/CloneMethodMustImplementCloneable"/>
<rule ref="rulesets/typeresolution.xml/UnusedImports"/>
@@ -16,13 +16,17 @@
<rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>
<rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/>
<rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>
- <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"/>
+ <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock">
+ <priority>4</priority>
+ </rule>
<rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>
<rule ref="rulesets/basic.xml/UnnecessaryReturn"/>
<rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>
<rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>
<rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>
- <rule ref="rulesets/basic.xml/BooleanInstantiation"/>
+ <rule ref="rulesets/basic.xml/BooleanInstantiation">
+ <priority>4</priority>
+ </rule>
<rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>
<rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>
<rule ref="rulesets/basic.xml/UselessOverridingMethod"/>
@@ -51,20 +55,22 @@
<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>
<rule ref="rulesets/logging-java.xml/SystemPrintln"/>
<rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>
- <rule ref="rulesets/controversial.xml/UnnecessaryConstructor"/>
- <rule ref="rulesets/controversial.xml/NullAssignment"/>
- <rule ref="rulesets/controversial.xml/OnlyOneReturn"/>
+ <rule ref="rulesets/controversial.xml/NullAssignment">
+ <priority>5</priority>
+ </rule>
<rule ref="rulesets/controversial.xml/UnusedModifier"/>
<rule ref="rulesets/controversial.xml/AssignmentInOperand"/>
- <rule ref="rulesets/controversial.xml/AtLeastOneConstructor"/>
<rule ref="rulesets/controversial.xml/DontImportSun"/>
<rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>
<rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>
<rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>
- <rule ref="rulesets/controversial.xml/DefaultPackage"/>
- <rule ref="rulesets/controversial.xml/BooleanInversion"/>
+ <rule ref="rulesets/controversial.xml/DefaultPackage">
+ <priority>5</priority>
+ </rule>
+ <rule ref="rulesets/controversial.xml/BooleanInversion">
+ <priority>5</priority>
+ </rule>
<rule ref="rulesets/controversial.xml/DataflowAnomalyAnalysis"/>
- <rule ref="rulesets/controversial.xml/AvoidFinalLocalVariable"/>
<rule ref="rulesets/controversial.xml/AvoidUsingShortType"/>
<rule ref="rulesets/controversial.xml/AvoidUsingVolatile"/>
<rule ref="rulesets/controversial.xml/AvoidUsingNativeCode"/>
@@ -108,6 +114,15 @@
<rule ref="rulesets/migrating.xml/JUnit4TestShouldUseTestAnnotation"/>
<rule ref="rulesets/migrating.xml/JUnit4SuitesShouldUseSuiteAnnotation"/>
<rule ref="rulesets/migrating.xml/JUnitUseExpected"/>
+ <rule ref="rulesets/j2ee.xml/UseProperClassLoader"/>
+ <rule ref="rulesets/j2ee.xml/MDBAndSessionBeanNamingConvention"/>
+ <rule ref="rulesets/j2ee.xml/RemoteSessionInterfaceNamingConvention"/>
+ <rule ref="rulesets/j2ee.xml/LocalInterfaceSessionNamingConvention"/>
+ <rule ref="rulesets/j2ee.xml/LocalHomeNamingConvention"/>
+ <rule ref="rulesets/j2ee.xml/RemoteInterfaceNamingConvention"/>
+ <rule ref="rulesets/j2ee.xml/DoNotCallSystemExit"/>
+ <rule ref="rulesets/j2ee.xml/StaticEJBFieldShouldBeFinal"/>
+ <rule ref="rulesets/j2ee.xml/DoNotUseThreads"/>
<rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal"/>
<rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal"/>
<rule ref="rulesets/optimizations.xml/AvoidInstantiatingObjectsInLoops"/>
@@ -139,10 +154,13 @@
<rule ref="rulesets/junit.xml/UseAssertNullInsteadOfAssertTrue"/>
<rule ref="rulesets/junit.xml/SimplifyBooleanAssertion"/>
<rule ref="rulesets/naming.xml/ShortVariable"/>
- <rule ref="rulesets/naming.xml/LongVariable"/>
<rule ref="rulesets/naming.xml/ShortMethodName"/>
- <rule ref="rulesets/naming.xml/VariableNamingConventions"/>
- <rule ref="rulesets/naming.xml/MethodNamingConventions"/>
+ <rule ref="rulesets/naming.xml/VariableNamingConventions">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/naming.xml/MethodNamingConventions">
+ <priority>3</priority>
+ </rule>
<rule ref="rulesets/naming.xml/ClassNamingConventions"/>
<rule ref="rulesets/naming.xml/AbstractNaming"/>
<rule ref="rulesets/naming.xml/AvoidDollarSigns"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2009-04-21 11:22:12
|
Revision: 4667
http://fudaa.svn.sourceforge.net/fudaa/?rev=4667&view=rev
Author: hadouxad
Date: 2009-04-21 11:10:32 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
Commit pc portable
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.core.resources.prefs
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue09reader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/DCFileReader.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CrueIODico.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.dc
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.dh
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele5.dc
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele5.dh
trunk/soft/fudaa-crue/dodico/src/test/resources/fichiersTestCorriges/Modele4.dc
trunk/soft/fudaa-crue/dodico/src/test/resources/fichiersTestCorriges/Modele4.dh
trunk/soft/fudaa-crue/dodico/src/test/resources/fichiersTestCorriges/Modele5.dc
trunk/soft/fudaa-crue/dodico/src/test/resources/fichiersTestCorriges/Modele5.dh
Removed Paths:
-------------
trunk/soft/fudaa-crue/fudaa/Fichiers_donnees_Crue/Modele 3/
trunk/soft/fudaa-crue/fudaa/Fichiers_donnees_Crue/Modele 4/
trunk/soft/fudaa-crue/fudaa/Fichiers_donnees_Crue/Modele 5/
Modified: trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.core.resources.prefs 2009-04-20 21:46:48 UTC (rev 4666)
+++ trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.core.resources.prefs 2009-04-21 11:10:32 UTC (rev 4667)
@@ -1,3 +1,4 @@
-#Sat Apr 11 00:21:39 CEST 2009
+#Tue Apr 21 09:04:32 CEST 2009
eclipse.preferences.version=1
+encoding//src/test/resources/fichierTest/Modele3.dc=UTF-8
encoding/<project>=UTF-8
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue09reader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue09reader.java 2009-04-20 21:46:48 UTC (rev 4666)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue09reader.java 2009-04-21 11:10:32 UTC (rev 4667)
@@ -61,17 +61,13 @@
*
* @throws IOException
*/
- public List<String> passerCommentaires() throws IOException {
+ public List<String> lireSuiteEtpasserCommentairesSansMotclef() throws IOException {
final List<String> commentaires = new ArrayList<String>();
+ in_.readFields();
String ligne = in_.getLine();
- if (ligne == null) {
- in_.readFields();
- ligne = in_.getLine();
- }
-
// -- lit toutes les lignes de début de fichier avec des commentaires --//
- while (isACommentLine(ligne)) {
+ while (isACommentLine(ligne) && !ligne.contains(keyWordDefinition)) {
commentaires.add(ligne);
in_.readFields();
ligne = in_.getLine();
@@ -89,7 +85,7 @@
public void readHeader() throws IOException {
// -- on commence par lire tous les commentaires du debut de fichier --//
- passerCommentaires();
+ lireSuiteEtpasserCommentairesSansMotclef();
// -- on lit ensuite les 5 premiers titres du fichier --//
final String ligne = null;
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CrueIODico.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CrueIODico.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CrueIODico.java 2009-04-21 11:10:32 UTC (rev 4667)
@@ -0,0 +1,31 @@
+package org.fudaa.dodico.crue.io;
+
+/**
+ * Dictionnaire des donnees des fichiers Crue9. Y sont déclarés les variables de type d'élément, le nombre de champs....
+ *
+ * @author Adrien Hadoux
+ */
+public final class CrueIODico {
+
+ // -- Encart réservé aux branches
+
+ /** l'identifiant de la ligne de branche, premier mot en début de fichier **/
+ public final static String BRANCHE_TYPE = "BRANCHE";
+ public final static String BRANCHE_DISTANCE = "DISTANCE";
+ public final static String BRANCHE_PROF = "PROF";
+ public final static String BRANCHE_DISTMAX = "DISTMAX";
+ public final static String BRANCHE_CCONV = "CCONV";
+ public final static String BRANCHE_CPOND = "CPOND";
+ public final static String BRANCHE_CDIV = "CDIV";
+
+ public final static String BRANCHE_BORDA = "BORDA";
+ public final static String BRANCHE_ZQ = "Z/Q";
+ public final static String BRANCHE_SEUIL = "SEUIL";
+ public final static String BRANCHE_CCTRMAX = "CCTRMAX";
+ public final static String BRANCHE_CLAPET = "CLAPET";
+
+ // public final static String BRANCHE_CCONV = "CCONV";
+ // public final static String BRANCHE_CCONV = "CCONV";
+ // public final static String BRANCHE_CCONV = "CCONV";
+
+}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/DCFileReader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/DCFileReader.java 2009-04-20 21:46:48 UTC (rev 4666)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/DCFileReader.java 2009-04-21 11:10:32 UTC (rev 4667)
@@ -1,10 +1,28 @@
package org.fudaa.dodico.crue.io;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
import org.fudaa.ctulu.CtuluActivity;
+import org.fudaa.dodico.crue.common.CrueResource;
import org.fudaa.dodico.crue.dao.CrueHelper;
+import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
+import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
+import org.fudaa.dodico.crue.metier.emh.CatEMHSection;
import org.fudaa.dodico.crue.metier.emh.CrueData;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheOrifice;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilLongitudinale;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheStrickler;
+import org.fudaa.dodico.crue.metier.emh.EMHNoeudNiveauContinu;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionProfil;
+import org.fudaa.dodico.crue.metier.emh.RelationEMH;
+import org.fudaa.dodico.crue.metier.helper.EMHHelper;
+import org.fudaa.dodico.crue.metier.helper.EMHNoeudHelper;
+import org.fudaa.dodico.crue.metier.helper.EMHSectionHelper;
/**
* Reader pour le format DC crue 9
@@ -54,35 +72,279 @@
public void readBranches(final CrueData metier) throws IOException {
// -- on commence par lire tous les commentaires du debut de fichier --//
- passerCommentaires();
+ lireSuiteEtpasserCommentairesSansMotclef();
// -- la ligne qui sera lu à chaque appel du reader. --//
final String lineRead = in_.getLine();
+ // -- si la ligne lue est un keyWord(definition branche), on la passe--//
+ // -- sinon on ne peut pas passer dans le while --//
+ if (isAKeyWordDefinition(lineRead)) {
+ lireSuiteEtpasserCommentairesSansMotclef();
+ }
+
// -- tant qu'on ne revient pas a une nouvelle définition--//
while (!isAKeyWordDefinition(lineRead)) {
- // // ce sont des var on les ajoute toutes
- // int nbFields = in_.getNumberOfFields();
- // for (int i = 0; i < nbFields; i++) {
- // // on inscrit la valeur pour la variable du pas de temps
- // // correspondant
- // double value = key.VALUE_UNDEFINED;
- // if (!key.isUndefined(in_.stringField(i))) {
- // value = in_.doubleField(i);
- // }
- //
- // structure.addValueForVariableAtSeparator(value, i, valuePasDetemps);
- // }
+ // -- analyse du premier element de la ligne pour gerer la bonne lecture --//
+ String element = in_.stringField(0);
- // on lit la suite en passant les commentaires
- in_.readFields();
- passerCommentaires();
+ if (element.toUpperCase().equals(CrueIODico.BRANCHE_TYPE)) {
+ readTypeBranche(metier);
+ } else {
+ in_.readFields();
+ }
}
+ }
+ /**
+ * Lit le type d'une branche. Ligne du type BRANCHE B2 N2 N3 20
+ *
+ * @param metier
+ * @throws IOException
+ */
+ public void readTypeBranche(final CrueData metier) throws IOException {
+
+ int nbFieldsBranche = in_.getNumberOfFields();
+ if (nbFieldsBranche >= 5) {
+ String nomBranche = in_.stringField(1);
+
+ // -- creation des noeuds amont et avals --//
+ String nomNoeudAmont = in_.stringField(2);
+ CatEMHNoeud noeudAmont = EMHNoeudHelper.findByReference(nomNoeudAmont, metier);
+ if (noeudAmont == null) {
+ noeudAmont = new EMHNoeudNiveauContinu(nomNoeudAmont);
+ metier.add(noeudAmont);
+ }
+ String nomNoeudAval = in_.stringField(3);
+ CatEMHNoeud noeudAval = EMHNoeudHelper.findByReference(nomNoeudAval, metier);
+ if (noeudAval == null) {
+ noeudAval = new EMHNoeudNiveauContinu(nomNoeudAval);
+ metier.add(noeudAval);
+ }
+
+ // -- creation de la branche en fonction de son type --//
+ int typebranche = in_.intField(4);
+
+ CatEMHBranche branche = readBrancheGeneral(typebranche, metier, nomBranche);
+
+ // -- ajout des relations des noeuds amont et avals --//
+ if (branche != null) {
+ branche.setNoeudAmont(noeudAmont);
+ branche.setNoeudAval(noeudAval);
+ } else {
+ analyze_.addError(CrueResource.getS("Objet Branche null. Ligne:" + in_.getLine()), in_.getLineNumber());
+ }
+
+ } else {
+ analyze_.addError(CrueResource.getS("Ligne Branche mal formée, attendu: 5 elements. Ligne:" + in_.getLine()), in_
+ .getLineNumber());
+ }
}
+ /**
+ * Creer la branche specifique en fonction de son numero type.
+ *
+ * @param typebranche
+ * @param id
+ * @return
+ */
+ public CatEMHBranche createBrancheSpecifique(final int typebranche, final String id) {
+
+ switch (typebranche) {
+ case 20:
+ return new EMHBrancheSaintVenant(id);
+ case 2:
+ return new EMHBrancheSeuilTransversal(id);
+ case 4:
+ return new EMHBrancheSeuilLongitudinale(id);
+ case 6:
+ return new EMHBrancheStrickler(id);
+ case 5:
+ return new EMHBrancheOrifice(id);
+
+ default:
+ return null;
+ }
+
+ }
+
+ /**
+ * Lit toutes les branches en adaptant le contenu selon les lignes lues. Arrive à la ligne début de branche. Lit
+ * toutes les lignes correspondantes à la branche saint venant.
+ *
+ * @param metier
+ * @return
+ * @throws IOException
+ */
+ public CatEMHBranche readBrancheGeneral(final int typeBranche, final CrueData metier, final String idBranche)
+ throws IOException {
+ CatEMHBranche branche = createBrancheSpecifique(typeBranche, idBranche);
+
+ if (branche == null) {
+ analyze_.addError(CrueResource.getS("Impossible de créer la branche, type de branche inconnu ") + typeBranche,
+ in_.getLineNumber());
+ return null;
+ }
+
+ // -- lecture du contenu formatté branche saint venant --//
+ lireSuiteEtpasserCommentairesSansMotclef();
+ String lineRead = in_.getLine();
+
+ // -- la liste des distances Xp sont affichées avant les sections --//
+ List<List<Double>> listeDistance = new ArrayList<List<Double>>();
+ // -- la liste des coef Cconv sont affichées avant les sections --//
+ List<List<Double>> listeCconv = new ArrayList<List<Double>>();
+ // -- la liste des coef Cpond sont affichées avant les sections --//
+ List<List<Double>> listeCpond = new ArrayList<List<Double>>();
+ // -- la liste des coef Cdiv sont affichées avant les sections --//
+ List<List<Double>> listeCdiv = new ArrayList<List<Double>>();
+
+ // -- la liste des sections branches --//
+ List<List<CatEMHSection>> listeSectionBranche = new ArrayList<List<CatEMHSection>>();
+ // -- tant qu'on est pas arrivé à une autre branche ou une autre definition, on lit les infos de la branche --//
+ while (!lineRead.toUpperCase().contains(CrueIODico.BRANCHE_TYPE) && !isAKeyWordDefinition(lineRead)) {
+ // -- recuperation de l'element lu en 1ere position --//
+ String typeLigne = in_.stringField(0);
+
+ // -- remplissage des distances par rapport aux sections --//
+ // ex: DISTANCE 100.00 100.00 100.00
+ if (typeLigne.toUpperCase().equals(CrueIODico.BRANCHE_DISTANCE)) {
+ List<Double> distances = new ArrayList<Double>();
+ // -- peut y avoir 1 ou plusieurs coefficients --//
+ for (int i = 0; i < in_.getNumberOfFields(); i++) {
+ distances.add(in_.doubleField(i));
+ }
+ listeDistance.add(distances);
+ } else
+ // -- gestion des sections profils --//
+ // ex: PROF PROF6B PROF5 PROF4 PROF3A
+ if (typeLigne.toUpperCase().equals(CrueIODico.BRANCHE_PROF)) {
+ List<CatEMHSection> sections = new ArrayList<CatEMHSection>();
+ // -- peut y avoir 1 ou plusieurs coefficients --//
+ for (int i = 0; i < in_.getNumberOfFields(); i++) {
+ String nomSection = in_.stringField(i);
+ CatEMHSection profil = EMHSectionHelper.findByReference(nomSection, metier);
+ if (profil == null) {
+ profil = new EMHSectionProfil(nomSection);
+ }
+ sections.add(profil);
+ }
+ listeSectionBranche.add(sections);
+ } else
+ // TODO: DISTMAX a gerer , demander CNR--//
+ if (typeLigne.toUpperCase().equals(CrueIODico.BRANCHE_DISTMAX)) {
+
+ } else
+ // -- coefficients cconv --//
+ if (typeLigne.toUpperCase().equals(CrueIODico.BRANCHE_CCONV)) {
+ List<Double> convs = new ArrayList<Double>();
+ // -- peut y avoir 1 ou plusieurs coefficients --//
+ for (int i = 0; i < in_.getNumberOfFields(); i++) {
+ convs.add(in_.doubleField(i));
+ }
+ listeCconv.add(convs);
+ } else
+ // -- coefficients cconv --//
+ if (typeLigne.toUpperCase().equals(CrueIODico.BRANCHE_CPOND)) {
+ List<Double> cponds = new ArrayList<Double>();
+ // -- peut y avoir 1 ou plusieurs coefficients --//
+ for (int i = 0; i < in_.getNumberOfFields(); i++) {
+ cponds.add(in_.doubleField(i));
+ }
+ listeCpond.add(cponds);
+ } else
+ // -- coefficients cconv --//
+ if (typeLigne.toUpperCase().equals(CrueIODico.BRANCHE_CDIV)) {
+ List<Double> cdivs = new ArrayList<Double>();
+ // -- peut y avoir 1 ou plusieurs coefficients --//
+ for (int i = 0; i < in_.getNumberOfFields(); i++) {
+ cdivs.add(in_.doubleField(i));
+ }
+ listeCdiv.add(cdivs);
+ }
+
+ // -- on lit la suite en passant les commentaires sans mot clef --//
+ lireSuiteEtpasserCommentairesSansMotclef();
+ }// on boucle sur le while.
+
+ // -- on remplit les distances avec les bonnes sections profils crees --//
+ int indiceListeSectionProfils = 0;
+ List<RelationEMH> listeRelationEmh = new ArrayList<RelationEMH>();
+ for (List<CatEMHSection> sections : listeSectionBranche) {
+ int indiceSection = 0;
+ for (CatEMHSection section : sections) {
+
+ // -- donnees liees aux section profils de branches, cf DRSO --//
+ double xp = -1;
+ double coefPond = -1;
+ double coefConv = -1;
+ double coefDiv = -1;
+
+ // -- en fonction des parametres lus, ajoute les bonnes relations EMH --//
+
+ // -- DISTANCE --//
+ if (listeDistance.size() > indiceListeSectionProfils && listeDistance.get(indiceListeSectionProfils) != null) {
+ // - cas particulier: une valeur sur toute la ligne à associer a tous les xp --//
+ if (listeDistance.get(indiceListeSectionProfils).size() == 1) {
+ xp = listeDistance.get(indiceListeSectionProfils).get(0);
+ } else if (listeDistance.get(indiceListeSectionProfils).size() > indiceSection) {
+ xp = listeDistance.get(indiceListeSectionProfils).get(indiceSection);
+ }
+ }
+ // -- cconv --//
+ if (listeCconv.size() > indiceListeSectionProfils && listeCconv.get(indiceListeSectionProfils) != null) {
+ // - cas particulier: une valeur sur toute la ligne à associer a tous les xp --//
+ if (listeCconv.get(indiceListeSectionProfils).size() == 1) {
+ coefConv = listeCconv.get(indiceListeSectionProfils).get(0);
+ } else if (listeCconv.get(indiceListeSectionProfils).size() > indiceSection) {
+ coefConv = listeCconv.get(indiceListeSectionProfils).get(indiceSection);
+ }
+ }
+ // -- cdiv --//
+ if (listeCdiv.size() > indiceListeSectionProfils && listeCdiv.get(indiceListeSectionProfils) != null) {
+ // - cas particulier: une valeur sur toute la ligne à associer a tous les xp --//
+ if (listeCdiv.get(indiceListeSectionProfils).size() == 1) {
+ coefConv = listeCdiv.get(indiceListeSectionProfils).get(0);
+ } else if (listeCdiv.get(indiceListeSectionProfils).size() > indiceSection) {
+ coefConv = listeCdiv.get(indiceListeSectionProfils).get(indiceSection);
+ }
+ }
+ // -- cpond --//
+ if (listeCpond.size() > indiceListeSectionProfils && listeCpond.get(indiceListeSectionProfils) != null) {
+ // - cas particulier: une valeur sur toute la ligne à associer a tous les xp --//
+ if (listeCpond.get(indiceListeSectionProfils).size() == 1) {
+ coefConv = listeCpond.get(indiceListeSectionProfils).get(0);
+ } else if (listeCpond.get(indiceListeSectionProfils).size() > indiceSection) {
+ coefConv = listeCpond.get(indiceListeSectionProfils).get(indiceSection);
+ }
+ }
+
+ // -- ajout de la section dans les données métier --//
+ metier.add(section);
+
+ // -- ajout de la section de la branche, relationEMH --//
+ final HashMap<String, Object> map = new HashMap<String, Object>();
+ map.put(EMHHelper.Pos_section, "");
+ map.put(EMHHelper.Xp_section, xp);
+ map.put(EMHHelper.Coeff_Pond, coefPond);
+ map.put(EMHHelper.Coeff_Div, coefDiv);
+ map.put(EMHHelper.Coeff_Conv, coefConv);
+
+ final RelationEMH relation = new RelationEMH(section, map);
+ listeRelationEmh.add(relation);
+ indiceSection++;
+ }
+ indiceListeSectionProfils++;
+ }
+
+ // -- on ajoute la liste des relations EMH à la branche --//
+ branche.setListeSections(listeRelationEmh);
+
+ return branche;
+ }
+
public void stop() {}
}
Added: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.dc
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.dc (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.dc 2009-04-21 11:10:32 UTC (rev 4667)
@@ -0,0 +1,18107 @@
+* Donn\xE9es g\xE9n\xE9rales
+* --------------------------
+* 5 lignes de titre
+TITRE CrueX - Structuration des donn\xE9es
+TITRE
+TITRE Mod\xE8le de test utilisant une branche15
+TITRE
+TITRE PBa Jan09 sur la base de MO2009
+*
+*** MONTELIMAR 2009 *******************************************************
+* Mise \xE0 jour effectu\xE9e par M.DECACHARD et T.FRETAUD en novembre 2008
+* - Vieux-Rh\xF4ne de Logis Neuf de novembre 2004
+* - Canal de Fuite de Logis Neuf de janvier 2008
+* - Retenue de Montelimar de f\xE9vrier 2008
+* - Canal d'amen\xE9e d'avril 2008
+* - Aval du barrage de Rochemaure de novembre 2005
+* - Roubion d'ao\xFBt 2008, malgr\xE9 le manque de donn\xE9es de calage
+* - Point de r\xE9glage au P152.200
+***************************************************************************
+*
+* dal theta isorti
+COEFF 1.00 0.75
+*
+*
+* D\xE9finition des branches
+* --------------------------
+*
+***BRANCHE VIEUX RHONE*****************************************************
+* Supprim\xE9es (entre P135.800 et P143.7D)
+*
+***BRANCHE CANAL DE FUITE**************************************************
+* Supprim\xE9es (entre CF142.50 et P143.7G)
+*
+***LIAISON CASIER - LIT VIEUX RHONE****************************************
+* Supprim\xE9es
+*
+***RETENUE DE MONTELIMAR***************************************************
+* Supprim\xE9es (entre P143.700 et P147.400)
+*
+BRANCHE BRET23B NRET23 RET23BIS 20
+DISTANCE 105.0000 97.0000 107.0000 96.0000 113.0000
+DISTANCE 101.0000 97.0000 83.0000 105.000 97.0000
+DISTANCE 77.0000 85.0000 87.0000 63.0000 62.0000
+DISTANCE 106.0000 121.000 94.0000 92.0000 116.0000
+PROF P147.4B P147.500 P147.600 P147.700 P147.800
+PROF P147.900 P148.000 P148.100 P148.200 P148.300
+PROF P148.400 P148.450 P148.500 P148.600 P148.700
+PROF P148.800 P148.900 P149.000 P149.100 P149.200
+PROF P149.300
+*
+BRANCHE BRET24 RET23BIS NRET24 20
+DISTANCE 117.0000 82.0000 72.0000 67.0000 82.0000
+DISTANCE 97.0000 90.0000 131.0000 130.0000 106.0000
+DISTANCE 112.0000 92.0000 85.0000 68.0000 66.0000
+DISTANCE 125.0000 124.0000 95.0000 76.0000 99.000
+PROF P149.3B P149.400 P149.500 P149.600 P149.700
+PROF P149.800 P149.900 P150.000 P150.100 P150.200
+PROF P150.300 P150.400 P150.500 P150.600 P150.700
+PROF P150.800 P150.900 P151.000 P151.100
+PROF P151.150 P151.200
+CCONV 0 0.2 0.2 0.2 0.2
+CCONV 0.3 0.3 0 0 0
+CCONV 0 0 0 0 0
+CCONV 0 0 0 0 0
+*
+BRANCHE BRET25 NRET24 NPR 20
+DISTANCE 120.0000 118.0000 66.0000 77.0000 108.0000
+DISTANCE 100.0000 107.0000 104.000 101.000 97.0000
+PROF P151.2B P151.300 P151.400 P151.500 P151.600
+PROF P151.700 P151.800 P151.900 P152.000 P152.100
+PROF P152.200
+CCONV 0 0 0 0 0
+CCONV 0 0.1 0.6 0 0
+*
+BRANCHE BRET26 NPR NRET25 20
+DISTANCE 118.0000 97.0000 69.0000 61.0000
+PROF P152.2d P152.3d P152.4d P152.5d P152.6d
+*
+* Amont barrage de Rochemaure
+BRANCHE BBGE1 NRET25 NBROCH 20
+DISTANCE 81 74 74
+PROF P152.6bd P152.7d P152.8d P152.9d
+*
+* Travers\xE9e du barrage de Montelimar - Loi de type 15
+BRANCHE BBGE2 NBROCH NBGE2 15
+* NBPQ Qmin Qmax NOMREF Phi Npas Lpas Zseuil Cseuil
+QMIN/QMAX -11000.000 11000.000
+NOMREF P150.500
+PARAM 0.9000 6 26.000 65.000 1.0000
+Z/Q 77.000 0.000 77.000 2000.000 77.000 2100.000
+Z/Q 77.000 2500.000 77.000 2600.000 77.000 2700.000
+Z/Q 77.000 2800.000 77.000 2850.000 77.000 2900.000
+Z/Q 77.000 3000.000 76.480 4000.000 75.930 5000.000
+Z/Q 75.880 6000.000 75.800 7000.000 75.700 8000.000
+Z/Q 75.620 8500.000 75.580 9000.000 75.470 9500.000
+Z/Q 75.360 10000.000
+PROF PROFAM PROFAV
+*
+BRANCHE BAVB3 NBGE2 NBGE3 20
+DISTANCE 20.0000
+PROF PROFAV1 PROFAV2
+*
+***LIAISON CASIER - LIT RETENUE********************************************
+* Supprim\xE9es
+*
+***CANAL D'AMENEE DE MONTELIMAR ET BARRAGE DE ROCHEMAURE*******************
+* Canal d'amen\xE9e de Chateauneuf
+* dimensionn\xE9 pour pouvoir tester disjonction avec pas de 20m
+BRANCHE BCA0 NPR NCA0 20
+PROF P152.2G P152.3G P152.4G P152.5G P152.6G
+DISTANCE 118.0000 97.0000 69.0000 61.0000
+distmax 50
+*
+BRANCHE BCA1 NCA0 NCA1 20
+DISTANCE 90.000 76.000 74.0000 81.0000
+PROF P152.6bG P152.7G P152.8G P152.9G CK153.00
+distmax 50
+*
+BRANCHE BCA2 NCA1 NCA2 20
+DISTANCE 504.000
+PROF CK153.B CK153.50
+distmax 50
+*
+BRANCHE BCA3 NCA2 NCA3 20
+DISTANCE 509.0000
+PROF CK153.5B CK154.00
+distmax 50
+*
+BRANCHE BCA4 NCA3 NCA4 20
+DISTANCE 500.0000
+PROF CK154.B CK154.50
+distmax 50
+*
+* Dans la branche BCA5, pont de la D11 \xE0 307m de CK154.5B et 203m de CK155.00
+BRANCHE BCA5 NCA4 NCA5 20
+DISTANCE 510.000
+PROF CK154.5B CK155.00
+distmax 50
+*
+BRANCHE BCA6 NCA5 NCA6 20
+DISTANCE 500.000
+PROF CK155.B CK155.50
+distmax 50
+*
+BRANCHE BCA7 NCA6 NCA7 20
+DISTANCE 500.000
+PROF CK155.5B CK156.00
+distmax 50
+*
+BRANCHE BCA8 NCA7 NCA8 20
+DISTANCE 500.000
+PROF CK156.B CK156.50
+distmax 50
+*
+BRANCHE BCA9 NCA8 NCA9 20
+DISTANCE 500.000
+PROF CK156.5B CK157.00
+distmax 50
+*
+* Dans la branche BCA10, pont \xE0 202m de CK157.B et 298m de CK157.50
+BRANCHE BCA10 NCA9 NCA10 20
+DISTANCE 500.000
+PROF CK157.B CK157.50
+distmax 50
+*
+BRANCHE BCA13 NCA10 NROUBION 20
+DISTANCE 509.000
+PROF CK157.5B CK158.00
+distmax 50
+*
+* NROUBION: noeud confluence avec Roubion
+BRANCHE BCA14 NROUBION NCA14 20
+DISTANCE 492.000
+PROF CK158.B CK158.50
+distmax 50
+*
+BRANCHE BCA15 NCA14 NCA15 20
+DISTANCE 500.000
+PROF CK158.5B CK159.00
+distmax 50
+*
+BRANCHE BCA16 NCA15 NCA16 20
+DISTANCE 500.000
+PROF CK159.B CK159.50
+distmax 50
+*
+* Dans la branche BCA17, pont de la D237 \xE0 69m de CK159.5B et 431m de CK160.00
+BRANCHE BCA17 NCA16 NCA17 20
+DISTANCE 500.000
+PROF CK159.5B CK160.00
+distmax 50
+*
+* Supprim\xE9es (entre CK160.B et CK163.00B)
+*
+***CANAL USINIER***********************************************************
+* Supprim\xE9es
+*
+***LE ROUBION**************************************************************
+BRANCHE ROUB1 R1 R2 20
+DISTANCE 55.0000 50.0000 52.0000 51.0000 48.0000
+DISTANCE 51.0000 45.0000 46.0000 50.0000 51.0000
+DISTANCE 57.0000 53.0000 57.0000 59.0000 54.0000
+DISTANCE 59.0000 56.0000 50.0000
+PROF R1 R2 R3 R4 R5
+PROF R6 R7 R8 R9 R10
+PROF R11 R12 R13 R14 R15
+PROF R16 R17 R18 R19
+*
+* Perte de charge pont RN7
+BRANCHE ROUBDZ R2 RN7AV 1
+DZ/Q 0 0 0.03 300
+DZ/Q 0.05 700 0.063 900
+DZ/Q 0.08 1500 0.10 2000
+*
+BRANCHE ROUB2 R2 R3 20
+DISTANCE 65 56.0000 52.0000 56.0000 58.0000
+DISTANCE 51.0000
+DISTANCE 50.0000 52.0000 48.0000 53.0000 49.0000
+DISTANCE 54.0000 47.0000 54.0000 48.0000 52.0000
+DISTANCE 50.0000 46.0000 50.0000 55.0000
+PROF R19A R20 R21 R22 R23 R24
+PROF R25 R26 R27 R28 R29
+PROF R30 R31 R32 R33 R34
+PROF R35 R36 R37 R38 R39
+*
+BRANCHE ROUB3 R3 amtseuil 20
+DISTANCE 56.0000
+PROF R39B R40
+*
+BRANCHE BROUBION4 amtseuil NROUBION 4
+BORDA 0
+SEUIL 106.7 73.50
+*
+*
+* D\xE9finition des frottements
+* --------------------------
+*
+STRIREF K0 0
+STRIREFZ KMIN1 84.00 29 84.50 27
+striref kmin2 40
+striref kmin3 32
+striref kmin6 34
+striref kmin7 38
+striref kmaj 15
+*
+* Vieux-Rh\xF4ne
+STRIREFZ P135.800MIN 60.00 25
+STRIREFZ P135.800MAJ 60.00 10
+STRIREFZ P135.800BMAJ 60.00 18
+*
+STRIREFZ P135.900MIN 60.00 25
+STRIREFZ P135.900MAJ 60.00 10
+STRIREFZ P135.900BMAJ 60.00 18
+*
+STRIREFZ P136.000MIN 60.00 25
+STRIREFZ P136.000MAJ 60.00 10
+STRIREFZ P136.000BMAJ 60.00 18
+*
+STRIREFZ P136.100MIN 60.00 25
+STRIREFZ P136.100MAJ 60.00 10
+STRIREFZ P136.100BMAJ 60.00 18
+*
+STRIREFZ P136.200MIN 60.00 26
+STRIREFZ P136.200MAJ 60.00 10
+STRIREFZ P136.200BMAJ 60.00 18
+*
+STRIREFZ P136.300MIN 60.00 26
+STRIREFZ P136.300MAJ 60.00 16
+STRIREFZ P136.300BMAJ 60.00 25
+*
+STRIREFZ P136.400MIN 60.00 26
+STRIREFZ P136.400MAJ 60.00 16
+STRIREFZ P136.400BMAJ 60.00 25
+*
+STRIREFZ P136.500MIN 60.00 28
+STRIREFZ P136.500MAJ 60.00 18
+STRIREFZ P136.500BMAJ 60.00 25
+*
+STRIREFZ P136.600MIN 60.00 28
+STRIREFZ P136.600MAJ 60.00 18
+STRIREFZ P136.600BMAJ 60.00 25
+*
+STRIREFZ P136.700MIN 60.00 23 80 28
+STRIREFZ P136.700MAJ 60.00 13
+STRIREFZ P136.700BMAJ 60.00 25
+*
+STRIREFZ P136.800MIN 60.00 23 80 28
+STRIREFZ P136.800MAJ 60.00 13
+STRIREFZ P136.800BMAJ 60.00 25
+*
+STRIREFZ P136.900MIN 60.00 23 80 28
+STRIREFZ P136.900MAJ 60.00 13
+STRIREFZ P136.900BMAJ 60.00 25
+*
+STRIREFZ P137.000MIN 60.00 23 80 26
+STRIREFZ P137.000MAJ 60.00 13
+STRIREFZ P137.000BMAJ 60.00 25
+*
+STRIREFZ P137.100MIN 60.00 23 80 26
+STRIREFZ P137.100MAJ 60.00 16
+STRIREFZ P137.100BMAJ 60.00 25
+*
+STRIREFZ P137.200MIN 60.00 23 80 26
+STRIREFZ P137.200MAJ 60.00 25
+*
+STRIREFZ P137.300MIN 60.00 23 80 26
+STRIREFZ P137.300MAJ 60.00 25
+*
+STRIREFZ P137.400MIN 60.00 23 80 30
+STRIREFZ P137.400MAJ 60.00 25
+*
+STRIREFZ P137.500MIN 60.00 23 80 30
+STRIREFZ P137.500MAJ 60.00 25
+*
+STRIREFZ P137.600MIN 60.00 23 80 30
+STRIREFZ P137.600MAJ 60.00 25
+*
+STRIREFZ P137.700MIN 60.00 23 80 30
+STRIREFZ P137.700MAJ 60.00 25
+*
+STRIREFZ P137.800MIN 60.00 23 80 30
+STRIREFZ P137.800MAJ 60.00 25
+*
+STRIREFZ P137.900MIN 60.00 23 80 30
+STRIREFZ P137.900MAJ 60.00 25
+*
+STRIREFZ P138.000MIN 60.00 24 80 30
+STRIREFZ P138.000MAJ 60.00 30
+STRIREFZ P138.000BMAJ 60.00 30
+STRIREFZ P138.000CMAJ 60.00 18
+*
+STRIREFZ P138.100MIN 60.00 26 80 30
+STRIREFZ P138.100MAJ 60.00 35
+STRIREFZ P138.100MAJB 60.00 30
+STRIREFZ P138.100MAJC 60.00 18
+*
+STRIREFZ P138.200MIN 60.00 28
+STRIREFZ P138.200MAJ 60.00 35
+STRIREFZ P138.200MAJB 60.00 30
+STRIREFZ P138.200MAJC 60.00 18
+*
+STRIREFZ P138.300MIN 60.00 30
+STRIREFZ P138.300MAJ 60.00 35
+STRIREFZ P138.300MAJB 60.00 30
+STRIREFZ P138.300MAJC 60.00 15
+*
+STRIREFZ P138.400MIN 60.00 30
+STRIREFZ P138.400MAJ 60.00 35
+STRIREFZ P138.400MAJB 60.00 30
+STRIREFZ P138.400MAJC 60.00 15
+*
+STRIREFZ P138.500MIN 60.00 33
+STRIREFZ P138.500MAJ 60.00 35
+STRIREFZ P138.500BMAJ 60.00 18
+*
+STRIREFZ P138.600MIN 60.00 34
+STRIREFZ P138.600MAJ 60.00 18
+*
+STRIREFZ P138.700MIN 60.00 34
+STRIREFZ P138.700MAJ 60.00 18
+*
+STRIREFZ P138.800MIN 60.00 34
+STRIREFZ P138.800MAJ 60.00 15
+*
+STRIREFZ P138.900MIN 60.00 34
+STRIREFZ P138.900MAJ 60.00 15
+*
+STRIREFZ P139.000MIN 60.00 34
+STRIREFZ P139.000MAJ 60.00 15
+*
+STRIREFZ P139.100MIN 60.00 33
+STRIREFZ P139.100MAJ 60.00 15
+*
+STRIREFZ P139.200MIN 60.00 33
+STRIREFZ P139.200MAJ 60.00 15
+*
+STRIREFZ P139.300MIN 60.00 33
+STRIREFZ P139.300MAJ 60.00 15
+*
+STRIREFZ P139.400MIN 60.00 31
+STRIREFZ P139.400MAJ 60.00 15
+*
+STRIREFZ P139.500MIN 60.00 31
+STRIREFZ P139.500MAJ 60.00 15
+*
+STRIREFZ P139.600MIN 60.00 31
+STRIREFZ P139.600MAJ 60.00 15
+*
+STRIREFZ P139.700MIN 60.00 31
+STRIREFZ P139.700MAJ 60.00 15
+*
+STRIREFZ P139.800MIN 60.00 31
+STRIREFZ P139.800MAJ 60.00 15
+*
+STRIREFZ P139.900MIN 60.00 31
+STRIREFZ P139.900MAJ 60.00 15
+*
+STRIREFZ P140.000MIN 81.20 31
+STRIREFZ P140.000MAJ 60.00 15
+*
+STRIREFZ P140.100MIN 81.20 31
+STRIREFZ P140.100MAJ 60.00 15
+*
+STRIREFZ P140.200MIN 81.20 31
+STRIREFZ P140.200MAJ 60.00 15
+*
+STRIREFZ P140.300MIN 81.20 31
+STRIREFZ P140.300MAJ 60.00 15
+*
+STRIREFZ P140.400MIN 81.20 31
+STRIREFZ P140.400MAJ 60.00 15
+*
+STRIREFZ P140.500MIN 81.20 31
+STRIREFZ P140.500MAJ 60.00 15
+*
+STRIREFZ P140.600MIN 81.20 31
+STRIREFZ P140.600MAJ 60.00 15
+*
+STRIREFZ P140.700MIN 81.00 31
+STRIREFZ P140.700MAJ 60.00 15
+*
+STRIREFZ P140.800MIN 81.00 31
+STRIREFZ P140.800MAJ 60.00 15
+*
+STRIREFZ P140.900MIN 81.00 31
+STRIREFZ P140.900MAJ 60.00 15
+*
+STRIREFZ P141.000MIN 81.00 31
+STRIREFZ P141.000MAJ 60.00 15
+*
+STRIREFZ P141.100MIN 81.00 31
+STRIREFZ P141.100MAJ 60.00 15
+*
+STRIREFZ P141.200MIN 81.00 31
+STRIREFZ P141.200MAJ 60.00 15
+*
+STRIREFZ P141.300MIN 81.00 31
+STRIREFZ P141.300MAJ 60.00 15
+*
+STRIREFZ P141.400MIN 60.00 31
+STRIREFZ P141.400MAJ 60.00 15
+*
+STRIREFZ P141.500MIN 60.00 31
+STRIREFZ P141.500MAJ 60.00 15
+*
+STRIREFZ P141.600MIN 60.00 31
+STRIREFZ P141.600MAJ 60.00 15
+*
+STRIREFZ P141.700MIN 60.00 31
+STRIREFZ P141.700MAJ 60.00 15
+*
+STRIREFZ P141.800MIN 60.00 31
+STRIREFZ P141.800MAJ 60.00 15
+*
+STRIREFZ P141.900MIN 60.00 31
+STRIREFZ P141.900MAJ 60.00 15
+*
+STRIREFZ P142.000MIN 60.00 29
+STRIREFZ P142.000MAJ 60.00 15
+*
+STRIREFZ P142.100MIN 60.00 29
+STRIREFZ P142.100MAJ 60.00 15
+*
+STRIREFZ P142.200MIN 60.00 29
+STRIREFZ P142.200MAJ 60.00 15
+*
+STRIREFZ P142.300MIN 60.00 29
+STRIREFZ P142.300MAJ 60.00 15
+*
+STRIREFZ P142.400MIN 60.00 29
+STRIREFZ P142.400MAJ 60.00 15
+*
+STRIREFZ P142.500MIN 60.00 29
+STRIREFZ P142.500MAJ 60.00 15
+*
+STRIREFZ P142.600MIN 60.00 29
+STRIREFZ P142.600MAJ 60.00 15
+*
+STRIREFZ P142.700MIN 60.00 29
+STRIREFZ P142.700MAJ 60.00 15
+*
+STRIREFZ P142.800MIN 60.00 29
+STRIREFZ P142.800MAJ 60.00 15
+*
+STRIREFZ P142.900MIN 60.00 29
+STRIREFZ P142.900MAJ 60.00 15
+*
+STRIREFZ P143.000MIN 60.00 29
+STRIREFZ P143.000MAJ 60.00 15
+*
+STRIREFZ P143.100MIN 60.00 29
+STRIREFZ P143.100MAJ 60.00 15
+*
+STRIREFZ P143.200MIN 79.30 29
+STRIREFZ P143.200MAJ 60.00 15
+*
+STRIREFZ P143.300MIN 79.30 29
+STRIREFZ P143.300MAJ 60.00 15
+*
+STRIREFZ P143.400MIN 79.30 29
+STRIREFZ P143.400MAJ 60.00 15
+*
+STRIREFZ P143.500MIN 79.30 29
+STRIREFZ P143.500MAJ 60.00 15
+*
+STRIREFZ P143.600MIN 79.30 29
+STRIREFZ P143.600MAJ 60.00 15
+*
+STRIREFZ P143.700MIN 60.00 29
+STRIREFZ P143.700MAJ 60.00 15
+*
+STRIREFZ P143.7DMIN 60.00 28
+STRIREFZ P143.7DMAJ 60.00 15
+*
+STRIREFZ P143.7GMIN 60.00 40
+STRIREFZ P143.7GMAJ 60.00 15
+*
+STRIREFZ CF142.50MIN 60.00 40
+STRIREFZ CF142.50MAJ 60.00 15
+*
+STRIREFZ CF142.75MIN 60.00 40
+STRIREFZ CF142.75MAJ 60.00 15
+*
+STRIREFZ CF142.7DMIN 60.00 40
+STRIREFZ CF142.7DMAJ 60.00 15
+*
+STRIREFZ CF143.00MIN 60.00 40
+STRIREFZ CF143.00MAJ 60.00 15
+*
+STRIREFZ CF143.0DMIN 60.00 40
+STRIREFZ CF143.0DMAJ 60.00 15
+*
+STRIREFZ CF143.25MIN 60.00 40
+STRIREFZ CF143.25MAJ 60.00 15
+*
+STRIREFZ CF143.2DMIN 60.00 40
+STRIREFZ CF143.2DMAJ 60.00 15
+*
+* La retenue de Montelimar
+STRIREFZ P143.800MIN 60.00 34
+STRIREFZ P143.800MAJ 60.00 15
+*
+STRIREFZ P143.900MIN 60.00 34
+STRIREFZ P143.900MAJ 60.00 15
+*
+STRIREFZ P144.000MIN 60.00 34
+STRIREFZ P144.000MAJ 60.00 15
+*
+STRIREFZ P144.100MIN 60.00 34
+STRIREFZ P144.100MAJ 60.00 15
+*
+STRIREFZ P144.200MIN 60.00 34
+STRIREFZ P144.200MAJ 60.00 15
+*
+STRIREFZ P144.300MIN 60.00 34
+STRIREFZ P144.300MAJ 60.00 15
+*
+STRIREFZ P144.400MIN 60.00 34
+STRIREFZ P144.400MAJ 60.00 15
+*
+STRIREFZ P144.500MIN 60.00 33
+STRIREFZ P144.500MAJ 60.00 15
+*
+STRIREFZ P144.600MIN 78.20 30
+STRIREFZ P144.600MAJ 60.00 15
+*
+STRIREFZ P144.700MIN 78.20 30
+STRIREFZ P144.700MAJ 60.00 15
+*
+STRIREFZ P144.800MIN 78.20 30
+STRIREFZ P144.800MAJ 60.00 15
+*
+STRIREFZ P144.900MIN 78.20 27
+STRIREFZ P144.900MAJ 60.00 15
+*
+STRIREFZ P145.000MIN 78.20 27
+STRIREFZ P145.000MAJ 60.00 15
+*
+STRIREFZ P145.100MIN 60.00 27
+STRIREFZ P145.100MAJ 60.00 15
+*
+STRIREFZ P145.200MIN 60.00 27
+STRIREFZ P145.200MAJ 60.00 15
+*
+STRIREFZ P145.300MIN 60.00 27
+STRIREFZ P145.300MAJ 60.00 15
+*
+STRIREFZ P145.400MIN 60.00 27
+STRIREFZ P145.400MAJ 60.00 10
+*
+STRIREFZ P145.500MIN 60.00 27
+STRIREFZ P145.500MAJ 60.00 10
+*
+STRIREFZ P145.600MIN 60.00 30
+STRIREFZ P145.600MAJ 60.00 10
+*
+STRIREFZ P145.700MIN 60.00 30
+STRIREFZ P145.700MAJ 60.00 10
+*
+STRIREFZ P145.800MIN 60.00 33
+STRIREFZ P145.800MAJ 60.00 10
+*
+STRIREFZ P145.900MIN 60.00 33
+STRIREFZ P145.900MAJ 60.00 10
+*
+STRIREFZ P145.950MIN 60.00 33
+STRIREFZ P145.950MAJ 60.00 10
+*
+STRIREFZ P146.000MIN 60.00 33
+STRIREFZ P146.000MAJ 60.00 10
+*
+STRIREFZ P146.100MIN 60.00 33
+STRIREFZ P146.100MAJ 60.00 10
+*
+STRIREFZ P146.200MIN 60.00 33
+STRIREFZ P146.200MAJ 60.00 10
+*
+STRIREFZ P146.300MIN 60.00 33
+STRIREFZ P146.300MAJ 60.00 10
+*
+STRIREFZ P146.400MIN 60.00 33
+STRIREFZ P146.400MAJ 60.00 10
+*
+STRIREFZ P146.500MIN 60.00 33
+STRIREFZ P146.500MAJ 60.00 10
+*
+STRIREFZ P146.600MIN 60.00 33
+STRIREFZ P146.600MAJ 60.00 10
+*
+STRIREFZ P146.700MIN 60.00 33
+STRIREFZ P146.700MAJ 60.00 10
+*
+STRIREFZ P146.800MIN 60.00 33
+STRIREFZ P146.800MAJ 60.00 10
+*
+STRIREFZ P146.900MIN 60.00 33
+STRIREFZ P146.900MAJ 60.00 10
+*
+STRIREFZ P147.000MIN 60.00 33
+STRIREFZ P147.000MAJ 60.00 10
+*
+STRIREFZ P147.100MIN 60.00 33
+STRIREFZ P147.100MAJ 60.00 10
+*
+STRIREFZ P147.200MIN 60.00 33
+STRIREFZ P147.200MAJ 60.00 10
+*
+STRIREFZ P147.300MIN 60.00 33
+STRIREFZ P147.300MAJ 60.00 10
+*
+STRIREFZ P147.400MIN 60.00 27 77.3 24
+STRIREFZ P147.400MAJ 60.00 10
+*
+STRIREFZ P147.500MIN 60.00 27 77.3 24
+STRIREFZ P147.500MAJ 60.00 10
+*
+STRIREFZ P147.600MIN 60.00 27 77.3 24
+STRIREFZ P147.600MAJ 60.00 10
+*
+STRIREFZ P147.700MIN 60.00 27 77.3 24
+STRIREFZ P147.700MAJ 60.00 10
+*
+STRIREFZ P147.800MIN 60.00 32 77.3 24
+STRIREFZ P147.800MAJ 60.00 10
+*
+STRIREFZ P147.900MIN 60.00 32 77.3 24
+STRIREFZ P147.900MAJ 60.00 10
+*
+STRIREFZ P148.000MIN 60.00 38
+STRIREFZ P148.000MAJ 60.00 15
+*
+STRIREFZ P148.100MIN 60.00 38
+STRIREFZ P148.100MAJ 60.00 15
+*
+STRIREFZ P148.200MIN 60.00 37
+STRIREFZ P148.200MAJ 60.00 15
+*
+STRIREFZ P148.300MIN 60.00 36
+STRIREFZ P148.300MAJ 60.00 15
+*
+STRIREFZ P148.400MIN 60.00 36
+STRIREFZ P148.400MAJ 60.00 15
+*
+STRIREFZ P148.450MIN 60.00 36
+STRIREFZ P148.450MAJ 60.00 15
+*
+STRIREFZ P148.500MIN 60.00 36
+STRIREFZ P148.500MAJ 60.00 15
+*
+STRIREFZ P148.600MIN 60.00 35
+STRIREFZ P148.600MAJ 60.00 15
+*
+STRIREFZ P148.700MIN 60.00 35
+STRIREFZ P148.700MAJ 60.00 15
+*
+STRIREFZ P148.800MIN 60.00 35
+STRIREFZ P148.800MAJ 60.00 15
+*
+STRIREFZ P148.900MIN 60.00 35
+STRIREFZ P148.900MAJ 60.00 15
+*
+STRIREFZ P149.000MIN 60.00 35
+STRIREFZ P149.000MAJ 60.00 15
+*
+STRIREFZ P149.100MIN 60.00 35
+STRIREFZ P149.100MAJ 60.00 15
+*
+STRIREFZ P149.200MIN 60.00 35
+STRIREFZ P149.200MAJ 60.00 15
+*
+STRIREFZ P149.300MIN 60.00 35
+STRIREFZ P149.300MAJ 60.00 15
+*
+STRIREFZ P149.400MIN 60.00 35
+STRIREFZ P149.400MAJ 60.00 15
+*
+STRIREFZ P149.500MIN 60.00 35
+STRIREFZ P149.500MAJ 60.00 15
+*
+STRIREFZ P149.600MIN 60.00 35
+STRIREFZ P149.600MAJ 60.00 15
+*
+STRIREFZ P149.700MIN 60.00 35
+STRIREFZ P149.700MAJ 60.00 15
+*
+STRIREFZ P149.800MIN 60.00 35
+STRIREFZ P149.800MAJ 60.00 15
+*
+STRIREFZ P149.900MIN 60.00 35
+STRIREFZ P149.900MAJ 60.00 15
+*
+STRIREFZ P150.000MIN 60.00 35
+STRIREFZ P150.000MAJ 60.00 15
+*
+STRIREFZ P150.100MIN 60.00 36
+STRIREFZ P150.100MAJ 60.00 15
+*
+STRIREFZ P150.200MIN 60.00 36
+STRIREFZ P150.200MAJ 60.00 15
+*
+STRIREFZ P150.300MIN 60.00 36
+STRIREFZ P150.300MAJ 60.00 15
+*
+STRIREFZ P150.400MIN 60.00 36
+STRIREFZ P150.400MAJ 60.00 15
+*
+STRIREFZ P150.500MIN 60.00 36
+STRIREFZ P150.500MAJ 60.00 15
+*
+STRIREFZ P150.600MIN 60.00 36
+STRIREFZ P150.600MAJ 60.00 15
+*
+STRIREFZ P150.700MIN 60.00 36
+STRIREFZ P150.700MAJ 60.00 15
+*
+STRIREFZ P150.800MIN 60.00 36
+STRIREFZ P150.800MAJ 60.00 15
+*
+STRIREFZ P150.900MIN 60.00 36
+STRIREFZ P150.900MAJ 60.00 15
+*
+STRIREFZ P151.000MIN 60.00 36
+STRIREFZ P151.000MAJ 60.00 15
+*
+STRIREFZ P151.100MIN 60.00 36
+STRIREFZ P151.100MAJ 60.00 15
+*
+STRIREFZ P151.150MIN 60.00 36
+STRIREFZ P151.150MAJ 60.00 15
+*
+STRIREFZ P151.200MIN 60.00 36
+STRIREFZ P151.200MAJ 60.00 15
+*
+STRIREFZ P151.300MIN 60.00 36
+STRIREFZ P151.300MAJ 60.00 15
+*
+STRIREFZ P151.400MIN 60.00 36
+STRIREFZ P151.400MAJ 60.00 15
+*
+STRIREFZ P151.500MIN 76.00 36
+STRIREFZ P151.500MAJ 60.00 15
+*
+STRIREFZ P151.600MIN 76.00 36
+STRIREFZ P151.600MAJ 60.00 15
+*
+STRIREFZ P151.700MIN 76.00 36
+STRIREFZ P151.700MAJ 60.00 15
+*
+STRIREFZ P151.800MIN 76.00 36
+STRIREFZ P151.800MAJ 60.00 15
+*
+STRIREFZ P151.900MIN 60.00 36
+STRIREFZ P151.900MAJ 60.00 15
+*
+STRIREFZ P152.000MIN 60.00 38
+STRIREFZ P152.000MAJ 60.00 15
+*
+STRIREFZ P152.100MIN 60.00 38
+STRIREFZ P152.100MAJ 60.00 15
+*
+*
+* Canal d'amen\xE9e de Montelimar
+*
+*
+* Vieux-Rh\xF4ne
+*
+STRIREFZ P152.200MIN 50.00 38
+STRIREFZ P152.200MAJ 50.00 15
+*
+STRIREFZ P152.300MIN 60.00 38
+STRIREFZ P152.300MAJ 60.00 15
+*
+STRIREFZ P152.400MIN 60.00 38
+STRIREFZ P152.400MAJ 60.00 15
+*
+STRIREFZ P152.500MIN 60.00 38
+STRIREFZ P152.500MAJ 60.00 15
+*
+STRIREFZ P152.600MIN 60.00 38
+STRIREFZ P152.600MAJ 60.00 15
+*
+STRIREFZ P152.700MIN 50.00 38
+STRIREFZ P152.700MAJ 50.00 15
+*
+STRIREFZ P152.800MIN 60.00 38
+STRIREFZ P152.800MAJ 60.00 15
+*
+STRIREFZ P152.8GMIN 50.00 38
+STRIREFZ P152.8GMAJ 50.00 15
+*
+STRIREFZ P152.8DMIN 50.00 38
+STRIREFZ P152.8DMAJ 50.00 15
+*
+STRIREFZ P152.900MIN 50.00 38
+STRIREFZ P152.900MAJ 50.00 15
+*
+STRIREFZ P152.900AMIN 50.00 38
+STRIREFZ P152.900AMAJ 50.00 15
+*
+STRIREFZ P152.9GMIN 50.00 38
+STRIREFZ P152.9GMAJ 50.00 15
+*
+STRIREFZ P152.91MIN 50.00 38
+STRIREFZ P152.91MAJ 50.00 15
+*
+STRIREFZ PK15291GMIN 50.00 38
+STRIREFZ PK15291GMAJ 50.00 15
+*
+* Travers\xE9e du barrage de Montelimar
+* stricklers des profils NAMO1 et NAMO2
+STRIREFZ NAMO1MIN 60.00 60
+STRIREFZ NAMO1MAJ 60.00 60
+*
+STRIREFZ NAMO2MIN 60.00 60
+STRIREFZ NAMO2MAJ 60.00 60
+*
+* Canal d'amen\xE9e
+*
+STRIREFZ CK153.00MIN 50.00 38
+STRIREFZ CK153.00MAJ 50.00 15
+*
+STRIREFZ CK153.50MIN 50.00 38
+STRIREFZ CK153.50MAJ 50.00 15
+*
+STRIREFZ CK154.00MIN 50.00 38
+STRIREFZ CK154.00MAJ 50.00 15
+*
+STRIREFZ CK154.50MIN 50.00 38
+STRIREFZ CK154.50MAJ 50.00 15
+*
+STRIREFZ CK155.00MIN 50.00 38
+STRIREFZ CK155.00MAJ 50.00 15
+*
+STRIREFZ CK155.50MIN 50.00 38
+STRIREFZ CK155.50MAJ 50.00 15
+*
+STRIREFZ CK156.00MIN 50.00 38
+STRIREFZ CK156.00MAJ 50.00 15
+*
+STRIREFZ CK156.50MIN 50.00 38
+STRIREFZ CK156.50MAJ 50.00 15
+*
+STRIREFZ CK157.00MIN 50.00 38
+STRIREFZ CK157.00MAJ 50.00 15
+*
+STRIREFZ CK157.50MIN 50.00 38
+STRIREFZ CK157.50MAJ 50.00 15
+*
+STRIREFZ CK158.00MIN 50.00 38
+STRIREFZ CK158.00MAJ 50.00 15
+*
+STRIREFZ CK158.50MIN 50.00 38
+STRIREFZ CK158.50MAJ 50.00 15
+*
+STRIREFZ CK159.00MIN 50.00 38
+STRIREFZ CK159.00MAJ 50.00 15
+*
+STRIREFZ CK159.50MIN 50.00 38
+STRIREFZ CK159.50MAJ 50.00 15
+*
+STRIREFZ CK160.00MIN 50.00 38
+STRIREFZ CK160.00MAJ 50.00 15
+*
+STRIREFZ CK160.50MIN 50.00 38
+STRIREFZ CK160.50MAJ 50.00 15
+*
+STRIREFZ CK161.00MIN 50.00 38
+STRIREFZ CK161.00MAJ 50.00 15
+*
+STRIREFZ CK161.50MIN 50.00 38
+STRIREFZ CK161.50MAJ 50.00 15
+*
+STRIREFZ CK162.00MIN 50.00 38
+STRIREFZ CK162.00MAJ 50.00 15
+*
+STRIREFZ CK162.50MIN 50.00 38
+STRIREFZ CK162.50MAJ 50.00 15
+*
+STRIREFZ CK163.00MIN 50.00 38
+STRIREFZ CK163.00MAJ 50.00 15
+*
+STRIREFZ CK163.50MIN 50.00 38
+STRIREFZ CK163.50MAJ 50.00 15
+*
+STRIREFZ CK163.5BMIN 50.00 38
+STRIREFZ CK163.5BMAJ 50.00 15
+*
+STRIREFZ PUSINEMIN 50.00 36
+STRIREFZ PUSINEMAJ 50.00 15
+*
+STRIREFZ PROFAVMIN 50.00 30
+STRIREFZ PROFAVMAJ 50.00 15
+*
+STRIREFZ NDS1MIN 60.00 15
+*
+STRIREFZ NDS2MIN 60.00 15
+*
+STRIREFZ NDS2DMIN 60.00 15
+*
+STRIREFZ NDS3MIN 60.00 15
+*
+STRIREFZ NDS4MIN 60.00 10
+*
+STRIREFZ NDS5MIN 60.00 10
+*
+STRIREFZ NDS6MIN 60.00 10
+*
+STRIREFZ NDS6DMIN 60.00 10
+*
+STRIREFZ NDS7MIN 60.00 10
+*
+STRIREFZ NDS7DMIN 60.00 10
+*
+STRIREFZ NDS8MIN 60.00 10
+*
+STRIREFZ NDS8DMIN 60.00 10
+*
+STRIREFZ NDS9MIN 60.00 10
+*
+STRIREFZ NDS9DMIN 60.00 10
+*
+STRIREFZ NDS10MIN 60.00 10
+*
+STRIREFZ NDS10DMIN 60.00 10
+*
+STRIREFZ NDS11MIN 60.00 10
+*
+STRIREFZ NDS12MIN 60.00 10
+*
+STRIREFZ NDS6AMIN 60.00 10
+*
+STRIREFZ NDS13MIN 60.00 10
+*
+* D\xE9finition profil Roubion
+STRIREF R1MAJ 30
+STRIREF R1MIN 30
+STRIREF R2MAJ 30
+STRIREF R2MIN 30
+STRIREF R3MAJ 30
+STRIREF R3MIN 30
+STRIREF R4MAJ 30
+STRIREF R4MIN 30
+STRIREF R5MAJ 30
+STRIREF R5MIN 30
+STRIREF R6MAJ 30
+STRIREF R6MIN 30
+STRIREF R7MAJ 30
+STRIREF R7MIN 37
+STRIREF R8MAJ 30
+STRIREF R8MIN 37
+STRIREF R9MAJ 30
+STRIREF R9MIN 37
+STRIREF R10MAJ 30
+STRIREF R10MIN 37
+STRIREF R11MAJ 30
+STRIREF R11MIN 37
+STRIREF R12MAJ 30
+STRIREF R12MIN 37
+STRIREF R13MAJ 30
+STRIREF R13MIN 37
+STRIREF R14MAJ 30
+STRIREF R14MIN 37
+STRIREF R15MAJ 30
+STRIREF R15MIN 37
+STRIREF R16MAJ 30
+STRIREF R16MIN 37
+STRIREF R17MAJ 30
+STRIREF R17MIN 37
+STRIREF R18MAJ 30
+STRIREF R18MIN 37
+STRIREF R19MAJ 30
+STRIREF R19MIN 38
+STRIREF R20MAJ 30
+STRIREF R20MIN 38
+STRIREF R21MAJ 30
+STRIREF R21MIN 38
+STRIREF R22MAJ 30
+STRIREF R22MIN 38
+STRIREF R23MAJ 30
+STRIREF R23MIN 38
+STRIREF R24MAJ 30
+STRIREF R24MIN 38
+STRIREF R25MAJ 30
+STRIREF R25MIN 38
+STRIREF R26MAJ 30
+STRIREF R26MIN 38
+STRIREF R27MAJ 30
+STRIREF R27MIN 38
+STRIREF R28MAJ 30
+STRIREF R28MIN 38
+STRIREF R29MAJ 30
+STRIREF R29MIN 38
+STRIREF R30MAJ 30
+STRIREF R30MIN 38
+STRIREF R31MAJ 30
+STRIREF R31MIN 38
+STRIREF R32MAJ 30
+STRIREF R32MIN 38
+STRIREF R33MAJ 30
+STRIREF R33MIN 38
+STRIREF R34MAJ 30
+STRIREF R34MIN 38
+STRIREF R35MAJ 30
+STRIREF R35MIN 38
+STRIREF R36MAJ 30
+STRIREF R36MIN 38
+STRIREF R37MAJ 30
+STRIREF R37MIN 38
+STRIREF R38MAJ 30
+STRIREF R38MIN 38
+STRIREF R39MAJ 30
+STRIREF R39MIN 38
+STRIREF R40MAJ 30
+STRIREF R40MIN 38
+STRIREF PSEUILvMAJ 30
+STRIREF PSEUILvMIN 38
+*
+* Ecluse
+STRIREFZ P13MAJ 50.00 15
+STRIREFZ P13MIN 50.00 38
+STRIREFZ P14MAJ 50.00 15
+STRIREFZ P14MIN 50.00 38
+STRIREFZ P15MAJ 50.00 15
+STRIREFZ P15MIN 50.00 38
+STRIREFZ P16MAJ 50.00 15
+STRIREFZ P16MIN 50.00 38
+STRIREFZ P17MAJ 50.00 15
+STRIREFZ P17MIN 50.00 38
+STRIREFZ P18MAJ 50.00 15
+STRIREFZ P18MIN 50.00 38
+*
+*
+* D\xE9finition des profils
+* --------------------------
+*
+PROFIDEM PROFAM P152.9D
+PROFIDEM PROFAV1 PROFAV
+PROFIDEM PROFAV2 PROFAV
+PROFIDEM P152.6bd P152.6d
+PROFIDEM P152.6bg P152.6g
+PROFIDEM R19A R19
+PROFIDEM R39B R39
+PROFIDEM P136.3B P136.300
+PROFIDEM P136.6B P136.600
+PROFIDEM P136.8B P136.800
+PROFIDEM P137.1B P137.100
+PROFIDEM P137.4B P137.400
+PROFIDEM P138.4B P138.400
+PROFIDEM P139.6B P139.600
+PROFIDEM P143.1B P143.100
+PROFIDEM P143.3B P143.300
+PROFIDEM P143.4B P143.400
+PROFIDEM P144.B P144.000
+PROFIDEM P145.6B P145.600
+PROFIDEM P147.4B P147.400
+PROFIDEM P149.3B P149.300
+PROFIDEM P151.2B P151.200
+PROFIDEM P152.2B P152.200
+PROFIDEM CK153.B CK153.00
+PROFIDEM CK153.5B CK153.50
+PROFIDEM CK154.B CK154.00
+PROFIDEM CK154.5B CK154.50
+PROFIDEM CK155.B CK155.00
+PROFIDEM CK155.5B CK155.50
+PROFIDEM CK156.B CK156.00
+PROFIDEM CK156.5B CK156.50
+PROFIDEM CK157.B CK157.00
+PROFIDEM CK157.5B CK157.50
+PROFIDEM CK158.B CK158.00
+PROFIDEM CK158.5B CK158.50
+PROFIDEM CK159.B CK159.00
+PROFIDEM CK160.B CK160.00
+PROFIDEM CK160.5B CK160.50
+PROFIDEM CK161.B CK161.00
+PROFIDEM CK161.5B CK161.50
+PROFIDEM CK162.B CK162.00
+PROFIDEM CK162.5B CK162.50
+profidem Pusineb Pusine
+profidem Pusinec Pusine
+PROFIDEM P18bis P18
+profidem p13bis p13
+*
+*D\xE9finition profil de l'\xE9cluse aval
+*Profil d\xE9tail \xE9cluse
+PROFIL P13
+*LIMITEJ 1 1 1 40 40 40
+LIMITEJ 1 1 1 37 37 37
+STRIC K0 P13MAJ P13MIN P13MAJ K0
+X/Z 18.12 73.55 18.38 73.44 18.83 73.17
+X/Z 21.95 72.13 22.40 71.86 23.56 71.57
+X/Z 24.68 71.10 24.89 71.08 24.98 70.90
+X/Z 25.37 70.70 26.62 70.40 26.74 70.08
+X/Z 27.06 70.09 27.11 69.96 27.47 70.04
+X/Z 27.73 69.92 28.39 69.93 29.01 69.53
+X/Z 39.13 69.37 49.13 69.32 51.40 69.49
+X/Z 55.94 69.38 60.82 69.41 66.90 69.32
+X/Z 70.26 69.29 80.08 69.31 88.43 69.26
+X/Z 92.53 69.28 94.54 69.50 101.77 69.38
+X/Z 107.04 69.26 110.69 69.61 112.54 70.42
+X/Z 112.76 70.79 113.13 71.01 113.54 71.44
+X/Z 114.34 71.85 114.95 72.06 115.34 72.06
+X/Z 115.47 72.17
+ACTIF 2 3 4
+LIT MAJD 2
+LIT MINEUR 3
+LIT MAJG 4
+LIT STOCKD 1
+LIT STOCKG 5
+*
+* 05/10/2006 09:46
+PROFIL P14
+LIMITEJ 1 1 1 54 54 54
+STRIC K0 P14MAJ P14MIN P14MAJ K0
+X/Z 13.87 74.42 18.15 74.13 19.18 73.67
+X/Z 19.87 73.45 21.33 72.23 23.02 71.65
+X/Z 23.51 71.30 24.13 71.23 25.45 70.72
+X/Z 26.61 70.38 28.13 70.02 28.44 69.71
+X/Z 29.51 69.53 35.30 69.46 37.08 69.35
+X/Z 43.20 69.33 45.46 69.51 47.94 69.45
+X/Z 51.00 69.29 53.94 69.49 56.50 69.38
+X/Z 62.95 69.28 71.08 69.23 80.08 69.31
+X/Z 84.54 69.44 94.30 69.21 100.28 69.36
+X/Z 104.34 69.35 109.27 69.57 109.77 69.81
+X/Z 111.18 70.05 111.52 70.32 111.62 70.22
+X/Z 111.64 70.04 112.30 69.54 112.43 69.66
+X/Z 112.59 69.93 113.14 70.32 113.18 70.38
+X/Z 113.49 69.94 113.51 70.31 114.14 70.67
+X/Z 115.40 70.61 115.51 70.85 115.83 71.13
+X/Z 115.87 71.30 116.57 71.47 117.41 71.85
+X/Z 117.88 72.34 118.32 72.76 120.34 73.25
+X/Z 120.73 73.30 120.89 73.35 121.04 73.35
+ACTIF 2 3 4
+LIT MAJD 2
+LIT MINEUR 3
+LIT MAJG 4
+LIT STOCKD 1
+LIT STOCKG 5
+*
+* 05/10/2006 09:46
+PROFIL P15
+LIMITEJ 1 1 1 44 44 44
+STRIC K0 P15MAJ P15MIN P15MAJ K0
+X/Z 12.09 74.95 19.74 74.81 25.07 74.33
+X/Z 25.74 74.14 30.22 70.96 31.45 70.54
+X/Z 31.88 70.18 32.47 69.93 32.68 69.63
+X/Z 33.31 69.35 36.66 69.28 40.04 69.19
+X/Z 41.43 69.36 41.74 69.20 44.36 69.20
+X/Z 49.61 69.14 53.27 69.20 56.38 69.11
+X/Z 62.42 69.19 69.58 69.19 78.64 69.16
+X/Z 88.79 69.29 93.29 69.31 96.35 69.21
+X/Z 97.16 69.21 97.60 69.20 101.76 69.23
+X/Z 104.12 69.35 108.05 69.31 109.36 69.39
+X/Z 110.45 69.36 111.25 69.46 112.12 69.80
+X/Z 113.03 70.37 113.37 70.42 113.99 71.23
+X/Z 114.39 71.44 115.35 71.87 115.81 71.87
+X/Z 115.93 72.00 116.48 72.12 121.44 73.50
+X/Z 123.14 74.04 124.17 74.36
+ACTIF 2 3 4
+LIT MAJD 2
+LIT MINEUR 3
+LIT MAJG 4
+LIT STOCKD 1
+LIT STOCKG 5
+*
+* 05/10/2006 09:46
+PROFIL P16
+LIMITEJ 1 1 1 43 43 43
+STRIC K0 P16MAJ P16MIN P16MAJ K0
+X/Z 15.38 73.93 23.18 73.45 27.32 73.09
+X/Z 31.93 70.59 33.69 69.28 36.26 68.87
+X/Z 46.98 69.27 47.55 69.20 48.63 69.21
+X/Z 50.30 69.22 54.30 69.27 56.15 69.29
+X/Z 60.02 69.48 69.65 69.33 71.43 69.31
+X/Z 80.28 69.40 85.61 69.09 86.03 69.23
+X/Z 89.80 69.07 94.90 69.16 98.77 69.34
+X/Z 102.47 69.35 102.50 69.35 102.52 69.35
+X/Z 102.63 69.32 102.90 69.34 103.28 69.47
+X/Z 103.58 69.48 104.06 69.52 105.14 69.48
+X/Z 105.95 69.28 106.03 69.40 106.37 69.30
+X/Z 108.33 69.47 109.99 70.11 110.13 70.43
+X/Z 111.42 70.77 113.62 71.75 116.73 72.19
+X/Z 117.24 72.46 117.91 72.59 120.08 73.51
+X/Z 120.18 73.61
+ACTIF 2 3 4
+LIT MAJD 2
+LIT MINEUR 3
+LIT MAJG 4
+LIT STOCKD 1
+LIT STOCKG 5
+*
+* 05/10/2006 09:46
+PROFIL P17
+LIMITEJ 1 1 1 52 52 52
+STRIC K0 P17MAJ P17MIN P17MAJ K0
+X/Z 13.22 74.70 20.88 73.20 27.56 71.53
+X/Z 30.59 69.94 33.48 69.51 46.00 69.20
+X/Z 46.80 69.10 47.07 69.24 48.35 69.26
+X/Z 49.14 69.55 51.12 69.62 51.83 69.28
+X/Z 53.13 69.16 54.75 69.26 54.94 69.16
+X/Z 55.97 69.29 56.67 69.28 58.41 69.04
+X/Z 59.17 69.23 60.85 69.16 62.43 69.10
+X/Z 70.30 69.13 75.69 69.20 77.57 69.04
+X/Z 78.79 69.08 80.12 69.40 82.22 69.24
+X/Z 83.84 69.41 86.34 69.32 88.63 69.36
+X/Z 88.70 69.38 88.90 69.37 89.24 69.38
+X/Z 89.60 69.38 89.71 69.34 89.72 69.34
+X/Z 89.73 69.35 92.23 69.39 93.66 69.34
+X/Z 95.58 69.32 97.13 69.33 99.58 69.17
+X/Z 100.43 69.27 104.47 69.28 105.18 69.47
+X/Z 105.60 69.46 105.80 69.82 106.19 70.18
+X/Z 109.64 71.12 110.90 71.72 114.33 72.71
+X/Z 114.37 72.82
+ACTIF 2 3 4
+LIT MAJD 2
+LIT MINEUR 3
+LIT MAJG 4
+LIT STOCKD 1
+LIT STOCKG 5
+*
+* 05/10/2006 09:46
+PROFIL P18
+LIMITEJ 1 1 1 49 49 49
+STRIC K0 P18MAJ P18MIN P18MAJ K0
+X/Z 15.40 73.93 19.55 73.67 23.23 72.88
+X/Z 26.11 72.26 28.93 71.55 29.47 71.19
+X/Z 30.38 69.93 31.68 69.48 32.30 69.49
+X/Z 33.78 69.38 35.70 69.41 45.42 69.39
+X/Z 48.96 69.35 54.29 69.43 54.57 69.63
+X/Z 55.69 69.68 56.29 69.38 57.22 69.40
+X/Z 60.65 69.33 63.36 69.14 70.40 69.23
+X/Z 76.98 69.35 81.07 69.12 85.90 69.09
+X/Z 88.36 69.27 88.99 69.25 89.23 69.27
+X/Z 89.28 69.25 89.64 69.26 91.25 69.39
+X/Z 93.35 69.45 97.24 69.37 97.32 69.26
+X/Z 97.48 69.41 97.94 69.33 100.12 69.39
+X/Z 102.86 69.63 103.87 69.80 104.90 70.54
+X/Z 105.03 70.78 105.11 71.36 105.29 71.59
+X/Z 106.17 71.88 106.26 72.04 106.61 72.22
+X/Z 108.49 72.71 109.93 73.16 113.46 73.87
+X/Z 117.08 74.31
+ACTIF 2 3 4
+LIT MAJD 2
+LIT MINEUR 3
+LIT MAJG 4
+LIT STOCKD 1
+LIT STOCKG 5
+*
+*** * PROFIL P153.300 profil situe 300m en aval du bge de Chateauneuf (bief de DM) leve en juillet 2003
+PROFIL PROFAV
+* 15/07/2003 00:00
+LIMITEJ 1 1 1 88 88 88
+STRIC K0 PROFAVMAJ PROFAVMIN PROFAVMAJ K0
+X/Z 0.00 73.87 0.90 73.80 2.93 72.34
+X/Z 6.87 72.05 10.24 70.88 18.84 71.09
+X/Z 22.26 72.29 34.62 72.41 42.06 72.49
+X/Z 51.21 71.70 65.79 70.27 78.96 69.49
+X/Z 88.13 67.67 95.49 67.33 103.02 66.87
+X/Z 110.74 66.21 122.16 66.11 131.94 66.07
+X/Z 134.45 65.67 138.33 65.80 139.39 66.08
+X/Z 150.60 66.18 156.62 66.37 161.77 66.13
+X/Z 167.13 66.15 169.43 65.93 172.43 65.97
+X/Z 173.52 65.90 174.97 65.66 175.99 65.60
+X/Z 188.69 65.45 189.84 65.46 190.27 65.88
+X/Z 190.84 65.96 197.06 66.06 200.37 65.88
+X/Z 204.79 65.94 210.61 66.08 214.52 65.93
+X/Z 215.23 65.82 216.79 65.64 222.82 65.45
+X/Z 227.15 65.29 234.17 65.05 239.16 64.88
+X/Z 243.91 64.68 244.61 64.56 250.26 64.79
+X/Z 253.67 64.80 257.80 65.25 264.67 65.13
+X/Z 266.53 65.33 271.82 65.40 279.33 65.24
+X/Z 287.65 65.37 295.86 65.20 299.57 65.39
+X/Z 306.53 65.16 312.94 64.95 317.58 64.84
+X/Z 324.38 64.77 330.66 64.75 332.25 65.34
+X/Z 332.71 65.72 333.60 65.98 337.26 67.60
+X/Z 343.36 67.52 344.58 66.77 346.95 65.29
+X/Z 349.67 64.38 357.11 64.08 361.82 64.88
+X/Z 363.00 66.79 370.59 71.03 378.22 70.60
+X/Z 382.84 68.77 385.42 68.61 391.72 70.02
+X/Z 392.47 70.20 395.14 71.25 399.95 71.58
+X/Z 400.10 71.91 400.19 71.69 403.88 71.81
+X/Z 412.27 74.79 413.43 75.61 421.00 78.08
+X/Z 423.53 78.23
+ACTIF 2 3 4
+LIT MAJD 2
+LIT MINEUR 3
+LIT MAJG 4
+LIT STOCKD 1
+LIT STOCKG 5
+*
+* Profil amont usine
+Profil PUsine
+LimiteJ 1 1 1 4 4 4
+STRIC K0 PUSINEMAJ PUSINEMIN PUSINEMAJ K0
+x/z 0.0 78.5 43.5 64 146.5 64 190 78.5
+Actif 2 3 4
+ LIT MAJD 2
+ LIT MINEUR 3
+ LIT MAJG 4
+ LIT STOCKD 1
+ LIT STOCKG 5
+*
+Profil PUsineA
+LimiteJ 1 1 1 4 4 4
+STRIC K0 PUSINEMAJ PUSINEMIN PUSINEMAJ K0
+x/z 0.0 78.5 43.5 64 166.5 64 210 78.5
+Actif 2 3 4
+ LIT MAJD 2
+ LIT MINEUR 3
+ LIT MAJG 4
+ LIT STOCKD 1
+ LIT STOCKG 5
+***************************************DEFINITION PROFIL VIEUX RHONE LOGIS NEUF**********************************************************
+* 01/01/2041 00:00
+PROFIL P135.800
+LIMITEJ 27 34 35 69 71 79 79
+STRIC K0 P135.800MAJ P135.800MIN P135.800MAJ P135.800BMAJ K0
+X/Z -1162.00 92.80 -1154.00 92.80 -1148.00 89.00
+X/Z -1110.00 88.80 -1050.00 89.10 -1000.00 88.70
+X/Z -900.00 88.00 -820.00 87.80 -812.00 88.10
+X/Z -804.00 88.10 -750.00 87.40 -600.00 86.80
+X/Z -520.00 86.70 -444.00 86.60 -436.00 87.20
+X/Z -432.00 87.20 -430.00 87.00 -380.00 87.10
+X/Z -345.00 87.10 -308.00 87.00 -302.00 83.90
+X/Z -296.00 83.90 -286.00 88.80 -228.00 89.15
+X/Z -220.00 89.15 -155.00 89.30 -148.00 89.30
+X/Z -138.00 88.90 -114.00 81.10 -110.00 79.50
+X/Z -70.00 79.50 -68.00 81.20 -60.00 81.00
+X/Z -46.00 89.60 0.00 89.42 0.01 89.12
+X/Z 0.02 89.15 1.37 89.15 2.96 88.61
+X/Z 3.47 87.89 24.78 79.53 26.19 79.46
+X/Z 30.68 79.24 32.43 78.94 34.61 78.32
+X/Z 38.59 78.48 42.18 78.47 49.41 78.50
+X/Z 64.32 78.52 76.70 77.65 86.97 78.09
+X/Z 97.81 77.94 108.59 77.31 120.25 77.24
+X/Z 133.12 77.58 143.93 77.46 153.48 77.22
+X/Z 163.04 77.52 175.51 78.12 180.89 78.25
+X/Z 189.70 78.63 200.68 78.16 209.33 78.06
+X/Z 218.11 78.09 222.85 78.67 224.86 79.38
+X/Z 246.44 87.67 246.91 88.42 249.99 88.55
+X/Z 250.07 88.54 340.00 88.80 350.00 86.00
+X/Z 360.00 86.80 365.00 86.80 366.00 84.10
+X/Z 386.00 84.10 387.00 88.80 407.00 88.80
+X/Z 414.00 92.10
+ACTIF 2 3 4 5
+LIT MAJD 2
+LIT MINEUR 3
+LIT MAJG 4 5
+LIT STOCKD 1
+LIT STOCKG 6
+*
+* 01/01/2041 00:00
+PROFIL P135.900
+LIMITEJ 20 20 20 105 107 117 117
+STRIC K0 P135.900MAJ P135.900MIN P135.900MAJ P135.900BMAJ K0
+X/Z -1510.00 93.20 -1500.00 89.60 -1110.00 89.40
+X/Z -950.00 88.70 -800.00 88.10 -690.00 87.00
+X/Z -575.00 86.80 -400.00 86.50 -300.00 86.30
+X/Z -200.00 86.30 -196.00 86.10 -192.00 83.90
+X/Z -174.00 83.90 -172.00 87.10 -146.00 87.10
+X/Z -142.00 83.00 -72.00 83.00 -70.00 88.10
+X/Z -25.00 88.10 0.00 86.40 0.03 85.99
+X/Z 0.29 85.89 4.51 85.90 7.63 84.16
+X/Z 13.91 83.64 18.74 82.94 21.63 81.23
+X/Z 21.84 80.73 21.86 81.08 22.24 80.60
+X/Z 23.78 80.76 24.37 80.98 24.39 81.91
+X/Z 26.50 83.17 45.38 82.99 55.42 82.32
+X/Z 65.44 81.03 69.34 79.79 69.61 79.36
+X/Z 70.77 78.65 72.38 78.37 77.07 78.14
+X/Z 82.57 78.11 86.06 78.38 87.19 78.73
+X/Z 89.00 79.38 89.99 80.11 93.36 80.11
+X/Z 95.38 79.50 96.97 78.98 100.13 78.58
+X/Z 102.74 78.59 105.72 78.56 108.19 79.36
+X/Z 110.02 79.71 112.76 79.66 113.04 79.37
+X/Z 113.88 79.19 116.33 78.73 126.74 78.88
+X/Z 138.83 79.08 144.51 79.08 153.94 78.84
+X/Z 157.57 78.64 160.98 78.59 166.12 78.70
+X/Z 173.90 78.57 178.24 78.45 192.55 77.73
+X/Z 202.77 77.83 215.34 77.40 222.56 77.61
+X/Z 231.39 78.72 233.41 78.93 234.50 79.27
+X/Z 235.72 79.81 240.12 80.32 250.20 80.41
+X/Z 253.22 79.79 259.76 79.57 265.42 79.90
+X/Z 266.98 79.46 269.18 79.63 272.85 80.76
+X/Z 276.01 80.15 281.50 79.63 282.76 80.00
+X/Z 283.47 79.88 283.89 79.33 284.82 79.21
+X/Z 286.58 79.12 288.30 79.36 291.14 79.38
+X/Z 293.66 78.94 297.19 78.75 299.62 78.70
+X/Z 301.96 79.04 302.40 79.34 303.45 80.27
+...
[truncated message content] |
|
From: <de...@us...> - 2009-04-21 22:32:30
|
Revision: 4671
http://fudaa.svn.sourceforge.net/fudaa/?rev=4671&view=rev
Author: deniger
Date: 2009-04-21 22:32:19 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/.pmd
trunk/soft/fudaa-crue/dodico/.pmd
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/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/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/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/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/io/CrueFileFormatManager.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHModeleBase.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHScenario.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/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/TestCrueOPTGFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueORESFile.java
trunk/soft/fudaa-crue/fudaa/.pmd
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueProjet.java
Added Paths:
-----------
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/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/Crue9DCFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9DHFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9FileFormatFactory.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CrueIOData.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CustomFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CustomFileFormatUnique.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CustomFileFormatVersionInterface.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/
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/AbstractCrue9Writer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/CrueIODico.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHFileReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHFileWriter.java
trunk/soft/fudaa-crue/dodico/src/test/java/idea/TestItPointDF.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/AbstractCrueFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueIOData.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue09reader.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/Crue9FileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9writer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CrueFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CrueIODico.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/DCFileReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/DCFileWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/DHFileReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/DHFileWriter.java
trunk/soft/fudaa-crue/dodico/src/test/java/idea/testPointDF.java
trunk/soft/fudaa-crue/src/main/config/eclipse-codetemplates.xml
Modified: trunk/soft/fudaa-crue/.pmd
===================================================================
--- trunk/soft/fudaa-crue/.pmd 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/.pmd 2009-04-21 22:32:19 UTC (rev 4671)
@@ -204,18 +204,10 @@
<ruleset>Java Logging Rules</ruleset>
</rule>
<rule>
- <name>UnnecessaryConstructor</name>
- <ruleset>Controversial Rules</ruleset>
- </rule>
- <rule>
<name>NullAssignment</name>
<ruleset>Controversial Rules</ruleset>
</rule>
<rule>
- <name>OnlyOneReturn</name>
- <ruleset>Controversial Rules</ruleset>
- </rule>
- <rule>
<name>UnusedModifier</name>
<ruleset>Controversial Rules</ruleset>
</rule>
@@ -224,10 +216,6 @@
<ruleset>Controversial Rules</ruleset>
</rule>
<rule>
- <name>AtLeastOneConstructor</name>
- <ruleset>Controversial Rules</ruleset>
- </rule>
- <rule>
<name>DontImportSun</name>
<ruleset>Controversial Rules</ruleset>
</rule>
@@ -256,10 +244,6 @@
<ruleset>Controversial Rules</ruleset>
</rule>
<rule>
- <name>AvoidFinalLocalVariable</name>
- <ruleset>Controversial Rules</ruleset>
- </rule>
- <rule>
<name>AvoidUsingShortType</name>
<ruleset>Controversial Rules</ruleset>
</rule>
@@ -476,10 +460,6 @@
<ruleset>Optimization Rules</ruleset>
</rule>
<rule>
- <name>AvoidInstantiatingObjectsInLoops</name>
- <ruleset>Optimization Rules</ruleset>
- </rule>
- <rule>
<name>UseArrayListInsteadOfVector</name>
<ruleset>Optimization Rules</ruleset>
</rule>
@@ -945,4 +925,5 @@
</rule>
</rules>
<includeDerivedFiles>false</includeDerivedFiles>
+ <violationsAsErrors>true</violationsAsErrors>
</pmd>
Modified: trunk/soft/fudaa-crue/dodico/.pmd
===================================================================
--- trunk/soft/fudaa-crue/dodico/.pmd 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/.pmd 2009-04-21 22:32:19 UTC (rev 4671)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<pmd>
<useProjectRuleSet>true</useProjectRuleSet>
- <ruleSetFile>C:\devel\fudaa\Fudaa-Crue\Fudaa-Crue root\src\main\config\pmd.xml</ruleSetFile>
+ <ruleSetFile>..\src\main\config\pmd.xml</ruleSetFile>
<includeDerivedFiles>false</includeDerivedFiles>
<violationsAsErrors>true</violationsAsErrors>
</pmd>
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/AbstractCrueFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/AbstractCrueFileFormat.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/AbstractCrueFileFormat.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -1,34 +0,0 @@
-/**
- * Licence GPL
- * Copyright Genesis
- */
-package org.fudaa.dodico.crue.common;
-
-import org.fudaa.ctulu.fileformat.FileFormatUnique;
-import org.fudaa.ctulu.fileformat.FileReadOperationAbstract;
-import org.fudaa.ctulu.fileformat.FileWriteOperationAbstract;
-
-/**
- * @author deniger
- * @param <M> la classe métier générée par ce fileformat
- */
-public abstract class AbstractCrueFileFormat<M> extends FileFormatUnique {
-
- /**
- *
- */
- public AbstractCrueFileFormat() {
- super(1);
- }
-
- @Deprecated
- public FileReadOperationAbstract createReader() {// NOPMD
- return null;
- }
-
- @Deprecated
- public FileWriteOperationAbstract createWriter() {// NOPMD
- return null;
- }
-
-}
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueIOData.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueIOData.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueIOData.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -1,73 +0,0 @@
-/**
- * Licence GPL
- * Copyright Genesis
- */
-package org.fudaa.dodico.crue.common;
-
-/**
- * @author deniger
- */
-public class CrueIOData<M> {
-
- private M metier;
- private String crueVersion;
- private String crueXsd;
- private String crueCommentaire;
-
- /**
- * @return the metier
- */
- public M getMetier() {
- return metier;
- }
-
- /**
- * @param metier the metier to set
- */
- public void setMetier(M metier) {
- this.metier = metier;
- }
-
- /**
- * @return the crueVersion
- */
- public String getCrueVersion() {
- return crueVersion;
- }
-
- /**
- * @param crueVersion the crueVersion to set
- */
- public void setCrueVersion(String crueVersion) {
- this.crueVersion = crueVersion;
- }
-
- /**
- * @return the crueXsd
- */
- public String getCrueXsd() {
- return crueXsd;
- }
-
- /**
- * @param crueXsd the crueXsd to set
- */
- public void setCrueXsd(String crueXsd) {
- this.crueXsd = crueXsd;
- }
-
- /**
- * @return the crueCommentaire
- */
- public String getCrueCommentaire() {
- return crueCommentaire;
- }
-
- /**
- * @param crueCommentaire the crueCommentaire to set
- */
- public void setCrueCommentaire(String crueCommentaire) {
- this.crueCommentaire = crueCommentaire;
- }
-
-}
Modified: 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-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/AbstractCrueDao.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -10,13 +10,14 @@
/**
* En tete xsd
*/
- public String xmlns = "http://www.fudaa.fr/xsd/crue";
- public String xmlnsxsi = "http://www.w3.org/2001/XMLSchema-instance";
- public final String xsischemaLocation;
+ protected String xmlns = "http://www.fudaa.fr/xsd/crue";
+ protected String xmlnsxsi = "http://www.w3.org/2001/XMLSchema-instance";
+ protected String xsischemaLocation;
- public AbstractCrueDao(final String xsdVersionValidator) {
- xsischemaLocation = "http://www.fudaa.fr/xsd/crue http://www.fudaa.fr" + xsdVersionValidator;
+ public AbstractCrueDao() {}
+ protected void setXsdName(final String xsdFile) {
+ xsischemaLocation = "http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/" + xsdFile;
}
}
Modified: 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-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverter.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -11,7 +11,7 @@
* @param <D> Represente la structure DAO
* @param <M> Represente le modele Metier
*/
-public interface CrueConverter<D, M> {
+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
Modified: 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/CrueConverterDCSP.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDCSP.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -34,7 +34,6 @@
import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.SectionProfil;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.SectionSansGeometrie;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.Zasso;
-import org.fudaa.dodico.crue.io.Crue10FileFormat;
import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
import org.fudaa.dodico.crue.metier.emh.CatEMHSection;
import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrt;
@@ -93,7 +92,7 @@
}
public CrueDaoDCSP convertMetierToDao(final List<EMH> metier, final CtuluAnalyze analyser) {
- final CrueDaoDCSP res = new CrueDaoDCSP(Crue10FileFormat.getDCSPFileFormat().getXsdValidator());
+ final CrueDaoDCSP res = new CrueDaoDCSP();
CrueConverterDCSP.toDAO(res, metier, analyser);
return res;
}
Modified: 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/CrueConverterDFRT.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDFRT.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -9,7 +9,6 @@
import org.fudaa.dodico.crue.dao.CrueDaoStructureDFRT.StriRefHPersist;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDFRT.StriRefPersist;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDFRT.StriRefZPersist;
-import org.fudaa.dodico.crue.io.Crue10FileFormat;
import org.fudaa.dodico.crue.metier.emh.DonFrt;
import org.fudaa.dodico.crue.metier.emh.FrottementPoint;
import org.fudaa.dodico.crue.metier.emh.StriRefC;
@@ -28,7 +27,7 @@
}
public CrueDaoDFRT convertMetierToDao(final List<DonFrt> metier, final CtuluAnalyze analyser) {
- final CrueDaoDFRT res = new CrueDaoDFRT(Crue10FileFormat.getDFRTFileFormat().getXsdValidator());
+ final CrueDaoDFRT res = new CrueDaoDFRT();
res.listeFrottement = CrueConverterDFRT.convertToDao(metier, analyser);
return res;
}
Modified: 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/CrueConverterDLHY.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDLHY.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -13,7 +13,6 @@
import org.fudaa.dodico.crue.dao.CrueDaoStructureDLHY.Tarrage;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDLHY.VannePasseDessous;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDLHY.VannePasseDessus;
-import org.fudaa.dodico.crue.io.Crue10FileFormat;
import org.fudaa.dodico.crue.metier.emh.CrueDate;
import org.fudaa.dodico.crue.metier.emh.EvolutionDF;
import org.fudaa.dodico.crue.metier.emh.EvolutionFF;
@@ -83,7 +82,7 @@
*/
public CrueDaoDLHY convertMetierToDao(final List<Loi> metier, final CtuluAnalyze analyser) {
- final CrueDaoDLHY res = new CrueDaoDLHY(Crue10FileFormat.getDLHYFileFormat().getXsdValidator());
+ final CrueDaoDLHY res = new CrueDaoDLHY();
res.Tarrages = new ArrayList<Tarrage>();
res.Hydrogrammes = new ArrayList<Hydrogramme>();
Modified: 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/CrueConverterDPTG.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDPTG.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -13,7 +13,6 @@
import org.fudaa.dodico.crue.dao.CrueDaoStructureDPTG.ProfilSection;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDPTG.SectionIdem;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDPTG.profilDPTG;
-import org.fudaa.dodico.crue.io.Crue10FileFormat;
import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
import org.fudaa.dodico.crue.metier.emh.CatEMHSection;
import org.fudaa.dodico.crue.metier.emh.CrueData;
@@ -53,7 +52,7 @@
}
public CrueDaoDPTG convertMetierToDao(final CrueData metier, final CtuluAnalyze analyser) {
- final CrueDaoDPTG res = new CrueDaoDPTG(Crue10FileFormat.getDPTGFileFormat().getXsdValidator());
+ final CrueDaoDPTG res = new CrueDaoDPTG();
CrueConverterDPTG.remplirPersistanceDPTG(res, metier, analyser);
return res;
}
@@ -231,7 +230,7 @@
profilPersistant.Serie = new CrueDaoStructureCommon.SerieFF();
profilPersistant.Serie.listePoints = new ArrayList<String>();
for (final PtProfil serie : prtgeo.getListeProfils()) {
- final String buff = "" + serie.getYP() + " " + serie.getZ();
+ final String buff = serie.getYP() + " " + serie.getZ();
profilPersistant.Serie.listePoints.add(buff);
}
} else {
Modified: 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/CrueConverterDPTI.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDPTI.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -26,7 +26,6 @@
import org.fudaa.dodico.crue.dao.CrueDaoStructureDPTI.SectionRefInterpolee;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDPTI.SectionRefProfil;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDPTI.SectionRefSansGeometrie;
-import org.fudaa.dodico.crue.io.Crue10FileFormat;
import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
@@ -96,7 +95,7 @@
}
public CrueDaoDPTI convertMetierToDao(final CrueData metier, final CtuluAnalyze analyser) {
- final CrueDaoDPTI res = new CrueDaoDPTI(Crue10FileFormat.getDPTIFileFormat().getXsdValidator());
+ final CrueDaoDPTI res = new CrueDaoDPTI();
// -- etape 1: on remplit les infso des noeuds --//
res.Noeuds = CrueConverterDPTI.remplirPersistanceAvecNoeudDPTI(metier.getNoeuds(), analyser);
Modified: 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/CrueConverterDRSO.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDRSO.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -37,7 +37,6 @@
import org.fudaa.dodico.crue.dao.CrueDaoStructureDRSO.SectionRefSansGeometrie;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDRSO.SectionReferenceeParIdem;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDRSO.SectionSansGeometrie;
-import org.fudaa.dodico.crue.io.Crue10FileFormat;
import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
@@ -103,7 +102,7 @@
}
public CrueDaoDRSO convertMetierToDao(final CrueData metier, final CtuluAnalyze analyser) {
- final CrueDaoDRSO res = new CrueDaoDRSO(Crue10FileFormat.getDRSOFileFormat().getXsdValidator());
+ final CrueDaoDRSO res = new CrueDaoDRSO();
// -- etape 1: on remplit les infso des noeuds --//
res.Noeuds = CrueConverterDRSO.remplirPersistanceAvecNoeudDRSO(metier.getNoeuds(), analyser);
Modified: 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/CrueConverterOPTG.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterOPTG.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -18,7 +18,6 @@
import org.fudaa.dodico.crue.dao.CrueDaoStructureOPTG.RegleRebDeb;
import org.fudaa.dodico.crue.dao.CrueDaoStructureOPTG.RegleSeuilDetect;
import org.fudaa.dodico.crue.dao.CrueDaoStructureOPTG.RegleVarPdxMax;
-import org.fudaa.dodico.crue.io.Crue10FileFormat;
import org.fudaa.dodico.crue.metier.emh.DonPrtReseau;
import org.fudaa.dodico.crue.metier.emh.Regle;
import org.fudaa.dodico.crue.metier.helper.RegleHelper;
@@ -72,7 +71,7 @@
}
public CrueDaoOPTG convertMetierToDao(final DonPrtReseau metier, final CtuluAnalyze analyser) {
- final CrueDaoOPTG dao = new CrueDaoOPTG(Crue10FileFormat.getOPTGFileFormat().getXsdValidator());
+ final CrueDaoOPTG dao = new CrueDaoOPTG();
dao.Planimetrage = new Planimetrage();
dao.Planimetrage.NbrPdz = metier.getNbRpdz();
Modified: 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/CrueConverterORES.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterORES.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -26,7 +26,6 @@
import org.fudaa.dodico.crue.dao.CrueDaoStructureORES.SectionInterpoleePersist;
import org.fudaa.dodico.crue.dao.CrueDaoStructureORES.SectionProfilPersist;
import org.fudaa.dodico.crue.dao.CrueDaoStructureORES.SectionSansGeometriePersist;
-import org.fudaa.dodico.crue.io.Crue10FileFormat;
import org.fudaa.dodico.crue.metier.emh.OrdResCalcul;
import org.fudaa.dodico.crue.metier.emh.OrdResCalculBrancheBarrageFilEau;
import org.fudaa.dodico.crue.metier.emh.OrdResCalculBrancheBarrageGenerique;
@@ -230,7 +229,7 @@
*/
public CrueDaoORES convertMetierToDao(OrdResCalcul metier, CtuluAnalyze analyser) {
- final CrueDaoORES res = new CrueDaoORES(Crue10FileFormat.getORESFileFormat().getXsdValidator());
+ final CrueDaoORES res = new CrueDaoORES();
res.Noeuds = new ArrayList<NoeudNiveauContinuPersist>();
res.Casiers = new ArrayList<CasierAbstractPersist>();
Modified: 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/CrueDaoDCLM.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDCLM.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -20,8 +20,7 @@
*
* @param xsdVersionValidator chemin relatif du XSD
*/
- public CrueDaoDCLM(final String xsdVersionValidator) {
- super(xsdVersionValidator);
+ public CrueDaoDCLM() {
}
Modified: 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/CrueDaoDCSP.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDCSP.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -13,9 +13,7 @@
*/
public class CrueDaoDCSP extends AbstractCrueDao {
- public CrueDaoDCSP(final String xsdVersionValidator) {
- super(xsdVersionValidator);
- }
+ public CrueDaoDCSP() {}
public String VersionCrue = CrueHelper.VersionCrue;
public String Commentaire = CrueHelper.Commentaire;
Modified: 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/CrueDaoDFRT.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDFRT.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -11,9 +11,7 @@
* @author Adrien Hadoux
*/
public class CrueDaoDFRT extends AbstractCrueDao {
- public CrueDaoDFRT(final String xsdVersionValidator) {
- super(xsdVersionValidator);
- }
+ public CrueDaoDFRT() {}
/**
* Suffixe ajout� aux r�f�rences des objets emh du fichier dpti pour indiquer qu'ils r�f�rent aux objets d�finis dans
@@ -30,23 +28,4 @@
*/
List<StriRefPersist> listeFrottement;
- // @Override
- // public void fillFromMetier(final List<DonFrt> data, final CtuluAnalyze analyser) {
- // listeFrottement = CrueConverterDFRT.convertToDao(data, analyser);
- //
- // }
- //
- // @Override
- // public List<DonFrt> convertToMetier(final CtuluAnalyze analyser, final Object data) {
- // return CrueConverterDFRT.convertToEMH(listeFrottement, analyser);
- // }
-
- // @Override
- // public XStream initXmlParser() {
- // final XStream xstream = new XStream(new DomDriver());
- // // -- initialisation du format de la structure des documents --//
- // CrueDaoStructuresFormatDFRT.initXmlParserForDFRT(xstream);
- // return xstream;
- // }
-
}
Modified: 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/CrueDaoDLHY.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDLHY.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -29,13 +29,4 @@
protected List<Tarrage> Tarrages;
protected Manoeuvres Manoeuvres;
- /**
- * Constructeur
- *
- * @param xsdVersionValidator
- */
- public CrueDaoDLHY(final String xsdVersionValidator) {
- super(xsdVersionValidator);
- }
-
}
Modified: 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/CrueDaoDPTG.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDPTG.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -15,9 +15,6 @@
* @author Adrien Hadoux
*/
public class CrueDaoDPTG extends AbstractCrueDao {
- public CrueDaoDPTG(final String xsdVersionValidator) {
- super(xsdVersionValidator);
- }
public static final String SUFFIXE_REF_DPTG = "DPTG#";
@@ -29,30 +26,4 @@
List<SectionIdem> Sections;
List<BrancheSaintVenant> Branches;
- // @Override
- // public void fillFromMetier(final CrueData data, final CtuluAnalyze listeMessageError) {
- // CrueConverterDPTG.remplirPersistanceDPTG(this, data, listeMessageError);
- //
- // }
-
- // @Override
- // public CrueData convertToMetier(final CtuluAnalyze listeMessageError, final Object dataLinked) {
- // if (dataLinked != null && (dataLinked instanceof CrueData)) {
- // final CrueData structure = (CrueData) dataLinked;
- // CrueConverterDPTG.remplirMetierDPTG(this, structure, listeMessageError);
- // return structure;
- //
- // } else {
- // return null;
- // }
- // }
-
- // @Override
- // public XStream initXmlParser() {
- // final XStream xstream = new XStream(new DomDriver());
- // // -- initialisation du format de la structure des documents --//
- // CrueDaoStructuresFormatDPTG.initXmlParserForDPTG(xstream);
- // return xstream;
- // }
-
}
Modified: 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/CrueDaoDPTI.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDPTI.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -15,10 +15,6 @@
*/
public class CrueDaoDPTI extends AbstractCrueDao {
- public CrueDaoDPTI(final String xsdVersionValidator) {
- super(xsdVersionValidator);
- }
-
public String VersionCrue = CrueHelper.VersionCrue;
public String Commentaire = CrueHelper.Commentaire;
@@ -42,57 +38,4 @@
*/
List<SectionAbstract> Sections;
- // @Override
- // public void fillFromMetier(final CrueData data, final CtuluAnalyze listeMessageError) {
- // // TODO Auto-generated method stub
- // // -- etape 1: on remplit les infso des noeuds --//
- // Noeuds = CrueConverterDPTI.remplirPersistanceAvecNoeudDPTI(data.getNoeuds(), listeMessageError);
- //
- // // -- etape 2: on remplit les infso des branches --//
- // Branches = CrueConverterDPTI.remplirPersistanceAvecBrancheDPTI(data.getBranches(), listeMessageError);
- //
- // // -- etape 3: on remplit les infso des casiers --//
- // Casiers = CrueConverterDPTI.remplirPersistanceAvecCasierDPTI(data.getCasiers(), listeMessageError);
- //
- // // -- etape 4: on remplit les infso des sections --//
- // Sections = CrueConverterDPTI.remplirPersistanceAvecSectionDPTI(data.getSections(), listeMessageError);
- //
- // }
-
- // @Override
- // CrueData convertToMetier(final CtuluAnalyze listeMessageError, final Object dataLinked) {
- //
- // if (dataLinked == null || !(dataLinked instanceof CrueData)) {
- // listeMessageError
- // .addFatalError(CrueResource
- // .getS("Impossible de r�cup�rer les donn�es r�saux (DRSO). Les r�f�rences du fichier DPTI ne pourront etre utilis�es."));
- // return null;
- // }
- // final CrueData dataCrue = (CrueData) dataLinked;
- //
- // // -- remplissage des noeuds --//
- // CrueConverterDPTI.remplirNoeudAvecPersistanceDPTI(Noeuds, dataCrue.getNoeuds(), listeMessageError);
- //
- // // -- remplissage des branches --//
- // CrueConverterDPTI.remplirBrancheAvecPersistanceDPTI(Branches, dataCrue.getBranches(), listeMessageError);
- //
- // // -- remplissage des casiers --//
- // CrueConverterDPTI.remplirCasierAvecPersistanceDPTI(Casiers, dataCrue.getCasiers(), listeMessageError);
- //
- // // -- remplissage des sections --//
- // CrueConverterDPTI.remplirSectionsAvecPersistanceDPTI(Sections, dataCrue.getSections(), listeMessageError);
- //
- // // TODO pour le moment rien mais il faudrait demander des pr�cisions --//
- //
- // return dataCrue;
- // }
-
- // @Override
- // public XStream initXmlParser() {
- // final XStream xstream = new XStream(new DomDriver());
- // // -- init du parser --//
- // CrueDaoStructuresFormatDPTI.initXmlParserForDPTI(xstream);
- // return xstream;
- // }
-
}
Modified: 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/CrueDaoDRSO.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDRSO.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -15,11 +15,6 @@
*/
public class CrueDaoDRSO extends AbstractCrueDao {
- public CrueDaoDRSO(final String xsdVersionValidator) {
- super(xsdVersionValidator);
-
- }
-
public String VersionCrue = CrueHelper.VersionCrue;
public String Commentaire = CrueHelper.Commentaire;
@@ -48,59 +43,4 @@
*/
List<BrancheAbstract> Branches;
- // @Override
- // public XStream initXmlParser() {
- // final XStream xstream = new XStream(new DomDriver());
- // // -- initialisation du format de la structure des documents --//
- // CrueDaoStructuresFormatDRSO.initXmlParserForDRSO(xstream);
- // return xstream;
- // }
-
- // @Override
- // public void fillFromMetier(final CrueData data, final CtuluAnalyze listeMessageError) {
- //
- // // -- etape 1: on remplit les infso des noeuds --//
- // Noeuds = CrueConverterDRSO.remplirPersistanceAvecNoeudDRSO(data.getNoeuds(), listeMessageError);
- //
- // // -- etape 2: on remplit les infso des casiers --//
- // Casiers = CrueConverterDRSO.remplirPersistanceAvecCasierDRSO(data.getCasiers(), listeMessageError);
- //
- // // -- etape 3: on remplit les infso des sections --//
- // Sections = CrueConverterDRSO.remplirPersistanceAvecSectionsDRSO(data.getSections(), listeMessageError);
- //
- // // -- etape 4: on remplit les infso des branches --//
- // Branches = CrueConverterDRSO.remplirPersistanceAvecBrancheDRSO(data.getAllEMH(), listeMessageError);
- //
- // }
-
- // @Override
- // public CrueData convertToMetier(final CtuluAnalyze listeMessageError, final Object dataLinked) {
- // final CrueData res = new CrueData();
- // CrueConverterDRSO.cptEntries = 1;
- //
- // // -- etape 1: on remplit les infso des noeuds --//
- // final List<CatEMHNoeud> listeNoeuds = CrueConverterDRSO.remplirNoeudAvecPersistanceDRSO(Noeuds, listeMessageError);
- //
- // // -- etape 2: les casiers --//
- // final List<CatEMHCasier> listeCasiers = CrueConverterDRSO.remplirCasierAvecPersistanceDRSO(Casiers, listeNoeuds,
- // listeMessageError);
- //
- // // -- etape 3: les sections a partir des sections--//
- //
- // final List<CatEMHSection> listeSections = CrueConverterDRSO.remplirSectionsAvecPersistanceDRSO(Sections,
- // listeMessageError);
- //
- // // -- etape 4: les branches et les sections de bransche cr�es lors du remplissage des sections --//
- // final List<CatEMHBranche> listeBranches = CrueConverterDRSO.remplirBrancheAvecPersistanceDRSO(Branches,
- // listeSections, listeNoeuds, listeMessageError);
- //
- // // -- on ajoute tout dans la liste compl�te --//
- // res.setNoeuds(listeNoeuds);
- // res.setBranches(listeBranches);
- // res.setSections(listeSections);
- // res.setCasiers(listeCasiers);
- //
- // return res;
- // }
-
}
Modified: 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/CrueDaoETU.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoETU.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -16,10 +16,6 @@
*/
public class CrueDaoETU extends AbstractCrueDao {
- public CrueDaoETU(final String xsdVersionValidator) {
- super(xsdVersionValidator);
- }
-
public String Commentaire = CrueHelper.Commentaire;
public String Creation;
public String DateCreation;
@@ -34,23 +30,4 @@
public String Rapports;
public List<Scenario> Scenarios;
- // @Override
- // public void fillFromMetier(final EMHproject data, final CtuluAnalyze analyser) {
- //
- // // -- on ne fais pas d'�criture pour ce fichier --//
- // }
- //
- // @Override
- // public EMHproject convertToMetier(final CtuluAnalyze analyser, final Object dataLinked) {
- // return CrueConverterETU.remplirMetierETU(this, analyser);
- // }
-
- // @Override
- // public XStream initXmlParser() {
- // final XStream xstream = new XStream(new DomDriver());
- // // -- initialisation du format de la structure des documents --//
- // CrueDaoStructuresFormatETU.initXmlParserForETU(xstream);
- // return xstream;
- // }
-
}
Modified: 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/CrueDaoOPTG.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoOPTG.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -14,10 +14,6 @@
@SuppressWarnings("PMD.VariableNamingConventions")
public class CrueDaoOPTG extends AbstractCrueDao {
- public CrueDaoOPTG(final String xsdVersionValidator) {
- super(xsdVersionValidator);
- }
-
public String VersionCrue = CrueHelper.VersionCrue;
public String Commentaire = CrueHelper.Commentaire;
Modified: 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/CrueDaoORES.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoORES.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -32,11 +32,4 @@
/** Représente la balise portant le même nom dans le fichier XML */
public List<BrancheAbstractPersist> Branches;
- /**
- * @param xsdVersionValidator
- */
- public CrueDaoORES(String xsdVersionValidator) {
- super(xsdVersionValidator);
- }
-
}
Added: 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/CrueXmlReaderWriter.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueXmlReaderWriter.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -0,0 +1,87 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.dao;
+
+import java.io.File;
+import java.io.OutputStream;
+import java.net.URL;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+
+/**
+ * @author deniger
+ * @param <M> l'objet metier supporte
+ */
+public interface CrueXmlReaderWriter<M> {
+
+ /**
+ * @return l'identifiant: dfrt par exemple.
+ */
+ String getXsdId();
+
+ /**
+ * @return le path du fichier xsd correspondant
+ */
+ String getXsdValidator();
+
+ /**
+ * @return true si le fichier demandé s'auto-suffit. Si il a besoin d'autre fichiers (ref ou dépendances) retourne
+ * false.
+ */
+ boolean isIndependant();
+
+ /**
+ * Lit les données dans le fichier f avec les données liées.
+ *
+ * @param dataLinked
+ * @return l'objet metier lu.
+ */
+ M readXML(final File f, final CtuluAnalyze analyzer, final Object dataLinked);
+
+ /**
+ * Lit les données dans le fichier f avec les données liées.
+ *
+ * @param dataLinked
+ * @return
+ */
+ M readXML(final String pathToResource, final CtuluAnalyze analyzer, final Object dataLinked);
+
+ /**
+ * Lit les données dans le fichier f avec les données liées.
+ *
+ * @param dataLinked
+ * @return
+ */
+ M read(final URL f, final CtuluAnalyze analyzer, final Object dataLinked);
+
+ boolean isValide(final File xml, final CtuluAnalyze res);
+
+ boolean isValide(final String xml, final CtuluAnalyze res);
+
+ boolean isValide(final URL xml, final CtuluAnalyze res);
+
+ /**
+ * MEthode qui permet d'�crire les datas dans le fichier f sp�cifi�.
+ *
+ * @param data
+ * @param f
+ * @return
+ */
+ boolean writeXML(final M metier, final File f, final CtuluAnalyze analyzer);
+
+ /**
+ * @param out le flux de sortie qui ne sera pas ferme
+ * @param metier l'objet metier
+ * @param analyser
+ * @return true si reussite
+ */
+ boolean writeXML(final OutputStream out, final M metier, final CtuluAnalyze analyser);
+
+ /**
+ * @param isIndependant the isInpendant to set
+ */
+ public void setIndependant(final boolean isIndependant);
+
+}
\ No newline at end of file
Added: 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/CrueXmlReaderWriterImpl.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueXmlReaderWriterImpl.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -0,0 +1,432 @@
+package org.fudaa.dodico.crue.dao;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.xml.XMLConstants;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.ctulu.CtuluLibFile;
+import org.fudaa.dodico.crue.common.CrueResource;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+import com.memoire.fu.FuLog;
+import com.thoughtworks.xstream.InitializationException;
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.XStreamException;
+import com.thoughtworks.xstream.converters.ConversionException;
+import com.thoughtworks.xstream.converters.reflection.ObjectAccessException;
+import com.thoughtworks.xstream.core.TreeMarshaller.CircularReferenceException;
+import com.thoughtworks.xstream.io.StreamException;
+import com.thoughtworks.xstream.io.xml.DomDriver;
+import com.thoughtworks.xstream.mapper.CannotResolveClassException;
+
+/**
+ * File format customisé pour Crue. Indique si le fichier est de type crue 9 ou 10. Contient un validator xsd pour le
+ * fichier donné. Contient une méthode statique très pratique qui permet de retourner automatiquement le bon FileFormat
+ * en fonction du type renvoyé. T correspond à la structure métier associée au format du fichier
+ *
+ * @param <D> Represente la structure DAO
+ * @param <M> Represente le modele Metier
+ * @author Adrien Hadoux
+ */
+public class CrueXmlReaderWriterImpl<D extends AbstractCrueDao, M> implements CrueXmlReaderWriter<M> {
+
+ /**
+ * @author deniger
+ */
+ private static final class ErrorHandlerDefault implements ErrorHandler {
+ private boolean hasError;
+ /**
+ *
+ */
+ private final CtuluAnalyze res;
+
+ /**
+ * @param res
+ */
+ private ErrorHandlerDefault(final CtuluAnalyze res) {
+ this.res = res;
+ }
+
+ public void error(final SAXParseException exception) throws SAXException {
+ hasError = true;
+ res.addError(exception.getMessage(), exception.getLineNumber());
+ }
+
+ public void fatalError(final SAXParseException exception) throws SAXException {
+ hasError = true;
+ res.addFatalError(exception.getMessage());
+
+ }
+
+ /**
+ * @return the hasError
+ */
+ protected boolean isHasError() {
+ return hasError;
+ }
+
+ public void warning(final SAXParseException exception) throws SAXException {
+ res.addWarn(exception.getMessage(), exception.getLineNumber());
+
+ }
+ }
+
+ private final CrueConverter<D, M> converter;
+ private final CrueDaoStructure daoConfigurer;
+
+ boolean isIndependant;
+ /**
+ * La version du fichier
+ */
+ private final String version;
+
+ /**
+ * le nom du fichier xsd a utiliser
+ */
+ private final String xsdId;
+
+ /**
+ * La path complet du fichier xsd
+ */
+ private final String xsdPath;
+ private final String xsdFile;
+
+ /**
+ * @param type le type en Upper case comme par exemple DFRT.
+ */
+ public CrueXmlReaderWriterImpl(final String xsdId, final CrueConverter<D, M> converter,
+ final CrueDaoStructure daoConfigurer) {
+ this(xsdId, "1.0", converter, daoConfigurer);
+ }
+
+ /**
+ * @param type le type en Upper case comme par exemple DFRT.
+ */
+ protected CrueXmlReaderWriterImpl(final String xsdId, final String version, final CrueConverter<D, M> converter,
+ final CrueDaoStructure daoConfigurer) {
+ this.daoConfigurer = daoConfigurer;
+ this.converter = converter;
+ this.version = version;
+ this.xsdId = xsdId;
+ this.xsdFile = xsdId + "-" + version + ".xsd";
+ xsdPath = "/xsd/" + xsdFile;
+
+ }
+
+ /**
+ * @return the xsdId
+ */
+ public String getXsdId() {
+ return xsdId;
+ }
+
+ protected final void configureXStream(final XStream xstream) {
+ daoConfigurer.configureXStream(xstream);
+ }
+
+ /**
+ * @return the version
+ */
+ public String getVersion() {
+ return version;
+ }
+
+ /**
+ * @return le path dans jar vers le fichier xsd correspondant
+ */
+ public final String getXsdValidator() {
+ return xsdPath;
+ }
+
+ protected XStream initXmlParser() {
+ final XStream xstream = new XStream(new DomDriver());
+ // -- creation des alias pour que ce soit + parlant dans le xml file --//
+
+ // -- alias pour les entete xsd --//
+
+ xstream.aliasAttribute("xmlns:xsi", "xmlnsxsi");
+ xstream.aliasAttribute("xsi:schemaLocation", "xsischemaLocation");
+
+ xstream.useAttributeFor(AbstractCrueDao.class, "xmlns");
+ xstream.useAttributeFor(AbstractCrueDao.class, "xmlnsxsi");
+ xstream.useAttributeFor(AbstractCrueDao.class, "xsischemaLocation");
+
+ configureXStream(xstream);
+ return xstream;
+ }
+
+ /**
+ * @return true si le fichier demandé s'auto-suffit. Si il a besoin d'autre fichiers (ref ou dépendances) retourne
+ * false.
+ */
+ public final boolean isIndependant() {
+ return isIndependant;
+ }
+
+ public boolean isValide(final File xml, final CtuluAnalyze res) {
+ try {
+ return isValide(xml.toURL(), res);
+ } catch (final MalformedURLException e) {
+ res.manageException(e);
+ FuLog.error(e);
+ return false;
+ }
+ }
+
+ public boolean isValide(final String xml, final CtuluAnalyze res) {
+ return isValide(getClass().getResource(xml), res);
+ }
+
+ public boolean isValide(final URL xml, final CtuluAnalyze res) {
+ final ErrorHandlerDefault handler = new ErrorHandlerDefault(res);
+ try {
+ final URL xsdURL = getClass().getResource(xsdPath);
+ final SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+ final Schema schema = schemaFactory.newSchema(xsdURL);
+ final Validator validator = schema.newValidator();
+ validator.validate(new SAXSource(new InputSource(xml.toString())));
+
+ } catch (final Exception e) {
+ res.manageException(e);
+ FuLog.error(e);
+ return false;
+ }
+ return !handler.isHasError();
+ }
+
+ /**
+ * Lit les données dans le fichier f avec les données liées.
+ *
+ * @param dataLinked
+ * @return
+ */
+ public final M read(final URL f, final CtuluAnalyze analyzer, final Object dataLinked) {
+ final D d = readDao(f, analyzer, dataLinked);
+ if (d != null) { return converter.convertDaoToMetier(d, dataLinked, analyzer); }
+ return null;
+
+ }
+
+ /**
+ * @param fichier
+ * @return
+ */
+ public D readDao(final File fichier, final CtuluAnalyze analyser, final Object dataLinked) {
+ // TODO a remettre if (!isValide(fichier, analyser)) { return null; }
+ FileInputStream in = null;
+ D newData = null;
+ try {
+ in = new FileInputStream(fichier);
+ newData = readDao(in, analyser, dataLinked);
+ } catch (final FileNotFoundException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur d'ecriture du fichier"));
+ } finally {
+ CtuluLibFile.close(in);
+ }
+ return newData;
+
+ }
+
+ /**
+ * @param in
+ * @return le dao
+ */
+ protected D readDao(final InputStream in, final CtuluAnalyze analyser, final Object dataLinked) {
+ D newData = null;
+ try {
+ final XStream parser = initXmlParser();
+
+ final BufferedReader contentRead = new BufferedReader(new InputStreamReader(in, "UTF-8"));
+
+ newData = (D) parser.fromXML(contentRead);
+ } catch (final CircularReferenceException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur de lecture du fichier"));
+
+ } catch (final ConversionException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur de lecture du fichier"));
+
+ } catch (final InitializationException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur de lecture du fichier"));
+ } catch (final ObjectAccessException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur de lecture du fichier"));
+ } catch (final StreamException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur de lecture du fichier"));
+
+ } catch (final CannotResolveClassException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur d'ecriture du fichier"));
+
+ } catch (final XStreamException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur de lecture du fichier"));
+ } catch (final UnsupportedEncodingException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur de lecture du fichier"));
+ }
+ return newData;
+
+ }
+
+ /**
+ * @param pathToResource l'adresse du fichier a charger commencant par /
+ * @param analyser
+ * @param dataLinked
+ * @return
+ */
+ protected D readDao(final String pathToResource, final CtuluAnalyze analyser, final Object dataLinked) {
+ return readDao(getClass().getResource(pathToResource), analyser, dataLinked);
+ }
+
+ /**
+ * @param fichier
+ * @return
+ */
+ public D readDao(final URL url, final CtuluAnalyze analyser, final Object dataLinked) {
+ if (url == null) {
+ analyser.addFatalError("file.url.null", -1);
+ return null;
+ }
+ // TODO a remetter if (!isValide(url, analyser)) { return null; }
+ InputStream in = null;
+ D newData = null;
+ try {
+ in = url.openStream();
+ newData = readDao(in, analyser, dataLinked);
+ } catch (final IOException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur d'ecriture du fichier"));
+ } finally {
+ CtuluLibFile.close(in);
+ }
+ return newData;
+
+ }
+
+ /**
+ * Lit les données dans le fichier f avec les données liées.
+ *
+ * @param dataLinked
+ * @return
+ */
+ public final M readXML(final File f, final CtuluAnalyze analyzer, final Object dataLinked) {
+ final D d = readDao(f, analyzer, dataLinked);
+ if (d != null) { return converter.convertDaoToMetier(d, dataLinked, analyzer); }
+ return null;
+
+ }
+
+ /**
+ * Lit les données dans le fichier f avec les données liées.
+ *
+ * @param dataLinked
+ * @return
+ */
+ public final M readXML(final String pathToResource, final CtuluAnalyze analyzer, final Object dataLinked) {
+ final D d = readDao(pathToResource, analyzer, dataLinked);
+ if (d != null) { return converter.convertDaoToMetier(d, dataLinked, analyzer); }
+ return null;
+
+ }
+
+ /**
+ * @param isIndependant the isInpendant to set
+ */
+ public void setIndependant(final boolean isIndependant) {
+ this.isIndependant = isIndependant;
+ }
+
+ protected boolean writeDAO(final File file, final D dao, final CtuluAnalyze analyser) {
+ FileOutputStream out = null;
+ boolean ok = true;
+ try {
+ out = new FileOutputStream(file);
+ ok = writeDAO(out, dao, analyser);
+ } catch (final FileNotFoundException e) {
+ FuLog.error(e);
+ ok = false;
+ } finally {
+ CtuluLibFile.close(out);
+ }
+ return ok;
+
+ }
+
+ /**
+ * @param out le flux de sortie
+ * @param dao le dao a persister
+ * @param analyser le receveur d'information
+ * @return
+ */
+ protected boolean writeDAO(final OutputStream out, final D dao, final CtuluAnalyze analyser) {
+ boolean isOk = true;
+ try {
+ final BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out, "UTF-8"));
+ writer.write(ValidatorXml.enteteXml + "\n");
+ final XStream parser = initXmlParser();
+ parser.toXML(dao, writer);
+
+ } catch (final IOException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur d'ecriture du fichier"));
+ isOk = false;
+ }
+ return isOk;
+ }
+
+ /**
+ * MEthode qui permet d'�crire les datas dans le fichier f sp�cifi�.
+ *
+ * @param data
+ * @param f
+ * @return
+ */
+ public final boolean writeXML(final M metier, final File f, final CtuluAnalyze analyzer) {
+ final D d = converter.convertMetierToDao(metier, analyzer);
+ if (d != null) {
+ d.setXsdName(xsdFile);
+ return writeDAO(f, d, analyzer);
+ }
+ return false;
+ }
+
+ /**
+ * @param out le flux de sortie qui ne sera pas ferme
+ * @param metier l'objet metier
+ * @param analyser
+ * @return true si reussite
+ */
+ public boolean writeXML(final OutputStream out, final M metier, final CtuluAnalyze analyser) {
+
+ final D d = converter.convertMetierToDao(metier, analyser);
+ if (d != null) { return writeDAO(out, d, analyser); }
+ return false;
+ }
+
+}
Added: 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/AbstractCrue9FileFormat.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -0,0 +1,75 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.io;
+
+import java.io.File;
+import java.io.OutputStream;
+import java.net.URL;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.ctulu.CtuluIOOperationSynthese;
+import org.fudaa.dodico.crue.dao.CrueHelper;
+import org.fudaa.dodico.crue.io.neuf.AbstractCrue9Reader;
+import org.fudaa.dodico.crue.io.neuf.AbstractCrue9Writer;
+import org.fudaa.dodico.crue.metier.emh.CrueData;
+
+/**
+ * @author deniger
+ */
+public abstract class AbstractCrue9FileFormat extends CustomFileFormatUnique<CrueData> {
+
+ /**
+ * @param id identifiant du format
+ */
+ public AbstractCrue9FileFormat(final String id) {
+ super(1);
+ nom = id;
+ this.id = nom;
+ extensions = new String[] { id.toLowerCase() };
+ description = nom + ".file";
+ }
+
+ /**
+ * @return le reader qui va bien
+ */
+ protected abstract AbstractCrue9Reader createReader();
+
+ /**
+ * @return
+ */
+ protected abstract AbstractCrue9Writer createWriter();
+
+ public CrueData read(final File f, final CtuluAnalyze analyzer, final Object dataLinked) {
+ final AbstractCrue9Reader reader = createReader();
+ final CtuluIOOperationSynthese operation = reader.read(f, null);
+
+ CrueHelper.copyAnalyzer(analyzer, operation.getAnalyze());
+
+ if (operation.getSource() != null) { return (CrueData) operation.getSource(); }
+ return null;
+ }
+
+ public CrueData read(final String pathToResource, final CtuluAnalyze analyzer, final Object dataLinked) {
+ throw new IllegalAccessError("Must be done");
+ }
+
+ public CrueData read(final URL url, final CtuluAnalyze analyzer, final Object dataLinked) {
+ throw new IllegalAccessError("Must be done");
+ }
+
+ public boolean write(final CrueData metier, final File f, final CtuluAnalyze analyzer) {
+ final AbstractCrue9Writer writer = createWriter();
+ final CtuluIOOperationSynthese operation = writer.write(metier);
+
+ CrueHelper.copyAnalyzer(analyzer, operation.getAnalyze());
+
+ return operation != null && (operation.containsClosingError() || operation.containsFatalError());
+ }
+
+ public boolean write(final OutputStream out, final CrueData metier, final CtuluAnalyze analyser) {
+ throw new IllegalAccessError("Must be done");
+ }
+
+}
\ No newline at end of file
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue09reader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue09reader.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue09reader.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -1,97 +0,0 @@
-package org.fudaa.dodico.crue.io;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.fudaa.ctulu.CtuluActivity;
-import org.fudaa.dodico.fortran.FileOpReadCharSimpleAbstract;
-
-/**
- * G�re la lecteure du format crue 09. Utilise fortran reader
- *
- * @author Adrien Hadoux
- */
-public abstract class Crue09reader extends FileOpReadCharSimpleAbstract implements CtuluActivity {
-
- /**
- * Toutes les lignes qui commencent par * sont des dlignes caracteres
- */
- public final static String CARACT_COMMENT = "*";
-
- /**
- * Nb de lignes qui composent le titre en début de fichier. Valable pour dc et dh.
- */
- public final static int nbLignesTitre_deb = 5;
-
- /**
- * mot clef qui sépare les définitions des objets.
- */
- public final static String keyWordDefinition = "Définition";
-
- /**
- * retourne true si la ligne est null ou commence par *.
- *
- * @param lineRead
- * @return
- */
- public boolean isACommentLine(final String lineRead) {
-
- return lineRead == null ? true : lineRead.startsWith(CARACT_COMMENT);
-
- }
-
- /**
- * Retourne true si il s'agit d'un nouveau mot clef définition.
- *
- * @param lineRead
- * @return
- */
- public boolean isAKeyWordDefinition(final String lineRead) {
-
- return lineRead == null ? false : lineRead.contains(keyWordDefinition);
-
- }
-
- /**
- * Methode qui lit tous les commentair...
[truncated message content] |
|
From: <de...@us...> - 2009-04-23 20:46:05
|
Revision: 4678
http://fudaa.svn.sourceforge.net/fudaa/?rev=4678&view=rev
Author: deniger
Date: 2009-04-23 20:45:52 +0000 (Thu, 23 Apr 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/common-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/dclm-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/etu-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/ocal-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-1.dcsp.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-1.dpti.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-1.drso.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-2.dpti.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-2.drso.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dcsp.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dfrt.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dptg.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dpti.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.drso.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.ocal.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.optg.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.ores.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.pnum.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.dcsp.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.dptg.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.drso.xml
trunk/soft/fudaa-crue/src/main/config/pmd.xml
Added Paths:
-----------
trunk/soft/fudaa-crue/planning/
trunk/soft/fudaa-crue/planning/lot0-chart.html
trunk/soft/fudaa-crue/planning/lot0-resources.html
trunk/soft/fudaa-crue/planning/lot0-tasks.html
trunk/soft/fudaa-crue/planning/lot0.gan
trunk/soft/fudaa-crue/planning/lot0.html
trunk/soft/fudaa-crue/planning/lot0.res.png
Modified: trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/common-1.0.xsd
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/common-1.0.xsd 2009-04-23 17:37:12 UTC (rev 4677)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/common-1.0.xsd 2009-04-23 20:45:52 UTC (rev 4678)
@@ -9,22 +9,20 @@
<xs:element name="Description" type="xs:string" />
+ <xs:simpleType name="TypeNomRefId">
+ <xs:restriction base="xs:token" />
+ </xs:simpleType>
-
- <xs:complexType name="TypeNomRef" mixed="true">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute type="xs:token" name="NomRef" use="optional" />
- </xs:extension>
- </xs:simpleContent>
+ <xs:complexType name="TypeNomRef">
+ <xs:attribute type="TypeNomRefId" name="NomRef" use="required" />
</xs:complexType>
+
<xs:element name="PointFF" type="TypeVec2d" />
- <!--
- Permet de spécifier des valeurs du style vecteur 2d. Exemple
- 0.00 1.00
- -->
+ <!--
+ Permet de spécifier des valeurs du style vecteur 2d. Exemple 0.00 1.00
+ -->
<xs:simpleType name="TypeVec2d">
<xs:restriction base="xs:string">
<xs:whiteSpace value="collapse" />
@@ -33,11 +31,11 @@
(\+|\-)?([0-9]+(\.[0-9]*)?|\.[0-9]+)((E|e)(\+|\-)?[0-9]+)?)?" />
</xs:restriction>
</xs:simpleType>
-
- <!--
- Permet de spécifier des valeurs du style vecteur 3d. Exemple
- 0.00 1.00 2.00
- -->
+
+ <!--
+ Permet de spécifier des valeurs du style vecteur 3d. Exemple 0.00 1.00
+ 2.00
+ -->
<xs:simpleType name="TypeVec3d">
<xs:restriction base="xs:string">
<xs:whiteSpace value="collapse" />
Modified: trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/dclm-1.0.xsd
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/dclm-1.0.xsd 2009-04-23 17:37:12 UTC (rev 4677)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/dclm-1.0.xsd 2009-04-23 20:45:52 UTC (rev 4678)
@@ -9,25 +9,25 @@
<xs:element name="SensOuv" type="xs:string" />
<xs:element name="Ouv" type="xs:string" />
<!-- <xs:element name="BrancheSaintVenant"> -->
- <xs:complexType name="TypeRuis">
- <xs:sequence>
- <xs:element ref="Qruis" minOccurs="0" />
- <xs:element ref="HydrogrammeRuis" minOccurs="0" />
- </xs:sequence>
- <xs:attribute type="xs:string" name="NomRef" use="optional" />
- </xs:complexType>
+ <xs:complexType name="TypeRuis">
+ <xs:sequence>
+ <xs:element ref="Qruis" minOccurs="0" />
+ <xs:element ref="HydrogrammeRuis" minOccurs="0" />
+ </xs:sequence>
+ <xs:attribute type="xs:string" name="NomRef" use="optional" />
+ </xs:complexType>
<!-- </xs:element> -->
<!-- <xs:element name="NoeudNiveauContinu"> -->
- <xs:complexType name="NoeudNiveauContinu">
- <xs:sequence>
- <xs:element name="Qapp" type="xs:string" minOccurs="0" />
- <xs:element name="Z" type="xs:string" minOccurs="0" />
- <xs:element ref="Hydrogramme" minOccurs="0" />
- <xs:element ref="Limnigramme" minOccurs="0" />
- <xs:element ref="Tarrage" minOccurs="0" />
- </xs:sequence>
- <xs:attribute type="xs:string" name="NomRef" use="optional" />
- </xs:complexType>
+ <xs:complexType name="NoeudNiveauContinu">
+ <xs:sequence>
+ <xs:element name="Qapp" type="xs:string" minOccurs="0" />
+ <xs:element name="Z" type="xs:string" minOccurs="0" />
+ <xs:element ref="Hydrogramme" minOccurs="0" />
+ <xs:element ref="Limnigramme" minOccurs="0" />
+ <xs:element ref="Tarrage" minOccurs="0" />
+ </xs:sequence>
+ <xs:attribute type="xs:string" name="NomRef" use="optional" />
+ </xs:complexType>
<!-- </xs:element> -->
<xs:element name="Tarrage" type="TypeNomRef" />
@@ -37,38 +37,38 @@
<xs:element name="Manoeuvre" type="TypeNomRef" />
<!-- <xs:element name="BrancheOrifice"> -->
- <xs:complexType name="BrancheOrifice">
- <xs:sequence>
- <xs:element ref="SensOuv" minOccurs="0" />
- <xs:element ref="Ouv" minOccurs="0" />
- <xs:element ref="Manoeuvre" minOccurs="0" />
- </xs:sequence>
- <xs:attribute type="xs:string" name="NomRef" use="optional" />
- </xs:complexType>
+ <xs:complexType name="BrancheOrifice">
+ <xs:sequence>
+ <xs:element ref="SensOuv" minOccurs="0" />
+ <xs:element ref="Ouv" minOccurs="0" />
+ <xs:element ref="Manoeuvre" minOccurs="0" />
+ </xs:sequence>
+ <xs:attribute type="xs:string" name="NomRef" use="required" />
+ </xs:complexType>
<!-- </xs:element> -->
<xs:element name="CalculPermanent">
<xs:complexType>
<xs:sequence>
<xs:element ref="Description" />
- <xs:element name="NoeudNiveauContinuQapp" type="NoeudNiveauContinu" maxOccurs="unbounded"
- minOccurs="0" />
- <xs:element name="NoeudNiveauContinuZ" type="NoeudNiveauContinu" maxOccurs="unbounded"
- minOccurs="0" />
+ <xs:element name="NoeudNiveauContinuQapp" type="NoeudNiveauContinu"
+ maxOccurs="unbounded" minOccurs="0" />
+ <xs:element name="NoeudNiveauContinuZ" type="NoeudNiveauContinu"
+ maxOccurs="unbounded" minOccurs="0" />
<xs:element name="BrancheOrificeOuv" type="BrancheOrifice" />
- <xs:element name="BrancheSaintVenantQruis" type="TypeRuis" minOccurs="0"/>
- <xs:element name="CasierProfilQruis" type="TypeRuis" minOccurs="0"/>
+ <xs:element name="BrancheSaintVenantQruis" type="TypeRuis"
+ minOccurs="0" maxOccurs="unbounded" />
+ <xs:element name="CasierProfilQruis" type="TypeRuis"
+ minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>
<xs:attribute type="xs:token" name="Nom" use="optional" />
</xs:complexType>
</xs:element>
- <!-- <xs:element name="CasierProfil">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="Hydrogramme" />
- </xs:sequence>
- <xs:attribute type="xs:string" name="NomRef" use="optional" />
- </xs:complexType>
- </xs:element> -->
+ <!--
+ <xs:element name="CasierProfil"> <xs:complexType> <xs:sequence>
+ <xs:element ref="Hydrogramme" /> </xs:sequence> <xs:attribute
+ type="xs:string" name="NomRef" use="optional" /> </xs:complexType>
+ </xs:element>
+ -->
<xs:element name="DCLM">
<xs:complexType>
<xs:sequence>
@@ -89,20 +89,20 @@
<xs:complexType>
<xs:sequence>
<xs:element ref="Description" />
- <xs:element name="NoeudNiveauContinuHydrogramme" type="NoeudNiveauContinu" maxOccurs="unbounded"
- minOccurs="0">
+ <xs:element name="NoeudNiveauContinuHydrogramme" type="NoeudNiveauContinu"
+ maxOccurs="unbounded" minOccurs="0">
<xs:annotation>
<xs:documentation>Une même loi peut être utilisée pour
plusieurs conditions aux limites</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="NoeudNiveauContinuLimnigramme" type="NoeudNiveauContinu" maxOccurs="unbounded"
- minOccurs="0"/>
- <xs:element name="NoeudNiveauContinuTarrage" type="NoeudNiveauContinu" maxOccurs="unbounded"
- minOccurs="0"/>
+ <xs:element name="NoeudNiveauContinuLimnigramme" type="NoeudNiveauContinu"
+ maxOccurs="unbounded" minOccurs="0" />
+ <xs:element name="NoeudNiveauContinuTarrage" type="NoeudNiveauContinu"
+ maxOccurs="unbounded" minOccurs="0" />
<xs:element name="BrancheOrificeManoeuvre" type="BrancheOrifice" />
- <xs:element name="BrancheSaintVenantHydrogrammeRuis" type="TypeRuis" maxOccurs="unbounded"
- minOccurs="0">
+ <xs:element name="BrancheSaintVenantHydrogrammeRuis"
+ type="TypeRuis" maxOccurs="unbounded" minOccurs="0">
<xs:annotation>
<xs:documentation>Ci-dessous, exemple d'hydrogrammes de
ruissellement sur des branches et casiers (non présent dans la
@@ -115,5 +115,5 @@
<xs:attribute type="xs:token" name="Nom" />
</xs:complexType>
</xs:element>
-
+
</xs:schema>
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/etu-1.0.xsd
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/etu-1.0.xsd 2009-04-23 17:37:12 UTC (rev 4677)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/etu-1.0.xsd 2009-04-23 20:45:52 UTC (rev 4678)
@@ -43,15 +43,15 @@
<xs:element name="Source">
<xs:complexType>
- <xs:attribute name="Nom" type="xs:ID" />
- <xs:attribute name="Chemin" type="xs:string" />
- <xs:attribute name="Type" type="xs:string" />
+ <xs:attribute name="Nom" type="xs:ID" use="required" />
+ <xs:attribute name="Chemin" type="xs:string" use="required" />
+ <xs:attribute name="Type" type="xs:string" use="required" />
</xs:complexType>
</xs:element>
<xs:complexType name="TypeFichEtudes">
<xs:sequence>
- <xs:element ref="Source" minOccurs="1" maxOccurs="unbounded" />
+ <xs:element ref="Source" minOccurs="1" maxOccurs="unbounded" />
</xs:sequence>
</xs:complexType>
@@ -66,7 +66,7 @@
<xs:element ref="DateCreation" />
<xs:element ref="DerniereModif" />
<xs:element ref="DateDerniereModif" />
- <xs:element name="FichEtudes" type="TypeListeReferencesFichier" />
+ <xs:element name="FichEtudes" type="TypeListeReferencesFichierSousModele" />
</xs:sequence>
<xs:attribute name="Nom" type="xs:token" />
</xs:complexType>
@@ -93,7 +93,7 @@
<xs:element ref="DerniereModif" />
<xs:element ref="DateCreation" />
<!-- xs:element ref="DateDerniereModif" /-->
- <xs:element name="FichEtudes" type="TypeListeReferencesFichier" />
+ <xs:element name="FichEtudes" type="TypeListeReferencesFichierModele" />
<xs:element name="SousModeles" minOccurs="0"
type="TypeListeReferencesSousModele" />
</xs:sequence>
@@ -132,7 +132,7 @@
<xs:element ref="DateCreation" />
<!-- xs:element ref="DateDerniereModif" /-->
- <xs:element name="FichEtudes" type="TypeListeReferencesFichier"
+ <xs:element name="FichEtudes" type="TypeListeReferencesFichierScenario"
minOccurs="0" />
<xs:element name="Modeles" type="TypeListeReferencesModele" />
<xs:element ref="Runs" minOccurs="0" />
@@ -160,7 +160,7 @@
<xs:element ref="Commentaire" />
<xs:element ref="FichRuns" />
</xs:sequence>
- <xs:attribute name="Nom" type="xs:token"/>
+ <xs:attribute name="Nom" type="xs:token" />
</xs:complexType>
</xs:element>
@@ -202,30 +202,194 @@
<xs:attribute name="NomRef" type="xs:string" />
</xs:complexType>
+ <xs:complexType name="TypeListeReferencesFichierModele">
+ <xs:choice>
+ <xs:group ref="GroupListeReferencesFichierModele10" />
+ <xs:group ref="GroupeListeReferencesFichierModele9" />
+ </xs:choice>
+ </xs:complexType>
- <xs:complexType name="TypeListeReferencesFichier">
- <xs:sequence minOccurs="0" maxOccurs="unbounded" >
-
+ <!-- Liste des fichiers acceptés au niveau scenario -->
+ <xs:complexType name="TypeListeReferencesFichierScenario">
+ <xs:sequence>
+ <xs:element name="OCAL" type="TypeReference" />
+ <xs:element name="ORES" type="TypeReference" />
+ <xs:element name="PCAL" type="TypeReference" />
+ <xs:element name="DCLM" type="TypeReference" />
+ <xs:element name="DLHY" type="TypeReference" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <!-- Liste des fichiers acceptés au niveau modèle -->
+ <xs:group name="GroupListeReferencesFichierModele10">
+ <xs:sequence>
+ <xs:element ref="OPTR" />
+ <xs:element ref="OPTG" />
+ <xs:element ref="OPTI" />
+ <xs:element ref="PNUM" />
+ <xs:element ref="DPTI" />
+ </xs:sequence>
+ </xs:group>
+ <!-- Les fichiers requis pour un projet Crue9 -->
+ <xs:group name="GroupeListeReferencesFichierModele9">
+ <xs:sequence>
+ <xs:element ref="DC"/>
+ <xs:element ref="DH"/>
+ </xs:sequence>
+ </xs:group>
+
+ <!-- Definition des références de fichiers -->
+
+ <xs:simpleType name="TypeXmlIdRef">
+ <xs:restriction base="xs:IDREF">
+ <xs:whiteSpace value="collapse" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:element name="OPTR">
+ <xs:complexType>
+ <xs:attribute name="NomRef" use="required">
+ <xs:simpleType>
+ <xs:restriction base="TypeXmlIdRef">
+ <xs:pattern value=".*[^\s].*\.optr\.xml"></xs:pattern>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="OPTG">
+ <xs:complexType>
+ <xs:attribute name="NomRef" use="required">
+ <xs:simpleType>
+ <xs:restriction base="TypeXmlIdRef">
+ <xs:pattern value=".*[^\s].*\.optg\.xml"></xs:pattern>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="OPTI">
+ <xs:complexType>
+ <xs:attribute name="NomRef" use="required">
+ <xs:simpleType>
+ <xs:restriction base="TypeXmlIdRef">
+ <xs:pattern value=".*[^\s].*\.opti\.xml"></xs:pattern>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="PNUM">
+ <xs:complexType>
+ <xs:attribute name="NomRef" use="required">
+ <xs:simpleType>
+ <xs:restriction base="TypeXmlIdRef">
+ <xs:pattern value=".*[^\s].*\.pnum\.xml"></xs:pattern>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="DPTI">
+ <xs:complexType>
+ <xs:attribute name="NomRef" use="required">
+ <xs:simpleType>
+ <xs:restriction base="TypeXmlIdRef">
+ <xs:pattern value=".*[^\s].*\.dpti\.xml"></xs:pattern>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="DC">
+ <xs:complexType>
+ <xs:attribute name="NomRef" use="required">
+ <xs:simpleType>
+ <xs:restriction base="TypeXmlIdRef">
+ <xs:pattern value=".*[^\s].*\.dc"></xs:pattern>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="DH">
+ <xs:complexType>
+ <xs:attribute name="NomRef" use="required">
+ <xs:simpleType>
+ <xs:restriction base="TypeXmlIdRef">
+ <xs:pattern value=".*[^\s].*\.dh"></xs:pattern>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="DRSO">
+ <xs:complexType>
+ <xs:attribute name="NomRef" use="required">
+ <xs:simpleType>
+ <xs:restriction base="TypeXmlIdRef">
+ <xs:pattern value=".*[^\s].*\.drso\.xml"></xs:pattern>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="DCSP">
+ <xs:complexType>
+ <xs:attribute name="NomRef" use="required">
+ <xs:simpleType>
+ <xs:restriction base="TypeXmlIdRef">
+ <xs:pattern value=".*[^\s].*\.dcsp\.xml"></xs:pattern>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="DPTG">
+ <xs:complexType>
+ <xs:attribute name="NomRef" use="required">
+ <xs:simpleType>
+ <xs:restriction base="TypeXmlIdRef">
+ <xs:pattern value=".*[^\s].*\.dptg\.xml"></xs:pattern>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="DFRT">
+ <xs:complexType>
+ <xs:attribute name="NomRef" use="required">
+ <xs:simpleType>
+ <xs:restriction base="TypeXmlIdRef">
+ <xs:pattern value=".*[^\s].*\.dfrt\.xml"></xs:pattern>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+
+
+
+
+ <xs:complexType name="TypeListeReferencesFichierSousModele">
+ <xs:sequence minOccurs="1" maxOccurs="1">
+
<!-- Le top 4 des indispensables!!! -->
<!-- TODO Fred: ajoute ta sauce magique pour forcer l'ordre !! -->
- <xs:element name="DRSO" type="TypeReference" minOccurs="0" maxOccurs="unbounded" />
- <xs:element name="DCSP" type="TypeReference" minOccurs="0" maxOccurs="unbounded" />
- <xs:element name="DPTG" type="TypeReference" minOccurs="0" maxOccurs="unbounded" />
- <xs:element name="DFRT" type="TypeReference" minOccurs="0" maxOccurs="unbounded" />
- <xs:element name="DC" type="TypeReference" minOccurs="0" maxOccurs="unbounded" />
-
- <xs:element name="DH" type="TypeReference" minOccurs="0" maxOccurs="unbounded" />
- <xs:element name="DCLM" type="TypeReference" minOccurs="0" maxOccurs="unbounded" />
- <xs:element name="DLHY" type="TypeReference" minOccurs="0" maxOccurs="unbounded" />
- <xs:element name="DPTI" type="TypeReference" minOccurs="0" maxOccurs="unbounded" />
- <xs:element name="PNUM" type="TypeReference" minOccurs="0" maxOccurs="unbounded" />
- <xs:element name="PCAL" type="TypeReference" minOccurs="0" maxOccurs="unbounded" />
- <xs:element name="OCAL" type="TypeReference" minOccurs="0" maxOccurs="unbounded" />
- <xs:element name="OPTG" type="TypeReference" minOccurs="0" maxOccurs="unbounded" />
- <xs:element name="OPTI" type="TypeReference" minOccurs="0" maxOccurs="unbounded" />
- <xs:element name="OPTR" type="TypeReference" minOccurs="0" maxOccurs="unbounded" />
- <xs:element name="ORES" type="TypeReference" minOccurs="0" maxOccurs="unbounded" />
-
+ <!-- L'ordre est respecté par défaut... -->
+ <!-- Pour ne pas mettre d'ordre il faut utiliser xs:all-->
+ <xs:element ref="DRSO" />
+ <xs:element ref="DCSP" />
+ <xs:element ref="DPTG" />
+ <xs:element ref="DFRT" />
+
</xs:sequence>
</xs:complexType>
Modified: trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/ocal-1.0.xsd
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/ocal-1.0.xsd 2009-04-23 17:37:12 UTC (rev 4677)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/ocal-1.0.xsd 2009-04-23 20:45:52 UTC (rev 4678)
@@ -1,27 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-attributeFormDefault="unqualified" elementFormDefault="qualified"
+ attributeFormDefault="unqualified" elementFormDefault="qualified"
targetNamespace="http://www.fudaa.fr/xsd/crue" xmlns="http://www.fudaa.fr/xsd/crue">
<xs:include schemaLocation="common-1.0.xsd" />
- <xs:element name="InitCalculPrecedent" type="xs:string" />
-
+ <xs:element name="IniCalculPrecedent" type="xs:string" />
+
<xs:element name="CalculPseudoPermanent">
<xs:complexType>
- <xs:sequence>
- <xs:element ref="InitCondInit" minOccurs="0" />
- <xs:element ref="InitCalculPrecedent" minOccurs="0" />
- </xs:sequence>
- <xs:attribute type="xs:token" name="NomRef" use="optional" />
+ <xs:complexContent>
+ <xs:extension base="TypeNomRef">
+ <xs:choice>
+ <xs:element ref="IniCondIni" />
+ <xs:element ref="IniCalculPrecedent" />
+ </xs:choice>
+ <!-- xs:attribute type="xs:token" name="NomRef" use="required" / -->
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
</xs:element>
-
- <xs:element name="InitCondInit" type="xs:string" />
-
+
+ <xs:element name="IniCondIni" type="xs:string" />
+
<xs:element name="CalculTransitoire">
<xs:complexType>
<xs:sequence>
- <xs:element ref="InitCalculPrecedent" />
+ <xs:element ref="IniCalculPrecedent" />
</xs:sequence>
<xs:attribute type="xs:token" name="NomRef" />
</xs:complexType>
Modified: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-1.dcsp.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-1.dcsp.xml 2009-04-23 17:37:12 UTC (rev 4677)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-1.dcsp.xml 2009-04-23 20:45:52 UTC (rev 4678)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<DCSP xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr//xsd/dcsp-1.0.xsd">
+<DCSP xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/dcsp-1.0.xsd">
<!-- Le fichier DCSP contient les données nécessaires au calcul ne nécessitant aucun prétraitement (en particulier géométrique) d'un modèle CrueX. Son périmètre est le sous-modèle -->
<!-- Révision 0 le 20/04/2009 par PBa : écriture du fichier à la main -->
Modified: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-1.dpti.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-1.dpti.xml 2009-04-23 17:37:12 UTC (rev 4677)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-1.dpti.xml 2009-04-23 20:45:52 UTC (rev 4678)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<DPTI xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr//xsd/dpti-1.0.xsd">
+<DPTI xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/dpti-1.0.xsd">
<!-- Le fichier DPTI décrit les conditions initiales (dont les manoeuvres d'ouvrages) d'un modèle CrueX. Son périmètre est le modèle -->
<!-- Révision 0 le 20/04/2009 par PBa : écriture du fichier à la main -->
Modified: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-1.drso.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-1.drso.xml 2009-04-23 17:37:12 UTC (rev 4677)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-1.drso.xml 2009-04-23 20:45:52 UTC (rev 4678)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<DRSO xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr//xsd/drso-1.0.xsd">
+<DRSO xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/drso-1.0.xsd">
<!-- Le fichier DRSO décrit la structure topologique d'un modèle CrueX. Son périmètre est le sous-modèle -->
<!-- Révision 0 le 20/04/2009 par PBa : écriture du fichier à la main -->
Modified: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-2.dpti.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-2.dpti.xml 2009-04-23 17:37:12 UTC (rev 4677)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-2.dpti.xml 2009-04-23 20:45:52 UTC (rev 4678)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<DPTI xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr//xsd/dpti-1.0.xsd">
+<DPTI xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/dpti-1.0.xsd">
<!-- Le fichier DPTI décrit les conditions initiales (dont les manoeuvres d'ouvrages) d'un modèle CrueX. Son périmètre est le modèle -->
<!-- Révision 0 le 20/04/2009 par PBa: écriture du fichier à la main -->
Modified: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-2.drso.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-2.drso.xml 2009-04-23 17:37:12 UTC (rev 4677)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-2.drso.xml 2009-04-23 20:45:52 UTC (rev 4678)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<DRSO xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr//xsd/drso-1.0.xsd">
+<DRSO xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/drso-1.0.xsd">
<!-- Le fichier DRSO décrit la structure topologique d'un modèle CrueX. Son périmètre est le sous-modèle -->
<!-- Révision 0 le 20/04/2009 par PBa: écriture du fichier à la main -->
Modified: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dcsp.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dcsp.xml 2009-04-23 17:37:12 UTC (rev 4677)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dcsp.xml 2009-04-23 20:45:52 UTC (rev 4678)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<DCSP xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr//xsd/dcsp-1.0.xsd">
+<DCSP xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/dcsp-1.0.xsd"
+
+>
<!-- Le fichier DCSP contient les données nécessaires au calcul ne nécessitant aucun prétraitement (en particulier géométrique) d'un modèle CrueX. Son périmètre est le sous-modèle -->
<!-- Révision 0 le 04/02/2009 par PBa : écriture du fichier à la main -->
<!-- Révision 1 le 06/03/2009 par JMB & PBa: Pour deuxième publication Fudaa-Crue v0 -->
Modified: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dfrt.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dfrt.xml 2009-04-23 17:37:12 UTC (rev 4677)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dfrt.xml 2009-04-23 20:45:52 UTC (rev 4678)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<DFRT xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr//xsd/dfrt-1.0.xsd">
+<DFRT xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/dfrt-1.0.xsd">
<!-- Le fichier DFRT décrit les frottements d'un modèle CrueX. Son périmètre est le sous-modèle -->
<!-- Révision 0 le 03/02/2009 par PBa : écriture du fichier à la main -->
<!-- Révision 1 le 06/03/2009 par JMB & PBa: Pour deuxième publication Fudaa-Crue v0 -->
Modified: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dptg.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dptg.xml 2009-04-23 17:37:12 UTC (rev 4677)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dptg.xml 2009-04-23 20:45:52 UTC (rev 4678)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<DPTG xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr//xsd/dptg-1.0.xsd">
+<DPTG xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/dptg-1.0.xsd">
<!-- Le fichier DPTG décrit les données nécessitant un prétraitement géométriques d'un modèle CrueX. Son périmètre est le sous-modèle -->
<!-- Révision 0 le 02/02/2009 par PBa: écriture du fichier à la main -->
<!-- Révision 1 le 03/02/2009 par JMB & PBa: introduction de ProfilIdemSection -->
Modified: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dpti.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dpti.xml 2009-04-23 17:37:12 UTC (rev 4677)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dpti.xml 2009-04-23 20:45:52 UTC (rev 4678)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<DPTI xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr//xsd/dpti-1.0.xsd">
+<DPTI xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/dpti-1.0.xsd">
<!-- Le fichier DPTI décrit les conditions initiales (dont les manoeuvres d'ouvrages) d'un modèle CrueX. Son périmètre est le modèle -->
<!-- Révision 0 le 05/02/2009 par PBa: écriture du fichier à la main -->
<!-- Révision 1 le 06/03/2009 par JMB & PBa: Pour deuxième publication Fudaa-Crue v0 -->
Modified: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.drso.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.drso.xml 2009-04-23 17:37:12 UTC (rev 4677)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.drso.xml 2009-04-23 20:45:52 UTC (rev 4678)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<DRSO xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr//xsd/drso-1.0.xsd">
+<DRSO xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/drso-1.0.xsd">
<!-- Le fichier DRSO décrit la structure topologique d'un modèle CrueX. Son périmètre est le sous-modèle -->
<!-- Révision 0 le 29/01/2009 par PBa: écriture du fichier à la main -->
<!-- Révision 1 le 02/02/2009 par JMB & PBa: prise en compte des Id-Ref; types d'EMH plutôt que leurs catégories -->
Modified: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.ocal.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.ocal.xml 2009-04-23 17:37:12 UTC (rev 4677)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.ocal.xml 2009-04-23 20:45:52 UTC (rev 4678)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<OCAL xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr//xsd/ocal-1.0.xsd">
+<OCAL xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/ocal-1.0.xsd">
<!-- Le fichier OCAL rassemble les ordres de calcul d'un scénario CrueX. Son périmètre est le scénario -->
<!-- La bibliothèque des calculs est définie dans le DCLM. Ici on précise ceux qu'on veut lancer -->
<!-- Révision 0 le 23/03/2009 par JMB&PBa : écriture du fichier à la main -->
Modified: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.optg.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.optg.xml 2009-04-23 17:37:12 UTC (rev 4677)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.optg.xml 2009-04-23 20:45:52 UTC (rev 4678)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<OPTG xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr//xsd/optg-1.0.xsd">
+<OPTG xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/optg-1.0.xsd">
<VersionCrue>0.0</VersionCrue>
<Commentaire>Commentaire sur le sous-modèle</Commentaire>
Modified: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.ores.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.ores.xml 2009-04-23 17:37:12 UTC (rev 4677)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.ores.xml 2009-04-23 20:45:52 UTC (rev 4678)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ORES xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr//xsd/ores-1.0.xsd">
+<ORES xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/ores-1.0.xsd">
<!-- Le fichier ORES rassemble les demandes de résultats supplémentaires. Son périmètre est le scénario -->
<!-- Révision 0 le 24/03/2009 par PBa : écriture du fichier à la main -->
<!-- Entrées pour chaque type d'EMH et non pour chaque catégorie d'EMH -->
Modified: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.pnum.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.pnum.xml 2009-04-23 17:37:12 UTC (rev 4677)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.pnum.xml 2009-04-23 20:45:52 UTC (rev 4678)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<PNUM xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr//xsd/pnum-1.0.xsd">
+<PNUM xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/pnum-1.0.xsd">
<!-- Le fichier PNUM rassemble les paramètres numériques d'un modèle CrueX. Son périmètre est le modèle -->
<!-- Révision 0 le 24/03/2009 par PBa : écriture du fichier à la main -->
<VersionCrue>0.0</VersionCrue> <!-- Version du moteur Crue10 minimale requise -->
Modified: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.dcsp.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.dcsp.xml 2009-04-23 17:37:12 UTC (rev 4677)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.dcsp.xml 2009-04-23 20:45:52 UTC (rev 4678)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<DCSP xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr//xsd/dcsp-1.0.xsd">
+<DCSP xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/dcsp-1.0.xsd">
<!-- Le fichier DCSP contient les données nécessaires au calcul ne nécessitant aucun prétraitement (en particulier géométrique) d'un modèle CrueX. Son périmètre est le sous-modèle -->
<!-- Révision 1 le 06/03/2009 par JMB & PBa: Pour deuxième publication Fudaa-Crue v0 -->
<!-- Révision 2 le 10/03/2009 par JMB & PBa: Pour troisième publication Fudaa-Crue v0 -->
Modified: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.dptg.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.dptg.xml 2009-04-23 17:37:12 UTC (rev 4677)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.dptg.xml 2009-04-23 20:45:52 UTC (rev 4678)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<DPTG xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr//xsd/dptg-1.0.xsd">
+<DPTG xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/dptg-1.0.xsd">
<!-- Le fichier DPTG décrit les données nécessitant un prétraitement géométriques d'un modèle CrueX. Son périmètre est le sous-modèle -->
<!-- Révision 0 le 02/02/2009 par PBa: écriture du fichier à la main -->
<!-- Révision 1 le 03/02/2009 par JMB & PBa: introduction de ProfilIdemSection -->
Modified: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.drso.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.drso.xml 2009-04-23 17:37:12 UTC (rev 4677)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.drso.xml 2009-04-23 20:45:52 UTC (rev 4678)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<DRSO xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr//xsd/drso-1.0.xsd">
+<DRSO xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/drso-1.0.xsd">
<!-- Le fichier DRSO décrit la structure topologique d'un modèle CrueX. Son périmètre est le sous-modèle -->
<!-- Révision 1 le 06/03/2009 par JMB & PBa: Pour deuxième publication Fudaa-Crue v0 -->
<!-- Révision 2 le 09/03/2009 par JMB & PBa: Pour troisième publication Fudaa-Crue v0 -->
Added: trunk/soft/fudaa-crue/planning/lot0-chart.html
===================================================================
--- trunk/soft/fudaa-crue/planning/lot0-chart.html (rev 0)
+++ trunk/soft/fudaa-crue/planning/lot0-chart.html 2009-04-23 20:45:52 UTC (rev 4678)
@@ -0,0 +1,129 @@
+<html xmlns:ganttproject="http://ganttproject.sf.net/">
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GanttProject - lot0</title>
+<style>
+ A:link {
+ FONT-WEIGHT: bold; TEXT-DECORATION: none;
+ FONT-SIZE: 14px ; COLOR: black;
+ }
+ A:visited {
+ FONT-WEIGHT: bold; TEXT-DECORATION: none;
+ FONT-SIZE: 14px ; COLOR: black; BACKGROUND: none
+ }
+ A:hover {
+ FONT-WEIGHT: bold; TEXT-DECORATION: none;
+ FONT-SIZE: 14px ; COLOR: white ; BACKGROUND: #6d9ec6;
+ }
+ .notes {
+ padding-left: 10px;
+ }
+ .notes pre {
+ font-family: Arial, Helvetica;
+ font-size: 10px;
+ margin-top: 0px;
+ padding-top: 0px;
+ margin-bottom: 5px;
+ }
+ .attachment {
+ padding-left: 10px;
+ }
+ .attachment a:link {
+ font-weight: normal;
+ font-size: 12px;
+ color: #6d9ec6;
+ background: white;
+ }
+ .attachment a:hover {
+ font-weight: normal;
+ text-decoration: underline;
+ font-size: 12px;
+ color: #6d9ec6;
+ background: white;
+ }
+ .attachment a:visited {
+ font-weight: normal;
+ font-size: 12px;
+ background: white;
+ color: gray;
+ }
+ TD {
+ FONT-SIZE: 12px; COLOR: black; FONT-STYLE: normal; FONT-FAMILY: Arial, Helvetica, Geneva, sans-serif
+ }
+ UL {
+ FONT-SIZE: 12px; FONT-FAMILY: Arial, Helvetica, Geneva, sans-serif
+ }
+ LI {
+ FONT-SIZE: 12px; FONT-FAMILY: Arial, Helvetica, Geneva, sans-serif
+ }
+ H1 {
+ FONT-WEIGHT: bold; FONT-SIZE: 16pt; COLOR: #6d9ec6;
+ }
+ H2 {
+ FONT-WEIGHT: bold; FONT-SIZE: 16pt; COLOR: #000000;
+ }
+ H3 {
+ FONT-WEIGHT: bold; FONT-SIZE: 13pt; COLOR: #6d9ec6;
+ }
+ H4 {
+ FONT-WEIGHT: bold; FONT-SIZE: 13px; COLOR: #000000;
+ }
+ H5 {
+ FONT-WEIGHT: bold; FONT-SIZE: 10pt; COLOR: #6d9ec6;
+ }
+ H6 {
+ FONT-WEIGHT: bold; FONT-SIZE: 10pt; COLOR: #000000
+ }
+
+ </style>
+</head>
+<body bgcolor="white">
+<center>
+<style>
+div.project_name {
+ font-size: 150%;
+ color: black;
+ font-weight: bold;
+ border-top: solid #6d9ec6 5px;
+ padding-top: 3px;
+ padding-bottom: 3px;
+ padding-left: 5px;
+}
+div.page_links {
+ background: #6d9ec6;
+ text-align: center;
+}
+</style>
+<center>
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+<tr>
+<td bgcolor="#dddddd">
+<div class="project_name">Untitled Gantt Project</div>
+</td>
+</tr>
+<tr>
+<td>
+<div class="page_links">
+<a href="lot0.html">Accueil</a> |
+ <a href="lot0-chart.html">Gantt</a> |
+ <a href="lot0-tasks.html">Tâches</a> |
+ <a href="lot0-resources.html">Ressources</a>
+</div>
+</td>
+</tr>
+</table>
+</center>
+<br>
+<br>
+<img src="lot0.png"><br>
+</center>
+<br>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td bgcolor="#6d9ec6" width="50%"><font color="#FFFFFF"><b>Ganttproject (2.0.9)</b></font></td><td bgcolor="#6d9ec6" width="50%" align="right"><b><a href="http://ganttproject.biz">ganttproject.biz</a></b>
+<br>
+<b>17/04/09 - 00:00:00</b></td>
+</tr>
+</table>
+</body>
+</html>
Added: trunk/soft/fudaa-crue/planning/lot0-resources.html
===================================================================
--- trunk/soft/fudaa-crue/planning/lot0-resources.html (rev 0)
+++ trunk/soft/fudaa-crue/planning/lot0-resources.html 2009-04-23 20:45:52 UTC (rev 4678)
@@ -0,0 +1,173 @@
+<html xmlns:ganttproject="http://ganttproject.sf.net/">
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GanttProject - lot0</title>
+<style>
+ A:link {
+ FONT-WEIGHT: bold; TEXT-DECORATION: none;
+ FONT-SIZE: 14px ; COLOR: black;
+ }
+ A:visited {
+ FONT-WEIGHT: bold; TEXT-DECORATION: none;
+ FONT-SIZE: 14px ; COLOR: black; BACKGROUND: none
+ }
+ A:hover {
+ FONT-WEIGHT: bold; TEXT-DECORATION: none;
+ FONT-SIZE: 14px ; COLOR: white ; BACKGROUND: #6d9ec6;
+ }
+ .notes {
+ padding-left: 10px;
+ }
+ .notes pre {
+ font-family: Arial, Helvetica;
+ font-size: 10px;
+ margin-top: 0px;
+ padding-top: 0px;
+ margin-bottom: 5px;
+ }
+ .attachment {
+ padding-left: 10px;
+ }
+ .attachment a:link {
+ font-weight: normal;
+ font-size: 12px;
+ color: #6d9ec6;
+ background: white;
+ }
+ .attachment a:hover {
+ font-weight: normal;
+ text-decoration: underline;
+ font-size: 12px;
+ color: #6d9ec6;
+ background: white;
+ }
+ .attachment a:visited {
+ font-weight: normal;
+ font-size: 12px;
+ background: white;
+ color: gray;
+ }
+ TD {
+ FONT-SIZE: 12px; COLOR: black; FONT-STYLE: normal; FONT-FAMILY: Arial, Helvetica, Geneva, sans-serif
+ }
+ UL {
+ FONT-SIZE: 12px; FONT-FAMILY: Arial, Helvetica, Geneva, sans-serif
+ }
+ LI {
+ FONT-SIZE: 12px; FONT-FAMILY: Arial, Helvetica, Geneva, sans-serif
+ }
+ H1 {
+ FONT-WEIGHT: bold; FONT-SIZE: 16pt; COLOR: #6d9ec6;
+ }
+ H2 {
+ FONT-WEIGHT: bold; FONT-SIZE: 16pt; COLOR: #000000;
+ }
+ H3 {
+ FONT-WEIGHT: bold; FONT-SIZE: 13pt; COLOR: #6d9ec6;
+ }
+ H4 {
+ FONT-WEIGHT: bold; FONT-SIZE: 13px; COLOR: #000000;
+ }
+ H5 {
+ FONT-WEIGHT: bold; FONT-SIZE: 10pt; COLOR: #6d9ec6;
+ }
+ H6 {
+ FONT-WEIGHT: bold; FONT-SIZE: 10pt; COLOR: #000000
+ }
+
+ </style>
+</head>
+<body bgcolor="white">
+<center>
+<style>
+div.project_name {
+ font-size: 150%;
+ color: black;
+ font-weight: bold;
+ border-top: solid #6d9ec6 5px;
+ padding-top: 3px;
+ padding-bottom: 3px;
+ padding-left: 5px;
+}
+div.page_links {
+ background: #6d9ec6;
+ text-align: center;
+}
+</style>
+<center>
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+<tr>
+<td bgcolor="#dddddd">
+<div class="project_name">Untitled Gantt Project</div>
+</td>
+</tr>
+<tr>
+<td>
+<div class="page_links">
+<a href="lot0.html">Accueil</a> |
+ <a href="lot0-chart.html">Gantt</a> |
+ <a href="lot0-tasks.html">Tâches</a> |
+ <a href="lot0-resources.html">Ressources</a>
+</div>
+</td>
+</tr>
+</table>
+</center>
+<br>
+<style>
+td.header {
+ background: #dddddd;
+ margin: 0;
+ padding-left: 3px;
+ padding-right: 3px;
+ padding-top: 2px;
+ padding-bottom:1px;
+ border-bottom: solid black 2px;
+}
+td.cell {
+ margin: 0;
+ margin-top: 2px;
+ padding-left: 3px;
+ padding-right: 3px;
+ padding-top: 2px;
+ padding-bottom:1px;
+}
+div.cell {
+}
+h5.header {
+ margin-left: 2px;
+ margin-top: 2px;
+}
+</style>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top" class="header">
+<h5 class="header">Nom</h5>
+</td><td valign="top" class="header">
+<h5 class="header">Rôle par défaut</h5>
+</td>
+</tr>
+<tr>
+<td valign="top" class="cell">Carole Delhaye</td><td valign="top" class="cell">Développeur</td>
+</tr>
+<tr>
+<td valign="top" class="cell">Adrien Hadoux</td><td valign="top" class="cell">Développeur</td>
+</tr>
+<tr>
+<td valign="top" class="cell">Frédéric Deniger</td><td valign="top" class="cell">Chef de projet</td>
+</tr>
+</table>
+<br>
+<br>
+<img src="lot0.res.png"><br>
+</center>
+<br>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td bgcolor="#6d9ec6" width="50%"><font color="#FFFFFF"><b>Ganttproject (2.0.9)</b></font></td><td bgcolor="#6d9ec6" width="50%" align="right"><b><a href="http://ganttproject.biz">ganttproject.biz</a></b>
+<br>
+<b>17/04/09 - 00:00:00</b></td>
+</tr>
+</table>
+</body>
+</html>
Added: trunk/soft/fudaa-crue/planning/lot0-tasks.html
===================================================================
--- trunk/soft/fudaa-crue/planning/lot0-tasks.html (rev 0)
+++ trunk/soft/fudaa-crue/planning/lot0-tasks.html 2009-04-23 20:45:52 UTC (rev 4678)
@@ -0,0 +1,1342 @@
+<html xmlns:ganttproject="http://ganttproject.sf.net/">
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GanttProject - lot0</title>
+<style>
+ A:link {
+ FONT-WEIGHT: bold; TEXT-DECORATION: none;
+ FONT-SIZE: 14px ; COLOR: black;
+ }
+ A:visited {
+ FONT-WEIGHT: bold; TEXT-DECORATION: none;
+ FONT-SIZE: 14px ; COLOR: black; BACKGROUND: none
+ }
+ A:hover {
+ FONT-WEIGHT: bold; TEXT-DECORATION: none;
+ FONT-SIZE: 14px ; COLOR: white ; BACKGROUND: #6d9ec6;
+ }
+ .notes {
+ padding-left: 10px;
+ }
+ .notes pre {
+ font-family: Arial, Helvetica;
+ font-size: 10px;
+ margin-top: 0px;
+ padding-top: 0px;
+ margin-bottom: 5px;
+ }
+ .attachment {
+ padding-left: 10px;
+ }
+ .attachment a:link {
+ font-weight: normal;
+ font-size: 12px;
+ color: #6d9ec6;
+ background: white;
+ }
+ .attachment a:hover {
+ font-weight: normal;
+ text-decoration: underline;
+ font-size: 12px;
+ color: #6d9ec6;
+ background: white;
+ }
+ .attachment a:visited {
+ font-weight: normal;
+ font-size: 12px;
+ background: white;
+ color: gray;
+ }
+ TD {
+ FONT-SIZE: 12px; COLOR: black; FONT-STYLE: normal; FONT-FAMILY: Arial, Helvetica, Geneva, sans-serif
+ }
+ UL {
+ FONT-SIZE: 12px; FONT-FAMILY: Arial, Helvetica, Geneva, sans-serif
+ }
+ LI {
+ FONT-SIZE: 12px; FONT-FAMILY: Arial, Helvetica, Geneva, sans-serif
+ }
+ H1 {
+ FONT-WEIGHT: bold; FONT-SIZE: 16pt; COLOR: #6d9ec6;
+ }
+ H2 {
+ FONT-WEIGHT: bold; FONT-SIZE: 16pt; COLOR: #000000;
+ }
+ H3 {
+ FONT-WEIGHT: bold; FONT-SIZE: 13pt; COLOR: #6d9ec6;
+ }
+ H4 {
+ FONT-WEIGHT: bold; FONT-SIZE: 13px; COLOR: #000000;
+ }
+ H5 {
+ FONT-WEIGHT: bold; FONT-SIZE: 10pt; COLOR: #6d9ec6;
+ }
+ H6 {
+ FONT-WEIGHT: bold; FONT-SIZE: 10pt; COLOR: #000000
+ }
+
+ </style>
+</head>
+<body bgcolor="white">
+<center>
+<style>
+div.project_name {
+ font-size: 150%;
+ color: black;
+ font-weight: bold;
+ border-top: solid #6d9ec6 5px;
+ padding-top: 3px;
+ padding-bottom: 3px;
+ padding-left: 5px;
+}
+div.page_links {
+ background: #6d9ec6;
+ text-align: center;
+}
+</style>
+<center>
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+<tr>
+<td bgcolor="#dddddd">
+<div class="project_name">Untitled Gantt Project</div>
+</td>
+</tr>
+<tr>
+<td>
+<div class="page_links">
+<a href="lot0.html">Accueil</a> |
+ <a href="lot0-chart.html">Gantt</a> |
+ <a href="lot0-tasks.html">Tâches</a> |
+ <a href="lot0-resources.html">Ressources</a>
+</div>
+</td>
+</tr>
+</table>
+</center>
+<br>
+<style>
+td.header {
+ background: #dddddd;
+ margin: 0;
+ padding-left: 3px;
+ padding-right: 3px;
+ padding-top: 2px;
+ padding-bottom:1px;
+ border-bottom: solid black 2px;
+}
+td.cell {
+ margin: 0;
+ margin-top: 2px;
+ padding-left: 3px;
+ padding-right: 3px;
+ padding-top: 2px;
+ padding-bottom:1px;
+}
+div.cell {
+}
+h5.header {
+ margin-left: 2px;
+ margin-top: 2px;
+}
+</style>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top" class="header">
+<h5 class="header">Nom</h5>
+</td><td valign="top" class="header">
+<h5 class="header">Date de début</h5>
+</td><td valign="top" class="header">
+<h5 class="header">Date de fin</h5>
+</td><td valign="top" class="header">
+<h5 class="header">Durée</h5>
+</td><td valign="top" class="header">
+<h5 class="header">Avancée</h5>
+</td><td valign="top" class="header">
+<h5 class="header">Ressources</h5>
+</td>
+</tr>
+<tr>
+<td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0em">
+<div style="margin: 0; padding: 0;">Mise en place environnement de développement</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">13/04/09</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">14/04/09</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">1</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">100</div>
+</div>
+</td><td valign="top" class="cell">Frédéric Deniger</td>
+</tr>
+<tr>
+<td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0em">
+<div style="margin: 0; padding: 0;">Mise en place outil de suivi de qualité</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">14/04/09</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">15/04/09</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">1</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">20</div>
+</div>
+</td><td valign="top" class="cell">Frédéric Deniger</td>
+</tr>
+<tr>
+<td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0em">
+<div style="margin: 0; padding: 0;">Stabilisation modèle objet</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">15/04/09</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">21/04/09</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">4</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">20</div>
+</div>
+</td><td valign="top" class="cell">Adrien Hadoux</td>
+</tr>
+<tr>
+<td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0em">
+<div style="margin: 0; padding: 0;">Reunion consortium Fudaa </div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">11/05/09</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">12/05/09</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">1</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">0</div>
+</div>
+</td><td valign="top" class="cell">Frédéric Deniger, Adrien Hadoux</td>
+</tr>
+<tr>
+<td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0em">
+<div style="margin: 0; padding: 0;">Restructuration projet Fudaa</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">12/05/09</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">20/05/09</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">6</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">0</div>
+</div>
+</td><td valign="top" class="cell">Frédéric Deniger</td>
+</tr>
+<tr>
+<td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0em">
+<div style="margin: 0; padding: 0;">Lecture Fichiers</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">07/04/09</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">07/05/09</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">21</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">40</div>
+</div>
+</td><td valign="top" class="cell"></td>
+</tr>
+<tr>
+<td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">Lecture/écriture fichier dcsp</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">07/04/09</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">10/04/09</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">3</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">100</div>
+</div>
+</td><td valign="top" class="cell">Adrien Hadoux</td>
+</tr>
+<tr>
+<td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">Lecture/écriture fichier dpti</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">10/04/09</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">15/04/09</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">3</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">100</div>
+</div>
+</td><td valign="top" class="cell">Adrien Hadoux</td>
+</tr>
+<tr>
+<td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">Lecture/écriture fichier drso</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">15/04/09</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">18/04/09</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">3</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">80</div>
+</div>
+</td><td valign="top" class="cell">Adrien Hadoux</td>
+</tr>
+<tr>
+<td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">Lecture fichier etu</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">20/04/09</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">22/04/09</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">2</div>
+</div>
+</td><td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div style="margin: 0; padding: 0;">20</div>
+</div>
+</td><td valign="top" class="cell">Adrien Hadoux</td>
+</tr>
+<tr>
+<td valign="top" class="cell">
+<div style="margin:0; padding:0; padding-left:0.5em">
+<div st...
[truncated message content] |
|
From: <de...@us...> - 2009-04-27 22:00:31
|
Revision: 4690
http://fudaa.svn.sourceforge.net/fudaa/?rev=4690&view=rev
Author: deniger
Date: 2009-04-27 22:00:20 +0000 (Mon, 27 Apr 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/.pmd
trunk/soft/fudaa-crue/dodico/.pmd
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueResource.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/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/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/CrueDaoStructureDCSP.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/CrueDaoStructureORES.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/CrueXmlReaderWriterImpl.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/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/Crue9DCFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9DHFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CustomFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CustomFileFormatUnique.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/CrueIODico.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AssociationScenarCalculPermanent.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalculPermanent.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalculTransitoire.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CrueData.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/DonPrtCIniBrancheOrifice.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Loi.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/emh/OrdResCalculBrancheBarrageFilEau.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResCalculBrancheBarrageGenerique.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResCalculBrancheOrifice.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResCalculBranchePdc.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResCalculBrancheSaintVenant.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResCalculBrancheSeuilLateral.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResCalculBrancheSeuilTransversal.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResCalculBrancheStrickler.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResCalculCasierProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResCalculNoeudNiveauContinu.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResCalculSectionIdem.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResCalculSectionInterpolee.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResCalculSectionProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResCalculSectionSansGeometrie.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamCalcScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/VariableOrdonnee.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java
trunk/soft/fudaa-crue/dodico/src/test/java/idea/TestFred.java
trunk/soft/fudaa-crue/dodico/src/test/java/idea/TestItPointDF.java
trunk/soft/fudaa-crue/dodico/src/test/java/idea/TestXstreamMultipleImpliciteCollection.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/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/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/TestCrueORESFile.java
trunk/soft/fudaa-crue/fudaa/.pmd
trunk/soft/fudaa-crue/src/main/config/pmd.xml
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/pmd.xml
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CrueIOResu.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/resources/xsd.zip
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/MODELE4.FCB
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/MODELE4.STO
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/MODELE4.STR
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/MODELE5.FCB
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/MODELE5.STO
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/MODELE5.STR
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dh.GOTO
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/ResHydro.drs
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/ResProfil.dlo
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/ResProfil.dpr
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/ResProfilLong.dle
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/xxcprovx.dat
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/xxcrue8w.dat
trunk/soft/fudaa-crue/src/main/config/fudaa.importorder
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/.ruleset
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CrueIOData.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHFileReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHFileWriter.java
Modified: trunk/soft/fudaa-crue/.pmd
===================================================================
--- trunk/soft/fudaa-crue/.pmd 2009-04-27 20:20:33 UTC (rev 4689)
+++ trunk/soft/fudaa-crue/.pmd 2009-04-27 22:00:20 UTC (rev 4690)
@@ -416,42 +416,6 @@
<ruleset>Migration Rules</ruleset>
</rule>
<rule>
- <name>UseProperClassLoader</name>
- <ruleset>J2EE Rules</ruleset>
- </rule>
- <rule>
- <name>MDBAndSessionBeanNamingConvention</name>
- <ruleset>J2EE Rules</ruleset>
- </rule>
- <rule>
- <name>RemoteSessionInterfaceNamingConvention</name>
- <ruleset>J2EE Rules</ruleset>
- </rule>
- <rule>
- <name>LocalInterfaceSessionNamingConvention</name>
- <ruleset>J2EE Rules</ruleset>
- </rule>
- <rule>
- <name>LocalHomeNamingConvention</name>
- <ruleset>J2EE Rules</ruleset>
- </rule>
- <rule>
- <name>RemoteInterfaceNamingConvention</name>
- <ruleset>J2EE Rules</ruleset>
- </rule>
- <rule>
- <name>DoNotCallSystemExit</name>
- <ruleset>J2EE Rules</ruleset>
- </rule>
- <rule>
- <name>StaticEJBFieldShouldBeFinal</name>
- <ruleset>J2EE Rules</ruleset>
- </rule>
- <rule>
- <name>DoNotUseThreads</name>
- <ruleset>J2EE Rules</ruleset>
- </rule>
- <rule>
<name>LocalVariableCouldBeFinal</name>
<ruleset>Optimization Rules</ruleset>
</rule>
@@ -568,10 +532,6 @@
<ruleset>JUnit Rules</ruleset>
</rule>
<rule>
- <name>ShortVariable</name>
- <ruleset>Naming Rules</ruleset>
- </rule>
- <rule>
<name>ShortMethodName</name>
<ruleset>Naming Rules</ruleset>
</rule>
@@ -712,10 +672,6 @@
<ruleset>Jakarta Commons Logging Rules</ruleset>
</rule>
<rule>
- <name>BeanMembersShouldSerialize</name>
- <ruleset>JavaBean Rules</ruleset>
- </rule>
- <rule>
<name>MissingSerialVersionUID</name>
<ruleset>JavaBean Rules</ruleset>
</rule>
Modified: trunk/soft/fudaa-crue/dodico/.pmd
===================================================================
--- trunk/soft/fudaa-crue/dodico/.pmd 2009-04-27 20:20:33 UTC (rev 4689)
+++ trunk/soft/fudaa-crue/dodico/.pmd 2009-04-27 22:00:20 UTC (rev 4690)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<pmd>
<useProjectRuleSet>true</useProjectRuleSet>
- <ruleSetFile>..\src\main\config\pmd.xml</ruleSetFile>
- <includeDerivedFiles>false</includeDerivedFiles>
+ <ruleSetFile>pmd.xml</ruleSetFile>
+ <includeDerivedFiles>true</includeDerivedFiles>
<violationsAsErrors>true</violationsAsErrors>
</pmd>
Deleted: trunk/soft/fudaa-crue/dodico/.ruleset
===================================================================
--- trunk/soft/fudaa-crue/dodico/.ruleset 2009-04-27 20:20:33 UTC (rev 4689)
+++ trunk/soft/fudaa-crue/dodico/.ruleset 2009-04-27 22:00:20 UTC (rev 4690)
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<ruleset xmlns="http://pmd.sf.net/ruleset/1.0.0" name="pmd-eclipse" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd" xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd">
- <description>PMD Plugin preferences rule set</description>
- <rule ref="rulesets/typeresolution.xml/LooseCoupling"/>
- <rule ref="rulesets/typeresolution.xml/CloneMethodMustImplementCloneable"/>
- <rule ref="rulesets/typeresolution.xml/UnusedImports"/>
- <rule ref="rulesets/typeresolution.xml/SignatureDeclareThrowsException"/>
- <rule ref="rulesets/basic.xml/EmptyCatchBlock"/>
- <rule ref="rulesets/basic.xml/EmptyIfStmt"/>
- <rule ref="rulesets/basic.xml/EmptyWhileStmt"/>
- <rule ref="rulesets/basic.xml/EmptyTryBlock"/>
- <rule ref="rulesets/basic.xml/EmptyFinallyBlock"/>
- <rule ref="rulesets/basic.xml/EmptySwitchStatements"/>
- <rule ref="rulesets/basic.xml/JumbledIncrementer"/>
- <rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"/>
- <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>
- <rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/>
- <rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>
- <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock">
- <priority>4</priority>
- </rule>
- <rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>
- <rule ref="rulesets/basic.xml/UnnecessaryReturn"/>
- <rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>
- <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>
- <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>
- <rule ref="rulesets/basic.xml/BooleanInstantiation">
- <priority>4</priority>
- </rule>
- <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>
- <rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>
- <rule ref="rulesets/basic.xml/UselessOverridingMethod"/>
- <rule ref="rulesets/basic.xml/ClassCastExceptionWithToArray"/>
- <rule ref="rulesets/basic.xml/AvoidDecimalLiteralsInBigDecimalConstructor"/>
- <rule ref="rulesets/basic.xml/UselessOperationOnImmutable"/>
- <rule ref="rulesets/basic.xml/MisplacedNullCheck"/>
- <rule ref="rulesets/basic.xml/UnusedNullCheckInEquals"/>
- <rule ref="rulesets/basic.xml/AvoidThreadGroup"/>
- <rule ref="rulesets/basic.xml/BrokenNullCheck"/>
- <rule ref="rulesets/basic.xml/BigIntegerInstantiation"/>
- <rule ref="rulesets/basic.xml/AvoidUsingOctalValues"/>
- <rule ref="rulesets/basic.xml/AvoidUsingHardCodedIP"/>
- <rule ref="rulesets/basic.xml/CheckResultSet"/>
- <rule ref="rulesets/basic.xml/AvoidMultipleUnaryOperators"/>
- <rule ref="rulesets/basic.xml/EmptyInitializer"/>
- <rule ref="rulesets/braces.xml/IfStmtsMustUseBraces"/>
- <rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces"/>
- <rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces"/>
- <rule ref="rulesets/braces.xml/ForLoopsMustUseBraces"/>
- <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>
- <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/>
- <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>
- <rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"/>
- <rule ref="rulesets/logging-java.xml/MoreThanOneLogger"/>
- <rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>
- <rule ref="rulesets/logging-java.xml/SystemPrintln"/>
- <rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>
- <rule ref="rulesets/controversial.xml/UnnecessaryConstructor"/>
- <rule ref="rulesets/controversial.xml/NullAssignment"/>
- <rule ref="rulesets/controversial.xml/OnlyOneReturn"/>
- <rule ref="rulesets/controversial.xml/UnusedModifier"/>
- <rule ref="rulesets/controversial.xml/AssignmentInOperand"/>
- <rule ref="rulesets/controversial.xml/AtLeastOneConstructor"/>
- <rule ref="rulesets/controversial.xml/DontImportSun"/>
- <rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>
- <rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>
- <rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>
- <rule ref="rulesets/controversial.xml/DefaultPackage"/>
- <rule ref="rulesets/controversial.xml/BooleanInversion"/>
- <rule ref="rulesets/controversial.xml/DataflowAnomalyAnalysis"/>
- <rule ref="rulesets/controversial.xml/AvoidFinalLocalVariable"/>
- <rule ref="rulesets/controversial.xml/AvoidUsingShortType"/>
- <rule ref="rulesets/controversial.xml/AvoidUsingVolatile"/>
- <rule ref="rulesets/controversial.xml/AvoidUsingNativeCode"/>
- <rule ref="rulesets/controversial.xml/AvoidAccessibilityAlteration"/>
- <rule ref="rulesets/controversial.xml/DoNotCallGarbageCollectionExplicitly"/>
- <rule ref="rulesets/strings.xml/AvoidDuplicateLiterals"/>
- <rule ref="rulesets/strings.xml/StringInstantiation"/>
- <rule ref="rulesets/strings.xml/StringToString"/>
- <rule ref="rulesets/strings.xml/InefficientStringBuffering"/>
- <rule ref="rulesets/strings.xml/UnnecessaryCaseChange"/>
- <rule ref="rulesets/strings.xml/UseStringBufferLength"/>
- <rule ref="rulesets/strings.xml/AppendCharacterWithChar"/>
- <rule ref="rulesets/strings.xml/ConsecutiveLiteralAppends"/>
- <rule ref="rulesets/strings.xml/UseIndexOfChar"/>
- <rule ref="rulesets/strings.xml/InefficientEmptyStringCheck"/>
- <rule ref="rulesets/strings.xml/InsufficientStringBufferDeclaration"/>
- <rule ref="rulesets/strings.xml/UselessStringValueOf"/>
- <rule ref="rulesets/strings.xml/StringBufferInstantiationWithChar"/>
- <rule ref="rulesets/strings.xml/UseEqualsToCompareStrings"/>
- <rule ref="rulesets/strings.xml/AvoidStringBufferField"/>
- <rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable"/>
- <rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException"/>
- <rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl"/>
- <rule ref="rulesets/strictexception.xml/AvoidCatchingNPE"/>
- <rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes"/>
- <rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException"/>
- <rule ref="rulesets/strictexception.xml/AvoidRethrowingException"/>
- <rule ref="rulesets/strictexception.xml/DoNotExtendJavaLangError"/>
- <rule ref="rulesets/strictexception.xml/DoNotThrowExceptionInFinally"/>
- <rule ref="rulesets/migrating.xml/ReplaceVectorWithList"/>
- <rule ref="rulesets/migrating.xml/ReplaceHashtableWithMap"/>
- <rule ref="rulesets/migrating.xml/ReplaceEnumerationWithIterator"/>
- <rule ref="rulesets/migrating.xml/AvoidEnumAsIdentifier"/>
- <rule ref="rulesets/migrating.xml/AvoidAssertAsIdentifier"/>
- <rule ref="rulesets/migrating.xml/IntegerInstantiation"/>
- <rule ref="rulesets/migrating.xml/ByteInstantiation"/>
- <rule ref="rulesets/migrating.xml/ShortInstantiation"/>
- <rule ref="rulesets/migrating.xml/LongInstantiation"/>
- <rule ref="rulesets/migrating.xml/JUnit4TestShouldUseBeforeAnnotation"/>
- <rule ref="rulesets/migrating.xml/JUnit4TestShouldUseAfterAnnotation"/>
- <rule ref="rulesets/migrating.xml/JUnit4TestShouldUseTestAnnotation"/>
- <rule ref="rulesets/migrating.xml/JUnit4SuitesShouldUseSuiteAnnotation"/>
- <rule ref="rulesets/migrating.xml/JUnitUseExpected"/>
- <rule ref="rulesets/j2ee.xml/UseProperClassLoader"/>
- <rule ref="rulesets/j2ee.xml/MDBAndSessionBeanNamingConvention"/>
- <rule ref="rulesets/j2ee.xml/RemoteSessionInterfaceNamingConvention"/>
- <rule ref="rulesets/j2ee.xml/LocalInterfaceSessionNamingConvention"/>
- <rule ref="rulesets/j2ee.xml/LocalHomeNamingConvention"/>
- <rule ref="rulesets/j2ee.xml/RemoteInterfaceNamingConvention"/>
- <rule ref="rulesets/j2ee.xml/DoNotCallSystemExit"/>
- <rule ref="rulesets/j2ee.xml/StaticEJBFieldShouldBeFinal"/>
- <rule ref="rulesets/j2ee.xml/DoNotUseThreads"/>
- <rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal"/>
- <rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal"/>
- <rule ref="rulesets/optimizations.xml/AvoidInstantiatingObjectsInLoops"/>
- <rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"/>
- <rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/>
- <rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends"/>
- <rule ref="rulesets/optimizations.xml/UseArraysAsList"/>
- <rule ref="rulesets/optimizations.xml/AvoidArrayLoops"/>
- <rule ref="rulesets/optimizations.xml/UnnecessaryWrapperObjectCreation"/>
- <rule ref="rulesets/optimizations.xml/AddEmptyString"/>
- <rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray"/>
- <rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly"/>
- <rule ref="rulesets/coupling.xml/CouplingBetweenObjects"/>
- <rule ref="rulesets/coupling.xml/ExcessiveImports"/>
- <rule ref="rulesets/coupling.xml/LooseCoupling"/>
- <rule ref="rulesets/imports.xml/DuplicateImports"/>
- <rule ref="rulesets/imports.xml/DontImportJavaLang"/>
- <rule ref="rulesets/imports.xml/UnusedImports"/>
- <rule ref="rulesets/imports.xml/ImportFromSamePackage"/>
- <rule ref="rulesets/imports.xml/TooManyStaticImports"/>
- <rule ref="rulesets/junit.xml/JUnitStaticSuite"/>
- <rule ref="rulesets/junit.xml/JUnitSpelling"/>
- <rule ref="rulesets/junit.xml/JUnitAssertionsShouldIncludeMessage"/>
- <rule ref="rulesets/junit.xml/JUnitTestsShouldIncludeAssert"/>
- <rule ref="rulesets/junit.xml/TestClassWithoutTestCases"/>
- <rule ref="rulesets/junit.xml/UnnecessaryBooleanAssertion"/>
- <rule ref="rulesets/junit.xml/UseAssertEqualsInsteadOfAssertTrue"/>
- <rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue"/>
- <rule ref="rulesets/junit.xml/UseAssertNullInsteadOfAssertTrue"/>
- <rule ref="rulesets/junit.xml/SimplifyBooleanAssertion"/>
- <rule ref="rulesets/naming.xml/ShortVariable"/>
- <rule ref="rulesets/naming.xml/LongVariable"/>
- <rule ref="rulesets/naming.xml/ShortMethodName"/>
- <rule ref="rulesets/naming.xml/VariableNamingConventions"/>
- <rule ref="rulesets/naming.xml/MethodNamingConventions"/>
- <rule ref="rulesets/naming.xml/ClassNamingConventions"/>
- <rule ref="rulesets/naming.xml/AbstractNaming"/>
- <rule ref="rulesets/naming.xml/AvoidDollarSigns"/>
- <rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass"/>
- <rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"/>
- <rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"/>
- <rule ref="rulesets/naming.xml/SuspiciousEqualsMethodName"/>
- <rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName"/>
- <rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName"/>
- <rule ref="rulesets/naming.xml/NoPackage"/>
- <rule ref="rulesets/naming.xml/PackageCase"/>
- <rule ref="rulesets/naming.xml/MisleadingVariableName"/>
- <rule ref="rulesets/naming.xml/BooleanGetMethodName"/>
- <rule ref="rulesets/codesize.xml/NPathComplexity"/>
- <rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>
- <rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>
- <rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>
- <rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>
- <rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>
- <rule ref="rulesets/codesize.xml/TooManyFields"/>
- <rule ref="rulesets/codesize.xml/NcssMethodCount"/>
- <rule ref="rulesets/codesize.xml/NcssTypeCount"/>
- <rule ref="rulesets/codesize.xml/NcssConstructorCount"/>
- <rule ref="rulesets/codesize.xml/TooManyMethods"/>
- <rule ref="rulesets/finalizers.xml/EmptyFinalizer"/>
- <rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize"/>
- <rule ref="rulesets/finalizers.xml/FinalizeOverloaded"/>
- <rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize"/>
- <rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected"/>
- <rule ref="rulesets/finalizers.xml/AvoidCallingFinalize"/>
- <rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/>
- <rule ref="rulesets/logging-jakarta-commons.xml/ProperLogger"/>
- <rule ref="rulesets/javabeans.xml/BeanMembersShouldSerialize"/>
- <rule ref="rulesets/javabeans.xml/MissingSerialVersionUID"/>
- <rule ref="rulesets/clone.xml/ProperCloneImplementation"/>
- <rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException"/>
- <rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable"/>
- <rule ref="rulesets/design.xml/UseSingleton"/>
- <rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
- <rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
- <rule ref="rulesets/design.xml/SwitchStmtsShouldHaveDefault"/>
- <rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"/>
- <rule ref="rulesets/design.xml/AvoidReassigningParameters"/>
- <rule ref="rulesets/design.xml/SwitchDensity"/>
- <rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/>
- <rule ref="rulesets/design.xml/AccessorClassGeneration"/>
- <rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>
- <rule ref="rulesets/design.xml/CloseResource"/>
- <rule ref="rulesets/design.xml/NonStaticInitializer"/>
- <rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"/>
- <rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement"/>
- <rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
- <rule ref="rulesets/design.xml/BadComparison"/>
- <rule ref="rulesets/design.xml/EqualsNull"/>
- <rule ref="rulesets/design.xml/ConfusingTernary"/>
- <rule ref="rulesets/design.xml/InstantiationToGetClass"/>
- <rule ref="rulesets/design.xml/IdempotentOperations"/>
- <rule ref="rulesets/design.xml/SimpleDateFormatNeedsLocale"/>
- <rule ref="rulesets/design.xml/ImmutableField"/>
- <rule ref="rulesets/design.xml/UseLocaleWithCaseConversions"/>
- <rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass"/>
- <rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"/>
- <rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/>
- <rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel"/>
- <rule ref="rulesets/design.xml/MissingBreakInSwitch"/>
- <rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/>
- <rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause"/>
- <rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod"/>
- <rule ref="rulesets/design.xml/SimplifyConditional"/>
- <rule ref="rulesets/design.xml/CompareObjectsWithEquals"/>
- <rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons"/>
- <rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/>
- <rule ref="rulesets/design.xml/NonThreadSafeSingleton"/>
- <rule ref="rulesets/design.xml/UncommentedEmptyMethod"/>
- <rule ref="rulesets/design.xml/UncommentedEmptyConstructor"/>
- <rule ref="rulesets/design.xml/AvoidConstantsInterface"/>
- <rule ref="rulesets/design.xml/UnsynchronizedStaticDateFormatter"/>
- <rule ref="rulesets/design.xml/PreserveStackTrace"/>
- <rule ref="rulesets/design.xml/UseCollectionIsEmpty"/>
- <rule ref="rulesets/design.xml/ClassWithOnlyPrivateConstructorsShouldBeFinal"/>
- <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/TooFewBranchesForASwitchStatement"/>
-</ruleset>
Added: trunk/soft/fudaa-crue/dodico/pmd.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/pmd.xml (rev 0)
+++ trunk/soft/fudaa-crue/dodico/pmd.xml 2009-04-27 22:00:20 UTC (rev 4690)
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<ruleset xmlns="http://pmd.sf.net/ruleset/1.0.0" name="pmd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd" xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd">
+ <description>PMD Plugin preferences rule set</description>
+ <rule ref="rulesets/typeresolution.xml/LooseCoupling"/>
+ <rule ref="rulesets/typeresolution.xml/CloneMethodMustImplementCloneable"/>
+ <rule ref="rulesets/typeresolution.xml/UnusedImports"/>
+ <rule ref="rulesets/typeresolution.xml/SignatureDeclareThrowsException"/>
+ <rule ref="rulesets/basic.xml/EmptyCatchBlock"/>
+ <rule ref="rulesets/basic.xml/EmptyIfStmt"/>
+ <rule ref="rulesets/basic.xml/EmptyWhileStmt"/>
+ <rule ref="rulesets/basic.xml/EmptyTryBlock"/>
+ <rule ref="rulesets/basic.xml/EmptyFinallyBlock"/>
+ <rule ref="rulesets/basic.xml/EmptySwitchStatements"/>
+ <rule ref="rulesets/basic.xml/JumbledIncrementer"/>
+ <rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>
+ <rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode">
+ <priority>2</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>
+ <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock">
+ <priority>4</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryReturn"/>
+ <rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>
+ <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>
+ <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>
+ <rule ref="rulesets/basic.xml/BooleanInstantiation">
+ <priority>2</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>
+ <rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>
+ <rule ref="rulesets/basic.xml/UselessOverridingMethod"/>
+ <rule ref="rulesets/basic.xml/ClassCastExceptionWithToArray"/>
+ <rule ref="rulesets/basic.xml/AvoidDecimalLiteralsInBigDecimalConstructor"/>
+ <rule ref="rulesets/basic.xml/UselessOperationOnImmutable"/>
+ <rule ref="rulesets/basic.xml/MisplacedNullCheck"/>
+ <rule ref="rulesets/basic.xml/UnusedNullCheckInEquals"/>
+ <rule ref="rulesets/basic.xml/AvoidThreadGroup"/>
+ <rule ref="rulesets/basic.xml/BrokenNullCheck"/>
+ <rule ref="rulesets/basic.xml/BigIntegerInstantiation">
+ <priority>2</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/AvoidUsingOctalValues"/>
+ <rule ref="rulesets/basic.xml/AvoidUsingHardCodedIP"/>
+ <rule ref="rulesets/basic.xml/CheckResultSet"/>
+ <rule ref="rulesets/basic.xml/AvoidMultipleUnaryOperators"/>
+ <rule ref="rulesets/basic.xml/EmptyInitializer"/>
+ <rule ref="rulesets/braces.xml/IfStmtsMustUseBraces"/>
+ <rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces"/>
+ <rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces"/>
+ <rule ref="rulesets/braces.xml/ForLoopsMustUseBraces"/>
+ <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>
+ <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/>
+ <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>
+ <rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"/>
+ <rule ref="rulesets/logging-java.xml/MoreThanOneLogger"/>
+ <rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>
+ <rule ref="rulesets/logging-java.xml/SystemPrintln"/>
+ <rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>
+ <rule ref="rulesets/controversial.xml/NullAssignment">
+ <priority>5</priority>
+ </rule>
+ <rule ref="rulesets/controversial.xml/UnusedModifier"/>
+ <rule ref="rulesets/controversial.xml/AssignmentInOperand"/>
+ <rule ref="rulesets/controversial.xml/DontImportSun"/>
+ <rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>
+ <rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>
+ <rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>
+ <rule ref="rulesets/controversial.xml/DefaultPackage">
+ <priority>5</priority>
+ </rule>
+ <rule ref="rulesets/controversial.xml/BooleanInversion">
+ <priority>5</priority>
+ </rule>
+ <rule ref="rulesets/controversial.xml/DataflowAnomalyAnalysis"/>
+ <rule ref="rulesets/controversial.xml/AvoidUsingShortType"/>
+ <rule ref="rulesets/controversial.xml/AvoidUsingVolatile"/>
+ <rule ref="rulesets/controversial.xml/AvoidUsingNativeCode"/>
+ <rule ref="rulesets/controversial.xml/AvoidAccessibilityAlteration"/>
+ <rule ref="rulesets/controversial.xml/DoNotCallGarbageCollectionExplicitly"/>
+ <rule ref="rulesets/strings.xml/AvoidDuplicateLiterals"/>
+ <rule ref="rulesets/strings.xml/StringInstantiation"/>
+ <rule ref="rulesets/strings.xml/StringToString"/>
+ <rule ref="rulesets/strings.xml/InefficientStringBuffering"/>
+ <rule ref="rulesets/strings.xml/UnnecessaryCaseChange"/>
+ <rule ref="rulesets/strings.xml/UseStringBufferLength"/>
+ <rule ref="rulesets/strings.xml/AppendCharacterWithChar"/>
+ <rule ref="rulesets/strings.xml/ConsecutiveLiteralAppends"/>
+ <rule ref="rulesets/strings.xml/UseIndexOfChar"/>
+ <rule ref="rulesets/strings.xml/InefficientEmptyStringCheck"/>
+ <rule ref="rulesets/strings.xml/InsufficientStringBufferDeclaration"/>
+ <rule ref="rulesets/strings.xml/UselessStringValueOf"/>
+ <rule ref="rulesets/strings.xml/StringBufferInstantiationWithChar"/>
+ <rule ref="rulesets/strings.xml/UseEqualsToCompareStrings"/>
+ <rule ref="rulesets/strings.xml/AvoidStringBufferField"/>
+ <rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable"/>
+ <rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException"/>
+ <rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl"/>
+ <rule ref="rulesets/strictexception.xml/AvoidCatchingNPE"/>
+ <rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes"/>
+ <rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException"/>
+ <rule ref="rulesets/strictexception.xml/AvoidRethrowingException"/>
+ <rule ref="rulesets/strictexception.xml/DoNotExtendJavaLangError"/>
+ <rule ref="rulesets/strictexception.xml/DoNotThrowExceptionInFinally"/>
+ <rule ref="rulesets/migrating.xml/ReplaceVectorWithList"/>
+ <rule ref="rulesets/migrating.xml/ReplaceHashtableWithMap"/>
+ <rule ref="rulesets/migrating.xml/ReplaceEnumerationWithIterator"/>
+ <rule ref="rulesets/migrating.xml/AvoidEnumAsIdentifier"/>
+ <rule ref="rulesets/migrating.xml/AvoidAssertAsIdentifier"/>
+ <rule ref="rulesets/migrating.xml/IntegerInstantiation"/>
+ <rule ref="rulesets/migrating.xml/ByteInstantiation"/>
+ <rule ref="rulesets/migrating.xml/ShortInstantiation"/>
+ <rule ref="rulesets/migrating.xml/LongInstantiation"/>
+ <rule ref="rulesets/migrating.xml/JUnit4TestShouldUseBeforeAnnotation">
+ <priority>5</priority>
+ </rule>
+ <rule ref="rulesets/migrating.xml/JUnit4TestShouldUseAfterAnnotation">
+ <priority>5</priority>
+ </rule>
+ <rule ref="rulesets/migrating.xml/JUnit4TestShouldUseTestAnnotation">
+ <priority>5</priority>
+ </rule>
+ <rule ref="rulesets/migrating.xml/JUnit4SuitesShouldUseSuiteAnnotation">
+ <priority>5</priority>
+ </rule>
+ <rule ref="rulesets/migrating.xml/JUnitUseExpected">
+ <priority>5</priority>
+ </rule>
+ <rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal"/>
+ <rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal"/>
+ <rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"/>
+ <rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/>
+ <rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends"/>
+ <rule ref="rulesets/optimizations.xml/UseArraysAsList"/>
+ <rule ref="rulesets/optimizations.xml/AvoidArrayLoops"/>
+ <rule ref="rulesets/optimizations.xml/UnnecessaryWrapperObjectCreation"/>
+ <rule ref="rulesets/optimizations.xml/AddEmptyString"/>
+ <rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray"/>
+ <rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly"/>
+ <rule ref="rulesets/coupling.xml/CouplingBetweenObjects"/>
+ <rule ref="rulesets/coupling.xml/ExcessiveImports"/>
+ <rule ref="rulesets/coupling.xml/LooseCoupling"/>
+ <rule ref="rulesets/imports.xml/DuplicateImports"/>
+ <rule ref="rulesets/imports.xml/DontImportJavaLang"/>
+ <rule ref="rulesets/imports.xml/UnusedImports"/>
+ <rule ref="rulesets/imports.xml/ImportFromSamePackage"/>
+ <rule ref="rulesets/imports.xml/TooManyStaticImports"/>
+ <rule ref="rulesets/junit.xml/JUnitSpelling"/>
+ <rule ref="rulesets/junit.xml/TestClassWithoutTestCases"/>
+ <rule ref="rulesets/junit.xml/UnnecessaryBooleanAssertion"/>
+ <rule ref="rulesets/junit.xml/UseAssertEqualsInsteadOfAssertTrue"/>
+ <rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue"/>
+ <rule ref="rulesets/junit.xml/UseAssertNullInsteadOfAssertTrue"/>
+ <rule ref="rulesets/junit.xml/SimplifyBooleanAssertion"/>
+ <rule ref="rulesets/naming.xml/ShortMethodName"/>
+ <rule ref="rulesets/naming.xml/VariableNamingConventions">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/naming.xml/MethodNamingConventions">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/naming.xml/ClassNamingConventions"/>
+ <rule ref="rulesets/naming.xml/AbstractNaming"/>
+ <rule ref="rulesets/naming.xml/AvoidDollarSigns"/>
+ <rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass"/>
+ <rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"/>
+ <rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"/>
+ <rule ref="rulesets/naming.xml/SuspiciousEqualsMethodName"/>
+ <rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName"/>
+ <rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName"/>
+ <rule ref="rulesets/naming.xml/NoPackage"/>
+ <rule ref="rulesets/naming.xml/PackageCase"/>
+ <rule ref="rulesets/naming.xml/MisleadingVariableName"/>
+ <rule ref="rulesets/naming.xml/BooleanGetMethodName"/>
+ <rule ref="rulesets/codesize.xml/NPathComplexity"/>
+ <rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>
+ <rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>
+ <rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>
+ <rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>
+ <rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>
+ <rule ref="rulesets/codesize.xml/TooManyFields"/>
+ <rule ref="rulesets/codesize.xml/NcssMethodCount"/>
+ <rule ref="rulesets/codesize.xml/NcssTypeCount"/>
+ <rule ref="rulesets/codesize.xml/NcssConstructorCount"/>
+ <rule ref="rulesets/codesize.xml/TooManyMethods"/>
+ <rule ref="rulesets/finalizers.xml/EmptyFinalizer"/>
+ <rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize"/>
+ <rule ref="rulesets/finalizers.xml/FinalizeOverloaded"/>
+ <rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize"/>
+ <rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected"/>
+ <rule ref="rulesets/finalizers.xml/AvoidCallingFinalize"/>
+ <rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/>
+ <rule ref="rulesets/logging-jakarta-commons.xml/ProperLogger"/>
+ <rule ref="rulesets/javabeans.xml/MissingSerialVersionUID"/>
+ <rule ref="rulesets/clone.xml/ProperCloneImplementation"/>
+ <rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException"/>
+ <rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable"/>
+ <rule ref="rulesets/design.xml/UseSingleton"/>
+ <rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
+ <rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
+ <rule ref="rulesets/design.xml/SwitchStmtsShouldHaveDefault"/>
+ <rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"/>
+ <rule ref="rulesets/design.xml/AvoidReassigningParameters"/>
+ <rule ref="rulesets/design.xml/SwitchDensity"/>
+ <rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/>
+ <rule ref="rulesets/design.xml/AccessorClassGeneration"/>
+ <rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>
+ <rule ref="rulesets/design.xml/CloseResource"/>
+ <rule ref="rulesets/design.xml/NonStaticInitializer"/>
+ <rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"/>
+ <rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement"/>
+ <rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
+ <rule ref="rulesets/design.xml/BadComparison"/>
+ <rule ref="rulesets/design.xml/EqualsNull"/>
+ <rule ref="rulesets/design.xml/ConfusingTernary"/>
+ <rule ref="rulesets/design.xml/InstantiationToGetClass"/>
+ <rule ref="rulesets/design.xml/IdempotentOperations"/>
+ <rule ref="rulesets/design.xml/SimpleDateFormatNeedsLocale"/>
+ <rule ref="rulesets/design.xml/ImmutableField"/>
+ <rule ref="rulesets/design.xml/UseLocaleWithCaseConversions">
+ <priority>5</priority>
+ </rule>
+ <rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass"/>
+ <rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"/>
+ <rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/>
+ <rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel"/>
+ <rule ref="rulesets/design.xml/MissingBreakInSwitch"/>
+ <rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/>
+ <rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause">
+ <priority>2</priority>
+ </rule>
+ <rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod"/>
+ <rule ref="rulesets/design.xml/SimplifyConditional"/>
+ <rule ref="rulesets/design.xml/CompareObjectsWithEquals"/>
+ <rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons"/>
+ <rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/>
+ <rule ref="rulesets/design.xml/NonThreadSafeSingleton"/>
+ <rule ref="rulesets/design.xml/UncommentedEmptyMethod"/>
+ <rule ref="rulesets/design.xml/UncommentedEmptyConstructor"/>
+ <rule ref="rulesets/design.xml/AvoidConstantsInterface"/>
+ <rule ref="rulesets/design.xml/UnsynchronizedStaticDateFormatter"/>
+ <rule ref="rulesets/design.xml/PreserveStackTrace"/>
+ <rule ref="rulesets/design.xml/UseCollectionIsEmpty"/>
+ <rule ref="rulesets/design.xml/ClassWithOnlyPrivateConstructorsShouldBeFinal"/>
+ <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/TooFewBranchesForASwitchStatement"/>
+</ruleset>
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueResource.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueResource.java 2009-04-27 20:20:33 UTC (rev 4689)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueResource.java 2009-04-27 22:00:20 UTC (rev 4690)
@@ -1,9 +1,9 @@
package org.fudaa.dodico.crue.common;
+import com.memoire.bu.BuResource;
+
import org.fudaa.dodico.commun.DodicoResource;
-import com.memoire.bu.BuResource;
-
/**
* TODO Fred a enlever Ressources crue. Utilit� ?
*
Modified: 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-27 20:20:33 UTC (rev 4689)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDCLM.java 2009-04-27 22:00:20 UTC (rev 4690)
@@ -9,56 +9,8 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.common.CrueResource;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.BrancheOrificeManoeuvrePersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.BrancheOrificeOuvPersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.BrancheSaintVenantHydrogrammeRuisPersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.BrancheSaintVenantQruisPersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.CalculAbstractPersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.CalculPermanentPersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.CalculTransitoirePersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.CasierProfilHydrogrammeRuisPersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.CasierProfilQruisPersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.HydrogrammePersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.HydrogrammeRuisPersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.LimnigrammePersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.ManoeuvrePersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.NoeudNiveauContinuHydrogrammePersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.NoeudNiveauContinuLimnigrammePersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.NoeudNiveauContinuQappPersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.NoeudNiveauContinuTarragePersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.NoeudNiveauContinuZimposePersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.RefDCLMAbstractPersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.TarragePersist;
-import org.fudaa.dodico.crue.metier.emh.CalculPermanent;
-import org.fudaa.dodico.crue.metier.emh.CalculPermanentBrancheOrificeOuv;
-import org.fudaa.dodico.crue.metier.emh.CalculPermanentBrancheSaintVenantQruis;
-import org.fudaa.dodico.crue.metier.emh.CalculPermanentCasierProfilQruis;
-import org.fudaa.dodico.crue.metier.emh.CalculPermanentNoeudNiveauContinuQapp;
-import org.fudaa.dodico.crue.metier.emh.CalculPermanentNoeudNiveauContinuZimpose;
-import org.fudaa.dodico.crue.metier.emh.CalculTransitoire;
-import org.fudaa.dodico.crue.metier.emh.CalculTransitoireBrancheOrificeManoeuvre;
-import org.fudaa.dodico.crue.metier.emh.CalculTransitoireBrancheSaintVenantHydrogrammeRuis;
-import org.fudaa.dodico.crue.metier.emh.CalculTransitoireCasierProfilHydrogrammeRuis;
-import org.fudaa.dodico.crue.metier.emh.CalculTransitoireNoeudNiveauContinuHydrogramme;
-import org.fudaa.dodico.crue.metier.emh.CalculTransitoireNoeudNiveauContinuLimnigramme;
-import org.fudaa.dodico.crue.metier.emh.CalculTransitoireNoeudNiveauContinuTarrage;
-import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
-import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
-import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
-import org.fudaa.dodico.crue.metier.emh.CrueData;
-import org.fudaa.dodico.crue.metier.emh.DonCLimMBrancheOrifice;
-import org.fudaa.dodico.crue.metier.emh.DonCLimMBrancheSaintVenant;
-import org.fudaa.dodico.crue.metier.emh.DonCLimMCasierProfil;
-import org.fudaa.dodico.crue.metier.emh.DonCLimMNoeudNiveauContinu;
-import org.fudaa.dodico.crue.metier.emh.DonCLimMScenario;
-import org.fudaa.dodico.crue.metier.emh.DonClimM;
-import org.fudaa.dodico.crue.metier.emh.EMH;
-import org.fudaa.dodico.crue.metier.emh.EMHBrancheOrifice;
-import org.fudaa.dodico.crue.metier.emh.EMHBrancheSaintVenant;
-import org.fudaa.dodico.crue.metier.emh.EMHCasierProfil;
-import org.fudaa.dodico.crue.metier.emh.Loi;
-import org.fudaa.dodico.crue.metier.emh.LoiDF;
-import org.fudaa.dodico.crue.metier.emh.LoiFF;
+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;
@@ -122,8 +74,8 @@
final DonCLimMScenario metier = new DonCLimMScenario();
- List<CalculPermanent> listeCalculsPermanents = new ArrayList<CalculPermanent>();
- List<CalculTransitoire> listeCalculsTransitoires = new ArrayList<CalculTransitoire>();
+ final List<CalculPermanent> listeCalculsPermanents = new ArrayList<CalculPermanent>();
+ final List<CalculTransitoire> listeCalculsTransitoires = new ArrayList<CalculTransitoire>();
metier.setListeCalculsPermanents(listeCalculsPermanents);
metier.setListeCalculsTransitoires(listeCalculsTransitoires);
@@ -157,8 +109,8 @@
* @param dataLinked
* @param analyzer
*/
- private static void remplirDonCLimMScenarioAvecPersistanceCalculPermanent(List<CalculPermanent> listeMetier,
- CalculPermanentPersist calculPermPersist, final CrueData dataLinked, final CtuluAnalyze 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);
@@ -177,10 +129,10 @@
final List<DonCLimMCasierProfil> listeDonCLimMCasierProfil = new ArrayList<DonCLimMCasierProfil>();
calculPermMetier.setListeRefs(new ArrayList<EMH>());
- for (RefDCLMAbstractPersist eltRefPersist : calculPermPersist.listeElementsCalculPermanent) {
+ for (final RefDCLMAbstractPersist eltRefPersist : calculPermPersist.listeElementsCalculPermanent) {
if (eltRefPersist instanceof NoeudNiveauContinuQappPersist) {
- NoeudNiveauContinuQappPersist eltPersist = (NoeudNiveauContinuQappPersist) eltRefPersist;
+ final NoeudNiveauContinuQappPersist eltPersist = (NoeudNiveauContinuQappPersist) eltRefPersist;
final CatEMHNoeud noeudMetier = getEMHNoeudFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (noeudMetier != null) {
final CalculPermanentNoeudNiveauContinuQapp eltMetier = new CalculPermanentNoeudNiveauContinuQapp();
@@ -193,7 +145,7 @@
} else if (eltRefPersist instanceof NoeudNiveauContinuZimposePersist) {
- NoeudNiveauContinuZimposePersist eltPersist = (NoeudNiveauContinuZimposePersist) eltRefPersist;
+ final NoeudNiveauContinuZimposePersist eltPersist = (NoeudNiveauContinuZimposePersist) eltRefPersist;
final CatEMHNoeud noeudMetier = getEMHNoeudFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (noeudMetier != null) {
final CalculPermanentNoeudNiveauContinuZimpose eltMetier = new CalculPermanentNoeudNiveauContinuZimpose();
@@ -206,7 +158,7 @@
} else if (eltRefPersist instanceof BrancheOrificeOuvPersist) {
- BrancheOrificeOuvPersist eltPersist = (BrancheOrificeOuvPersist) eltRefPersist;
+ final BrancheOrificeOuvPersist eltPersist = (BrancheOrificeOuvPersist) eltRefPersist;
final CatEMHBranche brancheMetier = getEMHBrancheFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (brancheMetier != null) {
final CalculPermanentBrancheOrificeOuv eltMetier = new CalculPermanentBrancheOrificeOuv();
@@ -220,7 +172,7 @@
} else if (eltRefPersist instanceof BrancheSaintVenantQruisPersist) {
- BrancheSaintVenantQruisPersist eltPersist = (BrancheSaintVenantQruisPersist) eltRefPersist;
+ final BrancheSaintVenantQruisPersist eltPersist = (BrancheSaintVenantQruisPersist) eltRefPersist;
final CatEMHBranche brancheMetier = getEMHBrancheFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (brancheMetier != null) {
final CalculPermanentBrancheSaintVenantQruis eltMetier = new CalculPermanentBrancheSaintVenantQruis();
@@ -233,7 +185,7 @@
} else if (eltRefPersist instanceof CasierProfilQruisPersist) {
- CasierProfilQruisPersist eltPersist = (CasierProfilQruisPersist) eltRefPersist;
+ final CasierProfilQruisPersist eltPersist = (CasierProfilQruisPersist) eltRefPersist;
final CatEMHCasier casierMetier = getEMHCasierFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (casierMetier != null) {
final CalculPermanentCasierProfilQruis eltMetier = new CalculPermanentCasierProfilQruis();
@@ -261,8 +213,9 @@
* @param dataLinked
* @param analyzer
*/
- private static void remplirDonCLimMScenarioAvecPersistanceCalculTransitoire(List<CalculTransitoire> listeMetier,
- CalculTransitoirePersist calculTransPersist, final CrueData dataLinked, final CtuluAnalyze 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);
@@ -280,11 +233,11 @@
final List<DonCLimMCasierProfil> listeDonCLimMCasierProfil = new ArrayList<DonCLimMCasierProfil>();
calculTransMetier.setListeRefs(new ArrayList<EMH>());
- for (RefDCLMAbstractPersist eltRefPersist : calculTransPersist.listeElementsCalculTransitoire) {
+ for (final RefDCLMAbstractPersist eltRefPersist : calculTransPersist.listeElementsCalculTransitoire) {
if (eltRefPersist instanceof NoeudNiveauContinuHydrogrammePersist) {
- NoeudNiveauContinuHydrogrammePersist eltPersist = (NoeudNiveauContinuHydrogrammePersist) eltRefPersist;
+ final NoeudNiveauContinuHydrogrammePersist eltPersist = (NoeudNiveauContinuHydrogrammePersist) eltRefPersist;
final CatEMHNoeud noeudMetier = getEMHNoeudFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (noeudMetier != null) {
final CalculTransitoireNoeudNiveauContinuHydrogramme eltMetier = new CalculTransitoireNoeudNiveauContinuHydrogramme();
@@ -311,7 +264,7 @@
} else if (eltRefPersist instanceof NoeudNiveauContinuLimnigrammePersist) {
- NoeudNiveauContinuLimnigrammePersist eltPersist = (NoeudNiveauContinuLimnigrammePersist) eltRefPersist;
+ final NoeudNiveauContinuLimnigrammePersist eltPersist = (NoeudNiveauContinuLimnigrammePersist) eltRefPersist;
final CatEMHNoeud noeudMetier = getEMHNoeudFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (noeudMetier != null) {
final CalculTransitoireNoeudNiveauContinuLimnigramme eltMetier = new CalculTransitoireNoeudNiveauContinuLimnigramme();
@@ -339,7 +292,7 @@
} else if (eltRefPersist instanceof NoeudNiveauContinuTarragePersist) {
- NoeudNiveauContinuTarragePersist eltPersist = (NoeudNiveauContinuTarragePersist) eltRefPersist;
+ final NoeudNiveauContinuTarragePersist eltPersist = (NoeudNiveauContinuTarragePersist) eltRefPersist;
final CatEMHNoeud noeudMetier = getEMHNoeudFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (noeudMetier != null) {
final CalculTransitoireNoeudNiveauContinuTarrage eltMetier = new CalculTransitoireNoeudNiveauContinuTarrage();
@@ -367,7 +320,7 @@
} else if (eltRefPersist instanceof BrancheOrificeManoeuvrePersist) {
- BrancheOrificeManoeuvrePersist eltPersist = (BrancheOrificeManoeuvrePersist) eltRefPersist;
+ final BrancheOrificeManoeuvrePersist eltPersist = (BrancheOrificeManoeuvrePersist) eltRefPersist;
final CatEMHBranche brancheMetier = getEMHBrancheFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (brancheMetier != null) {
final CalculTransitoireBrancheOrificeManoeuvre eltMetier = new CalculTransitoireBrancheOrificeManoeuvre();
@@ -397,7 +350,7 @@
} else if (eltRefPersist instanceof BrancheSaintVenantHydrogrammeRuisPersist) {
- BrancheSaintVenantHydrogrammeRuisPersist eltPersist = (BrancheSaintVenantHydrogrammeRuisPersist) eltRefPersist;
+ final BrancheSaintVenantHydrogrammeRuisPersist eltPersist = (BrancheSaintVenantHydrogrammeRuisPersist) eltRefPersist;
final CatEMHBranche brancheMetier = getEMHBrancheFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (brancheMetier != null) {
final CalculTransitoireBrancheSaintVenantHydrogrammeRuis eltMetier = new CalculTransitoireBrancheSaintVenantHydrogrammeRuis();
@@ -426,7 +379,7 @@
} else if (eltRefPersist instanceof CasierProfilHydrogrammeRuisPersist) {
- CasierProfilHydrogrammeRuisPersist eltPersist = (CasierProfilHydrogrammeRuisPersist) eltRefPersist;
+ final CasierProfilHydrogrammeRuisPersist eltPersist = (CasierProfilHydrogrammeRuisPersist) eltRefPersist;
final CatEMHCasier casierMetier = getEMHCasierFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (casierMetier != null) {
final CalculTransitoireCasierProfilHydrogrammeRuis eltMetier = new CalculTransitoireCasierProfilHydrogrammeRuis();
@@ -608,24 +561,24 @@
analyser.addError(CrueResource.getS("Il n'y a pas de calculs permanents dans DCLM."), cptEntries++);
} else {
- for (CalculPermanent calculMetier : data) {
+ for (final CalculPermanent calculMetier : data) {
- CalculPermanentPersist calculPersist = new CalculPermanentPersist();
+ final CalculPermanentPersist calculPersist = new CalculPermanentPersist();
calculPersist.Nom = calculMetier.getNom();
calculPersist.Description = calculMetier.getDescription();
calculPersist.MethodeCalcul = calculMetier.getMethodeCalcul();
calculPersist.listeElementsCalculPermanent = new ArrayList<RefDCLMAbstractPersist>();
- List<NoeudNiveauContinuQappPersist> listePersistNNCQapp = new ArrayList<NoeudNiveauContinuQappPersist>();
- List<NoeudNiveauContinuZimposePersist> listePersistNNCZ = new ArrayList<NoeudNiveauContinuZimposePersist>();
- List<BrancheOrificeOuvPersist> listePersistBrancheOr = new ArrayList<BrancheOrificeOuvPersist>();
- List<BrancheSaintVenantQruisPersist> listePersistBrancheQRuis = new ArrayList<BrancheSaintVenantQruisPersist>();
- List<CasierProfilQruisPersist> listePersistCasierQRuis = new ArrayList<CasierProfilQruisPersist>();
+ 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 (EMH emh : calculMetier.getListeRefs()) {
+ for (final EMH emh : calculMetier.getListeRefs()) {
if (emh instanceof CatEMHNoeud) {
- List<DonClimM> listeDoncClimM = emh.getDCLM();
+ final List<DonClimM> listeDoncClimM = emh.getDCLM();
if (listeDoncClimM == null) {
continue;
}
@@ -635,10 +588,10 @@
for (final DonClimM dataCliM : listeDoncClimM) {
if (dataCliM instanceof CalculPermanentNoeudNiveauContinuQapp) {
- CalculPermanentNoeudNiveauContinuQapp noeudNivContQapp = (CalculPermanentNoeudNiveauContinuQapp) dataCliM;
+ final CalculPermanentNoeudNiveauContinuQapp noeudNivContQapp = (CalculPermanentNoeudNiveauContinuQapp) dataCliM;
if (noeudNivContQapp.getNomCalculParent() != null
&& noeudNivContQapp.getNomCalculParent().equals(calculPersist.Nom)) {
- NoeudNiveauContinuQappPersist NNCQappPersist = new NoeudNiveauContinuQappPersist();
+ final NoeudNiveauContinuQappPersist NNCQappPersist = new NoeudNiveauContinuQappPersist();
NNCQappPersist.NomRef = CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom();
NNCQappPersist.Qapp = noeudNivContQapp.getQapp();
@@ -649,10 +602,10 @@
} else if (dataCliM instanceof CalculPermanentNoeudNiveauContinuZimpose) {
- CalculPermanentNoeudNiveauContinuZimpose noeudNivContZ = (CalculPermanentNoeudNiveauContinuZimpose) dataCliM;
+ final CalculPermanentNoeudNiveauContinuZimpose noeudNivContZ = (CalculPermanentNoeudNive...
[truncated message content] |
|
From: <de...@us...> - 2009-04-29 21:44:25
|
Revision: 4694
http://fudaa.svn.sourceforge.net/fudaa/?rev=4694&view=rev
Author: deniger
Date: 2009-04-29 21:44:22 +0000 (Wed, 29 Apr 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/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/CrueHelper.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/ValidatorXml.java
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/Crue10FileFormatFactory.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/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/emh/CrueData.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoProfilCommun.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHCasierHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHNoeudHelper.java
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/pcal-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/test/java/idea/TestXstreamMultipleImpliciteCollection.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/TestCrueDCLMFile.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/TestCrueOCALFile.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/resources/fichierTest/Modele3.dh.GOTO
trunk/soft/fudaa-crue/fudaa/.pmd
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/CruePersistanceErrorManager.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/ctulu/
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueIOMessages.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/metier/emh/CrueDataImpl.java
trunk/soft/fudaa-crue/dodico/src/test/java/idea/TestPointFF.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dh.include
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dh.include.1
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dh.include.2
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dh.include.3
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/test/java/idea/TestFred.java
Modified: trunk/soft/fudaa-crue/.pmd
===================================================================
--- trunk/soft/fudaa-crue/.pmd 2009-04-29 16:41:14 UTC (rev 4693)
+++ trunk/soft/fudaa-crue/.pmd 2009-04-29 21:44:22 UTC (rev 4694)
@@ -492,22 +492,10 @@
<ruleset>Import Statement Rules</ruleset>
</rule>
<rule>
- <name>JUnitStaticSuite</name>
- <ruleset>JUnit Rules</ruleset>
- </rule>
- <rule>
<name>JUnitSpelling</name>
<ruleset>JUnit Rules</ruleset>
</rule>
<rule>
- <name>JUnitAssertionsShouldIncludeMessage</name>
- <ruleset>JUnit Rules</ruleset>
- </rule>
- <rule>
- <name>JUnitTestsShouldIncludeAssert</name>
- <ruleset>JUnit Rules</ruleset>
- </rule>
- <rule>
<name>TestClassWithoutTestCases</name>
<ruleset>JUnit Rules</ruleset>
</rule>
Modified: trunk/soft/fudaa-crue/dodico/pmd.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/pmd.xml 2009-04-29 16:41:14 UTC (rev 4693)
+++ trunk/soft/fudaa-crue/dodico/pmd.xml 2009-04-29 21:44:22 UTC (rev 4694)
@@ -26,9 +26,7 @@
<rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>
<rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>
<rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>
- <rule ref="rulesets/basic.xml/BooleanInstantiation">
- <priority>2</priority>
- </rule>
+ <rule ref="rulesets/basic.xml/BooleanInstantiation"/>
<rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>
<rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>
<rule ref="rulesets/basic.xml/UselessOverridingMethod"/>
@@ -66,7 +64,6 @@
<rule ref="rulesets/controversial.xml/AssignmentInOperand"/>
<rule ref="rulesets/controversial.xml/DontImportSun"/>
<rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>
- <rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>
<rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>
<rule ref="rulesets/controversial.xml/DefaultPackage">
<priority>5</priority>
Added: 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 (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java 2009-04-29 21:44:22 UTC (rev 4694)
@@ -0,0 +1,388 @@
+/**
+ * @creation 20 f�vr. 2003
+ * @modification $Date: 2007-05-21 10:28:29 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ctulu;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+
+import com.memoire.fu.FuLog;
+
+/**
+ * Cette classe sert a transmettre les informations d'une operation de lecture ou d'ecriture. Les informations et les
+ * erreurs de l'operation sont stock�es avec eventuellement leur numero de ligne.
+ *
+ * @author deniger
+ * @version $Id: CtuluAnalyze.java,v 1.12 2007-05-21 10:28:29 deniger Exp $
+ */
+public class CtuluAnalyze {
+
+ protected static Map<String, Object> createMap(final int line, final Map<String, Object> init) {
+ Map<String, Object> res = init;
+ if (res == null) {
+ res = new HashMap<String, Object>();
+ }
+ res.put("file.line", line);
+ return res;
+ }
+
+ /**
+ * @param key la cle
+ * @param o l'objet
+ * @return une map initialisee avec key,o
+ */
+ public static Map<String, Object> createMap(final String key, final Object o) {
+ final Map<String, Object> res = new HashMap<String, Object>();
+ res.put(key, o);
+ return res;
+ }
+
+ private String desc;
+
+ protected final List<LogRecord> logs = new ArrayList<LogRecord>();
+
+ private String ressource;
+
+ /**
+ * @param msg le message
+ */
+ public void addError(final String msg) {
+ addRecord(Level.SEVERE, msg);
+ }
+
+ /**
+ * @param msg le message
+ * @param data
+ */
+ public void addError(final String msg, final Map<String, Object> data) {
+ addRecord(Level.SEVERE, msg, data);
+ }
+
+ /**
+ * @param msg
+ * @param i
+ */
+ public void addErrorFromFile(final String msg, final int i) {
+ addRecord(Level.SEVERE, msg, createMap(i, null));
+ }
+
+ /**
+ * @param msg le message
+ * @param reader le reader occasionnant l'erreur
+ */
+ public void addErrorFromFile(final String msg, final LineNumberReader reader) {
+ addRecord(Level.SEVERE, msg, createMap(reader, null));
+ }
+
+ /**
+ * @param msg le message
+ * @param data les donnees complementaire
+ * @param i le numero de ligne de l'erreur
+ */
+ public void addErrorFromFile(final String msg, final Map<String, Object> data, final int i) {
+ addRecord(Level.SEVERE, msg, createMap(i, data));
+ }
+
+ /**
+ * @param msg le message
+ * @param data les donnees complementaire
+ * @param reader le reader occasionnant l'erreur
+ */
+ public void addErrorFromFile(final String msg, final Map<String, Object> data, final LineNumberReader reader) {
+ addRecord(Level.SEVERE, msg, createMap(reader, data));
+ }
+
+ /**
+ * @param _m le message
+ * @deprecated
+ */
+ @Deprecated
+ public void addFatalError(final String _m) {
+ addError(_m);
+ }
+
+ /**
+ * Initialise le champ "erreur fatale". Si une erreur fatale a deja ete initialisee, ne fait rien.
+ *
+ * @param _m le message
+ * @param _index le num de ligne
+ */
+ public void addFatalError(final String _m, final int _index) {
+ addErrorFromFile(_m, _index);
+ }
+
+ /**
+ * Initialise le champ "erreur fatale". Si une erreur fatale a deja ete initialisee, ne fait rien.
+ *
+ * @param _m le message
+ * @param _in pour recuperer le num de ligne
+ */
+ public void addFatalError(final String _m, final LineNumberReader _in) {
+ addErrorFromFile(_m, _in);
+ }
+
+ /**
+ * @param msg le message d'info a ajouter
+ */
+ public void addInfo(final String msg) {
+ addRecord(Level.INFO, msg);
+ }
+
+ /**
+ * @param msg le message d'info a ajouter
+ * @param _index l'index identifiant le message (peut etre un numero de ligne)
+ */
+ public void addInfoFromFile(final String msg, final int _index) {
+ addRecord(Level.INFO, msg, createMap(_index, null));
+ }
+
+ /**
+ * @param msg le message d'info a ajouter
+ * @param _in le reader permettant de recuperer le numero de ligne
+ */
+ public void addInfoFromFile(final String msg, final LineNumberReader _in) {
+ addRecord(Level.INFO, msg, createMap(_in, null));
+ }
+
+ /**
+ * @param level le level
+ * @param msg le message
+ * @return le logRecord ajoute
+ */
+ public LogRecord addRecord(final Level level, final String msg) {
+ return addRecord(level, msg, null);
+ }
+
+ /**
+ * @param level le level
+ * @param msg le message
+ * @param data les donnees complementaire
+ * @return le logRecord ajoute
+ */
+ public LogRecord addRecord(final Level level, final String msg, final Map<String, Object> data) {
+ final LogRecord o = new LogRecord(level, msg);
+ if (data != null) {
+ o.setParameters(new Object[] { data });
+ }
+ logs.add(o);
+ return o;
+ }
+
+ /**
+ * @param msg le message d'avertissement
+ */
+ public void addWarn(final String msg) {
+ addRecord(Level.WARNING, msg);
+ }
+
+ /**
+ * @param msg le message d'avertissement
+ * @param in le reader permettant de recuperer le numero de ligne
+ */
+ public void addWarn(final String msg, final LineNumberReader in) {
+ addRecord(Level.WARNING, msg, createMap(in, null));
+ }
+
+ /**
+ * @param msg le message d'avertissement
+ * @param args les arguments supplementaires
+ */
+ public void addWarn(final String msg, final Map<String, Object> args) {
+ addRecord(Level.WARNING, msg, args);
+ }
+
+ /**
+ * @param msg le message d'avertissement
+ * @param index le numero identifiant le message
+ */
+ public void addWarnFromFile(final String msg, final int index) {
+ addRecord(Level.WARNING, msg, createMap(index, null));
+ }
+
+ @Deprecated
+ public void changeFatalError(final String _m) {
+ addError(_m);
+ }
+
+ /**
+ * Efface tous les canaux.
+ */
+ public void clear() {
+ logs.clear();
+ }
+
+ /**
+ * @return true si contient au moins une erreur
+ */
+ public boolean containsErrors() {
+ return containsLevel(Level.SEVERE);
+ }
+
+ /**
+ * @return true si contient une erreur fatale
+ */
+ public boolean containsFatalError() {
+ return containsErrors();
+ }
+
+ /**
+ * @return true si contient au moins une info
+ */
+ public boolean containsInfos() {
+ return containsLevel(Level.INFO);
+ }
+
+ /**
+ * @param l le level a tester
+ * @return true si au moins un message et de niveau l.
+ */
+ public boolean containsLevel(final Level l) {
+ for (final LogRecord log : logs) {
+ if (l.equals(log.getLevel())) { return true; }
+ }
+ return false;
+ }
+
+ /**
+ * @return true si contient au moins un avertissement
+ */
+ public boolean containsWarnings() {
+ return containsLevel(Level.WARNING);
+ }
+
+ protected Map<String, Object> createMap(final LineNumberReader line, final Map<String, Object> init) {
+ return createMap(line.getLineNumber(), init);
+ }
+
+ /**
+ * @return la description de l'analyse en cours
+ */
+ public String getDesc() {
+ return desc;
+ }
+
+ public Collection<LogRecord> getRecords() {
+ return Collections.unmodifiableCollection(logs);
+ }
+
+ /**
+ * @return chaine decrivant la ressource ( fichier, url, ...)
+ */
+ public String getResource() {
+ return ressource;
+ }
+
+ /**
+ * @return le resume de l'analyse
+ */
+ public String getResume() {
+ return CtuluDefaultLogFormatter.format(logs);
+ }
+
+ /**
+ * @return true si vide
+ */
+ public boolean isEmpty() {
+ return logs.isEmpty();
+ }
+
+ /**
+ * @param _e l'exception a ajouter a l'anayse
+ */
+ public void manageException(final Exception _e) {
+ manageException(_e, "exception.occured");
+ }
+
+ /**
+ * @param _e l'exception a ajouter a l'anayse
+ * @param msg le message
+ */
+ public void manageException(final Exception _e, final String msg) {
+ addRecord(Level.SEVERE, msg).setThrown(_e);
+ }
+
+ /**
+ * Ajoute un message d'erreur.
+ *
+ * @param _e l'exception a loguer
+ */
+ public void manageException(final FileNotFoundException _e) {
+ manageException(_e, "exception.FileNotFoundException");
+ }
+
+ /**
+ * @param _e l'exception a ajouter a l'anayse
+ */
+ public void manageException(final IllegalArgumentException _e) {
+ manageException(_e, "exception.IllegalArgumentException");
+ }
+
+ /**
+ * Ajoute un message d'erreur.
+ *
+ * @param _e l'exception a loguer
+ */
+ public void manageException(final IOException _e) {
+ manageException(_e, "exception.IOException");
+ }
+
+ /**
+ * @param _e l'exception a ajouter a l'anayse
+ * @param _l le numero de ligne
+ */
+ public void manageException(final NumberFormatException _e, final int _l) {
+ manageException(_e, "exception.NumberFormatException");
+ }
+
+ /**
+ * @param _e l'exception a ajouter a l'anayse
+ * @param msg le message
+ * @param line la ligne
+ */
+ public void manageExceptionFromFile(final Exception _e, final String msg, final int line) {
+ addRecord(Level.SEVERE, msg, createMap(line, null)).setThrown(_e);
+ }
+
+ /**
+ * Ajoute tous les canaux de l'analyse passee en parametres. Les pointeurs sont copi�es.
+ *
+ * @param _analyze l'analyse a ajouter a celle-ci
+ */
+ public void merge(final CtuluAnalyze _analyze) {
+ logs.addAll(_analyze.logs);
+ }
+
+ /**
+ * Permet d'ecrire sur la sortie standart le contenu de cette analyse.
+ */
+ public void printResume() {
+ FuLog.all(getResume());
+ }
+
+ /**
+ * @param _string la nouvelle description de l'analyse
+ */
+ public void setDesc(final String _string) {
+ desc = _string;
+ }
+
+ /**
+ * @param _string la nouvelle ressource de l'analyse
+ */
+ public void setResource(final String _string) {
+ ressource = _string;
+ }
+}
\ No newline at end of file
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java 2009-04-29 21:44:22 UTC (rev 4694)
@@ -0,0 +1,109 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.ctulu;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.logging.Formatter;
+import java.util.logging.LogRecord;
+import java.util.logging.SimpleFormatter;
+
+/**
+ * Formateur par defaut pour les logs
+ *
+ * @author deniger
+ */
+public final class CtuluDefaultLogFormatter extends SimpleFormatter {
+
+ /**
+ * Formateur par defaut pour les logs
+ */
+ public final static Formatter DEFAULT = new CtuluDefaultLogFormatter();
+
+ private CtuluDefaultLogFormatter() {
+ // EMPTY
+ }
+
+ /**
+ * @param logAnalyse l'analyse a formater
+ * @return la string contenant le tout
+ */
+ public static String format(final CtuluAnalyze logAnalyse) {
+ if (logAnalyse.logs == null) { return CtuluLibString.EMPTY_STRING; }
+ final StringBuilder res = new StringBuilder(40 + logAnalyse.logs.size() * 40);
+ if (logAnalyse.getDesc() != null) {
+ res.append(logAnalyse.getDesc());
+ }
+ if (logAnalyse.getResource() != null) {
+ if (res.length() > 0) {
+ res.append(CtuluLibString.LINE_SEP);
+ }
+ res.append(logAnalyse.getResource());
+ }
+ for (final LogRecord logRecord : logAnalyse.logs) {
+ if (res.length() > 0) {
+ res.append(CtuluLibString.LINE_SEP);
+ }
+ res.append(DEFAULT.format(logRecord));
+ }
+ return res.toString();
+ }
+
+ /**
+ * @param logs l'analyse a formater
+ * @return la string contenant le tout
+ */
+ public static String format(final Collection<LogRecord> logs) {
+ if (logs == null) { return CtuluLibString.EMPTY_STRING; }
+ final StringBuilder res = new StringBuilder(10 + logs.size() * 40);
+ for (final LogRecord logRecord : logs) {
+ res.append(DEFAULT.format(logRecord));
+ }
+ return res.toString();
+ }
+
+ @Override
+ public synchronized String formatMessage(final LogRecord record) {
+ String format = record.getMessage();
+ final java.util.ResourceBundle catalog = record.getResourceBundle();
+ if (catalog != null) {
+ // // We cache catalog lookups. This is mostly to avoid the
+ // // cost of exceptions for keys that are not in the catalog.
+ // if (catalogCache == null) {
+ // catalogCache = new HashMap();
+ // }
+ // format = (String)catalogCache.get(record.essage);
+ // if (format == null) {
+ try {
+ format = catalog.getString(record.getMessage());
+ } catch (final java.util.MissingResourceException ex) {
+ // Drop through. Use record message as format
+ format = record.getMessage();
+ }
+ // catalogCache.put(record.message, format);
+ // }
+ }
+ // Do the formatting.
+ try {
+ final Object parameters[] = record.getParameters();
+ if (parameters == null || parameters.length == 0) {
+ // No parameters. Just return format string.
+ return format;
+ }
+ final Map<String, Object> params = (Map<String, Object>) parameters[0];
+ final StringBuilder res = new StringBuilder(format.length() + params.size() * 20);
+ for (final Map.Entry<String, Object> object : params.entrySet()) {
+ res.append('[').append(object.getKey()).append('=').append(object.getValue());
+ }
+ format = res.toString();
+
+ } catch (final Exception ex) {
+ // Formatting failed: use localized format string.
+
+ }
+ return format;
+ }
+
+}
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueIOMessages.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueIOMessages.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueIOMessages.java 2009-04-29 21:44:22 UTC (rev 4694)
@@ -0,0 +1,64 @@
+package org.fudaa.dodico.crue.common;
+
+/**
+ * Messages associés à un code.
+ *
+ * @author Adrien Hadoux
+ */
+public class CrueIOMessages {
+
+ private static CrueIOMessages INSTANCE;
+
+ /**
+ * Instance de la classe de commentaires.
+ *
+ * @return l'instance de messages.
+ */
+ public static CrueIOMessages getInstancce() {
+ if (INSTANCE == null) {
+ INSTANCE = new CrueIOMessages();
+ }
+ return INSTANCE;
+
+ }
+
+ /**
+ *
+ */
+
+ public final String DC_CarteUnknown = CrueResource.getS("Type non pris en compte. Ligne:");
+
+ /**
+ *
+ */
+ public final String msg_err_line = CrueResource.getS("Une erreur est survenue à la Ligne:");
+ /**
+ *
+ */
+ public final String msg_err_branche = CrueResource.getS("Ligne Branche mal formée, attendu: 5 elements. Ligne:");
+ /**
+ *
+ */
+ public final String msg_unknow_branche = CrueResource
+ .getS("Impossible de créer la branche, type de branche inconnu ");
+ /**
+ *
+ */
+ public static final String DC_DCSP_BRANCHE = CrueResource
+ .getS("Erreur, data DCSP de la branche null, manque ligne Borda");
+
+ public final String msg_unknow_profil = CrueResource.getS("Impossible de créer le profil, structure inconnue ");
+
+ public final String msg_unknow_reference = CrueResource.getS("Impossible de trouver la référence");
+
+ /**
+ *
+ */
+ public static final String DH_EMPTY = "dh.empty";
+
+ /**
+ *
+ */
+ public static final String ERREUR_LIGNE_NON_PRISE_EN_COMPTE_POUR_LA_CARTE = "Erreur, Ligne non prise en compte pour la carte";
+
+}
Modified: 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 16:41:14 UTC (rev 4693)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDCLM.java 2009-04-29 21:44:22 UTC (rev 4694)
@@ -9,56 +9,8 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.common.CrueResource;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.BrancheOrificeManoeuvrePersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.BrancheOrificeOuvPersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.BrancheSaintVenantHydrogrammeRuisPersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.BrancheSaintVenantQruisPersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.CalculAbstractPersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.CalculPermanentPersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.CalculTransitoirePersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.CasierProfilHydrogrammeRuisPersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.CasierProfilQruisPersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.HydrogrammePersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.HydrogrammeRuisPersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.LimnigrammePersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.ManoeuvrePersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.NoeudNiveauContinuHydrogrammePersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.NoeudNiveauContinuLimnigrammePersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.NoeudNiveauContinuQappPersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.NoeudNiveauContinuTarragePersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.NoeudNiveauContinuZimposePersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.RefDCLMAbstractPersist;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDCLM.TarragePersist;
-import org.fudaa.dodico.crue.metier.emh.CalculPermanent;
-import org.fudaa.dodico.crue.metier.emh.CalculPermanentBrancheOrificeOuv;
-import org.fudaa.dodico.crue.metier.emh.CalculPermanentBrancheSaintVenantQruis;
-import org.fudaa.dodico.crue.metier.emh.CalculPermanentCasierProfilQruis;
-import org.fudaa.dodico.crue.metier.emh.CalculPermanentNoeudNiveauContinuQapp;
-import org.fudaa.dodico.crue.metier.emh.CalculPermanentNoeudNiveauContinuZimpose;
-import org.fudaa.dodico.crue.metier.emh.CalculTransitoire;
-import org.fudaa.dodico.crue.metier.emh.CalculTransitoireBrancheOrificeManoeuvre;
-import org.fudaa.dodico.crue.metier.emh.CalculTransitoireBrancheSaintVenantHydrogrammeRuis;
-import org.fudaa.dodico.crue.metier.emh.CalculTransitoireCasierProfilHydrogrammeRuis;
-import org.fudaa.dodico.crue.metier.emh.CalculTransitoireNoeudNiveauContinuHydrogramme;
-import org.fudaa.dodico.crue.metier.emh.CalculTransitoireNoeudNiveauContinuLimnigramme;
-import org.fudaa.dodico.crue.metier.emh.CalculTransitoireNoeudNiveauContinuTarrage;
-import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
-import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
-import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
-import org.fudaa.dodico.crue.metier.emh.CrueData;
-import org.fudaa.dodico.crue.metier.emh.DonCLimMBrancheOrifice;
-import org.fudaa.dodico.crue.metier.emh.DonCLimMBrancheSaintVenant;
-import org.fudaa.dodico.crue.metier.emh.DonCLimMCasierProfil;
-import org.fudaa.dodico.crue.metier.emh.DonCLimMNoeudNiveauContinu;
-import org.fudaa.dodico.crue.metier.emh.DonCLimMScenario;
-import org.fudaa.dodico.crue.metier.emh.DonClimM;
-import org.fudaa.dodico.crue.metier.emh.EMH;
-import org.fudaa.dodico.crue.metier.emh.EMHBrancheOrifice;
-import org.fudaa.dodico.crue.metier.emh.EMHBrancheSaintVenant;
-import org.fudaa.dodico.crue.metier.emh.EMHCasierProfil;
-import org.fudaa.dodico.crue.metier.emh.Loi;
-import org.fudaa.dodico.crue.metier.emh.LoiDF;
-import org.fudaa.dodico.crue.metier.emh.LoiFF;
+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;
@@ -72,8 +24,7 @@
public class CrueConverterDCLM implements CrueConverter<CrueDaoDCLM, DonCLimMScenario> {
/** Incrémente le nombre d'erreurs dans l'objet CtuluAnlayse * */
- public static int cptEntries = 1;
-
+ // public static int cptEntries = 1; ne sert à rien !
/**
* Convertit les objets persistants en objets métier
*/
@@ -129,8 +80,7 @@
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"),
- cptEntries++);
+ analyzer.addError(CrueResource.getS("Il n'y a pas de calculs (permanents ou transitoires) dans DCLM"));
} else {
for (final CalculAbstractPersist calculPersist : calculsPersist) {
@@ -169,7 +119,7 @@
// *** 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"), cptEntries++);
+ analyzer.addError(CrueResource.getS("Il n'y a pas de calculs permanents dans DCLM"));
} else {
final List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu = new ArrayList<DonCLimMNoeudNiveauContinu>();
@@ -273,7 +223,7 @@
// *** 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"), cptEntries++);
+ analyzer.addError(CrueResource.getS("Il n'y a pas de calculs transitoires dans DCLM"));
} else {
final List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu = new ArrayList<DonCLimMNoeudNiveauContinu>();
@@ -294,8 +244,7 @@
final List<LoiDF> loisDF = new ArrayList<LoiDF>();
if (eltPersist.listeHydrogrammes == null || eltPersist.listeHydrogrammes.size() == 0) {
- analyzer.addError(CrueHelper.emhEmpty("Calcul Transitoire - NoeudNiveauContinu - Hydrogrammes"),
- cptEntries++);
+ analyzer.addError(CrueHelper.emhEmpty("Calcul Transitoire - NoeudNiveauContinu - Hydrogrammes"));
} else {
for (final HydrogrammePersist hydroPersist : eltPersist.listeHydrogrammes) {
@@ -322,8 +271,7 @@
final List<LoiDF> loisDF = new ArrayList<LoiDF>();
if (eltPersist.listeLimnigrammes == null || eltPersist.listeLimnigrammes.size() == 0) {
- analyzer.addError(CrueHelper.emhEmpty("Calcul Transitoire - NoeudNiveauContinu - Limnigrammes"),
- cptEntries++);
+ analyzer.addError(CrueHelper.emhEmpty("Calcul Transitoire - NoeudNiveauContinu - Limnigrammes"));
} else {
for (final LimnigrammePersist limniPersist : eltPersist.listeLimnigrammes) {
@@ -350,8 +298,7 @@
final List<LoiFF> loisFF = new ArrayList<LoiFF>();
if (eltPersist.listeTarrages == null || eltPersist.listeTarrages.size() == 0) {
- analyzer
- .addError(CrueHelper.emhEmpty("Calcul Transitoire - NoeudNiveauContinu - Tarrages"), cptEntries++);
+ analyzer.addError(CrueHelper.emhEmpty("Calcul Transitoire - NoeudNiveauContinu - Tarrages"));
} else {
for (final TarragePersist tarragePersist : eltPersist.listeTarrages) {
@@ -379,8 +326,7 @@
if (eltPersist.listeManoeuvres == null || eltPersist.listeManoeuvres.size() == 0) {
- analyzer.addError(CrueHelper.emhEmpty("Calcul Transitoire - BrancheOrificeManoeuvre - Manoeuvres"),
- cptEntries++);
+ analyzer.addError(CrueHelper.emhEmpty("Calcul Transitoire - BrancheOrificeManoeuvre - Manoeuvres"));
} else {
for (final ManoeuvrePersist manoeuvrePersist : eltPersist.listeManoeuvres) {
@@ -410,7 +356,7 @@
if (eltPersist.listeHydrogrammesRuis == null || eltPersist.listeHydrogrammesRuis.size() == 0) {
analyzer.addError(CrueHelper
- .emhEmpty("Calcul Transitoire - BrancheSaintVenantHydrogrammeRuis - HydrogrammesRuis"), cptEntries++);
+ .emhEmpty("Calcul Transitoire - BrancheSaintVenantHydrogrammeRuis - HydrogrammesRuis"));
} else {
for (final HydrogrammeRuisPersist hydroRuisPersist : eltPersist.listeHydrogrammesRuis) {
@@ -439,7 +385,7 @@
if (eltPersist.listeHydrogrammesRuis == null || eltPersist.listeHydrogrammesRuis.size() == 0) {
analyzer.addError(CrueHelper
- .emhEmpty("Calcul Transitoire - CasierProfilHydrogrammeRuis - HydrogrammesRuis"), cptEntries++);
+ .emhEmpty("Calcul Transitoire - CasierProfilHydrogrammeRuis - HydrogrammesRuis"));
} else {
for (final HydrogrammeRuisPersist hydroRuisPersist : eltPersist.listeHydrogrammesRuis) {
@@ -607,7 +553,7 @@
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."), cptEntries++);
+ analyser.addError(CrueResource.getS("Il n'y a pas de calculs permanents dans DCLM."));
} else {
for (final CalculPermanent calculMetier : data) {
@@ -667,7 +613,7 @@
if (!trouve) {
analyser.addError(CrueResource
.getS("CalculPermanent - NoeudNiveauContinu : Donnee DCLM correspondant à la référence"
- + CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom() + " non trouvée"), cptEntries++);
+ + CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom() + " non trouvée"));
}
} // Fin if EMHNoeudNiveauContinu
@@ -702,7 +648,7 @@
if (!trouve) {
analyser.addError(CrueResource
.getS("CalculPermanent - BrancheOrificeOuv : Donnee DCLM correspondant à la référence"
- + CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom() + " non trouvée"), cptEntries++);
+ + CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom() + " non trouvée"));
}
} // Fin if EMHBrancheOrifice
@@ -732,7 +678,7 @@
if (!trouve) {
analyser.addError(CrueResource
.getS("CalculPermanent - BrancheSaintVenantQruis : Donnee DCLM correspondant à la référence"
- + CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom() + " non trouvée"), cptEntries++);
+ + CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom() + " non trouvée"));
}
} // Fin if EMHBrancheSaintVenant
@@ -765,7 +711,7 @@
if (!trouve) {
analyser.addError(CrueResource
.getS("CalculPermanent - CasierProfilQruis : Donnee DCLM correspondant à la référence"
- + CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom() + " non trouvée"), cptEntries++);
+ + CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom() + " non trouvée"));
}
}
@@ -801,7 +747,7 @@
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."), cptEntries++);
+ analyser.addError(CrueResource.getS("Il n'y a pas de calculs transitoires dans DCLM."));
} else {
for (final CalculTransitoire calculMetier : data) {
@@ -886,7 +832,7 @@
if (!trouve) {
analyser.addError(CrueResource
.getS("CalculTransitoire - NoeudNiveauContinu : Donnee DCLM correspondant à la référence"
- + CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom() + " non trouvée"), cptEntries++);
+ + CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom() + " non trouvée"));
}
}// Fin if CatEMHNoeud
@@ -926,7 +872,7 @@
if (!trouve) {
analyser.addError(CrueResource
.getS("CalculTransitoire - BrancheOrificeManoeuvre : Donnee DCLM correspondant à la référence"
- + CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom() + " non trouvée"), cptEntries++);
+ + CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom() + " non trouvée"));
}
} else if (emh instanceof EMHBrancheSaintVenant) {
@@ -961,10 +907,9 @@
}
if (!trouve) {
analyser
- .addError(
- CrueResource
- .getS("CalculTransitoire - BrancheSaintVenantHydrogrammeRuis : Donnee DCLM correspondant à la référence"
- + CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom() + " non trouvée"), cptEntries++);
+ .addError(CrueResource
+ .getS("CalculTransitoire - BrancheSaintVenantHydrogrammeRuis : Donnee DCLM correspondant à la référence"
+ + CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom() + " non trouvée"));
}
}
@@ -1003,7 +948,7 @@
if (!trouve) {
analyser.addError(CrueResource
.getS("CalculTransitoire - CasierProfilHydrogrammeRuis : Donnee DCLM correspondant à la référence"
- + CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom() + " non trouvée"), cptEntries++);
+ + CrueDaoDRSO.SUFFIXE_REF_DRSO + emh.getNom() + " non trouvée"));
}
} // Fin if EMHCasierProfil
Modified: 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/CrueConverterDCSP.java 2009-04-29 16:41:14 UTC (rev 4693)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDCSP.java 2009-04-29 21:44:22 UTC (rev 4694)
@@ -18,13 +18,12 @@
public class CrueConverterDCSP implements CrueConverter<CrueDaoDCSP, List<EMH>> {
/** Incrémente le nombre d'erreur trouvées */
- public static int cptEntries = 1;
public List<EMH> convertDaoToMetier(final CrueDaoDCSP dao, final CrueData dataLinked, final CtuluAnalyze analyser) {
if (dataLinked == null) {
analyser
.addFatalError(CrueResource
- .getS("Impossible de récupérer les donn�es résaux (DRSO). Les références du fichier DSCP ne pourront etre utilisées."));
+ .getS("Impossible de récupérer les données résaux (DRSO). Les références du fichier DSCP ne pourront etre utilisées."));
return null;
}
final List<EMH> listeEMHDRSO = dataLinked.getAllEMH();
@@ -57,7 +56,7 @@
// CrueDaoFactoryDCSP.remplirPersistanceAvecBrancheDSCP(persistance.Branches,data,listeMessageError);
if (data == null || data.size() == 0) {
- analyser.addError(CrueHelper.emhEmpty(CrueHelper.DCSP), cptEntries++);
+ analyser.addError(CrueHelper.emhEmpty(CrueHelper.DCSP));
} else {
for (final EMH emh : data) {
if (emh instanceof CatEMHBranche) {
@@ -70,8 +69,7 @@
if (dataCalc != null) {
CrueConverterDCSP.remplirPersistanceAvecBrancheDSCP(persistance.Branches, branche, dataCalc, analyser);
} else {
- analyser.addError(CrueHelper.unknowdataFromFile("Branches", CrueHelper.DCSP, branche.getNom()),
- cptEntries++);
+ analyser.addError(CrueHelper.unknowdataFromFile("Branches", CrueHelper.DCSP, branche.getNom()));
}
}
}
@@ -87,8 +85,7 @@
(DonCalcSansPrtSection) dataCalc, analyser);
} else {
- analyser.addError(CrueHelper.unknowdataFromFile("Section", CrueHelper.DCSP, section.getNom()),
- cptEntries++);
+ analyser.addError(CrueHelper.unknowdataFromFile("Section", CrueHelper.DCSP, section.getNom()));
}
}
@@ -167,10 +164,9 @@
else {
analyser
- .addError(
- CrueResource
- .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche barrage Fil d'eau) pour l'objet branche de r�f�rence"
- + branche.getNom()), cptEntries++);
+ .addError(CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche barrage Fil d'eau) pour l'objet branche de r�f�rence"
+ + branche.getNom()));
}
}
@@ -221,10 +217,9 @@
} else {
analyser
- .addError(
- CrueResource
- .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche barrage Generique) pour l'objet branche de r�f�rence"
- + branche.getNom()), cptEntries++);
+ .addError(CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche barrage Generique) pour l'objet branche de r�f�rence"
+ + branche.getNom()));
}
} else if (branche instanceof EMHBrancheBarrageRhone) {
@@ -251,10 +246,9 @@
} else {
analyser
- .addError(
- CrueResource
- .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche barrage Rhone) pour l'objet branche de r�f�rence"
- + branche.getNom()), cptEntries++);
+ .addError(CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche barrage Rhone) pour l'objet branche de r�f�rence"
+ + branche.getNom()));
}
}
@@ -283,10 +277,9 @@
.getElement());
} else {
analyser
- .addError(
- CrueResource
- .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche Orifice) pour l'objet branche de r�f�rence"
- + branche.getNom()), cptEntries++);
+ .addError(CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche Orifice) pour l'objet branche de r�f�rence"
+ + branche.getNom()));
}
} else if (branche instanceof EMHBranchePdc) {
@@ -321,10 +314,9 @@
else {
analyser
- .addError(
- CrueResource
- .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche seuil Longitudinal) pour l'objet branche de r�f�rence"
- + branche.getNom()), cptEntries++);
+ .addError(CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche seuil Longitudinal) pour l'objet branche de r�f�rence"
+ + branche.getNom()));
}
} else if (branche instanceof EMHBrancheNiveauxAssocies) {
@@ -360,10 +352,9 @@
else {
analyser
- .addError(
- CrueResource
- .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche seuil Longitudinal) pour l'objet branche de r�f�rence"
- + branche.getNom()), cptEntries++);
+ .addError(CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche seuil Longitudinal) pour l'objet branche de r�f�rence"
+ + branche.getNom()));
}
}
@@ -383,10 +374,9 @@
// br.Sections=remplirPersistanceAvecSectionsBrancheDSCP( branche.getListeSections(), analyser);
} else {
analyser
- .addError(
- CrueResource
- .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche SaintVenant) pour l'objet branche de r�f�rence"
- + branche.getNom()), cptEntries++);
+ .addError(CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche SaintVenant) pour l'objet branche de r�f�rence"
+ + branche.getNom()));
}
} else if (branche instanceof EMHBrancheSeuilLongitudinale) {
@@ -405,10 +395,9 @@
} else {
analyser
- .addError(
- CrueResource
- .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche seuil Longitudinal) pour l'objet branche de r�f�rence"
- + branche.getNom()), cptEntries++);
+ .addError(CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche seuil Longitudinal) pour l'objet branche de r�f�rence"
+ + branche.getNom()));
}
} else if (branche instanceof EMHBrancheSeuilTransversal) {
@@ -426,10 +415,9 @@
.getListElt());
} else {
analyser
- .addError(
- CrueResource
- .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche seuil transversal) pour l'objet branche de r�f�rence"
- + branche.getNom()), cptEntries++);
+ .addError(CrueResource
+ .getS("Branche : Donnee DSCP incorrecte (attendu. donnees branche seuil transversal) pour l'objet branche de r�f�rence"
+ + branche.getNom()));
}
}
@@ -443,7 +431,7 @@
listePersistante.add(branchePersist);
} else {
- analyser.addError(CrueHelper.unknowEMH("Branche", branche.getNom()), cptEntries++);
+ analyser.addError(CrueHelper.unknowEMH("Branche", branche.getNom()));
}
}
@@ -560,7 +548,7 @@
public static void remplirBrancheAvecPersistanceDSCP(final List<BrancheAbstract> listePersistants,
final List<EMH> data, final CtuluAnalyze analyser) {
if (listePersistants == null || listePersistants.size() == 0) {
- analyser.addError(CrueResource.getS("Branches: la liste est vide."), cptEntries++);
+ analyser.addError(CrueResource.getS("Branches: la liste est vide."));
} else {
for (final Object persist : listePersistants) {
if (persist instanceof BrancheAbstract) {
@@ -572,8 +560,7 @@
final CatEMHBranche branche = EMHBrancheHelper.findByReference(reference, data);
if (branche == null) {
analyser
- .addError(CrueResource.getS("Branche : Impossible de trouver la branche de r�f�rence " + reference),
- cptEntries++);
+ .addError(CrueResource.getS("Branche : Impossible de trouver la branche de r�f�rence " + reference));
} else {
if (branchePersist instanceof BrancheClassiqueAbstract) {
final BrancheClassiqueAbstract br = (BrancheClassiqueAbstract) branchePersist;
@@ -606,10 +593,8 @@
dataCalcul.setListElt(remplirSeuilsAvecPersistanceDSCP(br.ElemSeuils));
branche.addDSCP(dataCalcul);
} else {
- analyser
- .addError(CrueResource.getS("Branche : Les donnees de la branche de r�f�rence " + reference
- + " doivent �tre de type Transversal ou Longitudinal (liste de seuils+ formule pdc)"),
- cptEntries++);
+ analyser.addError(CrueResource.getS("Branche : Les donnees de la branche de r�f�rence " + reference
+ + " doivent �tre de type Transversal ou Longitudinal (liste de seuils+ formule pdc)"));
}
}
@@ -780,7 +765,7 @@
else {
analyser.addError(CrueResource.getS("Branche : Donn�es non correcte. La branche de r�f�rence "
- + reference + " contient des �l�ments de calcul innatendu."), cptEntries++);
+ + reference + " contient des �l�ments de calcul innatendu."));
}
}
@@ -869,7 +854,7 @@
final List<EMH> data, final CtuluAnalyze analyser) {
if (listePersistantsSection == null || listePersistantsSection.size() == 0) {
- analyser.addError(CrueResource.getS("Sections : la liste est vide."), cptEntries++);
+ analyser.addError(CrueResource.getS("Sections : la liste est vide."));
} else {
for (final Object persist : listePersistantsSection) {
if (persist instanceof SectionBrancheAbstract) {
@@ -892,7 +877,7 @@
dataCalcul.setCoeffPond(sectionPersist.CoefPond);
section.addDSCP(dataCalcul);
} else {
- analyser.addError(CrueHelper.unknowReference("Section", reference), cptEntries++);
+ analyser.addError(CrueHelper.unknowReference("Section", reference));
}
}
}
Modified: 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/CrueConverterDFRT.java 2009-04-29 16:41:14 UTC (rev 4693)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDFRT.java 2009-04-29 21:44:22 UTC (rev 4694)
@@ -33,8 +33,6 @@
return res;
}
- public static int cptEntries = 1;
-
/**
* remplir le fichier DFRT avec les frottemetns
*
@@ -77,7 +75,7 @@
public static List<DonFrt> convertToEMH(final List<StriRefPersist> persistListe, final CtuluAnalyze analyser) {
final List<DonFrt> data = new ArrayList<DonFrt>();
if (persistListe == null || persistListe.size() == 0) {
- analyser.addError(CrueResource.getS("Frottements : la liste est vide."), cptEntries++);
+ analyser.addError(CrueResource.getS("Frottements : la liste est vide."));
} else {
for (final StriRefPersist persist : persistListe) {
DonFrt frt = null;
@@ -105,14 +103,14 @@
} catch (final NumberFormatException e) {
analyser.addError(CrueResource.getS("Frottement: " + frt.getNom()
- + ": impossible de r�cup�rer le r�el du contenu: " + buff), cptEntries++);
+ + ": impossible de r�cup�rer le r�el du contenu: " + buff));
}
double y = 0;
try {
y = Double.parseDouble(val2);
} catch (final NumberFormatException e) {
analyser.addError(CrueResource.getS("Frottement: " + frt.getNom()
- + ": impossible de r�cup�rer le r�el du contenu: " + buff), cptEntries++);
+ + ": impossible de r�cup�rer le r�el du contenu: " + buff));
}
listePoints.add(new FrottementPoint(x, y));
Modified: 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/CrueConverterDLHY.java 2009-04-29 16:41:14 UTC (rev 4693)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDLHY.java 2009-04-29 21:44:22 UTC (rev 4694)
@@ -15,9 +15,6 @@
*/
public class CrueConverterDLHY implements CrueConverter<CrueDaoDLHY, List<Loi>> {
- /** Incrémente le nombre d'erreurs dans l'objet CtuluAnlayse * */
- public static int cptEntries = 1;
-
/**
* Convertit les objets persistants en objets métier
*/
@@ -81,16 +78,16 @@
}
if (res.Tarrages.size() == 0) {
- analyser.addError(CrueHelper.emhEmpty("Tarrages"), cptEntries++);
+ analyser.addError(CrueHelper.emhEmpty("Tarrages"));
}
if (res.Hydrogrammes.size() == 0) {
- analyser.addError(CrueHelper.emhEmpty("Hydrogrammes"), cptEntries++);
+ analyser.addError(CrueHelper.emhEmpty("Hydrogrammes"));
}
if (res.Limnigrammes.size() == 0) {
- analyser.addError(CrueHelper.emhEmpty("Limnigrammes"), cptEntries++);
+ analyser.addError(CrueHelper.emhEmpty("Limnigrammes"));
}
if (res.Manoeuvres.size() == 0) {
- analyser.addError(CrueHelper.emhEmpty("Manoeuvres"), cptEntries++);
+ analyser.addError(CrueHelper.emhEmpty("Manoeuvres"));
}
return res;
@@ -107,7 +104,7 @@
final List<LoiDF> listeLoisDF = new ArrayList<LoiDF>();
if (listePersistants == null || listePersistants.size() == 0) {
- analyser.addError(CrueHelper.emhEmpty("Hydrogrammes"), cptEntries++);
+ analyser.addError(CrueHelper.emhEmpty("Hydrogrammes"));
} else {
LoiDF loiDFMetier = null;
for (final LoiDFAbstractPersist loiDFAbstractPersist : listePersistants) {
@@ -137,7 +134,7 @@
final List<LoiDF> listeLoisDF = new ArrayList<LoiDF>();
if (listePersistants == null || listePersistants.size() == 0) {
- analyser.addError(CrueHelper.emhEmpty("Limnigrammes"), cptEntries++);
+ analyser.addError(CrueHelper.emhEmpty("Limnigrammes"));
} else {
LoiDF loiDFMetier = null;
@@ -165,7 +162,7 @@
final List<LoiDF> listeLoisDF = new ArrayList<LoiDF>();
if (listePersistants == null || listePersistants.size() == 0) {
- analyser.addError(CrueHelper.emhEmpty("Manoeuvres"), cptEntries++);
+ analyser.addError(CrueHelper.emhEmpty("Manoeuvres"));
} else {
LoiDF loiDF = null;
@@ -193,7 +190,7 @@
final List<LoiFF> listeLoisFF = new ArrayList<LoiFF>();
if (listePersistants == null || listePersistants.size() == 0) {
- analyser.addError(CrueHelper.emhEmpty("Tarrages"), cptEntries++);
+ analyser.addError(CrueHelper.emhEmpty("Tarrages"));
} else {
LoiFF loiFF = null;
EvolutionFF evolFF = null;
@@ -207,7 +204,7 @@
loiFF.setEvolutionFF(evolFF);
if (loiFFAbstract == null || loiFFAbstract.Serie == null) {
- analyser.addError(CrueHelper.emhEmpty("Serie"), cptEntries++);
+ analyser.addError(CrueHelper.emhEmpty("Serie"));
} else {
final List<PtEvolutionFF> pointsEvolutionFF = new ArrayList<PtEvolutionFF>();
@@ -366,7 +363,7 @@
if (loiDFPersist == null || loiDFPersist.SerieChronologique == null
|| loiDFPersist.SerieChronologique.listePoints == null
|| loiDFPersist.SerieChronologique.listePoints.size() == 0) {
- analyser.addError(CrueHelper.emhEmpty("SerieChronologique"), cptEntries++);
+ analyser.addError(CrueHelper.emhEmpty("SerieChronologique"));
} else {
PtEvolutionDF ptEvolutionDF = null;
Modified: 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/CrueConverterDPTG.java 2009-04-29 16:41:14 UTC (rev 4693)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDPTG.java 2009-04-29 21:44:22 UTC (rev 4694)
@@ -5,30 +5,10 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.common.CrueResource;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDPTG.BrancheSaintVenant;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDPTG.Frottement;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDPTG.Lit;
+import org.fudaa.dodico.crue.dao.CrueDaoStructureDPTG.*;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDPTG.LitUtile;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDPTG.ProfilCasier;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDPTG.ProfilSection;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDPTG.SectionIdem;
-import org.fudaa.dodico.crue.dao.CrueDaoStructureDPTG.profilDPTG;
-import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
-import org.fudaa.dodico.crue.metier.emh.CatEMHSection;
-import org.fudaa.dodico.crue.metier.emh.CrueData;
-import org.fudaa.dodico.crue.metier.emh.DonFrt;
-import org.fudaa.dodico.crue.metier.emh.DonPrtGeo;
-import org.fudaa.dodico.crue.metier.emh.DonPrtGeoBrancheSaintVenant;
-import org.fudaa.dodico.crue.metier.emh.DonPrtGeoProfilCasier;
-import org.fudaa.dodico.crue.metier.emh.DonPrtGeoProfilCommun;
-import org.fudaa.dodico.crue.metier.emh.DonPrtGeoSectionIdem;
-import org.fudaa.dodico.crue.metier.emh.DonPrtGeoSectionProfil;
-import org.fudaa.dodico.crue.metier.emh.EMH;
-import org.fudaa.dodico.crue.metier.emh.EMHCasierProfil;
-import org.fudaa.dodico.crue.metier.emh.EMHSectionProfil;
-import org.fudaa.dodico.crue.metier.emh.LitNomme;
-import org.fudaa.dodico.crue.metier.emh.LitNumerote;
-import org.fudaa.dodico.crue.metier.emh.PtProfil;
+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.EMHSectionHelper;
@@ -57,15 +37,13 @@
return res;
}
- public static int cptEntries = 1;
-
/**
* Remplit completement la structure persistante a partir des objets donPrtGeo. Optimise le remplissage en listante
* les donn�es emh une seule fois et en forwardant les objets aux bons endroits
*
* @param persistance
* @param data
- * @param listeMessageError
+ * @param analyser
*/
public static void remplirPersistanceDPTG(final CrueDaoDPTG persistance, final CrueData data,
final CtuluAnalyze analyser) {
@@ -80,7 +58,7 @@
persistance.Sections = new ArrayList<SectionIdem>();
if (data.getAllEMH() == null || data.getAllEMH().size() == 0) {
- analyser.addError(CrueResource.getS("DPTG: la liste est vide."), cptEntries++);
+ analyser.addError(CrueResource.getS("DPTG: la liste est vide."));
} else {
for (final EMH emh : data.getAllEMH()) {
if (emh.getDPTG() != null) {
@@ -159,7 +137,7 @@
litPersist.Frot.NomRef = CrueDaoDFRT.SUFFIXE_REF_DFRT + litMetier.getMDonFrt().getNom();
} else {
analyser.addError(CrueResource.getS("LitNumerote du casierProfil" + prtgeo.getNom()
- + ": pas de frottement existant"), cptEntries++);
+ + ": pas de frottement existant"));
}
// -- ajout du lit persistant --//
@@ -167,7 +145,7 @@
}
} else {
- analyser.addError(CrueResource.getS("Profil " + prtgeo.getNom() + ": aucun litNumerotes existant"), cptEntries++);
+ analyser.addError(CrueResource.getS("Profil " + prtgeo.getNom() + ": aucun litNumerotes existant"));
}
// -- ecriture des series pt --//
@@ -179,7 +157,7 @@
profilPersistant.Serie.listePoints.add(buff);
}
} else {
- analyser.addError(CrueResource.getS("Profil " + prtgeo.getNom() + ": aucune s�rie existante"), cptEntries++);
+ analyser.addError(CrueResource.getS("Profil " + prtgeo.getNom() + ": aucune s�rie existante"));
}
// -- ajout du profil persistant --//
@@ -220,7 +198,7 @@
}
} else {
- analyser.addError(CrueResource.getS("Profil " + prtgeo.getNom() + ": aucun litNumerotes existant"), cptEntries++);
+ analyser.addError(CrueResource.getS("Profil " + prtgeo.getNom() + ": aucun litNumerotes existant"));
}
// -- ecriture des series pt --//
@@ -232,7 +210,7 @@
profilPersistant.Serie.listePoints.add(buff);
}
} else {
- analyser.addError(CrueResource.getS("Profil " + prtgeo.getNom() + ": aucune s�rie existante"), cptEntries++);
+ analyser.addError(CrueResource.getS("Profil " + prtgeo.getNom() + ": aucune s�rie existante"));
}
// -- ajout du profil persistant --//
@@ -269,7 +247,7 @@
*/
public static void remplirMetierDPTG(final CrueDaoDPTG persistance, final CrueData data, final CtuluAnalyze analyser) {
if (persistance == null) {
- analyser.addError(CrueResource.getS("DPTG: Aucunes donn�es DPTG."), cptEntries++);
+ analyser.addError(CrueResource.getS("DPTG: Aucunes donn�es DPTG."));
} else {
// -- cas des SectionsProfils --//
remplirSectionsProfilsAvecPersistencaDPTG(persistance.ProfilSections, data.getAllEMH(), data.getFrottements(),
@@ -291,7 +269,7 @@
final List<EMH> data, final List<DonFrt> frottements, final CtuluAnalyze analyser) {
if (listePersistante == null || listePersistante.size() == 0) {
- analyser.addError(CrueResource.getS("DPTG: Aucunes donn�es pour les profils."), cptEnt...
[truncated message content] |
|
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] |
|
From: <de...@us...> - 2009-05-05 19:47:46
|
Revision: 4726
http://fudaa.svn.sourceforge.net/fudaa/?rev=4726&view=rev
Author: deniger
Date: 2009-05-05 19:47:22 +0000 (Tue, 05 May 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/.pmd
trunk/soft/fudaa-crue/fudaa/.pmd
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/CruePersistanceErrorManager.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/AppCrueTest.java
trunk/soft/fudaa-crue/src/main/config/pmd.xml
Modified: trunk/soft/fudaa-crue/.pmd
===================================================================
--- trunk/soft/fudaa-crue/.pmd 2009-05-05 17:49:07 UTC (rev 4725)
+++ trunk/soft/fudaa-crue/.pmd 2009-05-05 19:47:22 UTC (rev 4726)
@@ -224,10 +224,6 @@
<ruleset>Controversial Rules</ruleset>
</rule>
<rule>
- <name>CallSuperInConstructor</name>
- <ruleset>Controversial Rules</ruleset>
- </rule>
- <rule>
<name>UnnecessaryParentheses</name>
<ruleset>Controversial Rules</ruleset>
</rule>
Modified: trunk/soft/fudaa-crue/fudaa/.pmd
===================================================================
--- trunk/soft/fudaa-crue/fudaa/.pmd 2009-05-05 17:49:07 UTC (rev 4725)
+++ trunk/soft/fudaa-crue/fudaa/.pmd 2009-05-05 19:47:22 UTC (rev 4726)
@@ -224,10 +224,6 @@
<ruleset>Controversial Rules</ruleset>
</rule>
<rule>
- <name>CallSuperInConstructor</name>
- <ruleset>Controversial Rules</ruleset>
- </rule>
- <rule>
<name>UnnecessaryParentheses</name>
<ruleset>Controversial Rules</ruleset>
</rule>
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/CruePersistanceErrorManager.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/CruePersistanceErrorManager.java 2009-05-05 17:49:07 UTC (rev 4725)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/CruePersistanceErrorManager.java 2009-05-05 19:47:22 UTC (rev 4726)
@@ -16,6 +16,7 @@
import org.fudaa.ctulu.CtuluDefaultLogFormatter;
import org.fudaa.ctulu.CtuluUI;
import org.fudaa.ctulu.gui.CtuluLibSwing;
+import org.fudaa.dodico.crue.io.common.Messages;
import org.fudaa.ebli.ressource.EbliResource;
import org.fudaa.fudaa.commun.FudaaLib;
import org.jdesktop.swingx.JXTreeTable;
@@ -31,10 +32,10 @@
public CruePersistanceErrorManager() {
super();
- this.analyser_ = new CtuluAnalyze();
+ this.analyser_ = new CtuluAnalyze(Messages.RESOURCE_BUNDLE);
}
- CtuluAnalyze analyser_ = new CtuluAnalyze();
+ CtuluAnalyze analyser_ = new CtuluAnalyze(Messages.RESOURCE_BUNDLE);
public CtuluAnalyze getAnalyser() {
return analyser_;
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java 2009-05-05 17:49:07 UTC (rev 4725)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java 2009-05-05 19:47:22 UTC (rev 4726)
@@ -15,6 +15,10 @@
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
+import com.memoire.bu.*;
+import com.memoire.fu.FuLib;
+import com.memoire.fu.FuLog;
+
import org.fudaa.ctulu.gui.CtuluTaskOperationGUI;
import org.fudaa.dodico.crue.io.CrueFileFormatManager;
import org.fudaa.ebli.ressource.EbliResource;
@@ -24,17 +28,6 @@
import org.fudaa.fudaa.crue.common.CrueCommomImplementation;
import org.fudaa.fudaa.ressource.FudaaResource;
-import com.memoire.bu.BuApplication;
-import com.memoire.bu.BuCommonInterface;
-import com.memoire.bu.BuInformationsSoftware;
-import com.memoire.bu.BuLib;
-import com.memoire.bu.BuPreferences;
-import com.memoire.bu.BuRegistry;
-import com.memoire.bu.BuResource;
-import com.memoire.fu.Fu;
-import com.memoire.fu.FuLib;
-import com.memoire.fu.FuLog;
-
/**
* Launcher de crue.
*
@@ -46,9 +39,9 @@
private static void updateVersion() {
if (BuPreferences.BU.getBooleanProperty("check.update", true)) {
- if (Fu.DEBUG && FuLog.isDebug()) {
- FuLog.debug("FTR: search for updates");
- }
+ // if (Fu.DEBUG && FuLog.isDebug()) {
+ // FuLog.debug("FTR: search for updates");
+ // }
final Thread d = new Thread() {
@Override
public void run() {
@@ -270,21 +263,12 @@
@Override
public void windowClosed(final WindowEvent _e) {
final Window e = _e.getWindow();
- if (Fu.DEBUG && FuLog.isDebug()) {
- FuLog.debug("FTR: close frame " + e.getName());
- }
final boolean isTailClosed = (tail_ != null) && (tail_.getFrame() == e);
if (isTailClosed) {
- if (Fu.DEBUG && FuLog.isDebug()) {
- FuLog.debug("FTR: close tail frame");
- }
tail_ = null;
}
if (supervisor_ != null) {
if (supervisor_.getFrame() == e) {
- if (Fu.DEBUG && FuLog.isDebug()) {
- FuLog.debug("FTR: close supervisor frame");
- }
supervisor_ = null;
} else if (!isTailClosed) {
supervisor_.getFrame().toFront();
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/AppCrueTest.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/AppCrueTest.java 2009-05-05 17:49:07 UTC (rev 4725)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/AppCrueTest.java 2009-05-05 19:47:22 UTC (rev 4726)
@@ -15,6 +15,7 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.gui.CtuluDialogPanel;
import org.fudaa.dodico.crue.io.TestCrueContrat;
+import org.fudaa.dodico.crue.io.common.Messages;
import org.fudaa.dodico.crue.io.dao.ValidatorXml;
import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.crue.CruePersistanceErrorManager;
@@ -180,7 +181,7 @@
final String key = (String) combo.getSelectedItem();
final String validateur = mapValidation.get(key);
- final CtuluAnalyze listeMessageError = new CtuluAnalyze();
+ final CtuluAnalyze listeMessageError = new CtuluAnalyze(Messages.RESOURCE_BUNDLE);
final File fichiertovalidate = new File(field.getText());
listeMessageError.setDesc(FudaaLib.getS(" Analyse du Fichier " + fichiertovalidate.getName()));
Modified: trunk/soft/fudaa-crue/src/main/config/pmd.xml
===================================================================
--- trunk/soft/fudaa-crue/src/main/config/pmd.xml 2009-05-05 17:49:07 UTC (rev 4725)
+++ trunk/soft/fudaa-crue/src/main/config/pmd.xml 2009-05-05 19:47:22 UTC (rev 4726)
@@ -26,9 +26,7 @@
<rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>
<rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>
<rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>
- <rule ref="rulesets/basic.xml/BooleanInstantiation">
- <priority>2</priority>
- </rule>
+ <rule ref="rulesets/basic.xml/BooleanInstantiation"/>
<rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>
<rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>
<rule ref="rulesets/basic.xml/UselessOverridingMethod"/>
@@ -66,7 +64,6 @@
<rule ref="rulesets/controversial.xml/AssignmentInOperand"/>
<rule ref="rulesets/controversial.xml/DontImportSun"/>
<rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>
- <rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>
<rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>
<rule ref="rulesets/controversial.xml/DefaultPackage">
<priority>5</priority>
@@ -74,7 +71,6 @@
<rule ref="rulesets/controversial.xml/BooleanInversion">
<priority>5</priority>
</rule>
- <rule ref="rulesets/controversial.xml/DataflowAnomalyAnalysis"/>
<rule ref="rulesets/controversial.xml/AvoidUsingShortType"/>
<rule ref="rulesets/controversial.xml/AvoidUsingVolatile"/>
<rule ref="rulesets/controversial.xml/AvoidUsingNativeCode"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2009-05-07 00:00:08
|
Revision: 4730
http://fudaa.svn.sourceforge.net/fudaa/?rev=4730&view=rev
Author: hadouxad
Date: 2009-05-06 23:59:46 +0000 (Wed, 06 May 2009)
Log Message:
-----------
IHMS
Modified Paths:
--------------
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/metier/EMHScenario.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/adrienMessages.properties
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueCommomImplementation.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/FCrueResource.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueApplicationManager.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueSupervisorImplementation.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueProjet.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/AppCrueTest.java
Added Paths:
-----------
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueModeleBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueRunBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueScenarioBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueSousModeleBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueTreeProject.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ChargerScenario.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueComparaisonScenarioFille.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CruePanelFicheScenario.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CruePersistanceErrorManager.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueScenarioTreeManagerFille.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CruetransformationCrue9Fille.java
trunk/soft/fudaa-crue/fudaa/src/main/java/view/
Removed Paths:
-------------
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueModeleBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueScenarioBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueSousModeleBuilder.java
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-06 17:51:00 UTC (rev 4729)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java 2009-05-06 23:59:46 UTC (rev 4730)
@@ -86,7 +86,7 @@
new CrueXmlReaderWriterImpl<CrueDaoDRSO, CrueData>(CrueHelper.DRSO, new CrueConverterDRSO(),
new CrueDaoStructureDRSO()));
- private final static Crue10FileFormat<EMHproject> ETU = new Crue10FileFormat<EMHproject>(
+ private final static Crue10FileFormat<EMHproject> ETU = new Crue10FileFormat<EMHproject>(CrueHelper.ETU,
new CrueXmlReaderWriterImpl<CrueDaoETU, EMHproject>(CrueHelper.ETU, new CrueConverterETU(),
new CrueDaoStructureETU()));
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHScenario.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHScenario.java 2009-05-06 17:51:00 UTC (rev 4729)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHScenario.java 2009-05-06 23:59:46 UTC (rev 4730)
@@ -39,6 +39,14 @@
*/
protected List<FichierCrue> listeFichiersResultatsScenario_;
+ public List<FichierCrue> getListeFichiersResultatsScenario() {
+ return listeFichiersResultatsScenario_;
+ }
+
+ public void setListeFichiersResultatsScenario(List<FichierCrue> listeFichiersResultatsScenario) {
+ this.listeFichiersResultatsScenario_ = listeFichiersResultatsScenario;
+ }
+
/**
* Ajoute un Run .
*
@@ -46,7 +54,9 @@
* @return
*/
public boolean addRunToScenario(final EMHRun run) {
- if (listeRuns_ == null) listeRuns_ = new ArrayList<EMHRun>();
+ if (listeRuns_ == null) {
+ listeRuns_ = new ArrayList<EMHRun>();
+ }
return listeRuns_.add(run);
}
@@ -62,7 +72,7 @@
}
/**
- * Retourne true si le fichier existe en base r�f�renc� par son id.
+ * Retourne true si le fichier existe en base reference par son id.
*
* @param id
* @return
@@ -89,7 +99,9 @@
* @return
*/
public boolean addFichierDonneesToScenario(final FichierCrue fichier) {
- if (listeFichiersResultatsScenario_ == null) listeFichiersResultatsScenario_ = new ArrayList<FichierCrue>();
+ if (listeFichiersResultatsScenario_ == null) {
+ listeFichiersResultatsScenario_ = new ArrayList<FichierCrue>();
+ }
return listeFichiersResultatsScenario_.add(fichier);
}
@@ -104,7 +116,9 @@
* @return
*/
public boolean addModeleDonneesToScenario(final EMHModeleBase modele) {
- if (gestionModele_ == null) gestionModele_ = new EMHModeleEnchainement();
+ if (gestionModele_ == null) {
+ gestionModele_ = new EMHModeleEnchainement();
+ }
return gestionModele_.ajouteModele(modele);
}
@@ -120,8 +134,10 @@
* @return
*/
public static EMHScenario findById(final String nomRef, final List<EMHScenario> listeFiles) {
- if (listeFiles != null) for (final EMHScenario f : listeFiles) {
- if (f.id_.equals(nomRef)) return f;
+ if (listeFiles != null) {
+ for (final EMHScenario f : listeFiles) {
+ if (f.id_.equals(nomRef)) { return f; }
+ }
}
return null;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/adrienMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/adrienMessages.properties 2009-05-06 17:51:00 UTC (rev 4729)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/adrienMessages.properties 2009-05-06 23:59:46 UTC (rev 4730)
@@ -4,4 +4,6 @@
io.crue9.nametoolong.error = Erreur le nom {nom} est trop long pour la taille autorisee des lignes de format Crue 9. Le nom a ete concatene.
io.crue9.noeudAmontvide.error = Erreur, il n'existe pas de noeud amont pour la branche {nom}
io.crue9.noeudAvalvide.error = Erreur, il n'existe pas de noeud aval pour la branche {nom}
-io.crue9.brancheNotSupportedInCrue9.error = Erreur, la branche n'est pas support\xE9 au format Crue 9, elle ne sera pas prise en compte.
\ No newline at end of file
+io.crue9.brancheNotSupportedInCrue9.error = Erreur, la branche n'est pas support\xE9 au format Crue 9, elle ne sera pas prise en compte.
+io.etu.typeNotDefined = Erreur, le type du sc\xE9nario (version Crue) est introuvable
+
Copied: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueModeleBuilder.java (from rev 4697, trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueModeleBuilder.java)
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueModeleBuilder.java (rev 0)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueModeleBuilder.java 2009-05-06 23:59:46 UTC (rev 4730)
@@ -0,0 +1,79 @@
+package org.fudaa.fudaa.crue.builder;
+
+import java.util.List;
+
+import javax.swing.BorderFactory;
+import javax.swing.DefaultListModel;
+
+import org.fudaa.dodico.crue.metier.EMHModeleBase;
+import org.fudaa.dodico.crue.metier.FichierCrue;
+import org.fudaa.ebli.visuallibrary.graphe.GrapheCellRenderer;
+import org.fudaa.fudaa.crue.common.FCrueResource;
+
+import com.memoire.bu.BuIcon;
+import com.memoire.bu.BuLabel;
+import com.memoire.bu.BuList;
+
+/**
+ * G�re un modele crue. Un modele contient plusieurs sous mod�le.
+ *
+ * @author Adrien Hadoux
+ */
+public class CrueModeleBuilder {
+
+ /**
+ * Icone propre aux scenarios
+ */
+ public static BuIcon iconeModele_ = FCrueResource.CRUE.getIcon("crystal22_toutselectionner.png");
+
+ /**
+ * Construit une bu list avec l'ensemble des scenarios du logiciel
+ *
+ * @param baseScenarios
+ * @return
+ */
+ public static BuList buildListModele(final List<EMHModeleBase> baseModeles, final String title) {
+ final DefaultListModel model = new DefaultListModel();
+ if (baseModeles != null) {
+ for (final EMHModeleBase modele : baseModeles) {
+ final BuLabel label = new BuLabel(iconeModele_);
+ label.setText(modele.getId());
+ model.addElement(label);
+ }
+ }
+ final BuList liste = new BuList(model);
+ liste.setCellRenderer(new GrapheCellRenderer());
+ liste.setBorder(BorderFactory.createTitledBorder(title));
+ return liste;
+ }
+
+ /**
+ * Construit une bu list avec l'ensemble des fichiers
+ *
+ * @param baseScenarios
+ * @return
+ */
+ public static BuList buildListFichiers(final List<FichierCrue> baseModeles, final String title) {
+ final DefaultListModel model = new DefaultListModel();
+ if (baseModeles != null) {
+ for (final FichierCrue modele : baseModeles) {
+ final BuLabel label = new BuLabel(iconeModele_);
+ label.setText(modele.getId());
+ model.addElement(label);
+ }
+ }
+ final BuList liste = new BuList(model);
+ liste.setCellRenderer(new GrapheCellRenderer());
+ liste.setBorder(BorderFactory.createTitledBorder(title));
+ return liste;
+ }
+
+ public static BuList buildListModele(final List<EMHModeleBase> baseModeles) {
+ return buildListModele(baseModeles, FCrueResource.getS("Modeles disponibles"));
+ }
+
+ public static BuList buildListSousModele(final List<EMHModeleBase> baseModeles) {
+ return buildListModele(baseModeles, FCrueResource.getS("Sous Modeles disponibles"));
+ }
+
+}
Property changes on: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueModeleBuilder.java
___________________________________________________________________
Added: svn:mergeinfo
+
Added: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueRunBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueRunBuilder.java (rev 0)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueRunBuilder.java 2009-05-06 23:59:46 UTC (rev 4730)
@@ -0,0 +1,46 @@
+package org.fudaa.fudaa.crue.builder;
+
+import org.fudaa.dodico.crue.metier.EMHModeleRun;
+import org.fudaa.dodico.crue.metier.EMHRun;
+import org.fudaa.dodico.crue.metier.EMHScenario;
+import org.jdesktop.swingx.treetable.DefaultMutableTreeTableNode;
+import org.jdesktop.swingx.treetable.DefaultTreeTableModel;
+
+/**
+ * Builder de composants graphiques pour le tree de crue.
+ *
+ * @author Adrien Hadoux
+ */
+public class CrueRunBuilder {
+
+ /**
+ * Construitle tree des runs a partir du scenario donné. les runs affichent les modeles et pour chaque modele les
+ * fichiers utilisés.
+ *
+ * @param baseScenarios
+ * @return modele du tree.
+ */
+ public static DefaultTreeTableModel buildTreeRun(EMHScenario scenario) {
+ final DefaultMutableTreeTableNode root = new DefaultMutableTreeTableNode("root");
+ if (scenario.getListeRuns() != null) {
+ for (final EMHRun run : scenario.getListeRuns()) {
+ DefaultMutableTreeTableNode nodeRun = new DefaultMutableTreeTableNode(run.getId());
+ root.add(nodeRun);
+
+ // -- on ajoute les runs associés au scénario--//
+
+ if (run.getListeModelesRuns() != null) {
+ for (EMHModeleRun modeleRun : run.getListeModelesRuns()) {
+ nodeRun.add(new DefaultMutableTreeTableNode(modeleRun.getModeleRun().getId()));
+
+ }
+ }
+
+ }
+ }
+ DefaultTreeTableModel modeleTree = new DefaultTreeTableModel();
+ modeleTree.setRoot(root);
+
+ return modeleTree;
+ }
+}
Copied: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueScenarioBuilder.java (from rev 4697, trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueScenarioBuilder.java)
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueScenarioBuilder.java (rev 0)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueScenarioBuilder.java 2009-05-06 23:59:46 UTC (rev 4730)
@@ -0,0 +1,121 @@
+package org.fudaa.fudaa.crue.builder;
+
+import java.util.List;
+
+import javax.swing.BorderFactory;
+import javax.swing.DefaultListModel;
+
+import org.fudaa.dodico.crue.metier.EMHModeleRun;
+import org.fudaa.dodico.crue.metier.EMHRun;
+import org.fudaa.dodico.crue.metier.EMHScenario;
+import org.fudaa.dodico.crue.metier.EMHproject;
+import org.fudaa.ebli.visuallibrary.graphe.GrapheCellRenderer;
+import org.fudaa.fudaa.crue.builder.CrueTreeProject.TreeNodeModeleRun;
+import org.fudaa.fudaa.crue.builder.CrueTreeProject.TreeNodeRun;
+import org.fudaa.fudaa.crue.builder.CrueTreeProject.TreeNodeRunCourant;
+import org.fudaa.fudaa.crue.builder.CrueTreeProject.TreeNodeScenario;
+import org.fudaa.fudaa.crue.builder.CrueTreeProject.TreeNodeScenarioCourant;
+import org.fudaa.fudaa.crue.builder.CrueTreeProject.TreeScenarioModel;
+import org.fudaa.fudaa.crue.common.FCrueResource;
+import org.jdesktop.swingx.treetable.DefaultMutableTreeTableNode;
+
+import com.memoire.bu.BuLabel;
+import com.memoire.bu.BuList;
+
+/**
+ * G�re les interfaces relative � un sc�nario Crue. G�re le lien entre un EMHScenario m�tier et l'interface propos� par
+ * les actions sc�narios.
+ *
+ * @author Adrien Hadoux
+ */
+public class CrueScenarioBuilder {
+
+ /**
+ * Construit une bu list avec l'ensemble des sc�narios du logiciel
+ *
+ * @param baseScenarios
+ * @return
+ */
+ public static BuList buildListScenario(final List<EMHScenario> baseScenarios) {
+ final DefaultListModel model = new DefaultListModel();
+ if (baseScenarios != null) {
+ for (final EMHScenario scenario : baseScenarios) {
+ final BuLabel label = new BuLabel(CrueTreeProject.iconeScenario_);
+ label.setText(scenario.getId());
+ model.addElement(label);
+ }
+ }
+ final BuList liste = new BuList(model);
+ liste.setCellRenderer(new GrapheCellRenderer());
+ liste.setBorder(BorderFactory.createTitledBorder(FCrueResource.getS("Scénarios disponibles")));
+ return liste;
+ }
+
+ /**
+ * Construit une bu list avec l'ensemble des sc�narios du logiciel
+ *
+ * @param baseScenarios
+ * @return modele du tree.
+ */
+ public static TreeScenarioModel buildTreeScenario(EMHproject projet) {
+ final DefaultMutableTreeTableNode root = new DefaultMutableTreeTableNode("root");
+ if (projet.getListeScenarios() != null) {
+ for (final EMHScenario scenario : projet.getListeScenarios()) {
+ TreeNodeScenario nodeScenar = new TreeNodeScenario(scenario);
+ if (projet.getScenarioCourant() != null && projet.getScenarioCourant() == scenario) {
+ nodeScenar = new TreeNodeScenarioCourant(scenario);
+ root.add(nodeScenar);
+ } else {
+
+ root.add(nodeScenar);
+ }
+ // -- on ajoute les runs associés au scénario--//
+
+ if (scenario.getListeRuns() != null) {
+ for (EMHRun run : scenario.getListeRuns()) {
+ TreeNodeRun nodeRun = new TreeNodeRun(run);
+
+ if (scenario.getRunCourant() != null && scenario.getRunCourant() == run) {
+ nodeRun = new TreeNodeRunCourant(run);
+ }
+
+ nodeScenar.add(nodeRun);
+
+ if (run.getListeModelesRuns() != null) {
+ for (EMHModeleRun modele : run.getListeModelesRuns()) {
+ TreeNodeModeleRun nodemodele = new TreeNodeModeleRun(modele);
+ nodeRun.add(nodemodele);
+ }
+ }
+
+ }
+ }
+
+ }
+ }
+ TreeScenarioModel modeleTree = new TreeScenarioModel(projet);
+ modeleTree.setRoot(root);
+
+ return modeleTree;
+ }
+
+ /**
+ * G�n�re l'encart du scenario courant
+ *
+ * @param scenarCourant
+ * @return
+ */
+ public static BuList buildListScenarioCourant(final EMHScenario scenarCourant) {
+ final DefaultListModel model = new DefaultListModel();
+ if (scenarCourant == null) { return null; }
+ final BuLabel label = new BuLabel(CrueTreeProject.iconeScenario_Courant);
+ label.setText(scenarCourant.getId());
+ model.addElement(label);
+
+ final BuList liste = new BuList(model);
+ liste.setCellRenderer(new GrapheCellRenderer());
+ liste.setBorder(BorderFactory.createTitledBorder(FCrueResource.getS("Scénario courant")));
+ return liste;
+ }
+
+}
Property changes on: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueScenarioBuilder.java
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueSousModeleBuilder.java (from rev 4697, trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueSousModeleBuilder.java)
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueSousModeleBuilder.java (rev 0)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueSousModeleBuilder.java 2009-05-06 23:59:46 UTC (rev 4730)
@@ -0,0 +1,10 @@
+package org.fudaa.fudaa.crue.builder;
+
+/**
+ * G�re un sous mod�le crue.
+ *
+ * @author Adrien Hadoux
+ */
+public class CrueSousModeleBuilder {
+
+}
Property changes on: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueSousModeleBuilder.java
___________________________________________________________________
Added: svn:mergeinfo
+
Added: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueTreeProject.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueTreeProject.java (rev 0)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueTreeProject.java 2009-05-06 23:59:46 UTC (rev 4730)
@@ -0,0 +1,255 @@
+package org.fudaa.fudaa.crue.builder;
+
+import java.awt.Component;
+
+import javax.swing.JTree;
+import javax.swing.tree.DefaultTreeCellRenderer;
+
+import org.fudaa.dodico.crue.metier.EMHModeleRun;
+import org.fudaa.dodico.crue.metier.EMHRun;
+import org.fudaa.dodico.crue.metier.EMHScenario;
+import org.fudaa.dodico.crue.metier.EMHproject;
+import org.fudaa.fudaa.crue.common.FCrueResource;
+import org.jdesktop.swingx.treetable.DefaultMutableTreeTableNode;
+import org.jdesktop.swingx.treetable.DefaultTreeTableModel;
+
+import com.memoire.bu.BuIcon;
+
+/**
+ * Gere les composants du tree principal de l'appli.
+ *
+ * @author Adrien Hadoux
+ */
+public class CrueTreeProject {
+
+ public final static String unknowInfo = "N/A";
+
+ /**
+ * Node du tree reservé aux objets de type scenario = { "Scenario", "Type", "Commentaire Scenario",
+ * "Date modification" };
+ *
+ * @author Adrien Hadoux
+ */
+ public static class TreeNodeScenario extends DefaultMutableTreeTableNode {
+ EMHScenario s;
+
+ /**
+ * @param scenario
+ */
+ public TreeNodeScenario(EMHScenario scenario) {
+ super(scenario);
+ s = scenario;
+
+ }
+
+ @Override
+ public Object getValueAt(int column) {
+ if (column == 0) {
+ return s.getId();
+ } else if (column == 1) {
+ if (s.getInfosVersions() != null && s.getInfosVersions().getType() != null) {
+ return s.getInfosVersions().getType();
+ } else {
+ return unknowInfo;
+ }
+ } else if (column == 2) {
+ if (s.getInfosVersions() != null && s.getInfosVersions().getCommentaire() != null) {
+ return s.getInfosVersions().getCommentaire();
+ } else {
+ return unknowInfo;
+ }
+ } else if (column == 3) {
+ if (s.getInfosVersions() != null && s.getInfosVersions().getDateDerniereModif() != null
+ && s.getInfosVersions().getAuteurDerniereModif() != null) {
+ return s.getInfosVersions().getDateDerniereModif() + FCrueResource.getS("par") + " "
+ + s.getInfosVersions().getAuteurDerniereModif();
+ } else {
+ return unknowInfo;
+ }
+ } else {
+ return "";
+ }
+
+ }
+ }
+
+ /**
+ * Node du tree reservé aux objets de type scenario courant
+ *
+ * @author Adrien Hadoux
+ */
+ public static class TreeNodeScenarioCourant extends TreeNodeScenario {
+ /**
+ * @param scenario
+ */
+ public TreeNodeScenarioCourant(EMHScenario scenario) {
+ super(scenario);
+
+ }
+
+ }
+
+ /**
+ * Node du tree reservé aux objets de type run
+ *
+ * @author Adrien Hadoux
+ */
+ public static class TreeNodeRun extends DefaultMutableTreeTableNode {
+ EMHRun r;
+
+ public TreeNodeRun(EMHRun run) {
+ super(run);
+ r = run;
+ }
+
+ @Override
+ public Object getValueAt(int column) {
+ if (column == 0) {
+ return r.getId();
+ } else {
+ return "";
+ }
+ }
+ }
+
+ /**
+ * Node du tree reservé aux objets de type run courant
+ *
+ * @author Adrien Hadoux
+ */
+ public static class TreeNodeRunCourant extends TreeNodeRun {
+ public TreeNodeRunCourant(EMHRun run) {
+ super(run);
+ }
+ }
+
+ /**
+ * Node du tree reservé aux objets de type scenario
+ *
+ * @author Adrien Hadoux
+ */
+ public static class TreeNodeModeleRun extends DefaultMutableTreeTableNode {
+ public TreeNodeModeleRun(EMHModeleRun runModele) {
+ super(runModele);
+ }
+ }
+
+ /**
+ * Icone propre aux scenarios
+ */
+ public static BuIcon iconeScenario_ = FCrueResource.CRUE.getIcon("crystal_preference.png");
+ public static BuIcon iconeScenario_Courant = FCrueResource.CRUE.getIcon("crystal_oui.png");
+ public static BuIcon iconeRun_ = FCrueResource.CRUE.getIcon("crystal_tache.png");
+ public static BuIcon iconeRun_Courant = FCrueResource.CRUE.getIcon("crystal_oui.png");
+
+ /**
+ * Renderer de l'arbre des scenarios.
+ *
+ * @author Adrien Hadoux
+ */
+ public static class ScenarioTreeRenderer extends DefaultTreeCellRenderer {
+ /**
+ *
+ */
+ public ScenarioTreeRenderer() {
+
+ }
+
+ @Override
+ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded,
+ boolean leaf, int row, boolean hasFocus) {
+
+ super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
+ if (value instanceof TreeNodeScenarioCourant) {
+ setIcon(iconeScenario_Courant);
+ setToolTipText("Scénario");
+
+ } else if (value instanceof TreeNodeScenario) {
+ setIcon(iconeScenario_);
+ setToolTipText("Scénario");
+ } else if (value instanceof TreeNodeRunCourant) {
+ setIcon(iconeRun_Courant);
+ } else if (value instanceof TreeNodeRun) {
+ setIcon(iconeRun_);
+ }
+ if (value instanceof DefaultMutableTreeTableNode) {
+ setText(((DefaultMutableTreeTableNode) value).getValueAt(0).toString());
+ }
+ return this;
+ }
+
+ }
+
+ /**
+ * Modele de tree pour le projet CNR.
+ *
+ * @author Adrien Hadoux
+ */
+ public static class TreeScenarioModel extends DefaultTreeTableModel {
+ String[] titre_;
+ EMHproject projet;
+
+ @Override
+ public Class<?> getColumnClass(final int columnIndex) {
+
+ switch (columnIndex) {
+ case 0:
+ return String.class;
+ case 1:
+ return String.class;
+ }
+ return null;
+ }
+
+ // -- data correspondant au x donné --//
+ double[] dataY_ = new double[0];
+
+ /**
+ * @param p
+ */
+ public TreeScenarioModel(EMHproject p) {
+ String[] val = { "Scenario", "Type", "Commentaire Scenario", "Date modification" };
+ titre_ = val;
+ projet = p;
+ }
+
+ @Override
+ public int getColumnCount() {
+
+ return titre_.length;
+ }
+
+ @Override
+ public boolean isCellEditable(Object _node, int _column) {
+ return false;
+ }
+
+ @Override
+ public String getColumnName(int _columnIndex) {
+ return titre_[_columnIndex];
+ }
+
+ public int getRowCount() {
+ return projet.getListeScenarios().size();
+
+ }
+
+ @Override
+ public Object getValueAt(Object node, int column) {
+ Object res = new DefaultMutableTreeTableNode("n/a");
+ if (node instanceof DefaultMutableTreeTableNode) {
+
+ return ((DefaultMutableTreeTableNode) node).getValueAt(column);
+
+ }
+ return res;
+ }
+
+ public DefaultMutableTreeTableNode getTreeNode(int i) {
+ return (DefaultMutableTreeTableNode) getRoot().getChildAt(i);
+
+ }
+
+ }
+
+}
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueCommomImplementation.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueCommomImplementation.java 2009-05-06 17:51:00 UTC (rev 4729)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueCommomImplementation.java 2009-05-06 23:59:46 UTC (rev 4730)
@@ -9,16 +9,23 @@
import org.fudaa.fudaa.commun.FudaaHelpPDFViewer;
import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation;
+import org.fudaa.fudaa.crue.builder.CrueModeleBuilder;
+import org.fudaa.fudaa.crue.builder.CrueScenarioBuilder;
import org.fudaa.fudaa.crue.explorer.CrueLauncher;
-import org.fudaa.fudaa.crue.projet.CrueModeleBuilder;
import org.fudaa.fudaa.crue.projet.CrueProjet;
-import org.fudaa.fudaa.crue.projet.CrueScenarioBuilder;
+import org.fudaa.fudaa.crue.view.CrueComparaisonScenarioFille;
+import org.fudaa.fudaa.crue.view.CrueScenarioTreeManagerFille;
+import org.fudaa.fudaa.crue.view.CruetransformationCrue9Fille;
+import org.jdesktop.swingx.JXTreeTable;
import com.memoire.bu.BuColumn;
import com.memoire.bu.BuInformationsDocument;
import com.memoire.bu.BuInformationsSoftware;
+import com.memoire.bu.BuInternalFrame;
import com.memoire.bu.BuList;
import com.memoire.bu.BuMainPanel;
+import com.memoire.bu.BuMenu;
+import com.memoire.bu.BuMenuBar;
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuPreferences;
import com.memoire.bu.BuPrinter;
@@ -41,7 +48,13 @@
protected BuList scenarioCourant_ = null;
protected BuList listeModeles_ = null;
protected BuList listeSousModeles_ = null;
+
/**
+ * Tree contenant l'arborescence du projet.
+ */
+ protected JXTreeTable treeScenario = null;
+
+ /**
* Projet Crue.
*/
protected CrueProjet crueProjet_;
@@ -51,7 +64,7 @@
idCrue_.name = "FUDAA CRUE";
idCrue_.version = "0.1";
idCrue_.organization = "GENESIS";
- idCrue_.author = "Fr\xE9d\xE9ric Deniger, Adrien Hadoux";
+ idCrue_.author = "Frederic Deniger, Adrien Hadoux";
idCrue_.contact = "a.h...@ge...";
idCrue_.date = FuLib.date();
BuPrinter.INFO_LOG = CrueLauncher.infoCrue_;
@@ -68,7 +81,10 @@
}
/**
- * Initialisation de l'interface avec les donn\xE9es m\xE9tier
+ * Initialisation de l'interface avec les donnees metier CNR.
+ *
+ * @param project
+ * @param f
*/
public void init(final EMHproject project, final File f) {
@@ -79,6 +95,7 @@
}
if (project.getListeScenarios() != null) {
+
listeScenarios_ = CrueScenarioBuilder.buildListScenario(project.getListeScenarios());
}
@@ -94,6 +111,9 @@
}
+ // -- creation de la barre de menu des fonctionnalités --//
+ final BuMenuBar mb = getMainMenuBar();
+ mb.add(buildProjectMenu());
// -- construction de'application --//
rebuildApplication(f);
@@ -106,6 +126,35 @@
}
+ /**
+ * Construit le menu de base du projet CNR.
+ *
+ * @param project
+ * @return
+ */
+ private BuMenu buildProjectMenu() {
+ BuMenu menu = new BuMenu(BuResource.BU.getString("Projet"), "MENUPROJET");
+ menu.addSeparator(FCrueResource.getS("Projet"));
+ menu.addMenuItem(FCrueResource.getS("Etude"), "GESTIONETUDE", FCrueResource.CRUE.getIcon("crystal_message.png"),
+ this);
+ menu.addMenuItem(FCrueResource.getS("Gestion scenarios"), "GESTIONSCENARIOS", FCrueResource.CRUE
+ .getIcon("crystal_document.png"), this);
+
+ menu.addSeparator(FCrueResource.getS("Operations"));
+ menu.addMenuItem(FCrueResource.getS("Comparaison"), "GESTIONCOMPARAISON", FCrueResource.CRUE
+ .getIcon("crystal_controler.png"), this);
+
+ menu.addMenuItem(FCrueResource.getS("Crue 9 <=> Crue 10"), "GESTIONTRANSFORMATION", FCrueResource.CRUE
+ .getIcon("crystal_controler.png"), this);
+
+ return menu;
+ }
+
+ /**
+ * Reconstruit l'application a partir du fichier etu choisi.
+ *
+ * @param fichierEtu
+ */
public void rebuildApplication(final File fichierEtu) {
getMainPanel().getRightColumn().removeAll();
this.setTitle(fichierEtu.getAbsolutePath());
@@ -129,36 +178,59 @@
lc.setBorder(null);
// rc.setBorder(new EmptyBorder(0,2,0,2));
taches_ = new BuTaskView();
- taches_.setToolTipText(FudaaLib.getS("Les t\xE2ches en cours"));// a revoir
+ taches_.setToolTipText(FudaaLib.getS("Les taches en cours"));// a revoir
final BuScrollPane sp = new BuScrollPane(taches_);
sp.setPreferredSize(new Dimension(150, 80));
- sp.setToolTipText(FudaaLib.getS("Les t\xE2ches en cours"));
- rc.addToggledComponent(BuResource.BU.getString("T\xE2ches"), "TOGGLE_TACHE", BuResource.BU.getToolIcon("tache"), sp,
- true, this).setToolTipText(FudaaLib.getS("Cacher/Afficher les t\xE2ches"));
+ sp.setToolTipText(FudaaLib.getS("Les taches en cours"));
+ rc.addToggledComponent(BuResource.BU.getString("Taches"), "TOGGLE_TACHE", BuResource.BU.getToolIcon("tache"), sp,
+ true, this).setToolTipText(FudaaLib.getS("Cacher/Afficher les taches"));
mp.setTaskView(taches_);
}
/**
* Re-Construit le panel de droite (ou gauche) avec les listes remplies de scenario, modele et sous modeles dispos.
*/
+ // TODO laisser le choix du visuel a la CNR et afficher le contenu qui leur convient le mieux.
public void rebuildPanelRight() {
// -- panel scenario --//
- final BuPanel panelScenario = new BuPanel(new GridLayout(2, 1, 2, 5));
- if (scenarioCourant_ != null) panelScenario.add(scenarioCourant_);
- if (listeScenarios_ != null) panelScenario.add(listeScenarios_);
+ final BuPanel panelScenario = new BuPanel(new GridLayout(2, 1, 2, 5) /* new BorderLayout() */);
+ if (crueProjet_ != null) {
+ scenarioCourant_ = CrueScenarioBuilder.buildListScenarioCourant(crueProjet_.getProject().getScenarioCourant());
+ }
+ panelScenario.add(scenarioCourant_);
+ if (listeScenarios_ != null) {
+ panelScenario.add(listeScenarios_);
+ }
+ // if (listeScenarios_ != null) {
+ // // -- affichage du panel de gauche --//
+ // // final BuPanel panelTreeScenario = new BuPanel(new BorderLayout());
+ // panelScenario.add(treeScenario.getTableHeader(), BorderLayout.NORTH);
+ // panelScenario.add(treeScenario, BorderLayout.CENTER);
+ //
+ // // panelScenario.add(listeScenarios_);
+ // }
+
final BuPanel panelModeles = new BuPanel(new GridLayout(2, 1, 2, 5));
- if (listeModeles_ != null) panelModeles.add(listeModeles_);
- if (listeSousModeles_ != null) panelModeles.add(listeSousModeles_);
+ if (listeModeles_ != null) {
+ panelModeles.add(listeModeles_);
+ }
+ if (listeSousModeles_ != null) {
+ panelModeles.add(listeSousModeles_);
+ }
// -- assemblages des informations sur le panel de composants--//
- getMainPanel().getRightColumn().addToggledComponent(BuResource.BU.getString("Sc\xE9narios"), "SCENARIOS",
+ getMainPanel().getRightColumn().addToggledComponent(BuResource.BU.getString("Scenarios"), "SCENARIOS",
panelScenario, this);
- getMainPanel().getRightColumn().addToggledComponent(BuResource.BU.getString("Mod\xE8les"), "MODELES", panelModeles,
+ getMainPanel().getRightColumn().addToggledComponent(BuResource.BU.getString("Modeles"), "MODELES", panelModeles,
this);
+ // getMainPanel().getRightColumn().addToggledComponent(BuResource.BU.getString("Vue Scenarios"), "SCENARIOSTREE",
+ // panelTreeScenario, this);
+
getMainPanel().getRightColumn().revalidate();
+ // getMainPanel().getLeftColumn().revalidate();
}
@Override
@@ -199,6 +271,15 @@
this.addInternalFrame(frameHelpPDF_);
}
+ public CrueScenarioTreeManagerFille scenarioFille = null;
+
+ public void addScenarioManagerFille() {
+ if (scenarioFille == null) {
+ scenarioFille = new CrueScenarioTreeManagerFille(crueProjet_);
+ }
+ this.addInternalFrame(scenarioFille);
+ }
+
@Override
public void actionPerformed(final ActionEvent _evt) {
final String action = _evt.getActionCommand();
@@ -207,10 +288,27 @@
displayHelpPDF(getInformationsSoftware().baseManUrl());
} else if (action.equals("AIDE_INDEX")) {
displayHelp(getInformationsSoftware().baseManUrl());
- } else {
+ } else
+
+ if (action.equals("GESTIONSCENARIOS")) {
+ // -- ouverture de l'interface de gestion des scenarios --//
+ addScenarioManagerFille();
+ } else if (action.equals("GESTIONETUDE")) {
+
+ BuInternalFrame inframe = new BuInternalFrame();
+ inframe.getContentPane().add(crueProjet_.createInFosProjectPanel());
+ inframe.setTitle(FCrueResource.getS("Infos Etude"));
+ inframe.setSize(400, 150);
+ this.addInternalFrame(inframe);
+ } else if (action.equals("GESTIONCOMPARAISON")) {
+ this.addInternalFrame(new CrueComparaisonScenarioFille());
+ } else if (action.equals("GESTIONTRANSFORMATION")) {
+ this.addInternalFrame(new CruetransformationCrue9Fille(crueProjet_));
+ }
+
+ {
super.actionPerformed(_evt);
}
}
-
}
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/FCrueResource.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/FCrueResource.java 2009-05-06 17:51:00 UTC (rev 4729)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/FCrueResource.java 2009-05-06 23:59:46 UTC (rev 4730)
@@ -41,7 +41,7 @@
@Override
public BuIcon getIcon(final String val) {
- return FCrueResource.CRUE.getIcon(val);
+ return BuResource.BU.getIcon(val);
}
// public static String getMeshName() {
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueApplicationManager.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueApplicationManager.java 2009-05-06 17:51:00 UTC (rev 4729)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueApplicationManager.java 2009-05-06 23:59:46 UTC (rev 4730)
@@ -479,7 +479,7 @@
*/
public boolean isCrueFormat(final File _file) {
final CustomFileFormat format = findCrueFormat(_file);
- return format != null;
+ return format != null || _file.getName().contains("etu.xml");
}
/**
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueSupervisorImplementation.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueSupervisorImplementation.java 2009-05-06 17:51:00 UTC (rev 4729)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueSupervisorImplementation.java 2009-05-06 23:59:46 UTC (rev 4730)
@@ -82,7 +82,7 @@
r.addMenuItem(BuResource.BU.getString("Licence..."), "TEXTE_LICENCE", true);
r.addSeparator();
r.addMenuItem(BuResource.BU.getString("Site WWW"), "WWW_ACCUEIL", true);
- r.addMenuItem(BuResource.BU.getString("Mise \xE0 jour"), "MAJ", true);
+ r.addMenuItem(BuResource.BU.getString("Mise � jour"), "MAJ", true);
// TrLib.addJavawsForJnlp(r);
r.addMenuItem(FCrueResource.getS("Soumettre un commentaire"), "SEND_COMMENT", BuResource.BU.getIcon("envoyer"),
true);
@@ -119,7 +119,7 @@
public BuMenu buildEdition(final ActionListener _l) {
final BuMenu r = new BuMenu(BuResource.BU.getString("Edition"), "MENU_EDITION");
r.setIcon(null);
- r.addMenuItem(BuResource.BU.getString("Pr\xE9f\xE9rences"), "PREFERENCE", true, KeyEvent.VK_F2).addActionListener(_l);
+ r.addMenuItem(BuResource.BU.getString("Pr�f�rences"), "PREFERENCE", true, KeyEvent.VK_F2).addActionListener(_l);
r.addMenuItem(FudaaLib.getS("Modifier les applications externes"), "MANAGER", BuResource.BU.getIcon("aucun"), true)
.addActionListener(_l);
addConsoleMenu(r).addActionListener(_l);
@@ -173,7 +173,9 @@
buildMainPanel_ = false;
super.init();
- if (this.appliMng_ == null) this.appliMng_ = new CrueApplicationManager(launcher_);
+ if (this.appliMng_ == null) {
+ this.appliMng_ = new CrueApplicationManager(launcher_);
+ }
explorer_ = new CrueExplorer(this, this.appliMng_);
explorer_.setBorder(BorderFactory.createEmptyBorder(10, 5, 5, 5));
@@ -182,12 +184,12 @@
content_.revalidate();
main_toolbar_.removeAll();
BuToolButton it = new BuToolButton(FCrueResource.CRUE.getToolIcon("bookmark-add"));
- it.setToolTipText(FudaaLib.getS("Ajouter le r\xE9pertoire courant aux favoris"));
+ it.setToolTipText(FudaaLib.getS("Ajouter le repertoire courant aux favoris"));
it.setActionCommand("ADD_FAVORITE");
it.addActionListener(this);
main_toolbar_.add(it);
it = new BuToolButton(BuResource.BU.getToolIcon("rafraichir"));
- it.setToolTipText(BuResource.BU.getString("Rafra\xEEchir"));
+ it.setToolTipText(BuResource.BU.getString("Rafraichir"));
it.setActionCommand("RAFRAICHIR");
it.addActionListener(explorer_);
main_toolbar_.add(it);
@@ -210,7 +212,7 @@
//
// it.setAction(explorer_.getAppliManager().getEditorExec().getAction());
// it.setActionCommand("PREPRO");
- // it.setToolTipText(CrueRessource.getS("Lancer l'\xE9diteur de projet hydraulique"));
+ // it.setToolTipText(CrueRessource.getS("Lancer l'�diteur de projet hydraulique"));
// it.setText(CtuluLibString.EMPTY_STRING);
// main_toolbar_.add(it);
it = new BuToolButton();
Added: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ChargerScenario.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ChargerScenario.java (rev 0)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ChargerScenario.java 2009-05-06 23:59:46 UTC (rev 4730)
@@ -0,0 +1,133 @@
+package org.fudaa.fudaa.crue.projet;
+
+import java.awt.event.ActionEvent;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.metier.EMHScenario;
+import org.fudaa.dodico.crue.metier.emh.CrueData;
+import org.fudaa.dodico.crue.metier.emh.CrueDataImpl;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.fudaa.crue.common.CrueCommomImplementation;
+import org.fudaa.fudaa.crue.common.FCrueResource;
+
+/**
+ * Classe qui se charge de charger en memoire un scénario donné.
+ *
+ * @author Adrien Hadoux
+ */
+public class ChargerScenario {
+ /**
+ * @author Adrien Hadoux
+ */
+ public static class CrueActionChargerScenario extends EbliActionSimple {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 7682734169100306919L;
+
+ EMHScenario scenario;
+
+ CrueProjet projet;
+ CrueCommomImplementation impl;
+
+ /**
+ * @param scenario
+ * @param projet
+ * @param impl
+ */
+ public CrueActionChargerScenario(EMHScenario scenario, CrueProjet projet) {
+ super(FCrueResource.getS("Charger Scénario en mémoire"), FCrueResource.CRUE.getIcon("crystal_ouvrir.png"),
+ "SCENARIOCHARGER");
+ this.projet = projet;
+ this.scenario = scenario;
+ this.impl = projet.getImpl();
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent _e) {
+ if (impl.question(FCrueResource.getS("Chargement"), FCrueResource
+ .getS("Etes-vous sur de vouloir charger ce scénario courant?"))) {
+ if (scenario != null) {
+ ChargerScenario algo = new ChargerScenario(projet, scenario);
+ algo.compute();
+ }
+
+ }
+ }
+
+ }
+
+ EMHScenario scenario;
+
+ CrueProjet projet;
+
+ /**
+ * @param projet
+ * @param scenario
+ */
+ public ChargerScenario(CrueProjet projet, EMHScenario scenario) {
+ super();
+ this.projet = projet;
+ this.scenario = scenario;
+ }
+
+ /**
+ * Realise le calcul.
+ *
+ * @return
+ */
+ public CrueData compute() {
+
+ projet.managerError.clear();
+ CtuluAnalyze analyzer = projet.managerError.getAnalyser();
+
+ // -- detection crue 9 ou 10 --//
+ if (scenario.getInfosVersions() != null && scenario.getInfosVersions().getType() != null) {
+
+ String type = scenario.getInfosVersions().getType().toUpperCase();
+
+ if (type.contains("9")) {
+ return computeCrue9(analyzer);
+ } else {
+ return computeCrue10(analyzer);
+ }
+
+ } else {
+ analyzer.addError("io.etu.typeNotDefined");
+ return null;
+ }
+
+ }
+
+ /**
+ * Calcul le scenario de type crue 9
+ *
+ * @return
+ */
+ public CrueData computeCrue9(CtuluAnalyze analyzer) {
+ CrueData res = new CrueDataImpl();
+
+ // -- recuperation du fichier DC --//
+ if (scenario.getRunCourant() != null) {
+ // scenario.getRunCourant().setListeModelesRuns(listeModelesRuns)
+ // TODO continuer
+
+ }
+ projet.managerError.showDialog(projet.getImpl(), FCrueResource.getS("Résultats du Chargement scénario"));
+ return res;
+ }
+
+ /**
+ * calcul le scenario de type crue 10
+ *
+ * @return
+ */
+ public CrueData computeCrue10(CtuluAnalyze analyzer) {
+ CrueData res = new CrueDataImpl();
+ // TODO continuer
+
+ projet.managerError.showDialog(projet.getImpl(), FCrueResource.getS("Résultats du Chargement scénario"));
+ return res;
+ }
+
+}
Deleted: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueModeleBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueModeleBuilder.java 2009-05-06 17:51:00 UTC (rev 4729)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueModeleBuilder.java 2009-05-06 23:59:46 UTC (rev 4730)
@@ -1,57 +0,0 @@
-package org.fudaa.fudaa.crue.projet;
-
-import java.util.List;
-
-import javax.swing.BorderFactory;
-import javax.swing.DefaultListModel;
-
-import org.fudaa.dodico.crue.metier.EMHModeleBase;
-import org.fudaa.ebli.visuallibrary.graphe.GrapheCellRenderer;
-import org.fudaa.fudaa.crue.common.FCrueResource;
-
-import com.memoire.bu.BuIcon;
-import com.memoire.bu.BuLabel;
-import com.memoire.bu.BuList;
-
-/**
- * G\xE8re un mod\xE8le crue. Un mod\xE8le contient plusieurs sous mod\xE8le.
- *
- * @author Adrien Hadoux
- */
-public class CrueModeleBuilder {
-
- /**
- * Icone propre aux scenarios
- */
- public static BuIcon iconeModele_ = FCrueResource.CRUE.getIcon("crystal22_toutselectionner.png");
-
- /**
- * Construit une bu list avec l'ensemble des sc\xE9narios du logiciel
- *
- * @param baseScenarios
- * @return
- */
- public static BuList buildListModele(final List<EMHModeleBase> baseModeles, final String title) {
- final DefaultListModel model = new DefaultListModel();
- if (baseModeles != null) {
- for (final EMHModeleBase modele : baseModeles) {
- final BuLabel label = new BuLabel(iconeModele_);
- label.setText(modele.getId());
- model.addElement(label);
- }
- }
- final BuList liste = new BuList(model);
- liste.setCellRenderer(new GrapheCellRenderer());
- liste.setBorder(BorderFactory.createTitledBorder(title));
- return liste;
- }
-
- public static BuList buildListModele(final List<EMHModeleBase> baseModeles) {
- return buildListModele(baseModeles, FCrueResource.getS("Mod\xE8les disponibles"));
- }
-
- public static BuList buildListSousModele(final List<EMHModeleBase> baseModeles) {
- return buildListModele(baseModeles, FCrueResource.getS("Sous Mod\xE8les disponibles"));
- }
-
-}
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueProjet.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueProjet.java 2009-05-06 17:51:00 UTC (rev 4729)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueProjet.java 2009-05-06 23:59:46 UTC (rev 4730)
@@ -1,13 +1,24 @@
package org.fudaa.fudaa.crue.projet;
+import java.awt.GridLayout;
import java.io.File;
+import javax.swing.BorderFactory;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
import org.fudaa.dodico.crue.io.Crue10FileFormatFactory;
import org.fudaa.dodico.crue.metier.EMHproject;
-import org.fudaa.fudaa.crue.CruePersistanceErrorManager;
+import org.fudaa.dodico.crue.metier.emh.CrueData;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.ebli.commun.EbliComponentFactory;
import org.fudaa.fudaa.crue.common.CrueCommomImplementation;
import org.fudaa.fudaa.crue.common.FCrueResource;
+import org.fudaa.fudaa.crue.view.CruePersistanceErrorManager;
+import com.memoire.bu.BuPanel;
+
/**
* Projet Crue. Contient le contenu du fichier xml ETU lu. Manage les scc�narios, modeles et sous modeles crue au sein
* de l'application fudaa.
@@ -19,43 +30,124 @@
/**
* Structure correspondante au contenu du fichier xml ETU.
*/
- EMHproject project_;
+ EMHproject project;
- final CrueCommomImplementation impl_;
+ final CrueCommomImplementation impl;
final File fichierEtu_;
- final CruePersistanceErrorManager managerError_;
+ final CruePersistanceErrorManager managerError;
/**
+ * Les donnees crueData chargees.
+ */
+ CrueData dataChargees;
+
+ /**
* Lancement d'un projet.
*
* @param fichierEtu
*/
public CrueProjet(final File fichierEtu, final CrueCommomImplementation impl) {
- impl_ = impl;
+ this.impl = impl;
fichierEtu_ = fichierEtu;
- managerError_ = new CruePersistanceErrorManager();
+ managerError = new CruePersistanceErrorManager();
// -- init de la structure projet --//
- project_ = readProject(fichierEtu);
+ project = readProject(fichierEtu);
// -- initialisation des composants de l'IHM --//
- impl_.init(project_, fichierEtu);
+ impl.init(project, fichierEtu);
}
/**
- * Lit le fichier ETU et g�n�re la structure projet correspondante.
+ * Lit le fichier ETU et genere la structure projet correspondante.
*
* @param _f
* @return
*/
public EMHproject readProject(final File _f) {
- managerError_.clear();
+ managerError.clear();
// -- lecture du fichier --//
- final EMHproject projet = Crue10FileFormatFactory.getETUFileFormat().read(_f, managerError_.getAnalyser(), null);
+ final EMHproject projet = Crue10FileFormatFactory.getETUFileFormat().read(_f, managerError.getAnalyser(), null);
// -- affichage du r�sultat --//
- managerError_.showDialog(impl_, FCrueResource.getS("Chargement projet"));
+ managerError.showDialog(impl, FCrueResource.getS("Chargement projet"));
return projet;
}
+ public EMHproject getProject() {
+ return project;
+ }
+
+ public void setProject(EMHproject project) {
+ this.project = project;
+ }
+
+ public CrueCommomImplementation getImpl() {
+ return impl;
+ }
+
+ public CruePersistanceErrorManager getManagerError() {
+ return managerError;
+ }
+
+ /**
+ * Methode tres utile qui genere le panel d'infos generiques des infos du projet etude. Sera commun à plusieurs
+ * interfaces.
+ *
+ * @return panel des infos associees.
+ */
+ public JPanel createInFosProjectPanel() {
+ BuPanel infos = new BuPanel(new GridLayout(6, 2, 5, 1));
+
+ infos.setBorder(BorderFactory.createTitledBorder(FCrueResource.getS("Infos Etude")));
+
+ JLabel titreEtude1 = new JLabel(FCrueResource.getS("Etude:"));
+ JTextField titreEtude2 = new JTextField(fichierEtu_.getName(), 10);
+ JLabel titreCommentaire = new JLabel(FCrueResource.getS("Commentaire:"));
+ JTextField titreCommentaire2 = new JTextField(10);
+
+ JLabel path1 = new JLabel(project.getInfos().FICHETUDES + ":");
+ JTextField path1_2 = new JTextField(10);
+ JLabel path2 = new JLabel(project.getInfos().RUNS + ":");
+ JTextField path2_2 = new JTextField(10);
+ JLabel path3 = new JLabel(project.getInfos().RAPPORTS + ":");
+ JTextField path3_2 = new JTextField(10);
+
+ if (project.getInfos().getFichierEtu() != null) {
+ titreCommentaire2.setText(project.getInfos().getFichierEtu());
+ }
+ if (project.getInfos().getDirectories() != null) {
+ path1_2.setText(project.getInfos().getDirectories().get(project.getInfos().FICHETUDES));
+ path2_2.setText(project.getInfos().getDirectories().get(project.getInfos().RUNS));
+ path3_2.setText(project.getInfos().getDirectories().get(project.getInfos().RAPPORTS));
+ }
+
+ infos.add(titreEtude1);
+ infos.add(titreEtude2);
+
+ infos.add(titreCommentaire);
+ infos.add(titreCommentaire2);
+
+ infos.add(path1);
+ infos.add(path1_2);
+
+ infos.add(path2);
+ infos.add(path2_2);
+
+ infos.add(path3);
+ infos.add(path3_2);
+
+ EbliActionSimple actionModifier = new EbliActionSimple(FCrueResource.getS("Valider"), FCrueResource.CRUE
+ .getIcon("crystal_oui.png"), "VALIDER") {
+
+ };
+ infos.add(new JLabel());
+ infos.add(actionModifier.buildButton(EbliComponentFactory.INSTANCE));
+
+ return infos;
+ }
+
+ public File getFichierEtu_() {
+ return fichierEtu_;
+ }
}
Deleted: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueScenarioBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueScenarioBuilder.java 2009-05-06 17:51:00 UTC (rev 4729)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueScenarioBuilder.java 2009-05-06 23:59:46 UTC (rev 4730)
@@ -1,69 +0,0 @@
-package org.fudaa.fudaa.crue.projet;
-
-import java.util.List;
-
-import javax.swing.BorderFactory;
-import javax.swing.DefaultListModel;
-
-import org.fudaa.dodico.crue.metier.EMHScenario;
-import org.fudaa.ebli.visuallibrary.graphe.GrapheCellRenderer;
-import org.fudaa.fudaa.crue.common.FCrueResource;
-
-import com.memoire.bu.BuIcon;
-import com.memoire.bu.BuLabel;
-import com.memoire.bu.BuList;
-
-/**
- * G\xE8re les interfaces relative \xE0 un sc\xE9nario Crue. G\xE8re le lien entre un EMHScenario m\xE9tier et l'interface propos\xE9 par
- * les actions sc\xE9narios.
- *
- * @author Adrien Hadoux
- */
-public class CrueScenarioBuilder {
-
- /**
- * Icone propre aux scenarios
- */
- public static BuIcon iconeScenario_ = FCrueResource.CRUE.getIcon("crystal22_preference.png");
-
- /**
- * Construit une bu list avec l'ensemble des sc\xE9narios du logiciel
- *
- * @param baseScenarios
- * @return
- */
- public static BuList buildListScenario(final List<EMHScenario> baseScenarios) {
- final DefaultListModel model = new DefaultListModel();
- if (baseScenarios != null) {
- for (final EMHScenario scenario : baseScenarios) {
- final BuLabel label = new BuLabel(iconeScenario_);
- label.setText(scenario.getId());
- model.addElement(label);
- }
- }
- final BuList liste = new BuList(model);
- liste.setCellRenderer(new GrapheCellRenderer());
- liste.setBorder(BorderFactory.createTitledBorder(FCrueResource.getS("Sc\xE9narios disponibles")));
- return liste;
- }
-
- /**
- * G\xE9n\xE8re l'encart du scenario courant
- *
- * @param scenarCourant
- * @return
- */
- public static BuList buildListScenarioCourant(final EMHScenario scenarCourant) {
- final DefaultListModel model = new DefaultListModel();
- if (scenarCourant == null) return null;
- final BuLabel label = new BuLabel(iconeScenario_);
- label.setText(scenarCourant.getId());
- model.addElement(label);
-
- final BuList liste = new BuList(model);
- liste.setCellRenderer(new GrapheCellRenderer());
- liste.setBorder(BorderFactory.createTitledBorder(FCrueResource.getS("Sc\xE9nario courant")));
- return liste;
- }
-
-}
Deleted: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueSousModeleBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueSousModeleBuilder.java 2009-05-06 17:51:00 UTC (rev 4729)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueSousModeleBuilder.java 2009-05-06 23:59:46 UTC (rev 4730)
@@ -1,10 +0,0 @@
-package org.fudaa.fudaa.crue.projet;
-
-/**
- * G\xE8re un sous mod\xE8le crue.
- *
- * @author Adrien Hadoux
- */
-public class CrueSousModeleBuilder {
-
-}
Added: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueComparaisonScenarioFille.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueComparaisonScenarioFille.java (rev 0)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueComparaisonScenarioFille.java 2009-05-06 23:59:46 UTC (rev 4730)
@@ -0,0 +1,7 @@
+package org.fudaa.fudaa.crue.view;
+
+import com.memoire.bu.BuInternalFrame;
+
+public class CrueComparaisonScenarioFille extends BuInternalFrame {
+
+}
Added: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CruePanelFicheScenario.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CruePanelFicheScenario.java (rev 0)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CruePanelFicheScenario.java 2009-05-06 23:59:46 UTC (rev 4730)
@@ -0,0 +1,201 @@
+package org.fudaa.fudaa.crue.view;
+
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextField;
+
+import org.fudaa.dodico.crue.metier.EMHScenario;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.ebli.commun.EbliComponentFactory;
+import org.fudaa.fudaa.crue.builder.CrueModeleBuilder;
+import org.fudaa.fudaa.crue.common.FCrueResource;
+import org.fudaa.fudaa.crue.projet.ChargerScenario;
+import org.fudaa.fudaa.crue.projet.CrueProjet;
+
+import com.memoire.bu.BuLabel;
+import com.memoire.bu.BuList;
+import com.memoire.bu.BuPanel;
+
+/**
+ * Classe qui gère un panel d'affichage d'une fiche de scenario choisie.
+ *
+ * @author Adrien Hadoux
+ */
+public class CruePanelFicheScenario extends JPanel {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -3364259197192821481L;
+ EMHScenario scenario;
+
+ JTextField labelId = new JTextField(10);
+ JTextField labelType = new JTextField(10);
+ JTextField labelCommentaire = new JTextField(10);
+ JTextField labelModif = new JTextField(10);
+ /**
+ * conteneur des listes pour les modeles.
+ */
+ BuPanel conteneurModeles = new BuPanel();
+
+ /**
+ * conteneur des listes pour les fichiers etudes.
+ */
+ BuPanel conteneurFichiersEtudes = new BuPanel();
+
+ private final CrueProjet crueProjet_;
+
+ /**
+ * @param scenario
+ */
+ public CruePanelFicheScenario(EMHScenario scenario, CrueProjet impl) {
+ super();
+ this.crueProjet_ = impl;
+ initBuild();
+
+ updateForScenario(scenario);
+
+ }
+
+ /**
+ * Initialise la construction des parametres graphiques. A appeler une seule fois.
+ */
+ private void initBuild() {
+ setBorder(BorderFactory.createTitledBorder(FCrueResource.getS("Fiche Scenario")));
+ /*
+ * 3 etages id commentaires - liste des scenarios - liste des modeles.
+ */
+ // this.setLayout(new GridLayout(3, 2));
+ this.setLayout(new BorderLayout());
+ Box box = Box.createVerticalBox();
+ this.add(box, BorderLayout.CENTER);
+
+ BuPanel ligne = new BuPanel(new GridLayout(1, 2));
+
+ BuPanel identificationPanel = new BuPanel(new FlowLayout(FlowLayout.LEFT));
+ identificationPanel.add(new BuLabel(FCrueResource.getS("Id Scenario:")));
+ identificationPanel.add(labelId);
+ ligne.add(identificationPanel);
+
+ BuPanel typePanel = new BuPanel(new FlowLayout(FlowLayout.LEFT));
+ typePanel.add(new BuLabel(FCrueResource.getS("Type:")));
+ typePanel.add(labelType);
+ ligne.add(typePanel);
+
+ box.add(ligne);
+ ligne = new BuPanel(new GridLayout(1, 2));
+
+ BuPanel comPanel = new BuPanel(new FlowLayout(FlowLayout.LEFT));
+ comPanel.add(new BuLabel(FCrueResource.getS("Commentaire:")));
+ comPanel.add(labelCommentaire);
+ ligne.add(comPanel);
+
+ BuPanel datePanel = new BuPanel(new FlowLayout(FlowLayout.LEFT));
+ datePanel.add(new BuLabel(FCrueResource.getS("Modifié:")));
+ datePanel.add(labelModif);
+ ligne.add(datePanel);
+
+ box.add(ligne);
+ ligne = new BuPanel(new GridLayout(1, 2));
+ conteneurFichiersEtudes.setLayout(new GridLayout(1, 1));
+ conteneurModeles.setLayout(new GridLayout(1, 1));
+ ligne.add(conteneurFichiersEtudes);
+ ligne.add(conteneurModeles);
+ // conteneurFichiersEtudes.setBorder(BorderFactory.createTitledBorder(FCrueResource.getS("Fichiers Scénarios")));
+ // conteneurModeles.setBorder(BorderFactory.createTitledBorder(FCrueResource.getS("Modèles")));
+ box.add(ligne);
+ ligne = new BuPanel(new FlowLayout());
+
+ EbliActionSimple actionChangeScenario = new EbliActionSimple(FCrueResource.getS("Définir scénario courant"), null,
+ "SCENARIOCOURANT") {
+
+ @Override
+ public void actionPerformed(ActionEvent _e) {
+ if (crueProjet_.getImpl().question(FCrueResource.getS("Scénario courant"),
+ FCrueResource.getS("Etes-vous sur de vouloir définir ce scénario courant?"))) {
+ if (scenario != null) {
+ crueProjet_.getProject().setScenarioCourant(scenario);
+ }
+ crueProjet_.getImpl().removeInternalFrame(crueProjet_.getImpl().scenarioFille);
+ crueProjet_.getImpl().addScenarioManagerFille();
+ crueProjet_.getImpl().rebuildApplication(crueProjet_.getFichierEtu_());
+ crueProjet_.getImpl().message(FCrueResource.getS("Changement correctement déroulé."));
+ }
+ }
+
+ };
+
+ ligne.add(actionChangeScenario.buildButton(EbliComponentFactory.INSTANCE));
+ ChargerScenario.CrueActionChargerScenario actionCharger = new ChargerScenario.CrueActionChargerScenario(scenario,
+ crueProjet_);
+ ligne.add(actionCharger.buildButton(EbliCom...
[truncated message content] |
|
From: <had...@us...> - 2009-05-07 19:06:49
|
Revision: 4735
http://fudaa.svn.sourceforge.net/fudaa/?rev=4735&view=rev
Author: hadouxad
Date: 2009-05-07 19:06:42 +0000 (Thu, 07 May 2009)
Log Message:
-----------
IHM test complets
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/adrienMessages.properties
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueScenarioBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueTreeProject.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueCommomImplementation.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueProjet.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueScenarioTreeManagerFille.java
Added Paths:
-----------
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CommomLib.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoader.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioSaver.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheInfosGenerales.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheScenario.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleComparaisonScenario.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleGenerationCrue9.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/CruePersistanceErrorManager.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ChargerScenario.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueComparaisonScenarioFille.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CruePanelFicheScenario.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CruetransformationCrue9Fille.java
Modified: trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/adrienMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/adrienMessages.properties 2009-05-07 17:18:59 UTC (rev 4734)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/adrienMessages.properties 2009-05-07 19:06:42 UTC (rev 4735)
@@ -14,4 +14,5 @@
compute.error.notAnyScenarioFiles = Erreur, il manque un fichier dans un sous modeles: il faut u liste fixe de fichiers de niveau sc\xE9nario : OCAL, ORES, PCAL, DCLM, DLHY
compute.error.fileNotExist = Erreur, il n'existe pas de fichier a l'emplacement suivant {fichier}
compute.error.drsoFailed = Erreur, la lecture du fichier DRSO a echouee: {fichier}
-compute.error.dcFailed = Erreur, la lecture du fichier DC a echouee: {fichier}
\ No newline at end of file
+compute.error.dcFailed = Erreur, la lecture du fichier DC a echouee: {fichier}
+generate.error.noScenarioSelected = Erreur, aucun sc\xE9nario n'a a \xE9t\xE9 s\xE9lectionn\xE9
\ No newline at end of file
Deleted: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/CruePersistanceErrorManager.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/CruePersistanceErrorManager.java 2009-05-07 17:18:59 UTC (rev 4734)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/CruePersistanceErrorManager.java 2009-05-07 19:06:42 UTC (rev 4735)
@@ -1,119 +0,0 @@
-package org.fudaa.fudaa.crue;
-
-import java.awt.BorderLayout;
-import java.awt.Frame;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.logging.LogRecord;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-
-import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.ctulu.CtuluDefaultLogFormatter;
-import org.fudaa.ctulu.CtuluUI;
-import org.fudaa.ctulu.gui.CtuluLibSwing;
-import org.fudaa.dodico.crue.io.common.Messages;
-import org.fudaa.ebli.ressource.EbliResource;
-import org.fudaa.fudaa.commun.FudaaLib;
-import org.jdesktop.swingx.JXTreeTable;
-import org.jdesktop.swingx.treetable.DefaultMutableTreeTableNode;
-import org.jdesktop.swingx.treetable.DefaultTreeTableModel;
-
-/**
- * Fred: interet de cette classe ? Manager qui indique toutes les erreurs qui se sont produites pendant le chargement.
- *
- * @author Adrien Hadoux
- */
-public class CruePersistanceErrorManager {
-
- public CruePersistanceErrorManager() {
- super();
- this.analyser_ = new CtuluAnalyze(Messages.RESOURCE_BUNDLE);
- }
-
- CtuluAnalyze analyser_ = new CtuluAnalyze(Messages.RESOURCE_BUNDLE);
-
- public CtuluAnalyze getAnalyser() {
- return analyser_;
- }
-
- public void setListeMessageError(final CtuluAnalyze listeMessageError) {
- this.analyser_ = listeMessageError;
- }
-
- public void addMessageError(final String message) {
- analyser_.addError(message);
- }
-
- public void clear() {
-
- analyser_.clear();
-
- }
-
- public void showDialog(final CtuluUI ui, final String title) {
- if (analyser_ == null && ui != null) {
- ui.message(EbliResource.EBLI.getString("Chargement terminé"), EbliResource.EBLI
- .getString("Chargement terminé avec succès"), false);
-
- return;
- }
-
- final JXTreeTable table = new JXTreeTable(new DefaultTreeTableModel(constructArborescence(analyser_)));
- table.setEditable(false);
- final Frame f;
- if (ui != null) {
- f = CtuluLibSwing.getFrameAncestorHelper(ui.getParentComponent());
- } else {
- f = null;
- }
- final JDialog dialog_ = new JDialog(f);
- dialog_.setModal(true);
- dialog_.setTitle(title);
- final JPanel container = new JPanel(new BorderLayout());
- container.add(new JScrollPane(table), BorderLayout.CENTER);
-
- container.add(new JLabel(EbliResource.EBLI.getString("Op�ration termin�. Informations")), BorderLayout.NORTH);
-
- final JButton ajouter_ = new JButton("Valider", EbliResource.EBLI.getIcon("crystal_valider"));
- ajouter_.addActionListener(new ActionListener() {
-
- public void actionPerformed(final ActionEvent e) {
- dialog_.dispose();
- }
-
- });
- container.add((new JPanel()).add(ajouter_), BorderLayout.SOUTH);
-
- dialog_.setContentPane(container);
- if (ui != null) {
- dialog_.setLocationRelativeTo(ui.getParentComponent());
- }
- // dialog_.pack();
- dialog_.setSize(600, 250);
- dialog_.setVisible(true);
-
- }
-
- private DefaultMutableTreeTableNode constructArborescence(final CtuluAnalyze message) {
- final DefaultMutableTreeTableNode root = new DefaultMutableTreeTableNode("root");
-
- final DefaultMutableTreeTableNode rootFic = new DefaultMutableTreeTableNode(message.getDesc());
- root.add(rootFic);
-
- boolean perfect = message.isEmpty();
- for (LogRecord log : message.getRecords()) {
- rootFic.add(new DefaultMutableTreeTableNode(CtuluDefaultLogFormatter.DEFAULT.format(log)));
- }
- if (perfect) {
- rootFic.add(new DefaultMutableTreeTableNode(FudaaLib.getS("Aucun problème rencontré")));
- }
-
- return root;
- }
-
-}
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueScenarioBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueScenarioBuilder.java 2009-05-07 17:18:59 UTC (rev 4734)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueScenarioBuilder.java 2009-05-07 19:06:42 UTC (rev 4735)
@@ -5,11 +5,15 @@
import javax.swing.BorderFactory;
import javax.swing.DefaultListModel;
+import org.fudaa.dodico.crue.metier.EMHModeleBase;
import org.fudaa.dodico.crue.metier.EMHModeleRun;
import org.fudaa.dodico.crue.metier.EMHRun;
import org.fudaa.dodico.crue.metier.EMHScenario;
import org.fudaa.dodico.crue.metier.EMHproject;
+import org.fudaa.dodico.crue.metier.FichierCrue;
import org.fudaa.ebli.visuallibrary.graphe.GrapheCellRenderer;
+import org.fudaa.fudaa.crue.builder.CrueTreeProject.TreeNodeFile;
+import org.fudaa.fudaa.crue.builder.CrueTreeProject.TreeNodeModele;
import org.fudaa.fudaa.crue.builder.CrueTreeProject.TreeNodeModeleRun;
import org.fudaa.fudaa.crue.builder.CrueTreeProject.TreeNodeRun;
import org.fudaa.fudaa.crue.builder.CrueTreeProject.TreeNodeRunCourant;
@@ -31,12 +35,13 @@
public class CrueScenarioBuilder {
/**
- * Construit une bu list avec l'ensemble des sc�narios du logiciel
+ * Cree la liste avec ou non bordure.
*
* @param baseScenarios
+ * @param setBorder
* @return
*/
- public static BuList buildListScenario(final List<EMHScenario> baseScenarios) {
+ public static BuList buildListScenario(final List<EMHScenario> baseScenarios, boolean setBorder) {
final DefaultListModel model = new DefaultListModel();
if (baseScenarios != null) {
for (final EMHScenario scenario : baseScenarios) {
@@ -47,7 +52,9 @@
}
final BuList liste = new BuList(model);
liste.setCellRenderer(new GrapheCellRenderer());
- liste.setBorder(BorderFactory.createTitledBorder(FCrueResource.getS("Scénarios disponibles")));
+ if (setBorder) {
+ liste.setBorder(BorderFactory.createTitledBorder(FCrueResource.getS("Scénarios disponibles")));
+ }
return liste;
}
@@ -55,10 +62,20 @@
* Construit une bu list avec l'ensemble des sc�narios du logiciel
*
* @param baseScenarios
+ * @return
+ */
+ public static BuList buildListScenario(final List<EMHScenario> baseScenarios) {
+ return buildListScenario(baseScenarios, true);
+ }
+
+ /**
+ * Construit une bu list avec l'ensemble des sc�narios du logiciel
+ *
+ * @param baseScenarios
* @return modele du tree.
*/
public static TreeScenarioModel buildTreeScenario(EMHproject projet) {
- final DefaultMutableTreeTableNode root = new DefaultMutableTreeTableNode("root");
+ final TreeNodeFile root = new TreeNodeFile("root");
if (projet.getListeScenarios() != null) {
for (final EMHScenario scenario : projet.getListeScenarios()) {
TreeNodeScenario nodeScenar = new TreeNodeScenario(scenario);
@@ -89,6 +106,50 @@
}
}
+
+ if (scenario.getGestionModele() != null && scenario.getGestionModele().getListeModeles() != null) {
+ TreeNodeFile conteneurModeles = new TreeNodeFile("Modeles");
+ nodeScenar.add(conteneurModeles);
+ for (EMHModeleBase m : scenario.getGestionModele().getListeModeles()) {
+ TreeNodeModele nodeModel = new TreeNodeModele(m);
+ conteneurModeles.add(nodeModel);
+ if (m.getListeSousModeles() != null && m.getListeSousModeles().getListeModeles() != null) {
+ TreeNodeFile conteneurSModeles = new TreeNodeFile("Sous Modeles");
+ nodeModel.add(conteneurSModeles);
+ for (EMHModeleBase sousmodele : m.getListeSousModeles().getListeModeles()) {
+ TreeNodeModele nodeSModel = new TreeNodeModele(sousmodele);
+ conteneurSModeles.add(nodeSModel);
+
+ if (sousmodele.getListeFichiersCrue() != null) {
+ TreeNodeFile conteneurSModelesFichier = new TreeNodeFile("Fichiers");
+ nodeSModel.add(conteneurSModelesFichier);
+ for (FichierCrue fc : sousmodele.getListeFichiersCrue()) {
+ conteneurSModelesFichier.add(new TreeNodeFile(fc.getId()));
+ }
+ }
+
+ }
+
+ }
+ // -- fichiers du modeles --//
+ if (m.getListeFichiersCrue() != null) {
+ TreeNodeFile conteneurModelesFichier = new TreeNodeFile("Fichiers");
+ nodeModel.add(conteneurModelesFichier);
+ for (FichierCrue fc : m.getListeFichiersCrue()) {
+ conteneurModelesFichier.add(new TreeNodeFile(fc.getId()));
+ }
+ }
+ }
+ }
+ // -- fichiers du scenario --//
+ if (scenario.getListeFichiersScenario() != null) {
+ TreeNodeFile conteneurModelesFichier = new TreeNodeFile("Fichiers");
+ nodeScenar.add(conteneurModelesFichier);
+ for (FichierCrue fc : scenario.getListeFichiersScenario()) {
+ conteneurModelesFichier.add(new TreeNodeFile(fc.getId()));
+ }
+ }
+
}
}
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueTreeProject.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueTreeProject.java 2009-05-07 17:18:59 UTC (rev 4734)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueTreeProject.java 2009-05-07 19:06:42 UTC (rev 4735)
@@ -5,6 +5,7 @@
import javax.swing.JTree;
import javax.swing.tree.DefaultTreeCellRenderer;
+import org.fudaa.dodico.crue.metier.EMHModeleBase;
import org.fudaa.dodico.crue.metier.EMHModeleRun;
import org.fudaa.dodico.crue.metier.EMHRun;
import org.fudaa.dodico.crue.metier.EMHScenario;
@@ -106,13 +107,67 @@
public Object getValueAt(int column) {
if (column == 0) {
return r.getId();
+ } else if (column == 2) {
+ if (r.getInfosVersion() != null) {
+ return r.getInfosVersion().getCommentaire();
+ } else {
+ return "";
+ }
} else {
return "";
}
}
}
+ public static class TreeNodeFile extends DefaultMutableTreeTableNode {
+ String id;
+
+ public TreeNodeFile(String id) {
+ super(id);
+ this.id = id;
+ }
+
+ @Override
+ public Object getValueAt(int column) {
+ if (column == 0) {
+ return id;
+ } else {
+ return "";
+ }
+ }
+ }
+
/**
+ * Node du tree reservé aux objets de type run
+ *
+ * @author Adrien Hadoux
+ */
+ public static class TreeNodeModele extends DefaultMutableTreeTableNode {
+ EMHModeleBase r;
+
+ public TreeNodeModele(EMHModeleBase modele) {
+ super(modele);
+ r = modele;
+ }
+
+ @Override
+ public Object getValueAt(int column) {
+ if (column == 0) {
+ return r.getId();
+ } else if (column == 2) {
+ if (r.getInfosVersions() != null) {
+ return r.getInfosVersions().getCommentaire();
+ } else {
+ return "";
+ }
+ } else {
+ return "";
+ }
+ }
+
+ }
+
+ /**
* Node du tree reservé aux objets de type run courant
*
* @author Adrien Hadoux
Added: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CommomLib.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CommomLib.java (rev 0)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CommomLib.java 2009-05-07 19:06:42 UTC (rev 4735)
@@ -0,0 +1,42 @@
+package org.fudaa.fudaa.crue.common;
+
+import java.io.File;
+
+import javax.swing.JTextField;
+
+/**
+ * librairie commune fournit des methodes utiles.
+ *
+ * @author Adrien Hadoux
+ */
+public class CommomLib {
+
+ /**
+ * OUvre un chooser et place le résulat dans la textfield.
+ *
+ * @param field
+ */
+ public static void openChooserAndSynchroniseTf(JTextField field, CrueCommomImplementation impl, String title) {
+ openChooserAndSynchroniseTf(field, impl, title, new String[] { "" });
+
+ }
+
+ /**
+ * Idem mais avec une contrainte sur les extensions.
+ *
+ * @param field
+ * @param impl
+ * @param title
+ * @param extensions
+ */
+ public static void openChooserAndSynchroniseTf(JTextField field, CrueCommomImplementation impl, String title,
+ String[] extensions) {
+ final File fichierAbsolu = impl.ouvrirFileChooser(title, extensions);
+
+ if (fichierAbsolu != null) {
+ field.setText(fichierAbsolu.getAbsolutePath());
+ }
+
+ }
+
+}
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueCommomImplementation.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueCommomImplementation.java 2009-05-07 17:18:59 UTC (rev 4734)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueCommomImplementation.java 2009-05-07 19:06:42 UTC (rev 4735)
@@ -13,15 +13,15 @@
import org.fudaa.fudaa.crue.builder.CrueScenarioBuilder;
import org.fudaa.fudaa.crue.explorer.CrueLauncher;
import org.fudaa.fudaa.crue.projet.CrueProjet;
-import org.fudaa.fudaa.crue.view.CrueComparaisonScenarioFille;
+import org.fudaa.fudaa.crue.view.CrueFicheInfosGenerales;
+import org.fudaa.fudaa.crue.view.CrueFilleComparaisonScenario;
+import org.fudaa.fudaa.crue.view.CrueFilleGenerationCrue9;
import org.fudaa.fudaa.crue.view.CrueScenarioTreeManagerFille;
-import org.fudaa.fudaa.crue.view.CruetransformationCrue9Fille;
import org.jdesktop.swingx.JXTreeTable;
import com.memoire.bu.BuColumn;
import com.memoire.bu.BuInformationsDocument;
import com.memoire.bu.BuInformationsSoftware;
-import com.memoire.bu.BuInternalFrame;
import com.memoire.bu.BuList;
import com.memoire.bu.BuMainPanel;
import com.memoire.bu.BuMenu;
@@ -86,8 +86,9 @@
* @param project
* @param f
*/
- public void init(final EMHproject project, final File f) {
-
+ public void init(final CrueProjet crueproject, final File f) {
+ crueProjet_ = crueproject;
+ final EMHproject project = crueproject.getProject();
// -- initialisation des encarts du scenario --//
if (project.getScenarioCourant() != null) {
@@ -117,6 +118,8 @@
// -- construction de'application --//
rebuildApplication(f);
+ // -- ou verture de l'ihm de management des scenario --//
+ addScenarioManagerFille();
}
@@ -277,9 +280,21 @@
if (scenarioFille == null) {
scenarioFille = new CrueScenarioTreeManagerFille(crueProjet_);
}
- this.addInternalFrame(scenarioFille);
+ this.addInternalFrame(new CrueScenarioTreeManagerFille(crueProjet_));
}
+ public CrueFicheInfosGenerales etudeFille = null;
+
+ /**
+ *
+ */
+ public void addEtudeManagerFille() {
+ if (etudeFille == null) {
+ etudeFille = new CrueFicheInfosGenerales(crueProjet_);
+ }
+ this.addInternalFrame(etudeFille);
+ }
+
@Override
public void actionPerformed(final ActionEvent _evt) {
final String action = _evt.getActionCommand();
@@ -294,16 +309,21 @@
// -- ouverture de l'interface de gestion des scenarios --//
addScenarioManagerFille();
} else if (action.equals("GESTIONETUDE")) {
-
- BuInternalFrame inframe = new BuInternalFrame();
- inframe.getContentPane().add(crueProjet_.createInFosProjectPanel());
- inframe.setTitle(FCrueResource.getS("Infos Etude"));
- inframe.setSize(400, 150);
- this.addInternalFrame(inframe);
+ addEtudeManagerFille();
+ // BuInternalFrame inframe = new BuInternalFrame();
+ // inframe.getContentPane().add(crueProjet_.createInFosProjectPanel());
+ // inframe.setTitle(FCrueResource.getS("Infos Etude"));
+ // inframe.setSize(400, 150);
+ // this.addInternalFrame(inframe);
} else if (action.equals("GESTIONCOMPARAISON")) {
- this.addInternalFrame(new CrueComparaisonScenarioFille());
+ if (crueProjet_.getProject().getListeScenarios().size() < 2) {
+ crueProjet_.getImpl().error(
+ FCrueResource.getS("Erreur, il faut au moins 2 scénarios disponibles dans l'étude."));
+ } else {
+ this.addInternalFrame(new CrueFilleComparaisonScenario(crueProjet_));
+ }
} else if (action.equals("GESTIONTRANSFORMATION")) {
- this.addInternalFrame(new CruetransformationCrue9Fille(crueProjet_));
+ this.addInternalFrame(new CrueFilleGenerationCrue9(crueProjet_));
}
{
Deleted: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ChargerScenario.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ChargerScenario.java 2009-05-07 17:18:59 UTC (rev 4734)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ChargerScenario.java 2009-05-07 19:06:42 UTC (rev 4735)
@@ -1,133 +0,0 @@
-package org.fudaa.fudaa.crue.projet;
-
-import java.awt.event.ActionEvent;
-
-import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.dodico.crue.metier.EMHScenario;
-import org.fudaa.dodico.crue.metier.emh.CrueData;
-import org.fudaa.dodico.crue.metier.emh.CrueDataImpl;
-import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.fudaa.crue.common.CrueCommomImplementation;
-import org.fudaa.fudaa.crue.common.FCrueResource;
-
-/**
- * Classe qui se charge de charger en memoire un scénario donné.
- *
- * @author Adrien Hadoux
- */
-public class ChargerScenario {
- /**
- * @author Adrien Hadoux
- */
- public static class CrueActionChargerScenario extends EbliActionSimple {
- /**
- *
- */
- private static final long serialVersionUID = 7682734169100306919L;
-
- EMHScenario scenario;
-
- CrueProjet projet;
- CrueCommomImplementation impl;
-
- /**
- * @param scenario
- * @param projet
- * @param impl
- */
- public CrueActionChargerScenario(EMHScenario scenario, CrueProjet projet) {
- super(FCrueResource.getS("Charger Scénario en mémoire"), FCrueResource.CRUE.getIcon("crystal_ouvrir.png"),
- "SCENARIOCHARGER");
- this.projet = projet;
- this.scenario = scenario;
- this.impl = projet.getImpl();
- }
-
- @Override
- public void actionPerformed(ActionEvent _e) {
- if (impl.question(FCrueResource.getS("Chargement"), FCrueResource
- .getS("Etes-vous sur de vouloir charger ce scénario courant?"))) {
- if (scenario != null) {
- ChargerScenario algo = new ChargerScenario(projet, scenario);
- algo.compute();
- }
-
- }
- }
-
- }
-
- EMHScenario scenario;
-
- CrueProjet projet;
-
- /**
- * @param projet
- * @param scenario
- */
- public ChargerScenario(CrueProjet projet, EMHScenario scenario) {
- super();
- this.projet = projet;
- this.scenario = scenario;
- }
-
- /**
- * Realise le calcul.
- *
- * @return
- */
- public CrueData compute() {
-
- projet.managerError.clear();
- CtuluAnalyze analyzer = projet.managerError.getAnalyser();
-
- // -- detection crue 9 ou 10 --//
- if (scenario.getInfosVersions() != null && scenario.getInfosVersions().getType() != null) {
-
- String type = scenario.getInfosVersions().getType().toUpperCase();
-
- if (type.contains("9")) {
- return computeCrue9(analyzer);
- } else {
- return computeCrue10(analyzer);
- }
-
- } else {
- analyzer.addError("io.etu.typeNotDefined");
- return null;
- }
-
- }
-
- /**
- * Calcul le scenario de type crue 9
- *
- * @return
- */
- public CrueData computeCrue9(CtuluAnalyze analyzer) {
- CrueData res = new CrueDataImpl();
-
- // -- recuperation du fichier DC --//
- if (scenario.getRunCourant() != null) {
- // scenario.getRunCourant().setListeModelesRuns(listeModelesRuns)
- // TODO continuer
-
- }
- projet.managerError.showDialog(projet.getImpl(), FCrueResource.getS("Résultats du Chargement scénario"));
- return res;
- }
-
- /**
- * calcul le scenario de type crue 10
- *
- * @return
- */
- public CrueData computeCrue10(CtuluAnalyze analyzer) {
- CrueData res = new CrueDataImpl();
- // TODO continuer
-
- projet.managerError.showDialog(projet.getImpl(), FCrueResource.getS("Résultats du Chargement scénario"));
- return res;
- }
-
-}
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueProjet.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueProjet.java 2009-05-07 17:18:59 UTC (rev 4734)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueProjet.java 2009-05-07 19:06:42 UTC (rev 4735)
@@ -1,24 +1,14 @@
package org.fudaa.fudaa.crue.projet;
-import java.awt.GridLayout;
import java.io.File;
-import javax.swing.BorderFactory;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
import org.fudaa.dodico.crue.io.Crue10FileFormatFactory;
import org.fudaa.dodico.crue.metier.EMHproject;
import org.fudaa.dodico.crue.metier.emh.CrueData;
-import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.ebli.commun.EbliComponentFactory;
import org.fudaa.fudaa.crue.common.CrueCommomImplementation;
import org.fudaa.fudaa.crue.common.FCrueResource;
import org.fudaa.fudaa.crue.view.CruePersistanceErrorManager;
-import com.memoire.bu.BuPanel;
-
/**
* Projet Crue. Contient le contenu du fichier xml ETU lu. Manage les scc�narios, modeles et sous modeles crue au sein
* de l'application fudaa.
@@ -40,7 +30,7 @@
/**
* Les donnees crueData chargees.
*/
- CrueData dataChargees;
+ CrueData dataSources;
/**
* Lancement d'un projet.
@@ -55,7 +45,7 @@
project = readProject(fichierEtu);
// -- initialisation des composants de l'IHM --//
- impl.init(project, fichierEtu);
+ impl.init(this, fichierEtu);
}
@@ -71,6 +61,17 @@
final EMHproject projet = Crue10FileFormatFactory.getETUFileFormat().read(_f, managerError.getAnalyser(), null);
// -- affichage du r�sultat --//
managerError.showDialog(impl, FCrueResource.getS("Chargement projet"));
+
+ if (projet.getScenarioCourant() != null) {
+ if (impl.question(FCrueResource.getS("Chargement"), FCrueResource.getS("Le scénario courant ") + " "
+ + projet.getScenarioCourant().getId() + FCrueResource.getS("va être chargé. Voulez-vosu continuer?"))) {
+
+ ScenarioLoader algo = new ScenarioLoader(this, projet.getScenarioCourant());
+ // -- chargement du projet --//
+ dataSources = algo.compute();
+
+ }
+ }
return projet;
}
@@ -96,58 +97,65 @@
*
* @return panel des infos associees.
*/
- public JPanel createInFosProjectPanel() {
- BuPanel infos = new BuPanel(new GridLayout(6, 2, 5, 1));
+ // public JPanel createInFosProjectPanel() {
+ // BuPanel infos = new BuPanel(new GridLayout(6, 2, 5, 1));
+ //
+ // infos.setBorder(BorderFactory.createTitledBorder(FCrueResource.getS("Infos Etude")));
+ //
+ // JLabel titreEtude1 = new JLabel(FCrueResource.getS("Etude:"));
+ // JTextField titreEtude2 = new JTextField(fichierEtu_.getName(), 10);
+ // JLabel titreCommentaire = new JLabel(FCrueResource.getS("Commentaire:"));
+ // JTextField titreCommentaire2 = new JTextField(10);
+ //
+ // JLabel path1 = new JLabel(project.getInfos().FICHETUDES + ":");
+ // JTextField path1_2 = new JTextField(10);
+ // JLabel path2 = new JLabel(project.getInfos().RUNS + ":");
+ // JTextField path2_2 = new JTextField(10);
+ // JLabel path3 = new JLabel(project.getInfos().RAPPORTS + ":");
+ // JTextField path3_2 = new JTextField(10);
+ //
+ // if (project.getInfos().getFichierEtu() != null) {
+ // titreCommentaire2.setText(project.getInfos().getFichierEtu());
+ // }
+ // if (project.getInfos().getDirectories() != null) {
+ // path1_2.setText(project.getInfos().getDirectories().get(project.getInfos().FICHETUDES));
+ // path2_2.setText(project.getInfos().getDirectories().get(project.getInfos().RUNS));
+ // path3_2.setText(project.getInfos().getDirectories().get(project.getInfos().RAPPORTS));
+ // }
+ //
+ // infos.add(titreEtude1);
+ // infos.add(titreEtude2);
+ //
+ // infos.add(titreCommentaire);
+ // infos.add(titreCommentaire2);
+ //
+ // infos.add(path1);
+ // infos.add(path1_2);
+ //
+ // infos.add(path2);
+ // infos.add(path2_2);
+ //
+ // infos.add(path3);
+ // infos.add(path3_2);
+ //
+ // EbliActionSimple actionModifier = new EbliActionSimple(FCrueResource.getS("Valider"), FCrueResource.CRUE
+ // .getIcon("crystal_oui.png"), "VALIDER") {
+ //
+ // };
+ // infos.add(new JLabel());
+ // infos.add(actionModifier.buildButton(EbliComponentFactory.INSTANCE));
+ //
+ // return infos;
+ // }
+ public File getFichierEtu_() {
+ return fichierEtu_;
+ }
- infos.setBorder(BorderFactory.createTitledBorder(FCrueResource.getS("Infos Etude")));
-
- JLabel titreEtude1 = new JLabel(FCrueResource.getS("Etude:"));
- JTextField titreEtude2 = new JTextField(fichierEtu_.getName(), 10);
- JLabel titreCommentaire = new JLabel(FCrueResource.getS("Commentaire:"));
- JTextField titreCommentaire2 = new JTextField(10);
-
- JLabel path1 = new JLabel(project.getInfos().FICHETUDES + ":");
- JTextField path1_2 = new JTextField(10);
- JLabel path2 = new JLabel(project.getInfos().RUNS + ":");
- JTextField path2_2 = new JTextField(10);
- JLabel path3 = new JLabel(project.getInfos().RAPPORTS + ":");
- JTextField path3_2 = new JTextField(10);
-
- if (project.getInfos().getFichierEtu() != null) {
- titreCommentaire2.setText(project.getInfos().getFichierEtu());
- }
- if (project.getInfos().getDirectories() != null) {
- path1_2.setText(project.getInfos().getDirectories().get(project.getInfos().FICHETUDES));
- path2_2.setText(project.getInfos().getDirectories().get(project.getInfos().RUNS));
- path3_2.setText(project.getInfos().getDirectories().get(project.getInfos().RAPPORTS));
- }
-
- infos.add(titreEtude1);
- infos.add(titreEtude2);
-
- infos.add(titreCommentaire);
- infos.add(titreCommentaire2);
-
- infos.add(path1);
- infos.add(path1_2);
-
- infos.add(path2);
- infos.add(path2_2);
-
- infos.add(path3);
- infos.add(path3_2);
-
- EbliActionSimple actionModifier = new EbliActionSimple(FCrueResource.getS("Valider"), FCrueResource.CRUE
- .getIcon("crystal_oui.png"), "VALIDER") {
-
- };
- infos.add(new JLabel());
- infos.add(actionModifier.buildButton(EbliComponentFactory.INSTANCE));
-
- return infos;
+ public CrueData getDataSources() {
+ return dataSources;
}
- public File getFichierEtu_() {
- return fichierEtu_;
+ public void setDataSources(CrueData dataSources) {
+ this.dataSources = dataSources;
}
}
Copied: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoader.java (from rev 4730, trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ChargerScenario.java)
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoader.java (rev 0)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoader.java 2009-05-07 19:06:42 UTC (rev 4735)
@@ -0,0 +1,440 @@
+package org.fudaa.fudaa.crue.projet;
+
+import java.awt.event.ActionEvent;
+import java.util.List;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.Crue10FileFormatFactory;
+import org.fudaa.dodico.crue.io.Crue9FileFormatFactory;
+import org.fudaa.dodico.crue.io.common.CrueIOResu;
+import org.fudaa.dodico.crue.metier.EMHModeleBase;
+import org.fudaa.dodico.crue.metier.EMHScenario;
+import org.fudaa.dodico.crue.metier.FichierCrue;
+import org.fudaa.dodico.crue.metier.emh.CrueData;
+import org.fudaa.dodico.crue.metier.emh.CrueDataImpl;
+import org.fudaa.dodico.crue.metier.emh.DonCLimMScenario;
+import org.fudaa.dodico.crue.metier.emh.DonFrt;
+import org.fudaa.dodico.crue.metier.emh.Loi;
+import org.fudaa.dodico.crue.metier.emh.OrdCalcScenario;
+import org.fudaa.dodico.crue.metier.emh.OrdPrtGeoModeleBase;
+import org.fudaa.dodico.crue.metier.emh.OrdResScenario;
+import org.fudaa.dodico.crue.metier.emh.ParamCalcScenario;
+import org.fudaa.dodico.crue.metier.emh.ParamNumModeleBase;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.fudaa.crue.common.CrueCommomImplementation;
+import org.fudaa.fudaa.crue.common.FCrueResource;
+
+/**
+ * Classe qui se charge de charger en memoire un scénario donné.
+ *
+ * @author Adrien Hadoux
+ */
+public class ScenarioLoader {
+ /**
+ * @author Adrien Hadoux
+ */
+ public static class CrueActionChargerScenario extends EbliActionSimple {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 7682734169100306919L;
+
+ EMHScenario scenario;
+ CrueData operationRes;
+ CrueProjet projet;
+ CrueCommomImplementation impl;
+
+ /**
+ * @param scenario
+ * @param projet
+ * @param impl
+ */
+ public CrueActionChargerScenario(EMHScenario scenario, CrueProjet projet) {
+ super(FCrueResource.getS("Charger Scénario en mémoire"), FCrueResource.CRUE.getIcon("crystal_ouvrir.png"),
+ "SCENARIOCHARGER");
+ this.projet = projet;
+ this.scenario = scenario;
+ this.impl = projet.getImpl();
+ }
+
+ public CrueData getOperationRes() {
+ return operationRes;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent _e) {
+ if (impl.question(FCrueResource.getS("Chargement"), FCrueResource
+ .getS("Etes-vous sur de vouloir charger ce scénario courant?"))) {
+ if (scenario != null) {
+ ScenarioLoader algo = new ScenarioLoader(projet, scenario);
+ operationRes = algo.compute();
+ }
+
+ }
+ }
+
+ }
+
+ EMHScenario scenario;
+
+ CrueProjet projet;
+
+ /**
+ * @param projet
+ * @param scenario
+ */
+ public ScenarioLoader(CrueProjet projet, EMHScenario scenario) {
+ super();
+ this.projet = projet;
+ this.scenario = scenario;
+ }
+
+ /**
+ * Realise le calcul.
+ *
+ * @return
+ */
+ public CrueData compute() {
+
+ projet.managerError.clear();
+ CtuluAnalyze analyzer = projet.managerError.getAnalyser();
+
+ // -- detection crue 9 ou 10 --//
+ if (scenario.getInfosVersions() != null && scenario.getInfosVersions().getType() != null) {
+
+ String type = scenario.getInfosVersions().getType().toUpperCase();
+
+ if (type.contains("9")) {
+ return computeCrue9();
+ } else {
+ return computeCrue10();
+ }
+
+ } else {
+ analyzer.addError("io.etu.typeNotDefined");
+ return null;
+ }
+
+ }
+
+ /**
+ * Calcul le scenario de type crue 9
+ *
+ * @return
+ */
+ public CrueData computeCrue9() {
+ CrueData res = new CrueDataImpl();
+ CtuluAnalyze analyzer = projet.managerError.getAnalyser();
+
+ // -- recuperation du fichier DC --//
+ if (scenario.getRunCourant() != null) {
+ // scenario.getRunCourant().setListeModelesRuns(listeModelesRuns)
+ // -- on charge les données DRSO du modele --//
+
+ res = ordonnanceChargementCrue9(scenario, analyzer);
+
+ }
+ projet.managerError.showDialog(projet.getImpl(), FCrueResource.getS("Résultats du Chargement scénario"));
+ return res;
+ }
+
+ /**
+ * calcul le scenario de type crue 10
+ *
+ * @return
+ */
+ public CrueData computeCrue10() {
+ CrueData res = null;
+ CtuluAnalyze analyzer = projet.managerError.getAnalyser();
+ if (scenario.getRunCourant() != null) {
+ // scenario.getRunCourant().setListeModelesRuns(listeModelesRuns)
+
+ // -- on charge les données DRSO du modele --//
+
+ res = ordonnanceChargementCrue10(scenario, analyzer);
+
+ } else {
+ analyzer.addError("compute.error.noCurrentRun");
+ }
+
+ projet.managerError.showDialog(projet.getImpl(), FCrueResource.getS("Résultats du Chargement scénario"));
+ return res;
+ }
+
+ /**
+ * Ordonnance le chargement d'un projet crue 10: sous modeles puis modeles puis scenarios
+ *
+ * @param scenario
+ * @return
+ */
+ private CrueData ordonnanceChargementCrue10(EMHScenario scenario, CtuluAnalyze analyzer) {
+ CrueData res = new CrueDataImpl();
+
+ // -- recherche des fichiers sous modeles --//
+ if (scenario.getGestionModele() == null || scenario.getGestionModele().getListeModeles() == null
+ || scenario.getGestionModele().getListeModeles().size() == 00) {
+ analyzer.addError("compute.error.noCurrentModeles");
+ return null;
+ }
+ for (EMHModeleBase modele : scenario.getGestionModele().getListeModeles()) {
+ if (modele.getListeSousModeles() == null || modele.getListeSousModeles().getListeModeles() == null
+ || modele.getListeSousModeles().getListeModeles().size() == 0) {
+ analyzer.addError("compute.error.noCurrentSousModeles");
+ return null;
+ }
+ // -- on charge en memoire le contenu des sous modeles --//
+
+ for (EMHModeleBase sousModele : modele.getListeSousModeles().getListeModeles()) {
+ // -- on charge le cinquor
+ // --Une liste fixe de fichiers de niveau sous-modèle : DRSO, DPTG, DFRT, DCSP
+ if (sousModele.getListeFichiersCrue() == null || sousModele.getListeFichiersCrue().size() >= 4) {
+
+ FichierCrue fichierDrso = sousModele.getListeFichiersCrue().get(0);
+ FichierCrue fichierDptg = sousModele.getListeFichiersCrue().get(1);
+ FichierCrue fichierDfrt = sousModele.getListeFichiersCrue().get(2);
+ FichierCrue fichierDcsp = sousModele.getListeFichiersCrue().get(3);
+
+ if (!fichierDrso.getFichier().exists()) {
+ analyzer.addError("compute.error.fileNotExist", CtuluAnalyze.createMap("fichier", fichierDrso.getFichier()
+ .getAbsolutePath()));
+ return null;
+ }
+ if (!fichierDptg.getFichier().exists()) {
+ analyzer.addError("compute.error.fileNotExist", CtuluAnalyze.createMap("fichier", fichierDptg.getFichier()
+ .getAbsolutePath()));
+ return null;
+ }
+ if (!fichierDfrt.getFichier().exists()) {
+ analyzer.addError("compute.error.fileNotExist", CtuluAnalyze.createMap("fichier", fichierDfrt.getFichier()
+ .getAbsolutePath()));
+ return null;
+ }
+ if (!fichierDcsp.getFichier().exists()) {
+ analyzer.addError("compute.error.fileNotExist", CtuluAnalyze.createMap("fichier", fichierDcsp.getFichier()
+ .getAbsolutePath()));
+ return null;
+ }
+
+ CrueData resVersion = Crue10FileFormatFactory.getDRSOFileFormat().read(fichierDrso.getFichier(), analyzer,
+ null);
+
+ if (resVersion == null) {
+ analyzer.addError("compute.error.drsoFailed", CtuluAnalyze.createMap("fichier", fichierDrso.getFichier()
+ .getAbsolutePath()));
+ return null;
+ }
+
+ // -- lecture DFRT avant DPTG--//
+ final List<DonFrt> jeuDonnees = Crue10FileFormatFactory.getDFRTFileFormat().read(fichierDfrt.getFichier(),
+ analyzer, null);
+
+ resVersion.setFrottements(jeuDonnees);
+
+ // -- lecture DPTG a besoin de DFRT--//
+ Crue10FileFormatFactory.getDPTGFileFormat().read(fichierDptg.getFichier(), analyzer, resVersion);
+
+ // -- lecture DCSP --//
+ Crue10FileFormatFactory.getDCSPFileFormat().read(fichierDcsp.getFichier(), analyzer, resVersion);
+
+ // -- on fusionne les donnes res au res totaux --//
+ res.mergeWithAnotherCrueData(resVersion);
+
+ } else {
+ analyzer.addError("compute.error.notAnySousModelesFiles");
+ return null;
+ }
+
+ }
+
+ // -- on charge les fichiers de niveau modele--//
+ // Une liste fixe de fichiers de niveau modèle : (OPTR), OPTG, OPTI, PNUM, DPTI
+
+ if (modele.getListeFichiersCrue() == null || modele.getListeFichiersCrue().size() < 5) {
+ analyzer.addError("compute.error.notAnyModelesFiles");
+ return null;
+ }
+ // OPTR N'existe pas tant que le prétraitement réseau n'est pas opérationnel
+ FichierCrue fichierOPTR = modele.getListeFichiersCrue().get(0);
+ FichierCrue fichierOPTG = modele.getListeFichiersCrue().get(1);
+ FichierCrue fichierOPTI = modele.getListeFichiersCrue().get(2);
+ FichierCrue fichierPNUM = modele.getListeFichiersCrue().get(3);
+ FichierCrue fichierDPTI = modele.getListeFichiersCrue().get(4);
+
+ // if (!fichierOPTR.getFichier().exists()) {
+ // analyzer.addError("compute.error.fileNotExist", CtuluAnalyze.createMap("fichier", fichierOPTR.getFichier()
+ // .getAbsolutePath()));
+ // return null;
+ // }
+ if (!fichierOPTG.getFichier().exists()) {
+ analyzer.addError("compute.error.fileNotExist", CtuluAnalyze.createMap("fichier", fichierOPTG.getFichier()
+ .getAbsolutePath()));
+ return null;
+ }
+ if (!fichierOPTI.getFichier().exists()) {
+ analyzer.addError("compute.error.fileNotExist", CtuluAnalyze.createMap("fichier", fichierOPTI.getFichier()
+ .getAbsolutePath()));
+ return null;
+ }
+ if (!fichierPNUM.getFichier().exists()) {
+ analyzer.addError("compute.error.fileNotExist", CtuluAnalyze.createMap("fichier", fichierPNUM.getFichier()
+ .getAbsolutePath()));
+ return null;
+ }
+ if (!fichierDPTI.getFichier().exists()) {
+ analyzer.addError("compute.error.fileNotExist", CtuluAnalyze.createMap("fichier", fichierDPTI.getFichier()
+ .getAbsolutePath()));
+ return null;
+ }
+
+ // - on ajoute les infos au cruedata
+
+ // DPTI
+ Crue10FileFormatFactory.getDPTIFileFormat().read(fichierDPTI.getFichier(), analyzer, res);
+
+ // OPTG
+ final OrdPrtGeoModeleBase data = Crue10FileFormatFactory.getOPTGFileFormat().read(fichierOPTG.getFichier(),
+ analyzer, null);
+ res.setPretraitementsGeom(data);
+
+ // PNUM
+ final ParamNumModeleBase dataPnum = Crue10FileFormatFactory.getPNUMFileFormat().read(fichierPNUM.getFichier(),
+ analyzer, null);
+ res.setParamNumModeleBase(dataPnum);
+
+ // OPTI
+ // TODO
+
+ // OPTR
+ // Attendre la version ok.
+
+ }
+
+ // -- on applique les fichier de niveau scenario --//
+ // Une liste fixe de fichiers de niveau scénario : OCAL, ORES, PCAL, DCLM, DLHY
+ FichierCrue fichierOCAL = scenario.getListeFichiersScenario().get(0);
+ FichierCrue fichierORES = scenario.getListeFichiersScenario().get(1);
+ FichierCrue fichierPCAL = scenario.getListeFichiersScenario().get(2);
+ FichierCrue fichierDCLM = scenario.getListeFichiersScenario().get(3);
+ FichierCrue fichierDLHY = scenario.getListeFichiersScenario().get(4);
+
+ if (!fichierOCAL.getFichier().exists()) {
+ analyzer.addError("compute.error.fileNotExist", CtuluAnalyze.createMap("fichier", fichierOCAL.getFichier()
+ .getAbsolutePath()));
+ return null;
+ }
+ if (!fichierORES.getFichier().exists()) {
+ analyzer.addError("compute.error.fileNotExist", CtuluAnalyze.createMap("fichier", fichierORES.getFichier()
+ .getAbsolutePath()));
+ return null;
+ }
+ if (!fichierPCAL.getFichier().exists()) {
+ analyzer.addError("compute.error.fileNotExist", CtuluAnalyze.createMap("fichier", fichierPCAL.getFichier()
+ .getAbsolutePath()));
+ return null;
+ }
+ if (!fichierDCLM.getFichier().exists()) {
+ analyzer.addError("compute.error.fileNotExist", CtuluAnalyze.createMap("fichier", fichierDCLM.getFichier()
+ .getAbsolutePath()));
+ return null;
+ }
+ if (!fichierDLHY.getFichier().exists()) {
+ analyzer.addError("compute.error.fileNotExist", CtuluAnalyze.createMap("fichier", fichierDLHY.getFichier()
+ .getAbsolutePath()));
+ return null;
+ }
+
+ // -- lecture dlhy --//
+ final List<Loi> listeLois = Crue10FileFormatFactory.getDLHYFileFormat().read(fichierDLHY.getFichier(), analyzer,
+ res);
+
+ // -- ajout des lois de dlhy --//
+ res.setLois(listeLois);
+
+ // -- lecture de dclm --//
+ final DonCLimMScenario donCLimMScenario = Crue10FileFormatFactory.getDCLMFileFormat().read(
+ fichierDCLM.getFichier(), analyzer, res);
+ res.setConditionsLim(donCLimMScenario);
+
+ // OCAL
+ final OrdCalcScenario dataOCAL = Crue10FileFormatFactory.getOCALFileFormat().read(fichierOCAL.getFichier(),
+ analyzer, res);
+ res.setOrdCalc(dataOCAL);
+
+ // ORES
+ final OrdResScenario dataORES = Crue10FileFormatFactory.getORESFileFormat().read(fichierORES.getFichier(),
+ analyzer, null);
+ res.setOrdRes(dataORES);
+
+ // PCAL
+ final ParamCalcScenario dataPCAL = Crue10FileFormatFactory.getPCALFileFormat().read(fichierPCAL.getFichier(),
+ analyzer, null);
+ res.setParamCalc(dataPCAL);
+
+ return res;
+ }
+
+ /**
+ * Ordonnance le chargement d'un projet crue 10: sous modeles puis modeles puis scenarios
+ *
+ * @param scenario
+ * @return
+ */
+ private CrueData ordonnanceChargementCrue9(EMHScenario scenario, CtuluAnalyze analyzer) {
+ CrueData res = new CrueDataImpl();
+
+ // -- recherche des fichiers sous modeles --//
+ if (scenario.getGestionModele() == null || scenario.getGestionModele().getListeModeles() == null
+ || scenario.getGestionModele().getListeModeles().size() == 00) {
+ analyzer.addError("compute.error.noCurrentModeles");
+ return null;
+ }
+ for (EMHModeleBase modele : scenario.getGestionModele().getListeModeles()) {
+
+ // -- on charge les fichiers de niveau modele--//
+ // Une liste fixe de fichiers de niveau modèle :DC et DH
+
+ if (modele.getListeFichiersCrue() == null || modele.getListeFichiersCrue().size() < 2) {
+ analyzer.addError("compute.error.notAnyModelesFiles");
+ return null;
+ }
+ // OPTR N'existe pas tant que le prétraitement réseau n'est pas opérationnel
+ FichierCrue fichierDC = modele.getListeFichiersCrue().get(0);
+ FichierCrue fichierDH = modele.getListeFichiersCrue().get(1);
+
+ if (!fichierDC.getFichier().exists()) {
+ analyzer.addError("compute.error.fileNotExist", CtuluAnalyze.createMap("fichier", fichierDC.getFichier()
+ .getAbsolutePath()));
+ return null;
+ }
+ if (!fichierDH.getFichier().exists()) {
+ analyzer.addError("compute.error.fileNotExist", CtuluAnalyze.createMap("fichier", fichierDH.getFichier()
+ .getAbsolutePath()));
+ return null;
+ }
+
+ // - on ajoute les infos au cruedata
+
+ // DC
+ final CrueIOResu<CrueData> resuPartiels = Crue9FileFormatFactory.getDCFileFormat().read(fichierDC.getFichier(),
+ analyzer, null);
+
+ if (resuPartiels == null) {
+ analyzer.addError("compute.error.dcFailed", CtuluAnalyze.createMap("fichier", fichierDC.getFichier()
+ .getAbsolutePath()));
+ return null;
+ }
+
+ // DH
+ CrueIOResu<CrueData> resu2 = Crue9FileFormatFactory.getDHFileFormat().read(fichierDH.getFichier(), analyzer,
+ resuPartiels.getMetier());
+
+ res = resu2.getMetier();
+
+ }
+
+ // -- on applique les fichier de niveau scenario --//
+
+ return res;
+ }
+
+}
Property changes on: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoader.java
___________________________________________________________________
Added: svn:mergeinfo
+
Added: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioSaver.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioSaver.java (rev 0)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioSaver.java 2009-05-07 19:06:42 UTC (rev 4735)
@@ -0,0 +1,210 @@
+package org.fudaa.fudaa.crue.projet;
+
+import java.io.File;
+
+import org.fudaa.dodico.crue.io.Crue10FileFormatFactory;
+import org.fudaa.dodico.crue.io.Crue9FileFormatFactory;
+import org.fudaa.dodico.crue.io.common.CrueIOResu;
+import org.fudaa.dodico.crue.metier.EMHScenario;
+import org.fudaa.dodico.crue.metier.emh.CrueData;
+import org.fudaa.fudaa.crue.common.FCrueResource;
+
+/**
+ * Se charge de sauvegarder un scenario. Cette premiere version utilisee dans le lot 0 uniqument pour la generation de
+ * crue 9 en crue 10. Utilise un fichier modele et genere tous les fichier avec les bons suffixes.
+ *
+ * @author Adrien Hadoux
+ */
+public class ScenarioSaver {
+
+ String fichierModele;
+ EMHScenario scenarioToPersist;
+
+ CrueProjet projet;
+
+ public ScenarioSaver(String fichierModele, EMHScenario scenarioToPersist, CrueProjet projet) {
+ super();
+ this.fichierModele = fichierModele;
+ this.scenarioToPersist = scenarioToPersist;
+ this.projet = projet;
+ }
+
+ /**
+ * S'occupe de persister le scenario en crue 9.
+ *
+ * @return
+ */
+ public boolean generateInCrue9() {
+
+ File fileDc = new File(fichierModele + ".dc");
+
+ // -- generation DC --//
+ boolean ok = Crue9FileFormatFactory.getDCFileFormat().write(new CrueIOResu<CrueData>(projet.getDataSources()),
+ fileDc, projet.getManagerError().getAnalyser());
+
+ projet.getManagerError().getAnalyser().addInfo(
+ FCrueResource.getS("Fichier DC généré dans " + fileDc.getAbsolutePath()));
+
+ // -- generation DH --//
+
+ // TODO generation DH!!!
+
+ return ok;
+
+ }
+
+ /**
+ * S'occupe de persister le scenario en crue 10.
+ *
+ * @return
+ */
+ public boolean generateInCrue10() {
+
+ CrueData data = projet.getDataSources();
+
+ // TODO CAROLE implementer les prefixe
+ String prefixeModel = "MO";
+ String prefixeSousModel = "SMO";
+ String prefixeScenario = "S";
+
+ // -- generation DRSO --//
+ File fileDrso = new File(fichierModele + ".drso.xml");
+
+ boolean ok = Crue10FileFormatFactory.getDRSOFileFormat().write(data, fileDrso,
+ projet.getManagerError().getAnalyser());
+
+ projet.getManagerError().getAnalyser().addInfo(
+ FCrueResource.getS("Fichier DRSO généré dans " + fileDrso.getAbsolutePath()));
+
+ // -- generation DFRT --//
+ File fileDfrt = new File(fichierModele + ".dfrt.xml");
+
+ if (data.getFrottements() != null) {
+ ok = ok
+ && Crue10FileFormatFactory.getDFRTFileFormat().write(data.getFrottements(), fileDfrt,
+ projet.getManagerError().getAnalyser());
+
+ projet.getManagerError().getAnalyser().addInfo(
+ FCrueResource.getS("Fichier DFRT généré dans " + fileDfrt.getAbsolutePath()));
+ }
+
+ // -- DCSP --//
+ File fileDcsp = new File(fichierModele + ".dcsp.xml");
+
+ ok = ok
+ && Crue10FileFormatFactory.getDCSPFileFormat().write(data.getAllEMH(), fileDcsp,
+ projet.getManagerError().getAnalyser());
+
+ projet.getManagerError().getAnalyser().addInfo(
+ FCrueResource.getS("Fichier DCSP généré dans " + fileDcsp.getAbsolutePath()));
+
+ // -- DPTG --//
+ File fileDptg = new File(fichierModele + ".dptg.xml");
+
+ ok = ok
+ && Crue10FileFormatFactory.getDPTGFileFormat().write(data, fileDptg, projet.getManagerError().getAnalyser());
+
+ projet.getManagerError().getAnalyser().addInfo(
+ FCrueResource.getS("Fichier DPTG généré dans " + fileDptg.getAbsolutePath()));
+
+ // -- Niveau modele --//
+ // Une liste fixe de fichiers de niveau modèle : (OPTR), OPTG, OPTI, PNUM, DPTI, RPTR, RPTG, RPTI, RCAL, CPTR, CPTG,
+ // CPTI, CCAL, APTR, APTG, APTI, ACAL
+
+ // -- OPTG --//
+ if (data.getPretraitementsGeom() != null) {
+ File fileOptg = new File(fichierModele + ".optg.xml");
+
+ ok = ok
+ && Crue10FileFormatFactory.getOPTGFileFormat().write(data.getPretraitementsGeom(), fileOptg,
+ projet.getManagerError().getAnalyser());
+
+ projet.getManagerError().getAnalyser().addInfo(
+ FCrueResource.getS("Fichier OPTG généré dans " + fileOptg.getAbsolutePath()));
+ }
+
+ // - PNUM --//
+ if (data.getParamNumModeleBase() != null) {
+ File filePnum = new File(fichierModele + ".pnum.xml");
+
+ ok = ok
+ && Crue10FileFormatFactory.getPNUMFileFormat().write(data.getParamNumModeleBase(), filePnum,
+ projet.getManagerError().getAnalyser());
+
+ projet.getManagerError().getAnalyser().addInfo(
+ FCrueResource.getS("Fichier PNUM généré dans " + filePnum.getAbsolutePath()));
+ }
+
+ // - DPTI --//
+ File fileDpti = new File(fichierModele + ".dpti.xml");
+
+ ok = ok
+ && Crue10FileFormatFactory.getDPTIFileFormat().write(data, fileDpti, projet.getManagerError().getAnalyser());
+
+ projet.getManagerError().getAnalyser().addInfo(
+ FCrueResource.getS("Fichier DPTI généré dans " + fileDpti.getAbsolutePath()));
+
+ // -- niveau scenario Une liste fixe de fichiers de niveau scénario : OCAL, ORES, PCAL, DCLM, DLHY --//
+ // -- OCAL --//
+ if (data.getOrdCalc() != null) {
+ File fileOcal = new File(fichierModele + ".ocal.xml");
+
+ ok = ok
+ && Crue10FileFormatFactory.getOCALFileFormat().write(data.getOrdCalc(), fileOcal,
+ projet.getManagerError().getAnalyser());
+
+ projet.getManagerError().getAnalyser().addInfo(
+ FCrueResource.getS("Fichier OCAL généré dans " + fileOcal.getAbsolutePath()));
+ }
+
+ // -- ORES --//
+ if (data.getOrdRes() != null) {
+ File fileORES = new File(fichierModele + ".ores.xml");
+
+ ok = ok
+ && Crue10FileFormatFactory.getORESFileFormat().write(data.getOrdRes(), fileORES,
+ projet.getManagerError().getAnalyser());
+
+ projet.getManagerError().getAnalyser().addInfo(
+ FCrueResource.getS("Fichier ORES généré dans " + fileORES.getAbsolutePath()));
+ }
+ // -- PCAL --//
+ if (data.getParamCalc() != null) {
+ File filePCAL = new File(fichierModele + ".pcal.xml");
+
+ ok = ok
+ && Crue10FileFormatFactory.getPCALFileFormat().write(data.getParamCalc(), filePCAL,
+ projet.getManagerError().getAnalyser());
+
+ projet.getManagerError().getAnalyser().addInfo(
+ FCrueResource.getS("Fichier PCAL généré dans " + filePCAL.getAbsolutePath()));
+ }
+
+ // -- DLHY --//
+ if (data.getLois() != null) {
+ File fileDLHY = new File(fichierModele + ".dlhy.xml");
+
+ ok = ok
+ && Crue10FileFormatFactory.getDLHYFileFormat().write(data.getLois(), fileDLHY,
+ projet.getManagerError().getAnalyser());
+
+ projet.getManagerError().getAnalyser().addInfo(
+ FCrueResource.getS("Fichier DLHY généré dans " + fileDLHY.getAbsolutePath()));
+ }
+
+ // -- DCLM --//
+ if (data.getConditionsLim() != null) {
+ File fileDCLM = new File(fichierModele + ".dclm.xml");
+
+ ok = ok
+ && Crue10FileFormatFactory.getDCLMFileFormat().write(data.getConditionsLim(), fileDCLM,
+ projet.getManagerError().getAnalyser());
+
+ projet.getManagerError().getAnalyser().addInfo(
+ FCrueResource.getS("Fichier DCLM généré dans " + fileDCLM.getAbsolutePath()));
+ }
+
+ return ok;
+ }
+
+}
Deleted: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueComparaisonScenarioFille.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueComparaisonScenarioFille.java 2009-05-07 17:18:59 UTC (rev 4734)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueComparaisonScenarioFille.java 2009-05-07 19:06:42 UTC (rev 4735)
@@ -1,7 +0,0 @@
-package org.fudaa.fudaa.crue.view;
-
-import com.memoire.bu.BuInternalFrame;
-
-public class CrueComparaisonScenarioFille extends BuInternalFrame {
-
-}
Added: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheInfosGenerales.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheInfosGenerales.java (rev 0)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheInfosGenerales.java 2009-05-07 19:06:42 UTC (rev 4735)
@@ -0,0 +1,198 @@
+package org.fudaa.fudaa.crue.view;
+
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JLabel;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+
+import org.fudaa.dodico.crue.metier.EMHProjectInfos;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.ebli.commun.EbliComponentFactory;
+import org.fudaa.fudaa.crue.common.CommomLib;
+import org.fudaa.fudaa.crue.common.FCrueResource;
+import org.fudaa.fudaa.crue.projet.CrueProjet;
+
+import com.memoire.bu.BuButton;
+import com.memoire.bu.BuInternalFrame;
+import com.memoire.bu.BuPanel;
+
+public class CrueFicheInfosGenerales extends BuInternalFrame {
+
+ CrueProjet projet;
+
+ public CrueFicheInfosGenerales(CrueProjet projet) {
+ super(FCrueResource.getS("Transformation Crue 9 <=> Crue 10"), true, true, true, true);
+ this.projet = projet;
+
+ initBuild();
+
+ }
+
+ /**
+ * Init la construction graphique.
+ */
+ public void initBuild() {
+
+ setSize(550, 260);
+ BuPanel infos = new BuPanel(new GridLayout(8, 2, 10, 0));
+ this.getContentPane().add(infos);
+
+ // infos.setBorder(BorderFactory.createTitledBorder(FCrueResource.getS("Infos Etude")));
+ setTitle(FCrueResource.getS("Infos Etude"));
+
+ JLabel titreEtude1 = new JLabel(FCrueResource.getS("Etude:"));
+ final JTextField titreEtude2 = new JTextField(projet.getFichierEtu_().getName(), 20);
+ JLabel titreCommentaire = new JLabel(FCrueResource.getS("Commentaire:"));
+ final JTextArea titreCommentaire2 = new JTextArea(1, 20);
+
+ JLabel path1 = new JLabel(projet.getProject().getInfos().FICHETUDES + ":");
+ final JTextField path1_2 = new JTextField(15);
+ JLabel path2 = new JLabel(projet.getProject().getInfos().RUNS + ":");
+ final JTextField path2_2 = new JTextField(15);
+ JLabel path3 = new JLabel(projet.getProject().getInfos().RAPPORTS + ":");
+ final JTextField path3_2 = new JTextField(15);
+
+ if (projet.getProject().getInfos().getFichierEtu() != null) {
+ titreCommentaire2.setText(projet.getProject().getInfos().getFichierEtu());
+ }
+ if (projet.getProject().getInfos().getDirectories() != null) {
+ path1_2.setText(projet.getProject().getInfos().getDirectories().get(projet.getProject().getInfos().FICHETUDES));
+ path2_2.setText(projet.getProject().getInfos().getDirectories().get(projet.getProject().getInfos().RUNS));
+ path3_2.setText(projet.getProject().getInfos().getDirectories().get(projet.getProject().getInfos().RAPPORTS));
+ }
+
+ JLabel titredateCreation = new JLabel(FCrueResource.getS("Creation:"));
+ JLabel titredateCreation2 = new JLabel();
+ if (projet.getProject().getInfos().getInfosVersions() != null
+ && projet.getProject().getInfos().getInfosVersions().getDateCreation() != null) {
+ titredateCreation2.setText(projet.getProject().getInfos().getInfosVersions().getDateCreation());
+ }
+
+ JLabel auteurCreation = new JLabel(FCrueResource.getS("Auteur:"));
+ JLabel auteurCreation2 = new JLabel();
+ if (projet.getProject().getInfos().getInfosVersions() != null
+ && projet.getProject().getInfos().getInfosVersions().getAuteurDerniereModif() != null) {
+ auteurCreation2.setText(projet.getProject().getInfos().getInfosVersions().getAuteurDerniereModif());
+ }
+
+ infos.add(titreEtude1);
+ BuPanel pptitreEtude2 = new BuPanel(new FlowLayout(FlowLayout.LEFT));
+ pptitreEtude2.add(titreEtude2);
+ infos.add(pptitreEtude2);
+
+ infos.add(titredateCreation);
+ infos.add(titredateCreation2);
+ infos.add(auteurCreation);
+ infos.add(auteurCreation2);
+
+ infos.add(titreCommentaire);
+ BuPanel pptitreCommentaire2 = new BuPanel(new FlowLayout(FlowLayout.LEFT));
+ pptitreCommentaire2.add(titreCommentaire2);
+ titreCommentaire2.setDragEnabled(true);
+ infos.add(pptitreCommentaire2);
+
+ infos.ad...
[truncated message content] |
|
From: <had...@us...> - 2009-05-08 13:07:23
|
Revision: 4738
http://fudaa.svn.sourceforge.net/fudaa/?rev=4738&view=rev
Author: hadouxad
Date: 2009-05-08 13:07:20 +0000 (Fri, 08 May 2009)
Log Message:
-----------
COMMIT des liste de ctuluanalyse
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormat.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueCommomImplementation.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueProjet.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoader.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioSaver.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleComparaisonScenario.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleGenerationCrue9.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/AppCrueTest.java
Added Paths:
-----------
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueErrorManager.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleEMH.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleInfosGenerales.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheEMHFille.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheInfosGenerales.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CruePersistanceErrorManager.java
Modified: 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/Crue10FileFormat.java 2009-05-08 09:43:10 UTC (rev 4737)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormat.java 2009-05-08 13:07:20 UTC (rev 4738)
@@ -114,6 +114,7 @@
* @return
*/
public final M read(final File f, final CtuluAnalyze analyzer, final CrueData dataLinked) {
+ analyzer.setDesc(f.getName());
return readerWriter.readXML(f, analyzer, dataLinked);
}
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueCommomImplementation.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueCommomImplementation.java 2009-05-08 09:43:10 UTC (rev 4737)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueCommomImplementation.java 2009-05-08 13:07:20 UTC (rev 4738)
@@ -13,8 +13,8 @@
import org.fudaa.fudaa.crue.builder.CrueScenarioBuilder;
import org.fudaa.fudaa.crue.explorer.CrueLauncher;
import org.fudaa.fudaa.crue.projet.CrueProjet;
-import org.fudaa.fudaa.crue.view.CrueFicheEMHFille;
-import org.fudaa.fudaa.crue.view.CrueFicheInfosGenerales;
+import org.fudaa.fudaa.crue.view.CrueFilleEMH;
+import org.fudaa.fudaa.crue.view.CrueFilleInfosGenerales;
import org.fudaa.fudaa.crue.view.CrueFicheModeleFille;
import org.fudaa.fudaa.crue.view.CrueFilleComparaisonScenario;
import org.fudaa.fudaa.crue.view.CrueFilleGenerationCrue9;
@@ -305,7 +305,7 @@
this.addInternalFrame(new CrueFilleScenarioManager(crueProjet_));
}
- public CrueFicheEMHFille emhViewFille = null;
+ public CrueFilleEMH emhViewFille = null;
/**
*
@@ -318,10 +318,10 @@
}
if (emhViewFille == null) {
- emhViewFille = new CrueFicheEMHFille(crueProjet_);
+ emhViewFille = new CrueFilleEMH(crueProjet_);
}
// TODO a remplacer par scenarioFille (creer nouveau pour debugagge rapide)
- this.addInternalFrame(new CrueFicheEMHFille(crueProjet_));
+ this.addInternalFrame(new CrueFilleEMH(crueProjet_));
}
public CrueFicheModeleFille modeleFille = null;
@@ -346,14 +346,14 @@
this.addInternalFrame(new CrueFicheModeleFille(crueProjet_));
}
- public CrueFicheInfosGenerales etudeFille = null;
+ public CrueFilleInfosGenerales etudeFille = null;
/**
*
*/
public void addEtudeManagerFille() {
if (etudeFille == null) {
- etudeFille = new CrueFicheInfosGenerales(crueProjet_);
+ etudeFille = new CrueFilleInfosGenerales(crueProjet_);
}
this.addInternalFrame(etudeFille);
}
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueProjet.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueProjet.java 2009-05-08 09:43:10 UTC (rev 4737)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueProjet.java 2009-05-08 13:07:20 UTC (rev 4738)
@@ -7,7 +7,7 @@
import org.fudaa.dodico.crue.metier.emh.CrueData;
import org.fudaa.fudaa.crue.common.CrueCommomImplementation;
import org.fudaa.fudaa.crue.common.FCrueResource;
-import org.fudaa.fudaa.crue.view.CruePersistanceErrorManager;
+import org.fudaa.fudaa.crue.view.CrueErrorManager;
/**
* Projet Crue. Contient le contenu du fichier xml ETU lu. Manage les scc�narios, modeles et sous modeles crue au sein
@@ -25,7 +25,7 @@
final CrueCommomImplementation impl;
final File fichierEtu_;
- final CruePersistanceErrorManager managerError;
+ final CrueErrorManager managerError;
/**
* Les donnees crueData chargees.
@@ -40,7 +40,7 @@
public CrueProjet(final File fichierEtu, final CrueCommomImplementation impl) {
this.impl = impl;
fichierEtu_ = fichierEtu;
- managerError = new CruePersistanceErrorManager();
+ managerError = new CrueErrorManager();
// -- init de la structure projet --//
project = readProject(fichierEtu);
@@ -58,7 +58,7 @@
public EMHproject readProject(final File _f) {
managerError.clear();
// -- lecture du fichier --//
- final EMHproject projet = Crue10FileFormatFactory.getETUFileFormat().read(_f, managerError.getAnalyser(), null);
+ final EMHproject projet = Crue10FileFormatFactory.getETUFileFormat().read(_f, managerError.getNewAnalyser(), null);
// -- affichage du r�sultat --//
managerError.showDialog(impl, FCrueResource.getS("Chargement projet"));
@@ -87,7 +87,7 @@
return impl;
}
- public CruePersistanceErrorManager getManagerError() {
+ public CrueErrorManager getManagerError() {
return managerError;
}
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoader.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoader.java 2009-05-08 09:43:10 UTC (rev 4737)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoader.java 2009-05-08 13:07:20 UTC (rev 4738)
@@ -97,7 +97,6 @@
public CrueData compute() {
projet.managerError.clear();
- CtuluAnalyze analyzer = projet.managerError.getAnalyser();
// -- detection crue 9 ou 10 --//
if (scenario.getInfosVersions() != null && scenario.getInfosVersions().getType() != null) {
@@ -111,7 +110,7 @@
}
} else {
- analyzer.addError("io.etu.typeNotDefined");
+ projet.managerError.getLastAnalyser().addError("io.etu.typeNotDefined");
return null;
}
@@ -124,8 +123,8 @@
*/
public CrueData computeCrue9() {
CrueData res = new CrueDataImpl();
- CtuluAnalyze analyzer = projet.managerError.getAnalyser();
-
+ CtuluAnalyze analyzer = projet.managerError.getNewAnalyser();
+ analyzer.setDesc(FCrueResource.getS("Fichiers existant dans le scenario") + " " + scenario.getId());
// -- recuperation du fichier DC --//
if (scenario.getRunCourant() != null) {
// scenario.getRunCourant().setListeModelesRuns(listeModelesRuns)
@@ -145,7 +144,8 @@
*/
public CrueData computeCrue10() {
CrueData res = null;
- CtuluAnalyze analyzer = projet.managerError.getAnalyser();
+ CtuluAnalyze analyzer = projet.managerError.getNewAnalyser();
+ analyzer.setDesc(FCrueResource.getS("Fichiers existant dans le scenario") + " " + scenario.getId());
if (scenario.getRunCourant() != null) {
// scenario.getRunCourant().setListeModelesRuns(listeModelesRuns)
@@ -226,15 +226,17 @@
// -- lecture DFRT avant DPTG--//
final List<DonFrt> jeuDonnees = Crue10FileFormatFactory.getDFRTFileFormat().read(fichierDfrt.getFichier(),
- analyzer, null);
+ projet.getManagerError().getNewAnalyser(), null);
resVersion.setFrottements(jeuDonnees);
// -- lecture DPTG a besoin de DFRT--//
- Crue10FileFormatFactory.getDPTGFileFormat().read(fichierDptg.getFichier(), analyzer, resVersion);
+ Crue10FileFormatFactory.getDPTGFileFormat().read(fichierDptg.getFichier(),
+ projet.getManagerError().getNewAnalyser(), resVersion);
// -- lecture DCSP --//
- Crue10FileFormatFactory.getDCSPFileFormat().read(fichierDcsp.getFichier(), analyzer, resVersion);
+ Crue10FileFormatFactory.getDCSPFileFormat().read(fichierDcsp.getFichier(),
+ projet.getManagerError().getNewAnalyser(), resVersion);
// -- on fusionne les donnes res au res totaux --//
res.mergeWithAnotherCrueData(resVersion);
@@ -289,16 +291,17 @@
// - on ajoute les infos au cruedata
// DPTI
- Crue10FileFormatFactory.getDPTIFileFormat().read(fichierDPTI.getFichier(), analyzer, res);
+ Crue10FileFormatFactory.getDPTIFileFormat().read(fichierDPTI.getFichier(),
+ projet.getManagerError().getNewAnalyser(), res);
// OPTG
final OrdPrtGeoModeleBase data = Crue10FileFormatFactory.getOPTGFileFormat().read(fichierOPTG.getFichier(),
- analyzer, null);
+ projet.getManagerError().getNewAnalyser(), null);
res.setPretraitementsGeom(data);
// PNUM
final ParamNumModeleBase dataPnum = Crue10FileFormatFactory.getPNUMFileFormat().read(fichierPNUM.getFichier(),
- analyzer, null);
+ projet.getManagerError().getNewAnalyser(), null);
res.setParamNumModeleBase(dataPnum);
// OPTI
@@ -344,30 +347,30 @@
}
// -- lecture dlhy --//
- final List<Loi> listeLois = Crue10FileFormatFactory.getDLHYFileFormat().read(fichierDLHY.getFichier(), analyzer,
- res);
+ final List<Loi> listeLois = Crue10FileFormatFactory.getDLHYFileFormat().read(fichierDLHY.getFichier(),
+ projet.getManagerError().getNewAnalyser(), res);
// -- ajout des lois de dlhy --//
res.setLois(listeLois);
// -- lecture de dclm --//
final DonCLimMScenario donCLimMScenario = Crue10FileFormatFactory.getDCLMFileFormat().read(
- fichierDCLM.getFichier(), analyzer, res);
+ fichierDCLM.getFichier(), projet.getManagerError().getNewAnalyser(), res);
res.setConditionsLim(donCLimMScenario);
// OCAL
final OrdCalcScenario dataOCAL = Crue10FileFormatFactory.getOCALFileFormat().read(fichierOCAL.getFichier(),
- analyzer, res);
+ projet.getManagerError().getNewAnalyser(), res);
res.setOrdCalc(dataOCAL);
// ORES
final OrdResScenario dataORES = Crue10FileFormatFactory.getORESFileFormat().read(fichierORES.getFichier(),
- analyzer, null);
+ projet.getManagerError().getNewAnalyser(), null);
res.setOrdRes(dataORES);
// PCAL
final ParamCalcScenario dataPCAL = Crue10FileFormatFactory.getPCALFileFormat().read(fichierPCAL.getFichier(),
- analyzer, null);
+ projet.getManagerError().getNewAnalyser(), null);
res.setParamCalc(dataPCAL);
return res;
@@ -425,8 +428,8 @@
}
// DH
- CrueIOResu<CrueData> resu2 = Crue9FileFormatFactory.getDHFileFormat().read(fichierDH.getFichier(), analyzer,
- resuPartiels.getMetier());
+ CrueIOResu<CrueData> resu2 = Crue9FileFormatFactory.getDHFileFormat().read(fichierDH.getFichier(),
+ projet.getManagerError().getNewAnalyser(), resuPartiels.getMetier());
res = resu2.getMetier();
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioSaver.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioSaver.java 2009-05-08 09:43:10 UTC (rev 4737)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioSaver.java 2009-05-08 13:07:20 UTC (rev 4738)
@@ -40,9 +40,9 @@
// -- generation DC --//
boolean ok = Crue9FileFormatFactory.getDCFileFormat().write(new CrueIOResu<CrueData>(projet.getDataSources()),
- fileDc, projet.getManagerError().getAnalyser());
+ fileDc, projet.getManagerError().getNewAnalyser());
- projet.getManagerError().getAnalyser().addInfo(
+ projet.getManagerError().getLastAnalyser().addInfo(
FCrueResource.getS("Fichier DC généré dans " + fileDc.getAbsolutePath()));
// -- generation DH --//
@@ -71,9 +71,9 @@
File fileDrso = new File(fichierModele + ".drso.xml");
boolean ok = Crue10FileFormatFactory.getDRSOFileFormat().write(data, fileDrso,
- projet.getManagerError().getAnalyser());
+ projet.getManagerError().getNewAnalyser());
- projet.getManagerError().getAnalyser().addInfo(
+ projet.getManagerError().getLastAnalyser().addInfo(
FCrueResource.getS("Fichier DRSO généré dans " + fileDrso.getAbsolutePath()));
// -- generation DFRT --//
@@ -82,9 +82,9 @@
if (data.getFrottements() != null) {
ok = ok
&& Crue10FileFormatFactory.getDFRTFileFormat().write(data.getFrottements(), fileDfrt,
- projet.getManagerError().getAnalyser());
+ projet.getManagerError().getNewAnalyser());
- projet.getManagerError().getAnalyser().addInfo(
+ projet.getManagerError().getLastAnalyser().addInfo(
FCrueResource.getS("Fichier DFRT généré dans " + fileDfrt.getAbsolutePath()));
}
@@ -93,18 +93,18 @@
ok = ok
&& Crue10FileFormatFactory.getDCSPFileFormat().write(data.getAllEMH(), fileDcsp,
- projet.getManagerError().getAnalyser());
+ projet.getManagerError().getNewAnalyser());
- projet.getManagerError().getAnalyser().addInfo(
+ projet.getManagerError().getLastAnalyser().addInfo(
FCrueResource.getS("Fichier DCSP généré dans " + fileDcsp.getAbsolutePath()));
// -- DPTG --//
File fileDptg = new File(fichierModele + ".dptg.xml");
ok = ok
- && Crue10FileFormatFactory.getDPTGFileFormat().write(data, fileDptg, projet.getManagerError().getAnalyser());
+ && Crue10FileFormatFactory.getDPTGFileFormat().write(data, fileDptg, projet.getManagerError().getNewAnalyser());
- projet.getManagerError().getAnalyser().addInfo(
+ projet.getManagerError().getLastAnalyser().addInfo(
FCrueResource.getS("Fichier DPTG généré dans " + fileDptg.getAbsolutePath()));
// -- Niveau modele --//
@@ -117,9 +117,9 @@
ok = ok
&& Crue10FileFormatFactory.getOPTGFileFormat().write(data.getPretraitementsGeom(), fileOptg,
- projet.getManagerError().getAnalyser());
+ projet.getManagerError().getNewAnalyser());
- projet.getManagerError().getAnalyser().addInfo(
+ projet.getManagerError().getLastAnalyser().addInfo(
FCrueResource.getS("Fichier OPTG généré dans " + fileOptg.getAbsolutePath()));
}
@@ -129,9 +129,9 @@
ok = ok
&& Crue10FileFormatFactory.getPNUMFileFormat().write(data.getParamNumModeleBase(), filePnum,
- projet.getManagerError().getAnalyser());
+ projet.getManagerError().getNewAnalyser());
- projet.getManagerError().getAnalyser().addInfo(
+ projet.getManagerError().getLastAnalyser().addInfo(
FCrueResource.getS("Fichier PNUM généré dans " + filePnum.getAbsolutePath()));
}
@@ -139,9 +139,9 @@
File fileDpti = new File(fichierModele + ".dpti.xml");
ok = ok
- && Crue10FileFormatFactory.getDPTIFileFormat().write(data, fileDpti, projet.getManagerError().getAnalyser());
+ && Crue10FileFormatFactory.getDPTIFileFormat().write(data, fileDpti, projet.getManagerError().getNewAnalyser());
- projet.getManagerError().getAnalyser().addInfo(
+ projet.getManagerError().getLastAnalyser().addInfo(
FCrueResource.getS("Fichier DPTI généré dans " + fileDpti.getAbsolutePath()));
// -- niveau scenario Une liste fixe de fichiers de niveau scénario : OCAL, ORES, PCAL, DCLM, DLHY --//
@@ -151,9 +151,9 @@
ok = ok
&& Crue10FileFormatFactory.getOCALFileFormat().write(data.getOrdCalc(), fileOcal,
- projet.getManagerError().getAnalyser());
+ projet.getManagerError().getNewAnalyser());
- projet.getManagerError().getAnalyser().addInfo(
+ projet.getManagerError().getLastAnalyser().addInfo(
FCrueResource.getS("Fichier OCAL généré dans " + fileOcal.getAbsolutePath()));
}
@@ -163,9 +163,9 @@
ok = ok
&& Crue10FileFormatFactory.getORESFileFormat().write(data.getOrdRes(), fileORES,
- projet.getManagerError().getAnalyser());
+ projet.getManagerError().getNewAnalyser());
- projet.getManagerError().getAnalyser().addInfo(
+ projet.getManagerError().getLastAnalyser().addInfo(
FCrueResource.getS("Fichier ORES généré dans " + fileORES.getAbsolutePath()));
}
// -- PCAL --//
@@ -174,9 +174,9 @@
ok = ok
&& Crue10FileFormatFactory.getPCALFileFormat().write(data.getParamCalc(), filePCAL,
- projet.getManagerError().getAnalyser());
+ projet.getManagerError().getNewAnalyser());
- projet.getManagerError().getAnalyser().addInfo(
+ projet.getManagerError().getLastAnalyser().addInfo(
FCrueResource.getS("Fichier PCAL généré dans " + filePCAL.getAbsolutePath()));
}
@@ -186,9 +186,9 @@
ok = ok
&& Crue10FileFormatFactory.getDLHYFileFormat().write(data.getLois(), fileDLHY,
- projet.getManagerError().getAnalyser());
+ projet.getManagerError().getNewAnalyser());
- projet.getManagerError().getAnalyser().addInfo(
+ projet.getManagerError().getLastAnalyser().addInfo(
FCrueResource.getS("Fichier DLHY généré dans " + fileDLHY.getAbsolutePath()));
}
@@ -198,9 +198,9 @@
ok = ok
&& Crue10FileFormatFactory.getDCLMFileFormat().write(data.getConditionsLim(), fileDCLM,
- projet.getManagerError().getAnalyser());
+ projet.getManagerError().getNewAnalyser());
- projet.getManagerError().getAnalyser().addInfo(
+ projet.getManagerError().getLastAnalyser().addInfo(
FCrueResource.getS("Fichier DCLM généré dans " + fileDCLM.getAbsolutePath()));
}
Copied: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueErrorManager.java (from rev 4737, trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CruePersistanceErrorManager.java)
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueErrorManager.java (rev 0)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueErrorManager.java 2009-05-08 13:07:20 UTC (rev 4738)
@@ -0,0 +1,168 @@
+package org.fudaa.fudaa.crue.view;
+
+import java.awt.BorderLayout;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.LogRecord;
+
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.ctulu.CtuluDefaultLogFormatter;
+import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.gui.CtuluLibSwing;
+import org.fudaa.ebli.ressource.EbliResource;
+import org.fudaa.fudaa.commun.FudaaLib;
+import org.fudaa.fudaa.crue.common.FCrueResource;
+import org.jdesktop.swingx.JXTreeTable;
+import org.jdesktop.swingx.treetable.DefaultMutableTreeTableNode;
+import org.jdesktop.swingx.treetable.DefaultTreeTableModel;
+
+/**
+ * Manager qui indique toutes les erreurs,messages qui se sont produites pendant le chargement.
+ *
+ * @author Adrien Hadoux
+ */
+public class CrueErrorManager {
+
+ public CrueErrorManager() {
+ super();
+ }
+
+ List<CtuluAnalyze> analyser_ = new ArrayList<CtuluAnalyze>();
+
+ public List<CtuluAnalyze> getAnalyser() {
+ return analyser_;
+ }
+
+ /**
+ * Ajoute un nouvel ctuluanalyze a la liste et le fournit.
+ *
+ * @return
+ */
+ public CtuluAnalyze getNewAnalyser() {
+ CtuluAnalyze analyzer = new CtuluAnalyze();
+ // ajout dans la liste des analyze
+ analyser_.add(analyzer);
+ return analyzer;
+ }
+
+ /**
+ * retourne le dernier ctuluanalyze cree.
+ *
+ * @param message
+ * @return
+ */
+ public CtuluAnalyze getLastAnalyser() {
+ return analyser_.get(analyser_.size() - 1);
+ }
+
+ public void setListeMessageError(final List<CtuluAnalyze> listeMessageError) {
+ this.analyser_ = listeMessageError;
+ }
+
+ /**
+ * Ajoute un message d'erreur au tout dernier analyzer dispo.
+ *
+ * @param message
+ */
+ public void addMessageError(final String message) {
+ analyser_.get(analyser_.size() - 1).addError(message);
+ }
+
+ public void clear() {
+
+ analyser_.clear();
+
+ }
+
+ /**
+ * Affiche la dialog avec le resultata du ctuluAnalyse.
+ *
+ * @param ui
+ * @param title
+ */
+ public void showDialog(final CtuluUI ui, final String title) {
+ if (analyser_ == null && ui != null) {
+ ui.message(EbliResource.EBLI.getString("Chargement terminé"), EbliResource.EBLI
+ .getString("Chargement terminé avec succès"), false);
+
+ return;
+ }
+ DefaultTreeTableModel modeleJX = new DefaultTreeTableModel(constructArborescence(analyser_));
+ List<String> colonnes = new ArrayList<String>();
+ colonnes.add(FCrueResource.getS("Analyse"));
+ modeleJX.setColumnIdentifiers(colonnes);
+
+ final JXTreeTable table = new JXTreeTable(modeleJX);
+
+ table.setEditable(false);
+ final Frame f;
+ if (ui != null) {
+ f = CtuluLibSwing.getFrameAncestorHelper(ui.getParentComponent());
+ } else {
+ f = null;
+ }
+ final JDialog dialog_ = new JDialog(f);
+ dialog_.setModal(true);
+ dialog_.setTitle(title);
+ final JPanel container = new JPanel(new BorderLayout());
+ container.add(new JScrollPane(table), BorderLayout.CENTER);
+
+ container.add(new JLabel(EbliResource.EBLI.getString("Opération terminé. Informations")), BorderLayout.NORTH);
+
+ final JButton ajouter_ = new JButton("Valider", EbliResource.EBLI.getIcon("crystal_valider"));
+ ajouter_.addActionListener(new ActionListener() {
+
+ public void actionPerformed(final ActionEvent e) {
+ dialog_.dispose();
+ }
+
+ });
+ container.add((new JPanel()).add(ajouter_), BorderLayout.SOUTH);
+
+ dialog_.setContentPane(container);
+ if (ui != null) {
+ // dialog_.setLocationRelativeTo(ui.getParentComponent());
+ dialog_.setLocation(200, 200);
+ }
+ // dialog_.pack();
+ dialog_.setSize(600, 250);
+ dialog_.setVisible(true);
+
+ }
+
+ private DefaultMutableTreeTableNode constructArborescence(final List<CtuluAnalyze> listemessage) {
+ final DefaultMutableTreeTableNode root = new DefaultMutableTreeTableNode("root");
+
+ for (CtuluAnalyze message : listemessage) {
+
+ String entete = "Analyse";
+ if (message.getDesc() != null) {
+ entete = message.getDesc();
+ } else if (message.getResource() != null) {
+ entete = message.getResource();
+ }
+
+ final DefaultMutableTreeTableNode rootFic = new DefaultMutableTreeTableNode(entete);
+ root.add(rootFic);
+
+ boolean perfect = message.isEmpty();
+ for (LogRecord log : message.getRecords()) {
+ rootFic.add(new DefaultMutableTreeTableNode(CtuluDefaultLogFormatter.DEFAULT.format(log)));
+ }
+ if (perfect) {
+ rootFic.add(new DefaultMutableTreeTableNode(FudaaLib.getS("Aucun problème rencontré")));
+ }
+ }
+ return root;
+ }
+
+}
Deleted: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheEMHFille.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheEMHFille.java 2009-05-08 09:43:10 UTC (rev 4737)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheEMHFille.java 2009-05-08 13:07:20 UTC (rev 4738)
@@ -1,68 +0,0 @@
-package org.fudaa.fudaa.crue.view;
-
-import java.awt.BorderLayout;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.JLabel;
-import javax.swing.JScrollPane;
-import javax.swing.ListSelectionModel;
-
-import org.fudaa.fudaa.crue.builder.EMHGeneralBuilder;
-import org.fudaa.fudaa.crue.builder.CrueTreeProject.ScenarioTreeRenderer;
-import org.fudaa.fudaa.crue.common.FCrueResource;
-import org.fudaa.fudaa.crue.projet.CrueProjet;
-import org.jdesktop.swingx.JXTreeTable;
-import org.jdesktop.swingx.treetable.DefaultTreeTableModel;
-
-import com.memoire.bu.BuInternalFrame;
-import com.memoire.bu.BuList;
-
-/**
- * Affichage rapide des EMH.
- *
- * @author Adrien Hadoux
- */
-public class CrueFicheEMHFille extends BuInternalFrame {
- /**
- *
- */
- private static final long serialVersionUID = 4662472594024929109L;
- CrueProjet projet;
- BuList listeModeles;
- BuList listeSousModeles;
-
- /**
- * @param projet
- */
- public CrueFicheEMHFille(CrueProjet projet) {
- super(FCrueResource.getS("Affichage des EMH"), true, true, true, true);
- this.projet = projet;
-
- initBuild();
-
- }
-
- /**
- * Init la construction graphique.
- */
- public void initBuild() {
-
- setSize(550, 260);
-
- DefaultTreeTableModel treeModel = EMHGeneralBuilder.buildTreeScenario(projet.getDataSources());
-
- List<String> colonnes = new ArrayList<String>();
- colonnes.add("EMH");
- treeModel.setColumnIdentifiers(colonnes);
- JXTreeTable treeEMH = new JXTreeTable(treeModel);
- treeEMH.setTreeCellRenderer(new ScenarioTreeRenderer());
- treeEMH.setShowHorizontalLines(true);
- treeEMH.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- this.getContentPane().add(new JScrollPane(treeEMH), BorderLayout.CENTER);
- this.getContentPane().add(
- new JLabel(FCrueResource.getS("EMH contenues dans le scénario courant") + " "
- + projet.getProject().getScenarioCourant().getId()), BorderLayout.NORTH);
-
- }
-}
Deleted: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheInfosGenerales.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheInfosGenerales.java 2009-05-08 09:43:10 UTC (rev 4737)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheInfosGenerales.java 2009-05-08 13:07:20 UTC (rev 4738)
@@ -1,198 +0,0 @@
-package org.fudaa.fudaa.crue.view;
-
-import java.awt.FlowLayout;
-import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JLabel;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-
-import org.fudaa.dodico.crue.metier.EMHProjectInfos;
-import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.ebli.commun.EbliComponentFactory;
-import org.fudaa.fudaa.crue.common.CommomLib;
-import org.fudaa.fudaa.crue.common.FCrueResource;
-import org.fudaa.fudaa.crue.projet.CrueProjet;
-
-import com.memoire.bu.BuButton;
-import com.memoire.bu.BuInternalFrame;
-import com.memoire.bu.BuPanel;
-
-public class CrueFicheInfosGenerales extends BuInternalFrame {
-
- CrueProjet projet;
-
- public CrueFicheInfosGenerales(CrueProjet projet) {
- super(FCrueResource.getS("Transformation Crue 9 <=> Crue 10"), true, true, true, true);
- this.projet = projet;
-
- initBuild();
-
- }
-
- /**
- * Init la construction graphique.
- */
- public void initBuild() {
-
- setSize(550, 260);
- BuPanel infos = new BuPanel(new GridLayout(8, 2, 10, 0));
- this.getContentPane().add(infos);
-
- // infos.setBorder(BorderFactory.createTitledBorder(FCrueResource.getS("Infos Etude")));
- setTitle(FCrueResource.getS("Infos Etude"));
-
- JLabel titreEtude1 = new JLabel(FCrueResource.getS("Etude:"));
- final JTextField titreEtude2 = new JTextField(projet.getFichierEtu_().getName(), 20);
- JLabel titreCommentaire = new JLabel(FCrueResource.getS("Commentaire:"));
- final JTextArea titreCommentaire2 = new JTextArea(1, 20);
-
- JLabel path1 = new JLabel(projet.getProject().getInfos().FICHETUDES + ":");
- final JTextField path1_2 = new JTextField(15);
- JLabel path2 = new JLabel(projet.getProject().getInfos().RUNS + ":");
- final JTextField path2_2 = new JTextField(15);
- JLabel path3 = new JLabel(projet.getProject().getInfos().RAPPORTS + ":");
- final JTextField path3_2 = new JTextField(15);
-
- if (projet.getProject().getInfos().getFichierEtu() != null) {
- titreCommentaire2.setText(projet.getProject().getInfos().getFichierEtu());
- }
- if (projet.getProject().getInfos().getDirectories() != null) {
- path1_2.setText(projet.getProject().getInfos().getDirectories().get(projet.getProject().getInfos().FICHETUDES));
- path2_2.setText(projet.getProject().getInfos().getDirectories().get(projet.getProject().getInfos().RUNS));
- path3_2.setText(projet.getProject().getInfos().getDirectories().get(projet.getProject().getInfos().RAPPORTS));
- }
-
- JLabel titredateCreation = new JLabel(FCrueResource.getS("Creation:"));
- JLabel titredateCreation2 = new JLabel();
- if (projet.getProject().getInfos().getInfosVersions() != null
- && projet.getProject().getInfos().getInfosVersions().getDateCreation() != null) {
- titredateCreation2.setText(projet.getProject().getInfos().getInfosVersions().getDateCreation());
- }
-
- JLabel auteurCreation = new JLabel(FCrueResource.getS("Auteur:"));
- JLabel auteurCreation2 = new JLabel();
- if (projet.getProject().getInfos().getInfosVersions() != null
- && projet.getProject().getInfos().getInfosVersions().getAuteurDerniereModif() != null) {
- auteurCreation2.setText(projet.getProject().getInfos().getInfosVersions().getAuteurDerniereModif());
- }
-
- infos.add(titreEtude1);
- BuPanel pptitreEtude2 = new BuPanel(new FlowLayout(FlowLayout.LEFT));
- pptitreEtude2.add(titreEtude2);
- infos.add(pptitreEtude2);
-
- infos.add(titredateCreation);
- infos.add(titredateCreation2);
- infos.add(auteurCreation);
- infos.add(auteurCreation2);
-
- infos.add(titreCommentaire);
- BuPanel pptitreCommentaire2 = new BuPanel(new FlowLayout(FlowLayout.LEFT));
- pptitreCommentaire2.add(titreCommentaire2);
- titreCommentaire2.setDragEnabled(true);
- infos.add(pptitreCommentaire2);
-
- infos.add(path1);
- BuPanel ppath1 = new BuPanel(new FlowLayout(FlowLayout.LEFT));
- ppath1.add(path1_2);
- BuButton parcourir1 = new BuButton(FCrueResource.getS("..."));
- parcourir1.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- useJfileChooser(path1_2);
- }
- });
- ppath1.add(parcourir1);
-
- infos.add(ppath1);
-
- infos.add(path2);
- BuPanel ppath2 = new BuPanel(new FlowLayout(FlowLayout.LEFT));
- ppath2.add(path2_2);
- BuButton parcourir2 = new BuButton(FCrueResource.getS("..."));
- parcourir2.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- useJfileChooser(path2_2);
- }
- });
- ppath2.add(parcourir2);
-
- infos.add(ppath2);
-
- infos.add(path3);
- BuPanel ppath3 = new BuPanel(new FlowLayout(FlowLayout.LEFT));
- ppath3.add(path3_2);
- BuButton parcourir3 = new BuButton(FCrueResource.getS("..."));
- parcourir3.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- useJfileChooser(path3_2);
- }
- });
- ppath3.add(parcourir3);
-
- infos.add(ppath3);
-
- EbliActionSimple actionModifier = new EbliActionSimple(FCrueResource.getS("Valider"), FCrueResource.CRUE
- .getIcon("crystal_oui.png"), "VALIDER") {
-
- @Override
- public void actionPerformed(ActionEvent _e) {
- modifieEtude(titreEtude2.getText(), titreCommentaire2.getText(), path1_2.getText(), path2_2.getText(), path3_2
- .getText());
- }
-
- };
- infos.add(new JLabel());
-
- BuPanel ppmodifier = new BuPanel(new FlowLayout(FlowLayout.RIGHT));
- ppmodifier.add(actionModifier.buildButton(EbliComponentFactory.INSTANCE));
- infos.add(ppmodifier);
-
- }
-
- /**
- * Récupère les champs saisie de l'ihm et modifie les infos du projet crue.
- *
- * @param newEtude
- * @param newCommentaire
- * @param path1
- * @param path2
- * @param path
- */
- private void modifieEtude(String newEtude, String newCommentaire, String path1, String path2, String path3) {
-
- if (projet.getProject().getInfos() != null) {
- EMHProjectInfos infos = projet.getProject().getInfos();
-
- if (newEtude != null) {
- infos.setNomEtude(newEtude);
- }
- if (newCommentaire != null) {
- infos.getInfosVersions().setCommentaire(newCommentaire);
- }
-
- if (path1 != null) {
- infos.getDirectories().put(EMHProjectInfos.FICHETUDES, path1);
- } else if (path2 != null) {
- infos.getDirectories().put(EMHProjectInfos.RUNS, path2);
- } else if (path3 != null) {
- infos.getDirectories().put(EMHProjectInfos.RAPPORTS, path3);
- }
-
- projet.getImpl().message(FCrueResource.getS(""));
- }
-
- }
-
- /**
- * Utilise un chooser pour aider au parcours du fichier.
- *
- * @param field
- */
- public void useJfileChooser(JTextField field) {
- CommomLib.openChooserAndSynchroniseTf(field, projet.getImpl(), FCrueResource.getS("Emplacement du fichier"));
- }
-
-}
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleComparaisonScenario.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleComparaisonScenario.java 2009-05-08 09:43:10 UTC (rev 4737)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleComparaisonScenario.java 2009-05-08 13:07:20 UTC (rev 4738)
@@ -102,7 +102,7 @@
}
// TODO Carole: continuer la comparaison de scenario.
- projet.getManagerError().getAnalyser().addInfo("En cours de développement");
+ projet.getManagerError().getNewAnalyser().addInfo("En cours de développement");
// -- affichage du resultat --//
projet.getManagerError().showDialog(projet.getImpl(), FCrueResource.getS("Résultat comparaison"));
Copied: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleEMH.java (from rev 4737, trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheEMHFille.java)
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleEMH.java (rev 0)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleEMH.java 2009-05-08 13:07:20 UTC (rev 4738)
@@ -0,0 +1,68 @@
+package org.fudaa.fudaa.crue.view;
+
+import java.awt.BorderLayout;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.JLabel;
+import javax.swing.JScrollPane;
+import javax.swing.ListSelectionModel;
+
+import org.fudaa.fudaa.crue.builder.EMHGeneralBuilder;
+import org.fudaa.fudaa.crue.builder.CrueTreeProject.ScenarioTreeRenderer;
+import org.fudaa.fudaa.crue.common.FCrueResource;
+import org.fudaa.fudaa.crue.projet.CrueProjet;
+import org.jdesktop.swingx.JXTreeTable;
+import org.jdesktop.swingx.treetable.DefaultTreeTableModel;
+
+import com.memoire.bu.BuInternalFrame;
+import com.memoire.bu.BuList;
+
+/**
+ * Affichage rapide des EMH.
+ *
+ * @author Adrien Hadoux
+ */
+public class CrueFilleEMH extends BuInternalFrame {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 4662472594024929109L;
+ CrueProjet projet;
+ BuList listeModeles;
+ BuList listeSousModeles;
+
+ /**
+ * @param projet
+ */
+ public CrueFilleEMH(CrueProjet projet) {
+ super(FCrueResource.getS("Affichage des EMH"), true, true, true, true);
+ this.projet = projet;
+
+ initBuild();
+
+ }
+
+ /**
+ * Init la construction graphique.
+ */
+ public void initBuild() {
+
+ setSize(550, 260);
+
+ DefaultTreeTableModel treeModel = EMHGeneralBuilder.buildTreeScenario(projet.getDataSources());
+
+ List<String> colonnes = new ArrayList<String>();
+ colonnes.add("EMH");
+ treeModel.setColumnIdentifiers(colonnes);
+ JXTreeTable treeEMH = new JXTreeTable(treeModel);
+ treeEMH.setTreeCellRenderer(new ScenarioTreeRenderer());
+ treeEMH.setShowHorizontalLines(true);
+ treeEMH.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ this.getContentPane().add(new JScrollPane(treeEMH), BorderLayout.CENTER);
+ this.getContentPane().add(
+ new JLabel(FCrueResource.getS("EMH contenues dans le scénario courant") + " "
+ + projet.getProject().getScenarioCourant().getId()), BorderLayout.NORTH);
+
+ }
+}
Property changes on: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleEMH.java
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleGenerationCrue9.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleGenerationCrue9.java 2009-05-08 09:43:10 UTC (rev 4737)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleGenerationCrue9.java 2009-05-08 13:07:20 UTC (rev 4738)
@@ -11,7 +11,6 @@
import javax.swing.JTabbedPane;
import javax.swing.JTextField;
-import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.metier.EMHScenario;
import org.fudaa.fudaa.crue.builder.CrueScenarioBuilder;
import org.fudaa.fudaa.crue.common.CommomLib;
@@ -170,10 +169,10 @@
EMHScenario scenario = EMHScenario.findById(idScenario, projet.getProject().getListeScenarios());
projet.getManagerError().clear();
- CtuluAnalyze analyze = projet.getManagerError().analyser_;
+ // CtuluAnalyze analyze = projet.getManagerError().analyser_;
if (scenario == null) {
- analyze.addError("generate.error.noScenarioSelected");
+ projet.getManagerError().getNewAnalyser().addError("generate.error.noScenarioSelected");
} else {
ScenarioSaver saver = new ScenarioSaver(pathFichier, scenario, projet);
saver.generateInCrue9();
@@ -192,10 +191,10 @@
EMHScenario scenario = EMHScenario.findById(idScenario, projet.getProject().getListeScenarios());
projet.getManagerError().clear();
- CtuluAnalyze analyze = projet.getManagerError().analyser_;
+ // CtuluAnalyze analyze = projet.getManagerError().analyser_;
if (scenario == null) {
- analyze.addError("generate.error.noScenarioSelected");
+ projet.getManagerError().getNewAnalyser().addError("generate.error.noScenarioSelected");
} else {
ScenarioSaver saver = new ScenarioSaver(pathFichier, scenario, projet);
saver.generateInCrue10();
Copied: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleInfosGenerales.java (from rev 4735, trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheInfosGenerales.java)
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleInfosGenerales.java (rev 0)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleInfosGenerales.java 2009-05-08 13:07:20 UTC (rev 4738)
@@ -0,0 +1,198 @@
+package org.fudaa.fudaa.crue.view;
+
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JLabel;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+
+import org.fudaa.dodico.crue.metier.EMHProjectInfos;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.ebli.commun.EbliComponentFactory;
+import org.fudaa.fudaa.crue.common.CommomLib;
+import org.fudaa.fudaa.crue.common.FCrueResource;
+import org.fudaa.fudaa.crue.projet.CrueProjet;
+
+import com.memoire.bu.BuButton;
+import com.memoire.bu.BuInternalFrame;
+import com.memoire.bu.BuPanel;
+
+public class CrueFilleInfosGenerales extends BuInternalFrame {
+
+ CrueProjet projet;
+
+ public CrueFilleInfosGenerales(CrueProjet projet) {
+ super(FCrueResource.getS("Transformation Crue 9 <=> Crue 10"), true, true, true, true);
+ this.projet = projet;
+
+ initBuild();
+
+ }
+
+ /**
+ * Init la construction graphique.
+ */
+ public void initBuild() {
+
+ setSize(550, 260);
+ BuPanel infos = new BuPanel(new GridLayout(8, 2, 10, 0));
+ this.getContentPane().add(infos);
+
+ // infos.setBorder(BorderFactory.createTitledBorder(FCrueResource.getS("Infos Etude")));
+ setTitle(FCrueResource.getS("Infos Etude"));
+
+ JLabel titreEtude1 = new JLabel(FCrueResource.getS("Etude:"));
+ final JTextField titreEtude2 = new JTextField(projet.getFichierEtu_().getName(), 20);
+ JLabel titreCommentaire = new JLabel(FCrueResource.getS("Commentaire:"));
+ final JTextArea titreCommentaire2 = new JTextArea(1, 20);
+
+ JLabel path1 = new JLabel(projet.getProject().getInfos().FICHETUDES + ":");
+ final JTextField path1_2 = new JTextField(15);
+ JLabel path2 = new JLabel(projet.getProject().getInfos().RUNS + ":");
+ final JTextField path2_2 = new JTextField(15);
+ JLabel path3 = new JLabel(projet.getProject().getInfos().RAPPORTS + ":");
+ final JTextField path3_2 = new JTextField(15);
+
+ if (projet.getProject().getInfos().getFichierEtu() != null) {
+ titreCommentaire2.setText(projet.getProject().getInfos().getFichierEtu());
+ }
+ if (projet.getProject().getInfos().getDirectories() != null) {
+ path1_2.setText(projet.getProject().getInfos().getDirectories().get(projet.getProject().getInfos().FICHETUDES));
+ path2_2.setText(projet.getProject().getInfos().getDirectories().get(projet.getProject().getInfos().RUNS));
+ path3_2.setText(projet.getProject().getInfos().getDirectories().get(projet.getProject().getInfos().RAPPORTS));
+ }
+
+ JLabel titredateCreation = new JLabel(FCrueResource.getS("Creation:"));
+ JLabel titredateCreation2 = new JLabel();
+ if (projet.getProject().getInfos().getInfosVersions() != null
+ && projet.getProject().getInfos().getInfosVersions().getDateCreation() != null) {
+ titredateCreation2.setText(projet.getProject().getInfos().getInfosVersions().getDateCreation());
+ }
+
+ JLabel auteurCreation = new JLabel(FCrueResource.getS("Auteur:"));
+ JLabel auteurCreation2 = new JLabel();
+ if (projet.getProject().getInfos().getInfosVersions() != null
+ && projet.getProject().getInfos().getInfosVersions().getAuteurDerniereModif() != null) {
+ auteurCreation2.setText(projet.getProject().getInfos().getInfosVersions().getAuteurDerniereModif());
+ }
+
+ infos.add(titreEtude1);
+ BuPanel pptitreEtude2 = new BuPanel(new FlowLayout(FlowLayout.LEFT));
+ pptitreEtude2.add(titreEtude2);
+ infos.add(pptitreEtude2);
+
+ infos.add(titredateCreation);
+ infos.add(titredateCreation2);
+ infos.add(auteurCreation);
+ infos.add(auteurCreation2);
+
+ infos.add(titreCommentaire);
+ BuPanel pptitreCommentaire2 = new BuPanel(new FlowLayout(FlowLayout.LEFT));
+ pptitreCommentaire2.add(titreCommentaire2);
+ titreCommentaire2.setDragEnabled(true);
+ infos.add(pptitreCommentaire2);
+
+ infos.add(path1);
+ BuPanel ppath1 = new BuPanel(new FlowLayout(FlowLayout.LEFT));
+ ppath1.add(path1_2);
+ BuButton parcourir1 = new BuButton(FCrueResource.getS("..."));
+ parcourir1.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ useJfileChooser(path1_2);
+ }
+ });
+ ppath1.add(parcourir1);
+
+ infos.add(ppath1);
+
+ infos.add(path2);
+ BuPanel ppath2 = new BuPanel(new FlowLayout(FlowLayout.LEFT));
+ ppath2.add(path2_2);
+ BuButton parcourir2 = new BuButton(FCrueResource.getS("..."));
+ parcourir2.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ useJfileChooser(path2_2);
+ }
+ });
+ ppath2.add(parcourir2);
+
+ infos.add(ppath2);
+
+ infos.add(path3);
+ BuPanel ppath3 = new BuPanel(new FlowLayout(FlowLayout.LEFT));
+ ppath3.add(path3_2);
+ BuButton parcourir3 = new BuButton(FCrueResource.getS("..."));
+ parcourir3.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ useJfileChooser(path3_2);
+ }
+ });
+ ppath3.add(parcourir3);
+
+ infos.add(ppath3);
+
+ EbliActionSimple actionModifier = new EbliActionSimple(FCrueResource.getS("Valider"), FCrueResource.CRUE
+ .getIcon("crystal_oui.png"), "VALIDER") {
+
+ @Override
+ public void actionPerformed(ActionEvent _e) {
+ modifieEtude(titreEtude2.getText(), titreCommentaire2.getText(), path1_2.getText(), path2_2.getText(), path3_2
+ .getText());
+ }
+
+ };
+ infos.add(new JLabel());
+
+ BuPanel ppmodifier = new BuPanel(new FlowLayout(FlowLayout.RIGHT));
+ ppmodifier.add(actionModifier.buildButton(EbliComponentFactory.INSTANCE));
+ infos.add(ppmodifier);
+
+ }
+
+ /**
+ * Récupère les champs saisie de l'ihm et modifie les infos du projet crue.
+ *
+ * @param newEtude
+ * @param newCommentaire
+ * @param path1
+ * @param path2
+ * @param path
+ */
+ private void modifieEtude(String newEtude, String newCommentaire, String path1, String path2, String path3) {
+
+ if (projet.getProject().getInfos() != null) {
+ EMHProjectInfos infos = projet.getProject().getInfos();
+
+ if (newEtude != null) {
+ infos.setNomEtude(newEtude);
+ }
+ if (newCommentaire != null) {
+ infos.getInfosVersions().setCommentaire(newCommentaire);
+ }
+
+ if (path1 != null) {
+ infos.getDirectories().put(EMHProjectInfos.FICHETUDES, path1);
+ } else if (path2 != null) {
+ infos.getDirectories().put(EMHProjectInfos.RUNS, path2);
+ } else if (path3 != null) {
+ infos.getDirectories().put(EMHProjectInfos.RAPPORTS, path3);
+ }
+
+ projet.getImpl().message(FCrueResource.getS(""));
+ }
+
+ }
+
+ /**
+ * Utilise un chooser pour aider au parcours du fichier.
+ *
+ * @param field
+ */
+ public void useJfileChooser(JTextField field) {
+ CommomLib.openChooserAndSynchroniseTf(field, projet.getImpl(), FCrueResource.getS("Emplacement du fichier"));
+ }
+
+}
Property changes on: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleInfosGenerales.java
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CruePersistanceErrorManager.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CruePersistanceErrorManager.java 2009-05-08 09:43:10 UTC (rev 4737)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CruePersistanceErrorManager.java 2009-05-08 13:07:20 UTC (rev 4738)
@@ -1,132 +0,0 @@
-package org.fudaa.fudaa.crue.view;
-
-import java.awt.BorderLayout;
-import java.awt.Frame;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.LogRecord;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-
-import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.ctulu.CtuluDefaultLogFormatter;
-import org.fudaa.ctulu.CtuluUI;
-import org.fudaa.ctulu.gui.CtuluLibSwing;
-import org.fudaa.ebli.ressource.EbliResource;
-import org.fudaa.fudaa.commun.FudaaLib;
-import org.fudaa.fudaa.crue.common.FCrueResource;
-import org.jdesktop.swingx.JXTreeTable;
-import org.jdesktop.swingx.treetable.DefaultMutableTreeTableNode;
-import org.jdesktop.swingx.treetable.DefaultTreeTableModel;
-
-/**
- * Fred: interet de cette classe ? Manager qui indique toutes les erreurs qui se sont produites pendant le chargement.
- *
- * @author Adrien Hadoux
- */
-public class CruePersistanceErrorManager {
-
- public CruePersistanceErrorManager() {
- super();
- this.analyser_ = new CtuluAnalyze();
- }
-
- CtuluAnalyze analyser_ = new CtuluAnalyze();
-
- public CtuluAnalyze getAnalyser() {
- return analyser_;
- }
-
- public void setListeMessageError(final CtuluAnalyze listeMessageError) {
- this.analyser_ = listeMessageError;
- }
-
- public void addMessageError(final String message) {
- analyser_.addError(message);
- }
-
- public void clear() {
-
- analyser_.clear();
-
- }
-
- /**
- * Affiche la dialog avec le resultata du ctuluAnalyse.
- *
- * @param ui
- * @param title
- */
- public void showDialog(final CtuluUI ui, final String title) {
- if (analyser_ == null && ui != null) {
- ui.message(EbliResource.EBLI.getString("Chargement terminé"), EbliResource.EBLI
- .getString("Chargement terminé avec succès"), false);
-
- return;
- }
- DefaultTreeTableModel modeleJX = new DefaultTreeTableModel(constructArborescence(analyser_));
- List<String> colonnes = new ArrayList<String>();
- colonnes.add(FCrueResource.getS("Analyse"));
- modeleJX.setColumnIdentifiers(colonnes);
-
- final JXTreeTable table = new JXTreeTable(modeleJX);
-
- table.setEditable(false);
- final Frame f;
- if (ui != null) {
- f = CtuluLibSwing.getFrameAncestorHelper(ui.getParentComponent());
- } else {
- f = null;
- }
- final JDialog dialog_ = new JDialog(f);
- dialog_.setModal(true);
- dialog_.setTitle(title);
- final JPanel container = new JPanel(new BorderLayout());
- container.add(new JScrollPane(table), BorderLayout.CENTER);
-
- container.add(new JLabel(EbliResource.EBLI.getString("Opération terminé. Informations")), BorderLayout.NORTH);
-
- final JButton ajouter_ = new JButton("Valider", EbliResource.EBLI.getIcon("crystal_valider"));
- ajouter_.addActionListener(new ActionListener() {
-
- public void actionPerformed(final ActionEvent e) {
- dialog_.dispose();
- }
-
- });
- container.add((new JPanel()).add(ajouter_), BorderLayout.SOUTH);
-
- dialog_.setContentPane(container);
- if (ui != null) {
- dialog_.setLocationRelativeTo(ui.getParentComponent());
- }
- // dialog_.pack();
- dialog_.setSize(600, 250);
- dialog_.setVisible(true);
-
- }
-
- private DefaultMutableTreeTableNode constructArborescence(final CtuluAnalyze message) {
- final DefaultMutableTreeTableNode root = new DefaultMutableTreeTableNode("root");
-
- final DefaultMutableTreeTableNode rootFic = new DefaultMutableTreeTableNode(message.getDesc());
- root.add(rootFic);
-
- boolean perfect = message.isEmpty();
- for (LogRecord log : message.getRecords()) {
- rootFic.add(new DefaultMutableTreeTableNode(CtuluDefaultLogFormatter.DEFAULT.format(log)));
- }
- if (perfect) {
- rootFic.add(new DefaultMutableTreeTableNode(FudaaLib.getS("Aucun problème rencontré")));
- }
-
- return root;
- }
-
-}
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/AppCrueTest.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/AppCrueTest.java 2009-05-08 09:43:10 UTC (rev 4737)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/AppCrueTest.java 2009-05-08 13:07:20 UTC (rev 4738)
@@ -10,7 +10,16 @@
import java.util.List;
import java.util.Set;
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTabbedPane;
+import javax.swing.JTextField;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.gui.CtuluDialogPanel;
@@ -18,7 +27,7 @@
import org.fudaa.dodico.crue.io.common.Messages;
import org.fudaa.dodico.crue.io.dao.ValidatorXml;
import org.fudaa.fudaa.commun.FudaaLib;
-import org.fudaa.fudaa.crue.view.CruePersistanceErrorManager;
+import org.fudaa.fudaa.crue.view.CrueErrorManager;
/**
* Des methodes poru aider dans les tests
@@ -325,8 +334,8 @@
* @param listeMessageError
*/
public static void getInfosError(final CtuluAnalyze listeMessageError) {
- final CruePersistanceErrorManager manager = new CruePersistanceErrorManager();
- manager.setListeMessageError(listeMessageError);
+ final CrueErrorManager manager = new CrueErrorManager();
+ manager.getAnalyser().add(listeMessageError);
manager.showDialog(null, "R�sultats");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-05-09 23:47:45
|
Revision: 4744
http://fudaa.svn.sourceforge.net/fudaa/?rev=4744&view=rev
Author: deniger
Date: 2009-05-09 23:47:40 +0000 (Sat, 09 May 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/common-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/drso-1.0.xsd
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/common/AbstractTestCase.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dcsp.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dh.include
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.drso.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.drso.xml
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/AppCrueTest.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dptg.new.xml
Modified: trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/common-1.0.xsd
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/common-1.0.xsd 2009-05-09 23:46:40 UTC (rev 4743)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/common-1.0.xsd 2009-05-09 23:47:40 UTC (rev 4744)
@@ -106,7 +106,7 @@
<!-- le contenu des lois FF: il devrait dériver de LoiDF... -->
<xs:complexType name="TypeLoiFFUnamed">
<xs:sequence>
- <xs:element name="Description" type="xs:string" />
+ <xs:element name="Description" type="xs:string" minOccurs="0" />
<xs:element name="ExtrapolInf" type="xs:string" minOccurs="0" />
<xs:element name="ExtrapolSup" type="xs:string" minOccurs="0" />
<xs:element name="VarAbscisse" type="xs:string" />
Modified: trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/drso-1.0.xsd
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/drso-1.0.xsd 2009-05-09 23:46:40 UTC (rev 4743)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/drso-1.0.xsd 2009-05-09 23:47:40 UTC (rev 4744)
@@ -16,12 +16,7 @@
</xs:choice>
</xs:complexType>
- <!--<xs:complexType name="TypeReference">
- <xs:attribute name="NomRef" type="xs:token" />
- </xs:complexType>
-
- --><!-- Gestion des BRANCHES -->
<xs:complexType name="TypeSectionIncluseBranche">
<xs:sequence>
<xs:element name="Pos" type="xs:string" />
@@ -30,7 +25,7 @@
<xs:element name="CoefConv" type="xs:double" minOccurs="0" />
<xs:element name="CoefDiv" type="xs:double" minOccurs="0" />
</xs:sequence>
- <xs:attribute name="NomRef" type="xs:string" />
+ <xs:attribute name="NomRef" type="xs:IDREF" />
</xs:complexType>
@@ -103,6 +98,7 @@
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element name="Profil" type="TypeNomRef" />
</xs:choice>
+ <xs:element name="Bati" type="TypeNomRef" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="Nom" type="TypeForAttributeNom" use="required"/>
</xs:complexType>
Modified: trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/common/AbstractTestCase.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/common/AbstractTestCase.java 2009-05-09 23:46:40 UTC (rev 4743)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/common/AbstractTestCase.java 2009-05-09 23:47:40 UTC (rev 4744)
@@ -8,6 +8,8 @@
import java.net.URL;
import java.util.logging.LogManager;
+import org.fudaa.ctulu.CtuluAnalyze;
+
import junit.framework.TestCase;
/**
@@ -53,6 +55,13 @@
assertEquals(expected, read, 1E-10);
}
+ protected void testAnalyser(final CtuluAnalyze analyzer) {
+ if (analyzer.containsErrors()) {
+ analyzer.printResume();
+ }
+ assertFalse(analyzer.containsErrors());
+ }
+
protected AbstractTestCase() {// pour eviter l'instanciation
}
Modified: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dcsp.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dcsp.xml 2009-05-09 23:46:40 UTC (rev 4743)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dcsp.xml 2009-05-09 23:47:40 UTC (rev 4744)
@@ -61,27 +61,17 @@
<CoefPdc>1.00</CoefPdc>
</ElemSeuilAvecPdc>
</DonCalcSansPrtBrancheSeuilLateral>
- <DonCalcSansPrtBrancheNiveauxAssocies
- NomRef="B5">
- <QLimInf>-11000.0</QLimInf>
- <QLimSup>11000.0</QLimSup>
- <Zasso>
- <Description></Description>
- <ExtrapolInf>ValCst</ExtrapolInf>
- <ExtrapolSup>ValCst</ExtrapolSup>
- <VarAbscisse>Zam</VarAbscisse>
- <VarOrdonnee>Zav</VarOrdonnee>
- <EvolutionFF>
- <!-- Point Flottant-Flottant -->
- <PointFF>0.000 0.000</PointFF>
- <PointFF>1.000 0.500</PointFF>
- <PointFF>2.000 1.000</PointFF>
- <PointFF>3.000 1.500</PointFF>
- <PointFF>4.000 2.000</PointFF>
- <PointFF>5.000 2.500</PointFF>
- </EvolutionFF>
- </Zasso>
- </DonCalcSansPrtBrancheNiveauxAssocies>
+ <!--
+ <DonCalcSansPrtBrancheNiveauxAssocies NomRef="B5">
+ <QLimInf>-11000.0</QLimInf> <QLimSup>11000.0</QLimSup> <Zasso>
+ <Description></Description> <ExtrapolInf>ValCst</ExtrapolInf>
+ <ExtrapolSup>ValCst</ExtrapolSup> <VarAbscisse>Zam</VarAbscisse>
+ <VarOrdonnee>Zav</VarOrdonnee> <EvolutionFF> Point Flottant-Flottant
+ <PointFF>0.000 0.000</PointFF> <PointFF>1.000 0.500</PointFF>
+ <PointFF>2.000 1.000</PointFF> <PointFF>3.000 1.500</PointFF>
+ <PointFF>4.000 2.000</PointFF> <PointFF>5.000 2.500</PointFF>
+ </EvolutionFF> </Zasso> </DonCalcSansPrtBrancheNiveauxAssocies>
+ -->
<DonCalcSansPrtBrancheSeuilLateral
NomRef="B7">
<FormulePdc>Divergent</FormulePdc>
Modified: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dh.include
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dh.include 2009-05-09 23:46:40 UTC (rev 4743)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dh.include 2009-05-09 23:47:40 UTC (rev 4744)
@@ -10,7 +10,7 @@
PBa Jan09 sur la base de Modele2
TOTO
ligne 1
-FILE Modele3.dh.include.1
+FIC Modele3.dh.include.1
ligne 4
-FILE Modele3.dh.include.3
+FIC Modele3.dh.include.3
Deleted: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dptg.new.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dptg.new.xml 2009-05-09 23:46:40 UTC (rev 4743)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dptg.new.xml 2009-05-09 23:47:40 UTC (rev 4744)
@@ -1,771 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DPTG>
- <!-- Le fichier DPTG décrit les données nécessitant un prétraitement géométriques d'un modèle CrueX. Son périmètre est le sous-modèle -->
- <Commentaire>Commentaire sur le sous-modèle</Commentaire>
- <DonPrtGeoProfilSections>
- <ProfilSection Nom="PROF11">
- <Commentaire>Ceci est un commentaire optionnel sur le profil géométrique</Commentaire>
- <EvolutionFF>
- <!-- Point Flottant-Flottant -->
- <PointFF>0.00 6.10</PointFF>
- <PointFF>2.00 5.10</PointFF>
- <PointFF>32.00 4.10</PointFF>
- <PointFF>62.00 3.10</PointFF>
- <PointFF>66.00 1.10</PointFF>
- <PointFF>86.00 1.10</PointFF>
- <PointFF>90.00 3.10</PointFF>
- <PointFF>120.00 4.10</PointFF>
- <PointFF>150.00 5.10</PointFF>
- <PointFF>152.00 6.10</PointFF>
- </EvolutionFF>
- <LitNumerotes>
- <LitNumerote>
- <LimDeb>0.00 6.10</LimDeb>
- <LimFin>32.00 4.10</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>32.00 4.10</LimDeb>
- <LimFin>62.00 3.10</LimFin>
- <LitNomme>MajD</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF11MAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>62.00 3.10</LimDeb>
- <LimFin>90.00 3.10</LimFin>
- <LitNomme>Mineur</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>true</IsLitMineur>
- <Frot NomRef="FPROF11MIN"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>90.00 3.10</LimDeb>
- <LimFin>120.00 4.10</LimFin>
- <LitNomme>MajG</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF11MAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>120.00 4.10</LimDeb>
- <LimFin>152.00 6.10</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- </LitNumerotes>
- </ProfilSection>
- <ProfilSection Nom="PROF10">
- <EvolutionFF>
- <PointFF>0.00 6.00</PointFF>
- <PointFF>2.00 5.00</PointFF>
- <PointFF>32.00 4.00</PointFF>
- <PointFF>62.00 3.00</PointFF>
- <PointFF>66.00 1.00</PointFF>
- <PointFF>86.00 1.00</PointFF>
- <PointFF>90.00 3.00</PointFF>
- <PointFF>120.00 4.00</PointFF>
- <PointFF>150.00 5.00</PointFF>
- <PointFF>152.00 6.00</PointFF>
- </EvolutionFF>
- <LitNumerotes>
- <LitNumerote>
- <LimDeb>0.00 6.00</LimDeb>
- <LimFin>32.00 4.00</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>32.00 4.00</LimDeb>
- <LimFin>62.00 3.00</LimFin>
- <LitNomme>MajD</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF10MAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>62.00 3.00</LimDeb>
- <LimFin>90.00 3.00</LimFin>
- <LitNomme>Mineur</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>true</IsLitMineur>
- <Frot NomRef="FPROF10MIN"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>90.00 3.00</LimDeb>
- <LimFin>120.00 4.00</LimFin>
- <LitNomme>MajG</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF10MAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>120.00 4.00</LimDeb>
- <LimFin>152.00 6.00</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- </LitNumerotes>
- </ProfilSection>
- <ProfilSection Nom="PROF9">
- <EvolutionFF>
- <PointFF>0.00 5.90</PointFF>
- <PointFF>2.00 4.90</PointFF>
- <PointFF>32.00 3.90</PointFF>
- <PointFF>62.00 2.90</PointFF>
- <PointFF>66.00 0.90</PointFF>
- <PointFF>86.00 0.90</PointFF>
- <PointFF>90.00 2.90</PointFF>
- <PointFF>120.00 3.90</PointFF>
- <PointFF>150.00 4.90</PointFF>
- <PointFF>152.00 5.90</PointFF>
- </EvolutionFF>
- <LitNumerotes>
- <LitNumerote>
- <LimDeb>0.00 5.90</LimDeb>
- <LimFin>32.00 3.90</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>32.00 3.90</LimDeb>
- <LimFin>62.00 2.90</LimFin>
- <LitNomme>MajD</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF9MAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>62.00 2.90</LimDeb>
- <LimFin>90.00 2.90</LimFin>
- <LitNomme>Mineur</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>true</IsLitMineur>
- <Frot NomRef="FPROF9MIN"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>90.00 2.90</LimDeb>
- <LimFin>120.00 3.90</LimFin>
- <LitNomme>MajG</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF9MAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>120.00 3.90</LimDeb>
- <LimFin>152.00 5.90</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- </LitNumerotes>
- </ProfilSection>
- <ProfilSection Nom="PROF8">
- <EvolutionFF>
- <PointFF>0.00 5.80</PointFF>
- <PointFF>2.00 4.80</PointFF>
- <PointFF>32.00 3.80</PointFF>
- <PointFF>62.00 2.80</PointFF>
- <PointFF>66.00 0.80</PointFF>
- <PointFF>86.00 0.80</PointFF>
- <PointFF>90.00 2.80</PointFF>
- <PointFF>120.00 3.80</PointFF>
- <PointFF>150.00 4.80</PointFF>
- <PointFF>152.00 5.80</PointFF>
- </EvolutionFF>
- <LitNumerotes>
- <LitNumerote>
- <LimDeb>0.00 5.80</LimDeb>
- <LimFin>32.00 3.80</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>32.00 3.80</LimDeb>
- <LimFin>62.00 2.80</LimFin>
- <LitNomme>MajD</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF8MAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>62.00 2.80</LimDeb>
- <LimFin>90.00 2.80</LimFin>
- <LitNomme>Mineur</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>true</IsLitMineur>
- <Frot NomRef="FPROF8MIN"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>90.00 2.80</LimDeb>
- <LimFin>120.00 3.80</LimFin>
- <LitNomme>MajG</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF8MAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>120.00 3.80</LimDeb>
- <LimFin>152.00 5.80</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- </LitNumerotes>
- </ProfilSection>
- <ProfilSection Nom="PROF7">
- <EvolutionFF>
- <PointFF>0.00 5.70</PointFF>
- <PointFF>2.00 4.70</PointFF>
- <PointFF>32.00 3.70</PointFF>
- <PointFF>62.00 2.70</PointFF>
- <PointFF>66.00 0.70</PointFF>
- <PointFF>86.00 0.70</PointFF>
- <PointFF>90.00 2.70</PointFF>
- <PointFF>120.00 3.70</PointFF>
- <PointFF>150.00 4.70</PointFF>
- <PointFF>152.00 5.70</PointFF>
- </EvolutionFF>
- <LitNumerotes>
- <LitNumerote>
- <LimDeb>0.00 5.70</LimDeb>
- <LimFin>32.00 3.70</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>32.00 3.70</LimDeb>
- <LimFin>62.00 2.70</LimFin>
- <LitNomme>MajD</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF7MAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>62.00 2.70</LimDeb>
- <LimFin>90.00 2.70</LimFin>
- <LitNomme>Mineur</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>true</IsLitMineur>
- <Frot NomRef="FPROF7MIN"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>90.00 2.70</LimDeb>
- <LimFin>120.00 3.70</LimFin>
- <LitNomme>MajG</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF7MAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>120.00 3.70</LimDeb>
- <LimFin>152.00 5.70</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- </LitNumerotes>
- </ProfilSection>
- <ProfilSection Nom="PROF6A">
- <EvolutionFF>
- <PointFF>0.00 5.60</PointFF>
- <PointFF>2.00 4.60</PointFF>
- <PointFF>32.00 3.60</PointFF>
- <PointFF>62.00 2.60</PointFF>
- <PointFF>66.00 0.60</PointFF>
- <PointFF>86.00 0.60</PointFF>
- <PointFF>90.00 2.60</PointFF>
- <PointFF>120.00 3.60</PointFF>
- <PointFF>150.00 4.60</PointFF>
- <PointFF>152.00 5.60</PointFF>
- </EvolutionFF>
- <LitNumerotes>
- <LitNumerote>
- <LimDeb>0.00 5.60</LimDeb>
- <LimFin>32.00 3.60</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>32.00 3.60</LimDeb>
- <LimFin>62.00 2.60</LimFin>
- <LitNomme>MajD</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF6AMAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>62.00 2.60</LimDeb>
- <LimFin>90.00 2.60</LimFin>
- <LitNomme>Mineur</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>true</IsLitMineur>
- <Frot NomRef="FPROF6AMIN"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>90.00 2.60</LimDeb>
- <LimFin>120.00 3.60</LimFin>
- <LitNomme>MajG</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF6AMAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>120.00 3.60</LimDeb>
- <LimFin>152.00 5.60</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- </LitNumerotes>
- </ProfilSection>
- <ProfilSection Nom="PROF4">
- <EvolutionFF>
- <PointFF>0.00 5.40</PointFF>
- <PointFF>2.00 4.40</PointFF>
- <PointFF>32.00 3.40</PointFF>
- <PointFF>62.00 2.40</PointFF>
- <PointFF>66.00 0.40</PointFF>
- <PointFF>86.00 0.40</PointFF>
- <PointFF>90.00 2.40</PointFF>
- <PointFF>120.00 3.40</PointFF>
- <PointFF>150.00 4.40</PointFF>
- <PointFF>152.00 5.40</PointFF>
- </EvolutionFF>
- <LitNumerotes>
- <LitNumerote>
- <LimDeb>0.00 5.40</LimDeb>
- <LimFin>32.00 3.40</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>32.00 3.40</LimDeb>
- <LimFin>62.00 2.40</LimFin>
- <LitNomme>MajD</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF4MAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>62.00 2.40</LimDeb>
- <LimFin>90.00 2.40</LimFin>
- <LitNomme>Mineur</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>true</IsLitMineur>
- <Frot NomRef="FPROF4MIN"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>90.00 2.40</LimDeb>
- <LimFin>120.00 3.40</LimFin>
- <LitNomme>MajG</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF4MAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>120.00 3.40</LimDeb>
- <LimFin>152.00 5.40</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- </LitNumerotes>
- </ProfilSection>
- <ProfilSection Nom="PROF3A">
- <EvolutionFF>
- <PointFF>0.00 5.30</PointFF>
- <PointFF>2.00 4.30</PointFF>
- <PointFF>32.00 3.30</PointFF>
- <PointFF>62.00 2.30</PointFF>
- <PointFF>66.00 0.30</PointFF>
- <PointFF>86.00 0.30</PointFF>
- <PointFF>90.00 2.30</PointFF>
- <PointFF>120.00 3.30</PointFF>
- <PointFF>150.00 4.30</PointFF>
- <PointFF>152.00 5.30</PointFF>
- </EvolutionFF>
- <LitNumerotes>
- <LitNumerote>
- <LimDeb>0.00 5.30</LimDeb>
- <LimFin>32.00 3.30</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>32.00 3.30</LimDeb>
- <LimFin>62.00 2.30</LimFin>
- <LitNomme>MajD</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF3AMAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>62.00 2.30</LimDeb>
- <LimFin>90.00 2.30</LimFin>
- <LitNomme>Mineur</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>true</IsLitMineur>
- <Frot NomRef="FPROF3AMIN"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>90.00 2.30</LimDeb>
- <LimFin>120.00 3.30</LimFin>
- <LitNomme>MajG</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF3AMAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>120.00 3.30</LimDeb>
- <LimFin>152.00 5.30</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- </LitNumerotes>
- </ProfilSection>
- <ProfilSection Nom="PROF3AV">
- <EvolutionFF>
- <PointFF>0.00 5.30</PointFF>
- <PointFF>2.00 4.30</PointFF>
- <PointFF>32.00 3.30</PointFF>
- <PointFF>62.00 2.30</PointFF>
- <PointFF>66.00 0.30</PointFF>
- <PointFF>86.00 0.30</PointFF>
- <PointFF>90.00 2.30</PointFF>
- <PointFF>120.00 3.30</PointFF>
- <PointFF>150.00 4.30</PointFF>
- <PointFF>152.00 5.30</PointFF>
- </EvolutionFF>
- <LitNumerotes>
- <LitNumerote>
- <LimDeb>0.00 5.30</LimDeb>
- <LimFin>32.00 3.30</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>32.00 3.30</LimDeb>
- <LimFin>62.00 2.30</LimFin>
- <LitNomme>MajD</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF3AVMAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>62.00 2.30</LimDeb>
- <LimFin>90.00 2.30</LimFin>
- <LitNomme>Mineur</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>true</IsLitMineur>
- <Frot NomRef="FPROF3AVMIN"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>90.00 2.30</LimDeb>
- <LimFin>120.00 3.30</LimFin>
- <LitNomme>MajG</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF3AVMAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>120.00 3.30</LimDeb>
- <LimFin>152.00 5.30</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- </LitNumerotes>
- </ProfilSection>
- <ProfilSection Nom="PROF3B">
- <EvolutionFF>
- <PointFF>0.00 5.30</PointFF>
- <PointFF>2.00 4.30</PointFF>
- <PointFF>32.00 3.30</PointFF>
- <PointFF>62.00 2.30</PointFF>
- <PointFF>66.00 0.30</PointFF>
- <PointFF>86.00 0.30</PointFF>
- <PointFF>90.00 2.30</PointFF>
- <PointFF>120.00 3.30</PointFF>
- <PointFF>150.00 4.30</PointFF>
- <PointFF>152.00 5.30</PointFF>
- </EvolutionFF>
- <LitNumerotes>
- <LitNumerote>
- <LimDeb>0.00 5.30</LimDeb>
- <LimFin>32.00 3.30</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>32.00 3.30</LimDeb>
- <LimFin>62.00 2.30</LimFin>
- <LitNomme>MajD</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF3BMAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>62.00 2.30</LimDeb>
- <LimFin>90.00 2.30</LimFin>
- <LitNomme>Mineur</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>true</IsLitMineur>
- <Frot NomRef="FPROF3BMIN"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>90.00 2.30</LimDeb>
- <LimFin>120.00 3.30</LimFin>
- <LitNomme>MajG</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF3BMAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>120.00 3.30</LimDeb>
- <LimFin>152.00 5.30</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- </LitNumerotes>
- </ProfilSection>
- <ProfilSection Nom="PROF2">
- <EvolutionFF>
- <PointFF>0.00 5.20</PointFF>
- <PointFF>2.00 4.20</PointFF>
- <PointFF>32.00 3.20</PointFF>
- <PointFF>62.00 2.20</PointFF>
- <PointFF>66.00 0.20</PointFF>
- <PointFF>86.00 0.20</PointFF>
- <PointFF>90.00 2.20</PointFF>
- <PointFF>120.00 3.20</PointFF>
- <PointFF>150.00 4.20</PointFF>
- <PointFF>152.00 5.20</PointFF>
- </EvolutionFF>
- <LitNumerotes>
- <LitNumerote>
- <LimDeb>0.00 5.20</LimDeb>
- <LimFin>32.00 3.20</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>32.00 3.20</LimDeb>
- <LimFin>62.00 2.20</LimFin>
- <LitNomme>MajD</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF2MAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>62.00 2.20</LimDeb>
- <LimFin>90.00 2.20</LimFin>
- <LitNomme>Mineur</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>true</IsLitMineur>
- <Frot NomRef="FPROF2MIN"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>90.00 2.20</LimDeb>
- <LimFin>120.00 3.20</LimFin>
- <LitNomme>MajG</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF2MAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>120.00 3.20</LimDeb>
- <LimFin>152.00 5.20</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- </LitNumerotes>
- </ProfilSection>
- <ProfilSection Nom="PROF1">
- <EvolutionFF>
- <PointFF>0.00 5.10</PointFF>
- <PointFF>2.00 4.10</PointFF>
- <PointFF>32.00 3.10</PointFF>
- <PointFF>62.00 2.10</PointFF>
- <PointFF>66.00 0.10</PointFF>
- <PointFF>86.00 0.10</PointFF>
- <PointFF>90.00 2.10</PointFF>
- <PointFF>120.00 3.10</PointFF>
- <PointFF>150.00 4.10</PointFF>
- <PointFF>152.00 5.10</PointFF>
- </EvolutionFF>
- <LitNumerotes>
- <LitNumerote>
- <LimDeb>0.00 5.10</LimDeb>
- <LimFin>32.00 3.10</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>32.00 3.10</LimDeb>
- <LimFin>62.00 2.10</LimFin>
- <LitNomme>MajD</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF1MAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>62.00 2.10</LimDeb>
- <LimFin>90.00 2.10</LimFin>
- <LitNomme>Mineur</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>true</IsLitMineur>
- <Frot NomRef="FPROF1MIN"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>90.00 2.10</LimDeb>
- <LimFin>120.00 3.10</LimFin>
- <LitNomme>MajG</LitNomme>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FPROF1MAJ"/>
- </LitNumerote>
- <LitNumerote>
- <LimDeb>120.00 3.10</LimDeb>
- <LimFin>152.00 5.10</LimFin>
- <LitNomme>Stockage</LitNomme>
- <IsLitActif>false</IsLitActif>
- <IsLitMineur>false</IsLitMineur>
- <Frot NomRef="FK0"/>
- </LitNumerote>
- </LitNumerotes>
- </ProfilSection>
- <ProfilSection Nom="PROFSTR1">
- <EvolutionFF>
- <PointFF>0.00 2.00</PointFF>
- <PointFF>0.00 0.80</PointFF>
- <PointFF>50.00 0.80</PointFF>
- <PointFF>50.00 2.00</PointFF>
- </EvolutionFF>
- <LitNumerotes>
- <LitNumerote>
- <LimDeb>0.00 2.00</LimDeb>
- <LimFin>50.00 2.00</LimFin>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>true</IsLitMineur>
- <Frot NomRef="FPROFSTR1MIN"/>
- </LitNumerote>
- </LitNumerotes>
- </ProfilSection>
- <ProfilSection Nom="PROFSTR2">
- <EvolutionFF>
- <PointFF>0.00 2.00</PointFF>
- <PointFF>0.00 0.40</PointFF>
- <PointFF>50.00 0.40</PointFF>
- <PointFF>50.00 2.00</PointFF>
- </EvolutionFF>
- <LitNumerotes>
- <LitNumerote>
- <LimDeb>0.00 2.00</LimDeb>
- <LimFin>50.00 2.00</LimFin>
- <IsLitActif>true</IsLitActif>
- <IsLitMineur>true</IsLitMineur>
- <Frot NomRef="FPROFSTR2MIN"/>
- </LitNumerote>
- </LitNumerotes>
- </ProfilSection>
- </ProfilSections>
- <Volumes>
- <ProfilCasier Nom="PCN6_1">
- <Longueur>100.0</Longueur>
- <EvolutionFF>
- <PointFF>0.00 0.30</PointFF>
- <PointFF>100.00 0.30</PointFF>
- </EvolutionFF>
- <LitUtile>
- <LimDeb>0.00 0.300</LimDeb>
- <LimFin>100.00 0.30</LimFin>
- </LitUtile>
- </ProfilCasier>
- <ProfilCasier Nom="PCN6_2">
- <Longueur>100.0</Longueur>
- <EvolutionFF>
- <PointFF>-100.00 0.50</PointFF>
- <PointFF>0.00 0.40</PointFF>
- <PointFF>50.00 0.30</PointFF>
- <PointFF>100.00 0.20</PointFF>
- </EvolutionFF>
- <LitUtile>
- <LimDeb>0.00 0.40</LimDeb>
- <LimFin>100.00 0.20</LimFin>
- </LitUtile>
- </ProfilCasier>
- <ProfilCasier Nom="PCN7_1">
- <Longueur>200.0</Longueur>
- <EvolutionFF>
- <PointFF>0.00 0.20</PointFF>
- <PointFF>100.00 0.20</PointFF>
- </EvolutionFF>
- <LitUtile>
- <LimDeb>0.00 0.20</LimDeb>
- <LimFin>100.00 0.20</LimFin>
- </LitUtile>
- </ProfilCasier>
- </Volumes>
- <DonPrtGeoSections>
- <DonPrtGeoSectionIdem NomRef="SPROF6B">
- <Dz>0.0</Dz>
- </DonPrtGeoSectionIdem>
- <DonPrtGeoSectionIdem NomRef="SPROF3AM">
- <Dz>0.0</Dz>
- </DonPrtGeoSectionIdem>
- </DonPrtGeoSections>
- <DonPrtGeoBranches>
- <DonPrtGeoBrancheSaintVenant NomRef="B1">
- <CoefSinuo>1.0</CoefSinuo>
- </DonPrtGeoBrancheSaintVenant>
- <DonPrtGeoBrancheSaintVenant NomRef="B2">
- <CoefSinuo>1.0</CoefSinuo>
- </DonPrtGeoBrancheSaintVenant>
- <DonPrtGeoBrancheSaintVenant NomRef="B4">
- <CoefSinuo>1.0</CoefSinuo>
- </DonPrtGeoBrancheSaintVenant>
- </DonPrtGeoBranches>
-</DPTG>
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.drso.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.drso.xml 2009-05-09 23:46:40 UTC (rev 4743)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.drso.xml 2009-05-09 23:47:40 UTC (rev 4744)
@@ -1,342 +1,341 @@
<?xml version="1.0" encoding="UTF-8"?>
-<DRSO xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/drso-1.0.xsd">
- <!-- Le fichier DRSO décrit la structure topologique d'un modèle CrueX. Son périmètre est le sous-modèle -->
- <Commentaire>Commentaire sur le sous-modèle</Commentaire>
- <Noeuds>
- <!-- Liste des noeuds (d'autres types de noeuds sont envisageables) -->
- <!-- Tous les noeuds existants sont écrits: reliés à des EMH branches et casiers IsActives ou non -->
- <NoeudNiveauContinu Nom="N1" />
- <NoeudNiveauContinu Nom="N2" />
- <NoeudNiveauContinu Nom="N3" />
- <NoeudNiveauContinu Nom="N4" />
- <NoeudNiveauContinu Nom="N5" />
- <NoeudNiveauContinu Nom="N6" />
- <NoeudNiveauContinu Nom="N7" />
- </Noeuds>
- <Casiers>
- <!-- Liste des casiers, avec pour chacun son noeud -->
- <CasierProfil Nom="CN6">
- <IsActive>true</IsActive>
- <!-- EMH utilisée dans le modèle -->
- <Noeud NomRef="N6" />
- <Profil NomRef="PCN6_1" />
- <Profil NomRef="PCN6_2" />
- </CasierProfil>
- <CasierProfil Nom="CN7">
- <IsActive>true</IsActive>
- <Noeud NomRef="N7" />
- <Profil NomRef="PCN7_1" />
- </CasierProfil>
- </Casiers>
- <Sections>
- <!-- Bibliothèque des sections. Certaines peuvent ne pas encore appartenir à une branche -->
- <SectionProfil Nom="SPROF11">
- <!-- Section définie par un profil géométrique -->
- <Profil NomRef="PROF11" />
- </SectionProfil>
- <SectionInterpolee Nom="SB1_00050.0" />
- <SectionProfil Nom="SPROF10">
- <Profil NomRef="PROF10"/>
- </SectionProfil>
- <!-- Section définie par interpolation d'autres sections -->
- <SectionInterpolee Nom="SB1_00150.0" />
- <SectionProfil Nom="SPROF9">
- <Profil NomRef="PROF9" />
- </SectionProfil>
- <SectionInterpolee Nom="SB1_00250.0" />
- <SectionProfil Nom="SPROF8">
- <Profil NomRef="PROF8" />
- </SectionProfil>
- <SectionInterpolee Nom="SB1_00350.0" />
- <SectionProfil Nom="SPROF7">
- <Profil NomRef="PROF7" />
- </SectionProfil>
- <SectionInterpolee Nom="SB1_00450.0" />
- <SectionProfil Nom="SPROF6A">
- <Profil NomRef="PROF6A" />
- </SectionProfil>
- <SectionIdem Nom="SPROF6B">
- <!-- Section définie par rapport à une autre section -->
- <!-- Section (et non profil) de référence -->
- <Section NomRef="SPROF6A" />
- </SectionIdem>
- <SectionInterpolee Nom="SPROF5" />
- <SectionProfil Nom="SPROF4">
- <Profil NomRef="PROF4" />
- </SectionProfil>
- <SectionProfil Nom="SPROF3A">
- <Profil NomRef="PROF3A" />
- </SectionProfil>
- <SectionIdem Nom="SPROF3AM">
- <Section NomRef="SPROF3A" />
- </SectionIdem>
- <SectionProfil Nom="SPROF3AV">
- <Profil NomRef="PROF3AV" />
- </SectionProfil>
- <SectionProfil Nom="SPROF3B">
- <Profil NomRef="PROF3B" />
- </SectionProfil>
- <SectionProfil Nom="SPROF2">
- <Profil NomRef="PROF2" />
- </SectionProfil>
- <SectionProfil Nom="SPROF1">
- <Profil NomRef="PROF1" />
- </SectionProfil>
- <!-- Section de calcul sans géométrie associée -->
- <SectionSansGeometrie Nom="SB5_Aval" />
- <SectionSansGeometrie Nom="SB5_Amont" />
- <SectionProfil Nom="SPROFSTR1">
- <Profil NomRef="PROFSTR1" />
- </SectionProfil>
- <SectionProfil Nom="SPROFSTR2">
- <Profil NomRef="PROFSTR2" />
- </SectionProfil>
- <SectionSansGeometrie Nom="SB7_Amont" />
- <SectionSansGeometrie Nom="SB7_Aval" />
- <SectionSansGeometrie Nom="SB8_Amont" />
- <SectionSansGeometrie Nom="SB8_Aval" />
- </Sections>
- <Branches>
- <!-- Liste des branches, avec pour chacune ses noeuds et sections -->
- <BrancheSaintVenant Nom="B1">
- <IsActive>true</IsActive>
- <!-- EMH utilisée dans le modèle -->
- <NdAm NomRef="N1" />
- <NdAv NomRef="N2" />
- <Sections>
- <Branche-SectionProfil NomRef="SPROF11">
- <Pos>Amont</Pos>
- <Xp>0.0</Xp>
- <CoefPond>0.50</CoefPond>
- <CoefConv>0.00</CoefConv>
- <CoefDiv>0.00</CoefDiv>
- </Branche-SectionProfil>
- <Branche-SectionInterpolee NomRef="SB1_00050.0">
- <Pos>Interne</Pos>
- <Xp>50.0</Xp>
- <CoefPond>0.50</CoefPond>
- <CoefConv>0.00</CoefConv>
- <CoefDiv>0.00</CoefDiv>
- </Branche-SectionInterpolee>
- <Branche-SectionProfil NomRef="SPROF10">
- <Pos>Interne</Pos>
- <Xp>100.0</Xp>
- <CoefPond>0.50</CoefPond>
- <CoefConv>0.00</CoefConv>
- <CoefDiv>0.00</CoefDiv>
- </Branche-SectionProfil>
- <Branche-SectionInterpolee NomRef="SB1_00150.0">
- <Pos>Interne</Pos>
- <Xp>150.0</Xp>
- <CoefPond>0.50</CoefPond>
- <CoefConv>0.00</CoefConv>
- <CoefDiv>0.00</CoefDiv>
- </Branche-SectionInterpolee>
- <Branche-SectionProfil NomRef="SPROF9">
- <Pos>Interne</Pos>
- <Xp>200.0</Xp>
- <CoefPond>0.50</CoefPond>
- <CoefConv>0.00</CoefConv>
- <CoefDiv>0.00</CoefDiv>
- </Branche-SectionProfil>
- <Branche-SectionInterpolee NomRef="SB1_00250.0">
- <Pos>Interne</Pos>
- <Xp>250.0</Xp>
- <CoefPond>0.50</CoefPond>
- <CoefConv>0.00</CoefConv>
- <CoefDiv>0.00</CoefDiv>
- </Branche-SectionInterpolee>
- <Branche-SectionProfil NomRef="SPROF8">
- <Pos>Interne</Pos>
- <Xp>300.0</Xp>
- <CoefPond>0.50</CoefPond>
- <CoefConv>0.00</CoefConv>
- <CoefDiv>0.00</CoefDiv>
- </Branche-SectionProfil>
- <Branche-SectionInterpolee NomRef="SB1_00350.0">
- <Pos>Interne</Pos>
- <Xp>350.0</Xp>
- <CoefPond>0.50</CoefPond>
- <CoefConv>0.00</CoefConv>
- <CoefDiv>0.00</CoefDiv>
- </Branche-SectionInterpolee>
- <Branche-SectionProfil NomRef="SPROF7">
- <Pos>Interne</Pos>
- <Xp>400.0</Xp>
- <CoefPond>0.50</CoefPond>
- <CoefConv>0.00</CoefConv>
- <CoefDiv>0.00</CoefDiv>
- </Branche-SectionProfil>
-
- <Branche-SectionInterpolee NomRef="SB1_00450.0">
- <Pos>Interne</Pos>
- <Xp>450.0</Xp>
- <CoefPond>0.50</CoefPond>
- <CoefConv>0.00</CoefConv>
- <CoefDiv>0.00</CoefDiv>
- </Branche-SectionInterpolee>
- <Branche-SectionProfil NomRef="SPROF6A">
- <Pos>Aval</Pos>
- <Xp>500.0</Xp>
- <CoefPond>0.50</CoefPond>
- <CoefConv>0.00</CoefConv>
- <CoefDiv>0.00</CoefDiv>
- </Branche-SectionProfil>
- </Sections>
- </BrancheSaintVenant>
- <!--<BrancheNiveauxAssocies Nom="B5">
- <IsActive>true</IsActive>
- <NdAm NomRef="N2" />
- <NdAv NomRef="N6" />
- <Sections>
- <Branche-SectionSansGeometrie NomRef="SB5_Amont">
- <Pos>Amont</Pos>
- <Xp>0.0</Xp>
- </Branche-SectionSansGeometrie>
- <Branche-SectionSansGeometrie NomRef="SB5_Aval">
- <Pos>Aval</Pos>
- <Xp>0.0</Xp>
- </Branche-SectionSansGeometrie>
- </Sections>
- </BrancheNiveauxAssocies>
- --><BrancheSaintVenant Nom="B2">
- <IsActive>true</IsActive>
- <NdAm NomRef="N2" />
- <NdAv NomRef="N3" />
- <Sections>
- <Branche-SectionIdem NomRef="SPROF6B">
- <Pos>Amont</Pos>
- <Xp>0.0</Xp>
- <CoefPond>0.50</CoefPond>
- <CoefConv>0.00</CoefConv>
- <CoefDiv>0.00</CoefDiv>
- </Branche-SectionIdem>
- <Branche-SectionInterpolee NomRef="SPROF5">
- <Pos>Interne</Pos>
- <Xp>100.0</Xp>
- <CoefPond>0.50</CoefPond>
- <CoefConv>0.00</CoefConv>
- <CoefDiv>0.00</CoefDiv>
- </Branche-SectionInterpolee>
- <Branche-SectionProfil NomRef="SPROF4">
- <Pos>Interne</Pos>
- <Xp>200.0</Xp>
- <CoefPond>0.50</CoefPond>
- <CoefConv>0.00</CoefConv>
- <CoefDiv>0.00</CoefDiv>
- </Branche-SectionProfil>
- <Branche-SectionProfil NomRef="SPROF3A">
- <Pos>Aval</Pos>
- <Xp>300.0</Xp>
- <CoefPond>0.50</CoefPond>
- <CoefConv>0.00</CoefConv>
- <CoefDiv>0.00</CoefDiv>
- </Branche-SectionProfil>
- </Sections>
- </BrancheSaintVenant>
- <BrancheSeuilTransversal Nom="B3">
- <IsActive>true</IsActive>
- <NdAm NomRef="N3" />
- <NdAv NomRef="N4" />
- <Sections>
- <Branche-SectionIdem NomRef="SPROF3AM">
- <Pos>Amont</Pos>
- <Xp>0.0</Xp>
- </Branche-SectionIdem>
- <Branche-SectionProfil NomRef="SPROF3AV">
- <Pos>Aval</Pos>
- <Xp>0.0</Xp>
- </Branche-SectionProfil>
- </Sections>
- </BrancheSeuilTransversal>
- <BrancheSaintVenant Nom="B4">
- <IsActive>true</IsActive>
- <NdAm NomRef="N4" />
- <NdAv NomRef="N5" />
- <Sections>
- <Branche-SectionProfil NomRef="SPROF3B">
- <Pos>Amont</Pos>
- <Xp>0.0</Xp>
- <CoefPond>0.50</CoefPond>
- <CoefConv>0.00</CoefConv>
- <CoefDiv>0.00</CoefDiv>
- </Branche-SectionProfil>
- <Branche-SectionProfil NomRef="SPROF2">
- <Pos>Interne</Pos>
- <Xp>100.0</Xp>
- <CoefPond>0.50</CoefPond>
- <CoefConv>0.00</CoefConv>
- <CoefDiv>0.00</CoefDiv>
- </Branche-SectionProfil>
- <Branche-SectionProfil NomRef="SPROF1">
- <Pos>Aval</Pos>
- <Xp>200.0</Xp>
- <CoefPond>0.50</CoefPond>
- <CoefConv>0.00</CoefConv>
- <CoefDiv>0.00</CoefDiv>
- </Branche-SectionProfil>
- </Sections>
- </BrancheSaintVenant>
- <BrancheSeuilLateral Nom="B5">
- <IsActive>true</IsActive>
- <NdAm NomRef="N2" />
- <NdAv NomRef="N6" />
- <Sections>
- <Branche-SectionSansGeometrie NomRef="SB5_Amont">
- <Pos>Amont</Pos>
- <Xp>0.0</Xp>
- </Branche-SectionSansGeometrie>
- <Branche-SectionSansGeometrie NomRef="SB5_Aval">
- <Pos>Aval</Pos>
- <Xp>0.0</Xp>
- </Branche-SectionSansGeometrie>
- </Sections>
- </BrancheSeuilLateral>
- <BrancheStrickler Nom="B6">
- <IsActive>true</IsActive>
- <NdAm NomRef="N6" />
- <NdAv NomRef="N7" />
- <Sections>
- <Branche-SectionProfil NomRef="SPROFSTR1">
- <Pos>Amont</Pos>
- <Xp>0.0</Xp>
- </Branche-SectionProfil>
- <Branche-SectionProfil NomRef="SPROFSTR2">
- <Pos>Aval</Pos>
- <Xp>400.0</Xp>
- </Branche-SectionProfil>
- </Sections>
- </BrancheStrickler>
- <BrancheSeuilLateral Nom="B7">
- <IsActive>false</IsActive>
- <!-- EMH non utilisée dans le modèle (ignorée par Crue10); gardée en réserve (visible grisée dans Fudaa-Crue). Son nom et celui de ses éléments peuvent être en doublon -->
- <NdAm NomRef="N7" />
- <NdAv NomRef="N5" />
- <Sections>
- <Branche-SectionSansGeometrie NomRef="SB7_Amont">
- <Pos>Amont</Pos>
- <Xp>0.0</Xp>
- </Branche-SectionSansGeometrie>
- <Branche-SectionSansGeometrie NomRef="SB7_Aval">
- <Pos>Aval</Pos>
- <Xp>0.0</Xp>
- </Branche-SectionSansGeometrie>
- </Sections>
- </BrancheSeuilLateral>
- <BrancheOrifice Nom="B8">
- <IsActive>true</IsActive>
- <NdAm NomRef="N7" />
- <NdAv NomRef="N5" />
- <Sections>
- <Branche-SectionSansGeometrie NomRef="SB8_Amont">
- <Pos>Amont</Pos>
- <Xp>0.0</Xp>
- </Branche-SectionSansGeometrie>
- <Branche-SectionSansGeometrie NomRef="SB8_Aval">
- <Pos>Aval</Pos>
- <Xp>0.0</Xp>
- </Branche-SectionSansGeometrie>
- </Sections>
- </BrancheOrifice>
- </Branches>
+<DRSO xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/drso-1.0.xsd">
+ <!--
+ Le fichier DRSO décrit la structure topologique d'un modèle CrueX. Son
+ périmètre est le sous-modèle
+ -->
+ <Commentaire>Commentaire sur le sous-modèle</Commentaire>
+ <Noeuds>
+ <!-- Liste des noeuds (d'autres types de noeuds sont envisageables) -->
+ <!--
+ Tous les noeuds existants sont écrits: reliés à des EMH branches et
+ casiers IsActives ou non
+ -->
+ <NoeudNiveauContinu Nom="N1" />
+ <NoeudNiveauContinu Nom="N2" />
+ <NoeudNiveauContinu Nom="N3" />
+ <NoeudNiveauContinu Nom="N4" />
+ <NoeudNiveauContinu Nom="N5" />
+ <NoeudNiveauContinu Nom="N6" />
+ <NoeudNiveauContinu Nom="N7" />
+ </Noeuds>
+ <Casiers>
+ <!-- Liste des casiers, avec pour chacun son noeud -->
+ <CasierProfil Nom="CN6">
+ <IsActive>true</IsActive>
+ <!-- EMH utilisée dans le modèle -->
+ <Noeud NomRef="N6" />
+ <Profil NomRef="PCN6_1" />
+ <Profil NomRef="PCN6_2" />
+ </CasierProfil>
+ <CasierProfil Nom="CN7">
+ <IsActive>true</IsActive>
+ <Noeud NomRef="N7" />
+ <Profil NomRef="PCN7_1" />
+ </CasierProfil>
+ </Casiers>
+ <Sections>
+ <!--
+ Bibliothèque des sections. Certaines peuvent ne pas encore appartenir
+ à une branche
+ -->
+ <SectionProfil Nom="SPROF11">
+ <!-- Section définie par un profil géométrique -->
+ <Profil NomRef="PROF11" />
+ </SectionProfil>
+ <SectionInterpolee Nom="SB1_00050.0" />
+ <SectionProfil Nom="SPROF10">
+ <Profil NomRef="PROF10" />
+ </SectionProfil>
+ <!-- Section définie par interpolation d'autres sections -->
+ <SectionInterpolee Nom="SB1_00150.0" />
+ <SectionProfil Nom="SPROF9">
+ <Profil NomRef="PROF9" />
+ </SectionProfil>
+ <SectionInterpolee Nom="SB1_00250.0" />
+ <SectionProfil Nom="SPROF8">
+ <Profil NomRef="PROF8" />
+ </SectionProfil>
+ <SectionInterpolee Nom="SB1_00350.0" />
+ <SectionProfil Nom="SPROF7">
+ <Profil NomRef="PROF7" />
+ </SectionProfil>
+ <SectionInterpolee Nom="SB1_00450.0" />
+ <SectionProfil Nom="SPROF6A">
+ <Profil NomRef="PROF6A" />
+ </SectionProfil>
+ <SectionIdem Nom="SPROF6B">
+ <!-- Section définie par rapport à une autre section -->
+ <!-- Section (et non profil) de référence -->
+ <Section NomRef="SPROF6A" />
+ </SectionIdem>
+ <SectionInterpolee Nom="SPROF5" />
+ <SectionProfil Nom="SPROF4">
+ <Profil NomRef="PROF4" />
+ </SectionProfil>
+ <SectionProfil Nom="SPROF3A">
+ <Profil NomRef="PROF3A" />
+ </SectionProfil>
+ <SectionIdem Nom="SPROF3AM">
+ <Section NomRef="SPROF3A" />
+ </SectionIdem>
+ <SectionProfil Nom="SPROF3AV">
+ <Profil NomRef="PROF3AV" />
+ </SectionProfil>
+ <SectionProfil Nom="SPROF3B">
+ <Profil NomRef="PROF3B" />
+ </SectionProfil>
+ <SectionProfil Nom="SPROF2">
+ <Profil NomRef="PROF2" />
+ </SectionProfil>
+ <SectionProfil Nom="SPROF1">
+ <Profil NomRef="PROF1" />
+ </SectionProfil>
+ <!-- Section de calcul sans géométrie associée -->
+ <SectionSansGeometrie Nom="SB5_Aval" />
+ <SectionSansGeometrie Nom="SB5_Amont" />
+ <SectionProfil Nom="SPROFSTR1">
+ <Profil NomRef="PROFSTR1" />
+ </SectionProfil>
+ <SectionProfil Nom="SPROFSTR2">
+ <Profil NomRef="PROFSTR2" />
+ </SectionProfil>
+ <SectionSansGeometrie Nom="SB7_Amont" />
+ <SectionSansGeometrie Nom="SB7_Aval" />
+ <SectionSansGeometrie Nom="SB8_Amont" />
+ <SectionSansGeometrie Nom="SB8_Aval" />
+ </Sections>
+ <Branches>
+ <!-- Liste des branches, avec pour chacune ses noeuds et sections -->
+ <BrancheSaintVenant Nom="B1">
+ <IsActive>true</IsActive>
+ <!-- EMH utilisée dans le modèle -->
+ <NdAm NomRef="N1" />
+ <NdAv NomRef="N2" />
+ <Sections>
+ <Branche-SectionProfil NomRef="SPROF11">
+ <Pos>Amont</Pos>
+ <Xp>0.0</Xp>
+ <CoefPond>0.50</CoefPond>
+ <CoefConv>0.00</CoefConv>
+ <CoefDiv>0.00</CoefDiv>
+ </Branche-SectionProfil>
+ <Branche-SectionInterpolee NomRef="SB1_00050.0">
+ <Pos>Interne</Pos>
+ <Xp>50.0</Xp>
+ <CoefPond>0.50</CoefPond>
+ <CoefConv>0.00</CoefConv>
+ <CoefDiv>0.00</CoefDiv>
+ </Branche-SectionInterpolee>
+ <Branche-SectionProfil NomRef="SPROF10">
+ <Pos>Interne</Pos>
+ <Xp>100.0</Xp>
+ <CoefPond>0.50</CoefPond>
+ <CoefConv>0.00</CoefConv>
+ <CoefDiv>0.00</CoefDiv>
+ </Branche-SectionProfil>
+ <Branche-SectionInterpolee NomRef="SB1_00150.0">
+ <Pos>Interne</Pos>
+ <Xp>150.0</Xp>
+ <CoefPond>0.50</CoefPond>
+ <CoefConv>0.00</CoefConv>
+ <CoefDiv>0.00</CoefDiv>
+ </Branche-SectionInterpolee>
+ <Branche-SectionProfil NomRef="SPROF9">
+ <Pos>Interne</Pos>
+ <Xp>200.0</Xp>
+ <CoefPond>0.50</CoefPond>
+ <CoefConv>0.00</CoefConv>
+ <CoefDiv>0.00</CoefDiv>
+ </Branche-SectionProfil>
+ <Branche-SectionInterpolee NomRef="SB1_00250.0">
+ <Pos>Interne</Pos>
+ <Xp>250.0</Xp>
+ <CoefPond>0.50</CoefPond>
+ <CoefConv>0.00</CoefConv>
+ <CoefDiv>0.00</CoefDiv>
+ </Branche-SectionInterpolee>
+ <Branche-SectionProfil NomRef="SPROF8">
+ <Pos>Interne</Pos>
+ <Xp>300.0</Xp>
+ <CoefPond>0.50</CoefPond>
+ <CoefConv>0.00</CoefConv>
+ <CoefDiv>0.00</CoefDiv>
+ </Branche-SectionProfil>
+ <Branche-SectionInterpolee NomRef="SB1_00350.0">
+ <Pos>Interne</Pos>
+ <Xp>350.0</Xp>
+ <CoefPond>0.50</Co...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X