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.conver...
[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<ElemS...
[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...
[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>
+ <r...
[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...
[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 sta...
[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 readD...
[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...
[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...
[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
+...
[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 fo...
[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/f...
[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"/>
+ <...
[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(...
[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 NoeudNi...
[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_.setTo...
[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 EbliAc...
[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...
[truncated message content] |
|
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>
- <L...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X