From: <de...@us...> - 2009-03-31 22:42:48
|
Revision: 4603 http://fudaa.svn.sourceforge.net/fudaa/?rev=4603&view=rev Author: deniger Date: 2009-03-31 22:42:38 +0000 (Tue, 31 Mar 2009) Log Message: ----------- Modified Paths: -------------- trunk/soft/fudaa-crue/dodico/lib/dodico.jar trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryDCSP.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryDFRT.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryDPTG.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryDPTI.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryDRSO.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryETU.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoParsing.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDCSP.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDFRT.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTG.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTI.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDRSO.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistETU.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistOPTG.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersit.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDCSP.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDFRT.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDPTG.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDPTI.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDRSO.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatETU.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/validatorXml/ValidatorXml.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormatManager.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHInfosVersion.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHModeleBase.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHModeleEnchainement.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHModeleRun.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHProjectInfos.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHRun.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHScenario.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHproject.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/FichierCrue.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHSection.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ConditionLimite.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CrueData.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DefaultEMHValues.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrt.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBarrageFilEau.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheOrifice.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBranchePDC.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSaintVenant.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSeuilLateral.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSeuilTransversal.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtSection.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonClimM.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonFrt.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonGeoLoc.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBranche.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBranchePdc.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitNoeud.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitSection.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtClInit.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeo.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoBrancheSaintVenant.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoCasierProfil.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoProfilCommun.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoSectionIdem.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoSectionProfil.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtReseau.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheBarrageFilEau.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheBarrageGenerique.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheBarrageRhone.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheEnchainement.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheNiveauxAssocies.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheOrifice.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBranchePdc.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheSaintVenant.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheSeuilLongitudinale.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheSeuilTransversal.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheStrickler.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHCasierMNT.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHCasierProfil.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHNoeudNiveauContinu.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSectionIdem.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSectionInterpolee.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSectionProfil.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSectionSansGeometrie.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ElemOrifice.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ElemSeuil.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ElemSeuilAvecPdc.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Evolution.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/LigneForce.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/LimAxeHydraulique.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/LitNomme.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/LitNumerote.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Loi.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ProfilCasier.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/PtProfil.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResCalcul.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtClinit.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeo.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeoCasier.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeoSection.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtReseau.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/StriRefC.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/StriRefH.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/StriRefZ.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/VariableOrdonnee.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ZDeYprim.java trunk/soft/fudaa-crue/fudaa/lib/ebli.jar trunk/soft/fudaa-crue/fudaa/lib/fudaa.jar trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/Crue.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueCommomImplementation.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueApplicationManager.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueExplorer.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueFileRenderer.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueSupervisorImplementation.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueModeleBuilder.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueProjet.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueScenarioBuilder.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueSousModeleBuilder.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/AppCrueTest.java Added Paths: ----------- trunk/soft/fudaa-crue/bookmarks.xml trunk/soft/fudaa-crue/dodico/.classpath trunk/soft/fudaa-crue/dodico/.project trunk/soft/fudaa-crue/dodico/lib/ctulu-src.jar trunk/soft/fudaa-crue/dodico/lib/dodico-src.jar trunk/soft/fudaa-crue/dodico/src/main/config/ trunk/soft/fudaa-crue/dodico/src/main/config/export-ctulu-src.jardesc trunk/soft/fudaa-crue/dodico/src/main/config/export-dodico-src.jardesc trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueResource.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryCommon.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue09reader.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10writer.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue9writer.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/FrottementPoint.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/fudaa/ trunk/soft/fudaa-crue/dodico/src/test/java/org/ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/AppCrueTest.java trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestClasse.java trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDCSPFile.java trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDFRTFile.java trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDPTGFile.java trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDPTIFile.java trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDRSOFile.java trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueETU.java trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueInterface.java trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueOPTGFile.java trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/componentTestClasse.java trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/testXsd.java trunk/soft/fudaa-crue/fudaa/.classpath trunk/soft/fudaa-crue/fudaa/.project trunk/soft/fudaa-crue/fudaa/classes/ trunk/soft/fudaa-crue/fudaa/classes/org/ trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/ trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/ trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/ trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/Crue.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/CruePersistanceErrorManager$1.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/CruePersistanceErrorManager.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/common/ trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/common/CrueCommomImplementation.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/common/CruePreferences.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/common/FCrueResource.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/ trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueApplicationManager$1.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueApplicationManager$2.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueApplicationManager$FudaaExecConsole.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueApplicationManager$FudaaExecCrueView.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueApplicationManager$FudaaExecTexte.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueApplicationManager.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueExplorer$1.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueExplorer$2.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueExplorer$3.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueExplorer$ExplorerMenuItem.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueExplorer.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueFileRenderer$1.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueFileRenderer$SpecificButton.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueFileRenderer.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueLauncher$1.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueLauncher$2.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueLauncher$3.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueLauncher$4.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueLauncher$5.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueLauncher.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueSupervisorImplementation$CrueAppliMainMenu.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/explorer/CrueSupervisorImplementation.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/projet/ trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/projet/CrueModeleBuilder.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/projet/CrueProjet.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/projet/CrueScenarioBuilder.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/crue/projet/CrueSousModeleBuilder.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/ trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/AppCrueTest$1.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/AppCrueTest$2.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/AppCrueTest$3.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/AppCrueTest$4.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/AppCrueTest$5.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/AppCrueTest$6.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/AppCrueTest.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/MainTest.class trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/java/ trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/java/org/ trunk/soft/fudaa-crue/fudaa/classes/org/fudaa/fudaa/test/java/org/fudaa/ trunk/soft/fudaa-crue/fudaa/lib/ebli-src.jar trunk/soft/fudaa-crue/fudaa/lib/fudaa-src.jar trunk/soft/fudaa-crue/fudaa/lib/swingx-0.9.3-src.zip trunk/soft/fudaa-crue/fudaa/lib/swingx-0.9.3.jar trunk/soft/fudaa-crue/fudaa/src/main/config/ trunk/soft/fudaa-crue/fudaa/src/main/config/export-ebli-src.jardesc trunk/soft/fudaa-crue/fudaa/src/main/config/export-ebli.jardesc trunk/soft/fudaa-crue/fudaa/src/main/config/export-fudaa-src.jardesc trunk/soft/fudaa-crue/fudaa/src/main/config/export-fudaa.jardesc trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/CruePersistanceErrorManager.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CruePreferences.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/FCrueResource.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/MainTest.java Removed Paths: ------------- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue09reader.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue10reader.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue10writer.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue9writer.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/fileformat/ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CruePreferences.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueRessource.java trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryCommom.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CruePersistanceErrorManager.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/MainTest.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/TestClasse.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/TestCrueDCSPFile.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/TestCrueDFRTFile.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/TestCrueDPTGFile.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/TestCrueDPTIFile.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/TestCrueDRSOFile.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/TestCrueETU.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/TestCrueImplementation.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/TestCrueOPTGFile.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/componentTestClasse.java trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/testXsd.java Added: trunk/soft/fudaa-crue/bookmarks.xml =================================================================== --- trunk/soft/fudaa-crue/bookmarks.xml (rev 0) +++ trunk/soft/fudaa-crue/bookmarks.xml 2009-03-31 22:42:38 UTC (rev 4603) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<bookmarks> + <site url="http://downloads.open.collab.net/eclipse/update-site" selected="false" name="http://downloads.open.collab.net/eclipse/update-site"/> + <site url="http://downloads.open.collab.net/eclipse/update-site/e3.4" selected="true" name="http://downloads.open.collab.net/eclipse/update-site/e3.4"/> + <site url="http://eclipse.jcraft.com/" selected="true" name="http://eclipse.jcraft.com/"/> + <site url="http://eclipse.svnkit.com/1.2.x/" selected="true" name="http://eclipse.svnkit.com/1.2.x/"/> + <site url="http://findbugs.cs.umd.edu/eclipse" selected="true" name="http://findbugs.cs.umd.edu/eclipse"/> + <site url="http://mylyn-mantis.sourceforge.net/eclipse/update" selected="true" name=""/> + <site url="http://openextern.googlecode.com/svn/trunk/openextern_update/" selected="true" name="http://openextern.googlecode.com/svn/trunk/openextern_update/"/> + <site url="http://pmd.sourceforge.net/eclipse" selected="true" name="http://pmd.sourceforge.net/eclipse"/> + <site url="http://subclipse.tigris.org/update_1.4.x" selected="true" name="http://subclipse.tigris.org/update_1.4.x"/> + <site url="http://update.eclipse.org/updates/3.2" selected="false" name="http://update.eclipse.org/updates/3.2"/> + <site url="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-site/" selected="true" name="Subversive Connectors Update Site"/> +</bookmarks> Added: trunk/soft/fudaa-crue/dodico/.classpath =================================================================== --- trunk/soft/fudaa-crue/dodico/.classpath (rev 0) +++ trunk/soft/fudaa-crue/dodico/.classpath 2009-03-31 22:42:38 UTC (rev 4603) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/test/java"/> + <classpathentry exported="true" kind="lib" path="lib/ctulu.jar" sourcepath="lib/ctulu-src.jar"/> + <classpathentry exported="true" kind="lib" path="lib/dodico.jar" sourcepath="lib/dodico-src.jar"/> + <classpathentry exported="true" kind="lib" path="lib/junit.jar"/> + <classpathentry exported="true" kind="lib" path="lib/trove.jar"/> + <classpathentry exported="true" kind="lib" path="lib/xstream-1.3.jar"/> + <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="classes"/> +</classpath> Added: trunk/soft/fudaa-crue/dodico/.project =================================================================== --- trunk/soft/fudaa-crue/dodico/.project (rev 0) +++ trunk/soft/fudaa-crue/dodico/.project 2009-03-31 22:42:38 UTC (rev 4603) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>dodico-crue</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: trunk/soft/fudaa-crue/dodico/lib/ctulu-src.jar =================================================================== (Binary files differ) Property changes on: trunk/soft/fudaa-crue/dodico/lib/ctulu-src.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/soft/fudaa-crue/dodico/lib/dodico-src.jar =================================================================== (Binary files differ) Property changes on: trunk/soft/fudaa-crue/dodico/lib/dodico-src.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/soft/fudaa-crue/dodico/lib/dodico.jar =================================================================== (Binary files differ) Added: trunk/soft/fudaa-crue/dodico/src/main/config/export-ctulu-src.jardesc =================================================================== --- trunk/soft/fudaa-crue/dodico/src/main/config/export-ctulu-src.jardesc (rev 0) +++ trunk/soft/fudaa-crue/dodico/src/main/config/export-ctulu-src.jardesc 2009-03-31 22:42:38 UTC (rev 4603) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="ISO-8859-15" standalone="no"?> +<jardesc> + <jar path="C:/devel/fudaa/Fudaa-Crue/Fudaa-Crue root/dodico/lib/ctulu-src.jar"/> + <options buildIfNeeded="true" compress="true" descriptionLocation="/dodico-crue/export-ctulu-src.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/> + <storedRefactorings deprecationInfo="true" structuralOnly="false"/> + <selectedProjects/> + <selectedElements exportClassFiles="false" exportJavaFiles="true" exportOutputFolder="false"> + <file path="/ctulu/build.xml"/> + <file path="/ctulu/.project.defaults"/> + <file path="/ctulu/.classpath.defaults"/> + <javaElement handleIdentifier="=ctulu/src"/> + <file path="/ctulu/.classpath"/> + <file path="/ctulu/.project"/> + <file path="/ctulu/.cvsignore"/> + </selectedElements> + <fatjar builder="org.eclipse.jdt.ui.plain_jar_builder" launchConfig=""/> +</jardesc> Added: trunk/soft/fudaa-crue/dodico/src/main/config/export-dodico-src.jardesc =================================================================== --- trunk/soft/fudaa-crue/dodico/src/main/config/export-dodico-src.jardesc (rev 0) +++ trunk/soft/fudaa-crue/dodico/src/main/config/export-dodico-src.jardesc 2009-03-31 22:42:38 UTC (rev 4603) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="ISO-8859-15" standalone="no"?> +<jardesc> + <jar path="C:/devel/fudaa/Fudaa-Crue/Fudaa-Crue root/dodico/lib/dodico-src.jar"/> + <options buildIfNeeded="true" compress="true" descriptionLocation="/dodico-crue/export-dodico-src.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/> + <storedRefactorings deprecationInfo="true" structuralOnly="false"/> + <selectedProjects/> + <selectedElements exportClassFiles="false" exportJavaFiles="true" exportOutputFolder="false"> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.mesure"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.mascaret"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.geodesie"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.metier.loi"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.loi"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.evenement"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.ef.decorator"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.ef.impl"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.planification"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.fortran"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.ef.interpolation"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.objet"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.probabilite"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.dunes.io"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.lido.conversion"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.interpolateur"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.casier"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.calageauto"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.metier.qualitedeau"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.lido"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.navmer"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.fichiers"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.navigation"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.metier.calageauto"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.dunes"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.ef.cubature"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.singularite"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.oscar"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.ef.operation"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.ef"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.metier"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.collection"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.metier.evenement"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.metier.casier"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.metier.singularite"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.commun"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.calcul"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.ef.serviceDunes"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.dico"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.qualitedeau"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.association"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.mathematiques"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.lido.conversion.hydro1d"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.olb"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.representation"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.hydraulique1d.metier.geometrie"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.boony"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.lido.conversion.lido"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.geometrie"/> + <javaElement handleIdentifier="=dodico/src<org.fudaa.dodico.dimduc"/> + </selectedElements> + <fatjar builder="org.eclipse.jdt.ui.plain_jar_builder" launchConfig=""/> +</jardesc> Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue09reader.java =================================================================== --- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue09reader.java 2009-03-31 20:31:42 UTC (rev 4602) +++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue09reader.java 2009-03-31 22:42:38 UTC (rev 4603) @@ -1,11 +0,0 @@ -package org.fudaa.dodico.crue.IO; -/** - * G\xE8re la lecteure du format crue 09. - * - * Utilise fortran reader - * @author Adrien Hadoux - * - */ -public class Crue09reader { - -} Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue10reader.java =================================================================== --- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue10reader.java 2009-03-31 20:31:42 UTC (rev 4602) +++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue10reader.java 2009-03-31 22:42:38 UTC (rev 4603) @@ -1,170 +0,0 @@ -package org.fudaa.dodico.crue.IO; - -import java.io.File; -import java.util.List; - -import org.fudaa.ctulu.CtuluAnalyze; -import org.fudaa.dodico.crue.common.CrueRessource; -import org.fudaa.dodico.crue.dao.CrueDaoParsing; -import org.fudaa.dodico.crue.dao.CrueDaoPersistDCSP; -import org.fudaa.dodico.crue.dao.CrueDaoPersistDFRT; -import org.fudaa.dodico.crue.dao.CrueDaoPersistDPTG; -import org.fudaa.dodico.crue.dao.CrueDaoPersistDPTI; -import org.fudaa.dodico.crue.dao.CrueDaoPersistDRSO; -import org.fudaa.dodico.crue.dao.CrueDaoPersistETU; -import org.fudaa.dodico.crue.dao.CrueDaoPersistOPTG; -import org.fudaa.dodico.crue.dao.CrueDaoPersit; -import org.fudaa.dodico.crue.dao.validatorXml.ValidatorXml; -import org.fudaa.dodico.crue.metier.EMHproject; -import org.fudaa.dodico.crue.metier.emh.CrueData; -import org.fudaa.dodico.crue.metier.emh.DonFrt; -import org.fudaa.dodico.crue.metier.emh.DonPrtReseau; -import org.fudaa.dodico.crue.metier.emh.EMH; - - - - -/** - * G\xE8re la lecteure du format crue 10 - * - * Utilise du parsing xml - * @author Adrien Hadoux - * - */ -public class Crue10reader { - - /** - * lit le fichier et remplit les infos d'erreurs et gestion des xsd. - * @author Adrien Hadoux - * - */ - protected static class ReaderWithExtra<T>{ - CrueDaoPersit<T> data; - CtuluAnalyze listeMessageError; - Object dataLinked; - - public ReaderWithExtra(CrueDaoPersit<T> data,Object dataLinked,CtuluAnalyze listeMessageError){ - this.data=data; - this.listeMessageError=listeMessageError; - this.dataLinked=dataLinked; - } - /** - * lit le fichier et le valide via la xsd. - * @param fichier - * @param validatorXSDfile - * @return - */ - public T read(File fichier,String validatorXSDfile){ - - listeMessageError.setDesc(CrueRessource.getS(" Analyse du Fichier "+fichier.getName())); - - //-- evaluation du fichier avec la xsd --// - if(!ValidatorXml.validXMLWithDOM(fichier.getAbsolutePath(), validatorXSDfile, listeMessageError) ){ - listeMessageError.addWarn( CrueRessource.getS("Fichier "+fichier.getName()+" non valid\xE9 par la XSD "+validatorXSDfile),0); - } - - //-- lecture des donn\xE9es --// - CrueDaoParsing<T> parser=new CrueDaoParsing<T>(data); - T res= parser.getPersistData(dataLinked, fichier, listeMessageError); - - - - return res; - } - - } - - - /** - * lit le fichier xml ETU - * ETU - Le fichier ETU d\xE9crit les conditions initiales - * et retourne les donn\xE9es m\xE9tier correspondantes. - * Attention, il faut fournir en entree les structures de donnees DRSO - * car le fichier ETU ne contient que des references vers les objets d\xE9crits dans DRSO. - */ - public static EMHproject readETUFile( File fichierETU,CtuluAnalyze listeMessageError){ - return (new ReaderWithExtra<EMHproject>(new CrueDaoPersistETU(),null,listeMessageError)).read(fichierETU, ValidatorXml.xsdETU); - } - - - - - /** - * lit le fichier xml DRSO - * DRSO - Fichier des donn\xE9es du r\xE9seau (xml) - * et retourne les donn\xE9es m\xE9tier correspondantes. - * @param fichierDRSO - * @return - */ - public static CrueData readDRSOFile( File fichierDRSO,CtuluAnalyze listeMessageError){ - - //-- remplissage des donnees m\xE9tier a partir des persistantes--// - return (new ReaderWithExtra<CrueData>(new CrueDaoPersistDRSO(),null,listeMessageError)).read(fichierDRSO, ValidatorXml.xsdDRSO); - - } - - - /** - * lit le fichier xml DPTI - * DPTI - Le fichier DPTI d\xE9crit les conditions initiales - * et retourne les donn\xE9es m\xE9tier correspondantes. - * Attention, il faut fournir en entree les structures de donnees DRSO - * car le fichier DPTI ne contient que des references vers les objets d\xE9crits dans DRSO. - */ - public static void readDPTIFile( File fichierDPTI,CrueData dataDRSO,CtuluAnalyze listeMessageError){ - (new ReaderWithExtra<CrueData>(new CrueDaoPersistDPTI(),dataDRSO,listeMessageError)).read(fichierDPTI, ValidatorXml.xsdDPTI); - } - - - - /** - * Lit le fichier xml \xE0 l'emplacement fichierDDPTG - * DPTG - Fichier des donn\xE9es de pr\xE9traitement g\xE9om\xE9trique (xml) - * a partir des donn\xE9es m\xE9tiers fournies. - * ATTENTION: DPTG a besoin du fichier DRSO et DFRT car il contient des r\xE9f\xE9rences vers ces objets. - */ - public static void readDPTGFile( File fichierDPTG,CrueData dataDRSOetDFRT, CtuluAnalyze listeMessageError){ - - (new ReaderWithExtra<CrueData>(new CrueDaoPersistDPTG(),dataDRSOetDFRT,listeMessageError)).read(fichierDPTG, ValidatorXml.xsdDPTG); - } - - /** - * lit le fichier xml DSCP - * DSCP - Le fichier DSCP d\xE9crit les variables de calculs pour les branches. - * et retourne les donn\xE9es m\xE9tier correspondantes. - * Attention, il faut fournir en entree les structures de donnees DRSO - * car le fichier DSCP ne contient que des references vers les objets d\xE9crits dans DRSO. - */ - public static void readDSCPFile( File fichierDSCP,List<EMH> dataDRSO,CtuluAnalyze listeMessageError){ - (new ReaderWithExtra<List<EMH>>(new CrueDaoPersistDCSP(),dataDRSO,listeMessageError)).read(fichierDSCP, ValidatorXml.xsdDCSP); - } - - /** - * lit le fichier xml DFRT - * DFRT - Fichier des frottements (xml) - * et retourne les donn\xE9es m\xE9tier correspondantes. - * @param fichierDFRT - * @return - */ - public static List<DonFrt> readDFRTFile( File fichierDFRT,CtuluAnalyze listeMessageError){ - return (new ReaderWithExtra<List<DonFrt>>(new CrueDaoPersistDFRT(),null,listeMessageError)).read(fichierDFRT, ValidatorXml.xsdDFRT); - - } - - /** - * lit le fichier xml OPTG - * OPTG - Fichier des ordres pour le pr\xE9traitement g\xE9om\xE9trique (xml). - * et retourne les donn\xE9es m\xE9tier correspondantes. - * @param fichierOPTG - * @return - */ - public static DonPrtReseau readOPTGFile( File fichierOPTG,CtuluAnalyze listeMessageError){ - return (new ReaderWithExtra<DonPrtReseau>(new CrueDaoPersistOPTG(),null,listeMessageError)).read(fichierOPTG, ValidatorXml.xsdOPTG); - - } - - - - - -} Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue10writer.java =================================================================== --- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue10writer.java 2009-03-31 20:31:42 UTC (rev 4602) +++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue10writer.java 2009-03-31 22:42:38 UTC (rev 4603) @@ -1,133 +0,0 @@ -package org.fudaa.dodico.crue.IO; - -import java.io.File; -import java.util.List; - -import org.fudaa.ctulu.CtuluAnalyze; -import org.fudaa.dodico.crue.common.CrueRessource; -import org.fudaa.dodico.crue.dao.CrueDaoParsing; -import org.fudaa.dodico.crue.dao.CrueDaoPersistDCSP; -import org.fudaa.dodico.crue.dao.CrueDaoPersistDFRT; -import org.fudaa.dodico.crue.dao.CrueDaoPersistDPTG; -import org.fudaa.dodico.crue.dao.CrueDaoPersistDPTI; -import org.fudaa.dodico.crue.dao.CrueDaoPersistDRSO; -import org.fudaa.dodico.crue.dao.CrueDaoPersistOPTG; -import org.fudaa.dodico.crue.dao.CrueDaoPersit; -import org.fudaa.dodico.crue.metier.emh.CrueData; -import org.fudaa.dodico.crue.metier.emh.DonFrt; -import org.fudaa.dodico.crue.metier.emh.DonPrtReseau; -import org.fudaa.dodico.crue.metier.emh.EMH; - - - -/** - * Writer qui g\xE8re l'io vers le format crue 10. - * - * Utilise du parsing xml - * @author Adrien Hadoux - * - */ -public class Crue10writer { - - - protected static class WriterWithExtra<T>{ - - CrueDaoPersit<T> data; - T dataMetier; - - public WriterWithExtra(CrueDaoPersit<T> data,T dataMetier){ - this.data=data; - this.dataMetier=dataMetier; - } - - public boolean write(CtuluAnalyze listeMessageError, File f){ - - listeMessageError.setDesc(CrueRessource.getS(" Analyse du Fichier "+f.getName())); - - data.fillInfosWith(dataMetier,listeMessageError); - CrueDaoParsing<T> parser=new CrueDaoParsing<T>(data); - return parser.persistData(f,listeMessageError); - } - - } - - /** - * Ecrit le fichier xml \xE0 l'emplacement fichierDRSO - * DRSO - Fichier des donn\xE9es du r\xE9seau (xml) - * a partir des donn\xE9es m\xE9tiers fournies. - */ - public static boolean writeDRSOFile(CrueData data, File fichierDRSO,CtuluAnalyze listeMessageError){ - return (new WriterWithExtra<CrueData>(new CrueDaoPersistDRSO(),data)).write(listeMessageError, fichierDRSO); - } - - - /** - * Ecrit le fichier xml \xE0 l'emplacement fichierDDPTI - * DPTI - Le fichier DPTI d\xE9crit les conditions initiales - * a partir des donn\xE9es m\xE9tiers fournies. - */ - public static boolean writeDPTIFile(CrueData data, File fichierDPTI,CtuluAnalyze listeMessageError){ - - - return (new WriterWithExtra<CrueData>(new CrueDaoPersistDPTI(),data)).write(listeMessageError, fichierDPTI); - } - - - /** - * Ecrit le fichier xml \xE0 l'emplacement fichierDDPTI - * DSCP - Le fichier DSCP d\xE9crit les variables de calcul pour les branches - * a partir des donn\xE9es m\xE9tiers fournies. - */ - public static boolean writeDSCPFile(List<EMH> data, File fichierDSCP,CtuluAnalyze listeMessageError){ - return (new WriterWithExtra<List<EMH>>(new CrueDaoPersistDCSP(),data)).write(listeMessageError, fichierDSCP); - } - - /** - * Ecrit le fichier xml \xE0 l'emplacement fichierDRSO - * DFRT - Fichier des frottements (xml) - * a partir des donn\xE9es m\xE9tiers fournies. - */ - public static boolean writeDFRTFile(List<DonFrt> data, File fichierDFRT,CtuluAnalyze listeMessageError){ - return (new WriterWithExtra<List<DonFrt>>(new CrueDaoPersistDFRT(),data)).write(listeMessageError, fichierDFRT); - } - - - /** - * Ecrit le fichier xml \xE0 l'emplacement fichierDDPTG - * DPTG - Fichier des donn\xE9es de pr\xE9traitement g\xE9om\xE9trique (xml) - * a partir des donn\xE9es m\xE9tiers fournies. - */ - public static boolean writeDPTGFile(CrueData data, File fichierDPTG,CtuluAnalyze listeMessageError){ - return (new WriterWithExtra<CrueData>(new CrueDaoPersistDPTG(),data)).write(listeMessageError, fichierDPTG); - } - - /** - * ecrit le fichier xml OPTG - * OPTG - Fichier des ordres pour le pr\xE9traitement g\xE9om\xE9trique (xml). - * et retourne les donn\xE9es m\xE9tier correspondantes. - * @param fichierOPTG - * @return - */ - public static boolean writeOPTGFile(DonPrtReseau data, File fichierOPTG,CtuluAnalyze listeMessageError){ - CrueDaoPersistOPTG dataPersistante=new CrueDaoPersistOPTG(); - return (new WriterWithExtra<DonPrtReseau>(new CrueDaoPersistOPTG(),data)).write(listeMessageError, fichierOPTG); - } - - /** - * Methode qui \xE9crit l'ensemble du projet au format crue. - * TODO: adrien: il faut mettre en param d'entr\xE9e un emhScenario qui contient les noms de tous les fichiers. - * @return - */ - public static boolean writeProjetCrue10(){ - boolean ok=false; - //TODO faire la methode. - - - - - return ok; - } - - - -} Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue9writer.java =================================================================== --- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue9writer.java 2009-03-31 20:31:42 UTC (rev 4602) +++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/Crue9writer.java 2009-03-31 22:42:38 UTC (rev 4603) @@ -1,11 +0,0 @@ -package org.fudaa.dodico.crue.IO; - -/** - * writer qui permet d'\xE9crier les structures de crue 09 dans les fichiers appropri\xE9s. - * Utilise fortran writer - * @author Adrien Hadoux - * - */ -public class Crue9writer { - -} Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CruePreferences.java =================================================================== --- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CruePreferences.java 2009-03-31 20:31:42 UTC (rev 4602) +++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CruePreferences.java 2009-03-31 22:42:38 UTC (rev 4603) @@ -1,30 +0,0 @@ -package org.fudaa.dodico.crue.common; - -import org.fudaa.fudaa.commun.FudaaPreferencesAbstract; -/** - * Preferences pour crue. - * @author Adrien Hadoux - * - */ -public class CruePreferences extends FudaaPreferencesAbstract { - public static final String KEY_SERVEUR_PREFIXE = "serveur"; - public static final String KEY_SERVEUR_SHOW_LOG = "serveur.log"; - public static final String KEY_CODE_ID = "crue.code.id"; - - - - /** - * Singleton. - */ - public final static CruePreferences Crue = new CruePreferences(); - - private CruePreferences() { - super(); - } - - @Override - public void applyOn(final Object _o) { - - } -} - Copied: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueResource.java (from rev 4602, trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueRessource.java) =================================================================== --- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueResource.java (rev 0) +++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueResource.java 2009-03-31 22:42:38 UTC (rev 4603) @@ -0,0 +1,69 @@ +package org.fudaa.dodico.crue.common; + +import org.fudaa.dodico.commun.DodicoResource; + +import com.memoire.bu.BuResource; + +/** + * TODO Fred a enlever Ressources crue. Utilit\xE9 ? + * + * @author Adrien Hadoux + */ +public class CrueResource extends DodicoResource { + + public final static CrueResource CRUE = new CrueResource(DodicoResource.DODICO); + public final static String SOFTWARE_ID = "Crue"; + + private CrueResource(final BuResource _b) { + super(_b); + } + + public static String getS(final String _s) { + return CRUE.getString(_s); + } + + public static String getS(final String _s, final String _v0) { + return CRUE.getString(_s, _v0); + } + + public static String getS(final String _s, final String _v0, final String _v1) { + return CRUE.getString(_s, _v0, _v1); + } + + // public static BuIcon getLogo() { + // return EbliResource.EBLI.getIcon("logo-crue"); + // } + // + // public BuIcon getIcon(String val) { + // return EbliResource.EBLI.getIcon(val); + // } + // + // // public static String getMeshName() { + // // return CrueRessource.getS("Meshview"); + // // } + // + // public static BuIcon getSupervisorIcon() { + // return EbliResource.EBLI.getIcon("crystal16_browser.png"); + // } + // + // public static BuIcon getCrueIcon() { + // return EbliResource.EBLI.getIcon("aproposde_32.gif"); + // } + // + // public static BuIcon getScopIcon() { + // return EbliResource.EBLI.getIcon("curves"); + // } + + // public static String getCrueName() { + // return CrueResource.getS("Crue"); + // } + // + // public static String getEditorName() { + // return CrueResource.getS("Editeur"); + // } + // + // public static BuIcon getEditorIcon() { + // return EbliResource.EBLI.getIcon("texte"); + // } + +} Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueRessource.java =================================================================== --- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueRessource.java 2009-03-31 20:31:42 UTC (rev 4602) +++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueRessource.java 2009-03-31 22:42:38 UTC (rev 4603) @@ -1,76 +0,0 @@ -package org.fudaa.dodico.crue.common; - -import org.fudaa.ebli.ressource.EbliResource; - -import org.fudaa.fudaa.ressource.FudaaResource; - -import com.memoire.bu.BuIcon; -import com.memoire.bu.BuResource; - -/** - * Ressources crue. - * - * @author Adrien Hadoux - * - */ -public class CrueRessource extends FudaaResource { - - public final static CrueRessource CRUE = new CrueRessource(BuResource.BU); - public final static String SOFTWARE_ID="Crue"; - private CrueRessource(final BuResource _b) { - super(_b); - } - - public static String getS(final String _s) { - return EbliResource.EBLI.getString(_s); - } - - public static String getS(final String _s, final String _v0) { - return EbliResource.EBLI.getString(_s, _v0); - } - - public static String getS(final String _s, final String _v0, - final String _v1) { - return EbliResource.EBLI.getString(_s, _v0, _v1); - } - - public static BuIcon getMeshIcon() { - return EbliResource.EBLI.getIcon("crue"); - } - - public static BuIcon getLogo() { - return EbliResource.EBLI.getIcon("logo-crue"); - } - - public BuIcon getIcon(String val) { - return EbliResource.EBLI.getIcon(val); - } -// public static String getMeshName() { -// return CrueRessource.getS("Meshview"); -// } - - public static BuIcon getSupervisorIcon() { - return EbliResource.EBLI.getIcon("crystal16_browser.png"); - } - - public static BuIcon getCrueIcon() { - return EbliResource.EBLI.getIcon("aproposde_32.gif"); - } - - public static BuIcon getScopIcon() { - return EbliResource.EBLI.getIcon("curves"); - } - - public static String getCrueName() { - return CrueRessource.getS("Crue"); - } - - public static String getEditorName() { - return CrueRessource.getS("Editeur"); - } - - public static BuIcon getEditorIcon(){ - return EbliResource.EBLI.getIcon("texte"); - } - -} Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryCommom.java =================================================================== --- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryCommom.java 2009-03-31 20:31:42 UTC (rev 4602) +++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryCommom.java 2009-03-31 22:42:38 UTC (rev 4603) @@ -1,154 +0,0 @@ -package org.fudaa.dodico.crue.dao; - -import java.util.Date; -import java.util.List; - -import org.fudaa.ctulu.CtuluAnalyze; -import org.fudaa.dodico.crue.common.CrueRessource; -import org.fudaa.dodico.crue.metier.emh.PtProfil; - - - -/** - * Plusieurs m\xE9thodes et classes communes utilis\xE9es pour les factory. - * @author Adrien Hadoux - * - */ -public class CrueDaoFactoryCommom { - - public static String VersionCrue="0.0"; - public static String Commentaire="Genere par Fudaa le "+new Date(System.currentTimeMillis()); - - //-- listing des diff\xE9rents fichiers et leur noms utilis\xE9s --// - public static String ETU="ETU"; - - public static String DRSO="DRSO"; - public static String ORES="ORES"; - public static String OCAL="OCAL"; - public static String PCAL="PCAL"; - public static String DCLM="DCLM"; - public static String DLHY="DLHY"; - public static String OPTR="OPTR"; - public static String OPTG="OPTG"; - public static String OPTI="OPTI"; - public static String PNUM="PNUM"; - public static String DPTI="DPTI"; - public static String DCSP="DCSP"; - public static String DPTG="DPTG"; - public static String DFRT="DFRT"; - public static String DC="DC"; - public static String DH="DH"; - - - //-- fichiers de resultats --// - public static String FICHIERRESULTAT="RESULTAT"; - - public static String RPTR="RPTR"; - public static String RPTG="RPTG"; - public static String RPTI="RPTI"; - public static String RCAL="RCAL"; - - - - - - /** - * Construit un ptProfil a partir d'une chaine de caracteres. - * Utilis\xE9 pour DPTG - * @param buff - * @param listeMessageError - * @param nameError - * @return - */ - public static PtProfil createFormString(StringBuffer buff,CtuluAnalyze analyser,String nameError ){ - int indiceCesure=buff.lastIndexOf(" "); - String val1=buff.substring(0, indiceCesure); - String val2=buff.substring(indiceCesure+1, buff.length()); - double x=0; - try{ - x=Double.parseDouble(val1); - - }catch(NumberFormatException e){ - analyser.addInfo(CrueRessource.getS("Profil: "+nameError+": impossible de r\xE9cup\xE9rer la lim debut du contenu: "+buff)); - } - double y=0; - try{ - y=Double.parseDouble(val2); - }catch(NumberFormatException e){ - analyser.addInfo(CrueRessource.getS("Profil: "+nameError+": impossible de r\xE9cup\xE9rer la lim debut du contenu: "+buff)); - } - - PtProfil profil=new PtProfil(x,y); - return profil; - } - public static PtProfil createFormString(String buff,CtuluAnalyze analyser,String nameError ){ - return createFormString(new StringBuffer(buff), analyser, nameError); - } - - - /** - * Message qui indique la balise n'est pas reconnue par les structures de donn\xE9es EMH. - * @param balise - * @param nomRef - * @return - */ - public static String unknowEMH(String balise,String nomEMH){ - return CrueRessource.getS(balise+": Il n'existe pas de structure de donn\xE9e EMH pour l'objet "+nomEMH); - } - - - public static String unknowdataFromFile(String balise,String FileType,String nomEMH){ - return CrueRessource.getS(balise+": Il n'existe pas de structure de donn\xE9e "+FileType+" pour l'objet "+nomEMH); - } - - /** - * Message qui indique la balise n'est pas reconnue par les structures de donn\xE9es EMH. - * @param balise - * @param nomRef - * @return - */ - public static String unknowReference(String balise,String nomRef){ - return CrueRessource.getS(balise+": Impossible de trouver "+balise+" de r\xE9f\xE9rence "+nomRef); - - } - - /** - * Envoie un message formatt\xE9 pour une erreur de doublons d'id - * @param balise - * @param nomRef - * @return - */ - public static String errorIdNonUnique(String balise,String nomRef){ - return CrueRessource.getS("<"+balise+">: l'id "+nomRef+" est en doublon, il ne sera donc pas "); - - } - - - public static String messageBaliseError(String balise,String message){ - return CrueRessource.getS(balise+": "+message); - - } - - - /** - * Message qui indique la balise n'est pas reconnue par les structures de donn\xE9es EMH. - * @param balise - * @param nomRef - * @return - */ - public static String listEmpty(String balise){ - return CrueRessource.getS("Sections <"+balise+">: la liste est vide."); - - } - - public static String emhEmpty(String balise){ - return CrueRessource.getS("EMH: Aucune donn\xE9es EMH trouv\xE9e pour <"+balise+">."); - - } - - - - - - -} Copied: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryCommon.java (from rev 4602, trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryCommom.java) =================================================================== --- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryCommon.java (rev 0) +++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFactoryCommon.java 2009-03-31 22:42:38 UTC (rev 4603) @@ -0,0 +1,145 @@ +package org.fudaa.dodico.crue.dao; + +import java.util.Date; + +import org.fudaa.ctulu.CtuluAnalyze; +import org.fudaa.dodico.crue.common.CrueResource; +import org.fudaa.dodico.crue.metier.emh.PtProfil; + +/** + * Plusieurs m\xE9thodes et classes communes utilis\xE9es pour les factory. + * + * @author Adrien Hadoux + */ +public class CrueDaoFactoryCommon { + + public static String VersionCrue = "0.0"; + public static String Commentaire = "Genere par Fudaa le " + new Date(System.currentTimeMillis()); + + // -- listing des diff\xE9rents fichiers et leur noms utilis\xE9s --// + public static String ETU = "ETU"; + + public static String DRSO = "DRSO"; + public static String ORES = "ORES"; + public static String OCAL = "OCAL"; + public static String PCAL = "PCAL"; + public static String DCLM = "DCLM"; + public static String DLHY = "DLHY"; + public static String OPTR = "OPTR"; + public static String OPTG = "OPTG"; + public static String OPTI = "OPTI"; + public static String PNUM = "PNUM"; + public static String DPTI = "DPTI"; + public static String DCSP = "DCSP"; + public static String DPTG = "DPTG"; + public static String DFRT = "DFRT"; + public static String DC = "DC"; + public static String DH = "DH"; + + // -- fichiers de resultats --// + public static String FICHIERRESULTAT = "RESULTAT"; + + public static String RPTR = "RPTR"; + public static String RPTG = "RPTG"; + public static String RPTI = "RPTI"; + public static String RCAL = "RCAL"; + + /** + * Construit un ptProfil a partir d'une chaine de caracteres. Utilis\xE9 pour DPTG + * + * @param buff + * @param listeMessageError + * @param nameError + * @return + */ + public static PtProfil createFormString(final StringBuffer buff, final CtuluAnalyze analyser, final String nameError) { + final int indiceCesure = buff.lastIndexOf(" "); + final String val1 = buff.substring(0, indiceCesure); + final String val2 = buff.substring(indiceCesure + 1, buff.length()); + double x = 0; + try { + x = Double.parseDouble(val1); + + } catch (final NumberFormatException e) { + analyser.addInfo(CrueResource.getS("Profil: " + nameError + ": impossible de r\xE9cup\xE9rer la lim debut du contenu: " + + buff)); + } + double y = 0; + try { + y = Double.parseDouble(val2); + } catch (final NumberFormatException e) { + analyser.addInfo(CrueResource.getS("Profil: " + nameError + ": impossible de r\xE9cup\xE9rer la lim debut du contenu: " + + buff)); + } + + final PtProfil profil = new PtProfil(x, y); + return profil; + } + + public static PtProfil createFormString(final String buff, final CtuluAnalyze analyser, final String nameError) { + return createFormString(new StringBuffer(buff), analyser, nameError); + } + + /** + * Message qui indique la balise n'est pas reconnue par les structures de donn\xE9es EMH. + * + * @param balise + * @param nomRef + * @return + */ + public static String unknowEMH(final String balise, final String nomEMH) { + return CrueResource.getS(balise + ": Il n'existe pas de structure de donn\xE9e EMH pour l'objet " + nomEMH); + } + + public static String unknowdataFromFile(final String balise, final String File... [truncated message content] |