Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2009-05-10 17:34:47
|
Revision: 4750
http://fudaa.svn.sourceforge.net/fudaa/?rev=4750&view=rev
Author: deniger
Date: 2009-05-10 17:34:42 +0000 (Sun, 10 May 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDFRTFile.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dfrt.xml
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/EMHGeneralBuilder.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/RemplissageData.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dfrt.new.xml
Deleted: 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/RemplissageData.java 2009-05-10 17:33:18 UTC (rev 4749)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/RemplissageData.java 2009-05-10 17:34:42 UTC (rev 4750)
@@ -1,578 +0,0 @@
-package org.fudaa.dodico.crue.io;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.fudaa.dodico.crue.io.dao.DonPrtCIniCasierProfil;
-import org.fudaa.dodico.crue.metier.CrueData;
-import org.fudaa.dodico.crue.metier.CrueDataImpl;
-import org.fudaa.dodico.crue.metier.emh.*;
-import org.fudaa.dodico.crue.metier.helper.EMHHelper;
-import org.fudaa.dodico.crue.metier.helper.EMHNoeudHelper;
-
-public class RemplissageData {
-
- /**
- * remplit l'ensemble des donn�es pour faire les test. Methode a updgrader et a reutiliser poru centraliser les tests.
- *
- * @return
- */
- public static CrueData remplissageDonneeTest() {
- final CrueData data = new CrueDataImpl();
-
- // -- cr�ation de noeuds --//
- DonPrtCIniNoeudNiveauContinu condInitNoeud = null;
- int cptNoeuds = 1;
- while (cptNoeuds < 25) {
- final CatEMHNoeud noeud = new CatEMHNoeud("N" + cptNoeuds++);
- // -- 2 condition init pour tous les noeuds --//
- condInitNoeud = new DonPrtCIniNoeudNiveauContinu();
- condInitNoeud.setZIni(cptNoeuds);
- noeud.addDPTI(condInitNoeud);
-
- condInitNoeud = new DonPrtCIniNoeudNiveauContinu();
- condInitNoeud.setZIni(cptNoeuds + 25);
- noeud.addDPTI(condInitNoeud);
-
- data.getNoeuds().add(noeud);
- }
-
- // --Creation des donnees DONFRT --//
- final List<DonFrt> listeDonFrt = remplissageDonneeTestDFRT();
-
- // -- creation des casiers--//
- EMHCasierProfil casierProfil = new EMHCasierProfil("CASIER PROFIL 001");
- casierProfil.setActive(false);
- // -- Donnees DPTI --//
- DonPrtCIniCasierProfil condInitCasier = new DonPrtCIniCasierProfil();
- condInitCasier.setQruis(234.123);
- casierProfil.addDPTI(condInitCasier);
- // -- recherche du noeud 25 precedemment ins�r� --//
- final CatEMHNoeud noeud25 = EMHNoeudHelper.findByReference("N22", data);
- casierProfil.setNoeud(noeud25);
- // -- Donnees DPTG --//
- // -- Ajout de 3 donn�es DPTG --//
- DonPrtGeoProfilCasier geoCasier = new DonPrtGeoProfilCasier();
- geoCasier.setListeProfils(remplirSeriesProfilsDPTG(2));
- geoCasier.setLongueur(777);
- geoCasier.setNom("PROFIL01 de 001");
- // geoCasier.setMLitNumerotes(remplirLitsDPTG(3, listeDonFrt.get(0), listeDonFrt.get(5)));
- casierProfil.addDPTG(geoCasier);
-
- geoCasier = new DonPrtGeoProfilCasier();
- geoCasier.setListeProfils(remplirSeriesProfilsDPTG(8));
- geoCasier.setLongueur(423);
- geoCasier.setNom("PROFIL02 de 001");
- // geoCasier.setMLitNumerotes(remplirLitsDPTG(3, listeDonFrt.get(5), listeDonFrt.get(6)));
- casierProfil.addDPTG(geoCasier);
-
- geoCasier = new DonPrtGeoProfilCasier();
- geoCasier.setListeProfils(remplirSeriesProfilsDPTG(1));
- geoCasier.setLongueur(2);
- geoCasier.setNom("PROFIL03 de 001");
- // geoCasier.setMLitNumerotes(remplirLitsDPTG(3, listeDonFrt.get(2), listeDonFrt.get(1)));
- casierProfil.addDPTG(geoCasier);
-
- data.add(casierProfil);
-
- // -- ajout d'un autre casier profil qui utilise le meme profil DPTG --//
- casierProfil = new EMHCasierProfil("CASIER PROFIL PIque DPTG");
- casierProfil.setActive(false);
- final CatEMHNoeud noeud17 = EMHNoeudHelper.findByReference("N17", data);
- casierProfil.setNoeud(noeud17);
- // -- Donnees DPTG --//
- casierProfil.addDPTG(geoCasier);
- data.add(casierProfil);
-
- final EMHCasierMNT casierMNT = new EMHCasierMNT("CASIER MNT 002");
- casierMNT.setActive(true);
- // -- recherche du noeud 12 precedemment ins�r� --//
- final CatEMHNoeud noeud12 = EMHNoeudHelper.findByReference("N12", data);
- casierMNT.setNoeud(noeud12);
- condInitCasier = new DonPrtCIniCasierProfil();
- condInitCasier.setQruis(12.11);
- casierMNT.addDPTI(condInitCasier);
- data.add(casierMNT);
-
- // -- creation des sections --//
- final EMHSectionInterpolee interpol = new EMHSectionInterpolee("SEC INT");
-
- // -- dscp --//
- DonCalcSansPrtSection calculSection = new DonCalcSansPrtSection();
- calculSection.setCoeffConv(12.25);
- calculSection.setCoeffDiv(11.13);
- calculSection.setCoeffPond(2.251524);
- interpol.addDSCP(calculSection);
-
- data.add(interpol);
-
- // -- Section Profil --//
- final EMHSectionProfil profil = new EMHSectionProfil("SEC PROF");
-
- // -- dscp --//
- calculSection = new DonCalcSansPrtSection();
- calculSection.setCoeffConv(09.11);
- calculSection.setCoeffDiv(11);
- calculSection.setCoeffPond(212.2);
- profil.addDSCP(calculSection);
-
- // -- Donnees DPTG --//
- // -- Ajout de 3 donn�es DPTG --//
- final DonPrtGeoProfilSection geoSection = new DonPrtGeoProfilSection();
- geoSection.setListeProfils(remplirSeriesProfilsDPTG(2));
- geoSection.setNom("PROFIL_SECTION_007");
- geoSection.setMLitNumerotes(remplirLitsDPTG(3, listeDonFrt.get(0), listeDonFrt.get(5)));
- profil.addDPTG(geoSection);
- data.add(profil);
-
- final EMHSectionSansGeometrie geometrie = new EMHSectionSansGeometrie("SEC GEOM");
-
- // -- dscp --//
- calculSection = new DonCalcSansPrtSection();
- calculSection.setCoeffConv(255);
- calculSection.setCoeffDiv(999);
- calculSection.setCoeffPond(777);
- geometrie.addDSCP(calculSection);
- data.add(geometrie);
-
- // -- Section Idem --//
- final EMHSectionIdem sectionIdem = new EMHSectionIdem("SEC IDEM");
-
- // -- dscp --//
- final DonCalcSansPrtSection calculSection2 = new DonCalcSansPrtSection();
- calculSection2.setCoeffConv(12.25);
- calculSection2.setCoeffDiv(11.13);
- calculSection2.setCoeffPond(2.251524);
- sectionIdem.addDSCP(calculSection2);
-
- // -- DPTG --//
- final DonPrtGeoSectionIdem geoIdem = new DonPrtGeoSectionIdem();
- geoIdem.setDW(65535);
- sectionIdem.addDPTG(geoIdem);
- data.add(sectionIdem);
-
- // -- creation des branches --//
- DonPrtCIniBranche condInitBranche1 = null;
- DonPrtCIniBrancheOrifice condInitBranche2 = null;
-
- // EMHBrancheSaintVenant
- final EMHBrancheSaintVenant branche1 = new EMHBrancheSaintVenant("BRANCHE VENANT1");
- branche1.setActive(true);
- branche1.setNoeudAmont(EMHNoeudHelper.findByReference("N12", data));
- branche1.setNoeudAval(EMHNoeudHelper.findByReference("N1", data));
-
- // -- donnees DPTI --//
- condInitBranche1 = new DonPrtCIniBranche();
- condInitBranche1.setQinit(12.5);
- branche1.addDPTI(condInitBranche1);
- // -- donnees DSCP --//
- final DonCalcSansPrtBrancheSaintVenant dataCalcul = new DonCalcSansPrtBrancheSaintVenant();
- dataCalcul.setCoeffBeta(5.55);
- dataCalcul.setCoefRuis(6.66);
- dataCalcul.setCoeffRuisQdm(7.77);
- branche1.addDSCP(dataCalcul);
- List<RelationEMH> listeSections = new ArrayList<RelationEMH>();
- HashMap<String, Object> map = new HashMap<String, Object>();
- map.put(EMHHelper.Pos_section, "POSITION SECTION INTERPOL");
- map.put(EMHHelper.Xp_section, 123.4);
-
- listeSections.add(new RelationEMH(interpol, map));
- map = new HashMap<String, Object>();
- map.put(EMHHelper.Pos_section, "POSITION SECTION GEOMETRIE");
- map.put(EMHHelper.Xp_section, 123.4);
-
- listeSections.add(new RelationEMH(geometrie, map));
- branche1.setListeSections(listeSections);
-
- // -- Donnees DPTG --//
- final DonPrtGeoBrancheSaintVenant geoPrt = new DonPrtGeoBrancheSaintVenant();
- geoPrt.setCoefSinuo(255);
- branche1.addDPTG(geoPrt);
-
- data.add(branche1);
-
- // EMHBrancheBarrageGenerique
- final EMHBrancheBarrageGenerique branche2 = new EMHBrancheBarrageGenerique("BRANCHE CHANEL");
- branche2.setActive(false);
- branche2.setNoeudAmont(EMHNoeudHelper.findByReference("N5", data));
- branche2.setNoeudAval(EMHNoeudHelper.findByReference("N7", data));
-
- // -- donnees DPTI --//
- condInitBranche1 = new DonPrtCIniBranche();
- condInitBranche1.setQinit(2.5);
-
- branche2.addDPTI(condInitBranche1);
-
- // -- donnees DSCP --//
- final DonCalcSansPrtBrancheBarrageFilEau dataCalcul1 = new DonCalcSansPrtBrancheBarrageFilEau();
- dataCalcul1.setQLimInf(144);
- dataCalcul1.setQLimSup(441);
- LoiFF loi = new LoiFF();
- loi.setNom("Loi BRANCHE GENE");
- dataCalcul1.setRegimeDenoye(loi);
- dataCalcul1.setListElt(remplirListeSeuils());
- branche2.addDSCP(dataCalcul1);
-
- listeSections = new ArrayList<RelationEMH>();
- map = new HashMap<String, Object>();
- map.put(EMHHelper.Pos_section, "POSITION SECTION PROFIL");
- map.put(EMHHelper.Xp_section, 212.121);
- listeSections.add(new RelationEMH(profil, map));
- branche2.setListeSections(listeSections);
- data.add(branche2);
-
- // EMHBrancheOrifice
- final EMHBrancheOrifice branche3 = new EMHBrancheOrifice("BRANCHE ORIFICE");
- branche3.setActive(false);
- branche3.setNoeudAmont(EMHNoeudHelper.findByReference("N5", data));
- branche3.setNoeudAval(EMHNoeudHelper.findByReference("N7", data));
- // -- donnees DPTI --//
- condInitBranche2 = new DonPrtCIniBrancheOrifice();
- condInitBranche2.setQinit(65535);
- condInitBranche2.setOuvPasseDessous(255);
- branche3.addDPTI(condInitBranche2);
- // -- donnees DSCP --//
- // -- liste element orifices --//
- final DonCalcSansPrtBrancheOrifice dataCalcul2 = new DonCalcSansPrtBrancheOrifice();
- dataCalcul2.setElement(remplirListeOrifices());
- branche3.addDSCP(dataCalcul2);
-
- listeSections = new ArrayList<RelationEMH>();
- map = new HashMap<String, Object>();
- map.put(EMHHelper.Pos_section, "Test");
- map.put(EMHHelper.Xp_section, 777);
- listeSections.add(new RelationEMH(profil, map));
- branche3.setListeSections(listeSections);
- data.add(branche3);
-
- // EMHBrancheSeuilTransversal
- final EMHBrancheSeuilTransversal branche4 = new EMHBrancheSeuilTransversal("BRANCHE TRANSVERSALE ELEMSEUIL");
- branche4.setActive(false);
- branche4.setNoeudAmont(EMHNoeudHelper.findByReference("N3", data));
- branche4.setNoeudAval(EMHNoeudHelper.findByReference("N12", data));
- // -- donnees DPTI --//
- condInitBranche1 = new DonPrtCIniBranche();
- condInitBranche1.setQinit(12.254);
- branche4.addDPTI(condInitBranche1);
-
- // -- donnees DSCP --//
- // -- liste element orifices --//
- final DonCalcSansPrtBrancheSeuilTransversal dataCalcul3 = new DonCalcSansPrtBrancheSeuilTransversal();
- dataCalcul3.setListElt(remplirListeSeuilsPDC());
- dataCalcul3.setFormulePdc("Divergent");
- branche4.addDSCP(dataCalcul3);
-
- listeSections = new ArrayList<RelationEMH>();
- map = new HashMap<String, Object>();
- map.put(EMHHelper.Pos_section, "Profil Test");
- map.put(EMHHelper.Xp_section, 458);
- listeSections.add(new RelationEMH(profil, map));
- branche4.setListeSections(listeSections);
- data.add(branche4);
-
- // EMHBrancheSeuilLongitudinal
- final EMHBrancheSeuilLateral branche5 = new EMHBrancheSeuilLateral("BRANCHE LATERALE ELEMSEUIL");
- branche5.setActive(false);
- branche5.setNoeudAmont(EMHNoeudHelper.findByReference("N3", data));
- branche5.setNoeudAval(EMHNoeudHelper.findByReference("N12", data));
- // -- donnees DPTI --//
- condInitBranche1 = new DonPrtCIniBranche();
- condInitBranche1.setQinit(12.254);
- branche5.addDPTI(condInitBranche1);
-
- // -- donnees DSCP --//
- // -- liste element orifices --//
- final DonCalcSansPrtBrancheSeuilLateral dataCalcul4 = new DonCalcSansPrtBrancheSeuilLateral();
- dataCalcul4.setListElt(remplirListeSeuilsPDC());
- dataCalcul4.setFormulePdc("Convergent");
- branche5.addDSCP(dataCalcul4);
-
- listeSections = new ArrayList<RelationEMH>();
- map = new HashMap<String, Object>();
- map.put(EMHHelper.Pos_section, "Profil Test 3");
- map.put(EMHHelper.Xp_section, 457);
- listeSections.add(new RelationEMH(profil, map));
- branche5.setListeSections(listeSections);
- data.add(branche5);
-
- // EMHBrancheBarrageFilEau
- final EMHBrancheBarrageFilEau branche6 = new EMHBrancheBarrageFilEau("BRANCHE BARRAGE FIL EAU");
- branche6.setActive(false);
- branche6.setNoeudAmont(EMHNoeudHelper.findByReference("N3", data));
- branche6.setNoeudAval(EMHNoeudHelper.findByReference("N12", data));
- // -- donnees DPTI --//
- condInitBranche1 = new DonPrtCIniBranche();
- condInitBranche1.setQinit(12.254);
- branche6.addDPTI(condInitBranche1);
-
- // -- donnees DSCP --//
- // -- liste element orifices --//
- final DonCalcSansPrtBrancheBarrageFilEau dataCalcul5 = new DonCalcSansPrtBrancheBarrageFilEau();
- dataCalcul5.setQLimInf(144);
- dataCalcul5.setQLimSup(441);
- loi = new LoiFF();
- loi.setNom("Loi Speciale");
- dataCalcul5.setRegimeDenoye(loi);
- dataCalcul5.setListElt(remplirListeSeuils());
- branche6.addDSCP(dataCalcul5);
-
- listeSections = new ArrayList<RelationEMH>();
- map = new HashMap<String, Object>();
- map.put(EMHHelper.Pos_section, "VAR TEST profil");
- map.put(EMHHelper.Xp_section, 111);
- listeSections.add(new RelationEMH(profil, map));
- branche6.setListeSections(listeSections);
- data.add(branche6);
-
- // EMHBranchePdc
- final EMHBranchePdc branche7 = new EMHBranchePdc("BRANCHE PDC");
- branche7.setActive(false);
- branche7.setNoeudAmont(EMHNoeudHelper.findByReference("N3", data));
- branche7.setNoeudAval(EMHNoeudHelper.findByReference("N12", data));
- // -- donnees DPTI --//
- condInitBranche1 = new DonPrtCIniBrancheOrifice();
- condInitBranche1.setQinit(12.254);
- branche7.addDPTI(condInitBranche1);
-
- // -- donnees DSCP --//
- // -- liste element orifices --//
- final DonCalcSansPrtBranchePDC dataCalcul6 = new DonCalcSansPrtBranchePDC();
-
- loi = new LoiFF();
- loi.setNom("Loi du PDC");
- dataCalcul6.setPdc_DZ(loi);
- branche7.addDSCP(dataCalcul6);
-
- listeSections = new ArrayList<RelationEMH>();
- map = new HashMap<String, Object>();
- map.put(EMHHelper.Pos_section, "profil section");
- map.put(EMHHelper.Xp_section, 12345);
- listeSections.add(new RelationEMH(profil, map));
- branche7.setListeSections(listeSections);
- data.add(branche7);
-
- return data;
- }
-
- public static List<LitNumerote> remplirLitsDPTG(final int a, final DonFrt don1, final DonFrt don2) {
- final List<LitNumerote> listeLits = new ArrayList<LitNumerote>();
-
- LitNumerote litNum = new LitNumerote();
-
- litNum.setDebut(new PtProfil(13.2 * a, 101.2 * a));
- litNum.setFin(new PtProfil(44.2 * a, 2000.2 * a));
- litNum.setEstActif(true);
- litNum.setEstMineur(false);
- litNum.setMDonFrt(don1);
- listeLits.add(litNum);
-
- litNum = new LitNumerote();
- litNum.setDebut(new PtProfil(200 * a, 11.2 * a));
- litNum.setFin(new PtProfil(1000 * a, 13 * a));
- litNum.setEstActif(false);
- litNum.setEstMineur(true);
- litNum.setMDonFrt(don2);
- listeLits.add(litNum);
-
- return listeLits;
- }
-
- public static List<PtProfil> remplirSeriesProfilsDPTG(final int a) {
- final List<PtProfil> listeProfils = new ArrayList<PtProfil>();
- listeProfils.add(new PtProfil(13.2 * a, 101.2 * a));
- listeProfils.add(new PtProfil(1.2 * a, 12 * a));
- listeProfils.add(new PtProfil(2.2 * a, 2 * a));
- listeProfils.add(new PtProfil(123.2 * a, 10 * a));
- listeProfils.add(new PtProfil(1003.2 * a, 11 * a));
- listeProfils.add(new PtProfil(143.2 * a, 12 * a));
- listeProfils.add(new PtProfil(1.2 * a, 111 * a));
- listeProfils.add(new PtProfil(13.2 * a, 777 * a));
- listeProfils.add(new PtProfil(0.2 * a, 5.2 * a));
- listeProfils.add(new PtProfil(12.2 * a, 0.2 * a));
- listeProfils.add(new PtProfil(5.2 * a, 1.2 * a));
- listeProfils.add(new PtProfil(99.2 * a, 2.2 * a));
- listeProfils.add(new PtProfil(102.2 * a, 111.2 * a));
- return listeProfils;
- }
-
- public static List<ElemOrifice> remplirListeOrifices() {
- final List<ElemOrifice> listeEltSeuilsOrifices = new ArrayList<ElemOrifice>();
- ElemOrifice orif = new ElemOrifice();
- orif.setCoeffCtrLim(999);
- orif.setCoeffQ(23);
- orif.setLarg(11);
- orif.setSens("Bidirect");
- orif.setZSeuil(22.23);
- listeEltSeuilsOrifices.add(orif);
- orif = new ElemOrifice();
- orif.setCoeffCtrLim(543);
- orif.setCoeffQ(12345);
- orif.setLarg(987);
- orif.setSens("Uni");
- orif.setZSeuil(1.9);
- listeEltSeuilsOrifices.add(orif);
- orif = new ElemOrifice();
- orif.setCoeffCtrLim(2);
- orif.setCoeffQ(3);
- orif.setLarg(4);
- orif.setSens("5 Uni");
- orif.setZSeuil(6);
- listeEltSeuilsOrifices.add(orif);
- return listeEltSeuilsOrifices;
- }
-
- public static List<ElemSeuilAvecPdc> remplirListeSeuilsPDC() {
- final List<ElemSeuilAvecPdc> listeEltSeuils = new ArrayList<ElemSeuilAvecPdc>();
- ElemSeuilAvecPdc orif = new ElemSeuilAvecPdc();
- orif.setCoeffPdc(23);
- orif.setCoeffD(23);
- orif.setLarg(11);
- orif.setZSeuil(22.23);
- listeEltSeuils.add(orif);
- orif = new ElemSeuilAvecPdc();
- orif.setCoeffPdc(1.1);
- orif.setCoeffD(12345);
- orif.setLarg(987);
- orif.setZSeuil(1.9);
- listeEltSeuils.add(orif);
- orif = new ElemSeuilAvecPdc();
- orif.setCoeffPdc(99.9);
- orif.setCoeffD(3);
- orif.setLarg(4);
- orif.setZSeuil(6);
- listeEltSeuils.add(orif);
- return listeEltSeuils;
- }
-
- public static List<ElemSeuil> remplirListeSeuils() {
- final List<ElemSeuil> listeEltSeuils = new ArrayList<ElemSeuil>();
- ElemSeuil orif = new ElemSeuil();
-
- orif.setCoeffD(23);
- orif.setLarg(11);
- orif.setZSeuil(22.23);
- listeEltSeuils.add(orif);
- orif = new ElemSeuil();
-
- orif.setCoeffD(12345);
- orif.setLarg(987);
- orif.setZSeuil(1.9);
- listeEltSeuils.add(orif);
- orif = new ElemSeuil();
-
- orif.setCoeffD(3);
- orif.setLarg(4);
- orif.setZSeuil(6);
- listeEltSeuils.add(orif);
- return listeEltSeuils;
- }
-
- public static CrueData remplissageDonneeTestErreur() {
- final CrueData res = remplissageDonneeTest();
-
- res.getAllEMH().remove(EMHNoeudHelper.findByReference("N5", res));
- res.getAllEMH().remove(EMHNoeudHelper.findByReference("N12", res));
- res.getAllEMH().remove(EMHNoeudHelper.findByReference("N3", res));
- res.getAllEMH().remove(EMHNoeudHelper.findByReference("N1", res));
-
- return res;
- }
-
- /**
- * remplit l'ensemble des donn�es pour faire les test. Methode a updgrader et a reutiliser poru centraliser les tests.
- *
- * @return
- */
- public static List<DonFrt> remplissageDonneeTestDFRT() {
- final List<DonFrt> data = new ArrayList<DonFrt>();
-
- DonFrt ref1 = new StriRefC("ref#stric");
- ref1.addPoint(new FrottementPoint(10, 20));
- data.add(ref1);
- ref1 = new StriRefZ("rsdfsf");
- ref1.addPoint(new FrottementPoint(12, 23));
- ref1.addPoint(new FrottementPoint(452, 1));
- data.add(ref1);
- ref1 = new StriRefH("test");
- ref1.addPoint(new FrottementPoint(1, 1));
- ref1.addPoint(new FrottementPoint(1222, 2143));
- data.add(ref1);
- ref1 = new StriRefC("@#hgf55");
- ref1.addPoint(new FrottementPoint(10, 20));
- ref1.addPoint(new FrottementPoint(12, 23));
- data.add(ref1);
- ref1 = new StriRefH("12 235");
- ref1.addPoint(new FrottementPoint(10, 20));
- ref1.addPoint(new FrottementPoint(1712, 52253));
- data.add(ref1);
- ref1 = new StriRefH("XIII");
- ref1.addPoint(new FrottementPoint(10, 20));
- ref1.addPoint(new FrottementPoint(2, 3));
- data.add(ref1);
- data.add(ref1);
- ref1 = new StriRefZ("ba28 d");
- ref1.addPoint(new FrottementPoint(10, 20));
- ref1.addPoint(new FrottementPoint(666, 555));
- data.add(ref1);
- data.add(ref1);
- ref1 = new StriRefZ("ref z");
- ref1.addPoint(new FrottementPoint(14, 16));
- ref1.addPoint(new FrottementPoint(10, 20));
- data.add(ref1);
- ref1 = new StriRefZ("rh 132");
- ref1.addPoint(new FrottementPoint(10, 20));
- ref1.addPoint(new FrottementPoint(12, 23));
- data.add(ref1);
- ref1 = new StriRefH("refh12");
- ref1.addPoint(new FrottementPoint(10, 20));
- ref1.addPoint(new FrottementPoint(2112, 3223));
- data.add(ref1);
-
- return data;
- }
-
- public static List<DonFrt> remplissageDonneeTestErreurDFRT() {
- final List<DonFrt> data = new ArrayList<DonFrt>();
-
- DonFrt ref1 = new StriRefC("ref#stric");
- ref1.addPoint(new FrottementPoint(10, 20));
- data.add(ref1);
- ref1 = new StriRefZ("rsdfsf");
- ref1.addPoint(new FrottementPoint(12, 23));
- data.add(ref1);
- ref1 = new StriRefH("test");
- ref1.addPoint(new FrottementPoint(1, 1));
- data.add(ref1);
- ref1 = new StriRefC("@#hgf55");
- ref1.addPoint(new FrottementPoint(10, 20));
- data.add(ref1);
- ref1 = new StriRefH("12 235");
- ref1.addPoint(new FrottementPoint(10, 20));
- data.add(ref1);
- ref1 = new StriRefH("XIII");
- ref1.addPoint(new FrottementPoint(10, 20));
- data.add(ref1);
- ref1 = new StriRefZ("ba28 d");
- ref1.addPoint(new FrottementPoint(10, 20));
- data.add(ref1);
- ref1 = new StriRefZ("ref z");
- ref1.addPoint(new FrottementPoint(10, 20));
- data.add(ref1);
- ref1 = new StriRefZ("rh 132");
- ref1.addPoint(new FrottementPoint(10, 20));
- data.add(ref1);
- ref1 = new StriRefH("refh12");
- ref1.addPoint(new FrottementPoint(10, 20));
- data.add(ref1);
-
- return data;
- }
-
- public static OrdPrtGeoModeleBase remplissageDonneeTestErreurOPTG() {
- final OrdPrtGeoModeleBase data = new OrdPrtGeoModeleBase();
-
- return data;
- }
-
-}
Modified: 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/TestCrueDFRTFile.java 2009-05-10 17:33:18 UTC (rev 4749)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDFRTFile.java 2009-05-10 17:34:42 UTC (rev 4750)
@@ -6,6 +6,8 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.metier.emh.DonFrt;
+import org.fudaa.dodico.crue.metier.emh.DonFrtList;
+import org.fudaa.dodico.crue.metier.emh.StriRefC;
@SuppressWarnings("PMD.SystemPrintln")
public class TestCrueDFRTFile extends AbstractIOTestCase {
@@ -67,22 +69,25 @@
*/
public void testDonFrt(final List<DonFrt> frts) {
assertNotNull(frts);
- System.err.println(frts.size());
for (final DonFrt donfrt : frts) {
assertNotNull(donfrt);
}
- assertEquals(0.00, frts.get(1).getListePoints().get(0).getX());
- assertEquals(10.00, frts.get(1).getListePoints().get(1).getX());
- assertEquals(15.00, frts.get(1).getListePoints().get(0).getY());
- assertEquals(15.00, frts.get(1).getListePoints().get(1).getY());
+ StriRefC striRefC = (StriRefC) frts.get(0);
+ assertEquals("FK0", striRefC.getNom());
+ assertDoubleEquals(0, striRefC.k);
+ DonFrtList donFrtList = (DonFrtList) frts.get(1);
+ assertEquals(0.00, donFrtList.getX(0));
+ assertEquals(10.00, donFrtList.getX(1));
+ assertEquals(15.00, donFrtList.getY(0));
+ assertEquals(15.00, donFrtList.getY(1));
+ donFrtList = (DonFrtList) frts.get(2);
+ assertEquals(0.00, donFrtList.getX(0));
+ assertEquals(10.00, donFrtList.getX(1));
+ assertEquals(30.00, donFrtList.getY(0));
+ assertEquals(30.00, donFrtList.getY(1));
- assertEquals(0.00, frts.get(2).getListePoints().get(0).getX());
- assertEquals(10.00, frts.get(2).getListePoints().get(1).getX());
- assertEquals(30.00, frts.get(2).getListePoints().get(0).getY());
- assertEquals(30.00, frts.get(2).getListePoints().get(1).getY());
-
}
public static List<DonFrt> readModele3() {
@@ -103,7 +108,7 @@
testWrite(in, f);
final CtuluAnalyze analyse = new CtuluAnalyze();
final List<DonFrt> jeuDonnees = Crue10FileFormatFactory.getDFRTFileFormat().read(f, analyse, null);
- analyse.printResume();
+ testAnalyser(analyse);
testDonFrt(jeuDonnees);
}
@@ -111,8 +116,10 @@
private File testWrite(final List<DonFrt> in, final File f) {
final CtuluAnalyze analyse = new CtuluAnalyze();
final boolean res = Crue10FileFormatFactory.getDFRTFileFormat().write(in, f, analyse);
- analyse.printResume();
+ testAnalyser(analyse);
assertTrue(res);
+ assertTrue(Crue10FileFormatFactory.getDFRTFileFormat().isValide(f, analyse));
+ testAnalyser(analyse);
return f;
}
Deleted: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dfrt.new.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dfrt.new.xml 2009-05-10 17:33:18 UTC (rev 4749)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dfrt.new.xml 2009-05-10 17:34:42 UTC (rev 4750)
@@ -1,111 +0,0 @@
-<?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/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 -->
- <Commentaire>Commentaire sur le sous-modèle</Commentaire>
- <StriRefC Nom="FK0">0.</StriRefC>
- <StriRefZ Nom="FPROF1MAJ">
- <!-- Point Flottant-Flottant -->
- <PointFF>0.00 15.</PointFF>
- <PointFF>10.00 15.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF1MIN">
- <PointFF>0.00 30.</PointFF>
- <PointFF>10.00 30.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF2MAJ">
- <PointFF>0.00 15.</PointFF>
- <PointFF>10.00 15.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF2MIN">
- <PointFF>0.00 30.</PointFF>
- <PointFF>10.00 30.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF3AMAJ">
- <PointFF>0.00 15.</PointFF>
- <PointFF>10.00 15.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF3AMIN">
- <PointFF>0.00 30.</PointFF>
- <PointFF>10.00 30.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF3AVMAJ">
- <PointFF>0.00 15.</PointFF>
- <PointFF>10.00 15.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF3AVMIN">
- <PointFF>0.00 30.</PointFF>
- <PointFF>10.00 30.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF3BMAJ">
- <PointFF>0.00 15.</PointFF>
- <PointFF>10.00 15.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF3BMIN">
- <PointFF>0.00 30.</PointFF>
- <PointFF>10.00 30.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF4MAJ">
- <PointFF>0.00 15.</PointFF>
- <PointFF>10.00 15.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF4MIN">
- <PointFF>0.00 30.</PointFF>
- <PointFF>10.00 30.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF6AMAJ">
- <PointFF>0.00 15.</PointFF>
- <PointFF>10.00 15.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF6AMIN">
- <PointFF>0.00 30.</PointFF>
- <PointFF>10.00 30.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF7MAJ">
- <PointFF>0.00 15.</PointFF>
- <PointFF>10.00 15.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF7MIN">
- <PointFF>0.00 30.</PointFF>
- <PointFF>10.00 30.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF8MAJ">
- <PointFF>0.00 15.</PointFF>
- <PointFF>10.00 15.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF8MIN">
- <PointFF>0.00 30.</PointFF>
- <PointFF>10.00 30.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF9MAJ">
- <PointFF>0.00 15.</PointFF>
- <PointFF>10.00 15.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF9MIN">
- <PointFF>0.00 30.</PointFF>
- <PointFF>10.00 30.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF10MAJ">
- <PointFF>0.00 15.</PointFF>
- <PointFF>10.00 15.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF10MIN">
- <PointFF>0.00 30.</PointFF>
- <PointFF>10.00 30.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF11MAJ">
- <PointFF>0.00 15.</PointFF>
- <PointFF>10.00 15.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROF11MIN">
- <PointFF>0.00 30.</PointFF>
- <PointFF>11.00 30.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROFSTR1MIN">
- <PointFF>0.00 30.</PointFF>
- <PointFF>11.00 30.</PointFF>
- </StriRefZ>
- <StriRefZ Nom="FPROFSTR2MIN">
- <PointFF>0.00 30.</PointFF>
- <PointFF>11.00 30.</PointFF>
- </StriRefZ>
-</DFRT>
\ No newline at end of file
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-05-10 17:33:18 UTC (rev 4749)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dfrt.xml 2009-05-10 17:34:42 UTC (rev 4750)
@...
[truncated message content] |
|
From: <had...@us...> - 2009-05-15 14:12:43
|
Revision: 4780
http://fudaa.svn.sourceforge.net/fudaa/?rev=4780&view=rev
Author: hadouxad
Date: 2009-05-15 14:12:41 +0000 (Fri, 15 May 2009)
Log Message:
-----------
* Algo de validation du graphe: package org.fudaa.dodico.crue.validation
o mise en code de l'algo de parcours en profondeur pour les noeuds, puis pour les branches
* Correction crue 9 DC
o ajout de l'algo de gestion des profils interpoles (cf ci dessous).
* gestion des erreurs pour la carte strirefH
* probl?\195?\169matique pour la deuxi?\195?\168me mod?\195?\169lisation:
foutre des profils interpol?\195?\169s entre les profils classiques pour les branches,comme les distances inter-profils ne sont pas indiqu?\195?\169es pour les profils interpol?\195?\169s, on ne peut pas savoir au niveau de la lecture des branches si
le profil est interpol?\195?\169 ou non, il faudra attendre d'avoir lu les profils pour savoir lesquels le sont.
* pour la deuxieme mod?\195?\169lisation, les distmax, il faut ajouter les profils interpol?\195?\169s entre chaque profils toutes les distmax distances. cela est moins probl?\195?\169matique.
Algorithmiquement, voila comment je m'en sors:
pour la deuxieme mod?\195?\169lisation: je cr?\195?\169e des section profils, et je rectifis lorsque je tomberais sur les cartes PROFINT dans la partie profil, je saurais que ces profils doivent etres modifies en section interpoles
(j'avais fait pareil pour idem)
pourla premiere modelisation:
apres remplissage des sections de la branche st venant:
pour chaque relationEmh contenant une section I
si la distmax<|section(I).xpos - section(I+1).xpos|
alors:
nbSectionToAdd= (partie inferieur)|section(I).xpos - section(I+1).xpos|/distmax
pour k de 0 a nbSectionToAdd-1
creer section interpolee de nom: S+NomBranche+_+(k *distmax +section(I).xpos )
et de xpos =(k *distmax +section(I).xpos )
ajouter relation avec sectionInterpol?\195?\169?\195?\169 a la position (I+k+1)
Modified Paths:
--------------
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/metier/emh/EMH.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/projet/CrueProjet.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/EMHValidatorModele.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueValidationModele.java
Modified: 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/DCFileReader.java 2009-05-14 17:44:06 UTC (rev 4779)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java 2009-05-15 14:12:41 UTC (rev 4780)
@@ -12,7 +12,56 @@
import org.fudaa.dodico.crue.io.dao.DonPrtCIniCasierProfil;
import org.fudaa.dodico.crue.metier.CrueData;
import org.fudaa.dodico.crue.metier.CrueDataImpl;
-import org.fudaa.dodico.crue.metier.emh.*;
+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.DonCalcSansPrt;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheBarrageFilEau;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheBarrageGenerique;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheNiveauxAssocies;
+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.DonFrt;
+import org.fudaa.dodico.crue.metier.emh.DonPrtGeoBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.DonPrtGeoProfilCasier;
+import org.fudaa.dodico.crue.metier.emh.DonPrtGeoProfilSection;
+import org.fudaa.dodico.crue.metier.emh.DonPrtGeoSectionIdem;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageFilEau;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageGenerique;
+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.EMHBrancheSeuilLateral;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheStrickler;
+import org.fudaa.dodico.crue.metier.emh.EMHCasierProfil;
+import org.fudaa.dodico.crue.metier.emh.EMHNoeudNiveauContinu;
+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.ElemOrifice;
+import org.fudaa.dodico.crue.metier.emh.ElemSeuil;
+import org.fudaa.dodico.crue.metier.emh.ElemSeuilAvecPdc;
+import org.fudaa.dodico.crue.metier.emh.EvolutionFF;
+import org.fudaa.dodico.crue.metier.emh.LitNomme;
+import org.fudaa.dodico.crue.metier.emh.LitNumerote;
+import org.fudaa.dodico.crue.metier.emh.LitUtile;
+import org.fudaa.dodico.crue.metier.emh.LoiFF;
+import org.fudaa.dodico.crue.metier.emh.OrdPrtGeoModeleBase;
+import org.fudaa.dodico.crue.metier.emh.ParamNumModeleBase;
+import org.fudaa.dodico.crue.metier.emh.PtEvolutionFF;
+import org.fudaa.dodico.crue.metier.emh.PtProfil;
+import org.fudaa.dodico.crue.metier.emh.PtZK;
+import org.fudaa.dodico.crue.metier.emh.Regle;
+import org.fudaa.dodico.crue.metier.emh.RelationEMH;
+import org.fudaa.dodico.crue.metier.emh.StriRefC;
+import org.fudaa.dodico.crue.metier.emh.StriRefZ;
+import org.fudaa.dodico.crue.metier.emh.VariableOrdonnee;
import org.fudaa.dodico.crue.metier.helper.EMHBrancheHelper;
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
import org.fudaa.dodico.crue.metier.helper.EMHNoeudHelper;
@@ -325,9 +374,29 @@
lireSuite();
} else if (element.toUpperCase().equals(CrueIODico.PROFINT)) {
- // TODO A FAIRE APRES RETOURS CNR
+
final String nomProfil = in_.stringField(1);
sectionCree = createSectionProfilClassique(metier, nomProfil);
+
+ // -- il faut transformer cette section en interpole: on le fait maintenant car dans la methode cela ne change
+ // rien
+ // car c'est au niveau de la branche que l'on cree les sections.
+
+ final EMHSectionInterpolee newSection = new EMHSectionInterpolee(sectionCree.getNom());
+
+ EMHBrancheHelper.replaceSectioninAllConnectedBranche(sectionCree, newSection, metier.getBranches());
+ metier.getSections().remove(sectionCree);
+
+ // -- on remplace les relations et les infos emh --//
+ if (sectionCree.getListeInfosEMH() != null) {
+ newSection.setListeInfosEMH(sectionCree.getListeInfosEMH());
+ }
+ if (sectionCree.getRelationsAvecEMH() != null) {
+ newSection.setRelationsAvecEMH(sectionCree.getRelationsAvecEMH());
+ }
+
+ metier.add(newSection);
+
} else if (element.toUpperCase().equals(CrueIODico.PROFRECT)) {
// TODO pour FICHIER DEXP non présent dans V0
// final String nomProfil = in_.stringField(1);
@@ -437,6 +506,7 @@
final String nomProfil = id;
sectionProfil = EMHSectionHelper.findByReference(nomProfil, metier);
if (sectionProfil == null) {
+
sectionProfil = new EMHSectionProfil(nomProfil);
metier.add(sectionProfil);
}
@@ -674,7 +744,7 @@
* @param metier
* @throws IOException
*/
- public void readFrottements(final CrueData metier) throws IOException {
+ public void readFrottements(final CrueData metier) throws CrueNotSupportedException, IOException {
metier.setFrottements(new ArrayList<DonFrt>());
while (CrueIODico.appartientFrottementsCarte(in_.getLine())) {
@@ -692,16 +762,18 @@
} else if (element.toUpperCase().equals(CrueIODico.STRIREFH)) {
// STRIREFH(o) "nom_strickler" h1 k1 h2 k2... (nom du strickler, et couples h/k, h étant la hauteur par rapport
// au point le plus bas du profil)
- final String nomFrot = in_.stringField(1);
- final StrRefY frt = new StrRefY(nomFrot);
- frt.setPtZY(new ArrayList<PtZY>());
- for (int i = 2; i < in_.getNumberOfFields(); i++) {
- final double valX = in_.doubleField(i++);
- final double valY = in_.doubleField(i);
- frt.addPtZY(new PtZY(valX, valY));
+ // final String nomFrot = in_.stringField(1);
+ // final StrRefY frt = new StrRefY(nomFrot);
+ // frt.setPtZY(new ArrayList<PtZY>());
+ // for (int i = 2; i < in_.getNumberOfFields(); i++) {
+ // final double valX = in_.doubleField(i++);
+ // final double valY = in_.doubleField(i);
+ // frt.addPtZY(new PtZY(valX, valY));
+ //
+ // }
+ // metier.getFrottements().add(frt);
- }
- metier.getFrottements().add(frt);
+ throw new CrueNotSupportedException(CrueIODico.STRIREFH, in_.getLineNumber());
} else if (element.toUpperCase().equals(CrueIODico.STRIREFZ)) {
// STRIREFH(o) "nom_strickler" h1 k1 h2 k2... (nom du strickler, et couples h/k, h étant la hauteur par rapport
@@ -1031,6 +1103,7 @@
// -- la donnée DPTG de st venant --//
DonPrtGeoBrancheSaintVenant dataDPTG = null;
String nomSectionPilote = null;
+ double distMAX = 0;
// -- la liste des sections branches --//
final 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 --//
@@ -1069,6 +1142,8 @@
if (typeLigne.toUpperCase().equals(CrueIODico.BRANCHE_DISTMAX)) {
// TODO: DISTMAX a gerer , demander CNR, le dico dit abandonné dans crue 10...--//
+ distMAX = in_.doubleField(1);
+
} else
// -- coefficients cconv --//
if (typeLigne.toUpperCase().equals(CrueIODico.BRANCHE_CCONV)) {
@@ -1131,8 +1206,6 @@
errorCarteNotRecognized(typeLigne);
}
- // TODO Carole gérer les parametres suivants ....
-
// -- on lit la suite en passant les commentaires sans mot clef --//
lireSuite();
lineRead = in_.getLine();
@@ -1142,6 +1215,10 @@
completeBrancheWithInfosRead(metier, branche, dataDCSP, listeDistance, listeCconv, listeCpond, listeCdiv,
listeSectionBranche);
+ if (distMAX != 0) {
+ completeSaintVenantWithDistMAx(branche, distMAX, metier);
+ }
+
if (nomSectionPilote != null) {
CatEMHSection pilote = EMHSectionHelper.findByReference(nomSectionPilote, metier);
if (pilote == null) {
@@ -1155,6 +1232,81 @@
}
/**
+ * Cas particulier de Branche st venant: pour la valeur DISTMAX: DISTMAX(f, u) distmax (Distance max entre 2 profils.
+ * Crée les profils interpolés nécessaires) Cette valeur distmax indique la distance max entre chaque profil, donc si
+ * cette distance n'est pas respectee, il faut ajouter des profil interpoles avec pour nom:
+ * S+NomBranche+_+distanceParcourue.
+ *
+ * @param branche
+ */
+ public void completeSaintVenantWithDistMAx(EMHBrancheSaintVenant branche, double distmax, CrueData data) {
+
+ for (int i = 0; i < branche.getRelationsAvecEMH().size(); i++) {
+
+ RelationEMH relation1 = branche.getRelationsAvecEMH().get(i);
+
+ // -- si la relation concerne les sections --//
+ if (relation1.getEmh() instanceof CatEMHSection) {
+ RelationEMH relation2 = null;
+ // -- on recherche la prochaine relation --//
+ for (int j = i + 1; j < branche.getRelationsAvecEMH().size() && relation2 == null; j++) {
+ if (branche.getRelationsAvecEMH().get(j).getEmh() instanceof CatEMHSection) {
+ relation2 = branche.getRelationsAvecEMH().get(j);
+ }
+ }
+
+ if (relation2 == null) { return; }
+
+ double xpos1 = EMHHelper.getXpSection(relation1);
+ double xpos2 = EMHHelper.getXpSection(relation2);
+
+ if (distmax < Math.abs(xpos1 - xpos2)) {
+
+ // -- il faut ajouter des profils interpolées --//
+
+ // -- etape 1: on compte combien on en ajoute --//
+ int nbProfilsToAdd = (int) Math.floor(Math.abs(xpos1 - xpos2) / distmax) - 1;
+
+ // -- on creer une section interpolee pour chaque besoin et on l'ajoute dans cruedata puis dans les relations
+ // branche --//.
+ for (int k = 0; k < nbProfilsToAdd; k++) {
+ double xpos = xpos1 + (k + 1) * distmax;
+ String nom = "S" + branche.getNom() + "_" + xpos;
+ EMHSectionInterpolee interpol = new EMHSectionInterpolee(nom);
+
+ interpol.setNom(nom);
+
+ double coefPond = 1;
+ double coefConv = 1;
+ double coefDiv = 1;
+ final HashMap<String, Object> map = new HashMap<String, Object>();
+ map.put(EMHHelper.Pos_section, "Interne");
+ map.put(EMHHelper.Xp_section, xpos);
+ map.put(EMHHelper.Coeff_Pond, coefPond);
+ map.put(EMHHelper.Coeff_Div, coefDiv);
+ map.put(EMHHelper.Coeff_Conv, coefConv);
+
+ RelationEMH relation = new RelationEMH(interpol, map);
+ // -- ajout dans metier --//
+ data.add(interpol);
+
+ // -- ajout de la relation a l'emplacement k+1 a partir de i--//
+ branche.getRelationsAvecEMH().add((i + k + 1), relation);
+
+ }
+
+ // -- on translate i de k+1 itérations pour revenir a l'indice de la relation2 --//
+ i += nbProfilsToAdd;
+ // ATTENTION, le k+1 ici est indirect, car le +1 sera ajouté par la boucle for.
+ }
+
+ }
+
+ }
+
+ }
+
+ /**
* Creer une branche seuil transversal. 2
*
* @param metier
@@ -1941,11 +2093,15 @@
// -- en fonction des parametres lus, ajoute les bonnes relations EMH --//
// -- DISTANCE --//
- if (listeTotaleDistance.size() == 1) {
+ if (indiceSection == 0) {
+ // on laisse le xpos a 0: donc sumDistanceTotaleXP ne doit pas etre additionne.
+ } else if (listeTotaleDistance.size() == 1) {
sumDistanceTotaleXP += listeTotaleDistance.get(0);
- } else if (listeTotaleDistance.size() > indiceSection) {
- sumDistanceTotaleXP += listeTotaleDistance.get(indiceSection);
+ } else if (listeTotaleDistance.size() > indiceSection - 1) {
+ // -- la liste des distantce est inter-profil avec le premier profil a distance=0.
+ // donc on commence a positionner la deuxieme section a la position indiceSection-1.
+ sumDistanceTotaleXP += listeTotaleDistance.get(indiceSection - 1);
}
// -- cconv --//
Modified: 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/DCFileWriter.java 2009-05-14 17:44:06 UTC (rev 4779)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileWriter.java 2009-05-15 14:12:41 UTC (rev 4780)
@@ -10,7 +10,50 @@
import org.fudaa.dodico.crue.io.dao.CrueHelper;
import org.fudaa.dodico.crue.io.dao.DonPrtCIniCasierProfil;
import org.fudaa.dodico.crue.metier.CrueData;
-import org.fudaa.dodico.crue.metier.emh.*;
+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.DonCalcSansPrt;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheBarrageFilEau;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheBarrageGenerique;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheNiveauxAssocies;
+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.DonFrt;
+import org.fudaa.dodico.crue.metier.emh.DonFrtList;
+import org.fudaa.dodico.crue.metier.emh.DonPrtCIni;
+import org.fudaa.dodico.crue.metier.emh.DonPrtGeo;
+import org.fudaa.dodico.crue.metier.emh.DonPrtGeoBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.DonPrtGeoProfilCasier;
+import org.fudaa.dodico.crue.metier.emh.DonPrtGeoProfilSection;
+import org.fudaa.dodico.crue.metier.emh.DonPrtGeoSectionIdem;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageFilEau;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageGenerique;
+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.EMHBrancheSeuilLateral;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheStrickler;
+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.ElemOrifice;
+import org.fudaa.dodico.crue.metier.emh.ElemSeuilAvecPdc;
+import org.fudaa.dodico.crue.metier.emh.LitNumerote;
+import org.fudaa.dodico.crue.metier.emh.LitUtile;
+import org.fudaa.dodico.crue.metier.emh.PtEvolutionFF;
+import org.fudaa.dodico.crue.metier.emh.PtProfil;
+import org.fudaa.dodico.crue.metier.emh.Regle;
+import org.fudaa.dodico.crue.metier.emh.RelationEMH;
+import org.fudaa.dodico.crue.metier.emh.StrRefY;
+import org.fudaa.dodico.crue.metier.emh.StriRefC;
+import org.fudaa.dodico.crue.metier.emh.StriRefZ;
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
import org.fudaa.dodico.crue.metier.helper.RegleHelper;
@@ -350,8 +393,8 @@
for (final CatEMHSection section : metier.getSections()) {
- if (section instanceof EMHSectionProfil) {
- final EMHSectionProfil profil = (EMHSectionProfil) section;
+ if (section instanceof EMHSectionProfil || section instanceof EMHSectionInterpolee) {
+ final CatEMHSection profil = section;
fortranWriter_.stringField(0, CrueIODico.PROFIL);
fortranWriter_.stringField(1, profil.getNom());
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java 2009-05-14 17:44:06 UTC (rev 4779)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java 2009-05-15 14:12:41 UTC (rev 4780)
@@ -91,7 +91,7 @@
}
/**
- * Ajoute une infos (DSCP)
+ * Ajoute une infos (DCSP)
*
* @param dataCalcul
*/
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/EMHValidatorModele.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/EMHValidatorModele.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/EMHValidatorModele.java 2009-05-15 14:12:41 UTC (rev 4780)
@@ -0,0 +1,264 @@
+package org.fudaa.dodico.crue.validation;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.metier.CrueData;
+import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
+import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
+
+/**
+ * Algorithmes de validations du modele.
+ *
+ * @author Adrien Hadoux
+ */
+public class EMHValidatorModele {
+
+ /**
+ * Methode qui teste la connexité du modele et retourne true ou false,
+ *
+ * @param data
+ * @param analyzer analyzer
+ * @return
+ */
+ public static boolean validateConnexite(CrueData data, CtuluAnalyze analyzer) {
+ boolean validate = false;
+
+ // -- premeire verification: tous les noeuds sont affectées --//
+ validate = IsNoeudsTousAffectes(data, analyzer);
+
+ if (validate) {
+
+ // -- on verifie que toutes les branches ont un noeud --//.
+ validate = IsBranchesConnexes(data, analyzer);
+ }
+
+ return validate;
+ }
+
+ /**
+ * Verifie que toutes les branches soient affectees.
+ *
+ * @param data
+ * @param analyzer
+ * @return true si le graphe est connexe.
+ */
+ public static boolean IsBranchesConnexes(CrueData data, CtuluAnalyze analyzer) {
+
+ List<CatEMHNoeud> lstNoeudsATester = new ArrayList<CatEMHNoeud>(1);
+
+ List<CatEMHBranche> lstBranchesRestantes = remplirBranchesRestantesActives(data.getBranches());
+
+ // 1) Choisir un nœud de départ connecté à au moins une branche active. Il est stocké dans lstNoeudsATester.
+ CatEMHNoeud findNoeudDep = findNoeudDepart(data);
+
+ if (findNoeudDep == null) { return false; }
+ lstNoeudsATester.add(findNoeudDep);
+
+ // 2) Tant qu’il existe au moins un élément dans lstNoeudsATester :
+ while (lstNoeudsATester.size() > 0) {
+ // 2.1) Dépiler un élément de lstNoeudsATester (le supprimer de la liste) et le stocker dans NoeudCourant.
+ CatEMHNoeud noeudCourant = lstNoeudsATester.remove(0);
+
+ // 2.2) Tant qu’il existe une branche connectée à NoeudCourant et qui figure dans lstBranchesRestantes :
+ List<CatEMHBranche> lstBranchesContenantNoeud = findAllBranchesConnectedToNode(lstBranchesRestantes, noeudCourant);
+
+ while (lstBranchesContenantNoeud.size() > 0) {
+ // 2.2.1) Récupérer une telle branche et la stocker dans BrancheCourante.
+ CatEMHBranche brancheCourante = lstBranchesContenantNoeud.remove(0);
+
+ // 2.2.2) Récupérer le nœud situé à l’autre extrémité de BrancheCourante (par rapport à NoeudCourant) et le
+ // stocker
+ // dans lstNoeudsATester (s’il n’y figure pas déjà).
+ CatEMHNoeud nouveauNoeud = brancheCourante.getNoeudAmont();
+ if (nouveauNoeud != noeudCourant) {
+ lstNoeudsATester.add(nouveauNoeud);
+ } else {
+ nouveauNoeud = brancheCourante.getNoeudAval();
+ lstNoeudsATester.add(nouveauNoeud);
+ }
+
+ // 2.2.3) Supprimer BrancheCourante de lstBranchesRestantes.
+ lstBranchesRestantes.remove(brancheCourante);
+
+ }
+
+ }
+
+ if (lstBranchesRestantes.size() > 0) {
+ analyzer.addError("error.validationModele.branchesNonAffectes",
+ createMapBranchesNonAffectes(lstBranchesRestantes));
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Cree la liste de branches Active a partir de la liste de branches totales.
+ *
+ * @param lstBranchesTotales
+ * @return
+ */
+ public static List<CatEMHBranche> remplirBranchesRestantesActives(List<CatEMHBranche> lstBranchesTotales) {
+ List<CatEMHBranche> listeBranches = new ArrayList<CatEMHBranche>();
+
+ for (CatEMHBranche branche : lstBranchesTotales) {
+ if (branche.isActive()) {
+ listeBranches.add(branche);
+ }
+ }
+ return listeBranches;
+
+ }
+
+ /**
+ * Retrouve toutes les branches connectees au noeud.
+ *
+ * @param lstBranchesRestantes
+ * @param noeud
+ * @return
+ */
+ public static List<CatEMHBranche> findAllBranchesConnectedToNode(List<CatEMHBranche> lstBranchesRestantes,
+ CatEMHNoeud noeud) {
+ List<CatEMHBranche> listeConnected = new ArrayList<CatEMHBranche>();
+
+ for (CatEMHBranche branche : lstBranchesRestantes) {
+ if (branche.isActive()) {
+ CatEMHNoeud noeudAmont = branche.getNoeudAmont();
+ if (noeudAmont == noeud) {
+
+ listeConnected.add(branche);
+
+ } else {
+ CatEMHNoeud noeudAval = branche.getNoeudAval();
+ if (noeudAval == noeud) {
+
+ listeConnected.add(branche);
+
+ }
+ }
+ }
+ }
+
+ return listeConnected;
+ }
+
+ /**
+ * Methode qui recherche dans la liste des branches le premier noeud d'une branche active.
+ *
+ * @param data
+ * @return
+ */
+ public static CatEMHNoeud findNoeudDepart(CrueData data) {
+
+ for (int i = 0; i < data.getBranches().size(); i++) {
+ if (data.getBranches().get(i).isActive()) {
+
+ CatEMHNoeud findNoeudDep = data.getBranches().get(i).getNoeudAmont();
+ if (findNoeudDep != null) { return findNoeudDep; }
+ findNoeudDep = data.getBranches().get(i).getNoeudAval();
+ if (findNoeudDep != null) { return findNoeudDep; }
+
+ }
+
+ }
+ return null;
+ }
+
+ /**
+ * Verifie que tous les noeuds soient affectés a au moins une branche.
+ *
+ * @param data
+ * @param analyzer
+ * @return
+ */
+ public static boolean IsNoeudsTousAffectes(CrueData data, CtuluAnalyze analyzer) {
+
+ List<CatEMHNoeud> listeNoeudsNonAffectes = new ArrayList<CatEMHNoeud>(data.getNoeuds().size());
+
+ // pourri collections...
+ // Collections.copy(listeNoeudsNonAffectes, data.getNoeuds());
+
+ for (CatEMHNoeud node : data.getNoeuds()) {
+ listeNoeudsNonAffectes.add(node);
+ }
+
+ for (CatEMHBranche branche : data.getBranches()) {
+ if (branche.isActive()) {
+ CatEMHNoeud noeudAmont = branche.getNoeudAmont();
+ if (noeudAmont != null) {
+
+ listeNoeudsNonAffectes.remove(noeudAmont);
+
+ } else {
+ HashMap<String, Object> map = new HashMap<String, Object>();
+ map.put("branche", branche.getNom());
+ analyzer.addError("error.validationModele.noeudAmontManquant", map);
+ return false;
+ }
+ CatEMHNoeud noeudAval = branche.getNoeudAval();
+ if (noeudAval != null) {
+
+ listeNoeudsNonAffectes.remove(noeudAval);
+
+ } else {
+ HashMap<String, Object> map = new HashMap<String, Object>();
+ map.put("branche", branche.getNom());
+ analyzer.addError("error.validationModele.noeudAvalManquant", map);
+ return false;
+ }
+ }
+ }
+ if (listeNoeudsNonAffectes.size() != 0) {
+ analyzer.addError("error.validationModele.noeudNonAffectes", createMapNoeudsNonAffectes(listeNoeudsNonAffectes));
+ }
+
+ return listeNoeudsNonAffectes.size() == 0;
+ }
+
+ /**
+ * Creer la map avec la liste des noeuds non affectes.
+ *
+ * @param listeNoeudsNonAffectes
+ * @return
+ */
+ public static Map<String, Object> createMapNoeudsNonAffectes(List<CatEMHNoeud> listeNoeudsNonAffectes) {
+ String key = "noeuds";
+
+ String liste = "";
+
+ for (CatEMHNoeud noeud : listeNoeudsNonAffectes) {
+ liste += " " + noeud.getNom();
+ }
+
+ HashMap<String, Object> map = new HashMap<String, Object>();
+ map.put(key, liste);
+ return map;
+
+ }
+
+ /**
+ * Creer la map avec la liste des branches non affectes.
+ *
+ * @param listeBranchesNonAffectes
+ * @return
+ */
+ public static Map<String, Object> createMapBranchesNonAffectes(List<CatEMHBranche> listeBranchesNonAffectes) {
+ String key = "branches";
+
+ String liste = "";
+
+ for (CatEMHBranche branche : listeBranchesNonAffectes) {
+ liste += " " + branche.getNom();
+ }
+
+ HashMap<String, Object> map = new HashMap<String, Object>();
+ map.put(key, liste);
+ return map;
+
+ }
+}
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-14 17:44:06 UTC (rev 4779)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/adrienMessages.properties 2009-05-15 14:12:41 UTC (rev 4780)
@@ -1,3 +1,7 @@
#Mettre les traductions ici
#Ne pas faire attention aux accents les laisser mais ne pas les traduire en UTF-8
-Test=Test
\ No newline at end of file
+Test=Test
+error.validationModele.noeudNonAffectes = Erreur, il existe des noeuds isoles: {noeuds}
+error.validationModele.noeudAmontManquant= Erreur, il manque un noeud amont pour la branche {branche}
+error.validationModele.noeudAvalManquant= Erreur, il manque un noeud aval pour la branche {branche}
+
Added: trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueValidationModele.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueValidationModele.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueValidationModele.java 2009-05-15 14:12:41 UTC (rev 4780)
@@ -0,0 +1,73 @@
+package org.fudaa.dodico.crue.io;
+
+import junit.framework.TestCase;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.metier.CrueData;
+import org.fudaa.dodico.crue.validat...
[truncated message content] |
|
From: <had...@us...> - 2009-05-18 16:18:51
|
Revision: 4786
http://fudaa.svn.sourceforge.net/fudaa/?rev=4786&view=rev
Author: hadouxad
Date: 2009-05-18 16:18:39 +0000 (Mon, 18 May 2009)
Log Message:
-----------
FCB
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.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/view/CrueFicheModeleFille.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleComparaisonScenario.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCbStructureInfos.java
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java 2009-05-18 09:30:07 UTC (rev 4785)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java 2009-05-18 16:18:39 UTC (rev 4786)
@@ -1,5 +1,7 @@
package org.fudaa.dodico.crue.io.neuf;
+import gnu.trove.TLongArrayList;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -22,18 +24,15 @@
NativeNIOHelper helper_;
FileInputStream in_;
+ File file_;
- @Override
- protected Object internalRead() {
-
- return readFile();
- }
-
/**
- * Retourne la liste des indices des pas de temps * @return
+ * Retourne la liste des indices des pas de temps *
+ *
+ * @return
*/
public Object readFile() {
-
+ FCbStructureInfos infos = new FCbStructureInfos(file_);
final List data = new ArrayList();
helper_ = new NativeNIOHelper(in_.getChannel());
try {
@@ -48,6 +47,9 @@
// iprm i4 : nombre de profils du modèle
helper_.readAll(4);
+ ByteBuffer bf = helper_.getBuffer();
+ infos.nbProfilsModele = bf.getInt();
+
// past r8 : pas de temps d'impression des résultats, en secondes.
helper_.readAll(8);
// icodav i4 : présence (1) ou non (0) d'une régulation
@@ -55,47 +57,33 @@
// ibmax i4 : nombre de branches du modèle
helper_.readAll(4);
- final ByteBuffer bf = helper_.getBuffer();
- final int nbBranches = bf.getInt();
+ bf = helper_.getBuffer();
+ infos.nbBranches = bf.getInt();
- // -- on passe a la ligne suivante --//
+ // -- on passe a la ligne contenant ibmax et iparam --//
helper_.skipRecord();
- // on passe la ligne
+ // on arrive a la ligne des profils --//
// write(ifi2) (tit(ipro),sngl(dist(ipro)),zfond(nuprfl(ipro)), ipro,ipro=1,iprm)
+ // on recupere l'indice du début des profils.
+ readProfils(infos);
- helper_.skipRecord();
-
// -- on passe la boucle de nbbranches lignes--//
- // do 30 ib=1,ibmax
- // write(ifi2) ntyp(ib),imax(ib),(n0pr(ip,ib),ip=1,imax(ib)),
- // * nombr(ib),nupam(ib),nupav(ib)
- // 30 continue
- for (int i = 0; i < nbBranches; i++) {
- helper_.skipRecord();
- }
+ readBranches(infos);
+ // -- ensuite on lit les points si ou ils sont affiches--//
+ readNodes(infos);
+
// TODO gere si oui ou non la ligne de write(9) npar,(nompar(i),tx(i),i=1,npar)
// es t ecrite, cf spec pour entete
+ readRegulationParam(infos);
- while (true) {
- // -- on arrive au CORPS, on repere les indice de chaque PDT --//
- data.add(helper_.getCurrentPosition());
+ // -- on arrive au CORPS, on repere les indice de chaque PDT --//
+ readPdt(infos);
- // --on passee les lignes de regul--
- // write(9) test,sngl(t)
- // write(9) (para(i),i=1,npar)
- helper_.skipRecord();
- helper_.skipRecord();
- // TODO continuer les skip des lignes de regul, il faut lire le npar et faire nfois
+ // --on passee les lignes de Crue--//
- // --on passee les lignes de Crue--//
- // TODO a faire
-
- // on sort quand on est en EOF.
- }
-
} catch (final IOException e) {
analyze_.manageException(e);
} finally {
@@ -112,19 +100,152 @@
}
}
- public void stop() {
- // FIXME Auto-generated method stub
+ /**
+ * Lit les infos des noeuds si .
+ *
+ * @param infos
+ * @throws IOException
+ */
+ private void readNodes(FCbStructureInfos infos) throws IOException {
+ // (ifi2) nbpoin,(nompoi(ip),nupro(ip),ip=1,nbpoin)
+ // nbpoin i4 : nombre de noeuds
+ helper_.readAll(4);
+ ByteBuffer bf = helper_.getBuffer();
+
+ infos.nbNoeuds = bf.getInt();
+
+ infos.indicePostionHelperForNoeuds = helper_.getCurrentPosition();
+ for (int i = 0; i < infos.nbNoeuds; i++) {
+ helper_.skipRecord();
+ }
+
}
+ /**
+ * Lit les infos des regulations si elles existent.
+ *
+ * @param infos
+ * @throws IOException
+ */
+ private void readRegulationParam(FCbStructureInfos infos) throws IOException {
+ // write(9) npar,(nompar(i),tx(i),i=1,npar)
+
+ // TODO a verifier: l'objectif ici est de tenter de lire la ligne, si elle existe il y a des regulations,
+ // WARNING sinon il n'y a pas de pas de temps regul.
+
+ // npar i4 : nombre de paramètres de régulation
+
+ helper_.readAll(4);
+ ByteBuffer bf = helper_.getBuffer();
+ try {
+ infos.nbParamsRegulation = bf.getInt();
+ } catch (Exception e) {
+
+ return;
+ }
+ infos.hasRegulationRecords = true;
+ infos.tableauNomsParamRegulations = new String[infos.nbParamsRegulation];
+
+ for (int i = 0; i < infos.nbParamsRegulation; i++) {
+ helper_.readAll(8);
+ ByteBuffer buffer = helper_.getBuffer();
+
+ char[] nomChar = new char[8];
+ for (int j = 0; j < 8; j++) {
+ nomChar[j] = buffer.getChar();
+ }
+ infos.tableauNomsParamRegulations[i] = new String(nomChar);
+
+ }
+
+ infos.indicePostionHelperForRegulations = helper_.getCurrentPosition();
+
+ }
+
+ /**
+ * lit les pdt.
+ *
+ * @param infos
+ * @throws IOException
+ */
+ public void readPdt(FCbStructureInfos infos) throws IOException {
+
+ infos.tableauIndicesPdtCrue = new TLongArrayList();
+ infos.tableauIndicesPdtRegul = new TLongArrayList();
+
+ // -- on sort de la boucle au eof --//
+ while (true) {
+ // -- on lit les 2 param test et l'indice du pdt --//
+ // write(9) test,sngl(t)
+
+ helper_.readAll(8);
+ ByteBuffer buffer = helper_.getBuffer();
+
+ char[] nomChar = new char[8];
+ for (int j = 0; j < 8; j++) {
+ nomChar[j] = buffer.getChar();
+ }
+ String type = new String(nomChar);
+ infos.nbTimesSteps++;
+ // test c4 : 'CRUE' ou 'REGU' suivant le cas
+ if (type.equals("REGU")) {
+ infos.nbTimesStepsRegulation++;
+ infos.tableauIndicesPdtRegul.add(helper_.getCurrentPosition());
+ // pas de pdt pour crue
+ infos.tableauIndicesPdtCrue.add(-1);
+ } else {
+ infos.nbTimesStepsCrue++;
+ infos.tableauIndicesPdtCrue.add(helper_.getCurrentPosition());
+ // pas de pdt pour regul
+ infos.tableauIndicesPdtRegul.add(-1);
+ }
+
+ }
+
+ }
+
+ /**
+ * Lit les infos des branches
+ *
+ * @param infos
+ * @throws IOException
+ */
+ private void readBranches(FCbStructureInfos infos) throws IOException {
+ // do 30 ib=1,ibmax
+ // write(ifi2) ntyp(ib),imax(ib),(n0pr(ip,ib),ip=1,imax(ib)),
+ // * nombr(ib),nupam(ib),nupav(ib)
+ // 30 continue
+ infos.indicePostionHelperForBranches = helper_.getCurrentPosition();
+ for (int i = 0; i < infos.nbBranches; i++) {
+ helper_.skipRecord();
+ }
+ }
+
+ /**
+ * lecture profils write(ifi2) (tit(ipro),sngl(dist(ipro)),zfond(nuprfl(ipro)), ipro,ipro=1,iprm)
+ *
+ * @throws IOException
+ */
+ private void readProfils(FCbStructureInfos infos) throws IOException {
+
+ // on recupere l'indice du début des profils.
+ infos.indicePostionHelperForProfil = helper_.getCurrentPosition();
+ for (int i = 0; i < infos.nbProfilsModele; i++) {
+ helper_.skipRecord();
+ }
+ }
+
+ public void stop() {}
+
@Override
protected FortranInterface getFortranInterface() {
- // FIXME Auto-generated method stub
return FortranLib.getFortranInterface(in_);
}
@Override
public void setFile(final File _f) {
+ file_ = _f;
analyze_ = new CtuluAnalyze();
analyze_.setDesc(super.getOperationDescription(_f));
try {
@@ -134,4 +255,9 @@
}
}
+
+ @Override
+ protected Object internalRead() {
+ return readFile();
+ }
}
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCbStructureInfos.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCbStructureInfos.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCbStructureInfos.java 2009-05-18 16:18:39 UTC (rev 4786)
@@ -0,0 +1,414 @@
+package org.fudaa.dodico.crue.io.neuf;
+
+import gnu.trove.TLongArrayList;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+
+/**
+ * Structure de données fcb construite à la volée avec les infos fcb qui vont bien. garde en memoire les indices des pas
+ * de temps, les noeuds utilises, les branches, l'indice de regulation, le nb de pas de temps crue et regulation.
+ *
+ * @author Adrien Hadoux
+ */
+public class FCbStructureInfos {
+
+ /**
+ * le channel.
+ */
+ FileChannel channel;
+ /**
+ * le fichier associé.
+ */
+ final File file;
+
+ /**
+ * nb de branches.
+ */
+ int nbBranches = 0;
+ /**
+ * nb de profils du modele.
+ */
+ int nbProfilsModele = 0;
+ /**
+ * nb de profils du modele.
+ */
+ int nbNoeuds = 0;
+
+ /**
+ * indique la position du reader pour le debut de lecture des profils.
+ */
+ long indicePostionHelperForProfil = 0;
+ /**
+ * indique la position du reader pour le debut de lecture des branches.
+ */
+ long indicePostionHelperForBranches = 0;
+ /**
+ * indique la position du reader pour le debut de lecture des noeuds.
+ */
+ long indicePostionHelperForNoeuds = 0;
+ /**
+ * indique la position du reader pour le debut de lecture des nregulation
+ */
+ long indicePostionHelperForRegulations = 0;
+ /**
+ * indique la position du reader pour le debut de lecture des crue pas de temps.
+ */
+ long indicePostionHelperForCruePDT = 0;
+
+ /**
+ * le nb de timesteps total
+ */
+ int nbTimesSteps = 0;
+
+ /**
+ * Nb de pas de temps Regulation, different de crue
+ */
+ int nbTimesStepsRegulation = 0;
+ /**
+ * Nb de parametres de Regulation
+ */
+ int nbParamsRegulation = 0;
+ /**
+ * Nb de pas de temps Crue, different de Regulation
+ */
+ int nbTimesStepsCrue = 0;
+
+ boolean hasRegulationRecords = false;
+ /**
+ * hasCrueRecords en principe toujours vrai. A confirmer.
+ */
+ boolean hasCrueRecords = true;
+
+ /**
+ * Noms des differents parametres intervenant dans la regul: longueur variable.
+ */
+ String[] tableauNomsParamRegulations;
+
+ /**
+ * indice des positions de chaque pdt de crue, longueur variable
+ */
+
+ TLongArrayList tableauIndicesPdtCrue;
+ /**
+ * indice des positions de chaque pdt de regulation
+ */
+ TLongArrayList tableauIndicesPdtRegul;
+
+ /**
+ * Constructeur de la structure d'accès rapide fcb.
+ *
+ * @param file
+ */
+ public FCbStructureInfos(File file) {
+
+ this.file = file;
+ }
+
+ /**
+ * Retourne true si il existe des enregistrements sur la régulation.
+ *
+ * @return
+ */
+ boolean hasRegulationRecords() {
+ return hasRegulationRecords;
+ }
+
+ /**
+ * Retourne true si il existe des enregistrements sur la donnée crue.
+ *
+ * @return
+ */
+ boolean hasCrueRecords() {
+ return hasCrueRecords;
+ }
+
+ int getNbBranche() {
+ return nbBranches;
+ }
+
+ int getNbTimeStepRegulation() {
+ return nbTimesStepsRegulation;
+ }
+
+ int getNbTimeStepCrue() {
+ return nbTimesStepsCrue;
+ }
+
+ /**
+ * Cree un chanel pour le placer sur l'indice de position voulu.
+ *
+ * @throws IOException
+ */
+ private void createChannel() throws IOException {
+ if (channel == null) {
+ channel = new FileInputStream(file).getChannel();
+ }
+ }
+
+ /**
+ * Structure qui correspond a un enregistrement d'une branche.
+ *
+ * @author Adrien Hadoux
+ */
+ public static class StructBranche {
+ int typeBranche;
+ int[] tableauIndiceProfils;
+ String nom;
+ int profilAmont;
+ int profilAval;
+ }
+
+ /**
+ * @param capacity
+ * @return
+ */
+ protected ByteBuffer createBuffer(int capacity) {
+
+ ByteBuffer buffer = ByteBuffer.allocateDirect(capacity);
+
+ return buffer;
+ }
+
+ /**
+ * Recupere la ligne correspondante a la branche indiceBranche. Attention longueur variable a cause des profils...
+ *
+ * @param indiceBranche
+ * @return
+ * @throws IOException
+ */
+ public synchronized StructBranche getValuesBranche(final int indiceBranche) throws IOException {
+ createChannel();
+ if (!channel.isOpen()) { return null; }
+
+ StructBranche structure = new StructBranche();
+
+ // -- position de la position voulue --//
+ long position = indicePostionHelperForBranches + indiceBranche;
+
+ channel.position(position);
+
+ // -- donnees de la forme --//
+ // write(ifi2) ntyp(ib),imax(ib),(n0pr(ip,ib),ip=1,imax(ib)),
+ // nombr(ib),nupam(ib),nupav(ib)
+
+ // ntyp(NBR) i4 : type de la branche ib
+ ByteBuffer buffer = createBuffer(4);
+ channel.read(buffer);
+ structure.typeBranche = buffer.getInt();
+
+ // imax(NBR) i4 : nombre de profil dans la branche ib
+ buffer = createBuffer(4);
+ channel.read(buffer);
+ int nbProfils = buffer.getInt();
+ structure.tableauIndiceProfils = new int[nbProfils];
+
+ // --n0pr(NPR,NBR) i2 : n° absolu du profil dont le n° est ip dans la branche ib --//
+ buffer = createBuffer(4 * nbProfils);
+ // -- on lit tous les num de profils d'un coup --//
+ channel.read(buffer);
+
+ // -- on les copie dans un tableau d'indices --//
+ for (int i = 0; i < nbProfils; i++) {
+
+ structure.tableauIndiceProfils[i] = buffer.getInt();
+ }
+
+ // nombr(NBR) c8 : nom de la branche n° ib
+ buffer = createBuffer(8);
+ channel.read(buffer);
+ char[] nomChar = new char[8];
+ for (int i = 0; i < 8; i++) {
+ nomChar[i] = buffer.getChar();
+ }
+ structure.nom = new String(nomChar);
+
+ // nupam(NBR) i4 : n° du profil amont de la branche ib
+ buffer = createBuffer(4 * 2);
+ channel.read(buffer);
+ structure.profilAmont = buffer.getInt();
+
+ // nupav(NBR) i4 : n° du profil aval de la branche ib
+ structure.profilAval = buffer.getInt();
+
+ return structure;
+
+ }
+
+ /**
+ * Structure qui correspond a un enregistrement d'une profil.
+ *
+ * @author Adrien Hadoux
+ */
+ public static class StructProfil {
+
+ double[] distance;
+ double[] zfonds;
+ String nom;
+
+ }
+
+ /**
+ * Recupere la ligne correspondante a la profil indicePorfil. Attention longueur variable a cause des profils...
+ *
+ * @param indiceBranche
+ * @return
+ * @throws IOException
+ */
+ public synchronized StructProfil getValuesProfils(final int indiceProfil) throws IOException {
+ createChannel();
+ if (!channel.isOpen()) { return null; }
+
+ StructProfil structure = new StructProfil();
+
+ // -- position de la position voulue --//
+ long position = indicePostionHelperForProfil + indiceProfil;
+
+ channel.position(position);
+
+ // write(ifi2) (tit(ipro),sngl(dist(ipro)),zfond(nuprfl(ipro)), ipro,ipro=1,iprm)
+
+ // tit(NBPRO) c8 : noms des profils
+ ByteBuffer buffer = createBuffer(8);
+ channel.read(buffer);
+ char[] nomChar = new char[8];
+ for (int i = 0; i < 8; i++) {
+ nomChar[i] = buffer.getChar();
+ }
+ structure.nom = new String(nomChar);
+
+ // dist(NBPRO) r4 : distance entre les profils ipro-1 et ipro.
+ // attention sngl transforme en reel donc 4
+
+ // zfond r4 : cote du fond du profil fluvial
+
+ // on cree le buffer pour les zfond et dist pour iprm=nbProfils elements
+ buffer = createBuffer((4 + 4) * nbProfilsModele);
+
+ structure.distance = new double[nbProfilsModele];
+ structure.zfonds = new double[nbProfilsModele];
+
+ for (int i = 0; i < nbProfilsModele; i++) {
+ structure.distance[i] = buffer.getFloat();
+ structure.zfonds[i] = buffer.getFloat();
+ }
+ return structure;
+ }
+
+ /**
+ * Structure qui correspond a un enregistrement d'une noeud.
+ *
+ * @author Adrien Hadoux
+ */
+ public static class StructNoeuds {
+
+ int[] numPro;
+ String[] noms;
+
+ }
+
+ /**
+ * Recupere la ligne correspondante a la noeuds indiceNoeud. Attention longueur variable a cause des profils...
+ *
+ * @param indiceBranche
+ * @return
+ * @throws IOException
+ */
+ public synchronized StructNoeuds getValuesNoeuds(final int indiceProfil) throws IOException {
+ createChannel();
+ if (!channel.isOpen()) { return null; }
+
+ StructNoeuds structure = new StructNoeuds();
+
+ // -- position de la position voulue --//
+ long position = indicePostionHelperForNoeuds + indiceProfil;
+
+ channel.position(position);
+ // write(ifi2) nbpoin,(nompoi(ip),nupro(ip),ip=1,nbpoin)
+
+ structure.noms = new String[nbNoeuds];
+ structure.numPro = new int[nbNoeuds];
+
+ for (int k = 0; k < nbNoeuds; k++) {
+ // nompar nom noeud sur 8 octets
+ ByteBuffer buffer = createBuffer(8);
+ channel.read(buffer);
+ char[] nomChar = new char[8];
+ for (int i = 0; i < 8; i++) {
+ nomChar[i] = buffer.getChar();
+ }
+ structure.noms[k] = new String(nomChar);
+
+ // nupro(NBPMAX) i4 : n° d un des deux profils associes au noeud ip
+
+ buffer = createBuffer(4);
+ channel.read(buffer);
+ structure.numPro[k] = buffer.getInt();
+ }
+
+ return structure;
+ }
+
+ public static class StructRegulation {
+
+ double[] numPro;
+
+ double pdt;
+ }
+
+ /**
+ * @param pdt
+ * @return
+ * @throws IOException
+ */
+ public synchronized StructRegulation getValuesRegulation(final int pdt) throws IOException {
+
+ createChannel();
+ if (!channel.isOpen()) { return null; }
+ // on recupere la position de l'indice du pdt
+ long pos = tableauIndicesPdtRegul.get(pdt);
+ if (pos == -1) { return null; }
+ StructRegulation structure = new StructRegulation();
+ channel.position(pos);
+
+ // on est a la position du nom du pdt et les 2 valeurs en + a lire
+ // write(9) test,sngl(t)
+ // write(9) (para(i),i=1,npar)
+
+ ByteBuffer buffer = createBuffer(4);
+ channel.read(buffer);
+ structure.pdt = buffer.getFloat();
+
+ // para(npar) r4 : paramètres de régulation
+ buffer = createBuffer(4 * nbParamsRegulation);
+ structure.numPro = new double[nbParamsRegulation];
+ for (int i = 0; i < nbParamsRegulation; i++) {
+ structure.numPro[i] = buffer.getFloat();
+ }
+
+ return structure;
+ }
+
+ /**
+ * @param pdt
+ * @return
+ * @throws IOException
+ */
+ public synchronized double getValuesCRUE(final int pdt) throws IOException {
+
+ createChannel();
+ if (!channel.isOpen()) { return 0; }
+ // on recupere la position de l'indice du pdt
+
+ long pos = tableauIndicesPdtCrue.get(pdt);
+ if (pos == -1) { return 0; }
+ channel.position(pos);
+
+ // TODO Carole a terminer
+
+ return 0;
+ }
+}
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-18 09:30:07 UTC (rev 4785)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/adrienMessages.properties 2009-05-18 16:18:39 UTC (rev 4786)
@@ -4,4 +4,10 @@
error.validationModele.noeudNonAffectes = Erreur, il existe des noeuds isoles: {noeuds}
error.validationModele.noeudAmontManquant= Erreur, il manque un noeud amont pour la branche {branche}
error.validationModele.noeudAvalManquant= Erreur, il manque un noeud aval pour la branche {branche}
-
+error.scenario.empty= Il n'existe pas de sc\xE9nario courant ou de donn\xE9es EMH charg\xE9es...
+ihm.error.modele.empty=Il n'existe pas de mod\xE8les pour le fichier etude charg\xE9
+ihm.error.comparaison.scenario1=Erreur, il faut au moins 2 sc\xE9narios disponibles dans l'\xE9tude.
+ihm.error.comparaison.scenario2=Erreur, aucun sc\xE9nario 1 s\xE9lectionn\xE9
+ihm.error.comparaison.scenario3=Erreur, aucun sc\xE9nario 2 s\xE9lectionn\xE9
+ihm.error.comparaison.scenario4=Erreur, il faut s\xE9lectionner 2 sc\xE9narios diff\xE9rents.
+ihm.error.sousmodele.empty=Pas de sous mod\xE8les d\xE9finis pour ce mod\xE8le
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-18 09:30:07 UTC (rev 4785)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueCommomImplementation.java 2009-05-18 16:18:39 UTC (rev 4786)
@@ -337,7 +337,7 @@
*/
public void addEMHViewFille() {
if (crueProjet_.getProject().getScenarioCourant() == null || crueProjet_.getDataSources() == null) {
- message(FCrueResource.getS("Il n'existe pas de scénario courant ou de données EMH chargées..."));
+ message("error.scenario.empty");
return;
}
@@ -359,7 +359,7 @@
if (crueProjet_.getProject().getListeModeles() == null
|| crueProjet_.getProject().getListeModeles().getListeModeles() == null
|| crueProjet_.getProject().getListeModeles().getListeModeles().size() == 0) {
- message(FCrueResource.getS("Il n'existe pas de modèles pour le fichier etude chargé"));
+ message(FCrueResource.getS("ihm.error.modele.empty"));
return;
}
@@ -441,8 +441,7 @@
// this.addInternalFrame(inframe);
} else if (action.equals("GESTIONCOMPARAISON")) {
if (crueProjet_.getProject().getListeScenarios().size() < 2) {
- crueProjet_.getImpl().error(
- FCrueResource.getS("Erreur, il faut au moins 2 scénarios disponibles dans l'étude."));
+ crueProjet_.getImpl().error(FCrueResource.getS("ihm.error.comparaison.scenario1"));
} else {
this.addInternalFrame(new CrueFilleComparaisonScenario(crueProjet_));
}
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheModeleFille.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheModeleFille.java 2009-05-18 09:30:07 UTC (rev 4785)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheModeleFille.java 2009-05-18 16:18:39 UTC (rev 4786)
@@ -97,7 +97,7 @@
} else {
listeSousModeles.setModel(new DefaultListModel());
revalidate();
- projet.getImpl().message(FCrueResource.getS("Pas de sous modèles définis pour ce modèle"));
+ projet.getImpl().message(FCrueResource.getS("ihm.error.sousmodele.empty"));
}
}
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleComparaisonScenario.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleComparaisonScenario.java 2009-05-18 09:30:07 UTC (rev 4785)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleComparaisonScenario.java 2009-05-18 16:18:39 UTC (rev 4786)
@@ -92,13 +92,13 @@
EMHScenario scenario2 = getSelectedScenario(ListeFiles2);
projet.getManagerError().clear();
if (scenario1 == null) {
- projet.getImpl().error(FCrueResource.getS("Erreur, aucun scénario 1 sélectionné"));
+ projet.getImpl().error(FCrueResource.getS("ihm.error.comparaison.scenario2"));
} else if (scenario2 == null) {
- projet.getImpl().error(FCrueResource.getS("Erreur, aucun scénario 2 sélectionné"));
+ projet.getImpl().error(FCrueResource.getS("ihm.error.comparaison.scenario3"));
}
if (scenario1 == scenario2) {
- projet.getImpl().error(FCrueResource.getS("Erreur, il faut sélectionner 2 scénarios différents."));
+ projet.getImpl().error(FCrueResource.getS("ihm.error.comparaison.scenario4"));
}
// TODO Carole: continuer la comparaison de scenario.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-05-27 01:09:35
|
Revision: 4807
http://fudaa.svn.sourceforge.net/fudaa/?rev=4807&view=rev
Author: deniger
Date: 2009-05-27 01:09:20 +0000 (Wed, 27 May 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/.pmd
trunk/soft/fudaa-crue/dodico/pmd.xml
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractDaoLoi.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDLHY.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructure.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDCLM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDLHY.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureETU.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureORES.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructurePCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructurePNUM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueXmlReaderWriterImpl.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/SingleConverterPointFF.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/AbstractCrue9Reader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/CrueData.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/CrueDataImpl.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPerm.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermBrancheOrificeManoeuvre.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermBrancheSaintVenantQruis.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermCasierProfilQruis.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermNoeudNiveauContinuQapp.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermNoeudNiveauContinuZimpose.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTrans.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransBrancheOrificeManoeuvre.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransBrancheSaintVenantQruis.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransCasierProfilQruis.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuLimnigramme.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuTarrage.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHSection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrt.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheBarrageFilEau.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheBarrageGenerique.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheNiveauxAssocies.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheOrifice.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSaintVenant.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSeuilLateral.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSeuilTransversal.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHCasierProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSectionProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ElemOrifice.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/LoiDF.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/LoiFF.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/LoiHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/EMHValidatorModele.java
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-dclm-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-dcsp-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/MockCrueData.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDC.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDCLMFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDCSPFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDLHYFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueOCALFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueValidationModele.java
trunk/soft/fudaa-crue/fudaa/.pmd
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/EMHGeneralBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoader.java
trunk/soft/fudaa-crue/src/main/config/pmd.xml
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/AbstractSingleConverter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/EnumsConverter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractCalc.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractCatEMHActivable.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractDonCLimM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractDonCalcSansPrtBrancheQ.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractDonCalcSansPrtBrancheSeuil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractLoi.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermItem.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransItem.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuQapp.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBranchePdc.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumFormulePdc.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumInfosEMH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumLoiExtrapol.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumMethodeInterpolation.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumPositionSection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumSensOrifice.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumSensOuv.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumVariable.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumVerbosite.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/HelperInfosEMH.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AssociationScenarCalculPermanent.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuHydrogramme.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuRegulBarrage.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuRegulUsine.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuRegulUsineBarrage.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuRegulUsineBarrage2.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Calcul.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMBrancheOrifice.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMBrancheSaintVenant.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMCasierProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMNoeudNiveauContinu.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBranchePDC.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtSection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonClimM.java
Modified: trunk/soft/fudaa-crue/.pmd
===================================================================
--- trunk/soft/fudaa-crue/.pmd 2009-05-26 17:48:07 UTC (rev 4806)
+++ trunk/soft/fudaa-crue/.pmd 2009-05-27 01:09:20 UTC (rev 4807)
@@ -236,10 +236,6 @@
<ruleset>Controversial Rules</ruleset>
</rule>
<rule>
- <name>DataflowAnomalyAnalysis</name>
- <ruleset>Controversial Rules</ruleset>
- </rule>
- <rule>
<name>AvoidUsingShortType</name>
<ruleset>Controversial Rules</ruleset>
</rule>
Modified: trunk/soft/fudaa-crue/dodico/pmd.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/pmd.xml 2009-05-26 17:48:07 UTC (rev 4806)
+++ trunk/soft/fudaa-crue/dodico/pmd.xml 2009-05-27 01:09:20 UTC (rev 4807)
@@ -243,6 +243,8 @@
<rule ref="rulesets/design.xml/EmptyMethodInAbstractClassShouldBeAbstract"/>
<rule ref="rulesets/design.xml/SingularField"/>
<rule ref="rulesets/design.xml/ReturnEmptyArrayRatherThanNull"/>
- <rule ref="rulesets/design.xml/AbstractClassWithoutAnyMethod"/>
+ <rule ref="rulesets/design.xml/AbstractClassWithoutAnyMethod">
+ <priority>4</priority>
+ </rule>
<rule ref="rulesets/design.xml/TooFewBranchesForASwitchStatement"/>
</ruleset>
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java 2009-05-26 17:48:07 UTC (rev 4806)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java 2009-05-27 01:09:20 UTC (rev 4807)
@@ -162,6 +162,11 @@
addErrorFromFile(_m, _index);
}
+ public void addFatalError(final String _m, final Object arg) {
+ // TODO a continuer
+ addError(_m);
+ }
+
/**
* Initialise le champ "erreur fatale". Si une erreur fatale a deja ete initialisee, ne fait rien.
*
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java 2009-05-26 17:48:07 UTC (rev 4806)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java 2009-05-27 01:09:20 UTC (rev 4807)
@@ -22,8 +22,8 @@
new CrueXmlReaderWriterImpl<CrueDaoDFRT, List<DonFrt>>(CrueHelper.DFRT, new CrueConverterDFRT(),
new CrueDaoStructureDFRT()));
- private final static Crue10FileFormat<List<Loi>> DLHY = new Crue10FileFormat<List<Loi>>(
- new CrueXmlReaderWriterImpl<CrueDaoDLHY, List<Loi>>(CrueHelper.DLHY, new CrueConverterDLHY(),
+ private final static Crue10FileFormat<List<AbstractLoi>> DLHY = new Crue10FileFormat<List<AbstractLoi>>(
+ new CrueXmlReaderWriterImpl<CrueDaoDLHY, List<AbstractLoi>>(CrueHelper.DLHY, new CrueConverterDLHY(),
new CrueDaoStructureDLHY()));
private final static Crue10FileFormat<CrueData> DPTG = new Crue10FileFormat<CrueData>(
@@ -89,7 +89,7 @@
/**
* @return DLHY : objet CrueFileFormat qui contient le DAO et le métier de DLHY
*/
- public static Crue10FileFormat<List<Loi>> getDLHYFileFormat() {
+ public static Crue10FileFormat<List<AbstractLoi>> getDLHYFileFormat() {
return DLHY;
}
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/AbstractSingleConverter.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/AbstractSingleConverter.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/AbstractSingleConverter.java 2009-05-27 01:09:20 UTC (rev 4807)
@@ -0,0 +1,51 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.io.common;
+
+import com.thoughtworks.xstream.converters.SingleValueConverter;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+
+/**
+ * @author deniger
+ */
+public abstract class AbstractSingleConverter implements SingleValueConverter {
+
+ protected CtuluAnalyze analyse;
+
+ /**
+ *
+ */
+ public AbstractSingleConverter() {
+ super();
+ }
+
+ /**
+ * @return the analyse
+ */
+ public CtuluAnalyze getAnalyse() {
+ return analyse;
+ }
+
+ /**
+ * TODO a continuer pour prendre en compte option
+ *
+ * @param code
+ * @param option
+ */
+ protected void addFatalError(final String code, final Object option) {
+ if (analyse != null) {
+ analyse.addFatalError(code, option);
+ }
+ }
+
+ /**
+ * @param analyse the analyse to set
+ */
+ public final void setAnalyse(final CtuluAnalyze analyse) {
+ this.analyse = analyse;
+ }
+
+}
\ No newline at end of file
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/EnumsConverter.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/EnumsConverter.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/EnumsConverter.java 2009-05-27 01:09:20 UTC (rev 4807)
@@ -0,0 +1,180 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.io.common;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.thoughtworks.xstream.converters.SingleValueConverter;
+
+import org.apache.commons.collections.bidimap.DualHashBidiMap;
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.metier.emh.EnumFormulePdc;
+import org.fudaa.dodico.crue.metier.emh.EnumSensOrifice;
+import org.fudaa.dodico.crue.metier.emh.EnumSensOuv;
+
+/**
+ * Gestion des converter pour les enums
+ *
+ * @author deniger
+ */
+public final class EnumsConverter {
+
+ /**
+ * Code d'erreur a utiliser lorsqu'un enum ne peut etre reconstruit
+ */
+ public static final String CODE_CONVERT_ENUM_ERROR = "io.convert.enum.error";
+
+ private EnumsConverter() {
+
+ }
+
+ protected static class DefaultEnumConverter extends AbstractSingleConverter {
+ /**
+ *
+ */
+
+ private final DualHashBidiMap enumString;
+ private final Class classAccepted;
+
+ /**
+ * @param enumString la map Enum<->String
+ * @param classAccepted la classe de l'enum
+ * @param analyze l'analyze recevant les erreur.
+ */
+ public DefaultEnumConverter(final DualHashBidiMap enumString, final Class classAccepted, final CtuluAnalyze analyze) {
+ super();
+ this.enumString = enumString;
+ this.classAccepted = classAccepted;
+ setAnalyse(analyze);
+ }
+
+ public boolean canConvert(final Class arg0) {
+ return classAccepted.equals(arg0);
+ }
+
+ public Object fromString(final String arg0) {
+ final Object res = enumString.getKey(arg0);
+ if (res == null) {
+ addFatalError(CODE_CONVERT_ENUM_ERROR, arg0);
+ }
+ return res;
+ }
+
+ public String toString(final Object arg0) {
+ final String res = (String) enumString.get(arg0);
+ if (res == null) {
+ addFatalError(CODE_CONVERT_ENUM_ERROR, arg0);
+ }
+ return res;
+
+ }
+
+ }
+
+ private static final Map<Class, DualHashBidiMap> CRUE10_CONVERTER = new HashMap<Class, DualHashBidiMap>();
+ private static final Map<Class, DualHashBidiMap> CRUE9_CONVERTER = new HashMap<Class, DualHashBidiMap>();
+ static {
+ CRUE10_CONVERTER.put(EnumFormulePdc.class, createEnumFormulePdcMap());
+ CRUE9_CONVERTER.put(EnumFormulePdc.class, createEnumFormulePdcMapCrue9());
+ CRUE10_CONVERTER.put(EnumSensOrifice.class, createEnumSensOrificeMap());
+ CRUE9_CONVERTER.put(EnumSensOrifice.class, createEnumSensOrificeMapCrue9());
+ CRUE10_CONVERTER.put(EnumSensOuv.class, createEnumSensOuvMap());
+ CRUE9_CONVERTER.put(EnumSensOuv.class, createEnumSensOuvMapCrue9());
+ }
+
+ /**
+ * a voir pour utiliser une sauvegarde eventuelle.
+ *
+ * @return
+ */
+ private static DualHashBidiMap createEnumFormulePdcMap() {
+ final DualHashBidiMap res = new DualHashBidiMap();
+ res.put(EnumFormulePdc.BORDA, "Borda");
+ res.put(EnumFormulePdc.DIVERGENT, "Divergent");
+ return res;
+ }
+
+ /**
+ * @return une dual map enum<->String pour Crue 9.
+ */
+ private static DualHashBidiMap createEnumFormulePdcMapCrue9() {
+ final DualHashBidiMap res = new DualHashBidiMap();
+ res.put(EnumFormulePdc.BORDA, "1");
+ res.put(EnumFormulePdc.DIVERGENT, "0");
+ return res;
+ }
+
+ /**
+ * @return une dual map enum<->String pour Crue 9.
+ */
+ private static DualHashBidiMap createEnumSensOrificeMapCrue9() {
+ final DualHashBidiMap res = new DualHashBidiMap();
+ res.put(EnumSensOrifice.BIDIRECT, "0");
+ res.put(EnumSensOrifice.DIRECT, "1");
+ res.put(EnumSensOrifice.INDIRECT, "-1");
+ return res;
+ }
+
+ /**
+ * @return une dual map enum<->String pour Crue 9.
+ */
+ private static DualHashBidiMap createEnumSensOrificeMap() {
+ final DualHashBidiMap res = new DualHashBidiMap();
+ res.put(EnumSensOrifice.BIDIRECT, "Bidirect");
+ res.put(EnumSensOrifice.DIRECT, "Direct");
+ res.put(EnumSensOrifice.INDIRECT, "Indirect");
+ return res;
+ }
+
+ /**
+ * EnumSensOuv
+ *
+ * @return une dual map enum<->String pour Crue 9.
+ */
+ private static DualHashBidiMap createEnumSensOuvMapCrue9() {
+ final DualHashBidiMap res = new DualHashBidiMap();
+ res.put(EnumSensOuv.OUV_VERS_BAS, "42");
+ res.put(EnumSensOuv.OUV_VERS_HAUT, "41");
+ return res;
+ }
+
+ /**
+ * @return une dual map enum<->String pour Crue 9.
+ */
+ private static DualHashBidiMap createEnumSensOuvMap() {
+ final DualHashBidiMap res = new DualHashBidiMap();
+ res.put(EnumSensOuv.OUV_VERS_HAUT, "OuvVersHaut");
+ res.put(EnumSensOuv.OUV_VERS_BAS, "OuvVersBas");
+ return res;
+ }
+
+ /**
+ * @param enumClass la classe de l'enum
+ * @param analyze l'analyze
+ * @return le converter pour EnumFormulePdc
+ */
+ public static SingleValueConverter createEnumConverter(final Class enumClass, final CtuluAnalyze analyze) {
+ return createEnumConverter(CRUE10_CONVERTER, enumClass, analyze);
+
+ }
+
+ /**
+ * @param enumClass la classe de l'enum
+ * @param analyze l'analyze
+ * @return le converter pour l'enum enumClass pour Crue9
+ */
+ public static SingleValueConverter createCrue9EnumConverter(final Class enumClass, final CtuluAnalyze analyze) {
+ return createEnumConverter(CRUE9_CONVERTER, enumClass, analyze);
+
+ }
+
+ private static SingleValueConverter createEnumConverter(final Map<Class, DualHashBidiMap> map, final Class enumClass,
+ final CtuluAnalyze analyze) {
+ return new DefaultEnumConverter(map.get(enumClass), enumClass, analyze);
+
+ }
+
+}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractDaoLoi.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractDaoLoi.java 2009-05-26 17:48:07 UTC (rev 4806)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractDaoLoi.java 2009-05-27 01:09:20 UTC (rev 4807)
@@ -2,10 +2,9 @@
import com.thoughtworks.xstream.XStream;
+import org.fudaa.dodico.crue.metier.emh.AbstractLoi;
import org.fudaa.dodico.crue.metier.emh.EvolutionFF;
-import org.fudaa.dodico.crue.metier.emh.Loi;
import org.fudaa.dodico.crue.metier.emh.PtEvolutionFF;
-import org.fudaa.dodico.crue.metier.emh.VariableOrdonnee;
import org.fudaa.dodico.crue.metier.helper.LoiHelper;
/**
@@ -48,15 +47,15 @@
* @param outLoi
* @param inLoi
*/
- protected static void daoToMetierLoi(final Loi outLoi, final AbstractDaoLoi inLoi) {
+ protected static void daoToMetierLoi(final AbstractLoi outLoi, final AbstractDaoLoi inLoi) {
outLoi.setNom(inLoi.Nom);
outLoi.setDescription(inLoi.Description);
- VariableOrdonnee varOrdonnee = new VariableOrdonnee();
- varOrdonnee.setType(inLoi.VarAbscisse);
- outLoi.setMVariableAbscisse(varOrdonnee);
- varOrdonnee = new VariableOrdonnee();
- varOrdonnee.setType(inLoi.VarOrdonnee);
- outLoi.setMVariableOrdonnee(varOrdonnee);
+ // VariableOrdonnee varOrdonnee = new VariableOrdonnee();
+ // varOrdonnee.setType(inLoi.VarAbscisse);
+ outLoi.setVarAbscisse(inLoi.VarAbscisse);
+ // varOrdonnee = new VariableOrdonnee();
+ // varOrdonnee.setType(inLoi.VarOrdonnee);
+ outLoi.setVarOrdonnee(inLoi.VarOrdonnee);
outLoi.setEvolutionFF(inLoi.EvolutionFF);
}
@@ -66,11 +65,11 @@
* @param listePersistante
* @param dataMetier
*/
- protected static void metierToDaoLoi(final AbstractDaoLoi outLoi, final Loi inLoi) {
+ protected static void metierToDaoLoi(final AbstractDaoLoi outLoi, final AbstractLoi inLoi) {
outLoi.Nom = inLoi.getNom();
outLoi.Description = inLoi.getDescription();
- outLoi.VarAbscisse = inLoi.getMVariableAbscisse().getType();
- outLoi.VarOrdonnee = inLoi.getMVariableOrdonnee().getType();
+ outLoi.VarAbscisse = inLoi.getVarAbscisse();
+ outLoi.VarOrdonnee = inLoi.getVarOrdonnee();
outLoi.EvolutionFF = inLoi.getEvolutionFF();
}
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java 2009-05-26 17:48:07 UTC (rev 4806)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java 2009-05-27 01:09:20 UTC (rev 4807)
@@ -7,6 +7,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.collections.CollectionUtils;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.*;
import org.fudaa.dodico.crue.metier.CrueData;
@@ -49,11 +50,11 @@
res.listeCalculs = new ArrayList<CalculAbstractPersist>();
- List<CalculAbstractPersist> listeCalculs = remplirPersistanceDCLMAvecCalculsPermanents(metier
- .getListeCalculsPermanents(), analyser);
+ List<CalculAbstractPersist> listeCalculs = remplirPersistanceDCLMAvecCalculsPermanents(metier.getCalcPseudoPerm(),
+ analyser);
res.listeCalculs.addAll(listeCalculs);
- listeCalculs = remplirPersistanceDCLMAvecCalculsTransitoires(metier.getListeCalculsTransitoires(), analyser);
+ listeCalculs = remplirPersistanceDCLMAvecCalculsTransitoires(metier.getCalcTrans(), analyser);
res.listeCalculs.addAll(listeCalculs);
return res;
@@ -72,10 +73,10 @@
final List<CalcPseudoPerm> listeCalculsPermanents = new ArrayList<CalcPseudoPerm>();
final List<CalcTrans> listeCalculsTransitoires = new ArrayList<CalcTrans>();
- metier.setListeCalculsPermanents(listeCalculsPermanents);
- metier.setListeCalculsTransitoires(listeCalculsTransitoires);
-
- if (calculsPersist == null || calculsPersist.size() == 0) {
+ metier.setCalcPseudoPerm(listeCalculsPermanents);
+ metier.setCalcTrans(listeCalculsTransitoires);
+ // TODO est-ce une erreur
+ if (CollectionUtils.isEmpty(calculsPersist)) {
analyzer.addError("io.dclm.no.calcul");
} else {
@@ -110,7 +111,7 @@
final CalcPseudoPerm calculPermMetier = new CalcPseudoPerm();
calculPermMetier.setNom(calculPermPersist.Nom);
calculPermMetier.setDescription(calculPermPersist.Description);
- calculPermMetier.setMethodeCalcul(calculPermPersist.MethodeCalcul);
+ // calculPermMetier.setMethodeCalcul(calculPermPersist.MethodeCalcul);
// *** Gestion des elements d'un calcul permanent
if (calculPermPersist.listeElementsCalculPermanent == null
@@ -118,11 +119,13 @@
analyzer.addError("io.dclm.no.calcul.perm");
} else {
- final List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu = new ArrayList<DonCLimMNoeudNiveauContinu>();
- final List<DonCLimMBrancheOrifice> listeDonCLimMBrancheOrifice = new ArrayList<DonCLimMBrancheOrifice>();
- final List<DonCLimMBrancheSaintVenant> listeDonCLimMBrancheSaintVenant = new ArrayList<DonCLimMBrancheSaintVenant>();
- final List<DonCLimMCasierProfil> listeDonCLimMCasierProfil = new ArrayList<DonCLimMCasierProfil>();
- calculPermMetier.setListeRefs(new ArrayList<EMH>());
+ // final List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu = new
+ // ArrayList<DonCLimMNoeudNiveauContinu>();
+ // final List<DonCLimMBrancheOrifice> listeDonCLimMBrancheOrifice = new ArrayList<DonCLimMBrancheOrifice>();
+ // final List<DonCLimMBrancheSaintVenant> listeDonCLimMBrancheSaintVenant = new
+ // ArrayList<DonCLimMBrancheSaintVenant>();
+ // final List<DonCLimMCasierProfil> listeDonCLimMCasierProfil = new ArrayList<DonCLimMCasierProfil>();
+ // calculPermMetier.setListeRefs(new ArrayList<EMH>());
for (final RefDCLMAbstractPersist eltRefPersist : calculPermPersist.listeElementsCalculPermanent) {
if (eltRefPersist instanceof CalcPseudoPermNoeudNiveauContinuQappPersist) {
@@ -133,9 +136,12 @@
final CalcPseudoPermNoeudNiveauContinuQapp eltMetier = new CalcPseudoPermNoeudNiveauContinuQapp();
eltMetier.setNomCalculParent(calculPermMetier.getNom());
eltMetier.setQapp(eltPersist.Qapp);
- listeDonCLimMNoeudNiveauContinu.add(eltMetier);
+ calculPermMetier.addCalcPseudoPermNoeudNiveauContinuQapp(eltMetier);
+ // listeDonCLimMNoeudNiveauContinu.add(eltMetier);
noeudMetier.addDCLM(eltMetier);
- calculPermMetier.getListeRefs().add(noeudMetier);
+ // TODO a modifier et a mettre dans addDCLM
+ eltMetier.setNomEMH(noeudMetier.getNom());
+ // calculPermMetier.getListeRefs().add(noeudMetier);
}
} else if (eltRefPersist instanceof CalcPseudoPermNoeudNiveauContinuZimposePersist) {
@@ -145,10 +151,10 @@
if (noeudMetier != null) {
final CalcPseudoPermNoeudNiveauContinuZimpose eltMetier = new CalcPseudoPermNoeudNiveauContinuZimpose();
eltMetier.setNomCalculParent(calculPermMetier.getNom());
- eltMetier.setZIm...
[truncated message content] |
|
From: <had...@us...> - 2009-05-29 18:26:33
|
Revision: 4822
http://fudaa.svn.sourceforge.net/fudaa/?rev=4822&view=rev
Author: hadouxad
Date: 2009-05-29 18:26:31 +0000 (Fri, 29 May 2009)
Log Message:
-----------
- IHM modifi?\195?\169es
- OPTI g?\195?\169r?\195?\169
- revue des logs fudaa
- correction gestion des crue data au niveau des scenarios, modeles et sous modeles
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/Crue10FileFormatFactory.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/metier/CrueData.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/CrueDataImpl.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHModeleBase.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/OrdPrtCIniModeleBase.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParam.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamBooleen.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamDouble.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamEntier.java
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-opti-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/MockCrueData.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.opti.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichiersTestCorriges/Modele3-2.opti.xml
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/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/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/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/CrueFilleScenarioManager.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoOPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueEnumDico.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueOPTIFile.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichiersTestCorriges/Modele3.opti.xml
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/logocrue.png
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java 2009-05-29 17:44:31 UTC (rev 4821)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java 2009-05-29 18:26:31 UTC (rev 4822)
@@ -88,6 +88,7 @@
}
public boolean write(final CrueIOResu<CrueData> metier, final File f, final CtuluAnalyze analyzer) {
+ analyzer.setDesc(f.getName());
final AbstractCrue9Writer writer = createWriter();
writer.setFile(f);
final CtuluIOOperationSynthese operation = writer.write(metier);
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-29 17:44:31 UTC (rev 4821)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java 2009-05-29 18:26:31 UTC (rev 4822)
@@ -2,10 +2,62 @@
import java.util.List;
-import org.fudaa.dodico.crue.io.dao.*;
+import org.fudaa.dodico.crue.io.dao.CrueConverterDCLM;
+import org.fudaa.dodico.crue.io.dao.CrueConverterDCSP;
+import org.fudaa.dodico.crue.io.dao.CrueConverterDFRT;
+import org.fudaa.dodico.crue.io.dao.CrueConverterDLHY;
+import org.fudaa.dodico.crue.io.dao.CrueConverterDPTG;
+import org.fudaa.dodico.crue.io.dao.CrueConverterDPTI;
+import org.fudaa.dodico.crue.io.dao.CrueConverterDRSO;
+import org.fudaa.dodico.crue.io.dao.CrueConverterETU;
+import org.fudaa.dodico.crue.io.dao.CrueConverterOCAL;
+import org.fudaa.dodico.crue.io.dao.CrueConverterOPTG;
+import org.fudaa.dodico.crue.io.dao.CrueConverterOPTI;
+import org.fudaa.dodico.crue.io.dao.CrueConverterORES;
+import org.fudaa.dodico.crue.io.dao.CrueConverterPCAL;
+import org.fudaa.dodico.crue.io.dao.CrueConverterPNUM;
+import org.fudaa.dodico.crue.io.dao.CrueDaoDCLM;
+import org.fudaa.dodico.crue.io.dao.CrueDaoDCSP;
+import org.fudaa.dodico.crue.io.dao.CrueDaoDFRT;
+import org.fudaa.dodico.crue.io.dao.CrueDaoDLHY;
+import org.fudaa.dodico.crue.io.dao.CrueDaoDPTG;
+import org.fudaa.dodico.crue.io.dao.CrueDaoDPTI;
+import org.fudaa.dodico.crue.io.dao.CrueDaoDRSO;
+import org.fudaa.dodico.crue.io.dao.CrueDaoETU;
+import org.fudaa.dodico.crue.io.dao.CrueDaoOCAL;
+import org.fudaa.dodico.crue.io.dao.CrueDaoOPTG;
+import org.fudaa.dodico.crue.io.dao.CrueDaoOPTI;
+import org.fudaa.dodico.crue.io.dao.CrueDaoORES;
+import org.fudaa.dodico.crue.io.dao.CrueDaoPCAL;
+import org.fudaa.dodico.crue.io.dao.CrueDaoPNUM;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDFRT;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDLHY;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTG;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDRSO;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureETU;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureOCAL;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureOPTG;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureOPTI;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureORES;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructurePCAL;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructurePNUM;
+import org.fudaa.dodico.crue.io.dao.CrueHelper;
+import org.fudaa.dodico.crue.io.dao.CrueXmlReaderWriterImpl;
import org.fudaa.dodico.crue.metier.CrueData;
import org.fudaa.dodico.crue.metier.EMHproject;
-import org.fudaa.dodico.crue.metier.emh.*;
+import org.fudaa.dodico.crue.metier.emh.AbstractLoi;
+import org.fudaa.dodico.crue.metier.emh.DonCLimMScenario;
+import org.fudaa.dodico.crue.metier.emh.DonFrt;
+import org.fudaa.dodico.crue.metier.emh.EMH;
+import org.fudaa.dodico.crue.metier.emh.OrdCalcScenario;
+import org.fudaa.dodico.crue.metier.emh.OrdPrtCIniModeleBase;
+import org.fudaa.dodico.crue.metier.emh.OrdPrtGeoModeleBase;
+import org.fudaa.dodico.crue.metier.emh.OrdResScenario;
+import org.fudaa.dodico.crue.metier.emh.ParamCalcScenario;
+import org.fudaa.dodico.crue.metier.emh.ParamNumModeleBase;
/**
* Gere la lecture du format crue 10 Utilise du parsing xml
@@ -66,6 +118,10 @@
new CrueXmlReaderWriterImpl<CrueDaoPNUM, ParamNumModeleBase>(CrueHelper.PNUM, new CrueConverterPNUM(),
new CrueDaoStructurePNUM()));
+ private final static Crue10FileFormat<OrdPrtCIniModeleBase> OPTI = new Crue10FileFormat<OrdPrtCIniModeleBase>(
+ new CrueXmlReaderWriterImpl<CrueDaoOPTI, OrdPrtCIniModeleBase>(CrueHelper.OPTI, new CrueConverterOPTI(),
+ new CrueDaoStructureOPTI()));
+
static {
Crue10FileFormatFactory.DRSO.setIndependant(true);
ETU.setIndependant(true);
@@ -150,6 +206,13 @@
}
/**
+ * @return OPTI : objet CrueFileFormat qui contient le DAO et le métier de OPTI
+ */
+ public static Crue10FileFormat<OrdPrtCIniModeleBase> getOPTIFileFormat() {
+ return OPTI;
+ }
+
+ /**
* @return PCAL : objet CrueFileFormat qui contient le DAO et le métier de PCAL
*/
public static Crue10FileFormat<ParamCalcScenario> getPCALFileFormat() {
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOPTI.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOPTI.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOPTI.java 2009-05-29 18:26:31 UTC (rev 4822)
@@ -0,0 +1,84 @@
+package org.fudaa.dodico.crue.io.dao;
+
+import java.util.Iterator;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureOPTI.InterpolLineaire;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureOPTI.InterpolSaintVenant;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureOPTI.MethodesInterpolations;
+import org.fudaa.dodico.crue.metier.CrueData;
+import org.fudaa.dodico.crue.metier.emh.OrdPrtCIniModeleBase;
+import org.fudaa.dodico.crue.metier.emh.ValParam;
+import org.fudaa.dodico.crue.metier.emh.ValParamDouble;
+
+/**
+ * Creation des objets methodes interpolations
+ *
+ * @author Adrien Hadoux
+ */
+public class CrueConverterOPTI implements CrueConverter<CrueDaoOPTI, OrdPrtCIniModeleBase> {
+
+ public OrdPrtCIniModeleBase convertDaoToMetier(CrueDaoOPTI dao, CrueData dataLinked, CtuluAnalyze analyser) {
+ /**
+ * NB Adrien:pour le moment on ne gère qu'un seul élément, liste en backup.
+ */
+ OrdPrtCIniModeleBase metier = new OrdPrtCIniModeleBase();
+ if (dao.getListeInterpol() != null) {
+ for (MethodesInterpolations interpol : dao.getListeInterpol()) {
+
+ // -- ajout de l'enum --//
+ metier.setMethodeInterpol(interpol.getType());
+
+ // -- switch sur l'enum --//
+ switch (interpol.getType()) {
+ case InterpolLineaire:
+ // -- on ne fait rien --//
+ break;
+
+ case InterpolSaintVenant:
+ // -- on recupere le double --//
+ metier.addValParam(new ValParamDouble("SeuilDetect", interpol.getSeuilDetect()));
+ break;
+
+ }
+
+ }
+
+ }
+
+ return metier;
+ }
+
+ public CrueDaoOPTI convertMetierToDao(OrdPrtCIniModeleBase metier, CtuluAnalyze analyser) {
+
+ CrueDaoOPTI dao = new CrueDaoOPTI();
+
+ if (metier == null) { return dao; }
+
+ MethodesInterpolations methode = null;
+
+ switch (metier.getMethodeInterpol()) {
+ case InterpolLineaire:
+ // -- on ne fait rien --//
+ methode = new InterpolLineaire();
+
+ break;
+
+ case InterpolSaintVenant:
+ methode = new InterpolSaintVenant(0);
+ // -- on recupere le double --//
+ for (Iterator it = metier.getIteratorValParam(); it.hasNext();) {
+ ValParam param = (ValParam) it.next();
+ if (param instanceof ValParamDouble) {
+ methode.setSeuilDetect(((ValParamDouble) param).valeur);
+ }
+ }
+
+ break;
+
+ }
+ dao.MethodeInterpol.add(methode);
+
+ return dao;
+ }
+}
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoOPTI.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoOPTI.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoOPTI.java 2009-05-29 18:26:31 UTC (rev 4822)
@@ -0,0 +1,37 @@
+package org.fudaa.dodico.crue.io.dao;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureOPTI.MethodesInterpolations;
+
+/**
+ * Représentation persistante du fichier xml OPTI (Fichier des ordres pour le prétraitement des conditions initiales
+ * (xml)).
+ *
+ * @author Adrien Hadoux
+ */
+@SuppressWarnings("PMD.VariableNamingConventions")
+public class CrueDaoOPTI extends AbstractCrueDao {
+
+ public CrueDaoOPTI() {
+ MethodeInterpol = new ArrayList<MethodesInterpolations>();
+ }
+
+ /**
+ * Choix d'une interpolation.
+ *
+ * @NB Adrien: Ici la structure est une liste ce n'est pas nécessaire pour l'état actuel du fichier. car il y a juste
+ * une interpolation. Mais il vaut mieux anticiper une éventuelle modif du fichier.
+ */
+ public List<MethodesInterpolations> MethodeInterpol;
+
+ public List<MethodesInterpolations> getListeInterpol() {
+ return MethodeInterpol;
+ }
+
+ public void setListeInterpol(List<MethodesInterpolations> listeInterpol) {
+ this.MethodeInterpol = listeInterpol;
+ }
+
+}
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOPTI.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOPTI.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOPTI.java 2009-05-29 18:26:31 UTC (rev 4822)
@@ -0,0 +1,84 @@
+package org.fudaa.dodico.crue.io.dao;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+
+import com.thoughtworks.xstream.XStream;
+
+/**
+ * Structures de CrueDaoOPTI.
+ *
+ * @author Adrien Hadoux
+ */
+@SuppressWarnings("PMD.VariableNamingConventions")
+public class CrueDaoStructureOPTI implements CrueDaoStructure {
+
+ public void configureXStream(XStream xstream, CtuluAnalyze analyze) {
+ xstream.alias(CrueHelper.OPTI, CrueDaoOPTI.class);
+ // xstream.addImplicitCollection(CrueDaoOPTI.class, "listeInterpol");
+ xstream.alias("InterpolLineaire", InterpolLineaire.class);
+ xstream.alias("InterpolSaintVenant", InterpolSaintVenant.class);
+ }
+
+ /**
+ * methode interpolation
+ *
+ * @author Adrien Hadoux
+ */
+ public static interface MethodesInterpolations {
+ /**
+ * retoourne le type de la methode
+ *
+ * @return
+ */
+ public CrueEnumDico.InterpolationsOPTI getType();
+
+ public double getSeuilDetect();
+
+ public void setSeuilDetect(double s);
+
+ }
+
+ /**
+ * methode InterpolLineaire
+ *
+ * @author Adrien Hadoux
+ */
+ public static class InterpolLineaire implements MethodesInterpolations {
+ public CrueEnumDico.InterpolationsOPTI getType() {
+ return CrueEnumDico.InterpolationsOPTI.InterpolLineaire;
+ }
+
+ public double getSeuilDetect() {
+ return 0;
+ }
+
+ public void setSeuilDetect(double s) {}
+ }
+
+ /**
+ * methode InterpolSaintVenant
+ *
+ * @author Adrien Hadoux
+ */
+ public static class InterpolSaintVenant implements MethodesInterpolations {
+ double SeuilDetect;
+
+ public CrueEnumDico.InterpolationsOPTI getType() {
+ return CrueEnumDico.InterpolationsOPTI.InterpolSaintVenant;
+ }
+
+ public double getSeuilDetect() {
+ return SeuilDetect;
+ }
+
+ public void setSeuilDetect(double s) {
+ SeuilDetect = s;
+ }
+
+ public InterpolSaintVenant(double seuilDetect) {
+ super();
+ SeuilDetect = seuilDetect;
+ }
+ }
+
+}
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueEnumDico.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueEnumDico.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueEnumDico.java 2009-05-29 18:26:31 UTC (rev 4822)
@@ -0,0 +1,19 @@
+package org.fudaa.dodico.crue.io.dao;
+
+/**
+ * Gère les énumérations des données coté Fudaa
+ *
+ * @author Adrien Hadoux
+ */
+public class CrueEnumDico {
+
+ /**
+ * Enumeration des methodes d'interpolations pour OPTI.
+ *
+ * @author Adrien Hadoux
+ */
+ public static enum InterpolationsOPTI {
+ InterpolLineaire, InterpolSaintVenant
+ }
+
+}
Modified: 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/CrueXmlReaderWriterImpl.java 2009-05-29 17:44:31 UTC (rev 4821)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueXmlReaderWriterImpl.java 2009-05-29 18:26:31 UTC (rev 4822)
@@ -339,6 +339,7 @@
* @return
*/
public final boolean writeXML(final M metier, final File f, final CtuluAnalyze analyzer) {
+ analyzer.setDesc(f.getName());
analyzer.setDefaultResourceBundle(Messages.RESOURCE_BUNDLE);
final D d = converter.convertMetierToDao(metier, analyzer);
if (d != null) {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/CrueData.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/CrueData.java 2009-05-29 17:44:31 UTC (rev 4821)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/CrueData.java 2009-05-29 18:26:31 UTC (rev 4822)
@@ -16,6 +16,7 @@
import org.fudaa.dodico.crue.metier.emh.DonFrt;
import org.fudaa.dodico.crue.metier.emh.EMH;
import org.fudaa.dodico.crue.metier.emh.OrdCalcScenario;
+import org.fudaa.dodico.crue.metier.emh.OrdPrtCIniModeleBase;
import org.fudaa.dodico.crue.metier.emh.OrdPrtGeoModeleBase;
import org.fudaa.dodico.crue.metier.emh.OrdResScenario;
import org.fudaa.dodico.crue.metier.emh.ParamCalcScenario;
@@ -174,4 +175,14 @@
*/
public boolean mergeWithAnotherCrueData(CrueData data);
+ /**
+ * @return setter sur les methodes d'interpolation OPTI
+ */
+ public OrdPrtCIniModeleBase getMethodesInterpolation();
+
+ /**
+ * @return getter sur les methodes d'interpolation OPTI
+ */
+ public void setMethodesInterpolation(OrdPrtCIniModeleBase methodesInterpolation);
+
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/CrueDataImpl.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/CrueDataImpl.java 2009-05-29 17:44:31 UTC (rev 4821)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/CrueDataImpl.java 2009-05-29 18:26:31 UTC (rev 4822)
@@ -16,6 +16,7 @@
import org.fudaa.dodico.crue.metier.emh.EvolutionFF;
import org.fudaa.dodico.crue.metier.emh.LoiFF;
import org.fudaa.dodico.crue.metier.emh.OrdCalcScenario;
+import org.fudaa.dodico.crue.metier.emh.OrdPrtCIniModeleBase;
import org.fudaa.dodico.crue.metier.emh.OrdPrtGeoModeleBase;
import org.fudaa.dodico.crue.metier.emh.OrdResScenario;
import org.fudaa.dodico.crue.metier.emh.ParamCalcScenario;
@@ -115,6 +116,11 @@
List<CatEMHSection> sections;
/**
+ * Données OPTI
+ */
+ OrdPrtCIniModeleBase methodesInterpolation;
+
+ /**
* Données STO
*/
STOSequentialReader sto;
@@ -435,4 +441,12 @@
this.rptg = rptg;
}
+ public OrdPrtCIniModeleBase getMethodesInterpolation() {
+ return methodesInterpolation;
+ }
+
+ public void setMethodesInterpolation(OrdPrtCIniModeleBase methodesInterpolation) {
+ this.methodesInterpolation = methodesInterpolation;
+ }
+
}
Modified: 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/EMHModeleBase.java 2009-05-29 17:44:31 UTC (rev 4821)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHModeleBase.java 2009-05-29 18:26:31 UTC (rev 4822)
@@ -16,6 +16,11 @@
protected String id_;
/**
+ * Les donnees crueData du scenario .
+ */
+ CrueData dataSources;
+
+ /**
* La liste des sous modeles associ�s au modele. ETU
*/
protected EMHModeleEnchainement listeSousModeles_;
@@ -69,8 +74,10 @@
* @return
*/
public static EMHModeleBase findById(final String nomRef, final List<EMHModeleBase> listeFiles) {
- if (listeFiles != null) for (final EMHModeleBase f : listeFiles) {
- if (f.id_.equals(nomRef)) return f;
+ if (listeFiles != null) {
+ for (final EMHModeleBase f : listeFiles) {
+ if (f.id_.equals(nomRef)) { return f; }
+ }
}
return null;
}
@@ -82,7 +89,9 @@
* @return
*/
public boolean addFichierDonneesToModele(final FichierCrue fichier) {
- if (listeFichiersModele_ == null) listeFichiersModele_ = new ArrayList<FichierCrue>();
+ if (listeFichiersModele_ == null) {
+ listeFichiersModele_ = new ArrayList<FichierCrue>();
+ }
return listeFichiersModele_.add(fichier);
}
@@ -93,7 +102,9 @@
* @return
*/
public boolean addSousModeleDonneesToModele(final EMHModeleBase sousModele) {
- if (listeSousModeles_ == null) listeSousModeles_ = new EMHModeleEnchainement();
+ if (listeSousModeles_ == null) {
+ listeSousModeles_ = new EMHModeleEnchainement();
+ }
return listeSousModeles_.ajouteModele(sousModele);
}
@@ -105,4 +116,12 @@
this.listeFichiersModele_ = listeFichiersCrue;
}
+ public CrueData getDataSources() {
+ return dataSources;
+ }
+
+ public void setDataSources(CrueData dataSources) {
+ this.dataSources = dataSources;
+ }
+
}
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-29 17:44:31 UTC (rev 4821)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHScenario.java 2009-05-29 18:26:31 UTC (rev 4822)
@@ -17,6 +17,11 @@
EMHModeleEnchainement gestionModele_;
/**
+ * Les donnees crueData du scenario .
+ */
+ CrueData dataSources;
+
+ /**
* la liste des runs associes au sc�nraio.
*/
List<EMHRun> listeRuns_;
@@ -177,4 +182,12 @@
public void setListeRuns(final List<EMHRun> listeRuns) {
this.listeRuns_ = listeRuns;
}
+
+ public CrueData getDataSources() {
+ return dataSources;
+ }
+
+ public void setDataSources(CrueData dataSources) {
+ this.dataSources = dataSources;
+ }
}
Modified: 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/EMHproject.java 2009-05-29 17:44:31 UTC (rev 4821)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHproject.java 2009-05-29 18:26:31 UTC (rev 4822)
@@ -10,7 +10,7 @@
public class EMHproject {
/**
- * Infos du projet, contient la base des fichiers de donn\xE9es.
+ * Infos du projet, contient la base des fichiers de donn�es.
*/
EMHProjectInfos baseRessourcesInfos_;
@@ -20,7 +20,7 @@
EMHScenario scenarioCourant;
/**
- * Base des sc\xE9narios disponible pour tout le projet.
+ * Base des sc�narios disponible pour tout le projet.
*/
List<EMHScenario> baseScenarios_;
@@ -30,7 +30,7 @@
EMHModeleEnchainement baseModeles_;
/**
- * base des sous modeles du projet (ces sous modeles sont r\xE9f\xE9renc\xE9s dans les modeles qui les utilisent).
+ * base des sous modeles du projet (ces sous modeles sont r�f�renc�s dans les modeles qui les utilisent).
*/
EMHModeleEnchainement baseSousModeles_;
@@ -70,6 +70,19 @@
return scenarioCourant;
}
+ /**
+ * Methode tres importante; c'est elle qui retourne les crue data générales du scénario courant. En effet, ces crue
+ * data sont globale au scenario, elles contiennet donc la concaténation des crue data de chaque entité fille:
+ * modeles, sous modeles.
+ *
+ * @author Adrien hadoux
+ * @return
+ */
+ public CrueData getCrueDataFromScenarioCourant() {
+ if (getScenarioCourant() != null) { return getScenarioCourant().getDataSources(); }
+ return null;
+ }
+
public void setScenarioCourant(final EMHScenario scenarioCourant) {
this.scenarioCourant = scenarioCourant;
}
Modified: 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/FichierCrue.java 2009-05-29 17:44:31 UTC (rev 4821)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/FichierCrue.java 2009-05-29 18:26:31 UTC (rev 4822)
@@ -4,8 +4,8 @@
import java.util.List;
/**
- * Gere les fichiers Crue d\xE9finis dans le fichier xml ETU. un fichier est d\xE9fini par: son id unique son type le chemin
- * vers ce fichier. Sert de base de recherche pour lancer \xE0 la demande les diff\xE9rents sc\xE9narios.
+ * Gere les fichiers Crue d�finis dans le fichier xml ETU. un fichier est d�fini par: son id unique son type le chemin
+ * vers ce fichier. Sert de base de recherche pour lancer � la demande les diff�rents sc�narios.
*
* @author Adrien Hadoux
*/
@@ -34,7 +34,7 @@
public File getFichier() {
if (path_ != null) {
final File fichier = new File(path_);
- if (fichier.exists()) return fichier;
+ /* if (fichier.exists()) */return fichier;
}
return null;
}
@@ -47,8 +47,10 @@
* @return
*/
public static FichierCrue findById(final String nomRef, final List<FichierCrue> listeFiles) {
- if (listeFiles != null) for (final FichierCrue f : listeFiles) {
- if (f.id_.equals(nomRef)) return f;
+ if (listeFiles != null) {
+ for (final FichierCrue f : listeFiles) {
+ if (f.id_.equals(nomRef)) { return f; }
+ }
}
return null;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdPrtCIniModeleBase.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdPrtCIniModeleBase.java 2009-05-29 17:44:31 UTC (rev 4821)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdPrtCIniModeleBase.java 2009-05-29 18:26:31 UTC (rev 4822)
@@ -6,10 +6,12 @@
package org.fudaa.dodico.crue.metier.emh;
+import org.fudaa.dodico.crue.io.dao.CrueEnumDico;
+
/** @pdOid a637504e-9e1b-4a87-8327-92ea3b3fa1ea */
public class OrdPrtCIniModeleBase implements InfosEMH {
/** @pdOid 404a2a65-177d-47c5-8a9b-37ce33aae566 */
- public byte methodeInterpol;
+ public CrueEnumDico.InterpolationsOPTI methodeInterpol;
/**
* @pdRoleInfo migr=no name=ValParam assc=association112 coll=java.util.Collection impl=java.util.HashSet mult=0..*
@@ -78,4 +80,12 @@
}
}
+ public CrueEnumDico.InterpolationsOPTI getMethodeInterpol() {
+ return methodeInterpol;
+ }
+
+ public void setMethodeInterpol(CrueEnumDico.InterpolationsOPTI methodeInterpol) {
+ this.methodeInterpol = methodeInterpol;
+ }
+
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParam.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParam.java 2009-05-29 17:44:31 UTC (rev 4821)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParam.java 2009-05-29 18:26:31 UTC (rev 4822)
@@ -11,4 +11,9 @@
/** @pdOid 6f0ce4aa-3299-48c8-b1d1-8f9126593468 */
public String nom;
+ public ValParam(String nom) {
+ super();
+ this.nom = nom;
+ }
+
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamBooleen.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamBooleen.java 2009-05-29 17:44:31 UTC (rev 4821)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamBooleen.java 2009-05-29 18:26:31 UTC (rev 4822)
@@ -11,4 +11,9 @@
/** @pdOid 828ac7ca-131c-4d6f-94bb-f753f015ab7c */
public boolean valeur;
+ public ValParamBooleen(String nom, boolean valeur) {
+ super(nom);
+ this.valeur = valeur;
+ }
+
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamDouble.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamDouble.java 2009-05-29 17:44:31 UTC (rev 4821)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamDouble.java 2009-05-29 18:26:31 UTC (rev 4822)
@@ -11,4 +11,9 @@
/** @pdOid 03367cd0-b53c-4e0a-97d1-abfc61d5d93e */
public Double valeur;
+ public ValParamDouble(String nom, Double valeur) {
+ super(nom);
+ this.valeur = valeur;
+ }
+
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamEntier.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamEntier.java 2009-05-29 17:44:31 UTC (rev 4821...
[truncated message content] |
|
From: <had...@us...> - 2009-05-31 07:23:06
|
Revision: 4827
http://fudaa.svn.sourceforge.net/fudaa/?rev=4827&view=rev
Author: hadouxad
Date: 2009-05-31 07:23:04 +0000 (Sun, 31 May 2009)
Log Message:
-----------
1. visiblement le commite sur la lisgne if (!isValide(url, analyser)) { return null; }
n'a pas fonctionn?\195?\169, je la recommitte.
2. j'avais oubli?\195?\169 d'enlever de la commomImplementation: a chaque fois qu'on clique sur gestion scenario cela creait une nouvelle ihm (pour le debug sans redemarrer l'appli)
le prob c'est que la ils pourront ouvrir plusieurs fois une fenetre gestion scenario(admettons 2 une A et une B) et eventuellement raler si le scenario courant ne se met pas a jour sur l'autre ihm B a partir de modifications port?\195?\169es sur la A.
3. j'ai rajout?\195?\169 ?\195?\169galement le test de validation connexit?\195?\169 cote drso et un analyzer qui porte comme titre validation connexiit?\195?\169.
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueXmlReaderWriterImpl.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/ScenarioLoader.java
Modified: 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/CrueXmlReaderWriterImpl.java 2009-05-29 20:37:50 UTC (rev 4826)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueXmlReaderWriterImpl.java 2009-05-31 07:23:04 UTC (rev 4827)
@@ -242,7 +242,7 @@
analyser.addError("file.url.null.error");
return null;
}
- // TODO a remetter if (!isValide(url, analyser)) { return null; }
+ if (!isValide(url, analyser)) { return null; }
InputStream in = null;
D newData = null;
try {
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-29 20:37:50 UTC (rev 4826)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueCommomImplementation.java 2009-05-31 07:23:04 UTC (rev 4827)
@@ -327,7 +327,7 @@
scenarioFille = new CrueFilleScenarioManager(crueProjet_);
}
// TODO a remplacer par scenarioFille (creer nouveau pour debugagge rapide)
- this.addInternalFrame(new CrueFilleScenarioManager(crueProjet_));
+ this.addInternalFrame(scenarioFille);
}
public CrueFilleEMH emhViewFille = null;
@@ -369,7 +369,7 @@
modeleFille = new CrueFicheModeleFille(crueProjet_);
}
// TODO a remplacer par modeleFille (creer nouveau pour debugagge rapide)
- this.addInternalFrame(new CrueFicheModeleFille(crueProjet_));
+ this.addInternalFrame(modeleFille);
}
public CrueFilleInfosGenerales etudeFille = null;
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-29 20:37:50 UTC (rev 4826)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoader.java 2009-05-31 07:23:04 UTC (rev 4827)
@@ -20,6 +20,7 @@
import org.fudaa.dodico.crue.metier.emh.OrdResScenario;
import org.fudaa.dodico.crue.metier.emh.ParamCalcScenario;
import org.fudaa.dodico.crue.metier.emh.ParamNumModeleBase;
+import org.fudaa.dodico.crue.validation.EMHValidatorModele;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.fudaa.crue.common.CrueCommomImplementation;
import org.fudaa.fudaa.crue.common.FCrueResource;
@@ -237,6 +238,13 @@
return;
}
+ // -- Verifier la connexité du graphe --//
+ CtuluAnalyze analyseValidationCOnnexite = projet.getManagerError().getNewAnalyser();
+ analyseValidationCOnnexite.setDesc("Validation Connexité");
+ final boolean res = EMHValidatorModele.validateConnexite(cruedataSousModele, analyseValidationCOnnexite);
+
+ if (!res) { return; }
+
// -- lecture DFRT avant DPTG--//
final List<DonFrt> jeuDonnees = Crue10FileFormatFactory.getDFRTFileFormat().read(fichierDfrt.getFichier(),
projet.getManagerError().getNewAnalyser(), null);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-06-01 22:32:13
|
Revision: 4828
http://fudaa.svn.sourceforge.net/fudaa/?rev=4828&view=rev
Author: deniger
Date: 2009-06-01 22:32:04 +0000 (Mon, 01 Jun 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/.classpath
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/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/SingleConverterPointFF.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/SingleConverterPtProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBSequentialReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.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/PtProfil.java
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/caroleMessages.properties
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/messages.properties
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/common-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/etu-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/AbstractIOTestCase.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueFCB.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/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/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/crue/projet/ScenarioLoader.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueErrorManager.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractSingleConverterPoint.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBValueObject.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Point2D.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidationFichierScenario.java
trunk/soft/fudaa-crue/planning/Thumbs.db
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/PtEvolutionDF.java
Modified: trunk/soft/fudaa-crue/dodico/.classpath
===================================================================
--- trunk/soft/fudaa-crue/dodico/.classpath 2009-05-31 07:23:04 UTC (rev 4827)
+++ trunk/soft/fudaa-crue/dodico/.classpath 2009-06-01 22:32:04 UTC (rev 4828)
@@ -10,8 +10,8 @@
<classpathentry exported="true" kind="lib" path="lib/trove.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xstream-1.3.jar" sourcepath="lib/xstream-distribution-1.3.1-src.zip"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/commons-lang-2.4.jar" sourcepath="lib/commons-lang-2.4-sources.jar"/>
- <classpathentry kind="lib" path="lib/commons-beanutils-core-1.8.0.jar" sourcepath="lib/commons-beanutils-1.8.0-sources.jar"/>
- <classpathentry kind="lib" path="lib/commons-collections-3.2.1.jar" sourcepath="lib/commons-collections-3.2.1-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.4.jar" sourcepath="lib/commons-lang-2.4-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-core-1.8.0.jar" sourcepath="lib/commons-beanutils-1.8.0-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.jar" sourcepath="lib/commons-collections-3.2.1-sources.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java 2009-05-31 07:23:04 UTC (rev 4827)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java 2009-06-01 22:32:04 UTC (rev 4828)
@@ -106,7 +106,14 @@
* @param i le numero de ligne de l'erreur
*/
public void addErrorFromFile(final String msg, final int i, Object... data) {
- addRecord(Level.SEVERE, msg, i, data);
+ if (data == null) {
+ addRecord(Level.SEVERE, msg, i);
+ } else {
+ Object[] all = new Object[data.length + 1];
+ System.arraycopy(data, 0, all, 1, data.length);
+ all[0] = i;
+ addRecord(Level.SEVERE, msg, all);
+ }
}
/**
@@ -115,7 +122,7 @@
* @param reader le reader occasionnant l'erreur
*/
public void addErrorFromFile(final String msg, final LineNumberReader reader, Object... data) {
- addRecord(Level.SEVERE, msg, reader.getLineNumber(), data);
+ addErrorFromFile(msg, reader.getLineNumber(), data);
}
/**
@@ -358,7 +365,7 @@
* @param msg le message
*/
public void manageException(final Exception _e, final String msg) {
- addRecord(Level.SEVERE, msg).setThrown(_e);
+ addRecord(Level.SEVERE, msg, _e.getMessage()).setThrown(_e);
}
/**
Modified: 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 2009-05-31 07:23:04 UTC (rev 4827)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java 2009-06-01 22:32:04 UTC (rev 4828)
@@ -4,7 +4,9 @@
*/
package org.fudaa.ctulu;
+import java.text.MessageFormat;
import java.util.Collection;
+import java.util.Date;
import java.util.logging.Formatter;
import java.util.logging.LogRecord;
import java.util.logging.SimpleFormatter;
@@ -18,6 +20,17 @@
*/
public final class CtuluDefaultLogFormatter extends SimpleFormatter {
+ Date dat = new Date();
+ private final static String format = "{0,date} {0,time}";
+ private MessageFormat formatter;
+
+ private final Object args[] = new Object[1];
+
+ // Line separator string. This is the value of the line.separator
+ // property at the moment that the SimpleFormatter was created.
+ private final String lineSeparator = (String) java.security.AccessController
+ .doPrivileged(new sun.security.action.GetPropertyAction("line.separator"));
+
/**
* Formateur par defaut pour les logs
*/
@@ -61,6 +74,38 @@
}
@Override
+ public synchronized String format(LogRecord record) {
+ StringBuilder sb = new StringBuilder(256);
+ // Minimize memory allocations here.
+ // dat.setTime(record.getMillis());
+ // args[0] = dat;
+ // if (formatter == null) {
+ // formatter = new MessageFormat(format);
+ // }
+
+ sb.append(record.getLevel().getLocalizedName());
+ sb.append(": ");
+ // StringBuffer text = new StringBuffer();
+ // formatter.format(args, text, null);
+ // sb.append(" ");
+ sb.append(formatMessage(record));
+ // sb.append(": ");
+ // sb.append(text);
+
+ // sb.append(lineSeparator);
+ // if (record.getThrown() != null) {
+ // try {
+ // StringWriter sw = new StringWriter();
+ // PrintWriter pw = new PrintWriter(sw);
+ // record.getThrown().printStackTrace(pw);
+ // pw.close();
+ // sb.append(sw.toString());
+ // } catch (Exception ex) {}
+ // }
+ return sb.toString();
+ }
+
+ @Override
public synchronized String formatMessage(final LogRecord record) {
String format = record.getMessage();
final java.util.ResourceBundle catalog = record.getResourceBundle();
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractSingleConverterPoint.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractSingleConverterPoint.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractSingleConverterPoint.java 2009-06-01 22:32:04 UTC (rev 4828)
@@ -0,0 +1,61 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.io.dao;
+
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.dodico.crue.io.common.AbstractSingleConverter;
+import org.fudaa.dodico.crue.metier.emh.Point2D;
+
+// TODO pour Fred : cette classe est similaire à SingleConverterPtProfil (seuls les objets métier utilisés sont différents). Ne pourrait-on pas mutualiser l'analyse et l'affichage du point FF ?
+/**
+ * @author deniger
+ */
+public abstract class AbstractSingleConverterPoint extends AbstractSingleConverter {
+
+ final Class clazz;
+
+ /**
+ * @param clazz la classe acceptee par ce converter
+ */
+ public AbstractSingleConverterPoint(final Class clazz) {
+ super();
+ this.clazz = clazz;
+ }
+
+ protected abstract Object createFor(double x, double y);
+
+ public boolean canConvert(final Class type) {
+ return clazz.equals(type);
+ }
+
+ public Object fromString(final String str) {
+ if (CtuluLibString.isEmpty(str)) { return null; }
+ final String[] xy = StringUtils.split(str);
+ if (xy == null || xy.length != 2) {
+ if (analyse != null) {
+ analyse.addError("io.convert.PtEvolutionFF.error", str);
+ }
+ return null;
+ }
+ Object res = null;
+ try {
+ res = createFor(Double.parseDouble(xy[0]), Double.parseDouble(xy[1]));
+ } catch (final NumberFormatException e) {
+ if (analyse != null) {
+ analyse.addError("io.convert.PtEvolutionFF.error", str);
+ }
+ return null;
+ }
+ return res;
+ }
+
+ public String toString(final Object obj) {
+ if (obj == null) { return CtuluLibString.EMPTY_STRING; }
+ final Point2D in = (Point2D) obj;
+ return in.getAbscisse() + " " + in.getOrdonnee();
+ }
+
+}
Modified: 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/CrueHelper.java 2009-05-31 07:23:04 UTC (rev 4827)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueHelper.java 2009-06-01 22:32:04 UTC (rev 4828)
@@ -49,37 +49,8 @@
public final static String RPTI = "RPTI"; //$NON-NLS-1$
public final static String RCAL = "RCAL"; //$NON-NLS-1$
- // /**
- // * Construit un ptProfil a partir d'une chaine de caracteres. Utilisé 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(" "); //$NON-NLS-1$
- // 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) {
- // addWarn("io.ptProfil.x.error", nameError, buff, analyser); //$NON-NLS-1$
- // }
- // double y = 0;
- // try {
- // y = Double.parseDouble(val2);
- // } catch (final NumberFormatException e) {
- // addWarn("io.ptProfil.y.error", nameError, buff, analyser); //$NON-NLS-1$
- // }
- //
- // final PtProfil profil = new PtProfil(x, y);
- // return profil;
- // }
+
/**
* Compare l'égalité de 2 pt profils
*
@@ -92,106 +63,7 @@
}
- // public static PtEvolutionFF createPtEvolutionFFfromString(final String buff, final CtuluAnalyze analyser,
- // final String nomEMH) {
- // final int indiceCesure = buff.lastIndexOf(" "); //$NON-NLS-1$
- // 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) {
- // addWarn("io.ptEvolutionFF.x.error", nomEMH, buff, analyser); //$NON-NLS-1$
- // }
- // double y = 0;
- // try {
- // y = Double.parseDouble(val2);
- // } catch (final NumberFormatException e) {
- // addWarn("io.ptEvolutionFF.y.error", nomEMH, buff, analyser); //$NON-NLS-1$
- // }
- //
- // final PtEvolutionFF evolution = new PtEvolutionFF();
- // evolution.setX(x);
- // evolution.setY(y);
- // return evolution;
- // }
- // private static void addWarn(final String msg, final String nom, final Object data, final CtuluAnalyze analyser) {
- // // final Map m = createMapNom(nom);
- // // m.put("{data}", data); //$NON-NLS-1$
- // analyser.addWarn(msg, data);
- // }
-
- // public static PtEvolutionDF createEvolutionDFfromString(final String buff, final CtuluAnalyze analyser,
- // final String nomEMH) {
- //
- // try {
- // final StringTokenizer strToken = new StringTokenizer(buff.toString());
- //
- // String strnbJours = null, strnbHeures = null, strnbMinutes = null, strnbSecondes = null, stry = null;
- //
- // if (strToken.hasMoreTokens()) {
- // strnbJours = strToken.nextToken();
- // }
- // if (strToken.hasMoreTokens()) {
- // strnbHeures = strToken.nextToken();
- // }
- // if (strToken.hasMoreTokens()) {
- // strnbMinutes = strToken.nextToken();
- // }
- // if (strToken.hasMoreTokens()) {
- // strnbSecondes = strToken.nextToken();
- // }
- // if (strToken.hasMoreTokens()) {
- // stry = strToken.nextToken();
- // }
- //
- // int nbJours = -1, nbHeures = -1, nbMinutes = -1, nbSecondes = -1;
- // double y = 0;
- // // TODO a revoir avec le nouveau format date !
- // try {
- // nbJours = Integer.parseInt(strnbJours);
- // } catch (final NumberFormatException ex) {
- // addWarn("io.date.jour.error", nomEMH, buff, analyser); //$NON-NLS-1$
- // }
- // try {
- // nbHeures = Integer.parseInt(strnbHeures);
- // } catch (final NumberFormatException ex) {
- // addWarn("io.date.heure.error", nomEMH, buff, analyser); //$NON-NLS-1$
- // }
- // try {
- // nbMinutes = Integer.parseInt(strnbMinutes);
- // } catch (final NumberFormatException ex) {
- // addWarn("io.date.minute.error", nomEMH, buff, analyser); //$NON-NLS-1$
- // }
- // try {
- // nbSecondes = Integer.parseInt(strnbSecondes);
- // } catch (final NumberFormatException ex) {
- // addWarn("io.date.seconde.error", nomEMH, buff, analyser); //$NON-NLS-1$
- // }
- // try {
- // y = Double.parseDouble(stry);
- // } catch (final NumberFormatException ex) {
- // addWarn("io.evolutionDF.y.error", nomEMH, buff, analyser); //$NON-NLS-1$
- // }
- //
- // final CrueDate duree = new CrueDate(nbJours, nbHeures, nbMinutes, nbSecondes);
- //
- // final PtEvolutionDF evolution = new PtEvolutionDF();
- // evolution.setDate(duree);
- // evolution.setY(y);
- // return evolution;
- // } catch (final Exception e) {
- // return new PtEvolutionDF();
- // }
- //
- // }
-
- // 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ées EMH.
*
@@ -203,20 +75,9 @@
out.addInfo("io.unknownEMH.error", balise, nomEMH);
}
- // private static Map<String, Object> createMapBaliseNom(final String balise, final String nom) {
- // final Map<String, Object> m = createBaliseMap(balise);
- // m.put("{nom}", nom); //$NON-NLS-1$
- // return m;
- // }
- // public static Map<String, Object> createMapNom(final String nom) {
- // return CtuluAnalyze.createMap("{nom}", nom); //$NON-NLS-1$
- // }
-
public static void unknowdataFromFile(final String balise, final String FileType, final String nom,
final CtuluAnalyze out) {
- // final Map m = createMapBaliseNom(balise, nom);
- // m.put("{fileType}", FileType); //$NON-NLS-1$
out.addInfo("io.unknownDataFromFile.error", balise, FileType, nom); //$NON-NLS-1$
}
@@ -248,9 +109,6 @@
}
- // private static Map<String, Object> createBaliseMap(final String balise) {
- // return CtuluAnalyze.createMap("{balise}", balise); //$NON-NLS-1$
- // }
/**
* Message qui indique la balise n'est pas reconnue par les structures de données EMH.
Modified: 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/CrueXmlReaderWriterImpl.java 2009-05-31 07:23:04 UTC (rev 4827)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueXmlReaderWriterImpl.java 2009-06-01 22:32:04 UTC (rev 4828)
@@ -1,16 +1,6 @@
package org.fudaa.dodico.crue.io.dao;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
+import java.io.*;
import java.net.MalformedURLException;
import java.net.URL;
@@ -20,16 +10,16 @@
import javax.xml.validation.SchemaFactory;
import javax.xml.validation.Validator;
+import com.memoire.fu.FuLogCrue;
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.DomDriver;
+
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.dodico.crue.io.common.Messages;
import org.fudaa.dodico.crue.metier.CrueData;
import org.xml.sax.InputSource;
-import com.memoire.fu.FuLogCrue;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
-
/**
* File format customisé pour Crue. Indique si le fichier est de type crue 9 ou 10. Contient un validator xsd pour le
* fichier donné. Contient une méthode statique très pratique qui permet de retourner automatiquement le bon FileFormat
@@ -156,11 +146,13 @@
final URL xsdURL = getClass().getResource(xsdPath);
final SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
final Schema schema = schemaFactory.newSchema(xsdURL);
+
final Validator validator = schema.newValidator();
+ validator.setErrorHandler(handler);
validator.validate(new SAXSource(new InputSource(xml.toString())));
} catch (final Exception e) {
- res.manageException(e);
+ // res.manageException(e);
FuLogCrue.error(e);
return false;
}
@@ -185,7 +177,7 @@
* @return
*/
public D readDao(final File fichier, final CtuluAnalyze analyser, final Object dataLinked) {
- // TODO a remettre if (!isValide(fichier, analyser)) { return null; }
+ if (!isValide(fichier, analyser)) { return null; }
FileInputStream in = null;
D newData = null;
try {
Modified: 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/ErrorHandlerDefault.java 2009-05-31 07:23:04 UTC (rev 4827)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/ErrorHandlerDefault.java 2009-06-01 22:32:04 UTC (rev 4828)
@@ -24,12 +24,12 @@
public void error(final SAXParseException exception) throws SAXException {
hasError = true;
- res.addErrorFromFile(exception.getMessage(), exception.getLineNumber());
+ res.addErrorFromFile("io.xml.validator.error", exception.getLineNumber(), exception.getMessage());
}
public void fatalError(final SAXParseException exception) throws SAXException {
hasError = true;
- res.addErrorFromFile(exception.getMessage(), exception.getLineNumber());
+ res.addErrorFromFile("io.xml.validator.error", exception.getLineNumber(), exception.getMessage());
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/SingleConverterPointFF.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/SingleConverterPointFF.java 2009-05-31 07:23:04 UTC (rev 4827)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/SingleConverterPointFF.java 2009-06-01 22:32:04 UTC (rev 4828)
@@ -4,47 +4,23 @@
*/
package org.fudaa.dodico.crue.io.dao;
-import org.apache.commons.lang.StringUtils;
-import org.fudaa.ctulu.CtuluLibString;
-import org.fudaa.dodico.crue.io.common.AbstractSingleConverter;
import org.fudaa.dodico.crue.metier.emh.PtEvolutionFF;
-// TODO pour Fred : cette classe est similaire à SingleConverterPtProfil (seuls les objets métier utilisés sont différents). Ne pourrait-on pas mutualiser l'analyse et l'affichage du point FF ?
/**
* @author deniger
*/
-public class SingleConverterPointFF extends AbstractSingleConverter {
+public class SingleConverterPointFF extends AbstractSingleConverterPoint {
- public boolean canConvert(final Class type) {
- return PtEvolutionFF.class.equals(type);
+ /**
+ * Constructeur par défaut.
+ */
+ public SingleConverterPointFF() {
+ super(PtEvolutionFF.class);
}
- public Object fromString(final String str) {
- if (CtuluLibString.isEmpty(str)) { return null; }
- final String[] xy = StringUtils.split(str);
- if (xy == null || xy.length != 2) {
- if (analyse != null) {
- analyse.addError("io.convert.PtEvolutionFF.error", str);
- }
- return null;
- }
- final PtEvolutionFF res = new PtEvolutionFF();
- try {
- res.setX(Double.parseDouble(xy[0]));
- res.setY(Double.parseDouble(xy[1]));
- } catch (final NumberFormatException e) {
- if (analyse != null) {
- analyse.addError("io.convert.PtEvolutionFF.error", str);
- }
- return null;
- }
- return res;
+ @Override
+ protected Object createFor(double x, double y) {
+ return new PtEvolutionFF(x, y);
}
- public String toString(final Object obj) {
- if (obj == null) { return CtuluLibString.EMPTY_STRING; }
- final PtEvolutionFF in = (PtEvolutionFF) obj;
- return in.getX() + " " + in.getY();
- }
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/SingleConverterPtProfil.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/SingleConverterPtProfil.java 2009-05-31 07:23:04 UTC (rev 4827)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/SingleConverterPtProfil.java 2009-06-01 22:32:04 UTC (rev 4828)
@@ -4,64 +4,31 @@
*/
package org.fudaa.dodico.crue.io.dao;
-import org.apache.commons.lang.StringUtils;
-import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.dodico.crue.metier.emh.PtProfil;
-import com.thoughtworks.xstream.converters.SingleValueConverter;
-
/**
* @author deniger
*/
-public class SingleConverterPtProfil implements SingleValueConverter {
+public class SingleConverterPtProfil extends AbstractSingleConverterPoint {
- private CtuluAnalyze analyse;
+ /**
+ * Constructeur par defaut
+ */
+ public SingleConverterPtProfil() {
+ super(PtProfil.class);
+ }
+ @Override
public boolean canConvert(final Class type) {
return PtProfil.class.equals(type);
}
- public Object fromString(final String str) {
- if (CtuluLibString.isEmpty(str)) { return null; }
- final String[] xy = StringUtils.split(str);
- if (xy == null || xy.length != 2) {
- if (analyse != null) {
- analyse.addError("io.convert.PtEvolutionFF.error", str);
- }
- return null;
- }
+ @Override
+ protected Object createFor(final double x, final double y) {
final PtProfil res = new PtProfil();
- try {
- res.setYP(Double.parseDouble(xy[0]));
- res.setZ(Double.parseDouble(xy[1]));
- } catch (final NumberFormatException e) {
- if (analyse != null) {
- analyse.addError("io.convert.PtEvolutionFF.error", str);
- }
- return null;
- }
+ res.setYP(x);
+ res.setZ(y);
return res;
}
- /**
- * @return the analyse
- */
- public CtuluAnalyze getAnalyse() {
- return analyse;
- }
-
- /**
- * @param analyse the analyse to set
- */
- public void setAnalyse(final CtuluAnalyze analyse) {
- this.analyse = analyse;
- }
-
- public String toString(final Object obj) {
- if (obj == null) { return CtuluLibString.EMPTY_STRING; }
- final PtProfil in = (PtProfil) obj;
- return in.getYP() + " " + in.getZ();
- }
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java 2009-05-31 07:23:04 UTC (rev 4827)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java 2009-06-01 22:32:04 UTC (rev 4828)
@@ -1,5 +1,6 @@
package org.fudaa.dodico.crue.io.neuf;
+import gnu.trove.TDoubleArrayList;
import gnu.trove.TLongArrayList;
import java.io.IOException;
@@ -7,10 +8,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.fudaa.dodico.crue.io.neuf.FCBSequentialReader.StructBranche;
-import org.fudaa.dodico.crue.io.neuf.FCBSequentialReader.StructNoeud;
-import org.fudaa.dodico.crue.io.neuf.FCBSequentialReader.StructProfil;
-
/**
* Reader pour FCB.
*
@@ -46,6 +43,7 @@
analyze_.addFatalError("crue.io.fcb.notValid");
return null;
}
+ infos.setOrder(helper.getOrder());
// -- on lit les 10 premieres lignes de titre DC et DH dans le Buffer--//
final int nbCommentDc = 5;
@@ -60,8 +58,8 @@
commnentDc.add(helper.getStingFromBuffer(nbCaractereParLigne));
}
- infos.setCommentDc(commnentDc);
- infos.setCommentDh(commnentDh);
+ infos.commentDc = commnentDc;
+ infos.commentDh = commnentDh;
// on recupere la ligne write(ifi2) iprm,sngl(past),icodav,ibmax,nomdc,nomdh
helper.readData();
@@ -70,21 +68,21 @@
// iprm i4 : nombre de profils du modèle
// on lit la
// bf = helper.getBuffer();
- infos.nbProfils = bf.getInt();
+ final int nbProfils = bf.getInt();
// past r8 : pas de temps d'impression des résultats, en secondes.
- final double r8 = bf.getFloat();
+ /* final double r8 = */bf.getFloat();
// icodav i4 : présence (1) ou non (0) d'une régulation
// icodav==0 ou 2 pas de regulation
// icodav==1 ou 3 regulation
// icodav=2 ou 4 zfond_ssfente present
final int icodav = bf.getInt();
- infos.setSousFente(icodav >= 2);
- infos.setRegulationPresente(icodav == 1 || icodav == 3);
- infos.nbBranches = bf.getInt();
- final String nomDc = helper.getStingFromBuffer(60);
- final String nomDh = helper.getStingFromBuffer(60);
+ infos.sousFente = (icodav >= 2);
+ infos.regulation = (icodav == 1 || icodav == 3);
+ final int nbBranches = bf.getInt();
+ /* final String nomDc = */helper.getStingFromBuffer(60);
+ /* final String nomDh = */helper.getStingFromBuffer(60);
// -- on passe a la ligne contenant ibmax et iparam --//
// helper.skipRecord();
@@ -92,11 +90,11 @@
// on arrive a la ligne des profils --//
// write(ifi2) (tit(ipro),sngl(dist(ipro)),zfond(nuprfl(ipro)), ipro,ipro=1,iprm)
// on recupere l'indice du début des profils.
- readProfils(infos);
+ readProfils(infos, nbProfils);
// -- on passe la boucle de nbbranches lignes--//
- readBranches(infos);
+ readBranches(infos, nbBranches);
// -- ensuite on lit les points si ou ils sont affiches--//
readNodes(infos);
@@ -104,11 +102,12 @@
// TODO gere si oui ou non la ligne de write(9) npar,(nompar(i),tx(i),i=1,npar)
// es t ecrite, cf spec pour entete
if (infos.isRegulation()) {
- readRegulationParam(infos);
+ helper.readSequentialData();
+ // readRegulationParam(infos); pas pris en compte dans le lot0
}
// -- on arrive au CORPS, on repere les indice de chaque PDT --//
- // readPdt(infos);
+ readPdt(infos);
// --on passee les lignes de Crue--//
@@ -122,107 +121,76 @@
* @param infos
* @throws IOException
*/
+ // (ifi2) nbpoin,(nompoi(ip),nupro(ip),ip=1,nbpoin)
private void readNodes(final FCBSequentialReader infos) throws IOException {
- // (ifi2) nbpoin,(nompoi(ip),nupro(ip),ip=1,nbpoin)
// nbpoin i4 : nombre de noeuds
helper.readData();
final ByteBuffer bf = helper.getBuffer();
final int nbNd = bf.getInt();
- infos.nbNoeuds = nbNd;
- final List<StructNoeud> nds = new ArrayList<StructNoeud>(nbNd);
+ final List<FCBValueObject.EnteteNoeud> nds = new Array...
[truncated message content] |
|
From: <car...@us...> - 2009-06-02 17:50:32
|
Revision: 4831
http://fudaa.svn.sourceforge.net/fudaa/?rev=4831&view=rev
Author: caroledel
Date: 2009-06-02 17:50:17 +0000 (Tue, 02 Jun 2009)
Log Message:
-----------
STR : tests
IHM : remplacement messages par codes dans fichier properties
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/Messages.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STOReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRFactory.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/messages.properties
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueSTO.java
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/builder/CrueModeleBuilder.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/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/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/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/CrueErrorManager.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheModeleFille.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/CrueFilleEMH.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/crue/view/CrueFilleInfosGenerales.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleScenarioManager.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/MainTest.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/ihmMessages.properties
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/Messages.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/Messages.java 2009-06-02 16:16:39 UTC (rev 4830)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/Messages.java 2009-06-02 17:50:17 UTC (rev 4831)
@@ -4,7 +4,13 @@
*/
package org.fudaa.dodico.crue.io.common;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.ResourceBundle;
/**
* @author deniger
@@ -16,12 +22,15 @@
// en les créant de la sorte, ALL_RESOURCE_BUNDLE et le parent de DC_RESOURCE qui est le parent de RESOURCE_BUNDLE
private static final ResourceBundle ALL_RESOURCE_BUNDLE = ResourceBundle
.getBundle("org.fudaa.dodico.crue.io.messages");
- public static final ResourceBundle DC_RESOURCE_BUNDLE = ResourceBundle
+ private static final ResourceBundle DC_RESOURCE_BUNDLE = ResourceBundle
.getBundle("org.fudaa.dodico.crue.io.adrienMessages");
- public static final ResourceBundle DH_RESOURCE_BUNDLE = ResourceBundle
+ private static final ResourceBundle DH_RESOURCE_BUNDLE = ResourceBundle
.getBundle("org.fudaa.dodico.crue.io.caroleMessages");
+ private static final ResourceBundle IHM_RESOURCE_BUNDLE = ResourceBundle
+ .getBundle("org.fudaa.dodico.crue.io.ihmMessages");
+ /** ResourceBundle regroupant tous les ResourceBundle définis par des fichiers properties distincts */
public static final ResourceBundle RESOURCE_BUNDLE = new TempResourceBundle(ALL_RESOURCE_BUNDLE, DC_RESOURCE_BUNDLE,
- DH_RESOURCE_BUNDLE);
+ DH_RESOURCE_BUNDLE, IHM_RESOURCE_BUNDLE);
protected static class TempResourceBundle extends ResourceBundle {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STOReader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STOReader.java 2009-06-02 16:16:39 UTC (rev 4830)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STOReader.java 2009-06-02 17:50:17 UTC (rev 4831)
@@ -8,7 +8,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.fudaa.dodico.crue.io.TestCrueSTO;
import org.fudaa.dodico.crue.io.neuf.STOSequentialReader.DonneesBranche;
import org.fudaa.dodico.crue.io.neuf.STOSequentialReader.DonneesGenProfil;
import org.fudaa.dodico.crue.io.neuf.STOSequentialReader.DonneesGeneralesModele;
@@ -19,10 +18,7 @@
import org.fudaa.dodico.crue.metier.emh.ParamNumModeleBase;
/**
- * Fred: code repris pour reprendre le NativeNIOHelper. voir {@link TestCrueSTO} pour les tests. POur l'instant, on lit
- * tout d'un bloc. Par la suite, il sera question d'interroger sequentiellement les données. Dans le code, tous les
- * blocs sont lus correctement jusqu'au branche: les readData sont posées ou il faut. Il reste a completer pour les
- * noeud et les profils et stocker les resultats et à compléter le modèle metier avec les données.
+ * Classe permettant de lire le fichier STO en totalité.
*
* @author CDE
*/
@@ -91,38 +87,38 @@
final ByteBuffer readData = helper.getBuffer();
donnesGen.setNpr(readData.getInt());
- System.out.print("nPr = " + donnesGen.getNpr() + " | ");
+ // System.out.print("nPr = " + donnesGen.getNpr() + " | ");
donnesGen.setNbr(readData.getInt());
- System.out.print("nBr = " + donnesGen.getNbr() + " | ");
+ // System.out.print("nBr = " + donnesGen.getNbr() + " | ");
donnesGen.setNtpr(readData.getInt());
- System.out.print("ntpr = " + donnesGen.getNtpr() + " | ");
+ // System.out.print("ntpr = " + donnesGen.getNtpr() + " | ");
donnesGen.setNbpro(readData.getInt());
- System.out.print("NbPro = " + donnesGen.getNbpro() + " | ");
+ // System.out.print("NbPro = " + donnesGen.getNbpro() + " | ");
nbHaut = readData.getInt();
donnesGen.setNbhaut(nbHaut);
- System.out.print("NbHaut = " + donnesGen.getNbhaut() + " | ");
+ // System.out.print("NbHaut = " + donnesGen.getNbhaut() + " | ");
donnesGen.setNbpmax(readData.getInt());
- System.out.print("Nbpmax = " + donnesGen.getNbpmax() + " | ");
+ // System.out.print("Nbpmax = " + donnesGen.getNbpmax() + " | ");
donnesGen.setNbbram(readData.getInt());
- System.out.print("Nbbram = " + donnesGen.getNbbram() + " | ");
+ // System.out.print("Nbbram = " + donnesGen.getNbbram() + " | ");
donnesGen.setNtsing(readData.getInt());
- System.out.print("Ntsing = " + donnesGen.getNtsing() + " | ");
+ // System.out.print("Ntsing = " + donnesGen.getNtsing() + " | ");
donnesGen.setNbstr(readData.getInt());
- System.out.print("Nbstr = " + donnesGen.getNbstr() + " | ");
+ // System.out.print("Nbstr = " + donnesGen.getNbstr() + " | ");
donnesGen.setNblitmax(readData.getInt());
- System.out.print("Nblitmax = " + donnesGen.getNblitmax() + " | ");
+ // System.out.print("Nblitmax = " + donnesGen.getNblitmax() + " | ");
donnesGen.setNpo(readData.getInt());
- System.out.println("Npo = " + donnesGen.getNpo() + " | ");
+ // System.out.println("Npo = " + donnesGen.getNpo() + " | ");
data.setParametresGeneraux(donnesGen);
}
@@ -141,31 +137,31 @@
iBmax = readData.getInt();
dims.setIBmax(iBmax);
- System.out.print("iBmax = " + iBmax + " | ");
+ // System.out.print("iBmax = " + iBmax + " | ");
nbPoin = readData.getInt();
dims.setNbPoin(nbPoin);
- System.out.print("NbPoin = " + nbPoin + " | ");
+ // System.out.print("NbPoin = " + nbPoin + " | ");
iPrM = readData.getInt();
dims.setIPrM(iPrM);
- System.out.print("iPrM = " + iPrM + " | ");
+ // System.out.print("iPrM = " + iPrM + " | ");
dims.setIPrFlM(readData.getInt());
- System.out.print("iPrFlM = " + dims.getIPrFlM() + " | ");
+ // System.out.print("iPrFlM = " + dims.getIPrFlM() + " | ");
dims.setNSing(readData.getInt());
- System.out.print("nSing = " + dims.getNSing() + " | ");
+ // System.out.print("nSing = " + dims.getNSing() + " | ");
dims.setLarBan(readData.getInt());
- System.out.print("LarBan = " + dims.getLarBan() + " | ");
+ // System.out.print("LarBan = " + dims.getLarBan() + " | ");
dims.setLReclProf(readData.getInt());
- System.out.print("Lrecl_Prof = " + dims.getLReclProf() + " | ");
+ // System.out.print("Lrecl_Prof = " + dims.getLReclProf() + " | ");
nbRecProf = readData.getInt();
dims.setNbRecProf(nbRecProf);
- System.out.print("NbRec_Prof = " + nbRecProf + " | ");
+ // System.out.print("NbRec_Prof = " + nbRecProf + " | ");
data.setDimensionsModele(dims);
}
@@ -183,16 +179,16 @@
final ByteBuffer buffer = helper.readData();
donnees.setDal(buffer.getDouble());
- System.out.print("Dal = " + donnees.getDal() + " | ");
+ // System.out.print("Dal = " + donnees.getDal() + " | ");
donnees.setG(buffer.getDouble());
- System.out.print("g = " + donnees.getG() + " | ");
+ // System.out.print("g = " + donnees.getG() + " | ");
donnees.setTheta(buffer.getDouble());
- System.out.print("Theta = " + donnees.getTheta() + " | ");
+ // System.out.print("Theta = " + donnees.getTheta() + " | ");
donnees.setZRef(buffer.getFloat());
- System.out.print("Zref = " + donnees.getZRef() + " | ");
+ // System.out.print("Zref = " + donnees.getZRef() + " | ");
String titreDc = "";
for (int i = 0; i < 5; i++) {
@@ -200,10 +196,10 @@
titreDc += temp;
}
donnees.setTitreDc(titreDc);
- System.out.print("TitreDc = " + donnees.getTitreDc() + " | ");
+ // System.out.print("TitreDc = " + donnees.getTitreDc() + " | ");
donnees.setNomDc(helper.getStingFromBuffer(60));
- System.out.println("NomDc = " + donnees.getNomDc() + " | ");
+ // System.out.println("NomDc = " + donnees.getNomDc() + " | ");
data.setDonneesGenerales(donnees);
}
@@ -225,10 +221,10 @@
DonneesSpecProf donneesSpecProf = new DonneesSpecProf();
donneesSpecProf.setNomProfil(helper.getStingFromBuffer(16));
- System.out.print("nomProfil = " + donneesSpecProf.getNomProfil() + " | ");
+ // System.out.print("nomProfil = " + donneesSpecProf.getNomProfil() + " | ");
donneesSpecProf.setNomCasier(helper.getStingFromBuffer(16));
- System.out.println("nomCasier = " + donneesSpecProf.getNomCasier() + " | ");
+ // System.out.println("nomCasier = " + donneesSpecProf.getNomCasier() + " | ");
listeDonneesSpecProf.add(donneesSpecProf);
}
@@ -258,36 +254,36 @@
// Apparemment, erreur dans dictionnaire de données car doit être codé sur 16 caractères (au lieu de 8)
// donneesBranche.setNomBr(helper.getStingFromBuffer(8));
donneesBranche.setNomBr(helper.getStingFromBuffer(16));
- System.out.print("nomBr = " + donneesBranche.getNomBr() + " | ");
+ // System.out.print("nomBr = " + donneesBranche.getNomBr() + " | ");
donneesBranche.setNTyp(readData.getInt());
- System.out.print("nTyp = " + donneesBranche.getNTyp() + " | ");
+ // System.out.print("nTyp = " + donneesBranche.getNTyp() + " | ");
final int imax = readData.getInt();
donneesBranche.setIMax(imax);
- System.out.print("iMax = " + donneesBranche.getIMax() + " | ");
+ // System.out.print("iMax = " + donneesBranche.getIMax() + " | ");
donneesBranche.setNuPam(readData.getInt());
- System.out.print("nuPam = " + donneesBranche.getNuPam() + " | ");
+ // System.out.print("nuPam = " + donneesBranche.getNuPam() + " | ");
donneesBranche.setNuPav(readData.getInt());
- System.out.print("nuPav = " + donneesBranche.getNuPav() + " | ");
+ // System.out.print("nuPav = " + donneesBranche.getNuPav() + " | ");
donneesBranche.setRuiBra(readData.getFloat());
- System.out.print("ruiBra = " + donneesBranche.getRuiBra() + " | ");
+ // System.out.print("ruiBra = " + donneesBranche.getRuiBra() + " | ");
final int nbSing = readData.getInt();
donneesBranche.setNbSing(nbSing);
- System.out.print("nbSing = " + donneesBranche.getNbSing() + " | ");
+ // System.out.print("nbSing = " + donneesBranche.getNbSing() + " | ");
donneesBranche.setNSing(readData.getInt());
- System.out.print("nSing = " + donneesBranche.getNSing() + " | ");
+ // System.out.print("nSing = " + donneesBranche.getNSing() + " | ");
final int n = readData.getInt();
donneesBranche.setN(n);
- System.out.print("n = " + donneesBranche.getN() + " | ");
+ // System.out.print("n = " + donneesBranche.getN() + " | ");
donneesBranche.setSinuo(readData.getFloat());
- System.out.print("sinuo = " + donneesBranche.getSinuo() + " | ");
+ // System.out.print("sinuo = " + donneesBranche.getSinuo() + " | ");
donneesBranche.setAlpha(readData.getFloat());
- System.out.println("alpha = " + donneesBranche.getAlpha() + " | ");
+ // System.out.println("alpha = " + donneesBranche.getAlpha() + " | ");
// write(isto) (n0pr(i,ib),i=1,imax(ib))
readData = helper.readData();
@@ -295,9 +291,9 @@
// n0pr(NPR,NBR) i2 : n° absolu du profil dont le n° est ip dans la branche ib
// pas sur que l'on en ait besoin
donneesBranche.setN0Pr(readData.getShort());
- System.out.print("n0Pr = " + donneesBranche.getN0Pr() + " | ");
+ // System.out.print("n0Pr = " + donneesBranche.getN0Pr() + " | ");
}
- System.out.println("");
+ // System.out.println("");
// if(n.gt.0) then
// write(isto) (sing(i),i=nsing(ib)+1,nsing(ib+1))
@@ -306,10 +302,10 @@
float[] sings = new float[nbSing];
for (int j = 0; j < nbSing; j++) {
sings[j] = readData.getFloat();
- System.out.print("sing = " + sings[j] + " | ");
+ // System.out.print("sing = " + sings[j] + " | ");
}
donneesBranche.setSing(sings);
- System.out.println("");
+ // System.out.println("");
}
@@ -338,25 +334,25 @@
// Apparemment, erreur dans dictionnaire de données car doit être codé sur 16 caractères (au lieu de 8)
// donneesNoeud.setNomPoi(helper.getStingFromBuffer(8));
donneesNoeud.setNomPoi(helper.getStingFromBuffer(16));
- System.out.print("nomPoi = " + donneesNoeud.getNomPoi() + " | ");
+ // System.out.print("nomPoi = " + donneesNoeud.getNomPoi() + " | ");
final int nuCas = readData.getInt();
donneesNoeud.setNuCas(nuCas);
- System.out.print("nuCas = " + nuCas + " | ");
+ // System.out.print("nuCas = " + nuCas + " | ");
final int nbBran = readData.getInt();
donneesNoeud.setNbBran(nbBran);
- System.out.println("nbBran = " + nbBran + " | ");
+ // System.out.println("nbBran = " + nbBran + " | ");
// write(isto) (nubran(i,ipoin),i=1,nbbran(ipoin))
readData = helper.readData();
int[] numerosBranches = new int[nbBran];
for (int j = 0; j < nbBran; j++) {
numerosBranches[j] = readData.getInt();
- System.out.print("nuBran = " + numerosBranches[j] + " | ");
+ // System.out.print("nuBran = " + numerosBranches[j] + " | ");
}
donneesNoeud.setNumerosBranches(numerosBranches);
- System.out.println("");
+ // System.out.println("");
// Enregistrement si le noeud est un casier
// if(nucas(ipoin).ne.0) then
@@ -364,19 +360,19 @@
if (nuCas != 0) {
readData = helper.readData();
donneesNoeud.setZfonca(readData.getFloat());
- System.out.print("zfonca = " + donneesNoeud.getZfonca() + " | ");
+ // System.out.print("zfonca = " + donneesNoeud.getZfonca() + " | ");
donneesNoeud.setRuicas(readData.getFloat());
- System.out.print("ruicas = " + donneesNoeud.getRuicas() + " | ");
+ // System.out.print("ruicas = " + donneesNoeud.getRuicas() + " | ");
final int jmax = (11 + 2 * nbHaut);
float[] sings = new float[jmax];
for (int j = 0; j < jmax; j++) {
sings[j] = readData.getFloat();
- System.out.print("sing = " + sings[j] + " | ");
+ // System.out.print("sing = " + sings[j] + " | ");
}
donneesNoeud.setSings(sings);
- System.out.println("");
+ // System.out.println("");
}
@@ -405,17 +401,17 @@
// Apparemment, erreur dans dictionnaire de données car doit être codé sur 16 caractères (au lieu de 8)
// donneesProfil.setTit(helper.getStingFromBuffer(8));
donneesProfil.setTit(helper.getStingFromBuffer(16));
- System.out.print("tit = " + donneesProfil.getTit() + " | ");
+ // System.out.print("tit = " + donneesProfil.getTit() + " | ");
donneesProfil.setNuPrFl(readData.getInt());
- System.out.print("nuPrFl = " + donneesProfil.getNuPrFl() + " | ");
+ // System.out.print("nuPrFl = " + donneesProfil.getNuPrFl() + " | ");
donneesProfil.setDist(readData.getFloat());
- System.out.print("dist = " + donneesProfil.getDist() + " | ");
+ // System.out.print("dist = " + donneesProfil.getDist() + " | ");
donneesProfil.setCDiv(readData.getFloat());
- System.out.print("cDiv = " + donneesProfil.getCDiv() + " | ");
+ // System.out.print("cDiv = " + donneesProfil.getCDiv() + " | ");
donneesProfil.setCConv(readData.getFloat());
- System.out.print("cConv = " + donneesProfil.getCConv() + " | ");
+ // System.out.print("cConv = " + donneesProfil.getCConv() + " | ");
donneesProfil.setCPond(readData.getFloat());
- System.out.println("cPond = " + donneesProfil.getCPond() + " | ");
+ // System.out.println("cPond = " + donneesProfil.getCPond() + " | ");
donnees.add(donneesProfil);
}
@@ -427,7 +423,7 @@
* @param crueData
* @param data
*/
- private void alimenteObjetsMetier(final CrueData crueData, final STOSequentialReader data) {
+ public static void alimenteObjetsMetier(final CrueData crueData, final STOSequentialReader data) {
// pour chaque branche ( récupérée avec le nom) il faudra
// recuperer l'EMH et lui associe les valeurs qui vont bien
@@ -443,13 +439,6 @@
if (donneesGenModele != null) {
pnum.zref = donneesGenModele.getZRef();
- // ParamNumCalcPseudoPerm pseudoPerm = pnum.paramNumCalcPseudoPerm;
- // if (pseudoPerm == null) {
- // pseudoPerm = new ParamNumCalcPseudoPerm();
- // pnum.paramNumCalcPseudoPerm = pseudoPerm;
- // }
- // TODO cf si des donnees à completer ici
-
ParamNumCalcTrans calcTrans = pnum.paramNumCalcTrans;
if (calcTrans == null) {
calcTrans = new ParamNumCalcTrans();
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRFactory.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRFactory.java 2009-06-02 16:16:39 UTC (rev 4830)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRFactory.java 2009-06-02 17:50:17 UTC (rev 4831)
@@ -206,10 +206,10 @@
}
// Calcul des abscisses de lit
- final int nbLitMax = donneesSection.getNbLitMax();
- float[] abscissesDeLit = new float[nbLitMax];
+ final int nbLits = donneesSection.getNbLit();
+ float[] abscissesDeLit = new float[nbLits];
- for (int i = 0; i < nbLitMax; i++) {
+ for (int i = 0; i < nbLits; i++) {
// TODO CDE : voir quelle valeur mettre ici
abscissesDeLit[i] = 0;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java 2009-06-02 16:16:39 UTC (rev 4830)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java 2009-06-02 17:50:17 UTC (rev 4831)
@@ -271,21 +271,17 @@
donneesSection.setDonneesLimites(limites);
}
- if (nTypBra != -1) {
- DonneesSectionPourBranche donneesBranche = null;
- if (nTypBra == 0 || nTypBra == 9) {
- donneesBranche = getBranche0Ou9(bf);
- } else {
- donneesBranche = getAutreBranche(bf, nbLit);
- }
- donneesSection.setDonneesPourBranche(donneesBranche);
- // On enregistre la valeur du nombre de pas de hauteur par section car cela permettra de calculer la liste des
- // points z sur cette hauteur pour l'affection des loisFF
- donneesSection.setNbHaut(nbHaut);
- // On enregistre la valeur du nombre maximal de lits par section car cela permettra de calculer la liste des
- // points pour l'affection des loisFF
- donneesSection.setNbLitMax(nbLitMax);
+ DonneesSectionPourBranche donneesBranche = null;
+ if (nTypBra == 0 || nTypBra == 9) {
+ donneesBranche = getBranche0Ou9(bf);
+ } else {
+ donneesBranche = getAutreBranche(bf, nbLit);
}
+ donneesSection.setDonneesPourBranche(donneesBranche);
+ // On enregistre la valeur du nombre de pas de hauteur par section car cela permettra de calculer la liste des
+ // points z sur cette hauteur pour l'affection des loisFF
+ donneesSection.setNbHaut(nbHaut);
+
// System.out.println();
return donneesSection;
@@ -776,9 +772,8 @@
private DonneesLimites donneesLimites;
private DonneesSectionPourBranche donneesPourBranche;
- /** Données servant lors de l'alimentation métier des lois FF */
+ /** Donnée servant lors de l'alimentation métier des lois FF */
private int nbHaut;
- private int nbLitMax;
/**
* @return the cDigueD
@@ -1199,20 +1194,6 @@
public void setNbHaut(final int nbHaut) {
this.nbHaut = nbHaut;
}
-
- /**
- * @return the nbLitMax
- */
- public int getNbLitMax() {
- return nbLitMax;
- }
-
- /**
- * @param nbLitMax the nbLitMax to set
- */
- public void setNbLitMax(final int nbLitMax) {
- this.nbLitMax = nbLitMax;
- }
}
/**
Added: trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/ihmMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/ihmMessages.properties (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/ihmMessages.properties 2009-06-02 17:50:17 UTC (rev 4831)
@@ -0,0 +1,117 @@
+ihm.error.comparaison.scenario1 = Erreur, il faut au moins 2 sc\u00E9narios disponibles dans l'\u00E9tude.
+ihm.error.comparaison.scenario2 = Erreur, aucun sc\u00E9nario 1 s\u00E9lectionn\u00E9
+ihm.error.comparaison.scenario3 = Erreur, aucun sc\u00E9nario 2 s\u00E9lectionn\u00E9
+ihm.error.comparaison.scenario4 = Erreur, il faut s\u00E9lectionner 2 sc\u00E9narios diff\u00E9rents.
+ihm.error.modele.empty = Il n'existe pas de mod\u00E8les pour le fichier etude charg\u00E9
+ihm.error.sousmodele.empty = Pas de sous mod\u00E8les d\u00E9finis pour ce mod\u00E8le
+ihm.titre.chargement.projet = Chargement projet
+ihm.modeles.dispos = Modeles disponibles
+ihm.ss.modeles.dispos = Sous Modeles disponibles
+ihm.scenarios.dispos = Sc\xE9narios disponibles
+ihm.scenario.courant = Sc\xE9nario courant
+ihm.par = par
+ihm.enregistrement = Enregistrement
+ihm.confirmation = Confirmation
+ihm.confirm.fermeture.etude = Une \xE9tude est d\xE9ja charg\xE9e. Cette op\xE9ration la fermera automatiquement.\n Voulez-vous continuer?
+ihm.question.fermeture.etude = Voulez-vous fermer l'\xE9tude courante ?
+ihm.emh = EMH
+ihm.gerer.emhs = G\xE9rer EMHs
+ihm.ouvrir.etude = Ouvrir
+ihm.gerer.etude = G\xE9rer \xE9tude
+ihm.fermer.etude = Fermer \xE9tude
+ihm.gerer.scenarios = G\xE9rer sc\xE9narios
+ihm.enregistrer.scenario = Enregistrer sc\xE9nario
+ihm.operations = Op\xE9rations
+ihm.comparaison.scenarios = Comparaison
+ihm.chgt.format.crue9.crue10 = Crue 9 <=> Crue 10
+ihm.gerer.modeles = G\xE9rer mod\xE8les
+ihm.crue = Crue
+ihm.editeur = Editeur
+ihm.executer = Ex\xE9cuter...
+ihm.ouvrir.avec = Ouvrir avec...
+ihm.texte = texte
+ihm.fermer.applis = Fermer toutes les applications
+ihm.soumettre.commentaire = Soumettre un commentaire
+ihm.applis = Applications
+ihm.chargement = Chargement
+ihm.scenario.courant = Le sc\xE9nario courant
+ihm.confirm.chargt.scenario = va \xEAtre charg\xE9. Voulez-vous continuer ?
+ihm.chargt.fichiers.scenario = Chargement des fichiers du scenario
+ihm.dcFailed.error = La lecture du fichier DC a \xE9chou\xE9e: {0}
+ihm.drsoFailed.error = La lecture du fichier DRSO a \xE9chou\xE9e: {0}
+ihm.fileNotExist.error = Il n'existe pas de fichier \xE0 l'emplacement suivant: {0}
+ihm.noCurrentModele.error = Pas de mod\xE8le pour le sc\xE9nario.
+ihm.noCurrentRun.error = Pas de run courant pour le sc\xE9nario.
+ihm.noCurrentSousModele.error = Pas de sous-mod\xE8le pour le sc\xE9nario.
+ihm.notAnyModelesFiles.error = Il manque un fichier dans un mod\xE8le. Il faut une liste fixe de fichiers de niveau mod\xE8le : (OPTR), OPTG, OPTI, PNUM, DPTI.
+ihm.notAnySousModelesFiles.error = Il manque un fichier dans un sous-mod\xE8le. Il faut une liste fixe de fichiers de niveau sous-mod\xE8le : DRSO, DPTG, DFRT, DCSP.
+ihm.res.chargt.scenario = R\xE9sultats du Chargement sc\xE9nario
+ihm.fichiers.scenario = Fichiers existants dans le sc\xE9nario
+ihm.confirm.chargt.scenario1 = Etes-vous sur de vouloir charger ce sc\xE9nario
+ihm.confirm.chargt.scenario2 = ? Il deviendra le sc\xE9nario courant.
+ihm.charger.scenario = Charger Sc\xE9nario
+ihm.drso.genere = Fichier DRSO g\xE9n\xE9r\xE9 dans
+ihm.dfrt.genere = Fichier DFRT g\xE9n\xE9r\xE9 dans
+ihm.dcsp.genere = Fichier DCSP g\xE9n\xE9r\xE9 dans
+ihm.dptg.genere = Fichier DPTG g\xE9n\xE9r\xE9 dans
+ihm.optg.genere = Fichier OPTG g\xE9n\xE9r\xE9 dans
+ihm.pnum.genere = Fichier PNUM g\xE9n\xE9r\xE9 dans
+ihm.dpti.genere = Fichier DPTI g\xE9n\xE9r\xE9 dans
+ihm.ocal.genere = Fichier OCAL g\xE9n\xE9r\xE9 dans
+ihm.ores.genere = Fichier ORES g\xE9n\xE9r\xE9 dans
+ihm.pcal.genere = Fichier PCAL g\xE9n\xE9r\xE9 dans
+ihm.dlhy.genere = Fichier DLHY g\xE9n\xE9r\xE9 dans
+ihm.dclm.genere = Fichier DCLM g\xE9n\xE9r\xE9 dans
+ihm.dc.genere = Fichier DC g\xE9n\xE9r\xE9 dans
+ihm.dh.genere = Fichier DH g\xE9n\xE9r\xE9 dans
+ihm.analyse = Analyse
+ihm.gestion.modeles = Gestion des mod\xE8les
+ihm.ss.modeles.associes = Sous mod\xE8les associ\xE9s
+ihm.fiche.scenario = Fiche Sc\xE9nario
+ihm.label.id.scenario = Id Scenario:
+ihm.label.type = Type:
+ihm.label.scenario.courant = Sc\xE9nario courant:
+ihm.label.commentaire = Commentaire:
+ihm.label.modifie = Modifi\xE9:
+ihm.titre.fichiers.scenario = Fichiers Sc\xE9narios
+ihm.modeles = Mod\xE8les
+ihm.comparaison.scenarios2 = Comparaison de sc\xE9narios
+ihm.choix.scenario1 = Choisir Sc\xE9nario 1
+ihm.choix.scenario2 = Choisir Sc\xE9nario 2
+ihm.res.comparaison = R\xE9sultat comparaison
+ihm.bouton.valider = Valider
+ihm.affichage.emhs = Affichage des EMHs
+ihm.emhs.scenario = EMHs contenues dans le sc\xE9nario courant
+ihm.frame.chgt.format.crue9.crue10 = G\xE9n\xE9ration Crue 9 <=> Crue 10
+ihm.onglet.crue10 = g\xE9n\xE9rer Crue 10
+ihm.onglet.crue9 = g\xE9n\xE9rer Crue 9
+ihm.res.generation.crue10 = G\xE9n\xE9ration Crue 10
+ihm.res.generation.crue9 = G\xE9n\xE9ration Crue 9
+ihm.label.scen.crue9.fich.crue10 = Veuillez choisir le sc\xE9nario Crue 9 et indiquer les fichiers Crue 10 \xE0 g\xE9n\xE9rer
+ihm.label.scen.crue10.fich.crue9 = Veuillez choisir le sc\xE9nario Crue 10 et indiquer les fichiers Crue 9 \xE0 g\xE9n\xE9rer
+ihm.nom.fichier.crue10 = Choisir un nom de fichier Crue 10. Tous les fichiers g\xE9n\xE9r\xE9s porteront ce nom avec les suffixes correspondants.
+ihm.nom.fichier.crue9 = Choisir un nom de fichier Crue 9. Tous les fichiers g\xE9n\xE9r\xE9s porteront ce nom avec les suffixes correspondants.
+ihm.bouton.parcourir = Parcourir...
+ihm.emplacement.fichier = Emplacement du fichier
+ihm.transformation.crue9.crue10 = Transformation Crue 9 <=> Crue 10
+ihm.infos.etude = Infos Etude
+ihm.label.etude = Etude:
+ihm.label.creation = Creation:
+ihm.label.auteur = Auteur:
+ihm.bouton.parcourir2 = ...
+ihm.instruc.visualiser.scenario = Pour visualiser le sc\xE9nario, cliquer dessus ou sur le bouton ci-contre
+ihm.gestion.scenarios = Gestion des Sc\xE9narios
+ihm.choix.ligne.scenatio = Veuillez choisir une ligne correspondant \xE0 un sc\xE9nario
+ihm.choix.scenario = Veuillez selectionner un sc\xE9nario.
+ihm.validation.connexite = Validation Connexit\xE9
+
+
+
+
+
+
+
+
+
+
+
Modified: trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/messages.properties
==========...
[truncated message content] |
|
From: <de...@us...> - 2009-06-03 06:45:52
|
Revision: 4832
http://fudaa.svn.sourceforge.net/fudaa/?rev=4832&view=rev
Author: deniger
Date: 2009-06-03 06:45:44 +0000 (Wed, 03 Jun 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/config/eclipse-crue-catalog.xml
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/metier/EMHInfosVersion.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHScenario.java
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/scenario-1.0.0.xsd
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/TestCrueValidationModele.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoader.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueFileOpWriterCharSimpleAbstract.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ScenarioWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/TempValidationFichierScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateConnectionModele.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateModeleScenario.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/TestValidateModeleScenario.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.scenario.xml
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/EMHValidatorModele.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidationFichierScenario.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.run.xml.tmp
Modified: trunk/soft/fudaa-crue/dodico/src/main/config/eclipse-crue-catalog.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/config/eclipse-crue-catalog.xml 2009-06-02 17:50:17 UTC (rev 4831)
+++ trunk/soft/fudaa-crue/dodico/src/main/config/eclipse-crue-catalog.xml 2009-06-03 06:45:44 UTC (rev 4832)
@@ -48,6 +48,9 @@
<uri name="http://www.fudaa.fr/xsd/crue/pnum-1.0.0.xsd"
uri="platform:/resource/dodico-crue/src/main/resources/xsd/pnum-1.0.0.xsd" />
+
+ <uri name="http://www.fudaa.fr/xsd/crue/scenario-1.0.0.xsd"
+ uri="platform:/resource/dodico-crue/src/main/resources/xsd/scenario-1.0.0.xsd" />
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueFileOpWriterCharSimpleAbstract.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueFileOpWriterCharSimpleAbstract.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueFileOpWriterCharSimpleAbstract.java 2009-06-03 06:45:44 UTC (rev 4832)
@@ -0,0 +1,27 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.io.common;
+
+import java.io.File;
+
+import org.fudaa.dodico.fortran.FileOpWriterCharSimpleAbstract;
+
+/**
+ * Classe permettant de setter correctement le ResourceBundle.
+ *
+ * @author deniger
+ */
+public abstract class CrueFileOpWriterCharSimpleAbstract extends FileOpWriterCharSimpleAbstract {
+
+ /**
+ * appelle la methode parent et set le RESOURCE_BUNDLE correctement
+ */
+ @Override
+ public void setFile(final File _f) {
+ super.setFile(_f);
+ analyze_.setDefaultResourceBundle(Messages.RESOURCE_BUNDLE);
+ }
+
+}
Modified: 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/AbstractCrue9Writer.java 2009-06-02 17:50:17 UTC (rev 4831)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/AbstractCrue9Writer.java 2009-06-03 06:45:44 UTC (rev 4832)
@@ -7,6 +7,7 @@
import java.util.Date;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.Messages;
import org.fudaa.dodico.crue.metier.CrueData;
import org.fudaa.dodico.fortran.FileOpWriterCharSimpleAbstract;
import org.fudaa.dodico.fortran.FortranWriter;
@@ -86,18 +87,13 @@
public void setFile(final File _f) {
analyze_ = new CtuluAnalyze();
analyze_.setResource(_f.getAbsolutePath());
- FileWriter out = null;
+ analyze_.setDefaultResourceBundle(Messages.RESOURCE_BUNDLE);
try {
- out = new FileWriter(_f);
- // Message de Adrien: Fred, j'ai besoin de cet objet fortanWriter
- // car l'objet par defaut est moisi pour les formattages et ecritures par colonnes.
- fortranWriter_ = new FortranWriter(new FileWriter(_f));
+ out_ = new FileWriter(_f);
} catch (final IOException _e) {
analyze_.manageException(_e);
}
- if (out != null) {
- out_ = out;
- }
+ fortranWriter_ = new FortranWriter(out_);
}
}
Modified: 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/EMHInfosVersion.java 2009-06-02 17:50:17 UTC (rev 4831)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHInfosVersion.java 2009-06-03 06:45:44 UTC (rev 4832)
@@ -1,7 +1,7 @@
package org.fudaa.dodico.crue.metier;
/**
- * Informations sur la verszion du modele, fichier,scenqrio, sous modele, run,.... Crue
+ * Informations sur la version du modele, fichier,scenario, sous modele, run,.... Crue
*
* @author Adrien Hadoux
*/
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-06-02 17:50:17 UTC (rev 4831)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHScenario.java 2009-06-03 06:45:44 UTC (rev 4832)
@@ -10,39 +10,37 @@
*/
public class EMHScenario {
- String id_;
+ private final String id_;
/**
* la classe qui gere la liste des modeles du scenario.
*/
- EMHModeleEnchainement gestionModele_;
+ private EMHModeleEnchainement gestionModele_;
/**
* Les donnees crueData du scenario .
*/
- CrueData dataSources;
+ private CrueData dataSources;
/**
* la liste des runs associes au sc�nraio.
*/
- List<EMHRun> listeRuns_;
+ private List<EMHRun> listeRuns_;
/**
* Run courant.
*/
- EMHRun runCourant_;
+ private EMHRun runCourant_;
/**
* Infos sur la version.
*/
- protected EMHInfosVersion infosVersions_;
+ private EMHInfosVersion infosVersions_;
/**
* Liste des fichiers rattach�s au scenario . Ces fichiers proviennent de la classe EMHProjetInfos qui contient la
* base des fichiers du projet. Ces fichiers sont uniquement des fichiers r�sultat ?
- *
- * @param id
*/
- protected List<FichierCrue> listeFichiersScenario_;
+ private List<FichierCrue> listeFichiersScenario_;
public List<FichierCrue> getListeFichiersScenario() {
return listeFichiersScenario_;
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/EMHValidatorModele.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/EMHValidatorModele.java 2009-06-02 17:50:17 UTC (rev 4831)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/EMHValidatorModele.java 2009-06-03 06:45:44 UTC (rev 4832)
@@ -1,267 +0,0 @@
-package org.fudaa.dodico.crue.validation;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.dodico.crue.metier.CrueData;
-import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
-import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
-
-//TODO pourquoi faire des mehodes statique tout le temps !
-//la validation porte sur un CrueData et renvoie un CtuluAnalyse.
-/**
- * Algorithmes de validations du modele.
- *
- * @author Adrien Hadoux
- */
-public class EMHValidatorModele {
-
- /**
- * Methode qui teste la connexité du modele et retourne true ou false,
- *
- * @param data
- * @param analyzer analyzer
- * @return
- */
- public static boolean validateConnexite(final CrueData data, final CtuluAnalyze analyzer) {
- boolean validate = false;
-
- // -- premeire verification: tous les noeuds sont affectées --//
- validate = IsNoeudsTousAffectes(data, analyzer);
-
- if (validate) {
-
- // -- on verifie que toutes les branches ont un noeud --//.
- validate = IsBranchesConnexes(data, analyzer);
- }
-
- return validate;
- }
-
- /**
- * Verifie que toutes les branches soient affectees.
- *
- * @param data
- * @param analyzer
- * @return true si le graphe est connexe.
- */
- public static boolean IsBranchesConnexes(final CrueData data, final CtuluAnalyze analyzer) {
-
- final List<CatEMHNoeud> lstNoeudsATester = new ArrayList<CatEMHNoeud>(1);
-
- final List<CatEMHBranche> lstBranchesRestantes = remplirBranchesRestantesActives(data.getBranches());
-
- // 1) Choisir un nœud de départ connecté à au moins une branche active. Il est stocké dans lstNoeudsATester.
- final CatEMHNoeud findNoeudDep = findNoeudDepart(data);
-
- if (findNoeudDep == null) { return false; }
- lstNoeudsATester.add(findNoeudDep);
-
- // 2) Tant qu’il existe au moins un élément dans lstNoeudsATester :
- while (lstNoeudsATester.size() > 0) {
- // 2.1) Dépiler un élément de lstNoeudsATester (le supprimer de la liste) et le stocker dans NoeudCourant.
- final CatEMHNoeud noeudCourant = lstNoeudsATester.remove(0);
-
- // 2.2) Tant qu’il existe une branche connectée à NoeudCourant et qui figure dans lstBranchesRestantes :
- final List<CatEMHBranche> lstBranchesContenantNoeud = findAllBranchesConnectedToNode(lstBranchesRestantes,
- noeudCourant);
-
- while (lstBranchesContenantNoeud.size() > 0) {
- // 2.2.1) Récupérer une telle branche et la stocker dans BrancheCourante.
- final CatEMHBranche brancheCourante = lstBranchesContenantNoeud.remove(0);
-
- // 2.2.2) Récupérer le nœud situé à l’autre extrémité de BrancheCourante (par rapport à NoeudCourant) et le
- // stocker
- // dans lstNoeudsATester (s’il n’y figure pas déjà).
- CatEMHNoeud nouveauNoeud = brancheCourante.getNoeudAmont();
- if (nouveauNoeud != noeudCourant) {
- lstNoeudsATester.add(nouveauNoeud);
- } else {
- nouveauNoeud = brancheCourante.getNoeudAval();
- lstNoeudsATester.add(nouveauNoeud);
- }
-
- // 2.2.3) Supprimer BrancheCourante de lstBranchesRestantes.
- lstBranchesRestantes.remove(brancheCourante);
-
- }
-
- }
-
- if (lstBranchesRestantes.size() > 0) {
- analyzer.addError("error.validationModele.branchesNonAffectes",
- createMapBranchesNonAffectes(lstBranchesRestantes));
- return false;
- }
-
- return true;
- }
-
- /**
- * Cree la liste de branches Active a partir de la liste de branches totales.
- *
- * @param lstBranchesTotales
- * @return
- */
- public static List<CatEMHBranche> remplirBranchesRestantesActives(final List<CatEMHBranche> lstBranchesTotales) {
- final List<CatEMHBranche> listeBranches = new ArrayList<CatEMHBranche>();
-
- for (final CatEMHBranche branche : lstBranchesTotales) {
- if (branche.isActive()) {
- listeBranches.add(branche);
- }
- }
- return listeBranches;
-
- }
-
- /**
- * Retrouve toutes les branches connectees au noeud.
- *
- * @param lstBranchesRestantes
- * @param noeud
- * @return
- */
- public static List<CatEMHBranche> findAllBranchesConnectedToNode(final List<CatEMHBranche> lstBranchesRestantes,
- final CatEMHNoeud noeud) {
- final List<CatEMHBranche> listeConnected = new ArrayList<CatEMHBranche>();
-
- for (final CatEMHBranche branche : lstBranchesRestantes) {
- if (branche.isActive()) {
- final CatEMHNoeud noeudAmont = branche.getNoeudAmont();
- if (noeudAmont == noeud) {
-
- listeConnected.add(branche);
-
- } else {
- final CatEMHNoeud noeudAval = branche.getNoeudAval();
- if (noeudAval == noeud) {
-
- listeConnected.add(branche);
-
- }
- }
- }
- }
-
- return listeConnected;
- }
-
- /**
- * Methode qui recherche dans la liste des branches le premier noeud d'une branche active.
- *
- * @param data
- * @return
- */
- public static CatEMHNoeud findNoeudDepart(final CrueData data) {
-
- for (int i = 0; i < data.getBranches().size(); i++) {
- if (data.getBranches().get(i).isActive()) {
-
- CatEMHNoeud findNoeudDep = data.getBranches().get(i).getNoeudAmont();
- if (findNoeudDep != null) { return findNoeudDep; }
- findNoeudDep = data.getBranches().get(i).getNoeudAval();
- if (findNoeudDep != null) { return findNoeudDep; }
-
- }
-
- }
- return null;
- }
-
- /**
- * Verifie que tous les noeuds soient affectés a au moins une branche.
- *
- * @param data
- * @param analyzer
- * @return
- */
- public static boolean IsNoeudsTousAffectes(final CrueData data, final CtuluAnalyze analyzer) {
-
- final List<CatEMHNoeud> listeNoeudsNonAffectes = new ArrayList<CatEMHNoeud>(data.getNoeuds().size());
-
- // pourri collections...
- // Collections.copy(listeNoeudsNonAffectes, data.getNoeuds());
-
- for (final CatEMHNoeud node : data.getNoeuds()) {
- listeNoeudsNonAffectes.add(node);
- }
-
- for (final CatEMHBranche branche : data.getBranches()) {
- if (branche.isActive()) {
- final CatEMHNoeud noeudAmont = branche.getNoeudAmont();
- if (noeudAmont != null) {
-
- listeNoeudsNonAffectes.remove(noeudAmont);
-
- } else {
- final HashMap<String, Object> map = new HashMap<String, Object>();
- map.put("branche", branche.getNom());
- analyzer.addError("error.validationModele.noeudAmontManquant", map);
- return false;
- }
- final CatEMHNoeud noeudAval = branche.getNoeudAval();
- if (noeudAval != null) {
-
- listeNoeudsNonAffectes.remove(noeudAval);
-
- } else {
- final HashMap<String, Object> map = new HashMap<String, Object>();
- map.put("branche", branche.getNom());
- analyzer.addError("error.validationModele.noeudAvalManquant", map);
- return false;
- }
- }
- }
- if (listeNoeudsNonAffectes.size() != 0) {
- analyzer.addError("error.validationModele.noeudNonAffectes", createMapNoeudsNonAffectes(listeNoeudsNonAffectes));
- }
-
- return listeNoeudsNonAffectes.size() == 0;
- }
-
- /**
- * Creer la map avec la liste des noeuds non affectes.
- *
- * @param listeNoeudsNonAffectes
- * @return
- */
- public static Map<String, Object> createMapNoeudsNonAffectes(final List<CatEMHNoeud> listeNoeudsNonAffectes) {
- final String key = "noeuds";
-
- String liste = "";
-
- for (final CatEMHNoeud noeud : listeNoeudsNonAffectes) {
- liste += " " + noeud.getNom();
- }
-
- final HashMap<String, Object> map = new HashMap<String, Object>();
- map.put(key, liste);
- return map;
-
- }
-
- /**
- * Creer la map avec la liste des branches non affectes.
- *
- * @param listeBranchesNonAffectes
- * @return
- */
- public static Map<String, Object> createMapBranchesNonAffectes(final List<CatEMHBranche> listeBranchesNonAffectes) {
- final String key = "branches";
-
- String liste = "";
-
- for (final CatEMHBranche branche : listeBranchesNonAffectes) {
- liste += " " + branche.getNom();
- }
-
- final HashMap<String, Object> map = new HashMap<String, Object>();
- map.put(key, liste);
- return map;
-
- }
-}
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ScenarioWriter.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ScenarioWriter.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ScenarioWriter.java 2009-06-03 06:45:44 UTC (rev 4832)
@@ -0,0 +1,48 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.validation;
+
+import java.io.IOException;
+
+import com.memoire.fu.FuLogCrue;
+
+import org.fudaa.dodico.crue.io.common.CrueFileOpWriterCharSimpleAbstract;
+import org.fudaa.dodico.crue.metier.EMHScenario;
+
+/**
+ * @author deniger
+ */
+public class ScenarioWriter extends CrueFileOpWriterCharSimpleAbstract {
+
+ protected static class InputFormatWriter {
+ protected String version;
+ protected EMHScenario scenario;
+ }
+
+ @Override
+ protected void internalWrite(Object _o) {
+ if (_o instanceof InputFormatWriter) {
+ try {
+ writeInput((InputFormatWriter) _o);
+ } catch (IOException e) {
+ FuLogCrue.error(e);
+ analyze_.manageException(e);
+ }
+
+ }
+
+ }
+
+ private void writeInput(InputFormatWriter in) throws IOException {
+ // TODO a continuer
+ // il faut parcourir tous les fichiers du scenario
+ // puis le modele
+ // puis le sousmodele
+ // pour écrire l'entete il faut bien prendre en compte la version le 1.0.0 dans le fichier d'exemple
+ super.out_.append("<?xml....");
+
+ }
+
+}
Copied: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/TempValidationFichierScenario.java (from rev 4828, trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidationFichierScenario.java)
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/TempValidationFichierScenario.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/TempValidationFichierScenario.java 2009-06-03 06:45:44 UTC (rev 4832)
@@ -0,0 +1,133 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.validation;
+
+import java.net.URL;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+
+import com.memoire.fu.FuLog;
+
+import org.fudaa.dodico.crue.io.AbstractIOTestCase;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * Cette classe est un exemple à modifier: il faudra simplement reprendre la logique de validation.
+ *
+ * @author deniger
+ */
+@SuppressWarnings("PMD.SystemPrintln")
+public class TempValidationFichierScenario {
+
+ static final String JAXP_SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
+ public 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";
+
+ public static void main(String[] args) {
+ // final ErrorHandlerDefault handler = new ErrorHandlerDefault(res);
+ try {
+
+ final URL xsdURL = AbstractIOTestCase.class.getResource("/xsd/all-etude-1.0.xsd");
+ // final URL xsddfrtURL = AbstractIOTestCase.class.getResource("/xsd/dfrt-1.0.xsd");
+ final URL xml = AbstractIOTestCase.class.getResource("/fichierTest/Modele3.drso.xml");
+ final SchemaFactory schemaFactory = SchemaFactory.newInstance(W3C_XML_SCHEMA);
+ // schemaFactory.setResourceResolver(resourceResolver)
+ final Schema schema = schemaFactory.newSchema(xsdURL);
+ // //
+ //
+ // // parser.setSchema(schema);
+ DefaultHandler handler = new DefaultHandler() {
+
+ @Override
+ public void processingInstruction(String target, String data) throws SAXException {
+ // FIXME Auto-generated method stub
+ super.processingInstruction(target, data);
+ }
+
+ // @Override
+ // public void setDocumentLocator(Locator locator) {
+ // // FIXME Auto-generated method stub
+ // super.setDocumentLocator(locator);
+ // }
+
+ @Override
+ public void startPrefixMapping(String prefix, String uri) throws SAXException {
+ // FIXME Auto-generated method stub
+ super.startPrefixMapping(prefix, uri);
+ }
+
+ @Override
+ public void error(SAXParseException e) throws SAXException {
+ String msg = e.getMessage();
+ if (msg.contains("no grammar found") || msg.contains("must match DOCTYPE root")) { return; }
+ System.err.println("erreur dans le fichier " + e.getSystemId() + " a la ligne " + e.getLineNumber() + " = "
+ + e.getLocalizedMessage() + "/" + e.getMessage());
+ // e.printStackTrace();
+ }
+
+ @Override
+ public void fatalError(SAXParseException e) throws SAXException {
+ error(e);
+ }
+
+ @Override
+ public void warning(SAXParseException e) throws SAXException {
+ // e.printStackTrace();
+ }
+ };
+ // final Validator validator = schema.newValidator();
+ // // validator.s
+ // // SAXSource source = new SAXSource(new InputSource(xml.toString()));
+ // // validator.validate(source);
+ SAXParserFactory parser = SAXParserFactory.newInstance();
+ // parser.setSchema(schema);
+ parser.setNamespaceAware(true);
+ parser.setXIncludeAware(true);
+ parser.setValidating(true);
+ SAXParser newSAXParser = parser.newSAXParser();
+ newSAXParser.setProperty(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
+ newSAXParser.setProperty(JAXP_SCHEMA_SOURCE, new InputSource(xsdURL.toString()));
+ newSAXParser.parse(new InputSource(xml.toString()), handler);
+ // parser.newSAXParser().p
+ // DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+ // documentBuilderFactory.setNamespaceAware(true);
+ // documentBuilderFactory.setXIncludeAware(true);
+ // documentBuilderFactory.setValidating(true);
+ // documentBuilderFactory.setSchema(schema);
+ // DocumentBuilder parser = documentBuilderFactory.newDocumentBuilder();
+ // parser.setErrorHandler(handler);
+ // Document document = parser.parse(xml.toURI().toString());
+ // //
+ // // // create a SchemaFactory capable of understanding WXS schemas
+ // // SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+ // //
+ // // // load a WXS schema, represented by a Schema instance
+ // // Source schemaFile = new StreamSource(new File("mySchema.xsd"));
+ // // Schema schema = factory.newSchema(schemaFile);
+ // //
+ // // create a Validator instance, which can be used to validate an instance document
+ // Validator validator = schema.newValidator();
+ // validator.setErrorHandler(handler);
+ //
+ // // // validate the DOM tree
+ // // try {
+ // // SAXSource source = new SAXSource(new InputSource(xml.toString()));
+ // validator.validate(new DOMSource(document));
+ // validator.validate(source);
+
+ } catch (final Exception e) {
+ // e.printStackTrace();
+ FuLog.error(e);
+ }
+
+ }
+
+}
Copied: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateConnectionModele.java (from rev 4817, trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/EMHValidatorModele.java)
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateConnectionModele.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateConnectionModele.java 2009-06-03 06:45:44 UTC (rev 4832)
@@ -0,0 +1,267 @@
+package org.fudaa.dodico.crue.validation;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.metier.CrueData;
+import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
+import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
+
+//TODO pourquoi faire des mehodes statique tout le temps !
+//la validation porte sur un CrueData et renvoie un CtuluAnalyse.
+/**
+ * Algorithmes de validations du modele.
+ *
+ * @author Adrien Hadoux
+ */
+public class ValidateConnectionModele {
+
+ /**
+ * Methode qui teste la connexité du modele et retourne true ou false,
+ *
+ * @param data
+ * @param analyzer analyzer
+ * @return
+ */
+ public static boolean validateConnexite(final CrueData data, final CtuluAnalyze analyzer) {
+ boolean validate = false;
+
+ // -- premeire verification: tous les noeuds sont affectées --//
+ validate = IsNoeudsTousAffectes(data, analyzer);
+
+ if (validate) {
+
+ // -- on verifie que toutes les branches ont un noeud --//.
+ validate = IsBranchesConnexes(data, analyzer);
+ }
+
+ return validate;
+ }
+
+ /**
+ * Verifie que toutes les branches soient affectees.
+ *
+ * @param data
+ * @param analyzer
+ * @return true si le graphe est connexe.
+ */
+ public static boolean IsBranchesConnexes(final CrueData data, final CtuluAnalyze analyzer) {
+
+ final List<CatEMHNoeud> lstNoeudsATester = new ArrayList<CatEMHNoeud>(1);
+
+ final List<CatEMHBranche> lstBranchesRestantes = remplirBranchesRestantesActives(data.getBranches());
+
+ // 1) Choisir un nœud de départ connecté à au moins une branche active. Il est stocké dans lstNoeudsATester.
+ final CatEMHNoeud findNoeudDep = findNoeudDepart(data);
+
+ if (findNoeudDep == null) { return false; }
+ lstNoeudsATester.add(findNoeudDep);
+
+ // 2) Tant qu’il existe au moins un élément dans lstNoeudsATester :
+ while (lstNoeudsATester.size() > 0) {
+ // 2.1) Dépiler un élément de lstNoeudsATester (le supprimer de la liste) et le stocker dans NoeudCourant.
+ final CatEMHNoeud noeudCourant = lstNoeudsATester.remove(0);
+
+ // 2.2) Tant qu’il existe une branche connectée à NoeudCourant et qui figure dans lstBranchesRestantes :
+ final List<CatEMHBranche> lstBranchesContenantNoeud = findAllBranchesConnectedToNode(lstBranchesRestantes,
+ noeudCourant);
+
+ while (lstBranchesContenantNoeud.size() > 0) {
+ // 2.2.1) Récupérer une telle branche et la stocker dans BrancheCourante.
+ final CatEMHBranche brancheCourante = lstBranchesContenantNoeud.remove(0);
+
+ // 2.2.2) Récupérer le nœud situé à l’autre extrémité de BrancheCourante (par rapport à NoeudCourant) et le
+ // stocker
+ // dans lstNoeudsATester (s’il n’y figure pas déjà).
+ CatEMHNoeud nouveauNoeud = brancheCourante.getNoeudAmont();
+ if (nouveauNoeud != noeudCourant) {
+ lstNoeudsATester.add(nouveauNoeud);
+ } else {
+ nouveauNoeud = brancheCourante.getNoeudAval();
+ lstNoeudsATester.add(nouveauNoeud);
+ }
+
+ // 2.2.3) Supprimer BrancheCourante de lstBranchesRestantes.
+ lstBranchesRestantes.remove(brancheCourante);
+
+ }
+
+ }
+
+ if (lstBranchesRestantes.size() > 0) {
+ analyzer.addError("error.validationModele.branchesNonAffectes",
+ createMapBranchesNonAffectes(lstBranchesRestantes));
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Cree la liste de branches Active a partir de la liste de branches totales.
+ *
+ * @param lstBranchesTotales
+ * @return
+ */
+ public static List<CatEMHBranche> remplirBranchesRestantesActives(final List<CatEMHBranche> lstBranchesTotales) {
+ final List<CatEMHBranche> listeBranches = new ArrayList<CatEMHBranche>();
+
+ for (final CatEMHBranche branche : lstBranchesTotales) {
+ if (branche.isActive()) {
+ listeBranches.add(branche);
+ }
+ }
+ return listeBranches;
+
+ }
+
+ /**
+ * Retrouve toutes les branches connectees au noeud.
+ *
+ * @param lstBranchesRestantes
+ * @param noeud
+ * @return
+ */
+ public static List<CatEMHBranche> findAllBranchesConnectedToNode(final List<CatEMHBranche> lstBranchesRestantes,
+ final CatEMHNoeud noeud) {
+ final List<CatEMHBranche> listeConnected = new ArrayList<CatEMHBranche>();
+
+ for (final CatEMHBranche branche : lstBranchesRestantes) {
+ if (branche.isActive()) {
+ final CatEMHNoeud noeudAmont = branche.getNoeudAmont();
+ if (noeudAmont == noeud) {
+
+ listeConnected.add(branche);
+
+ } else {
+ final CatEMHNoeud noeudAval = branche.getNoeudAval();
+ if (noeudAval == noeud) {
+
+ listeConnected.add(branche);
+
+ }
+ }
+ }
+ }
+
+ return listeConnected;
+ }
+
+ /**
+ * Methode qui recherche dans la liste des branches le premier noeud d'une branche active.
+ *
+ * @param data
+ * @return
+ */
+ public static CatEMHNoeud findNoeudDepart(final CrueData data) {
+
+ for (int i = 0; i < data.getBranches().size(); i++) {
+ if (data.getBranches().get(i).isActive()) {
+
+ CatEMHNoeud findNoeudDep = data.getBranches().get(i).getNoeudAmont();
+ if (findNoeudDep != null) { return findNoeudDep; }
+ findNoeudDep = data.getBranches().get(i).getNoeudAval();
+ if (findNoeudDep != nu...
[truncated message content] |
|
From: <car...@us...> - 2009-06-03 17:49:05
|
Revision: 4838
http://fudaa.svn.sourceforge.net/fudaa/?rev=4838&view=rev
Author: caroledel
Date: 2009-06-03 17:48:49 +0000 (Wed, 03 Jun 2009)
Log Message:
-----------
messages : insertion de valeurs dynamiques
Validation scenario : generation du fichier scenario.xml
+ d?\195?\169but ecriture des fichiers xml utilis?\195?\169s par ce sc?\195?\169nario
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ScenarioWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateModeleScenario.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/ihmMessages.properties
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/TestValidateModeleScenario.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/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/CrueFilleEMH.java
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ScenarioWriter.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ScenarioWriter.java 2009-06-03 15:28:51 UTC (rev 4837)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ScenarioWriter.java 2009-06-03 17:48:49 UTC (rev 4838)
@@ -5,17 +5,59 @@
package org.fudaa.dodico.crue.validation;
import java.io.IOException;
+import java.util.List;
-import com.memoire.fu.FuLogCrue;
-
+import org.apache.commons.collections.CollectionUtils;
import org.fudaa.dodico.crue.io.common.CrueFileOpWriterCharSimpleAbstract;
+import org.fudaa.dodico.crue.metier.EMHModeleBase;
+import org.fudaa.dodico.crue.metier.EMHModeleEnchainement;
import org.fudaa.dodico.crue.metier.EMHScenario;
+import org.fudaa.dodico.crue.metier.FichierCrue;
+import com.memoire.fu.FuLogCrue;
+
/**
* @author deniger
*/
public class ScenarioWriter extends CrueFileOpWriterCharSimpleAbstract {
+ /** Entête de tout fichier XML */
+ public static final String ENTETE_XML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
+ /** Propriété XMLNS */
+ public static final String XMLNS = "http://www.fudaa.fr/xsd/crue";
+ /** Propriété XMLNS:XSI */
+ public static final String XMLNS_XSI = "http://www.w3.org/2001/XMLSchema-instance";
+ /** Propriété XMLNS:XI */
+ public static final String XMLNS_XI = "http://www.w3.org/2001/XInclude";
+ /** Propriété XSI:SCHEMALOCATION auquel il faut concaténer le nom du fichier XSD */
+ public static final String XSI_SCHEMALOCATION_SANS_NOM_XSD = XMLNS + " " + XMLNS;
+
+ /**
+ * Forme la chaîne qui contient toutes les informations pour la validation d'un fichier XML (xmlns, xmlns:xsi,
+ * xmlns:xi, xsi:schemaLocation) et pour accepter les inclusions de fichiers
+ *
+ * @param nomXSD
+ * @return la chaîne formée des attributs cités
+ */
+ public static String getChaineXMLAvecXmlnsXI(final String nomXSD) {
+
+ return "xmlns=\"" + XMLNS + "\" xmlns:xsi=\"" + XMLNS_XSI + "\" xmlns:xi=\"" + XMLNS_XI
+ + "\" xsi:schemaLocation=\"" + XSI_SCHEMALOCATION_SANS_NOM_XSD + "/" + nomXSD + ".xsd";
+ }
+
+ /**
+ * Forme la chaîne qui contient toutes les informations pour la validation d'un fichier XML (xmlns, xmlns:xsi,
+ * xsi:schemaLocation)
+ *
+ * @param nomXSD
+ * @return la chaîne formée des attributs cités
+ */
+ public static String getChaineXML(final String nomXSD) {
+
+ return "xmlns=\"" + XMLNS + "\" xmlns:xsi=\"" + XMLNS_XSI + "\" xsi:schemaLocation=\""
+ + XSI_SCHEMALOCATION_SANS_NOM_XSD + "/" + nomXSD + ".xsd";
+ }
+
protected static class InputFormatWriter {
protected String version;
protected EMHScenario scenario;
@@ -35,14 +77,91 @@
}
+ /**
+ * Ecriture du fichier XML de validation d'un scénario (qui contient l'ensemble des fichiers XML impactés dans le
+ * scénario qu'ils soient de niveau scénario, modèle et sous-modèle)
+ *
+ * @param in Objet qui contient le scénario à valider et la version de la XSD globale de validation
+ * @throws IOException
+ */
private void writeInput(InputFormatWriter in) throws IOException {
- // TODO a continuer
- // il faut parcourir tous les fichiers du scenario
- // puis le modele
- // puis le sousmodele
- // pour écrire l'entete il faut bien prendre en compte la version le 1.0.0 dans le fichier d'exemple
- super.out_.append("<?xml....");
+ if (in == null || in.scenario == null || in.version == null) { return; }
+
+ // Ecriture de l'entête
+ this.writelnToOut(ENTETE_XML);
+ this.writelnToOut("<ValidationScenario " + getChaineXMLAvecXmlnsXI("scenario-" + in.version) + "\">");
+
+ // Ecriture des fichiers du scénario
+ List<FichierCrue> listeFichiersScenario = in.scenario.getListeFichiersScenario();
+ if (listeFichiersScenario != null) {
+
+ this.writelnToOut("<ScenarioFichiers>");
+ for (int i = 0, imax = listeFichiersScenario.size(); i < imax; i++) {
+ writeIncludeFichier(listeFichiersScenario.get(i).getId());
+ }
+ this.writelnToOut("</ScenarioFichiers>");
+ }
+
+ // Ecriture des ValidationModele
+ EMHModeleEnchainement modeleEnch = in.scenario.getGestionModele();
+ List<EMHModeleBase> modeles = modeleEnch.getListeModeles();
+
+ if (CollectionUtils.isNotEmpty(modeles)) {
+ for (int i = 0, imax = modeles.size(); i < imax; i++) {
+
+ final EMHModeleBase modeleBase = modeles.get(i);
+
+ this.writelnToOut("<ValidationModele>");
+
+ // Ecriture des fichiers du modèle
+ writeIncludeListeFichiers(modeleBase.getListeFichiersCrue(), "ModeleFichiers");
+
+ // Ecriture des fichiers des sous-modèles
+ final EMHModeleEnchainement ssModeleEnch = modeleBase.getListeSousModeles();
+ final List<EMHModeleBase> ssModeles = ssModeleEnch.getListeModeles();
+ if (CollectionUtils.isEmpty(ssModeles)) {
+ continue;
+ }
+
+ for (int j = 0, jmax = ssModeles.size(); j < jmax; j++) {
+ writeIncludeListeFichiers(ssModeles.get(j).getListeFichiersCrue(), "SousModeleFichiers");
+ }
+
+ this.writelnToOut("</ValidationModele>");
+ }
+ }
+
+ this.writelnToOut("</ValidationScenario>");
}
+ /**
+ * Ecriture d'une ligne xi:include
+ *
+ * @param nomFichier Nom du fichier à inclure
+ * @throws IOException
+ */
+ private void writeIncludeFichier(String nomFichier) throws IOException {
+
+ this.writelnToOut("<xi:include href=\"" + nomFichier + "\" />");
+ }
+
+ /**
+ * Ecriture d'un ensemble de fichiers à inclure
+ *
+ * @param listeFichiers
+ * @param nomBalise Nom de la balise qui englobe la liste des fichiers à inclure
+ * @throws IOException
+ */
+ private void writeIncludeListeFichiers(final List<FichierCrue> listeFichiers, final String nomBalise)
+ throws IOException {
+
+ if (CollectionUtils.isEmpty(listeFichiers)) { return; }
+
+ this.writelnToOut("<" + nomBalise + ">");
+ for (int j = 0, jmax = listeFichiers.size(); j < jmax; j++) {
+ writeIncludeFichier(listeFichiers.get(j).getId());
+ }
+ this.writelnToOut("</" + nomBalise + ">");
+ }
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateModeleScenario.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateModeleScenario.java 2009-06-03 15:28:51 UTC (rev 4837)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateModeleScenario.java 2009-06-03 17:48:49 UTC (rev 4838)
@@ -5,12 +5,20 @@
package org.fudaa.dodico.crue.validation;
import java.io.File;
+import java.util.List;
+import org.apache.commons.collections.CollectionUtils;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.Crue10FileFormatFactory;
+import org.fudaa.dodico.crue.io.dao.CrueHelper;
+import org.fudaa.dodico.crue.metier.CrueData;
+import org.fudaa.dodico.crue.metier.EMHModeleBase;
+import org.fudaa.dodico.crue.metier.EMHModeleEnchainement;
import org.fudaa.dodico.crue.metier.EMHScenario;
+import org.fudaa.dodico.crue.metier.FichierCrue;
/**
- * Classe permettant de valider la cohérence des fichiers d'un modele
+ * Classe permettant de valider la cohérence des fichiers d'un modèle
*
* @author deniger
*/
@@ -19,11 +27,15 @@
private final File destDir;
private final EMHScenario scenario;
+ private static final short NIVEAU_SCENARIO = 1;
+ private static final short NIVEAU_MODELE = 2;
+ private static final short NIVEAU_SS_MODELE = 3;
+
private final String grammaireVersion = "1.0.0";
/**
- * @param destDir le répertoire de travail de ce validation
- * @param project le projet à valider
+ * @param destDir le répertoire de travail de cette validation
+ * @param scenario le scénario à valider
*/
public ValidateModeleScenario(File destDir, EMHScenario scenario) {
super();
@@ -33,6 +45,8 @@
/**
* Ecrit le fichier scenario.xml
+ *
+ * @return Les messages d'erreur éventuels
*/
public CtuluAnalyze writeScenario() {
destDir.mkdirs();
@@ -45,10 +59,152 @@
}
/**
- * @return le fichier utiliser pour ecrire le fichier concatene
+ * @return le fichier utilisé pour écrire le fichier concaténé
*/
public File getScenarioFile() {
return new File(destDir, "scenario.xml");
}
+ /**
+ * @param crueData
+ * @return Les messages d'erreur éventuels
+ */
+ public CtuluAnalyze writeFichiersXMLScenario(final CrueData crueData) {
+
+ final CtuluAnalyze analyzer = new CtuluAnalyze();
+ if (crueData == null || scenario == null) {
+ analyzer.addFatalError("");
+ return analyzer;
+ }
+
+ // Ecriture des fichiers du scénario
+ writeListeFichiers(scenario.getListeFichiersScenario(), crueData, analyzer, NIVEAU_SCENARIO);
+
+ // Ecriture des ValidationModele
+ EMHModeleEnchainement modeleEnch = scenario.getGestionModele();
+ List<EMHModeleBase> modeles = modeleEnch.getListeModeles();
+
+ if (CollectionUtils.isNotEmpty(modeles)) {
+ for (int i = 0, imax = modeles.size(); i < imax; i++) {
+
+ final EMHModeleBase modeleBase = modeles.get(i);
+
+ // Ecriture des fichiers du modèle
+ writeListeFichiers(modeleBase.getListeFichiersCrue(), crueData, analyzer, NIVEAU_MODELE);
+
+ // Ecriture des fichiers des sous-modèles
+ final EMHModeleEnchainement ssModeleEnch = modeleBase.getListeSousModeles();
+ final List<EMHModeleBase> ssModeles = ssModeleEnch.getListeModeles();
+ if (CollectionUtils.isEmpty(ssModeles)) {
+ continue;
+ }
+
+ for (int j = 0, jmax = ssModeles.size(); j < jmax; j++) {
+
+ writeListeFichiers(ssModeles.get(j).getListeFichiersCrue(), crueData, analyzer, NIVEAU_SS_MODELE);
+ }
+
+ }
+ }
+
+ return analyzer;
+ }
+
+ /**
+ * @param type
+ * @param crueData
+ * @param f
+ * @param analyzer
+ */
+ private void writeFichierNivScenarioSelonType(final String type, final CrueData crueData, final File f,
+ final CtuluAnalyze analyzer) {
+
+ if (type == null) { return; }
+
+ if (type.equals(CrueHelper.OCAL)) {
+ Crue10FileFormatFactory.getOCALFileFormat().write(crueData.getOrdCalc(), f, analyzer);
+ } else if (type.equals(CrueHelper.ORES)) {
+ Crue10FileFormatFactory.getORESFileFormat().write(crueData.getOrdRes(), f, analyzer);
+ } else if (type.equals(CrueHelper.PCAL)) {
+ Crue10FileFormatFactory.getPCALFileFormat().write(crueData.getParamCalc(), f, analyzer);
+ } else if (type.equals(CrueHelper.DCLM)) {
+ Crue10FileFormatFactory.getDCLMFileFormat().write(crueData.getConditionsLim(), f, analyzer);
+ } else if (type.equals(CrueHelper.DLHY)) {
+ Crue10FileFormatFactory.getDLHYFileFormat().write(crueData.getLois(), f, analyzer);
+ }
+ }
+
+ /**
+ * @param type
+ * @param crueData
+ * @param f
+ * @param analyzer
+ */
+ private void writeFichierNivModeleSelonType(final String type, final CrueData crueData, final File f,
+ final CtuluAnalyze analyzer) {
+
+ if (type == null) { return; }
+
+ if (type.equals(CrueHelper.OPTR)) {
+ // Crue10FileFormatFactory.getOPTRFileFormat().write(crueData, f, analyzer);
+ } else if (type.equals(CrueHelper.OPTG)) {
+ Crue10FileFormatFactory.getOPTGFileFormat().write(crueData.getPretraitementsGeom(), f, analyzer);
+ } else if (type.equals(CrueHelper.OPTI)) {
+ Crue10FileFormatFactory.getOPTIFileFormat().write(crueData.getMethodesInterpolation(), f, analyzer);
+ } else if (type.equals(CrueHelper.PNUM)) {
+ Crue10FileFormatFactory.getPNUMFileFormat().write(crueData.getParamNumModeleBase(), f, analyzer);
+ } else if (type.equals(CrueHelper.DPTI)) {
+ Crue10FileFormatFactory.getDPTIFileFormat().write(crueData, f, analyzer);
+ }
+ }
+
+ /**
+ * @param type
+ * @param crueData
+ * @param f
+ * @param analyzer
+ */
+ private void writeFichierNivSsModeleSelonType(final String type, final CrueData crueData, final File f,
+ final CtuluAnalyze analyzer) {
+
+ if (type == null) { return; }
+
+ if (type.equals(CrueHelper.DRSO)) {
+ Crue10FileFormatFactory.getDRSOFileFormat().write(crueData, f, analyzer);
+ } else if (type.equals(CrueHelper.DCSP)) {
+ Crue10FileFormatFactory.getDCSPFileFormat().write(crueData.getAllEMH(), f, analyzer);
+ } else if (type.equals(CrueHelper.DPTG)) {
+ Crue10FileFormatFactory.getDPTGFileFormat().write(crueData, f, analyzer);
+ } else if (type.equals(CrueHelper.DFRT)) {
+ Crue10FileFormatFactory.getDFRTFileFormat().write(crueData.getFrottements(), f, analyzer);
+ }
+ }
+
+ /**
+ * @param listeFichiers
+ * @param crueData
+ * @param analyzer
+ * @param niveauFichier
+ */
+ private void writeListeFichiers(final List<FichierCrue> listeFichiers, final CrueData crueData,
+ final CtuluAnalyze analyzer, final short niveauFichier) {
+
+ if (listeFichiers != null) {
+
+ for (int i = 0, imax = listeFichiers.size(); i < imax; i++) {
+ final FichierCrue fichierCrue = listeFichiers.get(i);
+ final File f = new File(destDir, fichierCrue.getId());
+
+ if (niveauFichier == NIVEAU_SCENARIO) {
+ writeFichierNivScenarioSelonType(fichierCrue.getType(), crueData, f, analyzer);
+ } else if (niveauFichier == NIVEAU_MODELE) {
+ writeFichierNivModeleSelonType(fichierCrue.getType(), crueData, f, analyzer);
+ } else if (niveauFichier == NIVEAU_SS_MODELE) {
+ writeFichierNivSsModeleSelonType(fichierCrue.getType(), crueData, f, analyzer);
+ }
+
+ }
+ }
+
+ }
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/ihmMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/ihmMessages.properties 2009-06-03 15:28:51 UTC (rev 4837)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/ihmMessages.properties 2009-06-03 17:48:49 UTC (rev 4838)
@@ -6,7 +6,7 @@
ihm.error.sousmodele.empty = Pas de sous mod\u00E8les d\u00E9finis pour ce mod\u00E8le
ihm.titre.chargement.projet = Chargement projet
ihm.modeles.dispos = Modeles disponibles
-ihm.ss.modeles.dispos = Sous Modeles disponibles
+ihm.ss.modeles.dispos = Sous Mod\xE8les disponibles
ihm.scenarios.dispos = Sc\xE9narios disponibles
ihm.scenario.courant = Sc\xE9nario courant
ihm.par = par
@@ -34,8 +34,7 @@
ihm.soumettre.commentaire = Soumettre un commentaire
ihm.applis = Applications
ihm.chargement = Chargement
-ihm.scenario.courant = Le sc\xE9nario courant
-ihm.confirm.chargt.scenario = va \xEAtre charg\xE9. Voulez-vous continuer ?
+ihm.confirm.chargt.scenario.courant = Le sc\xE9nario courant {0} va \xEAtre charg\xE9. Voulez-vous continuer ?
ihm.chargt.fichiers.scenario = Chargement des fichiers du scenario
ihm.dcFailed.error = La lecture du fichier DC a \xE9chou\xE9e: {0}
ihm.drsoFailed.error = La lecture du fichier DRSO a \xE9chou\xE9e: {0}
@@ -47,23 +46,22 @@
ihm.notAnySousModelesFiles.error = Il manque un fichier dans un sous-mod\xE8le. Il faut une liste fixe de fichiers de niveau sous-mod\xE8le : DRSO, DPTG, DFRT, DCSP.
ihm.res.chargt.scenario = R\xE9sultats du Chargement sc\xE9nario
ihm.fichiers.scenario = Fichiers existants dans le sc\xE9nario
-ihm.confirm.chargt.scenario1 = Etes-vous sur de vouloir charger ce sc\xE9nario
-ihm.confirm.chargt.scenario2 = ? Il deviendra le sc\xE9nario courant.
+ihm.confirm.chargt.scenario = Etes-vous s\xFBr de vouloir charger ce sc\xE9nario {0} ? Il deviendra le sc\xE9nario courant.
ihm.charger.scenario = Charger Sc\xE9nario
-ihm.drso.genere = Fichier DRSO g\xE9n\xE9r\xE9 dans
-ihm.dfrt.genere = Fichier DFRT g\xE9n\xE9r\xE9 dans
-ihm.dcsp.genere = Fichier DCSP g\xE9n\xE9r\xE9 dans
-ihm.dptg.genere = Fichier DPTG g\xE9n\xE9r\xE9 dans
-ihm.optg.genere = Fichier OPTG g\xE9n\xE9r\xE9 dans
-ihm.pnum.genere = Fichier PNUM g\xE9n\xE9r\xE9 dans
-ihm.dpti.genere = Fichier DPTI g\xE9n\xE9r\xE9 dans
-ihm.ocal.genere = Fichier OCAL g\xE9n\xE9r\xE9 dans
-ihm.ores.genere = Fichier ORES g\xE9n\xE9r\xE9 dans
-ihm.pcal.genere = Fichier PCAL g\xE9n\xE9r\xE9 dans
-ihm.dlhy.genere = Fichier DLHY g\xE9n\xE9r\xE9 dans
-ihm.dclm.genere = Fichier DCLM g\xE9n\xE9r\xE9 dans
-ihm.dc.genere = Fichier DC g\xE9n\xE9r\xE9 dans
-ihm.dh.genere = Fichier DH g\xE9n\xE9r\xE9 dans
+ihm.drso.genere = Fichier DRSO g\xE9n\xE9r\xE9 dans {0}
+ihm.dfrt.genere = Fichier DFRT g\xE9n\xE9r\xE9 dans {0}
+ihm.dcsp.genere = Fichier DCSP g\xE9n\xE9r\xE9 dans {0}
+ihm.dptg.genere = Fichier DPTG g\xE9n\xE9r\xE9 dans {0}
+ihm.optg.genere = Fichier OPTG g\xE9n\xE9r\xE9 dans {0}
+ihm.pnum.genere = Fichier PNUM g\xE9n\xE9r\xE9 dans {0}
+ihm.dpti.genere = Fichier DPTI g\xE9n\xE9r\xE9 dans {0}
+ihm.ocal.genere = Fichier OCAL g\xE9n\xE9r\xE9 dans {0}
+ihm.ores.genere = Fichier ORES g\xE9n\xE9r\xE9 dans {0}
+ihm.pcal.genere = Fichier PCAL g\xE9n\xE9r\xE9 dans {0}
+ihm.dlhy.genere = Fichier DLHY g\xE9n\xE9r\xE9 dans {0}
+ihm.dclm.genere = Fichier DCLM g\xE9n\xE9r\xE9 dans {0}
+ihm.dc.genere = Fichier DC g\xE9n\xE9r\xE9 dans {0}
+ihm.dh.genere = Fichier DH g\xE9n\xE9r\xE9 dans {0}
ihm.analyse = Analyse
ihm.gestion.modeles = Gestion des mod\xE8les
ihm.ss.modeles.associes = Sous mod\xE8les associ\xE9s
@@ -81,7 +79,7 @@
ihm.res.comparaison = R\xE9sultat comparaison
ihm.bouton.valider = Valider
ihm.affichage.emhs = Affichage des EMHs
-ihm.emhs.scenario = EMHs contenues dans le sc\xE9nario courant
+ihm.emhs.scenario = EMHs contenues dans le sc\xE9nario courant {0}
ihm.frame.chgt.format.crue9.crue10 = G\xE9n\xE9ration Crue 9 <=> Crue 10
ihm.onglet.crue10 = g\xE9n\xE9rer Crue 10
ihm.onglet.crue9 = g\xE9n\xE9rer Crue 9
@@ -96,7 +94,7 @@
ihm.transformation.crue9.crue10 = Transformation Crue 9 <=> Crue 10
ihm.infos.etude = Infos Etude
ihm.label.etude = Etude:
-ihm.label.creation = Creation:
+ihm.label.creation = Cr\xE9ation:
ihm.label.auteur = Auteur:
ihm.bouton.parcourir2 = ...
ihm.instruc.visualiser.scenario = Pour visualiser le sc\xE9nario, cliquer dessus ou sur le bouton ci-contre
Modified: trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/TestValidateModeleScenario.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/TestValidateModeleScenario.java 2009-06-03 15:28:51 UTC (rev 4837)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/TestValidateModeleScenario.java 2009-06-03 17:48:49 UTC (rev 4838)
@@ -7,21 +7,25 @@
import java.io.File;
import java.io.IOException;
-import com.memoire.fu.FuLogCrue;
-
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.dodico.crue.common.AbstractTestCase;
import org.fudaa.dodico.crue.io.TestCrueETUFile;
+import org.fudaa.dodico.crue.metier.CrueData;
import org.fudaa.dodico.crue.metier.EMHScenario;
import org.fudaa.dodico.crue.metier.EMHproject;
+import com.memoire.fu.FuLogCrue;
+
/**
* @author deniger
*/
@SuppressWarnings("PMD.SystemPrintln")
public class TestValidateModeleScenario extends AbstractTestCase {
+ /**
+ * Teste l'écriture du fichier de validation d'un scénario
+ */
public void testWriter() {
final EMHproject projet3 = TestCrueETUFile.readModele3();
// on va cr
@@ -34,8 +38,6 @@
}
System.err.println("Dossier de destination= " + destDir.getAbsolutePath());
final EMHScenario scenarioCourant = projet3.getScenarioCourant();
- // TODO il faut continuer le scenarioWriter pour obtenir le meme resultat que le fichier:
- // Modele3.scenario.xml fourni dans le répertoire de test. Mise
final ValidateModeleScenario validator = new ValidateModeleScenario(destDir, scenarioCourant);
CtuluAnalyze writeScenario = validator.writeScenario();
testAnalyser(writeScenario);
@@ -50,5 +52,10 @@
FuLogCrue.error(e);
}
+ // TODO CDE : CrueData null à ce stade ; Voir comment le charger...
+ CrueData crueData = scenarioCourant.getDataSources();
+ CtuluAnalyze analyzer = validator.writeFichiersXMLScenario(crueData);
+ testAnalyser(analyzer);
+
}
}
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/FCrueResource.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/FCrueResource.java 2009-06-03 15:28:51 UTC (rev 4837)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/FCrueResource.java 2009-06-03 17:48:49 UTC (rev 4838)
@@ -1,5 +1,6 @@
package org.fudaa.fudaa.crue.common;
+import java.text.MessageFormat;
import java.util.ResourceBundle;
import org.fudaa.dodico.crue.io.common.Messages;
@@ -28,6 +29,16 @@
return bundle.getString(_s);
}
+ /**
+ * @param _s
+ * @param valeurs
+ * @return chaine complétée avec les valeurs passées en paramètre
+ */
+ public static String getS(final String _s, final Object... valeurs) {
+
+ return MessageFormat.format(getS(_s), valeurs);
+ }
+
// public static String getS(final String _s, final String _v0) {
// return FCrueResource.CRUE.getString(_s, _v0);
// }
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-06-03 15:28:51 UTC (rev 4837)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueProjet.java 2009-06-03 17:48:49 UTC (rev 4838)
@@ -126,8 +126,8 @@
// -- affichage du résultat --//
if (projet.getScenarioCourant() != null) {
- if (impl.question(FCrueResource.getS("ihm.chargement"), FCrueResource.getS("ihm.scenario.courant") + " "
- + projet.getScenarioCourant().getId() + " " + FCrueResource.getS("ihm.confirm.chargt.scenario"))) {
+ if (impl.question(FCrueResource.getS("ihm.chargement"), FCrueResource.getS("ihm.confirm.chargt.scenario.courant",
+ projet.getScenarioCourant().getId()))) {
ScenarioLoader algo = new ScenarioLoader(this, projet.getScenarioCourant());
// -- chargement du projet --//
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-06-03 15:28:51 UTC (rev 4837)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoader.java 2009-06-03 17:48:49 UTC (rev 4838)
@@ -69,8 +69,8 @@
@Override
public void actionPerformed(ActionEvent _e) {
- if (impl.question(FCrueResource.getS("ihm.chargement"), FCrueResource.getS("ihm.confirm.chargt.scenario1") + " "
- + scenario.getId() + FCrueResource.getS("ihm.confirm.chargt.scenario2"))) {
+ if (impl.question(FCrueResource.getS("ihm.chargement"), FCrueResource.getS("ihm.confirm.chargt.scenario",
+ scenario.getId()))) {
if (scenario != null) {
ScenarioLoader algo = new ScenarioLoader(projet, scenario);
algo.compute();
@@ -217,7 +217,8 @@
// -- Verifier la connexité du graphe --//
CtuluAnalyze analyseValidationCOnnexite = projet.getManagerError().getNewAnalyser();
analyseValidationCOnnexite.setDesc(FCrueResource.getS("ihm.validation.connexite"));
- final boolean res = ValidateConnectionModele.validateConnexite(cruedataSousModele, analyseValidationCOnnexite);
+ final boolean res = ValidateConnectionModele.validateConnexite(cruedataSousModele,
+ analyseValidationCOnnexite);
if (!res) { return; }
@@ -329,7 +330,7 @@
dataScenarioGlobale.setParamCalc(dataPCAL);
} catch (Exception e) {
- projet.getManagerError().getNewAnalyser().addError("io.xml.erreur", new Object[] { e.getMessage() });
+ projet.getManagerError().getNewAnalyser().addError("io.xml.error", new Object[] { e.getMessage() });
} finally {
// -- ajout des data au niveau scenario --//
scenario.setDataSources(dataScenarioGlobale);
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-06-03 15:28:51 UTC (rev 4837)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioSaver.java 2009-06-03 17:48:49 UTC (rev 4838)
@@ -92,8 +92,7 @@
new CrueIOResu<CrueData>(projet.getProject().getScenarioCourant().getDataSources()), fileDc,
projet.getManagerError().getNewAnalyser());
- projet.getManagerError().getLastAnalyser().addInfo(
- FCrueResource.getS("ihm.dc.genere") + " " + fileDc.getAbsolutePath());
+ projet.getManagerError().getLastAnalyser().addInfo(FCrueResource.getS("ihm.dc.genere", fileDc.getAbsolutePath()));
File fileDH = null;
if (saveAs) {
@@ -107,8 +106,7 @@
new CrueIOResu<CrueData>(projet.getProject().getScenarioCourant().getDataSources()), fileDH,
projet.getManagerError().getNewAnalyser());
- projet.getManagerError().getLastAnalyser().addInfo(
- FCrueResource.getS("ihm.dh.genere") + " " + fileDH.getAbsolutePath());
+ projet.getManagerError().getLastAnalyser().addInfo(FCrueResource.getS("ihm.dh.genere", fileDH.getAbsolutePath()));
return ok;
@@ -178,7 +176,7 @@
ok = Crue10FileFormatFactory.getDRSOFileFormat().write(data, fileDrso, projet.getManagerError().getNewAnalyser());
projet.getManagerError().getLastAnalyser().addInfo(
- FCrueResource.getS("ihm.drso.genere") + " " + fileDrso.getAbsolutePath());
+ FCrueResource.getS("ihm.drso.genere", fileDrso.getAbsolutePath()));
}
// -- generation DFRT --//
@@ -196,7 +194,7 @@
projet.getManagerError().getNewAnalyser());
projet.getManagerError().getLastAnalyser().addInfo(
- FCrueResource.getS("ihm.dfrt.genere") + " " + fileDfrt.getAbsolutePath());
+ FCrueResource.getS("ihm.dfrt.genere", fileDfrt.getAbsolutePath()));
}
}
// -- DCSP --//
@@ -213,7 +211,7 @@
projet.getManagerError().getNewAnalyser());
projet.getManagerError().getLastAnalyser().addInfo(
- FCrueResource.getS("ihm.dcsp.genere") + " " + fileDcsp.getAbsolutePath());
+ FCrueResource.getS("ihm.dcsp.genere", fileDcsp.getAbsolutePath()));
}
// -- DPTG --//
@@ -229,7 +227,7 @@
projet.getManagerError().getNewAnalyser());
projet.getManagerError().getLastAnalyser().addInfo(
- FCrueResource.getS("ihm.dptg.genere") + " " + fileDptg.getAbsolutePath());
+ FCrueResource.getS("ihm.dptg.genere", fileDptg.getAbsolutePath()));
}
// -- Niveau modele --//
// Une liste fixe de fichiers de niveau modèle : (OPTR), OPTG, OPTI, PNUM, DPTI, RPTR, RPTG, RPTI, RCAL, CPTR, CPTG,
@@ -249,7 +247,7 @@
projet.getManagerError().getNewAnalyser());
projet.getManagerError().getLastAnalyser().addInfo(
- FCrueResource.getS("ihm.optg.genere") + " " + fileOptg.getAbsolutePath());
+ FCrueResource.getS("ihm.optg.genere", fileOptg.getAbsolutePath()));
}
}
// - PNUM --//
@@ -266,7 +264,7 @@
projet.getManagerError().getNewAnalyser());
projet.getManagerError().getLastAnalyser().addInfo(
- FCrueResource.getS("ihm.pnum.genere") + " " + filePnum.getAbsolutePath());
+ FCrueResource.getS("ihm.pnum.genere", filePnum.getAbsolutePath()));
}
}
@@ -284,7 +282,7 @@
projet.getManagerError().getNewAnalyser());
projet.getManagerError().getLastAnalyser().addInfo(
- FCrueResource.getS("ihm.dpti.genere") + " " + fileDpti.getAbsolutePath());
+ FCrueResource.getS("ihm.dpti.genere", fileDpti.getAbsolutePath()));
}
// -- niveau scenario Une liste fixe de fichiers de niveau scénario : OCAL, ORES, PCAL, DCLM, DLHY --//
// -- OCAL --//
@@ -301,7 +299,7 @@
projet.getManagerError().getNewAnalyser());
projet.getManagerError().getLastAnalyser().addInfo(
- FCrueResource...
[truncated message content] |
|
From: <de...@us...> - 2009-06-03 22:59:49
|
Revision: 4839
http://fudaa.svn.sourceforge.net/fudaa/?rev=4839&view=rev
Author: deniger
Date: 2009-06-03 22:59:45 +0000 (Wed, 03 Jun 2009)
Log Message:
-----------
Modified Paths:
--------------
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/common/Messages.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/CrueConverterETU.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/CrueDaoStructureOPTI.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/CrueHelper.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/DHWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/CrueDataImpl.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHModeleBase.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/EMHScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHproject.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/common/CommomLib.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/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/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/CrueErrorManager.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/CrueFilleEMH.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/crue/view/CrueFilleInfosGenerales.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleScenarioManager.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueConstants.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHContainer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/FichierCrueManager.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueCommonImplementation.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueEditorImplementation.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/Messages.java
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/crue/
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/crue/common/
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/crue/common/bookmark-add.png
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/crue/common/messages.properties
Removed Paths:
-------------
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueCommomImplementation.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-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormat.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -4,6 +4,8 @@
import java.io.OutputStream;
import java.net.URL;
+import com.memoire.bu.BuFileFilter;
+
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.fileformat.FileReadOperationAbstract;
import org.fudaa.ctulu.fileformat.FileWriteOperationAbstract;
@@ -29,6 +31,24 @@
this(readerWriter.getXsdId(), readerWriter);
}
+ @SuppressWarnings("serial")
+ @Override
+ public BuFileFilter createFileFilter() {
+ return new BuFileFilter(extensions, getDescription()) {
+ @Override
+ public String getExtension(final File _f) {
+ // on redefinit pour recuperer le premier point.
+ if (_f != null) {
+ final String filename = _f.getName();
+ final int i = filename.indexOf('.');
+ if ((i > 0) && (i < filename.length() - 1)) { return filename.substring(i + 1).toLowerCase(); }
+ }
+ return null;
+ }
+
+ };
+ }
+
/**
* @param type le type en Upper case comme par exemple DFRT.
*/
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-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -2,6 +2,7 @@
import java.util.List;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
import org.fudaa.dodico.crue.io.dao.CrueConverterDCLM;
import org.fudaa.dodico.crue.io.dao.CrueConverterDCSP;
import org.fudaa.dodico.crue.io.dao.CrueConverterDFRT;
@@ -44,7 +45,6 @@
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureORES;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructurePCAL;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructurePNUM;
-import org.fudaa.dodico.crue.io.dao.CrueHelper;
import org.fudaa.dodico.crue.io.dao.CrueXmlReaderWriterImpl;
import org.fudaa.dodico.crue.metier.CrueData;
import org.fudaa.dodico.crue.metier.EMHproject;
@@ -67,59 +67,59 @@
public class Crue10FileFormatFactory {
private final static Crue10FileFormat<List<EMH>> DCSP = new Crue10FileFormat<List<EMH>>(
- new CrueXmlReaderWriterImpl<CrueDaoDCSP, List<EMH>>(CrueHelper.DCSP, new CrueConverterDCSP(),
+ new CrueXmlReaderWriterImpl<CrueDaoDCSP, List<EMH>>(CrueConstants.DCSP, new CrueConverterDCSP(),
new CrueDaoStructureDCSP()));
private final static Crue10FileFormat<List<DonFrt>> DFRT = new Crue10FileFormat<List<DonFrt>>(
- new CrueXmlReaderWriterImpl<CrueDaoDFRT, List<DonFrt>>(CrueHelper.DFRT, new CrueConverterDFRT(),
+ new CrueXmlReaderWriterImpl<CrueDaoDFRT, List<DonFrt>>(CrueConstants.DFRT, new CrueConverterDFRT(),
new CrueDaoStructureDFRT()));
private final static Crue10FileFormat<List<AbstractLoi>> DLHY = new Crue10FileFormat<List<AbstractLoi>>(
- new CrueXmlReaderWriterImpl<CrueDaoDLHY, List<AbstractLoi>>(CrueHelper.DLHY, new CrueConverterDLHY(),
+ new CrueXmlReaderWriterImpl<CrueDaoDLHY, List<AbstractLoi>>(CrueConstants.DLHY, new CrueConverterDLHY(),
new CrueDaoStructureDLHY()));
private final static Crue10FileFormat<CrueData> DPTG = new Crue10FileFormat<CrueData>(
- new CrueXmlReaderWriterImpl<CrueDaoDPTG, CrueData>(CrueHelper.DPTG, new CrueConverterDPTG(),
+ new CrueXmlReaderWriterImpl<CrueDaoDPTG, CrueData>(CrueConstants.DPTG, new CrueConverterDPTG(),
new CrueDaoStructureDPTG()));
private final static Crue10FileFormat<CrueData> DPTI = new Crue10FileFormat<CrueData>(
- new CrueXmlReaderWriterImpl<CrueDaoDPTI, CrueData>(CrueHelper.DPTI, new CrueConverterDPTI(),
+ new CrueXmlReaderWriterImpl<CrueDaoDPTI, CrueData>(CrueConstants.DPTI, new CrueConverterDPTI(),
new CrueDaoStructureDPTI()));
private final static Crue10FileFormat<CrueData> DRSO = new Crue10FileFormat<CrueData>(
- new CrueXmlReaderWriterImpl<CrueDaoDRSO, CrueData>(CrueHelper.DRSO, new CrueConverterDRSO(),
+ new CrueXmlReaderWriterImpl<CrueDaoDRSO, CrueData>(CrueConstants.DRSO, new CrueConverterDRSO(),
new CrueDaoStructureDRSO()));
- private final static Crue10FileFormat<EMHproject> ETU = new Crue10FileFormat<EMHproject>(CrueHelper.ETU,
- new CrueXmlReaderWriterImpl<CrueDaoETU, EMHproject>(CrueHelper.ETU, new CrueConverterETU(),
+ private final static Crue10FileFormat<EMHproject> ETU = new Crue10FileFormat<EMHproject>(CrueConstants.ETU,
+ new CrueXmlReaderWriterImpl<CrueDaoETU, EMHproject>(CrueConstants.ETU, new CrueConverterETU(),
new CrueDaoStructureETU()));
private final static Crue10FileFormat<OrdPrtGeoModeleBase> OPTG = new Crue10FileFormat<OrdPrtGeoModeleBase>(
- new CrueXmlReaderWriterImpl<CrueDaoOPTG, OrdPrtGeoModeleBase>(CrueHelper.OPTG, new CrueConverterOPTG(),
+ new CrueXmlReaderWriterImpl<CrueDaoOPTG, OrdPrtGeoModeleBase>(CrueConstants.OPTG, new CrueConverterOPTG(),
new CrueDaoStructureOPTG()));
private final static Crue10FileFormat<DonCLimMScenario> DCLM = new Crue10FileFormat<DonCLimMScenario>(
- new CrueXmlReaderWriterImpl<CrueDaoDCLM, DonCLimMScenario>(CrueHelper.DCLM, new CrueConverterDCLM(),
+ new CrueXmlReaderWriterImpl<CrueDaoDCLM, DonCLimMScenario>(CrueConstants.DCLM, new CrueConverterDCLM(),
new CrueDaoStructureDCLM()));
private final static Crue10FileFormat<OrdResScenario> ORES = new Crue10FileFormat<OrdResScenario>(
- new CrueXmlReaderWriterImpl<CrueDaoORES, OrdResScenario>(CrueHelper.ORES, new CrueConverterORES(),
+ new CrueXmlReaderWriterImpl<CrueDaoORES, OrdResScenario>(CrueConstants.ORES, new CrueConverterORES(),
new CrueDaoStructureORES()));
private final static Crue10FileFormat<OrdCalcScenario> OCAL = new Crue10FileFormat<OrdCalcScenario>(
- new CrueXmlReaderWriterImpl<CrueDaoOCAL, OrdCalcScenario>(CrueHelper.OCAL, new CrueConverterOCAL(),
+ new CrueXmlReaderWriterImpl<CrueDaoOCAL, OrdCalcScenario>(CrueConstants.OCAL, new CrueConverterOCAL(),
new CrueDaoStructureOCAL()));
private final static Crue10FileFormat<ParamCalcScenario> PCAL = new Crue10FileFormat<ParamCalcScenario>(
- new CrueXmlReaderWriterImpl<CrueDaoPCAL, ParamCalcScenario>(CrueHelper.PCAL, new CrueConverterPCAL(),
+ new CrueXmlReaderWriterImpl<CrueDaoPCAL, ParamCalcScenario>(CrueConstants.PCAL, new CrueConverterPCAL(),
new CrueDaoStructurePCAL()));
private final static Crue10FileFormat<ParamNumModeleBase> PNUM = new Crue10FileFormat<ParamNumModeleBase>(
- new CrueXmlReaderWriterImpl<CrueDaoPNUM, ParamNumModeleBase>(CrueHelper.PNUM, new CrueConverterPNUM(),
+ new CrueXmlReaderWriterImpl<CrueDaoPNUM, ParamNumModeleBase>(CrueConstants.PNUM, new CrueConverterPNUM(),
new CrueDaoStructurePNUM()));
private final static Crue10FileFormat<OrdPrtCIniModeleBase> OPTI = new Crue10FileFormat<OrdPrtCIniModeleBase>(
- new CrueXmlReaderWriterImpl<CrueDaoOPTI, OrdPrtCIniModeleBase>(CrueHelper.OPTI, new CrueConverterOPTI(),
+ new CrueXmlReaderWriterImpl<CrueDaoOPTI, OrdPrtCIniModeleBase>(CrueConstants.OPTI, new CrueConverterOPTI(),
new CrueDaoStructureOPTI()));
static {
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueConstants.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueConstants.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueConstants.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -0,0 +1,36 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.io.common;
+
+/**
+ * @author deniger
+ *
+ */
+public class CrueConstants {
+
+ // -- listing des diff�rents fichiers et leur noms utilisés --//
+ public final static String ETU = "ETU"; //$NON-NLS-1$
+ public final static String DRSO = "DRSO"; //$NON-NLS-1$
+ public final static String ORES = "ORES"; //$NON-NLS-1$
+ public final static String OCAL = "OCAL"; //$NON-NLS-1$
+ public final static String PCAL = "PCAL"; //$NON-NLS-1$
+ public final static String DCLM = "DCLM"; //$NON-NLS-1$
+ public final static String DLHY = "DLHY"; //$NON-NLS-1$
+ public final static String OPTR = "OPTR"; //$NON-NLS-1$
+ public final static String OPTG = "OPTG"; //$NON-NLS-1$
+ public final static String OPTI = "OPTI"; //$NON-NLS-1$
+ public final static String PNUM = "PNUM"; //$NON-NLS-1$
+ public final static String DPTI = "DPTI"; //$NON-NLS-1$
+ public final static String DCSP = "DCSP"; //$NON-NLS-1$
+ public final static String DPTG = "DPTG"; //$NON-NLS-1$
+ public final static String DFRT = "DFRT"; //$NON-NLS-1$
+ public final static String DC = "DC"; //$NON-NLS-1$
+ public final static String DH = "DH"; //$NON-NLS-1$
+ public final static String RPTR = "RPTR"; //$NON-NLS-1$
+ public final static String RPTG = "RPTG"; //$NON-NLS-1$
+ public final static String RPTI = "RPTI"; //$NON-NLS-1$
+ public final static String RCAL = "RCAL"; //$NON-NLS-1$
+
+}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/Messages.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/Messages.java 2009-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/Messages.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -4,13 +4,7 @@
*/
package org.fudaa.dodico.crue.io.common;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.ResourceBundle;
+import java.util.*;
/**
* @author deniger
@@ -26,11 +20,9 @@
.getBundle("org.fudaa.dodico.crue.io.adrienMessages");
private static final ResourceBundle DH_RESOURCE_BUNDLE = ResourceBundle
.getBundle("org.fudaa.dodico.crue.io.caroleMessages");
- private static final ResourceBundle IHM_RESOURCE_BUNDLE = ResourceBundle
- .getBundle("org.fudaa.dodico.crue.io.ihmMessages");
/** ResourceBundle regroupant tous les ResourceBundle définis par des fichiers properties distincts */
public static final ResourceBundle RESOURCE_BUNDLE = new TempResourceBundle(ALL_RESOURCE_BUNDLE, DC_RESOURCE_BUNDLE,
- DH_RESOURCE_BUNDLE, IHM_RESOURCE_BUNDLE);
+ DH_RESOURCE_BUNDLE);
protected static class TempResourceBundle extends ResourceBundle {
@@ -69,11 +61,4 @@
private Messages() {}
- // public static String getString(String key) {
- // try {
- // return RESOURCE_BUNDLE.getString(key);
- // } catch (MissingResourceException e) {
- // return '!' + key + '!';
- // }
- // }
}
Modified: 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/CrueConverterDCSP.java 2009-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCSP.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -6,6 +6,7 @@
import org.apache.commons.collections.CollectionUtils;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheAbstract;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheBarrageFilEau;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheBarrageFilEauAbstract;
@@ -81,7 +82,7 @@
res.DonCalcSansPrtBranches = new ArrayList<DaoBrancheAbstract>();
if (CollectionUtils.isEmpty(metier)) {
- CrueHelper.emhEmpty(CrueHelper.DCSP, analyser);
+ CrueHelper.emhEmpty(CrueConstants.DCSP, analyser);
} else {
for (final EMH emh : metier) {
if (emh instanceof CatEMHBranche) {
@@ -94,7 +95,7 @@
if (dataCalc != null) {
CrueConverterDCSP.metierToDaoBranches(res.DonCalcSansPrtBranches, branche, dataCalc, analyser);
} else {
- CrueHelper.unknowdataFromFile("Branches", CrueHelper.DCSP, branche.getNom(), analyser);
+ CrueHelper.unknowdataFromFile("Branches", CrueConstants.DCSP, branche.getNom(), analyser);
}
}
}
Modified: 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/CrueConverterETU.java 2009-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterETU.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -7,25 +7,8 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluLibArray;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureETU.FichierResultat;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureETU.Modele;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureETU.ModeleRun;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureETU.Ref;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureETU.Repertoire;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureETU.Run;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureETU.Scenario;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureETU.SousModele;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureETU.TypeFichierDispo;
-import org.fudaa.dodico.crue.metier.CrueData;
-import org.fudaa.dodico.crue.metier.EMHInfosVersion;
-import org.fudaa.dodico.crue.metier.EMHModeleBase;
-import org.fudaa.dodico.crue.metier.EMHModeleEnchainement;
-import org.fudaa.dodico.crue.metier.EMHModeleRun;
-import org.fudaa.dodico.crue.metier.EMHProjectInfos;
-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.dodico.crue.io.dao.CrueDaoStructureETU.*;
+import org.fudaa.dodico.crue.metier.*;
/**
* Factory qui se charge de remplir les structures DAO dufichier ETU avec les donn�es m�tier et inversement.
@@ -121,7 +104,7 @@
// -- on essaie de retrouver la reference du fichier --//
if (reference.NomRef != null && infos.existFileInBase(reference.NomRef)) {
final FichierCrue fichierData = infos.getFileFromBase(reference.NomRef);
- newScenar.addFichierDonneesToScenario(fichierData);
+ newScenar.addFichierDonnees(fichierData);
} else {
CrueHelper.unknowReference("Fichier", reference.NomRef, analyser);
}
@@ -129,7 +112,17 @@
}
// -- ajout des modeles concernes --//
- if (CtuluLibArray.isEmpty(scenarPersist.Modeles)) {
+ // cas de v9:
+ if (scenarPersist.ScenarioModeleV9 != null) {
+ if (scenarPersist.ScenarioModeleV9.NomRef != null
+ && baseModeles.existModeleInBase(scenarPersist.ScenarioModeleV9.NomRef)) {
+ final EMHModeleBase modeleData = baseModeles.getModeleFromBase(scenarPersist.ScenarioModeleV9.NomRef);
+ // -- ajout du modele dans le scenar --//
+ newScenar.addModeleDonneesToScenario(modeleData);
+ } else {
+ CrueHelper.unknowReference("Modele v9", scenarPersist.ScenarioModeleV9.NomRef, analyser);
+ }
+ } else if (CtuluLibArray.isEmpty(scenarPersist.Modeles)) {
CrueHelper.listEmpty("Modele de Scenario" + " " + scenarPersist.Nom, analyser);
} else {
for (final Ref reference : scenarPersist.Modeles) {
@@ -139,7 +132,7 @@
// -- ajout du modele dans le scenar --//
newScenar.addModeleDonneesToScenario(modeleData);
} else {
- CrueHelper.unknowReference("SousModele", reference.NomRef, analyser);
+ CrueHelper.unknowReference("Modele", reference.NomRef, analyser);
}
}
}
@@ -260,7 +253,7 @@
// -- on essaie de retrouver la reference du fichier --//
if (reference.NomRef != null && infos.existFileInBase(reference.NomRef)) {
final FichierCrue fichierData = infos.getFileFromBase(reference.NomRef);
- smMetier.addFichierDonneesToModele(fichierData);
+ smMetier.addFichierDonnees(fichierData);
} else {
CrueHelper.unknowReference("Fichier", reference.NomRef, analyser);
}
@@ -307,7 +300,7 @@
// -- on essaie de retrouver la reference du fichier --//
if (reference.NomRef != null && infos.existFileInBase(reference.NomRef)) {
final FichierCrue fichierData = infos.getFileFromBase(reference.NomRef);
- newModeleMetier.addFichierDonneesToModele(fichierData);
+ newModeleMetier.addFichierDonnees(fichierData);
} else {
CrueHelper.unknowReference("Fichier", reference.NomRef, analyser);
}
Modified: 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/CrueDaoStructureDCLM.java 2009-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDCLM.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -8,6 +8,7 @@
import com.thoughtworks.xstream.XStream;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
import org.fudaa.dodico.crue.io.common.EnumsConverter;
import org.fudaa.dodico.crue.metier.emh.EnumSensOuv;
@@ -26,7 +27,7 @@
*/
public void configureXStream(final XStream xstream, CtuluAnalyze analyze) {
- xstream.alias(CrueHelper.DCLM, CrueDaoDCLM.class);
+ xstream.alias(CrueConstants.DCLM, CrueDaoDCLM.class);
xstream.addImplicitCollection(CrueDaoDCLM.class, "listeCalculs");
Modified: 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/CrueDaoStructureDCSP.java 2009-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDCSP.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -5,6 +5,7 @@
import com.thoughtworks.xstream.XStream;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
import org.fudaa.dodico.crue.io.common.EnumsConverter;
import org.fudaa.dodico.crue.metier.emh.EnumFormulePdc;
import org.fudaa.dodico.crue.metier.emh.EnumSensOrifice;
@@ -17,7 +18,7 @@
public void configureXStream(final XStream xstream, CtuluAnalyze analyze) {
// -- creation des alias pour que ce soit + parlant dans le xml file --//
- xstream.alias(CrueHelper.DCSP, CrueDaoDCSP.class);
+ xstream.alias(CrueConstants.DCSP, CrueDaoDCSP.class);
// -- liste des initialisations nécessaires pour le formattage des donn�es--//
initXmlParserBranche(xstream);
initXmlParserSection(xstream);
@@ -32,7 +33,7 @@
*/
protected static void initXmlParserForDSCP(final XStream xstream) {
// -- creation des alias pour que ce soit + parlant dans le xml file --//
- xstream.alias(CrueHelper.DCSP, CrueDaoDCSP.class);
+ xstream.alias(CrueConstants.DCSP, CrueDaoDCSP.class);
// -- liste des initialisations nécessaires pour le formattage des donn�es--//
initXmlParserBranche(xstream);
initXmlParserSection(xstream);
Modified: 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/CrueDaoStructureDFRT.java 2009-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDFRT.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -3,6 +3,7 @@
import com.thoughtworks.xstream.XStream;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDLHY.DaoLoiFF;
/**
@@ -16,7 +17,7 @@
public void configureXStream(final XStream xstream, CtuluAnalyze analyze) {
// -- creation des alias pour que ce soit + parlant dans le xml file --//
- xstream.alias(CrueHelper.DFRT, CrueDaoDFRT.class);
+ xstream.alias(CrueConstants.DFRT, CrueDaoDFRT.class);
xstream.alias("LoiFF", DaoLoiFF.class);
xstream.omitField(DaoLoiFF.class, "DateZeroLoiDF");
xstream.useAttributeFor(AbstractDaoLoi.class, "Nom");
Modified: 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/CrueDaoStructureDLHY.java 2009-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDLHY.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -1,6 +1,7 @@
package org.fudaa.dodico.crue.io.dao;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
import com.thoughtworks.xstream.XStream;
@@ -14,7 +15,7 @@
public void configureXStream(final XStream xstream, final CtuluAnalyze analyze) {
- xstream.alias(CrueHelper.DLHY, CrueDaoDLHY.class);
+ xstream.alias(CrueConstants.DLHY, CrueDaoDLHY.class);
xstream.alias("LoiFF", DaoLoiFF.class);
xstream.alias("LoiDF", DaoLoiDF.class);
xstream.omitField(DaoLoiFF.class, "DateZeroLoiDF");
Modified: 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/CrueDaoStructureDPTG.java 2009-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDPTG.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -5,6 +5,7 @@
import com.thoughtworks.xstream.XStream;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
import org.fudaa.dodico.crue.metier.emh.EvolutionFF;
import org.fudaa.dodico.crue.metier.emh.PtProfil;
@@ -19,7 +20,7 @@
public void configureXStream(final XStream xstream, CtuluAnalyze analyze) {
// -- creation des alias pour que ce soit + parlant dans le xml file --//
- xstream.alias(CrueHelper.DPTG, CrueDaoDPTG.class);
+ xstream.alias(CrueConstants.DPTG, CrueDaoDPTG.class);
// -- liste des initialisations n�cessaires pour le formattage des donn�es--//
initXmlParserSectionProfils(xstream);
initXmlParserSections(xstream);
Modified: 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/CrueDaoStructureDPTI.java 2009-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDPTI.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -3,6 +3,7 @@
import com.thoughtworks.xstream.XStream;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
/**
* Toutes les structures dao utilis�es et les inits du parser xml pour le format DPTI. Toutes ces structures sont
@@ -19,7 +20,7 @@
public static void initXmlParserForDPTI(final XStream xstream) {
// -- creation des alias po...
[truncated message content] |
|
From: <de...@us...> - 2009-06-04 22:55:38
|
Revision: 4851
http://fudaa.svn.sourceforge.net/fudaa/?rev=4851&view=rev
Author: deniger
Date: 2009-06-04 22:55:35 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
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/io/dao/AbstractDaoLoi.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDLHY.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/io/neuf/STRFactory.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/CrueData.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/CrueDataImpl.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPerm.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermBrancheOrificeManoeuvre.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermBrancheSaintVenantQruis.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermCasierProfilQruis.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermNoeudNiveauContinuQapp.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermNoeudNiveauContinuZimpose.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTrans.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransBrancheOrificeManoeuvre.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransBrancheSaintVenantQruis.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransCasierProfilQruis.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransItem.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuLimnigramme.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuQapp.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/DonCalcSansPrtBrancheNiveauxAssocies.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/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/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/helper/LoiHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/CruePrefix.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateModeleScenario.java
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-common-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-dclm-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-dcsp-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-dptg-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-dpti-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-drso-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-ores-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-pnum-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/MockCrueData.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/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/TestCrueDLHYFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueOCALFile.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoader.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Calc.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuTarage.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHActivable.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMCommon.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheQ.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSeuil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Loi.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractCalc.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractCatEMHActivable.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractDonCLimM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractDonCalcSansPrtBrancheQ.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractDonCalcSansPrtBrancheSeuil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractLoi.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuTarrage.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/PtZK.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/PtZY.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-06-04 18:15:30 UTC (rev 4850)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java 2009-06-04 22:55:35 UTC (rev 4851)
@@ -48,7 +48,7 @@
import org.fudaa.dodico.crue.io.dao.CrueXmlReaderWriterImpl;
import org.fudaa.dodico.crue.metier.CrueData;
import org.fudaa.dodico.crue.metier.EMHproject;
-import org.fudaa.dodico.crue.metier.emh.AbstractLoi;
+import org.fudaa.dodico.crue.metier.emh.Loi;
import org.fudaa.dodico.crue.metier.emh.DonCLimMScenario;
import org.fudaa.dodico.crue.metier.emh.DonFrt;
import org.fudaa.dodico.crue.metier.emh.EMH;
@@ -74,8 +74,8 @@
new CrueXmlReaderWriterImpl<CrueDaoDFRT, List<DonFrt>>(CrueConstants.DFRT, new CrueConverterDFRT(),
new CrueDaoStructureDFRT()));
- private final static Crue10FileFormat<List<AbstractLoi>> DLHY = new Crue10FileFormat<List<AbstractLoi>>(
- new CrueXmlReaderWriterImpl<CrueDaoDLHY, List<AbstractLoi>>(CrueConstants.DLHY, new CrueConverterDLHY(),
+ private final static Crue10FileFormat<List<Loi>> DLHY = new Crue10FileFormat<List<Loi>>(
+ new CrueXmlReaderWriterImpl<CrueDaoDLHY, List<Loi>>(CrueConstants.DLHY, new CrueConverterDLHY(),
new CrueDaoStructureDLHY()));
private final static Crue10FileFormat<CrueData> DPTG = new Crue10FileFormat<CrueData>(
@@ -145,7 +145,7 @@
/**
* @return DLHY : objet CrueFileFormat qui contient le DAO et le métier de DLHY
*/
- public static Crue10FileFormat<List<AbstractLoi>> getDLHYFileFormat() {
+ public static Crue10FileFormat<List<Loi>> getDLHYFileFormat() {
return DLHY;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractDaoLoi.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractDaoLoi.java 2009-06-04 18:15:30 UTC (rev 4850)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractDaoLoi.java 2009-06-04 22:55:35 UTC (rev 4851)
@@ -2,7 +2,7 @@
import com.thoughtworks.xstream.XStream;
-import org.fudaa.dodico.crue.metier.emh.AbstractLoi;
+import org.fudaa.dodico.crue.metier.emh.Loi;
import org.fudaa.dodico.crue.metier.emh.EvolutionFF;
import org.fudaa.dodico.crue.metier.emh.PtEvolutionFF;
import org.fudaa.dodico.crue.metier.helper.LoiHelper;
@@ -47,7 +47,7 @@
* @param outLoi
* @param inLoi
*/
- protected static void daoToMetierLoi(final AbstractLoi outLoi, final AbstractDaoLoi inLoi) {
+ protected static void daoToMetierLoi(final Loi outLoi, final AbstractDaoLoi inLoi) {
outLoi.setNom(inLoi.Nom);
outLoi.setDescription(inLoi.Description);
// VariableOrdonnee varOrdonnee = new VariableOrdonnee();
@@ -65,7 +65,7 @@
* @param listePersistante
* @param dataMetier
*/
- protected static void metierToDaoLoi(final AbstractDaoLoi outLoi, final AbstractLoi inLoi) {
+ protected static void metierToDaoLoi(final AbstractDaoLoi outLoi, final Loi inLoi) {
outLoi.Nom = inLoi.getNom();
outLoi.Description = inLoi.getDescription();
outLoi.VarAbscisse = inLoi.getVarAbscisse();
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java 2009-06-04 18:15:30 UTC (rev 4850)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java 2009-06-04 22:55:35 UTC (rev 4851)
@@ -289,7 +289,7 @@
final NoeudNiveauContinuTarragePersist eltPersist = (NoeudNiveauContinuTarragePersist) eltRefPersist;
final CatEMHNoeud noeudMetier = getEMHNoeudFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (noeudMetier != null) {
- final CalcTransNoeudNiveauContinuTarrage eltMetier = new CalcTransNoeudNiveauContinuTarrage();
+ final CalcTransNoeudNiveauContinuTarage eltMetier = new CalcTransNoeudNiveauContinuTarage();
eltMetier.setNomCalculParent(calculTransMetier.getNom());
noeudMetier.addDCLM(eltMetier);
eltMetier.setEMH(noeudMetier);
@@ -390,10 +390,10 @@
* @param analyzer
* @return
*/
- private static AbstractLoi getLoiFromReferenceDLHY(final String nomRef, final CrueData dataLinked,
+ private static Loi getLoiFromReferenceDLHY(final String nomRef, final CrueData dataLinked,
final CtuluAnalyze analyzer) {
- final AbstractLoi loi = LoiHelper.findByReference(nomRef, dataLinked.getLois());
+ final Loi loi = LoiHelper.findByReference(nomRef, dataLinked.getLois());
if (loi == null) {
analyzer.addInfo("io.dclm.ref.loi.error", nomRef);
}
@@ -740,7 +740,7 @@
dao.NomRef = in.getEMH().getNom();
calculPersist.listeElementsCalculTransitoire.add(dao);
}
- for (CalcTransNoeudNiveauContinuTarrage in : calculMetier.getCalcTransNoeudNiveauContinuTarrage()) {
+ for (CalcTransNoeudNiveauContinuTarage in : calculMetier.getCalcTransNoeudNiveauContinuTarrage()) {
NoeudNiveauContinuTarragePersist dao = new NoeudNiveauContinuTarragePersist();
dao.Tarrage = new TarragePersist();
dao.Tarrage.NomRef = in.getLoi().getNom();
Modified: 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/CrueConverterDLHY.java 2009-06-04 18:15:30 UTC (rev 4850)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDLHY.java 2009-06-04 22:55:35 UTC (rev 4851)
@@ -11,7 +11,7 @@
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDLHY.DaoLoiDF;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDLHY.DaoLoiFF;
import org.fudaa.dodico.crue.metier.CrueData;
-import org.fudaa.dodico.crue.metier.emh.AbstractLoi;
+import org.fudaa.dodico.crue.metier.emh.Loi;
import org.fudaa.dodico.crue.metier.emh.LoiDF;
import org.fudaa.dodico.crue.metier.emh.LoiFF;
@@ -20,13 +20,13 @@
*
* @author Adrien Hadoux, Carole Delhaye
*/
-public class CrueConverterDLHY implements CrueConverter<CrueDaoDLHY, List<AbstractLoi>> {
+public class CrueConverterDLHY implements CrueConverter<CrueDaoDLHY, List<Loi>> {
private interface ConvertLoi {
- AbstractDaoLoi metiertoDao(AbstractLoi in);
+ AbstractDaoLoi metiertoDao(Loi in);
- AbstractLoi daoToMetier(AbstractDaoLoi in);
+ Loi daoToMetier(AbstractDaoLoi in);
}
/**
@@ -34,7 +34,7 @@
*/
public final class ConvertLoiDF implements ConvertLoi {
- public AbstractDaoLoi metiertoDao(final AbstractLoi in) {
+ public AbstractDaoLoi metiertoDao(final Loi in) {
final LoiDF inLoi = (LoiDF) in;
final DaoLoiDF out = new DaoLoiDF();
AbstractDaoLoi.metierToDaoLoi(out, inLoi);
@@ -42,7 +42,7 @@
return out;
}
- public AbstractLoi daoToMetier(final AbstractDaoLoi in) {
+ public Loi daoToMetier(final AbstractDaoLoi in) {
final DaoLoiDF loiDFAbstractPersist = (DaoLoiDF) in;
final LoiDF outLoi = new LoiDF();
AbstractDaoLoi.daoToMetierLoi(outLoi, loiDFAbstractPersist);
@@ -57,13 +57,13 @@
*/
public final class ConvertLoiFF implements ConvertLoi {
- public AbstractDaoLoi metiertoDao(final AbstractLoi in) {
+ public AbstractDaoLoi metiertoDao(final Loi in) {
final DaoLoiFF outLoi = new DaoLoiFF();
AbstractDaoLoi.metierToDaoLoi(outLoi, in);
return outLoi;
}
- public AbstractLoi daoToMetier(final AbstractDaoLoi in) {
+ public Loi daoToMetier(final AbstractDaoLoi in) {
final LoiFF loiFF = new LoiFF();
AbstractDaoLoi.daoToMetierLoi(loiFF, in);
return loiFF;
@@ -74,11 +74,11 @@
/**
* Convertit les objets persistants en objets métier
*/
- public List<AbstractLoi> convertDaoToMetier(final CrueDaoDLHY dao, final CrueData dataLinked,
+ public List<Loi> convertDaoToMetier(final CrueDaoDLHY dao, final CrueData dataLinked,
final CtuluAnalyze analyser) {
final List<AbstractDaoLoi> inLois = dao.Lois;
- List<AbstractLoi> outLoi = Collections.emptyList();
+ List<Loi> outLoi = Collections.emptyList();
final Map<Class, ConvertLoi> corr = new HashMap<Class, ConvertLoi>();
corr.put(DaoLoiDF.class, new ConvertLoiDF());
corr.put(DaoLoiFF.class, new ConvertLoiFF());
@@ -86,7 +86,7 @@
if (CollectionUtils.isEmpty(inLois)) {
CrueHelper.emhEmpty("Lois", analyser);
} else {
- outLoi = new ArrayList<AbstractLoi>(inLois.size());
+ outLoi = new ArrayList<Loi>(inLois.size());
for (final AbstractDaoLoi in : inLois) {
final ConvertLoi cs = corr.get(in.getClass());
outLoi.add(cs.daoToMetier(in));
@@ -98,7 +98,7 @@
/**
* Convertit les objets métier en objets persistants
*/
- public CrueDaoDLHY convertMetierToDao(final List<AbstractLoi> metier, final CtuluAnalyze analyser) {
+ public CrueDaoDLHY convertMetierToDao(final List<Loi> metier, final CtuluAnalyze analyser) {
final CrueDaoDLHY res = new CrueDaoDLHY();
@@ -107,7 +107,7 @@
corr.put(LoiDF.class, new ConvertLoiDF());
corr.put(LoiFF.class, new ConvertLoiFF());
- for (final AbstractLoi loi : metier) {
+ for (final Loi loi : metier) {
final ConvertLoi cs = corr.get(loi.getClass());
res.Lois.add(cs.metiertoDao(loi));
}
Modified: 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/DHReader.java 2009-06-04 18:15:30 UTC (rev 4850)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java 2009-06-04 22:55:35 UTC (rev 4851)
@@ -902,7 +902,7 @@
// La loi pour Limnigramme et Zimpose est la même
typesConditionLimites.put(1, CalcTransNoeudNiveauContinuLimnigramme.class);
typesConditionLimites.put(2, CalcTransNoeudNiveauContinuQapp.class);
- typesConditionLimites.put(3, CalcTransNoeudNiveauContinuTarrage.class);
+ typesConditionLimites.put(3, CalcTransNoeudNiveauContinuTarage.class);
// loi 10 = manoeuvre pour branche de type 10 : non supporté (hors périmètre)
typesConditionLimites.put(10, "Station de pompage");
typesConditionLimites.put(20, "débit au barrage");
@@ -992,14 +992,14 @@
metier.setEMH(noeud);
calcTrans.addCalcTransNoeudNiveauContinuLimnigramme(metier);
- } else if (classe == CalcTransNoeudNiveauContinuTarrage.class) {
+ } else if (classe == CalcTransNoeudNiveauContinuTarage.class) {
final CatEMHNoeud noeud = res.findNoeudByReference(nomEmh);
if (noeud == null) {
analyze_.addError("io.dh.ref.emhnoeud.tarrage.error", nomEmh);
return;
}
- final CalcTransNoeudNiveauContinuTarrage metier = new CalcTransNoeudNiveauContinuTarrage();
+ final CalcTransNoeudNiveauContinuTarage metier = new CalcTransNoeudNiveauContinuTarage();
metier.setNomCalculParent(calcTrans.getNom());
noeud.addDCLM(metier);
metier.setEMH(noeud);
@@ -1255,9 +1255,9 @@
}
// Création des branches SaintVenantQruis correspondant aux branchex saint venant de DRSO
- List<AbstractLoi> dlhy = res.getLois();
+ List<Loi> dlhy = res.getLois();
if (dlhy == null) {
- dlhy = new ArrayList<AbstractLoi>();
+ dlhy = new ArrayList<Loi>();
res.setLois(dlhy);
}
@@ -1274,7 +1274,7 @@
brancheSV.setEMH(emh);
final String nomLoi = "HydrogrammeRuis" + nomEmh;
- final AbstractLoi loi = LoiHelper.findByReference(nomLoi, dlhy);
+ final Loi loi = LoiHelper.findByReference(nomLoi, dlhy);
LoiDF loiDF = null;
// Si la loi existe dans CrueData, c'est qu'elle existe aussi dans les conditions initiales ; On met à
@@ -1324,9 +1324,9 @@
return;
}
- List<AbstractLoi> dlhy = res.getLois();
+ List<Loi> dlhy = res.getLois();
if (dlhy == null) {
- dlhy = new ArrayList<AbstractLoi>();
+ dlhy = new ArrayList<Loi>();
res.setLois(dlhy);
}
@@ -1343,7 +1343,7 @@
final DonCLimM donneeTrans = listeDCLMs.get(i);
if (donneeTrans instanceof CalcTransNoeudNiveauContinuQapp
|| donneeTrans instanceof CalcTransNoeudNiveauContinuLimnigramme
- || donneeTrans instanceof CalcTransNoeudNiveauContinuTarrage) {
+ || donneeTrans instanceof CalcTransNoeudNiveauContinuTarage) {
final CalcTransItem nncTrans = (CalcTransItem) donneeTrans;
// pour s'assuer de la correspondance
@@ -1354,7 +1354,7 @@
if (nncTrans instanceof CalcTransNoeudNiveauContinuQapp) {
nomLoi = "Hydrogramme" + nomEmh;
- final AbstractLoi loi = LoiHelper.findByReference(nomLoi, dlhy);
+ final Loi loi = LoiHelper.findByReference(nomLoi, dlhy);
LoiDF loiDF = null;
// Si la loi existe dans CrueData, c'est qu'elle existe aussi dans les conditions initiales ; On met à
@@ -1391,7 +1391,7 @@
} else if (nncTrans instanceof CalcTransNoeudNiveauContinuLimnigramme) {
nomLoi = "Limnigramme" + nomEmh;
- final AbstractLoi loi = LoiHelper.findByReference(nomLoi, dlhy);
+ final Loi loi = LoiHelper.findByReference(nomLoi, dlhy);
LoiDF loiDF = null;
// Si la loi existe dans CrueData, c'est qu'elle existe aussi dans les conditions initiales ; On met à
@@ -1419,17 +1419,17 @@
}
loiDF.setEvolutionFF(evolutionFF);
- } else if (nncTrans instanceof CalcTransNoeudNiveauContinuTarrage) {
+ } else if (nncTrans instanceof CalcTransNoeudNiveauContinuTarage) {
nomLoi = "Tarrage" + nomEmh;
- final AbstractLoi loi = LoiHelper.findByReference(nomLoi, dlhy);
+ final Loi loi = LoiHelper.findByReference(nomLoi, dlhy);
LoiFF loiFF = null;
// Si la loi existe dans CrueData, c'est qu'elle existe aussi dans les conditions initiales ; On met à
// jour que la liste des points
if (loi instanceof LoiFF) {
loiFF = (LoiFF) loi;
- calcTrans.addCalcTransNoeudNiveauContinuTarrage((CalcTransNoeudNiveauContinuTarrage) nncTrans);
+ calcTrans.addCalcTransNoeudNiveauContinuTarrage((CalcTransNoeudNiveauContinuTarage) nncTrans);
} else {
loiFF = new LoiFF();
loiFF.setNom(nomLoi);
@@ -1439,7 +1439,7 @@
loiFF.setExtrapolInf(LoiHelper.EXTRAPOL_CST);
loiFF.setExtrapolSup(LoiHelper.EXTRAPOL_CST);
- final CalcTransNoeudNiveauContinuTarrage nncTarrage = (CalcTransNoeudNiveauContinuTarrage) nncTrans;
+ final CalcTransNoeudNiveauContinuTarage nncTarrage = (CalcTransNoeudNiveauContinuTarage) nncTrans;
nncTarrage.setTarrage(loiFF);
// Ajout de la loi dans DLHY
@@ -1470,7 +1470,7 @@
&& brancheOrManoeuvre.getNomCalculParent().equals(calcTrans.getNom())) {
nomLoi = "Manoeuvre" + nomEmh;
- final AbstractLoi loi = LoiHelper.findByReference(nomLoi, dlhy);
+ final Loi loi = LoiHelper.findByReference(nomLoi, dlhy);
LoiDF loiDF = null;
// Si la loi existe dans CrueData, c'est qu'elle existe aussi dans les conditions initiales ; On met à
Modified: 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/io/neuf/DHWriter.java 2009-06-04 18:15:30 UTC (rev 4850)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHWriter.java 2009-06-04 22:55:35 UTC (rev 4851)
@@ -968,11 +968,11 @@
final TObjectIntHashMap typesCL = new TObjectIntHashMap();
typesCL.put(CalcTransNoeudNiveauContinuLimnigramme.class, 1);
typesCL.put(CalcTransNoeudNiveauContinuQapp.class, 2);
- typesCL.put(CalcTransNoeudNiveauContinuTarrage.class, 3);
+ typesCL.put(CalcTransNoeudNiveauContinuTarage.class, 3);
typesCL.put(CalcTransBrancheOrificeManoeuvre.class, 41);
// Stocke les lois des Conditions aux limites pour écrire ensuite les lignes E
- final List<AbstractLoi> lignesE = new ArrayList<AbstractLoi>();
+ final List<Loi> lignesE = new ArrayList<Loi>();
afficheLignesBTransEtRecupereDonneesLignesETrans(calcTrans, typesCL, lignesE);
// Ecriture Ligne C
@@ -1065,7 +1065,7 @@
* @throws IOException
*/
private void afficheLignesBTransEtRecupereDonneesLignesETrans(final CalcTrans calcTrans,
- final TObjectIntHashMap typesCL, final List<AbstractLoi> lignesE) throws IOException {
+ final TObjectIntHashMap typesCL, final List<Loi> lignesE) throws IOException {
// final List<EMH> emhs = calcTrans.getListeRefs();
// final List<DonCLimMNoeudNiveauContinu> listeNNCs = calcTrans.gegetListeDonCLimMNoeudNiveauContinu();
@@ -1087,7 +1087,7 @@
}
- for (final CalcTransNoeudNiveauContinuTarrage lim : calcTrans.getCalcTransNoeudNiveauContinuTarrage()) {
+ for (final CalcTransNoeudNiveauContinuTarage lim : calcTrans.getCalcTransNoeudNiveauContinuTarrage()) {
manageTranItem(lim, typesCL, lignesE);
}
@@ -1144,7 +1144,7 @@
}
- private void manageTranItem(final CalcTransItem lim, final TObjectIntHashMap typesCL, final List<AbstractLoi> lignesE)
+ private void manageTranItem(final CalcTransItem lim, final TObjectIntHashMap typesCL, final List<Loi> lignesE)
throws IOException {
fortranWriter_.stringField(0, lim.getEMH().getNom());
int typeCL = typesCL.get(lim.getClass());
@@ -1179,7 +1179,7 @@
* @param loi
* @throws IOException
*/
- private void ecritLoi(final AbstractLoi loi) throws IOException {
+ private void ecritLoi(final Loi loi) throws IOException {
if (loi instanceof LoiDF) {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRFactory.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRFactory.java 2009-06-04 18:15:30 UTC (rev 4850)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRFactory.java 2009-06-04 22:55:35 UTC (rev 4851)
@@ -7,24 +7,17 @@
import java.util.ArrayList;
import java.util.List;
+import com.memoire.fu.FuLog;
+
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.neuf.STRSequentialReader.DonneesSectionOuProfil;
import org.fudaa.dodico.crue.io.neuf.STRSequentialReader.DonneesSectionPourBranche;
import org.fudaa.dodico.crue.io.neuf.STRSequentialReader.DonneesStricklerPourLitSection;
import org.fudaa.dodico.crue.io.neuf.STRSequentialReader.SectionPourAutreBranche;
import org.fudaa.dodico.crue.metier.CrueData;
-import org.fudaa.dodico.crue.metier.emh.DonFrt;
-import org.fudaa.dodico.crue.metier.emh.DonFrtStrickler;
-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.ResPrtGeo;
-import org.fudaa.dodico.crue.metier.emh.ResPrtGeoCasier;
-import org.fudaa.dodico.crue.metier.emh.ResPrtGeoSection;
+import org.fudaa.dodico.crue.metier.emh.*;
import org.fudaa.dodico.crue.metier.helper.LoiHelper;
-import com.memoire.fu.FuLog;
-
/**
* @author cde
*/
@@ -178,31 +171,31 @@
// Alimentation loi LaDeZ
LoiFF loiFF = getLoiFFDeZRPTG(abscissesZ, sectionAutreBranche.getListeLargLitActif(), "LaDeZ", "La");
if (loiFF != null) {
- rptg.setMLaDeZ(loiFF);
+ rptg.setZLact(loiFF);
}
// Alimentation loi DaDeZ
loiFF = getLoiFFDeZRPTG(abscissesZ, sectionAutreBranche.getListeDebLitActif(), "DaDeZ", "Da");
if (loiFF != null) {
- rptg.setMDaDeZ(loiFF);
+ rptg.setZDact(loiFF);
}
// Alimentation loi SaDeZ
loiFF = getLoiFFDeZRPTG(abscissesZ, sectionAutreBranche.getListeSLitActif(), "SaDeZ", "Sa");
if (loiFF != null) {
- rptg.setMSaDeZ(loiFF);
+ rptg.setZSact(loiFF);
}
// Alimentation loi BetaDeZ
loiFF = getLoiFFDeZRPTG(abscissesZ, sectionAutreBranche.getListeBeta(), "BetaDeZ", "Beta");
if (loiFF != null) {
- rptg.setMBetaDeZ(loiFF);
+ rptg.setZBeta(loiFF);
}
// Alimentation loi LsDeZ
loiFF = getLoiFFDeZRPTG(abscissesZ, sectionAutreBranche.getListeLargSto(), "LsDeZ", "Ls");
if (loiFF != null) {
- rptg.setMLsDeZ(loiFF);
+ rptg.setZLsto(loiFF);
}
// Calcul des abscisses de lit
@@ -215,35 +208,19 @@
}
// Alimentation loi PsupDeLit
- loiFF = getLoiFFDeLitRPTG(abscissesDeLit, sectionAutreBranche.getListePerHaut(), "PsupDeLit", "Psup");
- if (loiFF != null) {
- rptg.setMPsupDeLit(loiFF);
- }
-
+ rptg.setLitPsup(getLoiFFDeLitRPTG(abscissesDeLit, sectionAutreBranche.getListePerHaut(), "PsupDeLit", "Psup"));
// Alimentation loi LsupDeLit
- loiFF = getLoiFFDeLitRPTG(abscissesDeLit, sectionAutreBranche.getListeLargHaut(), "LsupDeLit", "Lsup");
- if (loiFF != null) {
- rptg.setMLsupDeLit(loiFF);
- }
-
+ rptg.setLitLsup(getLoiFFDeLitRPTG(abscissesDeLit, sectionAutreBranche.getListeLargHaut(), "LsupDeLit",
+ "Lsup"));
// Alimentation loi KsupDeLit
- loiFF = getLoiFFDeLitRPTG(abscissesDeLit, sectionAutreBranche.getListeStriHaut(), "KsupDeLit", "Ksup");
- if (loiFF != null) {
- rptg.setMKsupDeLit(loiFF);
- }
-
+ rptg.setLitKsup(getLoiFFDeLitRPTG(abscissesDeLit, sectionAutreBranche.getListeStriHaut(), "KsupDeLit",
+ "Ksup"));
// Alimentation loi LinfDeLit
- loiFF = getLoiFFDeLitRPTG(donneesSection.getZFondsLits(), sectionAutreBranche.getListeLargFond(), "LinfDeLit",
- "Linf");
- if (loiFF != null) {
- rptg.setMLinfDeLit(loiFF);
- }
-
+ rptg.setLLitLinf(getLoiFFDeLitRPTG(donneesSection.getZFondsLits(), sectionAutreBranche.getListeLargFond(),
+ "LinfDeLit", "Linf"));
// Alimentation loi SsupDeLit
- loiFF = getLoiFFDeLitRPTG(abscissesDeLit, sectionAutreBranche.getListeSurfHaut(), "SsupDeLit", "Ssup");
- if (loiFF != null) {
- rptg.setMSsupDeLit(loiFF);
- }
+ rptg.setLitSsup(getLoiFFDeLitRPTG(abscissesDeLit, sectionAutreBranche.getListeSurfHaut(), "SsupDeLit",
+ "Ssup"));
}
}
@@ -...
[truncated message content] |
|
From: <de...@us...> - 2009-06-07 23:24:45
|
Revision: 4853
http://fudaa.svn.sourceforge.net/fudaa/?rev=4853&view=rev
Author: deniger
Date: 2009-06-07 23:24:34 +0000 (Sun, 07 Jun 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/Messages.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/CrueConverterDPTI.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/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/STOReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/CrueData.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/CrueDataImpl.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHContainer.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/EMHproject.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/DonCLimMCommon.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrt.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonGeoLoc.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIni.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/DonPrtGeoProfilCasier.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoProfilSection.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/EnumInfosEMH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/InfosEMH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdCalcScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdPrtCIniModeleBase.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResScenario.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/ParamNumModeleBase.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/helper/EMHHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/LoiHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/CruePrefix.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ScenarioWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateModeleScenario.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/messages.properties
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/MockCrueData.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/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/TestCrueETUFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueOCALFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueValidationModele.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/TestValidateModeleScenario.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4-1.drso.xml
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/CrueTreeProject.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/CrueFicheModeleFille.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/CrueFilleEMH.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/crue/view/CrueFilleScenarioManager.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHFactory.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHModeleBase.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHSousModele.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonFrtConteneur.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonLoiHYConteneur.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumEMH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumLitPosition.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtData.java
Removed Paths:
-------------
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/main/resources/org/fudaa/dodico/crue/io/adrienMessages.properties
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/caroleMessages.properties
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/ihmMessages.properties
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/Messages.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/Messages.java 2009-06-05 18:03:25 UTC (rev 4852)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/Messages.java 2009-06-07 23:24:34 UTC (rev 4853)
@@ -16,13 +16,15 @@
// en les créant de la sorte, ALL_RESOURCE_BUNDLE et le parent de DC_RESOURCE qui est le parent de RESOURCE_BUNDLE
private static final ResourceBundle ALL_RESOURCE_BUNDLE = ResourceBundle
.getBundle("org.fudaa.dodico.crue.io.messages");
- private static final ResourceBundle DC_RESOURCE_BUNDLE = ResourceBundle
- .getBundle("org.fudaa.dodico.crue.io.adrienMessages");
- private static final ResourceBundle DH_RESOURCE_BUNDLE = ResourceBundle
- .getBundle("org.fudaa.dodico.crue.io.caroleMessages");
- /** ResourceBundle regroupant tous les ResourceBundle définis par des fichiers properties distincts */
- public static final ResourceBundle RESOURCE_BUNDLE = new TempResourceBundle(ALL_RESOURCE_BUNDLE, DC_RESOURCE_BUNDLE,
- DH_RESOURCE_BUNDLE);
+ // private static final ResourceBundle DC_RESOURCE_BUNDLE = ResourceBundle
+ // .getBundle("org.fudaa.dodico.crue.io.adrienMessages");
+ // private static final ResourceBundle DH_RESOURCE_BUNDLE = ResourceBundle
+ // .getBundle("org.fudaa.dodico.crue.io.caroleMessages");
+ // /** ResourceBundle regroupant tous les ResourceBundle définis par des fichiers properties distincts */
+ // public static final ResourceBundle RESOURCE_BUNDLE = new TempResourceBundle(ALL_RESOURCE_BUNDLE,
+ // DC_RESOURCE_BUNDLE,
+ // DH_RESOURCE_BUNDLE);
+ public static final ResourceBundle RESOURCE_BUNDLE = ALL_RESOURCE_BUNDLE;
protected static class TempResourceBundle extends ResourceBundle {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java 2009-06-05 18:03:25 UTC (rev 4852)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java 2009-06-07 23:24:34 UTC (rev 4853)
@@ -134,7 +134,7 @@
final CatEMHNoeud noeudMetier = getEMHNoeudFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (noeudMetier != null) {
final CalcPseudoPermNoeudNiveauContinuQapp eltMetier = new CalcPseudoPermNoeudNiveauContinuQapp();
- eltMetier.setNomCalculParent(calculPermMetier.getNom());
+ eltMetier.setCalculParent(calculPermMetier);
eltMetier.setQapp(eltPersist.Qapp);
calculPermMetier.addCalcPseudoPermNoeudNiveauContinuQapp(eltMetier);
// listeDonCLimMNoeudNiveauContinu.add(eltMetier);
@@ -150,7 +150,7 @@
final CatEMHNoeud noeudMetier = getEMHNoeudFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (noeudMetier != null) {
final CalcPseudoPermNoeudNiveauContinuZimpose eltMetier = new CalcPseudoPermNoeudNiveauContinuZimpose();
- eltMetier.setNomCalculParent(calculPermMetier.getNom());
+ eltMetier.setCalculParent(calculPermMetier);
eltMetier.setZimpose(eltPersist.Zimpose);
calculPermMetier.addCalcPseudoPermNoeudNiveauContinuZimpose(eltMetier);
noeudMetier.addDCLM(eltMetier);
@@ -163,7 +163,7 @@
final CatEMHBranche brancheMetier = getEMHBrancheFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (brancheMetier != null) {
final CalcPseudoPermBrancheOrificeManoeuvre eltMetier = new CalcPseudoPermBrancheOrificeManoeuvre();
- eltMetier.setNomCalculParent(calculPermMetier.getNom());
+ eltMetier.setCalculParent(calculPermMetier);
eltMetier.setOuv(eltPersist.Ouv);
eltMetier.setSensOuv(eltPersist.SensOuv);
calculPermMetier.addCalcPseudoPermBrancheOrificeManoeuvre(eltMetier);
@@ -178,7 +178,7 @@
final CatEMHBranche brancheMetier = getEMHBrancheFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (brancheMetier != null) {
final CalcPseudoPermBrancheSaintVenantQruis eltMetier = new CalcPseudoPermBrancheSaintVenantQruis();
- eltMetier.setNomCalculParent(calculPermMetier.getNom());
+ eltMetier.setCalculParent(calculPermMetier);
eltMetier.setQruis(eltPersist.Qruis);
calculPermMetier.addCalcPseudoPermBrancheSaintVenantQruis(eltMetier);
// listeDonCLimMBrancheSaintVenant.add(eltMetier);
@@ -193,7 +193,7 @@
final CatEMHCasier casierMetier = getEMHCasierFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (casierMetier != null) {
final CalcPseudoPermCasierProfilQruis eltMetier = new CalcPseudoPermCasierProfilQruis();
- eltMetier.setNomCalculParent(calculPermMetier.getNom());
+ eltMetier.setCalculParent(calculPermMetier);
eltMetier.setQruis(eltPersist.Qruis);
calculPermMetier.addCalcPseudoPermCasierProfilQruis(eltMetier);
// listeDonCLimMCasierProfil.add(eltMetier);
@@ -247,7 +247,7 @@
final CatEMHNoeud noeudMetier = getEMHNoeudFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (noeudMetier != null) {
final CalcTransNoeudNiveauContinuQapp eltMetier = new CalcTransNoeudNiveauContinuQapp();
- eltMetier.setNomCalculParent(calculTransMetier.getNom());
+ eltMetier.setCalculParent(calculTransMetier);
LoiDF loi = null;
if (eltPersist.HydrogrammeQapp == null) {
@@ -267,7 +267,7 @@
final CatEMHNoeud noeudMetier = getEMHNoeudFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (noeudMetier != null) {
final CalcTransNoeudNiveauContinuLimnigramme eltMetier = new CalcTransNoeudNiveauContinuLimnigramme();
- eltMetier.setNomCalculParent(calculTransMetier.getNom());
+ eltMetier.setCalculParent(calculTransMetier);
noeudMetier.addDCLM(eltMetier);
eltMetier.setEMH(noeudMetier);
@@ -290,7 +290,7 @@
final CatEMHNoeud noeudMetier = getEMHNoeudFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (noeudMetier != null) {
final CalcTransNoeudNiveauContinuTarage eltMetier = new CalcTransNoeudNiveauContinuTarage();
- eltMetier.setNomCalculParent(calculTransMetier.getNom());
+ eltMetier.setCalculParent(calculTransMetier);
noeudMetier.addDCLM(eltMetier);
eltMetier.setEMH(noeudMetier);
@@ -311,7 +311,7 @@
final CatEMHBranche brancheMetier = getEMHBrancheFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (brancheMetier != null) {
final CalcTransBrancheOrificeManoeuvre eltMetier = new CalcTransBrancheOrificeManoeuvre();
- eltMetier.setNomCalculParent(calculTransMetier.getNom());
+ eltMetier.setCalculParent(calculTransMetier);
brancheMetier.addDCLM(eltMetier);
eltMetier.setEMH(brancheMetier);
LoiDF loi = null;
@@ -332,7 +332,7 @@
final CatEMHBranche brancheMetier = getEMHBrancheFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (brancheMetier != null) {
final CalcTransBrancheSaintVenantQruis eltMetier = new CalcTransBrancheSaintVenantQruis();
- eltMetier.setNomCalculParent(calculTransMetier.getNom());
+ eltMetier.setCalculParent(calculTransMetier);
brancheMetier.addDCLM(eltMetier);
eltMetier.setEMH(brancheMetier);
LoiDF loi = null;
@@ -353,7 +353,7 @@
final CatEMHCasier casierMetier = getEMHCasierFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (casierMetier != null) {
final CalcTransCasierProfilQruis eltMetier = new CalcTransCasierProfilQruis();
- eltMetier.setNomCalculParent(calculTransMetier.getNom());
+ eltMetier.setCalculParent(calculTransMetier);
casierMetier.addDCLM(eltMetier);
eltMetier.setEMH(casierMetier);
LoiDF loi = null;
@@ -390,8 +390,7 @@
* @param analyzer
* @return
*/
- private static Loi getLoiFromReferenceDLHY(final String nomRef, final CrueData dataLinked,
- final CtuluAnalyze analyzer) {
+ private static Loi getLoiFromReferenceDLHY(final String nomRef, final CrueData dataLinked, final CtuluAnalyze analyzer) {
final Loi loi = LoiHelper.findByReference(nomRef, dataLinked.getLois());
if (loi == null) {
Modified: 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/CrueConverterDCSP.java 2009-06-05 18:03:25 UTC (rev 4852)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCSP.java 2009-06-07 23:24:34 UTC (rev 4853)
@@ -7,49 +7,9 @@
import org.apache.commons.collections.CollectionUtils;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.common.CrueConstants;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheAbstract;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheBarrageFilEau;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheBarrageFilEauAbstract;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheBarrageGenerique;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheBarrageGeneriqueAbstract;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheClassiqueAbstract;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheNiveauxAssocies;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheOrifice;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBranchePDCAbstract;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBranchePdc;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheSaintVenant;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheSeuilAbstract;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheSeuilLateral;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheSeuilTransversal;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoElemAvecSeuilPdc;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoElemSeuilOrifice;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoPdc;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoRegimeDenoye;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoRegimeNoye;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoZasso;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.SectionBrancheAbstract;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.*;
import org.fudaa.dodico.crue.metier.CrueData;
-import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
-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.DonCalcSansPrtBrancheNiveauxAssocies;
-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.EMH;
-import org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageFilEau;
-import org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageGenerique;
-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.EMHBrancheSeuilLateral;
-import org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilTransversal;
-import org.fudaa.dodico.crue.metier.emh.ElemSeuilAvecPdc;
-import org.fudaa.dodico.crue.metier.emh.LoiFF;
+import org.fudaa.dodico.crue.metier.emh.*;
import org.fudaa.dodico.crue.metier.helper.EMHBrancheHelper;
/**
@@ -69,7 +29,7 @@
final List<EMH> listeEMHDRSO = dataLinked.getAllEMH();
// -- remplissage des branches --//
- CrueConverterDCSP.daoToMetierBranche(dao.DonCalcSansPrtBranches, listeEMHDRSO, analyser);
+ daoToMetierBranche(dao.DonCalcSansPrtBranches, listeEMHDRSO, analyser);
// -- remplissage des sections --//
// CrueConverterDCSP.daoToMetierSection(dao.Sections, listeEMHDRSO, analyser);
@@ -382,6 +342,7 @@
seuilPersist.CoefD = seuilMetier.getCoefD();
seuilPersist.Largeur = seuilMetier.getLargeur();
seuilPersist.Zseuil = seuilMetier.getZseuil();
+ seuilPersist.Haut = seuilMetier.getHaut();
seuilPersist.CoefCtrLim = seuilMetier.getCoefCtrLim();
seuilPersist.Sens = seuilMetier.getSens();
return seuilPersist;
@@ -638,6 +599,7 @@
seuilMetier.setCoefD(seuilPersist.CoefD);
seuilMetier.setLargeur(seuilPersist.Largeur);
seuilMetier.setZseuil(seuilPersist.Zseuil);
+ seuilMetier.setHaut(seuilPersist.Haut);
seuilMetier.setCoefCtrLim(seuilPersist.CoefCtrLim);
seuilMetier.setSens(seuilPersist.Sens);
Modified: 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/CrueConverterDFRT.java 2009-06-05 18:03:25 UTC (rev 4852)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDFRT.java 2009-06-07 23:24:34 UTC (rev 4853)
@@ -7,7 +7,7 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDLHY.DaoLoiFF;
import org.fudaa.dodico.crue.metier.CrueData;
-import org.fudaa.dodico.crue.metier.CrueDataImpl;
+import org.fudaa.dodico.crue.metier.EMHFactory;
import org.fudaa.dodico.crue.metier.emh.DonFrt;
import org.fudaa.dodico.crue.metier.emh.DonFrtStrickler;
@@ -36,7 +36,7 @@
}
public DonFrt toMetier(final DaoLoiFF inDao) {
- final DonFrtStrickler outMetier = CrueDataImpl.createDonFrtStrickler(null);
+ final DonFrtStrickler outMetier = EMHFactory.createDonFrtStrickler(null);
// outMetier.Strickler = inDao;
AbstractDaoLoi.daoToMetierLoi(outMetier.Strickler, inDao);
return outMetier;
Modified: 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/CrueConverterDLHY.java 2009-06-05 18:03:25 UTC (rev 4852)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDLHY.java 2009-06-07 23:24:34 UTC (rev 4853)
@@ -74,8 +74,7 @@
/**
* Convertit les objets persistants en objets métier
*/
- public List<Loi> convertDaoToMetier(final CrueDaoDLHY dao, final CrueData dataLinked,
- final CtuluAnalyze analyser) {
+ public List<Loi> convertDaoToMetier(final CrueDaoDLHY dao, final CrueData dataLinked, final CtuluAnalyze analyser) {
final List<AbstractDaoLoi> inLois = dao.Lois;
List<Loi> outLoi = Collections.emptyList();
@@ -92,6 +91,9 @@
outLoi.add(cs.daoToMetier(in));
}
}
+ if (dataLinked != null) {
+ dataLinked.getLoiConteneur().setLois(outLoi);
+ }
return outLoi;
}
Modified: 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/CrueConverterDPTI.java 2009-06-05 18:03:25 UTC (rev 4852)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTI.java 2009-06-07 23:24:34 UTC (rev 4853)
@@ -5,54 +5,9 @@
import org.apache.commons.collections.CollectionUtils;
import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI.BrancheAbstract;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI.BrancheBarrageFilEau;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI.BrancheBarrageGenerique;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI.BrancheEnchainement;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI.BrancheNiveauxAssocies;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI.BrancheOrifice;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI.BranchePdc;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI.BrancheSaintVenant;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI.BrancheSeuilLateral;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI.BrancheSeuilTransversal;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI.BrancheStrickler;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI.CasierAbstract;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI.CasierMNT;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI.CasierProfil;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI.NoeudNiveauContinu;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI.SectionAbstract;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI.SectionRefIdem;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI.SectionRefInterpolee;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI.SectionRefProfil;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI.SectionRefSansGeometrie;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDPTI.*;
import org.fudaa.dodico.crue.metier.CrueData;
-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.DonPrtCIni;
-import org.fudaa.dodico.crue.metier.emh.DonPrtCIniBranche;
-import org.fudaa.dodico.crue.metier.emh.DonPrtCIniBrancheOrifice;
-import org.fudaa.dodico.crue.metier.emh.DonPrtCIniBrancheSaintVenant;
-import org.fudaa.dodico.crue.metier.emh.DonPrtCIniCasierProfil;
-import org.fudaa.dodico.crue.metier.emh.DonPrtCIniNoeudNiveauContinu;
-import org.fudaa.dodico.crue.metier.emh.DonPrtCIniSection;
-import org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageFilEau;
-import org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageGenerique;
-import org.fudaa.dodico.crue.metier.emh.EMHBrancheEnchainement;
-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.EMHBrancheSeuilLateral;
-import org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilTransversal;
-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.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;
@@ -78,16 +33,16 @@
final CrueData dataCrue = dataLinked;
// -- remplissage des noeuds --//
- remplirNoeudAvecPersistanceDPTI(dao.DonPrtCIniNoeuds, dataCrue.getNoeuds(), analyser);
+ daoToMetierNoeud(dao.DonPrtCIniNoeuds, dataCrue.getNoeuds(), analyser);
// -- remplissage des branches --//
- remplirBrancheAvecPersistanceDPTI(dao.DonPrtCIniBranches, dataCrue.getBranches(), analyser);
+ daoToMetierBranche(dao.DonPrtCIniBranches, dataCrue.getBranches(), analyser);
// -- remplissage des casiers --//
- CrueConverterDPTI.remplirCasierAvecPersistanceDPTI(dao.DonPrtCIniCasiers, dataCrue.getCasiers(), analyser);
+ daoToMetierCasier(dao.DonPrtCIniCasiers, dataCrue.getCasiers(), analyser);
// -- remplissage des sections --//
- CrueConverterDPTI.remplirSectionsAvecPersistanceDPTI(dao.DonPrtCIniSections, dataCrue.getSections(), analyser);
+ daoToMetierSection(dao.DonPrtCIniSections, dataCrue.getSections(), analyser);
// TODO pour le moment rien mais il faudrait demander des pr�cisions --//
@@ -101,16 +56,16 @@
final CrueDaoDPTI res = new CrueDaoDPTI();
// -- etape 1: on remplit les infso des noeuds --//
- res.DonPrtCIniNoeuds = CrueConverterDPTI.remplirPersistanceAvecNoeudDPTI(metier.getNoeuds(), analyser);
+ res.DonPrtCIniNoeuds = metierToDaoNoeud(metier.getNoeuds(), analyser);
// -- etape 2: on remplit les infso des branches --//
- res.DonPrtCIniBranches = CrueConverterDPTI.remplirPersistanceAvecBrancheDPTI(metier.getBranches(), analyser);
+ res.DonPrtCIniBranches = metierToDaoBranche(metier.getBranches(), analyser);
// -- etape 3: on remplit les infso des casiers --//
- res.DonPrtCIniCasiers = CrueConverterDPTI.remplirPersistanceAvecCasierDPTI(metier.getCasiers(), analyser);
+ res.DonPrtCIniCasiers = metierToDaoCasier(metier.getCasiers(), analyser);
// -- etape 4: on remplit les infso des sections --//
- res.DonPrtCIniSections = Cru...
[truncated message content] |
|
From: <car...@us...> - 2009-06-09 17:03:59
|
Revision: 4860
http://fudaa.svn.sourceforge.net/fudaa/?rev=4860&view=rev
Author: caroledel
Date: 2009-06-09 17:03:53 +0000 (Tue, 09 Jun 2009)
Log Message:
-----------
DH : test lecture crue 10 + ecriture crue 9
Modified Paths:
--------------
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/CrueConverterPCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPNUM.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java
Modified: 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/CrueConverterOCAL.java 2009-06-09 13:13:46 UTC (rev 4859)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOCAL.java 2009-06-09 17:03:53 UTC (rev 4860)
@@ -77,6 +77,7 @@
}
}
+ dataLinked.setOrdCalc(metier);
}
return metier;
Modified: 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/CrueConverterPCAL.java 2009-06-09 13:13:46 UTC (rev 4859)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPCAL.java 2009-06-09 17:03:53 UTC (rev 4860)
@@ -49,6 +49,10 @@
metier.setVerbosite(dao.Verbosite);
}
+ if (dataLinked != null) {
+ dataLinked.setParamCalc(metier);
+ }
+
return metier;
}
Modified: 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/CrueConverterPNUM.java 2009-06-09 13:13:46 UTC (rev 4859)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPNUM.java 2009-06-09 17:03:53 UTC (rev 4860)
@@ -13,7 +13,14 @@
import org.fudaa.dodico.crue.io.dao.CrueDaoStructurePNUM.DaoParamNumCommuns;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructurePNUM.DaoPdt;
import org.fudaa.dodico.crue.metier.CrueData;
-import org.fudaa.dodico.crue.metier.emh.*;
+import org.fudaa.dodico.crue.metier.emh.Duration;
+import org.fudaa.dodico.crue.metier.emh.ElemPdt;
+import org.fudaa.dodico.crue.metier.emh.ParamNumCalcPseudoPerm;
+import org.fudaa.dodico.crue.metier.emh.ParamNumCalcTrans;
+import org.fudaa.dodico.crue.metier.emh.ParamNumModeleBase;
+import org.fudaa.dodico.crue.metier.emh.Pdt;
+import org.fudaa.dodico.crue.metier.emh.PdtCst;
+import org.fudaa.dodico.crue.metier.emh.PdtVar;
/**
* Classe qui se charge de remplir les structures DAO du fichier PNUM avec les donnees metier et inversement.
@@ -34,6 +41,11 @@
metier.zref = dao.ParamNumCommuns.Zref;
metier.paramNumCalcPseudoPerm = daoToMetierPseudo(dao);
metier.paramNumCalcTrans = daoToMetierTrans(dao);
+
+ if (dataLinked != null) {
+ dataLinked.setParamNumModeleBase(metier);
+ }
+
return metier;
}
Modified: 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/TestCrueDH.java 2009-06-09 13:13:46 UTC (rev 4859)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java 2009-06-09 17:03:53 UTC (rev 4860)
@@ -9,7 +9,36 @@
import org.fudaa.dodico.crue.io.common.CrueIOResu;
import org.fudaa.dodico.crue.io.common.Messages;
import org.fudaa.dodico.crue.metier.CrueData;
-import org.fudaa.dodico.crue.metier.emh.*;
+import org.fudaa.dodico.crue.metier.emh.CalcPseudoPerm;
+import org.fudaa.dodico.crue.metier.emh.CalcPseudoPermBrancheOrificeManoeuvre;
+import org.fudaa.dodico.crue.metier.emh.CalcPseudoPermNoeudNiveauContinuQapp;
+import org.fudaa.dodico.crue.metier.emh.CalcPseudoPermNoeudNiveauContinuZimpose;
+import org.fudaa.dodico.crue.metier.emh.CalcTrans;
+import org.fudaa.dodico.crue.metier.emh.CalcTransBrancheOrificeManoeuvre;
+import org.fudaa.dodico.crue.metier.emh.CalcTransNoeudNiveauContinuQapp;
+import org.fudaa.dodico.crue.metier.emh.CalcTransNoeudNiveauContinuTarage;
+import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
+import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
+import org.fudaa.dodico.crue.metier.emh.DonCLimM;
+import org.fudaa.dodico.crue.metier.emh.DonCLimMScenario;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrt;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.metier.emh.DonPrtCIniBranche;
+import org.fudaa.dodico.crue.metier.emh.DonPrtCIniNoeudNiveauContinu;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.metier.emh.EnumFormulePdc;
+import org.fudaa.dodico.crue.metier.emh.EnumSensOuv;
+import org.fudaa.dodico.crue.metier.emh.EvolutionFF;
+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.metier.emh.ParamCalcScenario;
+import org.fudaa.dodico.crue.metier.emh.ParamNumModeleBase;
+import org.fudaa.dodico.crue.metier.emh.Pdt;
+import org.fudaa.dodico.crue.metier.emh.PdtCst;
+import org.fudaa.dodico.crue.metier.emh.PtEvolutionFF;
import org.fudaa.dodico.crue.metier.helper.EMHBrancheHelper;
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
import org.fudaa.dodico.crue.metier.helper.EMHNoeudHelper;
@@ -23,6 +52,13 @@
public class TestCrueDH extends AbstractTestCase {
protected static final String FICHIER_TEST_MODELE3_DH = "/fichierTest/Modele3.dh";
+ protected static final String FICHIER_TEST_MODELE3_DCSP = "/fichierTest/Modele3.dcsp.xml";
+ protected static final String FICHIER_TEST_MODELE3_OCAL = "/fichierTest/Modele3.ocal.xml";
+ protected static final String FICHIER_TEST_MODELE3_PCAL = "/fichierTest/Modele3.pcal.xml";
+ protected static final String FICHIER_TEST_MODELE3_PNUM = "/fichierTest/Modele3.pnum.xml";
+ protected static final String FICHIER_TEST_MODELE3_DPTI = "/fichierTest/Modele3.dpti.xml";
+ protected static final String FICHIER_TEST_MODELE3_DLHY = "/fichierTest/Modele3.dlhy.xml";
+ protected static final String FICHIER_TEST_MODELE3_DCLM = "/fichierTest/Modele3.dclm.xml";
/**
* Test de lecture
@@ -66,30 +102,48 @@
}
/**
- * Test cycle de lecture/ecriture/lecture (+ verif donnees) du modele 3
+ * Test lecture des fichiers crue 10 du modele 3 et ecriture du fichier DH correspondant
*/
- public void testLectureEcritureLectureCRUE9Modele3() {
+ public void testLectureFichiersCrue10etEcritureCrue9() {
- final CtuluAnalyze analyzer = new CtuluAnalyze();
- // -- lecture --//
- final TestCrueDC testDC = new TestCrueDC();
- CrueData data = testDC.testLectureFichierDC("/fichierTest/Modele3.dc");
- final CrueIOResu<CrueData> res = Crue9FileFormatFactory.getDHFileFormat().read(FICHIER_TEST_MODELE3_DH, analyzer,
- data);
+ final CtuluAnalyze analyzer = new CtuluAnalyze(Messages.RESOURCE_BUNDLE);
+ // -- lecture DRSO --//
+ final CrueData data = Crue10FileFormatFactory.getDRSOFileFormat().read(
+ TestCrueDRSOFile.FICHIER_TEST_MODELE3_DRSO_XML, analyzer, null);
testAnalyser(analyzer);
- // -- ecriture --//
- final File f = createTemptxtFile("modele3");
- writeModeleCrue9(analyzer, f, res.getMetier());
+ // -- lecture DCSP --//
+ Crue10FileFormatFactory.getDCSPFileFormat().read(FICHIER_TEST_MODELE3_DCSP, analyzer, data);
testAnalyser(analyzer);
- // -- lecture --//
- data = testDC.testLectureFichierDC("/fichierTest/Modele3.dc");
- final CrueIOResu<CrueData> res2 = Crue9FileFormatFactory.getDHFileFormat().read(f, analyzer, data);
+ // -- lecture PCAL --//
+ Crue10FileFormatFactory.getPCALFileFormat().read(FICHIER_TEST_MODELE3_PCAL, analyzer, data);
testAnalyser(analyzer);
- testData(res2.getMetier(), true);
+ // -- lecture DPTI --//
+ Crue10FileFormatFactory.getDPTIFileFormat().read(FICHIER_TEST_MODELE3_DPTI, analyzer, data);
+ testAnalyser(analyzer);
+ // -- lecture PNUM --//
+ Crue10FileFormatFactory.getPNUMFileFormat().read(FICHIER_TEST_MODELE3_PNUM, analyzer, data);
+ testAnalyser(analyzer);
+
+ // -- lecture DLHY --//
+ Crue10FileFormatFactory.getDLHYFileFormat().read(FICHIER_TEST_MODELE3_DLHY, analyzer, data);
+ testAnalyser(analyzer);
+
+ // -- lecture DCLM --//
+ Crue10FileFormatFactory.getDCLMFileFormat().read(FICHIER_TEST_MODELE3_DCLM, analyzer, data);
+ testAnalyser(analyzer);
+
+ // -- lecture OCAL --//
+ Crue10FileFormatFactory.getOCALFileFormat().read(FICHIER_TEST_MODELE3_OCAL, analyzer, data);
+ testAnalyser(analyzer);
+
+ // -- ecriture DH (crue9) --//
+ final File f = createTemptxtFile("modele3");
+ writeModeleCrue9(analyzer, f, data);
+ testAnalyser(analyzer);
}
/**
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-06-09 13:13:46 UTC (rev 4859)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java 2009-06-09 17:03:53 UTC (rev 4860)
@@ -16,10 +16,6 @@
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.fudaa.commun.FudaaLib;
@@ -28,6 +24,17 @@
import org.fudaa.fudaa.crue.common.CrueEditorImplementation;
import org.fudaa.fudaa.ressource.FudaaResource;
+import com.memoire.bu.BuApplication;
+import com.memoire.bu.BuCommonInterface;
+import com.memoire.bu.BuIcon;
+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.FuLib;
+import com.memoire.fu.FuLog;
+
/**
* Launcher de crue.
*
@@ -86,7 +93,7 @@
// infoCrue_.logo = new BuIcon(pathLogo);
infoCrue_.name = "Fudaa-Crue";
infoCrue_.version = "0.1";
- infoCrue_.date = "29-mai -2009";
+ infoCrue_.date = "29-mai-2009";
infoCrue_.rights = "";
infoCrue_.contact = "fu...@ge...";
infoCrue_.license = "GPL2";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-06-27 19:59:35
|
Revision: 4891
http://fudaa.svn.sourceforge.net/fudaa/?rev=4891&view=rev
Author: deniger
Date: 2009-06-27 19:57:53 +0000 (Sat, 27 Jun 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrueBinaryFileFormat.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/CrueFileFormatManager.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/common/CrueData.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataImpl.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/Messages.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/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/CrueConverterOPTI.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/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/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/CrueDaoStructureOPTI.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/CrueHelper.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/CrueXmlReaderWriterImpl.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/FichierCrueManager.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerContrat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHContainer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHContainerBase.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHModeleBase.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHSousModele.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/projet/ProjetMessages.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateModeleScenario.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/ioMessages.properties
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/projet/projetMessages.properties
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/ctulu/ExampleCtuluDefaultLogFormatter.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDC.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDCLMFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDCSPFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDFRTFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDLHYFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/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/TestCrueOCALFile.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/TestCrueOPTIFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueORESFile.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
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueValidationModele.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueEditorImplementation.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/ScenarioLoaderUI.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioSaver.java
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/crue/common/messages.properties
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueMessageHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueFileType.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/OrdonnanceurCrue10.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue10.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueConstants.java
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -146,9 +146,9 @@
* @param _m
* @param arg
*/
- public void addFatalError(final String _m, final Object arg) {
+ public void addFatalError(final String _m, final Object... arg) {
// TODO a continuer
- addError(_m);
+ addError(_m, arg);
}
/**
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueMessageHelper.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueMessageHelper.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueMessageHelper.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -0,0 +1,29 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.common;
+
+import java.text.MessageFormat;
+import java.util.ResourceBundle;
+
+import org.fudaa.ctulu.CtuluLibArray;
+
+/**
+ * @author deniger
+ */
+public final class CrueMessageHelper {
+
+ /**
+ * @param bundle
+ * @param s le message initial
+ * @param args les arguements a utiliser pour le message
+ * @return la chaine traduite
+ */
+ public static String getS(ResourceBundle bundle, final String s, Object... args) {
+ String res = bundle.getString(s);
+ if (!CtuluLibArray.isEmpty(args)) { return new MessageFormat(res).format(args); }
+ return res;
+ }
+
+}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -87,7 +87,7 @@
return source;
}
- public boolean write(final CrueIOResu<CrueData> metier, final File f, final CtuluAnalyze analyzer) {
+ public boolean writeMetier(final CrueIOResu<CrueData> metier, final File f, final CtuluAnalyze analyzer) {
analyzer.setDesc(f.getName());
final AbstractCrue9Writer writer = createWriter();
writer.setFile(f);
@@ -99,8 +99,16 @@
return (ok && (operation.containsClosingError() || operation.containsFatalError()));
}
- public boolean write(final OutputStream out, final CrueIOResu<CrueData> metier, final CtuluAnalyze analyser) {
+ public boolean writeMetier(final CrueIOResu<CrueData> metier, final OutputStream out, final CtuluAnalyze analyser) {
throw new IllegalAccessError("Must be done");
}
+ public boolean write(CrueData metier, File f, CtuluAnalyze analyzer) {
+ return writeMetier(new CrueIOResu<CrueData>(metier), f, analyzer);
+ }
+
+ public boolean write(CrueData metier, OutputStream out, CtuluAnalyze analyser) {
+ return writeMetier(new CrueIOResu<CrueData>(metier), out, analyser);
+ }
+
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrueBinaryFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrueBinaryFileFormat.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrueBinaryFileFormat.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -79,12 +79,20 @@
throw new IllegalArgumentException("Not supported");
}
- public boolean write(CrueIOResu<M> metier, File f, CtuluAnalyze analyzer) {
+ public boolean writeMetier(CrueIOResu<M> metier, File f, CtuluAnalyze analyzer) {
throw new IllegalArgumentException("Not supported");
}
- public boolean write(OutputStream out, CrueIOResu<M> metier, CtuluAnalyze analyser) {
+ public boolean write(CrueData metier, File f, CtuluAnalyze analyzer) {
throw new IllegalArgumentException("Not supported");
}
+ public boolean write(CrueData metier, OutputStream out, CtuluAnalyze analyser) {
+ throw new IllegalArgumentException("Not supported");
+ }
+
+ public boolean writeMetier(CrueIOResu<M> metier, OutputStream out, CtuluAnalyze analyser) {
+ throw new IllegalArgumentException("Not supported");
+ }
+
}
\ No newline at end of file
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-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormat.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -3,6 +3,7 @@
import java.io.File;
import java.io.OutputStream;
import java.net.URL;
+import java.util.Map;
import com.memoire.bu.BuFileFilter;
@@ -10,6 +11,7 @@
import org.fudaa.ctulu.fileformat.FileReadOperationAbstract;
import org.fudaa.ctulu.fileformat.FileWriteOperationAbstract;
import org.fudaa.dodico.crue.io.common.CrueData;
+import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.dao.CrueXmlReaderWriter;
/**
@@ -27,8 +29,9 @@
/**
* @param type le type en Upper case comme par exemple DFRT.
*/
- protected Crue10FileFormat(final CrueXmlReaderWriter<M> readerWriter) {
- this(readerWriter.getXsdId(), readerWriter);
+ protected Crue10FileFormat(final CrueXmlReaderWriter<M> readerWriter, final Map<CrueFileType, Crue10FileFormat> saver) {
+ this(readerWriter.getFileType(), readerWriter, saver);
+
}
@SuppressWarnings("serial")
@@ -52,14 +55,21 @@
/**
* @param type le type en Upper case comme par exemple DFRT.
*/
- protected Crue10FileFormat(final String type, final CrueXmlReaderWriter<M> readerWriter) {
+ protected Crue10FileFormat(final CrueFileType type, final CrueXmlReaderWriter<M> readerWriter,
+ final Map<CrueFileType, Crue10FileFormat> saver) {
super(1);
this.readerWriter = readerWriter;
- nom = type.toLowerCase();
+ nom = type.toString().toLowerCase();
id = nom;
extensions = new String[] { nom + ".xml" };
description = nom + ".file";
+ }
+ /**
+ * @return type du fichier supporte.
+ */
+ public CrueFileType getFileType() {
+ return readerWriter.getFileType();
}
/**
@@ -189,18 +199,28 @@
* @param analyzer
* @return true si l'écriture s'est bien passée
*/
- public final boolean write(final M metier, final File f, final CtuluAnalyze analyzer) {
+ public final boolean write(final CrueData metier, final File f, final CtuluAnalyze analyzer) {
return readerWriter.writeXML(metier, f, analyzer);
}
+ public boolean write(final CrueData metier, final OutputStream out, final CtuluAnalyze analyser) {
+ return readerWriter.writeXML(metier, out, analyser);
+ }
+
+ public boolean writeMetier(final M metier, final OutputStream out, final CtuluAnalyze analyser) {
+ return readerWriter.writeXMLMetier(metier, out, analyser);
+ }
+
/**
- * @param out le flux de sortie qui ne sera pas ferme
- * @param metier l'objet metier
- * @param analyser
- * @return true si reussite
+ * Méthode qui permet d'écrire les datas dans le fichier f spécifié.
+ *
+ * @param metier
+ * @param f
+ * @param analyzer
+ * @return true si l'écriture s'est bien passée
*/
- public boolean write(final OutputStream out, final M metier, final CtuluAnalyze analyser) {
- return readerWriter.writeXML(out, metier, analyser);
+ public final boolean writeMetier(final M metier, final File f, final CtuluAnalyze analyzer) {
+ return readerWriter.writeXMLMetier(metier, f, analyzer);
}
}
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-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -1,9 +1,11 @@
package org.fudaa.dodico.crue.io;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
-import org.fudaa.dodico.crue.io.common.CrueConstants;
import org.fudaa.dodico.crue.io.common.CrueData;
+import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.dao.*;
import org.fudaa.dodico.crue.metier.EMHproject;
import org.fudaa.dodico.crue.metier.emh.*;
@@ -13,166 +15,185 @@
*
* @author Adrien Hadoux
*/
-public class Crue10FileFormatFactory {
+public final class Crue10FileFormatFactory {
- private final static Crue10FileFormat<CrueData> DCSP = new Crue10FileFormat<CrueData>(
- new CrueXmlReaderWriterImpl<CrueDaoDCSP, CrueData>(CrueConstants.DCSP, new CrueConverterDCSP(),
- new CrueDaoStructureDCSP()));
+ private final Map<CrueFileType, Crue10FileFormat> fnts = new HashMap<CrueFileType, Crue10FileFormat>();
- private final static Crue10FileFormat<List<DonFrt>> DFRT = new Crue10FileFormat<List<DonFrt>>(
- new CrueXmlReaderWriterImpl<CrueDaoDFRT, List<DonFrt>>(CrueConstants.DFRT, new CrueConverterDFRT(),
- new CrueDaoStructureDFRT()));
+ private final Crue10FileFormat<CrueData> dcsp = new Crue10FileFormat<CrueData>(
+ new CrueXmlReaderWriterImpl<CrueDaoDCSP, CrueData>(CrueFileType.DCSP, new CrueConverterDCSP(),
+ new CrueDaoStructureDCSP()), fnts);
- private final static Crue10FileFormat<List<Loi>> DLHY = new Crue10FileFormat<List<Loi>>(
- new CrueXmlReaderWriterImpl<CrueDaoDLHY, List<Loi>>(CrueConstants.DLHY, new CrueConverterDLHY(),
- new CrueDaoStructureDLHY()));
+ private final Crue10FileFormat<List<DonFrt>> dfrt = new Crue10FileFormat<List<DonFrt>>(
+ new CrueXmlReaderWriterImpl<CrueDaoDFRT, List<DonFrt>>(CrueFileType.DFRT, new CrueConverterDFRT(),
+ new CrueDaoStructureDFRT()), fnts);
- private final static Crue10FileFormat<CrueData> DPTG = new Crue10FileFormat<CrueData>(
- new CrueXmlReaderWriterImpl<CrueDaoDPTG, CrueData>(CrueConstants.DPTG, new CrueConverterDPTG(),
- new CrueDaoStructureDPTG()));
+ private final Crue10FileFormat<List<Loi>> dlhy = new Crue10FileFormat<List<Loi>>(
+ new CrueXmlReaderWriterImpl<CrueDaoDLHY, List<Loi>>(CrueFileType.DLHY, new CrueConverterDLHY(),
+ new CrueDaoStructureDLHY()), fnts);
- private final static Crue10FileFormat<CrueData> DPTI = new Crue10FileFormat<CrueData>(
- new CrueXmlReaderWriterImpl<CrueDaoDPTI, CrueData>(CrueConstants.DPTI, new CrueConverterDPTI(),
- new CrueDaoStructureDPTI()));
+ private final Crue10FileFormat<CrueData> dptg = new Crue10FileFormat<CrueData>(
+ new CrueXmlReaderWriterImpl<CrueDaoDPTG, CrueData>(CrueFileType.DPTG, new CrueConverterDPTG(),
+ new CrueDaoStructureDPTG()), fnts);
- private final static Crue10FileFormat<CrueData> DRSO = new Crue10FileFormat<CrueData>(
- new CrueXmlReaderWriterImpl<CrueDaoDRSO, CrueData>(CrueConstants.DRSO, new CrueConverterDRSO(),
- new CrueDaoStructureDRSO()));
+ private final Crue10FileFormat<CrueData> dpti = new Crue10FileFormat<CrueData>(
+ new CrueXmlReaderWriterImpl<CrueDaoDPTI, CrueData>(CrueFileType.DPTI, new CrueConverterDPTI(),
+ new CrueDaoStructureDPTI()), fnts);
- private final static Crue10FileFormat<EMHproject> ETU = new Crue10FileFormat<EMHproject>(CrueConstants.ETU,
- new CrueXmlReaderWriterImpl<CrueDaoETU, EMHproject>(CrueConstants.ETU, new CrueConverterETU(),
- new CrueDaoStructureETU()));
+ private final Crue10FileFormat<CrueData> drso = new Crue10FileFormat<CrueData>(
+ new CrueXmlReaderWriterImpl<CrueDaoDRSO, CrueData>(CrueFileType.DRSO, new CrueConverterDRSO(),
+ new CrueDaoStructureDRSO()), fnts);
- private final static Crue10FileFormat<OrdPrtGeoModeleBase> OPTG = new Crue10FileFormat<OrdPrtGeoModeleBase>(
- new CrueXmlReaderWriterImpl<CrueDaoOPTG, OrdPrtGeoModeleBase>(CrueConstants.OPTG, new CrueConverterOPTG(),
- new CrueDaoStructureOPTG()));
+ private final Crue10FileFormat<EMHproject> etu = new Crue10FileFormat<EMHproject>(
+ new CrueXmlReaderWriterImpl<CrueDaoETU, EMHproject>(CrueFileType.ETU, new CrueConverterETU(),
+ new CrueDaoStructureETU()), fnts);
- private final static Crue10FileFormat<DonCLimMScenario> DCLM = new Crue10FileFormat<DonCLimMScenario>(
- new CrueXmlReaderWriterImpl<CrueDaoDCLM, DonCLimMScenario>(CrueConstants.DCLM, new CrueConverterDCLM(),
- new CrueDaoStructureDCLM()));
+ private final Crue10FileFormat<OrdPrtGeoModeleBase> optg = new Crue10FileFormat<OrdPrtGeoModeleBase>(
+ new CrueXmlReaderWriterImpl<CrueDaoOPTG, OrdPrtGeoModeleBase>(CrueFileType.OPTG, new CrueConverterOPTG(),
+ new CrueDaoStructureOPTG()), fnts);
- private final static Crue10FileFormat<OrdResScenario> ORES = new Crue10FileFormat<OrdResScenario>(
- new CrueXmlReaderWriterImpl<CrueDaoORES, OrdResScenario>(CrueConstants.ORES, new CrueConverterORES(),
- new CrueDaoStructureORES()));
+ private final Crue10FileFormat<DonCLimMScenario> dclm = new Crue10FileFormat<DonCLimMScenario>(
+ new CrueXmlReaderWriterImpl<CrueDaoDCLM, DonCLimMScenario>(CrueFileType.DCLM, new CrueConverterDCLM(),
+ new CrueDaoStructureDCLM()), fnts);
- private final static Crue10FileFormat<OrdCalcScenario> OCAL = new Crue10FileFormat<OrdCalcScenario>(
- new CrueXmlReaderWriterImpl<CrueDaoOCAL, OrdCalcScenario>(CrueConstants.OCAL, new CrueConverterOCAL(),
- new CrueDaoStructureOCAL()));
+ private final Crue10FileFormat<OrdResScenario> ores = new Crue10FileFormat<OrdResScenario>(
+ new CrueXmlReaderWriterImpl<CrueDaoORES, OrdResScenario>(CrueFileType.ORES, new CrueConverterORES(),
+ new CrueDaoStructureORES()), fnts);
- private final static Crue10FileFormat<ParamCalcScenario> PCAL = new Crue10FileFormat<ParamCalcScenario>(
- new CrueXmlReaderWriterImpl<CrueDaoPCAL, ParamCalcScenario>(CrueConstants.PCAL, new CrueConverterPCAL(),
- new CrueDaoStructurePCAL()));
+ private final Crue10FileFormat<OrdCalcScenario> ocal = new Crue10FileFormat<OrdCalcScenario>(
+ new CrueXmlReaderWriterImpl<CrueDaoOCAL, OrdCalcScenario>(CrueFileType.OCAL, new CrueConverterOCAL(),
+ new CrueDaoStructureOCAL()), fnts);
- private final static Crue10FileFormat<ParamNumModeleBase> PNUM = new Crue10FileFormat<ParamNumModeleBase>(
- new CrueXmlReaderWriterImpl<CrueDaoPNUM, ParamNumModeleBase>(CrueConstants.PNUM, new CrueConverterPNUM(),
- new CrueDaoStructurePNUM()));
+ private final Crue10FileFormat<ParamCalcScenario> pcal = new Crue10FileFormat<ParamCalcScenario>(
+ new CrueXmlReaderWriterImpl<CrueDaoPCAL, ParamCalcScenario>(CrueFileType.PCAL, new CrueConverterPCAL(),
+ new CrueDaoStructurePCAL()), fnts);
- private final static Crue10FileFormat<OrdPrtCIniModeleBase> OPTI = new Crue10FileFormat<OrdPrtCIniModeleBase>(
- new CrueXmlReaderWriterImpl<CrueDaoOPTI, OrdPrtCIniModeleBase>(CrueConstants.OPTI, new CrueConverterOPTI(),
- new CrueDaoStructureOPTI()));
+ private final Crue10FileFormat<ParamNumModeleBase> pnum = new Crue10FileFormat<ParamNumModeleBase>(
+ new CrueXmlReaderWriterImpl<CrueDaoPNUM, ParamNumModeleBase>(CrueFileType.PNUM, new CrueConverterPNUM(),
+ new CrueDaoStructurePNUM()), fnts);
- static {
- Crue10FileFormatFactory.DRSO.setIndependant(true);
- ETU.setIndependant(true);
- OPTG.setIndependant(true);
+ private final Crue10FileFormat<OrdPrtCIniModeleBase> opti = new Crue10FileFormat<OrdPrtCIniModeleBase>(
+ new CrueXmlReaderWriterImpl<CrueDaoOPTI, OrdPrtCIniModeleBase>(CrueFileType.OPTI, new CrueConverterOPTI(),
+ new CrueDaoStructureOPTI()), fnts);
+
+ private static final Crue10FileFormatFactory INSTANCE = new Crue10FileFormatFactory();
+
+ /**
+ * @return le singleton
+ */
+ public static final Crue10FileFormatFactory getInstance() {
+ return INSTANCE;
}
+ private Crue10FileFormatFactory() {
+ drso.setIndependant(true);
+ etu.setIndependant(true);
+ optg.setIndependant(true);
+ }
+
/**
+ * @param type le type voulu
+ * @return le fileformat correspondant
+ */
+ public Crue10FileFormat getFileFormat(final CrueFileType type) {
+ return fnts.get(type);
+ }
+
+ /**
* @return DCSP : objet CrueFileFormat qui contient le DAO et le métier de DCSP
*/
- public static Crue10FileFormat<CrueData> getDCSPFileFormat() {
- return DCSP;
+ public Crue10FileFormat<CrueData> getDCSP() {
+ return dcsp;
}
/**
* @return DFRT : objet CrueFileFormat qui contient le DAO et le métier de DFRT
*/
- public static Crue10FileFormat<List<DonFrt>> getDFRTFileFormat() {
- return DFRT;
+ public Crue10FileFormat<List<DonFrt>> getDFRT() {
+ return dfrt;
}
/**
* @return DLHY : objet CrueFileFormat qui contient le DAO et le métier de DLHY
*/
- public static Crue10FileFormat<List<Loi>> getDLHYFileFormat() {
- return DLHY;
+ public Crue10FileFormat<List<Loi>> getDLHY() {
+ return dlhy;
}
/**
* @return DCLM : objet CrueFileFormat qui contient le DAO et le métier de DCLM
*/
- public static Crue10FileFormat<DonCLimMScenario> getDCLMFileFormat() {
- return DCLM;
+ public Crue10FileFormat<DonCLimMScenario> getDCLM() {
+ return dclm;
}
/**
* @return ORES : objet CrueFileFormat qui contient le DAO et le métier de ORES
*/
- public static Crue10FileFormat<OrdResScenario> getORESFileFormat() {
- return ORES;
+ public Crue10FileFormat<OrdResScenario> getORES() {
+ return ores;
}
/**
* @return DPTG : objet CrueFileFormat qui contient le DAO et le métier de DPTG
*/
- public static Crue10FileFormat<CrueData> getDPTGFileFormat() {
- return DPTG;
+ public Crue10FileFormat<CrueData> getDPTG() {
+ return dptg;
}
/**
* @return DPTI : objet CrueFileFormat qui contient le DAO et le métier de DPTI
*/
- public static Crue10FileFormat<CrueData> getDPTIFileFormat() {
- return DPTI;
+ public Crue10FileFormat<CrueData> getDPTI() {
+ return dpti;
}
/**
* @return DRSO : objet CrueFileFormat qui contient le DAO et le métier de DRSO
*/
- public static Crue10FileFormat<CrueData> getDRSOFileFormat() {
- return DRSO;
+ public Crue10FileFormat<CrueData> getDRSO() {
+ return drso;
}
/**
* @return ETU : objet CrueFileFormat qui contient le DAO et le métier de ETU
*/
- public static Crue10FileFormat<EMHproject> getETUFileFormat() {
- return ETU;
+ public Crue10FileFormat<EMHproject> getETU() {
+ return etu;
}
/**
* @return OPTG : objet CrueFileFormat qui contient le DAO et le métier de OPTG
*/
- public static Crue10FileFormat<OrdPrtGeoModeleBase> getOPTGFileFormat() {
- return OPTG;
+ public Crue10FileFormat<OrdPrtGeoModeleBase> getOPTG() {
+ return optg;
}
/**
* @return OCAL : objet CrueFileFormat qui contient le DAO et le métier de OCAL
*/
- public static Crue10FileFormat<OrdCalcScenario> getOCALFileFormat() {
- return OCAL;
+ public Crue10FileFormat<OrdCalcScenario> getOCAL() {
+ return ocal;
}
/**
* @return OPTI : objet CrueFileFormat qui contient le DAO et le métier de OPTI
*/
- public static Crue10FileFormat<OrdPrtCIniModeleBase> getOPTIFileFormat() {
- return OPTI;
+ public Crue10FileFormat<OrdPrtCIniModeleBase> getOPTI() {
+ return opti;
}
/**
* @return PCAL : objet CrueFileFormat qui contient le DAO et le métier de PCAL
*/
- public static Crue10FileFormat<ParamCalcScenario> getPCALFileFormat() {
- return PCAL;
+ public Crue10FileFormat<ParamCalcScenario> getPCAL() {
+ return pcal;
}
/**
* @return PNUM : objet CrueFileFormat qui contient le DAO et le métier de PNUM
*/
- public static Crue10FileFormat<ParamNumModeleBase> getPNUMFileFormat() {
- return PNUM;
+ public Crue10FileFormat<ParamNumModeleBase> getPNUM() {
+ return pnum;
}
}
Modified: 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/CrueFileFormatManager.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CrueFileFormatManager.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -24,7 +24,7 @@
final List<CustomFileFormat> r = new ArrayList<CustomFileFormat>();
// -- format du fichier ETU --//
- r.add(Crue10FileFormatFactory.getETUFileFormat());
+ r.add(Crue10FileFormatFactory.getInstance().getETU());
return r.toArray(new CustomFileFormat[r.size()]);
}
Modified: 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/CustomFileFormatVersionInterface.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-cr...
[truncated message content] |
|
From: <de...@us...> - 2009-06-28 22:19:50
|
Revision: 4892
http://fudaa.svn.sourceforge.net/fudaa/?rev=4892&view=rev
Author: deniger
Date: 2009-06-28 22:19:41 +0000 (Sun, 28 Jun 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueErrorManager.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/AbstractCrueBinaryFileFormat.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/Crue9FCBFileFormat.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/Crue9STOFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9STRFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueFileType.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/metier/FichierCrue.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHModeleBase.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/OrdonnanceurCrue10.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue10.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/CruePrefix.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ScenarioWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateConnectionModele.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateModeleScenario.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/projet/projetMessages.properties
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/TestCrueValidationModele.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/TestValidateModeleScenario.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/CrueTreeProject.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueEditorImplementation.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/ScenarioLoaderUI.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleGenerationCrue9.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHProjet.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/OrdonnanceurCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioExporterCrue10.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioExporterCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaver.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaver10.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaverCrue9.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioSaverUI.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHproject.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/MockCrueData.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioSaver.java
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueErrorManager.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueErrorManager.java 2009-06-27 19:57:53 UTC (rev 4891)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueErrorManager.java 2009-06-28 22:19:41 UTC (rev 4892)
@@ -14,8 +14,26 @@
*/
public class CrueErrorManager {
- List<CtuluAnalyze> analyser = new ArrayList<CtuluAnalyze>();
+ private List<CtuluAnalyze> analyser = new ArrayList<CtuluAnalyze>();
+ private CtuluAnalyze mainAnalyze;
+ /**
+ * @return the mainAnalyze
+ */
+ public CtuluAnalyze getMainAnalyze() {
+ if (mainAnalyze == null) {
+ mainAnalyze = getNewAnalyser();
+ }
+ return mainAnalyze;
+ }
+
+ /**
+ * @param mainAnalyze the mainAnalyze to set
+ */
+ public void setMainAnalyze(CtuluAnalyze mainAnalyze) {
+ this.mainAnalyze = mainAnalyze;
+ }
+
ResourceBundle defaultResource;
public CrueErrorManager(ResourceBundle defaultResource) {
@@ -36,13 +54,18 @@
* @return
*/
public CtuluAnalyze getNewAnalyser() {
- CtuluAnalyze analyzer = new CtuluAnalyze();
- analyzer.setDefaultResourceBundle(defaultResource);
+ CtuluAnalyze analyzer = createAnalyzer();
// ajout dans la liste des analyze
analyser.add(analyzer);
return analyzer;
}
+ private CtuluAnalyze createAnalyzer() {
+ CtuluAnalyze analyzer = new CtuluAnalyze();
+ analyzer.setDefaultResourceBundle(defaultResource);
+ return analyzer;
+ }
+
/**
* retourne le dernier ctuluanalyze cree.
*
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java 2009-06-27 19:57:53 UTC (rev 4891)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java 2009-06-28 22:19:41 UTC (rev 4892)
@@ -7,10 +7,12 @@
import java.io.File;
import java.io.OutputStream;
import java.net.URL;
+import java.util.Map;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluIOOperationSynthese;
import org.fudaa.dodico.crue.io.common.CrueData;
+import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.common.CrueIOResu;
import org.fudaa.dodico.crue.io.dao.CrueHelper;
import org.fudaa.dodico.crue.io.neuf.AbstractCrue9Reader;
@@ -21,15 +23,20 @@
*/
public abstract class AbstractCrue9FileFormat extends CustomFileFormatUnique<CrueIOResu<CrueData>> {
+ private final CrueFileType fileType;
+
/**
* @param id identifiant du format
*/
- public AbstractCrue9FileFormat(final String id) {
+ public AbstractCrue9FileFormat(final CrueFileType id, Map<CrueFileType, AbstractCrue9FileFormat> map) {
super(1);
- nom = id;
+ this.fileType = id;
+ nom = id.toString();
this.id = nom;
- extensions = new String[] { id.toLowerCase() };
+ extensions = new String[] { nom.toLowerCase() };
description = nom + ".file";
+ map.put(id, this);
+
}
/**
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrueBinaryFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrueBinaryFileFormat.java 2009-06-27 19:57:53 UTC (rev 4891)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrueBinaryFileFormat.java 2009-06-28 22:19:41 UTC (rev 4892)
@@ -11,6 +11,7 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluIOOperationSynthese;
import org.fudaa.dodico.crue.io.common.CrueData;
+import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.common.CrueIOResu;
import org.fudaa.dodico.crue.io.dao.CrueHelper;
import org.fudaa.dodico.crue.io.neuf.AbstractCrueBinaryReader;
@@ -23,15 +24,17 @@
* @param <M> Objet qui permet de stocker les informations lues dans le fichier binaire
*/
public abstract class AbstractCrueBinaryFileFormat<M> extends CustomFileFormatUnique<CrueIOResu<M>> {
+ private final CrueFileType type;
/**
* @param id identifiant du format
*/
- public AbstractCrueBinaryFileFormat(final String id) {
+ public AbstractCrueBinaryFileFormat(final CrueFileType id) {
super(1);
- nom = id;
+ this.type = id;
+ nom = id.toString();
this.id = nom;
- extensions = new String[] { id.toLowerCase() };
+ extensions = new String[] { nom.toLowerCase() };
description = nom + ".file";
}
@@ -40,6 +43,14 @@
*/
protected abstract AbstractCrueBinaryReader<M> createReader();
+ /**
+ * @return the type
+ */
+ @Override
+ public CrueFileType getType() {
+ return type;
+ }
+
public CrueIOResu<M> read(final File f, final CtuluAnalyze analyzer, final CrueData dataLinked) {
final AbstractCrueBinaryReader reader = createReader();
reader.setDataLinked(dataLinked);
@@ -79,15 +90,15 @@
throw new IllegalArgumentException("Not supported");
}
- public boolean writeMetier(CrueIOResu<M> metier, File f, CtuluAnalyze analyzer) {
+ public boolean write(CrueData metier, File f, CtuluAnalyze analyzer) {
throw new IllegalArgumentException("Not supported");
}
- public boolean write(CrueData metier, File f, CtuluAnalyze analyzer) {
+ public boolean write(CrueData metier, OutputStream out, CtuluAnalyze analyser) {
throw new IllegalArgumentException("Not supported");
}
- public boolean write(CrueData metier, OutputStream out, CtuluAnalyze analyser) {
+ public boolean writeMetier(CrueIOResu<M> metier, File f, CtuluAnalyze analyzer) {
throw new IllegalArgumentException("Not supported");
}
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-06-27 19:57:53 UTC (rev 4891)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java 2009-06-28 22:19:41 UTC (rev 4892)
@@ -7,7 +7,7 @@
import org.fudaa.dodico.crue.io.common.CrueData;
import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.dao.*;
-import org.fudaa.dodico.crue.metier.EMHproject;
+import org.fudaa.dodico.crue.metier.EMHProjet;
import org.fudaa.dodico.crue.metier.emh.*;
/**
@@ -43,8 +43,8 @@
new CrueXmlReaderWriterImpl<CrueDaoDRSO, CrueData>(CrueFileType.DRSO, new CrueConverterDRSO(),
new CrueDaoStructureDRSO()), fnts);
- private final Crue10FileFormat<EMHproject> etu = new Crue10FileFormat<EMHproject>(
- new CrueXmlReaderWriterImpl<CrueDaoETU, EMHproject>(CrueFileType.ETU, new CrueConverterETU(),
+ private final Crue10FileFormat<EMHProjet> etu = new Crue10FileFormat<EMHProjet>(
+ new CrueXmlReaderWriterImpl<CrueDaoETU, EMHProjet>(CrueFileType.ETU, new CrueConverterETU(),
new CrueDaoStructureETU()), fnts);
private final Crue10FileFormat<OrdPrtGeoModeleBase> optg = new Crue10FileFormat<OrdPrtGeoModeleBase>(
@@ -157,7 +157,7 @@
/**
* @return ETU : objet CrueFileFormat qui contient le DAO et le métier de ETU
*/
- public Crue10FileFormat<EMHproject> getETU() {
+ public Crue10FileFormat<EMHProjet> getETU() {
return etu;
}
Modified: 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/Crue9DCFileFormat.java 2009-06-27 19:57:53 UTC (rev 4891)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9DCFileFormat.java 2009-06-28 22:19:41 UTC (rev 4892)
@@ -1,5 +1,8 @@
package org.fudaa.dodico.crue.io;
+import java.util.Map;
+
+import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.neuf.DCFileReader;
import org.fudaa.dodico.crue.io.neuf.DCFileWriter;
@@ -13,8 +16,8 @@
/**
* déclare seulement l'extension
*/
- public Crue9DCFileFormat() {
- super("DC");
+ public Crue9DCFileFormat(Map<CrueFileType, AbstractCrue9FileFormat> map) {
+ super(CrueFileType.DC, map);
}
@Override
Modified: 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/Crue9DHFileFormat.java 2009-06-27 19:57:53 UTC (rev 4891)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9DHFileFormat.java 2009-06-28 22:19:41 UTC (rev 4892)
@@ -1,5 +1,8 @@
package org.fudaa.dodico.crue.io;
+import java.util.Map;
+
+import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.neuf.DHReader;
import org.fudaa.dodico.crue.io.neuf.DHWriter;
@@ -13,8 +16,8 @@
/**
* Constructeur qui précise l'extension autorisée pour ce type de fichier
*/
- public Crue9DHFileFormat() {
- super("DH");
+ public Crue9DHFileFormat(Map<CrueFileType, AbstractCrue9FileFormat> map) {
+ super(CrueFileType.DH, map);
}
@Override
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9FCBFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9FCBFileFormat.java 2009-06-27 19:57:53 UTC (rev 4891)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9FCBFileFormat.java 2009-06-28 22:19:41 UTC (rev 4892)
@@ -1,5 +1,6 @@
package org.fudaa.dodico.crue.io;
+import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.neuf.AbstractCrueBinaryReader;
import org.fudaa.dodico.crue.io.neuf.FCBReader;
import org.fudaa.dodico.crue.io.neuf.FCBSequentialReader;
@@ -15,7 +16,7 @@
* Constructeur qui précise l'extension autorisée pour ce type de fichier
*/
public Crue9FCBFileFormat() {
- super("FCB");
+ super(CrueFileType.FCB);
}
@Override
Modified: 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/Crue9FileFormatFactory.java 2009-06-27 19:57:53 UTC (rev 4891)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9FileFormatFactory.java 2009-06-28 22:19:41 UTC (rev 4892)
@@ -1,5 +1,10 @@
package org.fudaa.dodico.crue.io;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.fudaa.dodico.crue.io.common.CrueFileType;
+
/**
* Gere la lecture du format crue 9.
*
@@ -7,12 +12,13 @@
*/
public final class Crue9FileFormatFactory {
- // private Crue9FileFormatFactory() {
- //
- // }
+ /**
+ * la map contenant les correspondance
+ */
+ private static final Map<CrueFileType, AbstractCrue9FileFormat> MAP = new HashMap<CrueFileType, AbstractCrue9FileFormat>();
- private static final Crue9DCFileFormat DC_FILEFORMAT = new Crue9DCFileFormat();
- private static final Crue9DHFileFormat DH_FILEFORMAT = new Crue9DHFileFormat();
+ private static final Crue9DCFileFormat DC_FILEFORMAT = new Crue9DCFileFormat(MAP);
+ private static final Crue9DHFileFormat DH_FILEFORMAT = new Crue9DHFileFormat(MAP);
private static final Crue9FCBFileFormat FCB_FILEFORMAT = new Crue9FCBFileFormat();
private static final Crue9STOFileFormat STO_FILEFORMAT = new Crue9STOFileFormat();
private static final Crue9STRFileFormat STR_FILEFORMAT = new Crue9STRFileFormat();
@@ -25,6 +31,14 @@
}
/**
+ * @param type le type demande
+ * @return le format correspondant
+ */
+ public static AbstractCrue9FileFormat getFileFormat(CrueFileType type) {
+ return MAP.get(type);
+ }
+
+ /**
* @return the DH
*/
public static Crue9DHFileFormat getDHFileFormat() {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9STOFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9STOFileFormat.java 2009-06-27 19:57:53 UTC (rev 4891)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9STOFileFormat.java 2009-06-28 22:19:41 UTC (rev 4892)
@@ -3,6 +3,7 @@
*/
package org.fudaa.dodico.crue.io;
+import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.neuf.AbstractCrueBinaryReader;
import org.fudaa.dodico.crue.io.neuf.STOReader;
import org.fudaa.dodico.crue.io.neuf.STOSequentialReader;
@@ -16,7 +17,7 @@
* Constructeur qui précise l'extension autorisée pour ce type de fichier
*/
public Crue9STOFileFormat() {
- super("STO");
+ super(CrueFileType.STO);
}
@Override
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9STRFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9STRFileFormat.java 2009-06-27 19:57:53 UTC (rev 4891)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9STRFileFormat.java 2009-06-28 22:19:41 UTC (rev 4892)
@@ -3,6 +3,7 @@
*/
package org.fudaa.dodico.crue.io;
+import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.neuf.AbstractCrueBinaryReader;
import org.fudaa.dodico.crue.io.neuf.STRReader;
import org.fudaa.dodico.crue.io.neuf.STRSequentialReader;
@@ -16,7 +17,7 @@
* Constructeur qui précise l'extension autorisée pour ce type de fichier
*/
public Crue9STRFileFormat() {
- super("STR");
+ super(CrueFileType.STR);
}
@Override
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueFileType.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueFileType.java 2009-06-27 19:57:53 UTC (rev 4891)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueFileType.java 2009-06-28 22:19:41 UTC (rev 4892)
@@ -9,6 +9,6 @@
*/
public enum CrueFileType {
- ETU, DRSO, ORES, OCAL, PCAL, DCLM, DLHY, OPTR, OPTG, OPTI, PNUM, DPTI, DCSP, DPTG, DFRT, DC, DH, RPTR, RPTG, RPTI, RCAL
+ ETU, DRSO, ORES, OCAL, PCAL, DCLM, DLHY, OPTR, OPTG, OPTI, PNUM, DPTI, DCSP, DPTG, DFRT, DC, DH, RPTR, RPTG, RPTI, RCAL, FCB, STO, STR
}
Modified: 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/CrueConverterETU.java 2009-06-27 19:57:53 UTC (rev 4891)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterETU.java 2009-06-28 22:19:41 UTC (rev 4892)
@@ -19,17 +19,17 @@
*
* @author Adrien Hadoux
*/
-public class CrueConverterETU implements CrueConverter<CrueDaoETU, EMHproject> {
+public class CrueConverterETU implements CrueConverter<CrueDaoETU, EMHProjet> {
- public EMHproject convertDaoToMetier(final CrueDaoETU dao, final CrueData dataLinked, final CtuluAnalyze analyser) {
+ public EMHProjet convertDaoToMetier(final CrueDaoETU dao, final CrueData dataLinked, final CtuluAnalyze analyser) {
return CrueConverterETU.remplirMetierETU(dao, analyser);
}
- public EMHproject getConverterData(CrueData in) {
+ public EMHProjet getConverterData(CrueData in) {
return null;
}
- public CrueDaoETU convertMetierToDao(final EMHproject metier, final CtuluAnalyze analyser) {
+ public CrueDaoETU convertMetierToDao(final EMHProjet metier, final CtuluAnalyze analyser) {
return null;
}
@@ -40,9 +40,9 @@
* @param analyser
* @return
*/
- public static EMHproject remplirMetierETU(final CrueDaoETU persistance, final CtuluAnalyze analyser) {
+ public static EMHProjet remplirMetierETU(final CrueDaoETU persistance, final CtuluAnalyze analyser) {
- final EMHproject project = new EMHproject();
+ final EMHProjet project = new EMHProjet();
final EMHProjectInfos infos = new EMHProjectInfos();
@@ -86,7 +86,7 @@
* @param listeMessageError
* @return
*/
- private static void remplirBaseScenarios(final EMHproject project, final List<Scenario> listePersist,
+ private static void remplirBaseScenarios(final EMHProjet project, final List<Scenario> listePersist,
final EMHProjectInfos infos, final CtuluAnalyze analyser) {
if (CollectionUtils.isEmpty(listePersist)) {
@@ -222,7 +222,7 @@
* @param listeMessageError
* @return
*/
- public static void remplirBaseSousModeles(final EMHproject dest, final List<SousModele> listePersist,
+ public static void remplirBaseSousModeles(final EMHProjet dest, final List<SousModele> listePersist,
final EMHProjectInfos infos, final CtuluAnalyze analyser) {
if (CollectionUtils.isNotEmpty(listePersist)) {
@@ -260,7 +260,7 @@
* @param listeMessageError
* @return
*/
- private static void remplirBaseModeles(final EMHproject project, final List<Modele> listePersist,
+ private static void remplirBaseModeles(final EMHProjet project, final List<Modele> listePersist,
final EMHProjectInfos infos, final CtuluAnalyze analyser) {
if (listePersist != null) {
Copied: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHProjet.java (from rev 4891, 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/EMHProjet.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHProjet.java 2009-06-28 22:19:41 UTC (rev 4892)
@@ -0,0 +1,232 @@
+package org.fudaa.dodico.crue.metier;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Gere un projet EMH. Est construit a partir du fichier XML ETU.
+ *
+ * @author Adrien Hadoux
+ */
+public class EMHProjet {
+
+ private final static Logger LOGGER = LoggerFactory.getLogger(EMHProjet.class);
+
+ /**
+ * Infos du projet, contient la base des fichiers de donn�es.
+ */
+ private EMHProjectInfos baseRessourcesInfos_;
+
+ /**
+ * Base des sc�narios disponible pour tout le projet.
+ */
+ private final List<ManagerEMHScenario> baseScenarios = new ArrayList<ManagerEMHScenario>();
+ private final Map<String, ManagerEMHModeleBase> idModele = new HashMap<String, ManagerEMHModeleBase>();
+
+ private final Map<String, ManagerEMHScenario> idScenario = new HashMap<String, ManagerEMHScenario>();
+
+ private final Map<String, ManagerEMHSousModele> idSousModele = new HashMap<String, ManagerEMHSousModele>();
+
+ private final List<ManagerEMHModeleBase> listeModele = new ArrayList<ManagerEMHModeleBase>();
+
+ private final List<ManagerEMHSousModele> listeSousModele = new ArrayList<ManagerEMHSousModele>();
+
+ // /**
+ // * Methode tres importante; c'est elle qui retourne les crue data générales du scénario courant. En effet, ces crue
+ // * data sont globale au scenario, elles contiennet donc la concaténation des crue data de chaque entité fille:
+ // * modeles, sous modeles.
+ // *
+ // * @author Adrien hadoux
+ // * @return
+ // */
+ // public CrueData getCrueDataFromScenarioCourant() {
+ // if (getScenarioCourant() != null) { return CrueDataImpl.buildConcatFor(getScenarioCourant().getEMH()); }
+ // return null;
+ // }
+
+ /**
+ * Scenario courant du projet. Attention peut etre null.
+ */
+ private ManagerEMHScenario scenarioCourant;
+
+ public void addBaseModele(final ManagerEMHModeleBase modele) {
+ this.listeModele.add(modele);
+ idModele.put(modele.getNom(), modele);
+ }
+
+ public void addBaseSousModele(final ManagerEMHSousModele sousModele) {
+ this.listeSousModele.add(sousModele);
+ idSousModele.put(sousModele.getNom(), sousModele);
+ }
+
+ public void addScenario(final ManagerEMHScenario scenario) {
+ this.idScenario.put(scenario.getNom(), scenario);
+ this.baseScenarios.add(scenario);
+ }
+
+ public File getDirForRun(final ManagerEMHScenario sc, final EMHRun runCourant) {
+ File dir = new File(getInfos().getDirectories().get(EMHProjectInfos.RUNS), sc.getNom());
+ dir = new File(dir, runCourant.getId());
+ return dir;
+ }
+
+ public File getDirForRunCourant() {
+ if (scenarioCourant != null && scenarioCourant.getRunCourant() != null) { return getDirForRun(scenarioCourant,
+ scenarioCourant.getRunCourant()); }
+ return null;
+ }
+
+ private Map<String, URL> getEtudeFiles(final Map<String, FichierCrueParModele> allFileUsed) {
+ final Map<String, URL> res = new HashMap<String, URL>();
+ try {
+ for (final Map.Entry<String, FichierCrueParModele> entry : allFileUsed.entrySet()) {
+ res.put(entry.getKey(), entry.getValue().getFichier().getProjetFichier(this).toURI().toURL());
+ }
+ } catch (MalformedURLException e) {
+ LOGGER.error("getEtudeFiles", e);
+ }
+ return res;
+ }
+
+ private Map<String, File> getFileEtudeFiles(final Map<String, FichierCrueParModele> allFileUsed) {
+ final Map<String, File> res = new HashMap<String, File>();
+ for (final Map.Entry<String, FichierCrueParModele> entry : allFileUsed.entrySet()) {
+ res.put(entry.getKey(), entry.getValue().getFichier().getProjetFichier(this));
+ }
+ return res;
+ }
+
+ /**
+ * @return l'association idFichier->File pour les fichier d'etude
+ */
+ public Map<String, URL> getFileEtudeScenario(final String id) {
+ final ManagerEMHScenario sc = getScenario(id);
+ if (sc == null) { return Collections.emptyMap(); }
+ return getEtudeFiles(sc.getAllFileUsed());
+ }
+
+ public Map<String, File> getFileFileEtudeScenario(final String id) {
+ final ManagerEMHScenario sc = getScenario(id);
+ if (sc == null) { return Collections.emptyMap(); }
+ return getFileEtudeFiles(sc.getAllFileUsed());
+ }
+
+ /**
+ * @param nom le nom du scenario
+ * @return l'association idFichier->File pour les fichier d'etude
+ */
+ public Map<String, URL> getURLRunScenario(final String nom) {
+ final ManagerEMHScenario sc = getScenario(nom);
+ if (sc == null || sc.getRunCourant() == null) { return Collections.emptyMap(); }
+ return getRunFiles(sc.getAllFileUsed(), sc.getRunCourant());
+ }
+
+ /**
+ * @param nom le nom du scenario
+ * @return l'association idFichier->File pour les fichier d'etude
+ */
+ public Map<String, File> getFileRunScenario(final String nom) {
+ final ManagerEMHScenario sc = getScenario(nom);
+ if (sc == null || sc.getRunCourant() == null) { return Collections.emptyMap(); }
+ return getRunFileFiles(sc.getAllFileUsed(), sc.getRunCourant());
+ }
+
+ /**
+ * @return l'association idFichier->File pour les fichier d'etude
+ */
+ public Map<String, URL> getURLScenarioCourant() {
+ if (scenarioCourant == null || scenarioCourant.getRunCourant() == null) { return Collections.emptyMap(); }
+ return getRunFiles(scenarioCourant.getAllFileUsed(), scenarioCourant.getRunCourant());
+ }
+
+ /**
+ * @return l'association idFichier->File pour les fichier du run courant
+ */
+ public Map<String, URL> getFilesEtudeScenarioCourant() {
+ if (scenarioCourant == null) { return Collections.emptyMap(); }
+ return getEtudeFiles(scenarioCourant.getAllFileUsed());
+ }
+
+ /**
+ * @return l'association pour les fichiers resultats du run courant
+ */
+ public Map<String, URL> getFilesResultatForCurrentRun() {
+ final File dir = getDirForRunCourant();
+ if (dir != null) { return scenarioCourant.getFilesResultatIn(dir); }
+ return null;
+
+ }
+
+ public EMHProjectInfos getInfos() {
+ return baseRessourcesInfos_;
+ }
+
+ public List<ManagerEMHModeleBase> getListeModeles() {
+ return Collections.unmodifiableList(listeModele);
+ }
+
+ public List<ManagerEMHScenario> getListeScenarios() {
+ return baseScenarios;
+ }
+
+ public List<ManagerEMHSousModele> getListeSousModeles() {
+ return listeSousModele;
+ }
+
+ public ManagerEMHModeleBase getModele(final String nom) {
+ return idModele.get(nom);
+ }
+
+ private Map<String, URL> getRunFiles(final Map<String, FichierCrueParModele> allFileUsed, final EMHRun runCourant) {
+ final Map<String, URL> res = new HashMap<String, URL>(allFileUsed.size());
+ final Map<String, File> file = getRunFileFiles(allFileUsed, runCourant);
+ for (Map.Entry<String, File> it : file.entrySet()) {
+ try {
+ res.put(it.getKey(), it.getValue().toURI().toURL());
+ } catch (MalformedURLException e) {
+ LOGGER.error("getRunFiles", e);
+ }
+ }
+ return res;
+ }
+
+ private Map<String, File> getRunFileFiles(final Map<String, FichierCrueParModele> allFileUsed, final EMHRun runCourant...
[truncated message content] |
|
From: <de...@us...> - 2009-06-30 22:01:57
|
Revision: 4893
http://fudaa.svn.sourceforge.net/fudaa/?rev=4893&view=rev
Author: deniger
Date: 2009-06-30 22:01:53 +0000 (Tue, 30 Jun 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.wst.validation.prefs
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractDaoLoi.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTG.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/CrueDaoStructureDCSP.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/CrueDaoStructureOPTI.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/neuf/DCFileReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STOReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRFactory.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHFactory.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransBrancheOrificeManoeuvre.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransBrancheSaintVenantQruis.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuLimnigramme.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuQapp.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransNoeudNiveauContinuTarage.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheBarrageFilEau.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheBarrageGenerique.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheNiveauxAssocies.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBranchePdc.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/DonFrtManning.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonFrtStrickler.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumMethodeInterpolation.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Loi.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Regle.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/helper/LoiFactory.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaver.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/CruePrefix.java
trunk/soft/fudaa-crue/dodico/src/main/resources/logback-test.xml
trunk/soft/fudaa-crue/dodico/src/main/resources/logback.xml
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/projet/projetMessages.properties
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/validation/validation.txt
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/etu-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-common-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-dclm-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-dcsp-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-dfrt-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-dlhy-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-dptg-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-drso-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-optg-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-opti-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDCLMFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDCSPFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDFRTFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDLHYFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/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/TestCrueOCALFile.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Etude.etu.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Etude2.etu.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-1.dcsp.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-1.dptg.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-3.dptg.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-3.drso.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-4.dcsp.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-4.dptg.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-4.drso.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dclm.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/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-1.drso.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.dc
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/dodico/src/test/resources/fichierTest/Modele5.dc
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueActionChargerScenario.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/ScenarioSaverUI.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleEMH.java
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/crue/common/messages.properties
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumRegle.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumTypeLoi.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest.zip
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTestNew.zip
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumLoiExtrapol.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/RegleHelper.java
Modified: trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.wst.validation.prefs
===================================================================
--- trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.wst.validation.prefs 2009-06-28 22:19:41 UTC (rev 4892)
+++ trunk/soft/fudaa-crue/dodico/.settings/org.eclipse.wst.validation.prefs 2009-06-30 22:01:53 UTC (rev 4893)
@@ -1,4 +1,4 @@
-#Tue Jun 23 10:52:28 CEST 2009
+#Tue Jun 30 16:44:44 CEST 2009
DELEGATES_PREFERENCE=delegateValidatorList
USER_BUILD_PREFERENCE=enabledBuildValidatorList
USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;
@@ -13,6 +13,6 @@
vals/org.eclipse.wst.dtd.core.dtdDTDValidator/global=TF01
vals/org.eclipse.wst.html.ui.HTMLValidator/global=TF01
vals/org.eclipse.wst.wsdl.validation.wsdl/global=TF02158org.eclipse.wst.wsdl.validation.internal.eclipse.Validator
-vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude07113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0207fileext112scenario.xmlF04file120Modele3.scenario.xmlF01
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude08113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0207fileext112scenario.xmlF04file120Modele3.scenario.xmlF0104file07classesF01
vals/org.eclipse.wst.xsd.core.xsd/global=FF02162org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator
vf.version=3
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractDaoLoi.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractDaoLoi.java 2009-06-28 22:19:41 UTC (rev 4892)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractDaoLoi.java 2009-06-30 22:01:53 UTC (rev 4893)
@@ -2,10 +2,13 @@
import com.thoughtworks.xstream.XStream;
+import org.fudaa.dodico.crue.io.common.AbstractSingleConverter;
+import org.fudaa.dodico.crue.metier.emh.EnumTypeLoi;
import org.fudaa.dodico.crue.metier.emh.EvolutionFF;
import org.fudaa.dodico.crue.metier.emh.Loi;
import org.fudaa.dodico.crue.metier.emh.PtEvolutionFF;
-import org.fudaa.dodico.crue.metier.helper.LoiHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Classe abstraite qui permet de factoriser les attributs communs de toutes les lois
@@ -22,21 +25,45 @@
* La date de début pour une loi Date. Doit être ignoree par les autres lois.
*/
protected String DateZeroLoiDF;
- /** Extrapolation inferieure */
- protected String ExtrapolInf = LoiHelper.EXTRAPOL_CST;
- /** Extrapolation superieure */
- protected String ExtrapolSup = LoiHelper.EXTRAPOL_CST;
- /** Représente la balise portant le même nom dans le fichier XML */
- protected String VarAbscisse;
- /** Représente la balise portant le même nom dans le fichier XML */
- protected String VarOrdonnee;
+ protected EnumTypeLoi Type;
+
protected EvolutionFF EvolutionFF;
+ private final static Logger LOGGER = LoggerFactory.getLogger(AbstractDaoLoi.class);
+
+ private static final class EnumTypeLoiConverter extends AbstractSingleConverter {
+
+ public boolean canConvert(final Class arg0) {
+ return EnumTypeLoi.class.equals(arg0);
+ }
+
+ public Object fromString(final String arg0) {
+ final EnumTypeLoi valueOf = EnumTypeLoi.valueOf(arg0);
+ if (valueOf == null) {
+ LOGGER.error("EnumTypeLoiConverter can't convert " + arg0);
+ }
+ return valueOf;
+ }
+
+ public String toString(final Object arg0) {
+
+ return arg0.toString();
+ }
+
+ }
+
+ private final static SingleConverterPointFF POINT_FF = new SingleConverterPointFF();
+ private final static EnumTypeLoiConverter ENUM_LOI = new EnumTypeLoiConverter();
+
public static void configureXstream(final XStream xstream) {
xstream.alias("EvolutionFF", EvolutionFF.class);
xstream.alias("PointFF", PtEvolutionFF.class);
- xstream.registerConverter(new SingleConverterPointFF());
+ xstream.aliasAttribute(AbstractDaoLoi.class, "Type", "xsi:type");
+ xstream.useAttributeFor(AbstractDaoLoi.class, "Type");
+ xstream.useAttributeFor(AbstractDaoLoi.class, "Nom");
+ xstream.registerConverter(POINT_FF);
+ xstream.registerConverter(ENUM_LOI);
xstream.addImplicitCollection(EvolutionFF.class, "mpoints");
}
@@ -50,12 +77,7 @@
protected static void daoToMetierLoi(final Loi outLoi, final AbstractDaoLoi inLoi) {
outLoi.setNom(inLoi.Nom);
outLoi.setDescription(inLoi.Description);
- // VariableOrdonnee varOrdonnee = new VariableOrdonnee();
- // varOrdonnee.setType(inLoi.VarAbscisse);
- outLoi.setVarAbscisse(inLoi.VarAbscisse);
- // varOrdonnee = new VariableOrdonnee();
- // varOrdonnee.setType(inLoi.VarOrdonnee);
- outLoi.setVarOrdonnee(inLoi.VarOrdonnee);
+ outLoi.setType(inLoi.Type);
outLoi.setEvolutionFF(inLoi.EvolutionFF);
}
@@ -68,8 +90,7 @@
protected static void metierToDaoLoi(final AbstractDaoLoi outLoi, final Loi inLoi) {
outLoi.Nom = inLoi.getNom();
outLoi.Description = inLoi.getDescription();
- outLoi.VarAbscisse = inLoi.getVarAbscisse();
- outLoi.VarOrdonnee = inLoi.getVarOrdonnee();
+ outLoi.Type = inLoi.getType();
outLoi.EvolutionFF = inLoi.getEvolutionFF();
}
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java 2009-06-28 22:19:41 UTC (rev 4892)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java 2009-06-30 22:01:53 UTC (rev 4893)
@@ -235,7 +235,7 @@
} else {
loi = (LoiDF) getLoiFromReferenceDLHY(eltPersist.HydrogrammeQapp.NomRef, dataLinked, analyzer);
}
- eltMetier.setHydrogrammeQapp(loi);
+ eltMetier.setLoiTQapp(loi);
noeudMetier.addInfosEMH(eltMetier);
eltMetier.setEmh(noeudMetier);
calculTransMetier.addCalcTransNoeudNiveauContinuQapp(eltMetier);
@@ -258,7 +258,7 @@
} else {
loi = (LoiDF) getLoiFromReferenceDLHY(eltPersist.Limnigramme.NomRef, dataLinked, analyzer);
}
- eltMetier.setLimnigramme(loi);
+ eltMetier.setLoiTZ(loi);
// listeDonCLimMNoeudNiveauContinu.add(eltMetier);
calculTransMetier.addCalcTransNoeudNiveauContinuLimnigramme(eltMetier);
@@ -281,7 +281,7 @@
} else {
loi = (LoiFF) getLoiFromReferenceDLHY(eltPersist.Tarrage.NomRef, dataLinked, analyzer);
}
- eltMetier.setTarage(loi);
+ eltMetier.setLoiQZ(loi);
calculTransMetier.addCalcTransNoeudNiveauContinuTarage(eltMetier);
}
@@ -301,7 +301,7 @@
} else {
loi = (LoiDF) getLoiFromReferenceDLHY(eltPersist.Manoeuvre.NomRef, dataLinked, analyzer);
}
- eltMetier.setManoeuvre(loi);
+ eltMetier.setLoiTOuv(loi);
eltMetier.setSensOuv(eltPersist.SensOuv);
calculTransMetier.addCalcTransBrancheOrificeManoeuvre(eltMetier);
}
@@ -323,7 +323,7 @@
} else {
loi = (LoiDF) getLoiFromReferenceDLHY(eltPersist.HydrogrammeQruis.NomRef, dataLinked, analyzer);
}
- eltMetier.setHydrogrammeQruis(loi);
+ eltMetier.setLoiTQruis(loi);
calculTransMetier.addCalcTransBrancheSaintVenantQruis(eltMetier);
}
Modified: 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/CrueConverterDCSP.java 2009-06-28 22:19:41 UTC (rev 4892)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCSP.java 2009-06-30 22:01:53 UTC (rev 4893)
@@ -89,10 +89,10 @@
final DaoBrancheBarrageFilEau br = (DaoBrancheBarrageFilEau) branchePersist;
// -- recuperation de la Loi Regime denoye --//
- if (((DonCalcSansPrtBrancheBarrageFilEau) dataCalc).getRegimeDenoye() != null) {
+ if (((DonCalcSansPrtBrancheBarrageFilEau) dataCalc).getLoiQZam() != null) {
// - remplissage de la loi RegimeDenoye--//
- final LoiFF loi = ((DonCalcSansPrtBrancheBarrageFilEau) dataCalc).getRegimeDenoye();
+ final LoiFF loi = ((DonCalcSansPrtBrancheBarrageFilEau) dataCalc).getLoiQZam();
br.RegimeDenoye = new DaoRegimeDenoye();
AbstractDaoLoi.metierToDaoLoi(br.RegimeDenoye, loi);
}
@@ -114,17 +114,17 @@
final DaoBrancheBarrageGenerique br = (DaoBrancheBarrageGenerique) branchePersist;
// -- recuperation de la loi RegimeDenoye --//
- if (((DonCalcSansPrtBrancheBarrageGenerique) dataCalc).getRegimeDenoye() != null) {
- final LoiFF loi = ((DonCalcSansPrtBrancheBarrageGenerique) dataCalc).getRegimeDenoye();
+ if (((DonCalcSansPrtBrancheBarrageGenerique) dataCalc).getLoiQZam() != null) {
+ final LoiFF loi = ((DonCalcSansPrtBrancheBarrageGenerique) dataCalc).getLoiQZam();
br.RegimeDenoye = new DaoRegimeDenoye();
AbstractDaoLoi.metierToDaoLoi(br.RegimeDenoye, loi);
}
// -- recuperation de la loi RegimeNoye --//
- if (((DonCalcSansPrtBrancheBarrageGenerique) dataCalc).getRegimeNoye() != null) {
+ if (((DonCalcSansPrtBrancheBarrageGenerique) dataCalc).getLoiQDz() != null) {
// - remplissage de la loi RegimeDenoye--//
- final LoiFF loi = ((DonCalcSansPrtBrancheBarrageGenerique) dataCalc).getRegimeNoye();
+ final LoiFF loi = ((DonCalcSansPrtBrancheBarrageGenerique) dataCalc).getLoiQDz();
br.RegimeNoye = new DaoRegimeNoye();
AbstractDaoLoi.metierToDaoLoi(br.RegimeNoye, loi);
}
@@ -164,10 +164,10 @@
final DaoBranchePdc br = (DaoBranchePdc) branchePersist;
// -- recuperation de la formule --//
- if (((DonCalcSansPrtBranchePdc) dataCalc).getPdc() != null) {
+ if (((DonCalcSansPrtBranchePdc) dataCalc).getLoiQPdc() != null) {
// - remplissage de la loi RegimeDenoye--//
- final LoiFF loi = ((DonCalcSansPrtBranchePdc) dataCalc).getPdc();
+ final LoiFF loi = ((DonCalcSansPrtBranchePdc) dataCalc).getLoiQPdc();
br.Pdc = new DaoPdc();
AbstractDaoLoi.metierToDaoLoi(br.Pdc, loi);
}
@@ -186,10 +186,10 @@
final DaoBrancheNiveauxAssocies br = (DaoBrancheNiveauxAssocies) branchePersist;
// -- recuperation de la formule --//
- if (((DonCalcSansPrtBrancheNiveauxAssocies) dataCalc).getZasso() != null) {
+ if (((DonCalcSansPrtBrancheNiveauxAssocies) dataCalc).getLoiZavZam() != null) {
// - remplissage de la loi RegimeDenoye--//
- final LoiFF loi = ((DonCalcSansPrtBrancheNiveauxAssocies) dataCalc).getZasso();
+ final LoiFF loi = ((DonCalcSansPrtBrancheNiveauxAssocies) dataCalc).getLoiZavZam();
br.Zasso = new DaoZasso();
AbstractDaoLoi.metierToDaoLoi(br.Zasso, loi);
}
@@ -402,7 +402,7 @@
if (br.Pdc != null) {
final LoiFF newLoi = new LoiFF();
AbstractDaoLoi.daoToMetierLoi(newLoi, br.Pdc);
- dataCalcul.setPdc(newLoi);
+ dataCalcul.setLoiQPdc(newLoi);
}
@@ -419,7 +419,7 @@
if (br.Zasso != null) {
final LoiFF newLoi = new LoiFF();
AbstractDaoLoi.daoToMetierLoi(newLoi, br.Zasso);
- dataCalcul.setZasso(newLoi);
+ dataCalcul.setLoiZavZam(newLoi);
}
dataCalcul.setQLimInf(br.QLimInf);
@@ -437,7 +437,7 @@
if (br.RegimeDenoye != null) {
final LoiFF newLoi = new LoiFF();
AbstractDaoLoi.daoToMetierLoi(newLoi, br.RegimeDenoye);
- dataCalcul.setRegimeDenoye(newLoi);
+ dataCalcul.setLoiQZam(newLoi);
}
dataCalcul.setQLimInf(br.QLimInf);
@@ -458,14 +458,14 @@
if (br.RegimeDenoye != null) {
final LoiFF newLoi = new LoiFF();
AbstractDaoLoi.daoToMetierLoi(newLoi, br.RegimeDenoye);
- dataCalcul.setRegimeDenoye(newLoi);
+ dataCalcul.setLoiQZam(newLoi);
}
// -- recuperation de la Loi RegimeNoye --//
if (br.RegimeNoye != null) {
final LoiFF newLoi = new LoiFF();
AbstractDaoLoi.daoToMetierLoi(newLoi, br.RegimeNoye);
- dataCalcul.setRegimeNoye(newLoi);
+ dataCalcul.setLoiQDz(newLoi);
}
Modified: 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/CrueConverterDPTG.java 2009-06-28 22:19:41 UTC (rev 4892)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTG.java 2009-06-30 22:01:53 UTC (rev 4893)
@@ -280,7 +280,7 @@
if (frottement != null) {
litNum.setFrot(frottement);
} else {
- analyser.addInfo("io.dptg.profil.ref.error", profil, idFrottement);
+ analyser.addError("io.dptg.profil.ref.error", profil, idFrottement);
}
}
Modified: 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/CrueConverterOPTG.java 2009-06-28 22:19:41 UTC (rev 4892)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOPTG.java 2009-06-30 22:01:53 UTC (rev 4893)
@@ -5,22 +5,47 @@
package org.fudaa.dodico.crue.io.dao;
import java.util.ArrayList;
+import java.util.Map;
+import org.apache.commons.collections.BidiMap;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.bidimap.DualHashBidiMap;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.common.CrueData;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureOPTG.*;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureOPTG.DaoPlanimetrageNbrPdzCst;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureOPTG.Planimetrage;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureOPTG.RegleDAO;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureOPTG.RegleSeuilDetect;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureOPTG.RegleVarPdxMax;
+import org.fudaa.dodico.crue.metier.emh.EnumRegle;
import org.fudaa.dodico.crue.metier.emh.OrdPrtGeoModeleBase;
import org.fudaa.dodico.crue.metier.emh.PlanimetrageNbrPdzCst;
import org.fudaa.dodico.crue.metier.emh.Regle;
-import org.fudaa.dodico.crue.metier.helper.RegleHelper;
+import org.fudaa.dodico.crue.metier.emh.ValParamDouble;
+import org.fudaa.dodico.crue.metier.emh.ValParamEntier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
*/
public class CrueConverterOPTG implements CrueConverter<CrueDaoOPTG, OrdPrtGeoModeleBase> {
- public OrdPrtGeoModeleBase getConverterData(CrueData in) {
+ private BidiMap getCorrespondance() {
+ final BidiMap daoToRegle = new DualHashBidiMap();
+ daoToRegle.put(CrueDaoStructureOPTG.RegleDecal.class, EnumRegle.DECAL);
+ daoToRegle.put(CrueDaoStructureOPTG.RegleLargSeuil.class, EnumRegle.LARG_SEUIL);
+ daoToRegle.put(CrueDaoStructureOPTG.ReglePdxMax.class, EnumRegle.PDX_MAX);
+ daoToRegle.put(CrueDaoStructureOPTG.ReglePenteMax.class, EnumRegle.PENTE_MAX);
+ daoToRegle.put(CrueDaoStructureOPTG.ReglePenteRupture.class, EnumRegle.PENTE_RUPTURE);
+ daoToRegle.put(CrueDaoStructureOPTG.RegleProfPlat.class, EnumRegle.PROF_PLAT);
+ daoToRegle.put(CrueDaoStructureOPTG.RegleRebDeb.class, EnumRegle.REB_DEB);
+ daoToRegle.put(CrueDaoStructureOPTG.RegleVarPdxMax.class, EnumRegle.VAR_PDX_MAX);
+
+ return daoToRegle;
+ }
+
+ public OrdPrtGeoModeleBase getConverterData(final CrueData in) {
return in.getPretraitementsGeom();
}
@@ -33,36 +58,18 @@
planiMetier.setNbrPdz((int) dao.Planimetrage.PlanimetrageNbrPdzCst.NbrPdz);
ordres.setPlanimetrage(planiMetier);
}
-
+ final Map classToEnum = getCorrespondance();
if (dao.Regles != null) {
// ordres.setListeRegles(new ArrayList<Regle>());
for (final RegleDAO regleDAO : dao.Regles) {
-
- final Regle regle = new Regle();
-
+ final Regle regle = new Regle((EnumRegle) classToEnum.get(regleDAO.getClass()));
regle.setActive(regleDAO.IsActive);
if (regleDAO instanceof RegleSeuilDetect) {
- regle.setSeuilDetect(((RegleSeuilDetect) regleDAO).SeuilDetect);
- }
-
- if (regleDAO instanceof RegleRebDeb) {
- regle.setType(RegleHelper.RegleRebDeb);
- } else if (regleDAO instanceof RegleProfPlat) {
- regle.setType(RegleHelper.RegleProfPlat);
- } else if (regleDAO instanceof ReglePenteRupture) {
- regle.setType(RegleHelper.ReglePenteRupture);
- } else if (regleDAO instanceof RegleDecal) {
- regle.setType(RegleHelper.RegleDecal);
- } else if (regleDAO instanceof RegleLargSeuil) {
- regle.setType(RegleHelper.RegleLargSeuil);
- } else if (regleDAO instanceof ReglePdxMax) {
- regle.setType(RegleHelper.ReglePdxMax);
+ regle.setValParam(new ValParamDouble("Pm_" + regle.getNom(), ((RegleSeuilDetect) regleDAO).getValue()));
} else if (regleDAO instanceof RegleVarPdxMax) {
- regle.setType(RegleHelper.RegleVarPdxMax);
- } else if (regleDAO instanceof ReglePenteMax) {
- regle.setType(RegleHelper.ReglePenteMax);
+ final RegleVarPdxMax pdx = (RegleVarPdxMax) regleDAO;
+ regle.setValParam(new ValParamEntier("Pm_" + regle.getNom(), pdx.getValue()));
}
-
ordres.addRegle(regle);
}
}
@@ -72,6 +79,8 @@
return ordres;
}
+ private final static Logger LOGGER = LoggerFactory.getLogger(CrueConverterOPTG.class);
+
public CrueDaoOPTG convertMetierToDao(final OrdPrtGeoModeleBase metier, final CtuluAnalyze analyser) {
final CrueDaoOPTG dao = new CrueDaoOPTG();
@@ -83,32 +92,21 @@
if (CollectionUtils.isNotEmpty(metier.getRegle())) {
dao.Regles = new ArrayList<RegleDAO>();
-
+ final BidiMap classToEnum = getCorrespondance();
for (final Regle regleMetier : metier.getRegle()) {
-
+ final Class daoClass = (Class) classToEnum.getKey(regleMetier.getType());
RegleDAO reglePersist = null;
-
- if (regleMetier.getType().equals(RegleHelper.RegleRebDeb)) {
- reglePersist = new RegleRebDeb();
- } else if (regleMetier.getType().equals(RegleHelper.RegleProfPlat)) {
- reglePersist = new RegleProfPlat();
- } else if (regleMetier.getType().equals(RegleHelper.ReglePenteRupture)) {
- reglePersist = new ReglePenteRupture();
- } else if (regleMetier.getType().equals(RegleHelper.RegleDecal)) {
- reglePersist = new RegleDecal();
- } else if (regleMetier.getType().equals(RegleHelper.RegleLargSeuil)) {
- reglePersist = new RegleLargSeuil();
- } else if (regleMetier.getTyp...
[truncated message content] |
|
From: <de...@us...> - 2009-07-01 22:37:05
|
Revision: 4898
http://fudaa.svn.sourceforge.net/fudaa/?rev=4898&view=rev
Author: deniger
Date: 2009-07-01 22:35:48 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/Messages.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/CrueConverterOPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOPTI.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/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/metier/EMHFactory.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHProjet.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHSousModele.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumMethodeInterpolation.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaver.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/CruePrefix.java
trunk/soft/fudaa-crue/dodico/src/main/resources/logback-test.xml
trunk/soft/fudaa-crue/dodico/src/main/resources/logback.xml
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/ioMessages.properties
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/validation/validation.txt
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-opti-1.0.0.xsd
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/validation/TestValidateModeleScenario.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/Messages.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueActionChargerScenario.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/CrueFilleScenarioManager.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/resources/default.ores.xml
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/crue/common/ihmMessages.properties
Removed Paths:
-------------
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/crue/common/messages.properties
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java 2009-07-01 03:52:04 UTC (rev 4897)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java 2009-07-01 22:35:48 UTC (rev 4898)
@@ -416,6 +416,8 @@
* @param _analyze l'analyse a ajouter a celle-ci
*/
public void merge(final CtuluAnalyze _analyze) {
+ setDesc(_analyze.getDesc());
+ setResource(_analyze.getResource());
logs.addAll(_analyze.logs);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java 2009-07-01 03:52:04 UTC (rev 4897)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java 2009-07-01 22:35:48 UTC (rev 4898)
@@ -14,6 +14,7 @@
import org.fudaa.dodico.crue.io.common.CrueData;
import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.common.CrueIOResu;
+import org.fudaa.dodico.crue.io.common.Messages;
import org.fudaa.dodico.crue.io.dao.CrueHelper;
import org.fudaa.dodico.crue.io.neuf.AbstractCrue9Reader;
import org.fudaa.dodico.crue.io.neuf.AbstractCrue9Writer;
@@ -81,7 +82,9 @@
// return null;
// }
public CrueIOResu<CrueData> read(final String pathToResource, final CtuluAnalyze analyzer, final CrueData dataLinked) {
- return read(getClass().getResource(pathToResource), analyzer, dataLinked);
+ CrueIOResu<CrueData> read = read(getClass().getResource(pathToResource), analyzer, dataLinked);
+ analyzer.setDesc(Messages.getString("read.file", pathToResource));
+ return read;
}
public CrueIOResu<CrueData> read(final URL url, final CtuluAnalyze analyzer, final CrueData dataLinked) {
@@ -91,6 +94,7 @@
final CtuluIOOperationSynthese read = crue9reader.read();
final CrueIOResu<CrueData> source = (CrueIOResu<CrueData>) read.getSource();
analyzer.merge(read.getAnalyze());
+ analyzer.setDesc(Messages.getString("read.file", url.toString()));
return source;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/Messages.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/Messages.java 2009-07-01 03:52:04 UTC (rev 4897)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/Messages.java 2009-07-01 22:35:48 UTC (rev 4898)
@@ -6,6 +6,8 @@
import java.util.ResourceBundle;
+import org.fudaa.dodico.crue.common.CrueMessageHelper;
+
/**
* @author deniger
*/
@@ -14,4 +16,12 @@
private Messages() {}
+ public static String getString(String s) {
+ return RESOURCE_BUNDLE.getString(s);
+ }
+
+ public static String getString(String s, Object... args) {
+ return CrueMessageHelper.getS(RESOURCE_BUNDLE, s, args);
+ }
+
}
Modified: 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/CrueConverterDPTG.java 2009-07-01 03:52:04 UTC (rev 4897)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTG.java 2009-07-01 22:35:48 UTC (rev 4898)
@@ -58,10 +58,11 @@
res.DonPrtGeoBranches = new ArrayList<CrueDaoStructureDPTG.BrancheSaintVenant>();
res.DonPrtGeoSections = new ArrayList<CrueDaoStructureDPTG.SectionIdem>();
- if (metier.getAllEMH() == null || metier.getAllEMH().size() == 0) {
+ List<EMH> allEMH = metier.getAllEMH();
+ if (CollectionUtils.isEmpty(allEMH)) {
analyser.addInfo("io.dptg.vide.error");
} else {
- for (final EMH emh : metier.getAllEMH()) {
+ for (final EMH emh : allEMH) {
if (emh.getDPTG() != null) {
final List<DonPrtGeo> donnees = emh.getDPTG();
Modified: 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/CrueConverterDPTI.java 2009-07-01 03:52:04 UTC (rev 4897)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTI.java 2009-07-01 22:35:48 UTC (rev 4898)
@@ -123,7 +123,7 @@
} else {
for (final CatEMHSection section : data) {
final List<DonPrtCIni> listeCond = section.getDPTI();
- if (listeCond != null && listeCond.size() != 0) {
+ if (CollectionUtils.isNotEmpty(listeCond)) {
for (final DonPrtCIni conditionInit : listeCond) {
if (conditionInit != null && (conditionInit instanceof DonPrtCIniSection)) {
@@ -145,9 +145,10 @@
}
}
- } else {
- analyser.addInfo("io.dpti.ecriture.section.error", section.getNom());
}
+ // else {
+ // analyser.addInfo("io.dpti.ecriture.section.error", section.getNom());
+ // }
}
}
return listePersistante;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOPTI.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOPTI.java 2009-07-01 03:52:04 UTC (rev 4897)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOPTI.java 2009-07-01 22:35:48 UTC (rev 4898)
@@ -11,6 +11,7 @@
import org.fudaa.dodico.crue.metier.emh.OrdPrtCIniModeleBase;
import org.fudaa.dodico.crue.metier.emh.ValParam;
import org.fudaa.dodico.crue.metier.emh.ValParamDouble;
+import org.fudaa.dodico.crue.validation.CruePrefix;
/**
* Creation des objets methodes interpolations
@@ -36,7 +37,7 @@
final EnumMethodeInterpolation type = interpol.getType();
metier.setMethodeInterpol(type);
if (EnumMethodeInterpolation.SAINT_VENANT.equals(type)) {
- metier.addValParam(new ValParamDouble("SeuilDetect", interpol.getSeuilDetect()));
+ metier.addValParam(new ValParamDouble(CruePrefix.PM_TOL_ND_Z, interpol.getSeuilDetect()));
}
break;
}
@@ -56,8 +57,13 @@
MethodesInterpolations methode = null;
- if (EnumMethodeInterpolation.LINEAIRE.equals(metier.getMethodeInterpol())) {// NOPMD
+ EnumMethodeInterpolation interpol = metier.getMethodeInterpol();
+ if (EnumMethodeInterpolation.LINEAIRE.equals(interpol)) {// NOPMD
methode = new InterpolLineaire();
+ } else if (EnumMethodeInterpolation.BAIGNOIRE.equals(interpol)) {
+ methode = new CrueDaoStructureOPTI.InterpolBaignoire();
+ } else if (EnumMethodeInterpolation.INTERPOL_ZIMP_AUX_SECTIONS.equals(interpol)) {
+ methode = new CrueDaoStructureOPTI.InterpolZimpAuxSections();
} else {
methode = new InterpolSaintVenant(0);
// -- on recupere le double --//
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOPTI.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOPTI.java 2009-07-01 03:52:04 UTC (rev 4897)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOPTI.java 2009-07-01 22:35:48 UTC (rev 4898)
@@ -18,6 +18,7 @@
xstream.alias(CrueFileType.OPTI.toString(), CrueDaoOPTI.class);
// xstream.addImplicitCollection(CrueDaoOPTI.class, "listeInterpol");
xstream.alias("InterpolLineaire", InterpolLineaire.class);
+ xstream.alias("InterpolZimpAuxSections", InterpolZimpAuxSections.class);
xstream.alias("InterpolBaignoire", InterpolBaignoire.class);
xstream.alias("InterpolSaintVenant", InterpolSaintVenant.class);
}
@@ -59,6 +60,21 @@
}
/**
+ * @author deniger
+ */
+ public static class InterpolZimpAuxSections implements MethodesInterpolations {
+ public EnumMethodeInterpolation getType() {
+ return EnumMethodeInterpolation.INTERPOL_ZIMP_AUX_SECTIONS;
+ }
+
+ public double getSeuilDetect() {
+ return 0;
+ }
+
+ public void setSeuilDetect(double s) {}
+ }
+
+ /**
* methode InterpolLineaire
*
* @author Adrien Hadoux
Modified: 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/CrueXmlReaderWriterImpl.java 2009-07-01 03:52:04 UTC (rev 4897)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueXmlReaderWriterImpl.java 2009-07-01 22:35:48 UTC (rev 4898)
@@ -136,9 +136,11 @@
}
public boolean isValide(final File xml, final CtuluAnalyze res) {
- res.setDefaultResourceBundle(Messages.RESOURCE_BUNDLE);
try {
- return isValide(xml.toURI().toURL(), res);
+ boolean valide = isValide(xml.toURI().toURL(), res);
+ res.setDesc(Messages.getString("valid.xml", xml.getName()));
+ return valide;
+
} catch (final MalformedURLException e) {
res.manageException(e);
LOGGER.error("isValide", e);
@@ -147,12 +149,13 @@
}
public boolean isValide(final String xml, final CtuluAnalyze res) {
- res.setDefaultResourceBundle(Messages.RESOURCE_BUNDLE);
+
return isValide(getClass().getResource(xml), res);
}
public boolean isValide(final URL xml, final CtuluAnalyze res) {
res.setDefaultResourceBundle(Messages.RESOURCE_BUNDLE);
+ res.setDesc(Messages.getString("valid.xml", xml));
final ErrorHandlerDefault handler = new ErrorHandlerDefault(res);
try {
final URL xsdURL = getClass().getResource(xsdPath);
@@ -165,7 +168,7 @@
} catch (final Exception e) {
// res.manageException(e);
- FuLogCrue.error(e);
+ LOGGER.error("isValide", e);
return false;
}
return !handler.isHasError();
@@ -178,6 +181,8 @@
* @return
*/
public final M read(final URL f, final CtuluAnalyze analyzer, final CrueData dataLinked) {
+ analyzer.setDefaultResourceBundle(Messages.RESOURCE_BUNDLE);
+ analyzer.setDesc(Messages.getString("read.file", f));
final D d = readDao(f, analyzer, dataLinked);
if (d != null) { return converter.convertDaoToMetier(d, dataLinked, analyzer); }
return null;
@@ -249,13 +254,14 @@
return null;
}
// if (!isValide(url, analyser)) { return null; }
+
InputStream in = null;
D newData = null;
try {
in = url.openStream();
newData = readDao(in, analyser, dataLinked);
} catch (final IOException e) {
- FuLogCrue.debug(e.getMessage(), e);
+ LOGGER.debug(e.getMessage(), e);
analyser.addError("io.xml.error", e.getMessage());
} finally {
CtuluLibFile.close(in);
@@ -272,6 +278,7 @@
*/
public final M readXML(final File f, final CtuluAnalyze analyzer, final CrueData dataLinked) {
analyzer.setDefaultResourceBundle(Messages.RESOURCE_BUNDLE);
+ analyzer.setDesc(Messages.getString("read.file", f.getName()));
final D d = readDao(f, analyzer, dataLinked);
if (d != null) { return converter.convertDaoToMetier(d, dataLinked, analyzer); }
return null;
@@ -286,6 +293,7 @@
*/
public final M readXML(final String pathToResource, final CtuluAnalyze analyzer, final CrueData dataLinked) {
analyzer.setDefaultResourceBundle(Messages.RESOURCE_BUNDLE);
+ analyzer.setDesc(Messages.getString("read.file", pathToResource));
final D d = readDao(pathToResource, analyzer, dataLinked);
if (d != null) { return converter.convertDaoToMetier(d, dataLinked, analyzer); }
return null;
@@ -345,8 +353,8 @@
* @return
*/
public final boolean writeXML(final CrueData metier, final File f, final CtuluAnalyze analyzer) {
- analyzer.setDesc(f.getName());
analyzer.setDefaultResourceBundle(Messages.RESOURCE_BUNDLE);
+ analyzer.setDesc(Messages.getString("write.file", f.getName()));
final D d = converter.convertMetierToDao(converter.getConverterData(metier), analyzer);
if (d != null) {
d.setXsdName(xsdFile);
@@ -363,6 +371,7 @@
*/
public boolean writeXML(final CrueData metier, final OutputStream out, final CtuluAnalyze analyser) {
analyser.setDefaultResourceBundle(Messages.RESOURCE_BUNDLE);
+ analyser.setDesc(Messages.getString("write.file", getFileType().toString()));
final D d = converter.convertMetierToDao(converter.getConverterData(metier), analyser);
if (d != null) { return writeDAO(out, d, analyser); }
return false;
@@ -376,7 +385,7 @@
* @return
*/
public final boolean writeXMLMetier(final M metier, final File f, final CtuluAnalyze analyzer) {
- analyzer.setDesc(f.getName());
+ analyzer.setDesc(Messages.getString("write.file", f.getName()));
analyzer.setDefaultResourceBundle(Messages.RESOURCE_BUNDLE);
final D d = converter.convertMetierToDao(metier, analyzer);
if (d != null) {
@@ -393,10 +402,10 @@
* @return true si reussite
*/
public boolean writeXMLMetier(final M metier, final OutputStream out, final CtuluAnalyze analyser) {
+ analyser.setDesc(Messages.getString("write.file", getFileType().toString()));
analyser.setDefaultResourceBundle(Messages.RESOURCE_BUNDLE);
final D d = converter.convertMetierToDao(metier, analyser);
if (d != null) { return writeDAO(out, d, analyser); }
return false;
}
-
}
Modified: 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/AbstractCrue9Reader.java 2009-07-01 03:52:04 UTC (rev 4897)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/AbstractCrue9Reader.java 2009-07-01 22:35:48 UTC (rev 4898)
@@ -156,6 +156,7 @@
FuLogCrue.error(e);
}
setResourceBundle(Messages.RESOURCE_BUNDLE);
+ analyze_.setDesc(Messages.getString("read.file", _f.getAbsolutePath()));
super.setFile(_f);
}
@@ -165,6 +166,7 @@
@Deprecated
@Override
public void setFile(final Reader _r) {
+ analyze_.setDesc(Messages.getString("read.file", "Crue 9"));
super.setFile(_r);
setResourceBundle(Messages.RESOURCE_BUNDLE);
}
@@ -189,6 +191,7 @@
folder = urlAll.substring(0, urlAll.lastIndexOf('/') + 1);
setResourceBundle(Messages.RESOURCE_BUNDLE);
analyze_.setResource(_r.toString());
+ analyze_.setDesc(Messages.getString("read.file", _r.toString()));
super.setFile(new InputStreamReader(_r.openStream()));
} catch (final IOException e) {
FuLogCrue.error(e);
Modified: 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/DCFileReader.java 2009-07-01 03:52:04 UTC (rev 4897)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java 2009-07-01 22:35:48 UTC (rev 4898)
@@ -1941,15 +1941,16 @@
// -- recuperation de l'element lu en 1ere position --//
final String element = in_.stringField(0);
final String nomProfil = in_.stringField(1);
- if (element.toUpperCase().equals(CrueIODico.PROFIL)) {
+ final String upperCase = element.toUpperCase();
+ if (upperCase.equals(CrueIODico.PROFIL)) {
sectionCree = createSectionProfilClassique(metier, nomProfil);
- } else if (element.toUpperCase().equals(CrueIODico.PROFREF)) {
+ } else if (upperCase.equals(CrueIODico.PROFREF)) {
// ex: PROFREF(o) "nom_prof_ref"
sectionCree = createSectionProfilReference(metier, nomProfil);
- } else if (element.toUpperCase().equals(CrueIODico.PROFIDEM)) {
+ } else if (upperCase.equals(CrueIODico.PROFIDEM)) {
// -- section avec reference vers une autre section et une donnee DPTG avec un deltaZ changeant --//
// ex PROFIDEM(o) "nom_profil" "nom_prof_appelé" [deltaz]
final String nomReference = in_.stringField(2);
@@ -1971,33 +1972,39 @@
sectionCree = newSection;
lireSuite();
- } else if (element.toUpperCase().equals(CrueIODico.PROFINT)) {
+ } else if (upperCase.equals(CrueIODico.PROFINT)) {
- sectionCree = createSectionProfilClassique(metier, nomProfil);
+ final CatEMHSection sectionToreplace = metier.findSectionByReference(nomProfil);
+ // sectionCree = createSectionProfilClassique(metier, nomProfil);
+
// -- il faut transformer cette section en interpole: on le fait maintenant car dans la methode cela ne change
// rien
// car c'est au niveau de la branche que l'on cree les sections.
- final EMHSectionInterpolee newSection = new EMHSectionInterpolee(sectionCree.getNom());
- replaceSection(metier, sectionCree, newSection);
-
- // -- on remplace les relations et les infos emh --//
- if (sectionCree.getInfosEMH() != null) {
- newSection.setInfosEMH(sectionCree.getInfosEMH());
+ sectionCree = new EMHSectionInterpolee(nomProfil);
+ if (sectionToreplace == null) {
+ metier.add(sectionCree);
+ } else {
+ replaceSection(metier, sectionCree, sectionCree);
}
- if (sectionCree.getRelationEMH() != null) {
- newSection.setRelationEMH(sectionCree.getRelationEMH());
- }
- metier.add(newSection);
+ // // -- on remplace les relations et les infos emh --//
+ // if (sectionCree.getInfosEMH() != null) {
+ // newSection.setInfosEMH(sectionCree.getInfosEMH());
+ // }
+ // if (sectionCree.getRelationEMH() != null) {
+ // newSection.setRelationEMH(sectionCree.getRelationEMH());
+ // }
- } else if (element.toUpperCase().equals(CrueIODico.PROFRECT)) {
+ // metier.add(newSection);
+
+ } else if (upperCase.equals(CrueIODico.PROFRECT)) {
// TODO pour FICHIER DEXP non présent dans V0
// final String nomProfil = in_.stringField(1);
// sectionCree = createSectionProfilClassique(metier, nomProfil);
throw new CrueNotSupportedException(element, in_.getLineNumber());
- } else if (element.toUpperCase().equals(CrueIODico.PROFTRAP)) {
+ } else if (upperCase.equals(CrueIODico.PROFTRAP)) {
// TODO pour FICHIER DEXP non présent dans V0
// final String nomProfil = in_.stringField(1);
// sectionCree = createSectionProfilClassique(metier, nomProfil);
Modified: 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/DHReader.java 2009-07-01 03:52:04 UTC (rev 4897)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java 2009-07-01 22:35:48 UTC (rev 4898)
@@ -398,10 +398,6 @@
if (sectionEMH instanceof EMHSectionProfil) {
final DonPrtCIniSection sectionDPTI = new DonPrtCIniSection();
sectionDPTI.setZini(calculeNiveauEauSection((EMHSectionProfil) sectionEMH, coefRempliPourBrancheI));
- // Ajout du DPTI au CatEMHSection
- // if (emh.getInfosEMH() == null) {
- // emh.setListeInfosEMH(new ArrayList<InfosEMH>());
- // }
sectionEMH.addInfosEMH(sectionDPTI);
}
}
@@ -698,6 +694,7 @@
}
final List<CalcPseudoPerm> calculsPermanents = new ArrayList<CalcPseudoPerm>();
+ OrdCalcScenario ocal = res.getOrdCalc();
while (!FIN.equals(reader.stringField(0))) {
// CONLIM (IM) : valeur de la IMème condition à la limite
@@ -722,6 +719,15 @@
calcPerm.setNom(CruePrefix.P_CALCUL + (nbEtatPermanent + 1));
calcPerm.setDescription("Calcul permanent " + (nbEtatPermanent + 1));
+ // pour le premier on prend en compte la reprise éventuelle
+ if (reprise != null && ocal.getOrdCalc().isEmpty()) {
+ reprise.setCalcPseudoPerm(calcPerm);
+ ocal.addOrdCalc(reprise);
+ } else {
+ OrdCalcPseudoPermIniCalcPrecedent iniPrec = new OrdCalcPseudoPermIniCalcPrecedent();
+ iniPrec.setCalcPseudoPerm(calcPerm);
+ ocal.addOrdCalc(reprise);
+ }
// final List<EMH> listeRefs = new ArrayList<EMH>();
// calcPerm.setListeRefs(listeRefs);
@@ -839,7 +845,7 @@
final StringBuilder build = new StringBuilder();
for (int i = 0; i < nbConlim; i++) {
// la valeur des conditions aux limites d'un état permanent.
- build.append(reader.doubleField(i) + " ; ");
+ build.append(reader.doubleField(i)).append(" ; ");
}
LOGGER.fine(reader.getCurrent().getLineNumber() + " conlims=" + build);
}
@@ -960,6 +966,9 @@
calcTrans.setNom(CruePrefix.P_CALCUL + "Trans1");
calcTrans.setDescription("Calcul transitoire 1");
dclm.addCalcTrans(calcTrans);
+ OrdCalcTransIniCalcPrecedent prec = new OrdCalcTransIniCalcPrecedent();
+ prec.setCalcTrans(calcTrans);
+ res.getOrdCalc().addOrdCalc(prec);
// calcTrans.setListeDonCLimMNoeudNiveauContinu(new ArrayList<DonCLimMNoeudNiveauContinu>());
// calcTrans.setListeDonCLimMBrancheOrifice(new ArrayList<DonCLimMBrancheOrifice>());
@@ -1444,6 +1453,11 @@
}
/**
+ * non null si reprise: ical=0
+ */
+ OrdCalcPseudoPermIniCalcReprise reprise;
+
+ /**
* Methode principale qui fait le tout.
*
* @param res
@@ -1501,24 +1515,23 @@
// Enregistrement de "ical" et de "trepr" dans OCAL (seulement s'il vaut 0 ; aucun enregistrement metier pour une
// valeur différente)
final CrueData crueData = res.getMetier();
+ // Création de IniCalcReprise avec une date de reprise
+ OrdCalcScenario ocal = crueData.getOrdCalc();
+ if (ocal == null) {
+ ocal = new OrdCalcScenario();
+ crueData.setOrdCalc(ocal);
+ }
if (ical == 0) {
- // Création de IniCalcReprise avec une date de reprise
- OrdCalcScenario ocal = crueData.getOrdCalc();
- if (ocal == null) {
- ocal = new OrdCalcScenario();
- crueData.setOrdCalc(ocal);
- }
-
// final List<OrdCalcPerm> calculsPerms = new ArrayList<OrdCalcPerm>();
// final OrdCalcPseudoPerm pseudoPerm = new OrdCalcPseudoPerm();
- final OrdCalcPseudoPermIniCalcReprise reprise = new OrdCalcPseudoPermIniCalcReprise();
+ reprise = new OrdCalcPseudoPermIniCalcReprise();
reprise.setDateReprise(DateDurationConverter.getDateFromZeroDate(tempReprise));
// pseudoPerm.setIniReprise(reprise);
// calculsPerms.add(pseudoPerm);
- ocal.addOrdCalc(reprise);
+ // ocal.addOrdCalc(reprise);
}
// Enregistrement de "cru" et "cofqr" dans les propriétés CoefRuisQdm et CoefRuis respectivement de toutes les
@@ -1559,6 +1572,8 @@
crueData.setParamCalc(pcal);
}
pcal.setVerbosite(isorti == 0 ? EnumVerbosite.ZERO : EnumVerbosite.UN);
+ OrdPrtCIniModeleBase methodesInterpolation = createOpti(ile);
+ crueData.setMethodesInterpolation(methodesInterpolation);
// Pas d'enregistrement de "ile" qui sert pour l'algo uniquement
@@ -1581,4 +1596,35 @@
}
}
+ private OrdPrtCIniModeleBase createOpti(int ile) {
+ OrdPrtCIniModeleBase res = EMHFactory.createOPTI();
+ // <!-- cas DH.iLE=1 -->
+ // <InterpolLineaire />
+ // <!--
+ // XOR, si DH.iLE=0, une interpolation par cotes imposées aux sections
+ // <InterpolZimpAuxSections/>
+ // -->
+ // <!--
+ // XOR, si DH.iLE=2, une interpolation des cotes par calcul de la courbe
+ // de remous en permanent <InterpolSaintVenant>
+ // <Pm_TolNdZ>0.01</Pm_TolNdZ> </InterpolSaintVenant>
+ // -->
+ // <!--
+ // XOR, si DH.iLE=3, une interpolation à cotes constantes type baignoire
+ // <InterpolBaignoire/>
+ // -->
+ EnumMethodeInterpolation enumInterpol = EnumMethodeInterpolation.INTERPOL_ZIMP_AUX_SECTIONS;
+ if (ile == 1) {
+ enumInterpol = EnumMethodeInterpolation.LINEAIRE;
+ } else if (ile == 2) {
+ enumInterpol = EnumMethodeInterpolation.SAINT_VENANT;
+
+ res.addValParam(new ValParamDouble(CruePrefix.PM_TOL_ND_Z, 0.01));
+ } else if (ile == 3) {
+ enumInterpol = EnumMethodeInterpolation.BAIGNOIRE;
+ }
+ res.setMethodeInterpol(enumInterpol);
+
+ return res;
+ }
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHFactory.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHFactory.java 2009-07-01 03:52:04 UTC (rev 4897)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHFactory.java 2009-07-01 22:35:48 UTC (rev 4898)
@@ -67,4 +67,8 @@
dataDCSP.setLoiQPdc(newLoi);
return dataDCSP;
}
+
+ public static OrdPrtCIniModeleBase createOPTI() {
+ return new OrdPrtCIniModeleBase();
+ }
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHProjet.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHProjet.java 2009-07-01 03:52:04 UTC (rev 4897)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHProjet.java 2009-07-01 22:35:48 UTC (rev 4898)
@@ -85,6 +85,12 @@
return null;
}
+ public File getDirForRunCourantOf(String scenarioNom) {
+ final ManagerEMHScenario sc = getScenario(scenarioNom);
+ if (sc != null && sc.getRunCourant() != null) { return getDirForRun(sc, sc.getRunCourant()); }
+ return null;
+ }
+
private Map<String, URL> getEtudeFiles(final Map<String, FichierCrueParModele> allFileUsed) {
final Map<String, URL> res = new HashMap<String, URL>();
try {
@@ -108,60 +114,49 @@
/**
* @return l'association idFichier->File pour les fichier d'etude
*/
- public Map<String, URL> getFileEtudeScenario(final String id) {
- final ManagerEMHScenario sc = getScenario(id);
+ public Map<String, URL> getFileUrlEtudeScenario(final String nomScenario) {
+ final ManagerEMHScenario sc = getScenario(nomScenario);
if (sc == null) { return Collections.emptyMap(); }
return getEtudeFiles(s...
[truncated message content] |
|
From: <de...@us...> - 2009-07-02 22:18:53
|
Revision: 4899
http://fudaa.svn.sourceforge.net/fudaa/?rev=4899&view=rev
Author: deniger
Date: 2009-07-02 22:18:51 +0000 (Thu, 02 Jul 2009)
Log Message:
-----------
Modified Paths:
--------------
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/EMHFactory.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHConteneur.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioExporterCrue10.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioExporterCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaver.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaverCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/CruePrefix.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/EMHPropertiesValidator.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/NumberPropertyValidator.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateModeleScenario.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/ExampleEMHPropertiesValidator.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioSaverUI.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CommonMessages.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/common/
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/common/commonMessages.properties
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ProjetMessages.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/projet/projetMessages.properties
Copied: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CommonMessages.java (from rev 4891, trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ProjetMessages.java)
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CommonMessages.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CommonMessages.java 2009-07-02 22:18:51 UTC (rev 4899)
@@ -0,0 +1,26 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.common;
+
+import java.util.ResourceBundle;
+
+/**
+ * @author deniger
+ */
+public final class CommonMessages {
+ public static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+ .getBundle("org.fudaa.dodico.crue.common.commonMessages");
+
+ private CommonMessages() {}
+
+ public static String getString(String s) {
+ return RESOURCE_BUNDLE.getString(s);
+ }
+
+ public static String getString(String s, Object... args) {
+ return CrueMessageHelper.getS(RESOURCE_BUNDLE, s, args);
+ }
+
+}
Modified: 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/DCFileReader.java 2009-07-01 22:35:48 UTC (rev 4898)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java 2009-07-02 22:18:51 UTC (rev 4899)
@@ -312,10 +312,12 @@
// branche --//.
for (int k = 0; k < nbProfilsToAdd; k++) {
final double xpos = xpos1 + (k + 1) * distmax;
- final String nom = CruePrefix.P_PROFIL_SECTION + branche.getNom() + "_" + xpos;
- final EMHSectionInterpolee interpol = new EMHSectionInterpolee(nom);
-
- interpol.setNom(nom);
+ double doubleForNom = xpos;
+ if (doubleForNom >= 1) {
+ doubleForNom = Math.floor(doubleForNom);
+ }
+ final EMHSectionInterpolee interpol = EMHFactory.createSectionInterpoleFromDistmax(doubleForNom, branche
+ .getNom());
final RelationEMH relation = createRelationSectionDansBranche(branche, interpol, xpos, 1, 1, 1);
// -- ajout dans metier --//
data.add(interpol);
@@ -1280,7 +1282,8 @@
// -- on lit la suite --//
lireSuite();
- final EMHCasierProfil newCasier = new EMHCasierProfil("C" + idNoeud);
+ final EMHCasierProfil newCasier = new EMHCasierProfil(CruePrefix.changePrefix(idNoeud, CruePrefix.P_NOEUD,
+ CruePrefix.P_CASIER));
newCasier.setActive(true);
CatEMHNoeud noeudRef = metier.findNoeudByReference(idNoeud);
@@ -1305,7 +1308,7 @@
final List<Double> abscissesLimiteX = new ArrayList<Double>();
DonPrtGeoProfilCasier dataDPTG = null;
- int cptDPTG = 1;
+ double oldLong = 0;
while (!CrueIODico.isAnewCasierDefinition(in_.getLine()) && CrueIODico.appartientCasiersCarte(in_.getLine())) {
// -- recuperation de l'element lu en 1ere position --//
final String element = in_.stringField(0);
@@ -1354,8 +1357,14 @@
}
// ex: PROFCAS 400.0000
final double longueur = in_.doubleField(1);
+ oldLong += longueur;
+ if (longueur == 0) {
+ oldLong++;
+ }
dataDPTG = new DonPrtGeoProfilCasier();
- dataDPTG.setNom(CruePrefix.P_PROFIL_CASIER + newCasier.getNom());
+ dataDPTG.setNom(EMHFactory.createNomWithSuff(CruePrefix.changePrefix(newCasier.getNom(), CruePrefix.P_CASIER,
+ CruePrefix.P_PROFIL_CASIER)
+ + "#", oldLong));
dataDPTG.setLongueur(longueur);
}
@@ -1988,7 +1997,7 @@
} else {
replaceSection(metier, sectionCree, sectionCree);
}
-
+ lireSuite();
// // -- on remplace les relations et les infos emh --//
// if (sectionCree.getInfosEMH() != null) {
// newSection.setInfosEMH(sectionCree.getInfosEMH());
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHFactory.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHFactory.java 2009-07-01 22:35:48 UTC (rev 4898)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHFactory.java 2009-07-02 22:18:51 UTC (rev 4899)
@@ -8,6 +8,7 @@
import java.util.List;
import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.CtuluNumberFormatFixedFigure;
import org.fudaa.dodico.crue.metier.emh.*;
import org.fudaa.dodico.crue.validation.CruePrefix;
import org.joda.time.Duration;
@@ -59,8 +60,7 @@
final List<PtEvolutionFF> listePoints = new ArrayList<PtEvolutionFF>();
listeEvolution.setPtEvolutionFF(listePoints);
final LoiFF newLoi = new LoiFF();
- final String brancheNom = idBranche.startsWith(CruePrefix.P_BRANCHE) ? StringUtils.substringAfter(idBranche,
- CruePrefix.P_BRANCHE) : idBranche;
+ final String brancheNom = getBrancheNomWithoutPrefix(idBranche);
newLoi.setNom(CruePrefix.addPrefixIfNeeded(EnumTypeLoi.LoiQPdc, brancheNom));
newLoi.setEvolutionFF(listeEvolution);
newLoi.setType(EnumTypeLoi.LoiQPdc);
@@ -68,7 +68,27 @@
return dataDCSP;
}
+ public static String getBrancheNomWithoutPrefix(final String idBranche) {
+ return idBranche.startsWith(CruePrefix.P_BRANCHE) ? StringUtils.substringAfter(idBranche, CruePrefix.P_BRANCHE)
+ : idBranche;
+ }
+
public static OrdPrtCIniModeleBase createOPTI() {
return new OrdPrtCIniModeleBase();
}
+
+ public static EMHSectionInterpolee createSectionInterpoleFromDistmax(final double xpos, final String brancheNom) {
+ final String profilSection = CruePrefix.P_PROFIL_SECTION + getBrancheNomWithoutPrefix(brancheNom) + "#";
+ final String nom = createNomWithSuff(profilSection, xpos);
+ final EMHSectionInterpolee interpol = new EMHSectionInterpolee(nom);
+ interpol.setNom(nom);
+ return interpol;
+ }
+
+ public static String createNomWithSuff(final String profilSection, final double suff) {
+ final int nbToAdd = Math.max(1, CruePrefix.NB_CAR_MAX - profilSection.length());
+ final String nom = profilSection + new CtuluNumberFormatFixedFigure(nbToAdd).format(suff);
+ return nom;
+ }
+
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHScenario.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHScenario.java 2009-07-01 22:35:48 UTC (rev 4898)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHScenario.java 2009-07-02 22:18:51 UTC (rev 4899)
@@ -20,6 +20,37 @@
*/
public class ManagerEMHScenario extends ManagerEMHContainer<ManagerEMHModeleBase> {
+ private boolean compatibleCrue9 = true;
+ private boolean compatibleCrue10 = true;
+
+ /**
+ * @return the compatibleCrue10
+ */
+ public boolean isCompatibleCrue10() {
+ return compatibleCrue10;
+ }
+
+ /**
+ * @param compatibleCrue10 the compatibleCrue10 to set
+ */
+ public void setCompatibleCrue10(boolean compatibleCrue10) {
+ this.compatibleCrue10 = compatibleCrue10;
+ }
+
+ /**
+ * @return the compatibleCrue9
+ */
+ public boolean isCompatibleCrue9() {
+ return compatibleCrue9;
+ }
+
+ /**
+ * @param compatibleCrue9 the compatibleCrue9 to set
+ */
+ public void setCompatibleCrue9(boolean compatibleCrue9) {
+ this.compatibleCrue9 = compatibleCrue9;
+ }
+
private EMHScenario emh;
/**
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHConteneur.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHConteneur.java 2009-07-01 22:35:48 UTC (rev 4898)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHConteneur.java 2009-07-02 22:18:51 UTC (rev 4899)
@@ -49,4 +49,11 @@
return EMHHelper.getEMHInRelationEMHContient(getConcatSousModele(), EnumTypeEMH.CASIER);
}
+ /**
+ * @return tous les emh contenu par ce modele
+ */
+ public List<EMH> getSimpleEMH() {
+ return EMHHelper.getEMHInRelationEMHContient(getConcatSousModele());
+ }
+
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHScenario.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHScenario.java 2009-07-01 22:35:48 UTC (rev 4898)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHScenario.java 2009-07-02 22:18:51 UTC (rev 4899)
@@ -38,6 +38,20 @@
return EMHHelper.getEMHInRelationEMHContient(this, EnumTypeEMH.MODELE);
}
+ public List<EMH> getAllEMH() {
+ final List<EMH> simpleEMH = getSimpleEMH();
+ final List<EMH> res = new ArrayList<EMH>(simpleEMH.size() + 20);
+ res.add(this);
+ final List<EMHModeleBase> modeles = getModele();
+ res.addAll(modeles);
+ for (final EMHModeleBase modeleBase : modeles) {
+ res.addAll(modeleBase.getSousModele());
+ }
+ res.addAll(simpleEMH);
+ return res;
+
+ }
+
/**
* @return le conteneur de loi: toujours non null
*/
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ProjetMessages.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ProjetMessages.java 2009-07-01 22:35:48 UTC (rev 4898)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ProjetMessages.java 2009-07-02 22:18:51 UTC (rev 4899)
@@ -1,28 +0,0 @@
-/**
- * Licence GPL
- * Copyright Genesis
- */
-package org.fudaa.dodico.crue.projet;
-
-import java.util.ResourceBundle;
-
-import org.fudaa.dodico.crue.common.CrueMessageHelper;
-
-/**
- * @author deniger
- */
-public final class ProjetMessages {
- public static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle("org.fudaa.dodico.crue.projet.projetMessages");
-
- private ProjetMessages() {}
-
- public static String getString(String s) {
- return RESOURCE_BUNDLE.getString(s);
- }
-
- public static String getString(String s, Object... args) {
- return CrueMessageHelper.getS(RESOURCE_BUNDLE, s, args);
- }
-
-}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioExporterCrue10.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioExporterCrue10.java 2009-07-01 22:35:48 UTC (rev 4898)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioExporterCrue10.java 2009-07-02 22:18:51 UTC (rev 4899)
@@ -5,6 +5,7 @@
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.dodico.crue.common.CrueErrorManager;
+import org.fudaa.dodico.crue.common.CommonMessages;
import org.fudaa.dodico.crue.io.Crue10FileFormat;
import org.fudaa.dodico.crue.io.Crue10FileFormatFactory;
import org.fudaa.dodico.crue.io.common.CrueData;
@@ -58,7 +59,7 @@
public CrueErrorManager export() {
// on recupere tous les fichiers a écrire
final List<CrueFileType> allFiles = fileToExport == null ? ordonnanceur.getAllFileType() : fileToExport;
- final CrueErrorManager error = new CrueErrorManager(ProjetMessages.RESOURCE_BUNDLE);
+ final CrueErrorManager error = new CrueErrorManager(CommonMessages.RESOURCE_BUNDLE);
for (final CrueFileType crueFileType : allFiles) {
final Crue10FileFormat fileFormat = factory.getFileFormat(crueFileType);
final File fileDest = CtuluLibFile.changeExtension(new File(fichierModele), fileFormat.getExtensions()[0]);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioExporterCrue9.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioExporterCrue9.java 2009-07-01 22:35:48 UTC (rev 4898)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioExporterCrue9.java 2009-07-02 22:18:51 UTC (rev 4899)
@@ -4,6 +4,7 @@
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.dodico.crue.common.CrueErrorManager;
+import org.fudaa.dodico.crue.common.CommonMessages;
import org.fudaa.dodico.crue.io.AbstractCrue9FileFormat;
import org.fudaa.dodico.crue.io.Crue9FileFormatFactory;
import org.fudaa.dodico.crue.io.common.CrueData;
@@ -44,7 +45,7 @@
}
private CrueErrorManager exportFor(final CrueFileType dc, final CrueErrorManager error) {
- final CrueErrorManager res = error == null ? new CrueErrorManager(ProjetMessages.RESOURCE_BUNDLE) : error;
+ final CrueErrorManager res = error == null ? new CrueErrorManager(CommonMessages.RESOURCE_BUNDLE) : error;
final AbstractCrue9FileFormat format = Crue9FileFormatFactory.getFileFormat(dc);
format.write(dataToExport, CtuluLibFile.changeExtension(new File(fichierModele), format.getExtensions()[0]), error
.getNewAnalyser());
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java 2009-07-01 22:35:48 UTC (rev 4898)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java 2009-07-02 22:18:51 UTC (rev 4899)
@@ -8,12 +8,15 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluLibFile;
+import org.fudaa.dodico.crue.common.CommonMessages;
import org.fudaa.dodico.crue.common.CrueErrorManager;
import org.fudaa.dodico.crue.metier.EMHProjet;
import org.fudaa.dodico.crue.metier.EMHRun;
import org.fudaa.dodico.crue.metier.ManagerEMHScenario;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
+import org.fudaa.dodico.crue.validation.EMHPropertiesValidator;
import org.fudaa.dodico.crue.validation.ValidateConnectionModele;
+import org.fudaa.dodico.crue.validation.EMHPropertiesValidator.NomValidator;
/**
* Classe qui se charge de charger en memoire un scénario donné.
@@ -40,10 +43,10 @@
* @return true si ok
*/
public CrueErrorManager compute() {
- final CrueErrorManager errorMng = new CrueErrorManager(ProjetMessages.RESOURCE_BUNDLE);
+ final CrueErrorManager errorMng = new CrueErrorManager(CommonMessages.RESOURCE_BUNDLE);
final CtuluAnalyze analyzer = errorMng.getNewAnalyser();
errorMng.setMainAnalyze(analyzer);
- analyzer.setDesc(ProjetMessages.RESOURCE_BUNDLE.getString("loader.fichiers.scenario.chargt") + " "
+ analyzer.setDesc(CommonMessages.RESOURCE_BUNDLE.getString("loader.fichiers.scenario.chargt") + " "
+ scenario.getNom());
final boolean ok = validFiles(errorMng);
if (!ok) { return errorMng; }
@@ -70,11 +73,22 @@
}
}
if (emhScenario == null) { return errorMng; }
- scenario.setEmh(emhScenario);
+
// on valide les données
final CtuluAnalyze analyseValidationCOnnexite = errorMng.getNewAnalyser();
- analyseValidationCOnnexite.setDesc(ProjetMessages.getString("validation.connexite", scenario.getNom()));
+ analyseValidationCOnnexite.setDesc(CommonMessages.getString("validation.connexite", scenario.getNom()));
ValidateConnectionModele.validateConnexite(emhScenario, analyseValidationCOnnexite);
+
+ final EMHPropertiesValidator propValidator = new EMHPropertiesValidator();
+ emhScenario.setNom(scenario.getNom());
+ final NomValidator res = propValidator.validateNoms(emhScenario.getAllEMH(), false);
+ final CtuluAnalyze nomValidationRes = res.getRes();
+ errorMng.getAnalyser().add(nomValidationRes);
+ scenario.setCompatibleCrue9(res.isCrue9Compatible());
+ scenario.setCompatibleCrue10(res.isCrue10Compatible());
+ if (nomValidationRes.containsErrors()) { return errorMng; }
+ // finalement tout va bien:
+ scenario.setEmh(emhScenario);
return errorMng;
}
@@ -95,7 +109,7 @@
}
- private boolean validFileExists(CrueErrorManager error, final Map<String, URL> allFileUsed, final String title) {
+ private boolean validFileExists(final CrueErrorManager error, final Map<String, URL> allFileUsed, final String title) {
CtuluAnalyze fileNotExist = null;
boolean valid = true;
for (final URL f : allFileUsed.values()) {
@@ -103,8 +117,8 @@
valid = false;
if (fileNotExist == null) {
fileNotExist = error.getNewAnalyser();
- fileNotExist.setDefaultResourceBundle(ProjetMessages.RESOURCE_BUNDLE);
- fileNotExist.setDesc(ProjetMessages.RESOURCE_BUNDLE.getString(title));
+ fileNotExist.setDefaultResourceBundle(CommonMessages.RESOURCE_BUNDLE);
+ fileNotExist.setDesc(CommonMessages.RESOURCE_BUNDLE.getString(title));
}
fileNotExist.addError("loader.fichier.notExist.error", f.toString());
}
@@ -119,8 +133,8 @@
if (!urlExist(url)) {
valid = false;
if (fileNotExist == null) {
- fileNotExist = new CtuluAnalyze(ProjetMessages.RESOURCE_BUNDLE);
- fileNotExist.setDesc(ProjetMessages.RESOURCE_BUNDLE.getString("loader.resFichier.exist"));
+ fileNotExist = new CtuluAnalyze(CommonMessages.RESOURCE_BUNDLE);
+ fileNotExist.setDesc(CommonMessages.RESOURCE_BUNDLE.getString("loader.resFichier.exist"));
}
fileNotExist.addWarn("loader.resFichier.notExist.error", url.toString());
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java 2009-07-01 22:35:48 UTC (rev 4898)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java 2009-07-02 22:18:51 UTC (rev 4899)
@@ -91,6 +91,7 @@
}
final EMHScenario emhScenario = res.getScenarioData();
res.getModele().setNom(modele.getNom());
+ res.getSousModele().setNom(CruePrefix.changePrefix(modele.getNom(), CruePrefix.P_MODELE, CruePrefix.P_SS_MODELE));
EMHHelper.addRelationContientEMH(emhScenario, res.getModele());
EMHHelper.addRelationContientEMH(res.getModele(), res.getSousModele());
return emhScenario;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaver.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaver.java 2009-07-01 22:35:48 UTC (rev 4898)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaver.java 2009-07-02 22:18:51 UTC (rev 4899)
@@ -5,6 +5,7 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.common.CrueErrorManager;
+import org.fudaa.dodico.crue.common.CommonMessages;
import org.fudaa.dodico.crue.metier.EMHProjet;
import org.fudaa.dodico.crue.metier.EMHRun;
import org.fudaa.dodico.crue.metier.ManagerEMHScenario;
@@ -42,10 +43,10 @@
* @return true si réussite
*/
public CrueErrorManager saveWithScenarioType() {
- final CrueErrorManager errorMng = new CrueErrorManager(ProjetMessages.RESOURCE_BUNDLE);
+ final CrueErrorManager errorMng = new CrueErrorManager(CommonMessages.RESOURCE_BUNDLE);
final CtuluAnalyze analyzer = errorMng.getNewAnalyser();
errorMng.setMainAnalyze(analyzer);
- analyzer.setDesc(ProjetMessages.getString("write.scenario.action", scenario.getNom()));
+ analyzer.setDesc(CommonMessages.getString("write.scenario.action", scenario.getNom()));
if (projet.getScenario(scenario.getNom()) == null) {
analyzer.addFatalError("not.scenario.error", scenario.getNom());
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaverCrue9.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaverCrue9.java 2009-07-01 22:35:48 UTC (rev 4898)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaverCrue9.java 2009-07-02 22:18:51 UTC (rev 4899)
@@ -33,6 +33,10 @@
public boolean save(final Map<String, File> files) {
final CtuluAnalyze analyzer = errorManager.getMainAnalyze();
+ if (!scenario.isCompatibleCrue9()) {
+ analyzer.addFatalError("scenario.nonCompatible.crue9");
+ return false;
+ }
// -- recherche des fichiers sous modeles --//
final List<ManagerEMHModeleBase> fils = scenario.getFils();
if (fils.isEmpty()) {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/CruePrefix.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/CruePrefix.java 2009-07-01 22:35:48 UTC (rev 4898)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/CruePrefix.java 2009-07-02 22:18:51 UTC (rev 4899)
@@ -8,10 +8,11 @@
import java.util.Map;
import java.util.TreeMap;
+import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.common.CommonMessages;
import org.fudaa.dodico.crue.io.common.CrueData;
import org.fudaa.dodico.crue.metier.emh.*;
-import org.fudaa.dodico.crue.projet.ProjetMessages;
/**
* @author cde
@@ -26,7 +27,7 @@
public static final String P_MODELE_E = "Me_";
public static final String P_SS_MODELE_E = "Se_";
public static final String P_SS_MODELE = "Sm_";
- public static final String P_NOEUD = "Nd_ ";
+ public static final String P_NOEUD = "Nd_";
public static final String P_CASIER = "Ca_";
public static final String P_BRANCHE = "Br_";
public static final String P_SECTION = "St_";
@@ -97,6 +98,10 @@
return typeLoi.toString() + "_";
}
+ public static String changePrefix(String nom, String oldPref, String newPref) {
+ return newPref + StringUtils.removeStart(nom, oldPref);
+ }
+
public static String getNom(final EnumTypeLoi typeLoi, final String suffixe) {
return getPrefix(typeLoi) + suffixe;
}
@@ -136,7 +141,11 @@
return getNomAvecPrefixe(prefix, loi.getNom());
}
- private static final int NB_CAR_MAX_CRUE9 = 16;
+ public static final int NB_CAR_MAX_CRUE9 = 16;
+ /**
+ * Le nombre max de caractère autorise dans un nom
+ */
+ public static final int NB_CAR_MAX = 32;
protected static void computeNom(final ObjetNomme obj, final String prefixe, final CtuluAnalyze analyze,
final String codeErreur) {
@@ -198,7 +207,7 @@
public static CtuluAnalyze verifiePrefixeNomDonneesCrue9(final CrueData crueData) {
final List<EMH> listeEMHs = crueData.getAllEMH();
- final CtuluAnalyze analyze = new CtuluAnalyze(ProjetMessages.RESOURCE_BUNDLE);
+ final CtuluAnalyze analyze = new CtuluAnalyze(CommonMessages.RESOURCE_BUNDLE);
for (final EMH emh : listeEMHs) {
computeNom(emh, getPrefixFor(emh), analyze, "crue9.cant.rename.emh");
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/EMHPropertiesValidator.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/EMHPropertiesValidator.java 2009-07-01 22:35:48 UTC (rev 4898)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/EMHPropertiesValidator.java 2009-07-02 22:18:51 UTC (rev 4899)
@@ -10,8 +10,10 @@
import org.apache.commons.beanutils.PropertyUtils;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.common.CommonMessages;
import org.fudaa.dodico.crue.metier.emh.EMH;
import org.fudaa.dodico.crue.metier.emh.InfosEMH;
+import org.fudaa.dodico.crue.metier.emh.ObjetNomme;
import org.fudaa.dodico.crue.metier.emh.ParamNumModeleBase;
import org.fudaa.dodico.crue.metier.emh.RelationEMH;
@@ -22,13 +24,126 @@
*/
public class EMHPropertiesValidator {
+ public class NomValidator implements Validator {
+ private final boolean errorForCrue9;
+ boolean isCrue10Compatible = true;
+ boolean isCrue9Compatible = true;
+
+ private final CtuluAnalyze res = new CtuluAnalyze();
+
+ private final Map<String, Object> used = new HashMap<String, Object>();
+
+ public NomValidator(final boolean errorForCrue9) {
+ super();
+ this.errorForCrue9 = errorForCrue9;
+ res.setDefaultResourceBundle(CommonMessages.RESOURCE_BUNDLE);
+ res.setDesc(CommonMessages.getString("validation.noms"));
+ }
+
+ public CtuluAnalyze createAnalyzeForEMH(final EMH emh) {
+ return res;
+ }
+
+ /**
+ * @return the res
+ */
+ public CtuluAnalyze getRes() {
+ return res;
+ }
+
+ /**
+ * @return the isCrue10Compatible
+ */
+ public boolean isCrue10Compatible() {
+ return isCrue10Compatible;
+ }
+
+ /**
+ * @return the isCrue9Compatible
+ */
+ public boolean isCrue9Compatible() {
+ return isCrue9Compatible;
+ }
+
+ public void validate(final Object o, final CtuluAnalyze res) {
+ if (o instanceof ObjetNomme) {
+ final String nom = ((ObjetNomme) o).getNom();
+ System.err.println("test de " + nom);
+ final int length = nom.length();
+ if (length > CruePrefix.NB_CAR_MAX) {
+ isCrue10Compatible = false;
+ res.addError("valid.nom.tooLong", nom);
+ }
+ if (length > CruePrefix.NB_CAR_MAX_CRUE9) {
+ isCrue9Compatible = false;
+ if (errorForCrue9) {
+ res.addError("valid.nom.tooLong.crue9", nom);
+ } else {
+ res.addWarn("valid.nom.tooLong.crue9", nom);
+ }
+ }
+ final Object usedObject = used.get(nom);
+ if (usedObject == null) {
+ used.put(nom, o);
+ } else if (!usedObject.equals(o)) {
+ res.addError("valid.nom.notUnique", nom);
+ }
+
+ }
+
+ }
+ }
+
private interface ValidateObjects<T> {
void getObjects(T in, Set<Object> collector);
}
+ private interface Validator {
+ CtuluAnalyze createAnalyzeForEMH(EMH emh);
+
+ void validate(Object o, CtuluAnalyze res);
+ }
+
+ private class ValueValidator implements Validator {
+ final Map<String, NumberPropertyValidator> map;
+
+ public ValueValidator(final Map<String, NumberPropertyValidator> map) {
+ super();
+ this.map = map;
+ }
+
+ public CtuluAnalyze createAnalyzeForEMH(final EMH emh) {
+ final CtuluAnalyze emhAnalyze = new CtuluAnalyze();
+ emhAnalyze.setDesc(emh.getNom());
+ emhAnalyze.setResource(emh.getClass().toString());
+ return emhAnalyze;
+ }
+
+ public void validate(final Object o, final CtuluAnalyze res) {
+ validateObject(res, o, map);
+ }
+ }
+
+ protected static void validateObject(final CtuluAnalyze analyze, final Object o,
+ final Map<String, NumberPropertyValidator> ranges) {
+ final PropertyDescriptor[] propertyDescriptors = PropertyUtils.getPropertyDescriptors(o.getClass());
+ for (int i = 0; i < propertyDescriptors.length; i++) {
+ final PropertyDescriptor desc = propertyDescriptors[i];
+ final NumberPropertyValidator r = ranges.get(desc.getName());
+ if...
[truncated message content] |
|
From: <de...@us...> - 2009-07-05 22:35:56
|
Revision: 4901
http://fudaa.svn.sourceforge.net/fudaa/?rev=4901&view=rev
Author: deniger
Date: 2009-07-05 22:35:48 +0000 (Sun, 05 Jul 2009)
Log Message:
-----------
Modified Paths:
--------------
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/DateDurationConverter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueData.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataImpl.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/CrueConverterDPTG.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/CrueConverterOPTG.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/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/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/DCFileReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBSequentialReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHFactory.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHProjet.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Calc.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/DonFrt.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoBatiCasier.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoProfilCasier.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoProfilSection.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/EMHScenario.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/LitNomme.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/ObjetNomme.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcPseudoPerm.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Regle.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtData.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtDataLitPos.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/ValParam.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/projet/ScenarioExporterCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaver.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaver10.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaverCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/CruePrefix.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/NumberPropertyValidator.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/NumberPropertyValidatorsBuilder.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/NumberRangeValidator.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateModeleScenario.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/common/commonMessages.properties
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/validation/validation.txt
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/etu-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-dptg-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-pnum-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/TestComparaisonFactory.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/TestCrueDH.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueOPTGFile.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Etude.etu.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dc
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dh
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4-1.drso.xml
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CommonGuiLib.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueCommonImplementation.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueEditorImplementation.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/crue/projet/ScenarioLoaderUI.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioSaverUI.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleScenarioManager.java
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/crue/common/ihmMessages.properties
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ComparaisonGroup.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ComparaisonNode.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ComparaisonNodeFinal.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ConvertComparaisonConteneur.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ConvertCompare.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ConvertSelectOn.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ConvertSelectOnItem.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ConvertSelectOnItemMerge.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ConvertSelectOnItemRequest.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/common/
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/common/ComparaisonMessages.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/config/
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/config/AbstractConfCompare.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/config/AbstractConfSelectionItem.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfComparaison.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfComparaisonConteneur.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfCompare.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfCompareListe.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfCompareObject.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfCompareSpecific.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfOption.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfSelection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfSelectionItem.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfSelectionItemMerge.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfSelectionItemRequete.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/io/
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/io/ReaderConfig.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/AbstractEqualsTester.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/AbstractTemplateEqualsTesterDouble.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTester.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterArray.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterArrayDouble.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterArrayFloat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterArrayInteger.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterArrayLong.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterCollection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterDate.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterDouble.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterDuration.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterInteger.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterIsIncludeCollection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterItemBuilder.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterLong.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterObject.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterPeriod.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterPoint2D.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/FactoryEqualsTester.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/ResultatTest.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/TemplateEqualsTesterLong.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/TesterContext.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/TesterContextFactory.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateEMHProperties.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/comparaison/common/
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/comparaison/common/comparaisonMessages.properties
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/comparaison/io/
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/comparaison/io/comparaison-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/TestConvertCompare.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/TestConvertSelectOn.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/io/
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/io/TestReaderConfig.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/TestEMHPropertiesValidator.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele6.dc
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele6.dh
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele7.dc
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele7.dh
trunk/soft/fudaa-crue/dodico/src/test/resources/org/fudaa/dodico/crue/comparaison/
trunk/soft/fudaa-crue/dodico/src/test/resources/org/fudaa/dodico/crue/comparaison/io/
trunk/soft/fudaa-crue/dodico/src/test/resources/org/fudaa/dodico/crue/comparaison/io/testComparaison.xml
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/AbstractEqualsTester.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/AbstractTemplateEqualsTesterDouble.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/BuilderEqualsTesterItem.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/EqualsTester.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/EqualsTesterArray.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/EqualsTesterArrayDouble.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/EqualsTesterArrayFloat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/EqualsTesterArrayInteger.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/EqualsTesterArrayLong.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/EqualsTesterBean.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/EqualsTesterCollection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/EqualsTesterDate.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/EqualsTesterDouble.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/EqualsTesterDuration.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/EqualsTesterInteger.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/EqualsTesterLong.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/EqualsTesterObject.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/EqualsTesterPeriod.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/EqualsTesterPoint2D.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/FactoryEqualsTester.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/TemplateEqualsTesterLong.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/EMHPropertiesValidator.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/ExampleEMHPropertiesValidator.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest.zip
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTestNew.zip
Modified: 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 2009-07-02 22:20:25 UTC (rev 4900)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java 2009-07-05 22:35:48 UTC (rev 4901)
@@ -11,8 +11,6 @@
import java.util.logging.LogRecord;
import java.util.logging.SimpleFormatter;
-import com.memoire.fu.FuLib;
-
/**
* Formateur par defaut pour les logs
*
@@ -135,10 +133,7 @@
// final Map<String, Object> params = (Map<String, Object>) parameters[0];
if (catalog != null) {
// TODO a ameliorer...
- for (int i = 0; i < parameters.length; i++) {
- format = FuLib.replace(format, "{" + i + "}", parameters[i].toString());
-
- }
+ format = MessageFormat.format(format, parameters);
}
// final StringBuilder res = new StringBuilder(format.length() + parameters.length * 20);
// res.append(format).append(" ");
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/DateDurationConverter.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/DateDurationConverter.java 2009-07-02 22:20:25 UTC (rev 4900)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/DateDurationConverter.java 2009-07-05 22:35:48 UTC (rev 4901)
@@ -104,7 +104,8 @@
* @return la duration correspondante
*/
public static Duration getDuration(final String xsdDuration) {
- return getDaysHourMinSecPeriod(xsdDuration).toStandardDuration();
+ if (xsdDuration == null) { return null; }
+ return getDaysHourMinSecPeriod(xsdDuration.trim()).toStandardDuration();
}
/**
@@ -112,7 +113,8 @@
* @return la date
*/
public static LocalDateTime getDate(final String xsdDuration) {
- return XSD_DATE_PARSER.parseDateTime(xsdDuration).toLocalDateTime();
+ if (xsdDuration == null) { return null; }
+ return XSD_DATE_PARSER.parseDateTime(xsdDuration.trim()).toLocalDateTime();
}
/**
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/AbstractEqualsTester.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/AbstractEqualsTester.java 2009-07-02 22:20:25 UTC (rev 4900)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/AbstractEqualsTester.java 2009-07-05 22:35:48 UTC (rev 4901)
@@ -1,34 +0,0 @@
-package org.fudaa.dodico.crue.comparaison;
-
-
-/**
- * Tests de comparaison par défaut gérant les null.
- *
- * @author denf01a
- * @creation 22 juin 2009
- * @version
- * @param <T>
- */
-public abstract class AbstractEqualsTester<T> implements EqualsTester<T> {
-
- public final boolean isSame(final T o1, final T o2, ComparaisonResult res) {
- if (o1 == o2) { return true; }
- if (o1 == null || o2 == null) { return false; }
- // try {
- return isSameSafe(o1, o2, res);
- // } catch (ClassCastException e) {
- // // FIXME Auto-generated catch block
- // e.printStackTrace();
- // }
- // return false;
- }
-
- /**
- * @param o1 non null
- * @param o2 non null
- * @param res FIXME
- * @return true si egaux.
- */
- public abstract boolean isSameSafe(T o1, T o2, ComparaisonResult res);
-
-}
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/AbstractTemplateEqualsTesterDouble.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/AbstractTemplateEqualsTesterDouble.java 2009-07-02 22:20:25 UTC (rev 4900)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/AbstractTemplateEqualsTesterDouble.java 2009-07-05 22:35:48 UTC (rev 4901)
@@ -1,39 +0,0 @@
-package org.fudaa.dodico.crue.comparaison;
-
-/**
- * un template pour comparer des long.
- *
- * @author denf01a
- * @creation 18 juin 2009
- * @version
- * @param <T> le type d'objet a comparer.
- */
-public abstract class AbstractTemplateEqualsTesterDouble<T> extends AbstractEqualsTester<T> {
-
- private double eps = 0;
-
- /**
- * @return l'epsilon utilise pour les comparaison
- */
- public double getEps() {
- return eps;
- }
-
- /**
- * @param eps l'epsilon utilise pour les comparaison
- */
- public void setEps(final double eps) {
- this.eps = Math.abs(eps);
- }
-
- /**
- * @param d1 le double a comparer
- * @param d2 le double a comparer
- * @return true si egaux a eps pres.
- */
- public boolean isSameDouble(final double d1, final double d2) {
- if (eps > 0) { return Math.abs(d1 - d2) <= eps; }
- return d1 == d2;
- }
-
-}
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/BuilderEqualsTesterItem.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/BuilderEqualsTesterItem.java 2009-07-02 22:20:25 UTC (rev 4900)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/BuilderEqualsTesterItem.java 2009-07-05 22:35:48 UTC (rev 4901)
@@ -1,140 +0,0 @@
-package org.fudaa.dodico.crue.comparaison;
-
-import java.util.Map;
-
-import org.joda.time.Duration;
-import org.joda.time.LocalDateTime;
-import org.joda.time.Period;
-
-/**
- * @author denf01a
- * @creation 24 juin 2009
- * @version
- * @param <T>
- */
-public abstract class BuilderEqualsTesterItem<T extends EqualsTester> {
-
- protected static final LongTester LONG_TESTER = new LongTester();
-
- protected static final IntegerTester INTEGER_TESTER = new IntegerTester();
-
- protected static final DoubleTester DOUBLE_TESTER = new DoubleTester();
-
- protected static final EqualsTesterInteger ZERO_INT_TESTER = new EqualsTesterInteger();
- protected static final EqualsTesterLong ZERO_LONG_TESTER = new EqualsTesterLong();
- protected static final EqualsTesterObject BASIC_OBJECT_TESTER = new EqualsTesterObject();
-
- protected static void addDefault(final Map<Class, BuilderEqualsTesterItem> dest) {
- final DoubleTester d = DOUBLE_TESTER;
- dest.put(Double.class, d);
- dest.put(Float.class, d);
- dest.put(Integer.class, INTEGER_TESTER);
- dest.put(Long.class, LONG_TESTER);
- dest.put(Duration.class, new DurationTester());
- dest.put(Period.class, new PeriodTester());
- dest.put(LocalDateTime.class, new DateTester());
- dest.put(String.class, new BasicObjectTester());
- }
-
- public static class BasicObjectTester extends BuilderEqualsTesterItem<EqualsTesterObject> {
-
- @Override
- protected EqualsTesterObject build(final FactoryEqualsTester factory, final String propName, final Class propClass,
- final Class parentClass) {
- return BASIC_OBJECT_TESTER;
- }
- }
-
- public static class DateTester extends BuilderEqualsTesterItem<EqualsTesterDate> {
-
- private static final EqualsTesterDate ZERO = new EqualsTesterDate();
- static {
- ZERO.setEps(1E-20);
- }
-
- @Override
- protected EqualsTesterDate build(final FactoryEqualsTester factory, final String propName, final Class propClass,
- final Class parentClass) {
- final double eps = factory.getEpsFor(propName);
- if (eps <= 1E-20) { return ZERO; }
- final EqualsTesterDate res = new EqualsTesterDate();
- res.setEps(eps);
- return res;
- }
- }
-
- public static class DoubleTester extends BuilderEqualsTesterItem<EqualsTesterDouble> {
-
- private static final EqualsTesterDouble ZERO = new EqualsTesterDouble();
- static {
- ZERO.setEps(1E-20);
- }
-
- @Override
- protected EqualsTesterDouble build(final FactoryEqualsTester factory, final String propName, final Class propClass,
- final Class parentClass) {
- final double eps = factory.getEpsFor(propName);
- if (eps <= 1E-20) { return ZERO; }
- final EqualsTesterDouble res = new EqualsTesterDouble();
- res.setEps(eps);
- return res;
- }
- }
-
- public static class DurationTester extends BuilderEqualsTesterItem<EqualsTesterDuration> {
-
- private static final EqualsTesterDuration ZERO = new EqualsTesterDuration();
- static {
- ZERO.setEps(1E-20);
- }
-
- @Override
- protected EqualsTesterDuration build(final FactoryEqualsTester factory, final String propName,
- final Class propClass, final Class parentClass) {
- final double eps = factory.getEpsFor(propName);
- if (eps <= 1E-20) { return ZERO; }
- final EqualsTesterDuration res = new EqualsTesterDuration();
- res.setEps(eps);
- return res;
- }
- }
-
- public static class IntegerTester extends BuilderEqualsTesterItem<EqualsTesterInteger> {
-
- @Override
- protected EqualsTesterInteger build(final FactoryEqualsTester factory, final String propName,
- final Class propClass, final Class parentClass) {
- return ZERO_INT_TESTER;
- }
- }
-
- public static class LongTester extends BuilderEqualsTesterItem<EqualsTesterLong> {
-
- @Override
- protected EqualsTesterLong build(final FactoryEqualsTester factory, final String propName, final Class propClass,
- final Class parentClass) {
- return ZERO_LONG_TESTER;
- }
- }
-
- public static class PeriodTester extends BuilderEqualsTesterItem<EqualsTesterPeriod> {
-
- private static final EqualsTesterPeriod ZERO = new EqualsTesterPeriod();
- static {
- ZERO.setEps(1E-20);
- }
-
- @Override
- protected EqualsTesterPeriod build(final FactoryEqualsTester factory, final String propName, final Class propClass,
- final Class parentClass) {
- final double eps = factory.getEpsFor(propName);
- if (eps <= 1E-20) { return ZERO; }
- final EqualsTesterPeriod res = new EqualsTesterPeriod();
- res.setEps(eps);
- return res;
- }
- }
-
- protected abstract T build(FactoryEqualsTester factory, String propName, Class propClass, Class parentClass);
-
-}
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ComparaisonGroup.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ComparaisonGroup.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ComparaisonGroup.java 2009-07-05 22:35:48 UTC (rev 4901)
@@ -0,0 +1,20 @@
+package org.fudaa.dodico.crue.comparaison;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ComparaisonGroup extends ComparaisonNode {
+
+ List<ComparaisonNode> fils = new ArrayList<ComparaisonNode>();
+
+ @Override
+ public List<ComparaisonNode> getFils() {
+ return fils;
+ }
+
+ @Override
+ public boolean isFeuille() {
+ return false;
+ }
+
+}
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ComparaisonNode.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ComparaisonNode.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ComparaisonNode.java 2009-07-05 22:35:48 UTC (rev 4901)
@@ -0,0 +1,15 @@
+package org.fudaa.dodico.crue.comparaison;
+
+import java.util.List;
+
+public abstract class ComparaisonNode {
+ ComparaisonNode parent;
+ String print;
+ Object objetA;
+ Object objetB;
+
+ public abstract boolean isFeuille();
+
+ public abstract List<ComparaisonNode> getFils();
+
+}
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ComparaisonNodeFinal.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ComparaisonNodeFinal.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ComparaisonNodeFinal.java 2009-07-05 22:35:48 UTC (rev 4901)
@@ -0,0 +1,21 @@
+package org.fudaa.dodico.crue.comparaison;
+
+import java.util.Collections;
+import java.util.List;
+
+public class ComparaisonNodeFinal extends ComparaisonNode {
+
+ List listObjectA;
+ List listObjectB;
+
+ @Override
+ public List<ComparaisonNode> getFils() {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public ...
[truncated message content] |
|
From: <de...@us...> - 2009-07-15 20:52:54
|
Revision: 4910
http://fudaa.svn.sourceforge.net/fudaa/?rev=4910&view=rev
Author: deniger
Date: 2009-07-15 20:52:41 +0000 (Wed, 15 Jul 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/AbstractTemplateEqualsTesterDouble.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterInteger.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterIsIncludeCollection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterLong.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/FactoryEqualsTester.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/CrueDaoDCSP.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/CrueHelper.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/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/io/neuf/FCBSequentialReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/FactoryEMH.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/ManagerEMHScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DefaultValues.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/OrdonnanceurCrue10.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/OrdonnanceurCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/NumberRangeValidator.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/PropertyValidator.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/PropertyValidatorsBuilder.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateEMHProperties.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/common/commonMessages.properties
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/ioMessages.properties
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-dcsp-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDCSPFile.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dcsp.xml
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueEditorImplementation.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueNumberUtils.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtCasierProfil.java
trunk/soft/fudaa-crue/dodico/src/test/resources/Modele3.dc
trunk/soft/fudaa-crue/dodico/src/test/resources/exportModele3.dc
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueExportCtuluFileChooserTest.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/NumberUtils.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/TempValidationFichierScenario.java
Copied: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueNumberUtils.java (from rev 4905, trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/NumberUtils.java)
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueNumberUtils.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueNumberUtils.java 2009-07-15 20:52:41 UTC (rev 4910)
@@ -0,0 +1,59 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.common;
+
+import org.fudaa.ctulu.CtuluLib;
+
+/**
+ * @author deniger
+ */
+public final class CrueNumberUtils {
+
+ /**
+ * L'infini sur les EMH
+ */
+ public final static double INFINI = 1E30;
+ /**
+ * La valeur de l'infini a utiliser pour les tests.
+ */
+ public final static double INFINI_FOR_TEST = 1E29;
+
+ private CrueNumberUtils() {
+
+ }
+
+ /**
+ * @param d le double a tester
+ * @return true si superieur a +{@link #INFINI} ou inferieur à -{@link #INFINI}
+ */
+ public static boolean isInfini(final double d) {
+ return isInfiniPositif(d) || isInfiniNegatif(d);
+ }
+
+ /**
+ * @param d le double a tester
+ * @return true si pas infini
+ */
+ public static boolean isNotInfini(final double d) {
+ return !isInfini(d);
+ }
+
+ /**
+ * @param d d le double a tester
+ * @return true si superieur ou egal a +{@link #INFINI}
+ */
+ public static boolean isInfiniPositif(final double d) {
+ return d >= INFINI_FOR_TEST || CtuluLib.isEquals(d, INFINI_FOR_TEST);
+ }
+
+ /**
+ * @param d d le double a tester
+ * @return true si inferieur ou egal à -{@link #INFINI}
+ */
+ public static boolean isInfiniNegatif(final double d) {
+ return d <= -INFINI_FOR_TEST || CtuluLib.isEquals(d, -INFINI_FOR_TEST);
+ }
+
+}
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/NumberUtils.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/NumberUtils.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/NumberUtils.java 2009-07-15 20:52:41 UTC (rev 4910)
@@ -1,55 +0,0 @@
-/**
- * Licence GPL
- * Copyright Genesis
- */
-package org.fudaa.dodico.crue.common;
-
-import org.fudaa.ctulu.CtuluLib;
-
-/**
- * @author deniger
- */
-public final class NumberUtils {
-
- /**
- * L'infini sur les EMH
- */
- public final static double INFINI = 1E30;
-
- private NumberUtils() {
-
- }
-
- /**
- * @param d le double a tester
- * @return true si superieur a +{@link #INFINI} ou inferieur à -{@link #INFINI}
- */
- public static boolean isInfini(final double d) {
- return isInfiniPositif(d) || isInfiniNegatif(d);
- }
-
- /**
- * @param d le double a tester
- * @return true si pas infini
- */
- public static boolean isNotInfini(final double d) {
- return !isInfini(d);
- }
-
- /**
- * @param d d le double a tester
- * @return true si superieur ou egal a +{@link #INFINI}
- */
- public static boolean isInfiniPositif(final double d) {
- return d >= INFINI || CtuluLib.isEquals(d, INFINI);
- }
-
- /**
- * @param d d le double a tester
- * @return true si inferieur ou egal à -{@link #INFINI}
- */
- public static boolean isInfiniNegatif(final double d) {
- return d <= -INFINI || CtuluLib.isEquals(d, -INFINI);
- }
-
-}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/AbstractTemplateEqualsTesterDouble.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/AbstractTemplateEqualsTesterDouble.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/AbstractTemplateEqualsTesterDouble.java 2009-07-15 20:52:41 UTC (rev 4910)
@@ -1,6 +1,6 @@
package org.fudaa.dodico.crue.comparaison.tester;
-import org.fudaa.dodico.crue.common.NumberUtils;
+import org.fudaa.dodico.crue.common.CrueNumberUtils;
/**
* un template pour comparer des long.
@@ -40,8 +40,8 @@
*/
public boolean isSameDouble(final double d1, final double d2) {
// le cas des infini:
- if (NumberUtils.isInfiniPositif(d1) && NumberUtils.isInfiniPositif(d2)) { return true; }
- if (NumberUtils.isInfiniNegatif(d1) && NumberUtils.isInfiniNegatif(d2)) { return true; }
+ if (CrueNumberUtils.isInfiniPositif(d1) && CrueNumberUtils.isInfiniPositif(d2)) { return true; }
+ if (CrueNumberUtils.isInfiniNegatif(d1) && CrueNumberUtils.isInfiniNegatif(d2)) { return true; }
if (eps > 0) { return Math.abs(d1 - d2) <= eps; }
return d1 == d2;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterInteger.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterInteger.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterInteger.java 2009-07-15 20:52:41 UTC (rev 4910)
@@ -1,6 +1,6 @@
package org.fudaa.dodico.crue.comparaison.tester;
-import org.fudaa.dodico.crue.common.NumberUtils;
+import org.fudaa.dodico.crue.common.CrueNumberUtils;
/**
* @author denf01a
@@ -36,8 +36,8 @@
* @return true si egaux a eps pres.
*/
public boolean isSameInteger(final int d1, final int d2) {
- if (NumberUtils.isInfiniPositif(d1) && NumberUtils.isInfiniPositif(d2)) { return true; }
- if (NumberUtils.isInfiniNegatif(d1) && NumberUtils.isInfiniNegatif(d2)) { return true; }
+ if (CrueNumberUtils.isInfiniPositif(d1) && CrueNumberUtils.isInfiniPositif(d2)) { return true; }
+ if (CrueNumberUtils.isInfiniNegatif(d1) && CrueNumberUtils.isInfiniNegatif(d2)) { return true; }
if (eps > 0) { return Math.abs(d1 - d2) < eps; }
return d1 == d2;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterIsIncludeCollection.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterIsIncludeCollection.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterIsIncludeCollection.java 2009-07-15 20:52:41 UTC (rev 4910)
@@ -63,9 +63,11 @@
// }
// return false;
// }
- String[] prop = StringUtils.split(propName, ",");
+ final String[] prop = StringUtils.split(propName, ",");
final Set propInA = ConvertSelectOnItemMerge.getSet(o1, prop);
+ propInA.remove(null);
final Set propInB = ConvertSelectOnItemMerge.getSet(o2, prop);
+ propInB.remove(null);
boolean resFinal = true;
Collection subtract = CollectionUtils.subtract(propInA, propInB);
if (CollectionUtils.isNotEmpty(subtract)) {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterLong.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterLong.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterLong.java 2009-07-15 20:52:41 UTC (rev 4910)
@@ -1,6 +1,6 @@
package org.fudaa.dodico.crue.comparaison.tester;
-import org.fudaa.dodico.crue.common.NumberUtils;
+import org.fudaa.dodico.crue.common.CrueNumberUtils;
/**
* @author denf01a
@@ -36,8 +36,8 @@
* @return true si egaux a eps pres.
*/
public boolean isSameLong(final long d1, final long d2) {
- if (NumberUtils.isInfiniPositif(d1) && NumberUtils.isInfiniPositif(d2)) { return true; }
- if (NumberUtils.isInfiniNegatif(d1) && NumberUtils.isInfiniNegatif(d2)) { return true; }
+ if (CrueNumberUtils.isInfiniPositif(d1) && CrueNumberUtils.isInfiniPositif(d2)) { return true; }
+ if (CrueNumberUtils.isInfiniNegatif(d1) && CrueNumberUtils.isInfiniNegatif(d2)) { return true; }
if (eps > 0) { return Math.abs(d1 - d2) < eps; }
return d1 == d2;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/FactoryEqualsTester.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/FactoryEqualsTester.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/FactoryEqualsTester.java 2009-07-15 20:52:41 UTC (rev 4910)
@@ -93,7 +93,7 @@
* @return le tester demande. Ne renvoie jamais null.
*/
public EqualsTester buildTesterFor(final Class parentClass, final Class propClass, final String prop) {
- EqualsTester res = knownTester.get(propClass);
+ EqualsTester res = getKnownEqualsTester(propClass);
if (res != null) { return res; }
res = getCollectionTester(parentClass, propClass, prop);
if (res != null) { return res; }
@@ -104,4 +104,12 @@
// return BuilderEqualsTesterItem.BASIC_OBJECT_TESTER;
}
+
+ /**
+ * @param propClass LoiDF,LoiFF,String et PtProfil
+ * @return le tester d'egalité associe
+ */
+ public EqualsTester getKnownEqualsTester(final Class propClass) {
+ return knownTester.get(propClass);
+ }
}
Modified: 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/CrueConverterDCSP.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCSP.java 2009-07-15 20:52:41 UTC (rev 4910)
@@ -7,9 +7,9 @@
import org.apache.commons.collections.CollectionUtils;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.common.CrueData;
-import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.*;
import org.fudaa.dodico.crue.metier.emh.*;
+import org.fudaa.dodico.crue.metier.helper.EMHHelper;
/**
* Factory qui se charge de remplir les structures DAO du ficheir DCSP avec les donn�es m�tier et inversement.
@@ -29,46 +29,85 @@
// -- remplissage des branches --//
daoToMetierBranche(dao.DonCalcSansPrtBranches, dataLinked, analyser);
+ daoToMetierCasier(dao.DonCalcSansPrtCasiers, dataLinked, analyser);
// -- remplissage des sections --//
// CrueConverterDCSP.daoToMetierSection(dao.Sections, listeEMHDRSO, analyser);
return dataLinked;
}
- public CrueData getConverterData(CrueData in) {
+ /**
+ * @param donCalcSansPrtCasiers
+ * @param dataLinked
+ * @param analyser
+ */
+ private void daoToMetierCasier(final List<DaoCasier> donCalcSansPrtCasiers, final CrueData dataLinked,
+ final CtuluAnalyze analyser) {
+ if (CollectionUtils.isEmpty(donCalcSansPrtCasiers)) { return; }
+ for (final DaoCasier daoCasier : donCalcSansPrtCasiers) {
+ final CatEMHCasier casier = dataLinked.findCasierByReference(daoCasier.NomRef);
+ if (casier == null) {
+ analyser.addInfo("io.global.cantFindCasier.error", daoCasier.NomRef);
+ }
+ final DonCalcSansPrtCasierProfil dcsp = new DonCalcSansPrtCasierProfil();
+ dcsp.setCoefRuis(daoCasier.CoefRuis);
+ casier.addInfosEMH(dcsp);
+ }
+
+ }
+
+ public CrueData getConverterData(final CrueData in) {
return in;
}
public CrueDaoDCSP convertMetierToDao(final CrueData data, final CtuluAnalyze analyser) {
final CrueDaoDCSP res = new CrueDaoDCSP();
- res.Sections = new ArrayList<SectionBrancheAbstract>();
- res.DonCalcSansPrtBranches = new ArrayList<DaoBrancheAbstract>();
- List<EMH> metier = data.getAllSimpleEMH();
+ // res.Sections = new ArrayList<SectionBrancheAbstract>();
- if (CollectionUtils.isEmpty(metier)) {
- CrueHelper.emhEmpty(CrueFileType.DCSP, analyser);
- } else {
- for (final EMH emh : metier) {
- if (emh instanceof CatEMHBranche) {
- // -- remplissage des sections de branches --//
- final CatEMHBranche branche = (CatEMHBranche) emh;
+ convertMetierToDaoBranche(data, analyser, res);
+ convertMetierToDaoCasier(data, analyser, res);
+ return res;
+ }
- final List<DonCalcSansPrt> listeDoncalc = branche.getDCSP();
- if (listeDoncalc != null) {
- for (final DonCalcSansPrt dataCalc : listeDoncalc) {
- if (dataCalc != null) {
- CrueConverterDCSP.metierToDaoBranches(res.DonCalcSansPrtBranches, branche, dataCalc, analyser);
- } else {
- CrueHelper.unknowdataFromFile("Branches", branche.getNom(), analyser);
- }
+ private void convertMetierToDaoBranche(final CrueData data, final CtuluAnalyze analyser, final CrueDaoDCSP res) {
+ res.DonCalcSansPrtBranches = new ArrayList<DaoBrancheAbstract>();
+ final List<CatEMHBranche> metier = data.getBranches();
+ if (CollectionUtils.isNotEmpty(metier)) {
+ for (final CatEMHBranche branche : metier) {
+ final List<DonCalcSansPrt> listeDoncalc = branche.getDCSP();
+ if (listeDoncalc != null) {
+ for (final DonCalcSansPrt dataCalc : listeDoncalc) {
+ if (dataCalc != null) {
+ CrueConverterDCSP.metierToDaoBranches(res.DonCalcSansPrtBranches, branche, dataCalc, analyser);
+ } else {
+ CrueHelper.unknowdataFromFile("Branches", branche.getNom(), analyser);
}
}
+ }
+ }
+ }
+ }
+ private void convertMetierToDaoCasier(final CrueData data, final CtuluAnalyze analyser, final CrueDaoDCSP res) {
+ res.DonCalcSansPrtCasiers = new ArrayList<DaoCasier>();
+ final List<CatEMHCasier> casiers = data.getCasiers();
+ if (CollectionUtils.isNotEmpty(casiers)) {
+ for (final CatEMHCasier casier : casiers) {
+ final List<DonCalcSansPrtCasierProfil> listeDoncalc = EMHHelper.selectClass(casier.getDCSP(),
+ DonCalcSansPrtCasierProfil.class);
+ if (CollectionUtils.isNotEmpty(listeDoncalc)) {
+ if (listeDoncalc.size() > 1) {
+ analyser.addFatalError("dcsp.tooMuchDonForCasier", casier.getNom());
+ } else {
+ final DonCalcSansPrtCasierProfil pr = listeDoncalc.get(0);
+ final DaoCasier daoCasier = new DaoCasier();
+ daoCasier.NomRef = casier.getNom();
+ daoCasier.CoefRuis = pr.getCoefRuis();
+ res.DonCalcSansPrtCasiers.add(daoCasier);
+ }
}
-
}
}
- return res;
}
/**
Modified: 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/CrueDaoDCSP.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoDCSP.java 2009-07-15 20:52:41 UTC (rev 4910)
@@ -3,7 +3,7 @@
import java.util.List;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheAbstract;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.SectionBrancheAbstract;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoCasier;
/**
* Classe persistante qui reprend la meme structure que le fichier xml DSCP - Fichier des donn�es de calcul (xml) A
@@ -21,6 +21,5 @@
/**
* La liste des sections
*/
- protected List<SectionBrancheAbstract> Sections;
-
+ protected List<DaoCasier> DonCalcSansPrtCasiers;
}
\ No newline at end of file
Modified: 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/CrueDaoStructureDCSP.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDCSP.java 2009-07-15 20:52:41 UTC (rev 4910)
@@ -16,13 +16,15 @@
@SuppressWarnings("PMD.VariableNamingConventions")
public class CrueDaoStructureDCSP implements CrueDaoStructure {
- public void configureXStream(final XStream xstream, CtuluAnalyze analyze) {
+ public void configureXStream(final XStream xstream, final CtuluAnalyze analyze) {
// -- creation des alias pour que ce soit + parlant dans le xml file --//
xstream.alias(CrueFileType.DCSP.toString(), CrueDaoDCSP.class);
// -- liste des initialisations nécessaires pour le formattage des donn�es--//
initXmlParserBranche(xstream);
- initXmlParserSection(xstream);
initXmlParserSeuils(xstream);
+
+ xstream.alias("DonCalcSansPrtCasierProfil", DaoCasier.class);
+ xstream.useAttributeFor(DaoCasier.class, "NomRef");
// les enums:
xstream.registerConverter(EnumsConverter.createEnumConverter(EnumFormulePdc.class, analyze));
xstream.registerConverter(EnumsConverter.createEnumConverter(EnumSensOrifice.class, analyze));
@@ -55,34 +57,15 @@
xstream.alias("RegimeNoye", DaoRegimeNoye.class);
AbstractDaoLoi.configureXstream(xstream);
xstream.omitField(AbstractDaoLoi.class, "DateZeroLoiDF");
- // xstream.omitField(AbstractDaoLoi.class, "Nom");
- // les enum.
}
- /**
- * Init le parser avec les infos des sections.
- *
- * @param xstream
- */
- protected static void initXmlParserSection(final XStream xstream) {
- // -- gestion des sections --//
- xstream.alias("SectionIdem", DaoSectionIdem.class);
- xstream.alias("SectionSansGeometrie", DaoSectionSansGeometrie.class);
- xstream.alias("SectionProfil", DaoSectionProfil.class);
- xstream.alias("SectionInterpolee", DaoSectionInterpolee.class);
- xstream.alias("SectionPilote", DaoSectionPilote.class);
-
- xstream.useAttributeFor(SectionBrancheAbstract.class, "NomRef");
- }
-
protected static void initXmlParserSeuils(final XStream xstream) {
xstream.alias("ElemSeuilAvecPdc", DaoElemAvecSeuilPdc.class);
xstream.alias("ElemOrifice", DaoElemSeuilOrifice.class);
xstream.alias("ElemSeuil", DaoElemSeuil.class);
xstream.addImplicitCollection(DaoBrancheSeuilAbstract.class, "ElemSeuils");
xstream.addImplicitCollection(DaoBrancheBarrageFilEauAbstract.class, "ElemSeuils");
- // xstream.addImplicitCollection(DaoBrancheSeuilOrificeAbstract.class, "ElemOrifices");
}
@@ -99,6 +82,12 @@
protected DaoPdc Pdc;
}
+ protected static class DaoCasier {
+ protected String NomRef;
+ protected double CoefRuis;
+
+ }
+
protected static class DaoBrancheClassiqueAbstract extends DaoBrancheAbstract {
protected double CoefBeta;
@@ -196,27 +185,4 @@
protected DaoZasso Zasso;
}
- /**
- * Elementsection qui se trouve dans branche, dispose d'une reference positionnee dans la balise de d�but.
- *
- * @author Adrien Hadoux Pos: position.
- */
- protected static class SectionBrancheAbstract {
- protected String NomRef;
- protected double CoefPond;
- protected double CoefConv;
- protected double CoefDiv;
-
- }
-
- protected static class DaoSectionIdem extends SectionBrancheAbstract {}
-
- protected static class DaoSectionInterpolee extends SectionBrancheAbstract {}
-
- protected static class DaoSectionProfil extends SectionBrancheAbstract {}
-
- protected static class DaoSectionSansGeometrie extends SectionBrancheAbstract {}
-
- protected static class DaoSectionPilote extends SectionBrancheAbstract {}
-
}
Modified: 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/CrueHelper.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueHelper.java 2009-07-15 20:52:41 UTC (rev 4910)
@@ -6,8 +6,12 @@
import org.apache.commons.collections.CollectionUtils;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluLib;
+import org.fudaa.dodico.crue.comparaison.FactoryEqualsTesterSingleton;
+import org.fudaa.dodico.crue.comparaison.tester.EqualsTester;
import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.metier.emh.PtProfil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Plusieurs m�thodes et classes communes utilis�es pour les factory.
@@ -39,22 +43,61 @@
return CtuluLib.isEquals(a.getYp(), b.getYp()) && CtuluLib.isEquals(a.getZ(), b.getZ());
}
+ private final static Logger LOGGER = LoggerFactory.getLogger(CrueHelper.class);
+
/**
+ * @param pt le point recherche
+ * @param listPt la liste a parcourir
+ * @return l'indice du PtProfil egal a epsilon pres
+ */
+ public static int getEqualsPtProfil(final PtProfil pt, final List<PtProfil> listPt) {
+ if (pt == null || CollectionUtils.isEmpty(listPt)) { return -1; }
+ final EqualsTester knownEqualsTester = FactoryEqualsTesterSingleton.INSTANCE.getKnownEqualsTester(PtProfil.class);
+ final int nb = listPt.size();
+ for (int i = 0; i < nb; i++) {
+ try {
+ if (knownEqualsTester.isSame(pt, listPt.get(i), null, null)) { return i; }
+ } catch (final Exception e) {
+ LOGGER.error("getEqualsPtProfil", e);
+ }
+
+ }
+ return -1;
+ }
+
+ /**
* @param pt le point de base
- * @param listPt la liste de point a parcourir dans laquelle on va recherche le point le plus pres
+ * @param listPt la liste de point a parcourir dans laquelle on va recherche le point le plus pres.
+ * @return le plus petit indice du point le plus près
+ */
+ public static int getMinNearestPtProfilEnY(final PtProfil pt, final List<PtProfil> listPt) {
+ return getNearestPtProfilEnY(pt, listPt, true);
+ }
+
+ /**
+ * @param pt le point de base
+ * @param listPt la liste de point a parcourir dans laquelle on va recherche le point le plus pres.
+ * @return le plus grand indice du point le plus pres
+ */
+ public static int getMaxNearestPtProfilEnY(final PtProfil pt, final List<PtProfil> listPt) {
+ return getNearestPtProfilEnY(pt, listPt, false);
+ }
+
+ /**
+ * @param pt le point de base
+ * @param listPt la liste de point a parcourir dans laquelle on va recherche le point le plus pres.
+ * @param min true si on veut récupérer le point le plus près d'indice min
* @return -1 si un des 2 argument est null ou si liste vide. l'indice sinon
*/
- public static int getNearestPtProfilEnY(final PtProfil pt, final List<PtProfil> listPt) {
+ public static int getNearestPtProfilEnY(final PtProfil pt, final List<PtProfil> listPt, final boolean min) {
if (pt == null || CollectionUtils.isEmpty(listPt)) { return -1; }
int res = 0;
final int size = listPt.size();
double minDistanceFound = -1;
for (int i = 0; i < size; i++) {
final PtProfil ptInList = listPt.get(i);
- // si egale on le renvoie de suite
- if (CtuluLib.isEquals(ptInList.getYp(), pt.getYp())) { return i; }
final double distance = Math.abs(ptInList.getYp() - pt.getYp());
- if (minDistanceFound < 0 || distance < minDistanceFound) {
+ if (minDistanceFound < 0 || (min ? (distance < minDistanceFound) : (distance <= minDistanceFound))) {
res = i;
minDistanceFound = distance;
}
Modified: 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/AbstractCrue9Writer.java 2009-07-15 13:42:25 UTC (rev 4909)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/AbstractCrue9Writer.java 2009-07-15 20:52:41 UTC (rev 4910)
@@ -67,22 +67,27 @@
* @param data
* @throws IOException
*/
- public void writeHeader(final CrueIOResu<CrueData> data) throws IOException {
+ public void writeHeader(final CrueIOResu<CrueData> data, boolean writeTitre) throws IOException {
writeCom("");
String commentaire = data.getCrueCommentaire();
if (StringUtils.isBlank(commentaire)) {
commentaire = "Generé par FUDAA le " + DateFormat.getInstance().format(new Date(System.currentTimeMillis()));
}
- String[] titles = StringUtils.split(commentaire, '|');
+ final String[] titles = StringUtils.split(commentaire, '|');
for (int i = 0; i < Math.min(NB_LINES_TITLE, titles.length); i++) {
- fortranWriter.stringField(0, titles[i]);
+ if (writeTitre) {
+ fortranWriter.stringField(0, CrueIODico.TITRE);
+ fortranWriter.stringField(1, titles[i]);
+ } else {
+ fortranWriter.stringField(0, titles[i]);
+ }
fortranWriter.writeFields();
}
/**
* onécrit nblignes-1 de titre.
*/
for (int i = titles.length; i < NB_LINES_TITLE; i++) {
- fortranWriter.stringField(0, StringUtils.EMPTY);
+ fortranWriter.stringField(0, writeTitre ? CrueIODico.TITRE : StringUtils.EMPTY);
fortranWriter.writeFields();
}
@@ -106,14 +111,14 @@
protected void writeCarteValeur(final String carte, final double val1, final double val2) throws IOException {
fortranWriter...
[truncated message content] |
|
From: <de...@us...> - 2009-10-18 18:39:35
|
Revision: 5388
http://fudaa.svn.sourceforge.net/fudaa/?rev=5388&view=rev
Author: deniger
Date: 2009-10-18 18:39:21 +0000 (Sun, 18 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
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/metier/FactoryEMH.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDC.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/EMHGeneralBuilder.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-4.dc
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-4.dh
Modified: 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/DCFileReader.java 2009-10-18 18:24:49 UTC (rev 5387)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java 2009-10-18 18:39:21 UTC (rev 5388)
@@ -156,7 +156,7 @@
final List<Double> listeLimiteX, final List<Integer> listeLitsActifs, final DonPrtGeoProfilSectionFenteData fente) {
// -- on associe les objets crées entre eux pour creer un DPTG--//
final DonPrtGeoProfilSection dataDPTG = new DonPrtGeoProfilSection();
- dataDPTG.setNom(sectionProfil.getNom());
+ dataDPTG.setNom(CruePrefix.changePrefix(sectionProfil.getNom(), CruePrefix.P_SECTION, CruePrefix.P_PROFIL_SECTION));
dataDPTG.setFente(fente);
// --Il faut préfixer la section profil par un s car le profil et la section partagent le meme nom dans l'algo.--//
// sectionProfil.setNom(sectionProfil.getNom());
@@ -1288,10 +1288,10 @@
newCasier.addInfosEMH(dataDPTGQRuis);
} else if (element.toUpperCase().equals(CrueIODico.SBATI)) {
- // TODO attendre les retours CNR pour cette donnee.
-
- throw new CrueNotSupportedException(element, in_.getLineNumber());
-
+ final DonPrtGeoBatiCasier batiCasier = FactoryEMH.createDonPrtGeoBatiCasier(newCasier);
+ batiCasier.setSplanBati(in_.doubleField(1));
+ batiCasier.setZBatiTotal(in_.doubleField(2));
+ newCasier.addInfosEMH(batiCasier);
} else if (element.toUpperCase().equals(CrueIODico.PROFCAS)) {
// -- on finalise l'ancienne DPTG si on tombe sur une nouvelle --//
Modified: 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/DCFileWriter.java 2009-10-18 18:24:49 UTC (rev 5387)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileWriter.java 2009-10-18 18:39:21 UTC (rev 5388)
@@ -15,6 +15,7 @@
import org.fudaa.dodico.crue.io.common.EnumsConverter;
import org.fudaa.dodico.crue.io.dao.CrueHelper;
import org.fudaa.dodico.crue.metier.emh.*;
+import org.fudaa.dodico.crue.metier.helper.EMHHelper;
import org.fudaa.dodico.crue.metier.helper.LoiHelper;
/**
@@ -395,7 +396,17 @@
}
}
+ DonPrtGeoBatiCasier batiCasier = EMHHelper.getFirstOfClass(dptgList, DonPrtGeoBatiCasier.class);
+ if (batiCasier != null) {
+ fortranWriter.stringField(0, CrueIODico.SBATI);
+ // batiCasier.setSplanBati(in_.doubleField(1));
+ // batiCasier.setZBatiTotal(in_.doubleField(2));
+ fortranWriter.doubleField(1, batiCasier.getSplanBati());
+ fortranWriter.doubleField(2, batiCasier.getZBatiTotal());
+ fortranWriter.writeFields();
+ }
+
}
}
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/FactoryEMH.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/FactoryEMH.java 2009-10-18 18:24:49 UTC (rev 5387)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/FactoryEMH.java 2009-10-18 18:39:21 UTC (rev 5388)
@@ -107,9 +107,11 @@
if (distmax < 10) {
fmt = FMT_DISTMAX_FAIBLE;
}
- final EMHSectionInterpolee interpol = new EMHSectionInterpolee(CruePrefix.P_SECTION + brancheNom + "_"
- + fmt.format(xpos));
- // interpol.setNom(CruePrefix.P_PROFIL_SECTION + getBrancheNomWithoutPrefix(brancheNom) + "_" + fmt.format(xpos));
+ final EMHSectionInterpolee interpol = new EMHSectionInterpolee(CruePrefix.changePrefix(brancheNom,
+ CruePrefix.P_BRANCHE, CruePrefix.P_SECTION)
+ + "_" + fmt.format(xpos));
+ // interpol.setNom(CruePrefix.P_PROFIL_SECTION +
+ // getBrancheNomWithoutPrefix(brancheNom) + "_" + fmt.format(xpos));
return interpol;
}
@@ -125,6 +127,17 @@
return dataDPTG;
}
+ /**
+ * @param casier le casier a traiter
+ * @param pos la position du profil dans le casier
+ * @return le DonPrtGeoProfilCasier produit
+ */
+ public static DonPrtGeoBatiCasier createDonPrtGeoBatiCasier(final CatEMHCasier casier) {
+ final DonPrtGeoBatiCasier dataDPTG = new DonPrtGeoBatiCasier();
+ dataDPTG.setNom(CruePrefix.changePrefix(casier.getNom(), CruePrefix.P_CASIER, CruePrefix.P_BATI_CASIER));
+ return dataDPTG;
+ }
+
// public static String createNomWithSuff(final String profilSection, final double suff) {
// // final int nbToAdd = Math.max(1, CruePrefix.NB_CAR_MAX - profilSection.length());
// final String nom = profilSection + new CtuluNumberFormatFixedFigure(nbToAdd).format(suff);
Modified: 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/TestCrueDC.java 2009-10-18 18:24:49 UTC (rev 5387)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDC.java 2009-10-18 18:39:21 UTC (rev 5388)
@@ -2,6 +2,7 @@
import java.io.File;
import java.io.IOException;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.List;
@@ -10,9 +11,12 @@
import org.fudaa.dodico.crue.io.common.CrueData;
import org.fudaa.dodico.crue.io.common.CrueIOResu;
import org.fudaa.dodico.crue.io.common.IOMessages;
+import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
import org.fudaa.dodico.crue.metier.emh.DonFrt;
+import org.fudaa.dodico.crue.metier.emh.DonPrtGeoBatiCasier;
import org.fudaa.dodico.crue.metier.emh.EMHSectionIdem;
import org.fudaa.dodico.crue.metier.emh.OrdPrtGeoModeleBase;
+import org.fudaa.dodico.crue.metier.helper.EMHHelper;
import org.fudaa.dodico.crue.validation.CruePrefix;
/**
@@ -23,155 +27,114 @@
@SuppressWarnings("PMD.SystemPrintln")
public class TestCrueDC extends AbstractTestCase {
+ protected static final String EXEMPLE_CUSTOM = "/fichierTest/exempleDCbrancheOnly.dc";
+ protected static final String FICHIER_TEST_MODELE3_1_DC = "/fichierTest/Modele3-1.dc";
+ protected static final String FICHIER_TEST_MODELE3_2_DC = "/fichierTest/Modele3-2.dc";
public static final String FICHIER_TEST_MODELE3_DC = "/fichierTest/Modele3.dc";
+ public static final String FICHIER_TEST_MODELE34_DC = "/fichierTest/Modele3-4.dc";
+
public static final String FICHIER_TEST_MODELE4_DC = "/fichierTest/Modele4.dc";
public static final String FICHIER_TEST_MODELE5_DC = "/fichierTest/Modele5.dc";
public static final String FICHIER_TEST_MODELE6_DC = "/fichierTest/Modele6.dc";
public static final String FICHIER_TEST_MODELE7_DC = "/fichierTest/Modele7.dc";
- protected static final String FICHIER_TEST_MODELE3_1_DC = "/fichierTest/Modele3-1.dc";
- protected static final String FICHIER_TEST_MODELE3_2_DC = "/fichierTest/Modele3-2.dc";
- protected static final String EXEMPLE_CUSTOM = "/fichierTest/exempleDCbrancheOnly.dc";
-
/**
- *
+ * @param _args
*/
- public TestCrueDC() {
- // super(Crue9FileFormatFactory.getDCFileFormat(), FICHIER_TEST_MODELE3_DC_XML);
+ public static void main(final String[] _args) {
+ final TestCrueDC test = new TestCrueDC();
+ test.testLectureEcritureCRUE9Modele5();
}
/**
- * lit un fichier fabriqué avec quelques objets branches.
- *
+ * @param analyzer
* @param path
- * @return cruedata.
+ * @return CrueData
*/
- public CrueData testLectureFichierDC(final String path) {
- final CtuluAnalyze analyzer = new CtuluAnalyze(IOMessages.RESOURCE_BUNDLE);
- final CrueData data = readModeleCrue9(analyzer, path);
- testAnalyser(analyzer);
- testData(data);
- return data;
- }
+ public static CrueData readModeleCrue9(final CtuluAnalyze analyzer, final String path) {
+ // TODO attention cela ne fonctionnera pas en mode jar !
+ return readModeleCrue9(analyzer, TestCrueDC.class.getResource(path));
- /**
- * Test de lecture du modele 3 complet.
- */
- public void testLectureModele3() {
- CrueData testLectureFichierDC = testLectureFichierDC(FICHIER_TEST_MODELE3_DC);
- testAnalyser(CruePrefix.verifiePrefixeNomDonneesCrue9(testLectureFichierDC));
}
- /**
- * Test de lecture du modele 4 complet.
- */
- public void testLectureModele4() {
- testLectureFichierDC(FICHIER_TEST_MODELE3_DC);
- }
+ public static CrueData readModeleCrue9(final CtuluAnalyze analyzer, final URL url) {
- /**
- * Test de lecture du modele 5 complet.
- */
- public void testLectureModele5() {
- testLectureFichierDC(FICHIER_TEST_MODELE5_DC);
- }
+ final CrueIOResu<CrueData> data = Crue9FileFormatFactory.getDCFileFormat().read(url, analyzer, null);
+ analyzer.printResume();
+ return data.getMetier();
- /**
- * Test de lecture du modele 6 complet.
- */
- public void testLectureModele6() {
- testLectureFichierDC(FICHIER_TEST_MODELE6_DC);
}
/**
- * Test de lecture du modele 3-1 complet.
+ * @param analyzer
+ * @param f
+ * @param data
*/
- public void testLectureModele3_1() {
- testLectureFichierDC(FICHIER_TEST_MODELE3_1_DC);
- }
+ public static void writeModeleCrue9(final CtuluAnalyze analyzer, final File f, final CrueData data) {
- /**
- * Test de lecture du modele 3-2 complet.
- */
- public void testLectureModele3_2() {
- testLectureFichierDC(FICHIER_TEST_MODELE3_2_DC);
- }
+ Crue9FileFormatFactory.getDCFileFormat().write(data, f, analyzer);
+ analyzer.printResume();
- /**
- *
- */
- public void testLectureCrue9EcritureCrue10Modele3() {
- testLectureFichierCrue9etEcritureCrue10(FICHIER_TEST_MODELE3_DC);
}
/**
*
*/
- public void testLectureCrue9EcritureCrue10Modele4() {
- testLectureFichierCrue9etEcritureCrue10(FICHIER_TEST_MODELE4_DC);
+ public TestCrueDC() {
+ // super(Crue9FileFormatFactory.getDCFileFormat(), FICHIER_TEST_MODELE3_DC_XML);
}
- /**
- *
- */
- public void testLectureCrue9EcritureCrue10Modele5() {
- testLectureFichierCrue9etEcritureCrue10(FICHIER_TEST_MODELE5_DC);
- }
+ @Override
+ protected File createTempFile() {
+ File res = null;
+ try {
+ res = File.createTempFile("tmp", ".xml");
- /**
- *
- */
- public void testLectureCrue9EcritureCrue10Modele3_1() {
- testLectureFichierCrue9etEcritureCrue10(FICHIER_TEST_MODELE3_1_DC);
+ } catch (final IOException e) {
+ fail(e.getMessage());
+ }
+ return res;
}
- /**
- *
- */
- public void testLectureCrue9EcritureCrue10Modele3_2() {
- testLectureFichierCrue9etEcritureCrue10(FICHIER_TEST_MODELE3_2_DC);
+ protected File createTemptxtFile(final String titre) {
+ File res = null;
+ try {
+ res = File.createTempFile(titre + "tmpDC", ".txt");
+
+ } catch (final IOException e) {
+ fail(e.getMessage());
+ }
+ return res;
}
- /**
- *
- */
- public void testLectureCrue9EcritureCrue10ExempleCustom() {
- testLectureFichierCrue9etEcritureCrue10(EXEMPLE_CUSTOM);
+ private void testBatiCasier(final CrueData data) {
+ assertNotNull(data);
+ CruePrefix.verifiePrefixeNomDonneesCrue9(data);
+ CatEMHCasier findCasierByReference = data.findCasierByReference("Ca_N6");
+ assertNotNull(findCasierByReference);
+ DonPrtGeoBatiCasier bati = EMHHelper
+ .getFirstOfClass(findCasierByReference.getInfosEMH(), DonPrtGeoBatiCasier.class);
+ assertDoubleEquals(5000, bati.getSplanBati());
+ assertDoubleEquals(0.35, bati.getZBatiTotal());
}
- /**
- * Lit en crue 9 et écrit en crue 10.
- *
- * @param path
- */
- public void testLectureFichierCrue9etEcritureCrue10(final String path) {
+ public void testCrue9Modele34() {
final CtuluAnalyze analyzer = new CtuluAnalyze(IOMessages.RESOURCE_BUNDLE);
+ final CrueData data = readModeleCrue9(analyzer, FICHIER_TEST_MODELE34_DC);
+ testBatiCasier(data);
+ File file = createTempFile();
+ writeModeleCrue9(analyzer, file, data);
+ super.testAnalyser(analyzer);
+ try {
+ testBatiCasier(readModeleCrue9(analyzer, file.toURL()));
+ } catch (MalformedURLException e) {
+ fail(e.getMessage());
+ }
- final CrueData data = readModeleCrue9(analyzer, path);
+ }
- final File fichierEcritureDRRSO = createTempFile();
- // -- ecriture DRSO --//
- Crue10FileFormatFactory.getInstance().getDRSO().write(data, fichierEcritureDRRSO, analyzer);
-
- // -- ecriture DCSP --//
- final File fichierEcritureDCSP = createTempFile();
- Crue10FileFormatFactory.getInstance().getDCSP().write(data, fichierEcritureDCSP, analyzer);
-
- // -- ecriture des DFRT--//
- final File fichierEcritureDFRT = createTempFile();
- Crue10FileFormatFactory.getInstance().getDFRT().write(data, fichierEcritureDFRT, analyzer);
-
- // -- ecriture des DPTG --//
- final File fichierEcritureDPTG = createTempFile();
- Crue10FileFormatFactory.getInstance().getDPTG().write(data, fichierEcritureDPTG, analyzer);
-
- // -- ecriture des DPTI --//
- final File fichierEcritureDPTI = createTempFile();
- Crue10FileFormatFactory.getInstance().getDPTI().write(data, fichierEcritureDPTI, analyzer);
-
- // AppCrueTest.ecrireErrorMsg(analyzer);
- // testData(data);
-
+ protected void testData(final CrueData data) {
+ assertNotNull(data);
}
/**
@@ -202,39 +165,46 @@
}
- protected void testData(final CrueData data) {
- assertNotNull(data);
+ /**
+ *
+ */
+ public void testLectureCrue9EcritureCrue10ExempleCustom() {
+ testLectureFichierCrue9etEcritureCrue10(EXEMPLE_CUSTOM);
}
/**
- * @param analyzer
- * @param path
- * @return CrueData
+ *
*/
- public static CrueData readModeleCrue9(final CtuluAnalyze analyzer, final String path) {
- // TODO attention cela ne fonctionnera pas en mode jar !
- return readModeleCrue9(analyzer, TestCrueDC.class.getResource(path));
+ public void testLectureCrue9EcritureCrue10Modele3() {
+ testLectureFichierCrue9etEcritureCrue10(FICHIER_TEST_MODELE3_DC);
+ }
+ /**
+ *
+ */
+ public void testLectureCrue9EcritureCrue10Modele3_1() {
+ testLectureFichierCrue9etEcritureCrue10(FICHIER_TEST_MODELE3_1_DC);
}
- public static CrueData readModeleCrue9(final CtuluAnalyze analyzer, final URL url) {
+ /**
+ *
+ */
+ public void testLectureCrue9EcritureCrue10Modele3_2() {
+ testLectureFichierCrue9etEcritureCrue10(FICHIER_TEST_MODELE3_2_DC);
+ }
- final CrueIOResu<CrueData> data = Crue9FileFormatFactory.getDCFileFormat().read(url, analyzer, null);
- analyzer.printResume();
- return data.getMetier();
-
+ /**
+ *
+ */
+ public void testLectureCrue9EcritureCrue10Modele4() {
+ testLectureFichierCrue9etEcritureCrue10(FICHIER_TEST_MODELE4_DC);
}
/**
- * @param analyzer
- * @param f
- * @param data
+ *
*/
- public static void writeModeleCrue9(final CtuluAnalyze analyzer, final File f, final CrueData data) {
-
- Crue9FileFormatFactory.getDCFileFormat().write(data, f, analyzer);
- analyzer.printResume();
-
+ public void testLectureCrue9EcritureCrue10Modele5() {
+ testLectureFichierCrue9etEcritureCrue10(FICHIER_TEST_MODELE5_DC);
}
/**
@@ -285,33 +255,94 @@
}
/**
- * @param _args
+ * Lit en crue 9 et écrit en crue 10.
+ *
+ * @param path
*/
- public static void main(final String[] _args) {
- final TestCrueDC test = new TestCrueDC();
- test.testLectureEcritureCRUE9Modele5();
+ public void testLectureFichierCrue9etEcritureCrue10(final String path) {
+ final CtuluAnalyze analyzer = new CtuluAnalyze(IOMessages.RESOURCE_BUNDLE);
+
+ final CrueData data = readModeleCrue9(analyzer, path);
+
+ final File fichierEcritureDRRSO = createTempFile();
+ // -- ecriture DRSO --//
+ Crue10FileFormatFactory.getInstance().getDRSO().write(data, fichierEcritureDRRSO, analyzer);
+
+ // -- ecriture DCSP --//
+ final File fichierEcritureDCSP = createTempFile();
+ Crue10FileFormatFactory.getInstance().getDCSP().write(data, fichierEcritureDCSP, analyzer);
+
+ // -- ecriture des DFRT--//
+ final File fichierEcritureDFRT = createTempFile();
+ Crue10FileFormatFactory.getInstance().getDFRT().write(data, fichierEcritureDFRT, analyzer);
+
+ // -- ecriture des DPTG --//
+ final File fichierEcritureDPTG = createTempFile();
+ Crue10FileFormatFactory.getInstance().getDPTG().write(data, fichierEcritureDPTG, analyzer);
+
+ // -- ecriture des DPTI --//
+ final File fichierEcritureDPTI = createTempFile();
+ Crue10FileFormatFactory.getInstance().getDPTI().write(data, fichierEcritureDPTI, analyzer);
+
+ // AppCrueTest.ecrireErrorMsg(analyzer);
+ // testData(data);
+
}
- @Override
- protected File createTempFile() {
- File res = null;
- try {
- res = File.createTempFile("tmp", ".xml");
+ /**
+ * lit un fichier fabriqué avec quelques objets branches.
+ *
+ * @param path
+ * @return cruedata.
+ */
+ public CrueData testLectureFichierDC(final String path) {
+ final CtuluAnalyze analyzer = new CtuluAnalyze(IOMessages.RESOURCE_BUNDLE);
+ final CrueData data = readModeleCrue9(analyzer, path);
+ testAnalyser(analyzer);
+ testData(data);
+ return data;
+ }
- } catch (final IOException e) {
- fail(e.getMessage());
- }
- return res;
+ /**
+ * Test de lecture du modele 3 complet.
+ */
+ public void testLectureModele3() {
+ CrueData testLectureFichierDC = testLectureFichierDC(FICHIER_TEST_MODELE3_DC);
+ testAnalyser(CruePrefix.verifiePrefixeNomDonneesCrue9(testLectureFichierDC));
}
- protected File createTemptxtFile(final String titre) {
- File res = null;
- try {
- res = File.createTempFile(titre + "tmpDC", ".txt");
+ /**
+ * Test de lecture du modele 3-1 complet.
+ */
+ public void testLectureModele3_1() {
+ testLectureFichierDC(FICHIER_TEST_MODELE3_1_DC);
+ }
- } catch (final IOException e) {
- fail(e.getMessage());
- }
- return res;
+ /**
+ * Test de lecture du modele 3-2 complet.
+ */
+ public void testLectureModele3_2() {
+ testLectureFichierDC(FICHIER_TEST_MODELE3_2_DC);
}
+
+ /**
+ * Test de lecture du modele 4 complet.
+ */
+ public void testLectureModele4() {
+ testLectureFichierDC(FICHIER_TEST_MODELE3_DC);
+ }
+
+ /**
+ * Test de lecture du modele 5 complet.
+ */
+ public void testLectureModele5() {
+ testLectureFichierDC(FICHIER_TEST_MODELE5_DC);
+ }
+
+ /**
+ * Test de lecture du modele 6 complet.
+ */
+ public void testLectureModele6() {
+ testLectureFichierDC(FICHIER_TEST_MODELE6_DC);
+ }
}
Added: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-4.dc
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-4.dc (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-4.dc 2009-10-18 18:39:21 UTC (rev 5388)
@@ -0,0 +1,333 @@
+* Donn\xE9es g\xE9n\xE9rales
+* --------------------------
+* 5 lignes de titre
+TITRE CrueX - Structuration des donn\xE9es
+TITRE
+TITRE Mod\xE8le de test utilisant les \xE9l\xE9ments de mod\xE9lisation les plus courants
+TITRE
+TITRE PBa Jan09 sur la base de Modele2
+*
+* Configuration des r\xE8gles
+R_SLARGE 110.
+*
+* dal theta isorti
+COEFF 1.00 0.75
+*
+*
+* D\xE9finition des branches
+* --------------------------
+*
+* Branche B1: Saint-Venant
+BRANCHE B1 N1 N2 20
+DISTANCE 100.00 100.00 100.00 100.00 100.00
+PROF PROF11 PROF10 PROF9 PROF8 PROF7
+PROF PROF6A
+DISTMAX 50.
+*
+* Branche B2: Saint-Venant
+BRANCHE B2 N2 N3 20
+DISTANCE 100.00 100.00 100.00
+PROF PROF6B PROF5 PROF4 PROF3A
+*
+* Branche B3: Seuil transversal
+BRANCHE B3 N3 N4 2
+BORDA 1.
+* Larg Zseuil Cdebit Cpdc
+SEUIL 20.00 0.60 0.900
+SEUIL 8.00 2.20 0.900 1.000
+* nom des profils amont et aval
+PROF PROF3AM PROF3AV
+*
+* Branche B4: Saint-Venant
+BRANCHE B4 N4 N5 20
+DISTANCE 100.00 100.00
+PROF PROF3B PROF2 PROF1
+*
+* Branche B5: Seuil lateral
+BRANCHE B5 N2 N6 4
+BORDA 1.
+* Larg Zseuil Cdebit Cpdc
+SEUIL 100.00 3.78 0.900 1.000
+SEUIL 100.00 3.82 0.900
+*
+* Branche B6: Strickler
+BRANCHE B6 N6 N7 6
+DISTANCE 400.00
+PROF PROFSTR1 PROFSTR2
+*
+** Branche B7: Seuil lateral
+*BRANCHE B7 N7 N5 4
+*BORDA 0.
+** Larg Zseuil Cdebit Cpdc
+*SEUIL 100.00 3.00 1.000 1.000
+*
+* Branche B8: Orifice
+BRANCHE B8 N7 N5 5
+CCTRMAX 0.65
+* Zrad Haut Larg Cdeb Sens
+CLAPET 3.00 1.50 20.0 0.90 0
+*
+*
+* D\xE9finition des frottements
+* --------------------------
+*
+STRIREF K0 0
+*
+* Branches Saint-Venant
+STRIREFZ PROF11MIN 0.00 30. 11.00 30.
+STRIREFZ PROF11MAJ 0.00 15. 10.00 15.
+STRIREFZ PROF10MIN 0.00 30. 10.00 30.
+STRIREFZ PROF10MAJ 0.00 15. 10.00 15.
+STRIREFZ PROF9MIN 0.00 30. 10.00 30.
+STRIREFZ PROF9MAJ 0.00 15. 10.00 15.
+STRIREFZ PROF8MIN 0.00 30. 10.00 30.
+STRIREFZ PROF8MAJ 0.00 15. 10.00 15.
+STRIREFZ PROF7MIN 0.00 30. 10.00 30.
+STRIREFZ PROF7MAJ 0.00 15. 10.00 15.
+STRIREFZ PROF6AMIN 0.00 30. 10.00 30.
+STRIREFZ PROF6AMAJ 0.00 15. 10.00 15.
+STRIREFZ PROF6BMIN 0.00 30. 10.00 30.
+STRIREFZ PROF6BMAJ 0.00 15. 10.00 15.
+STRIREFZ PROF5MIN 0.00 30. 10.00 30.
+STRIREFZ PROF5MAJ 0.00 15. 10.00 15.
+STRIREFZ PROF4MIN 0.00 30. 10.00 30.
+STRIREFZ PROF4MAJ 0.00 15. 10.00 15.
+STRIREFZ PROF3AMIN 0.00 30. 10.00 30.
+STRIREFZ PROF3AMAJ 0.00 15. 10.00 15.
+STRIREFZ PROF3BMIN 0.00 30. 10.00 30.
+STRIREFZ PROF3BMAJ 0.00 15. 10.00 15.
+STRIREFZ PROF2MIN 0.00 30. 10.00 30.
+STRIREFZ PROF2MAJ 0.00 15. 10.00 15.
+STRIREFZ PROF1MIN 0.00 30. 10.00 30.
+STRIREFZ PROF1MAJ 0.00 15. 10.00 15.
+*
+* Branches Strickler
+STRIREFZ PROFSTR1MIN 0.00 30. 11.00 30.
+STRIREFZ PROFSTR2MIN 0.00 30. 11.00 30.
+*
+* Branches seuil
+STRIREFZ PROF3AMMIN 0.00 30. 10.00 30.
+STRIREFZ PROF3AMMAJ 0.00 15. 10.00 15.
+STRIREFZ PROF3AVMIN 0.00 30. 10.00 30.
+STRIREFZ PROF3AVMAJ 0.00 15. 10.00 15.
+*
+*
+* D\xE9finition des profils
+* --------------------------
+*
+* Profils Saint-Venant
+PROFIL PROF11
+LIMITEJ 1 3 4 7 8 10
+STRIC K0 PROF11MAJ PROF11MIN PROF11MAJ K0
+X/Z 0.00 6.10 2.00 5.10 32.00 4.10 62.00 3.10
+X/Z 66.00 1.10 86.00 1.10 90.00 3.10 120.00 4.10
+X/Z 150.00 5.10 152.00 6.10
+ACTIF 2 3 4
+LIT MAJD 2
+LIT MINEUR 3
+LIT MAJG 4
+LIT STOCKAGE 1 5
+*
+PROFIL PROF10
+LIMITEJ 1 3 4 7 8 10
+STRIC K0 PROF10MAJ PROF10MIN PROF10MAJ K0
+X/Z 0.00 6.00 2.00 5.00 32.00 4.00 62.00 3.00
+X/Z 66.00 1.00 86.00 1.00 90.00 3.00 120.00 4.00
+X/Z 150.00 5.00 152.00 6.00
+ACTIF 2 3 4
+LIT MAJD 2
+LIT MINEUR 3
+LIT MAJG 4
+LIT STOCKAGE 1 5
+*
+PROFIL PROF9
+LIMITEJ 1 3 4 7 8 10
+STRIC K0 PROF9MAJ PROF9MIN PROF9MAJ K0
+X/Z 0.00 5.90 2.00 4.90 32.00 3.90 62.00 2.90
+X/Z 66.00 0.90 86.00 0.90 90.00 2.90 120.00 3.90
+X/Z 150.00 4.90 152.00 5.90
+ACTIF 2 3 4
+LIT MAJD 2
+LIT MINEUR 3
+LIT MAJG 4
+LIT STOCKAGE 1 5
+*
+PROFIL PROF8
+LIMITEJ 1 3 4 7 8 10
+STRIC K0 PROF8MAJ PROF8MIN PROF8MAJ K0
+X/Z 0.00 5.80 2.00 4.80 32.00 3.80 62.00 2.80
+X/Z 66.00 0.80 86.00 0.80 90.00 2.80 120.00 3.80
+X/Z 150.00 4.80 152.00 5.80
+ACTIF 2 3 4
+LIT MAJD 2
+LIT MINEUR 3
+LIT MAJG 4
+LIT STOCKAGE 1 5
+*
+PROFIL PROF7
+LIMITEJ 1 3 4 7 8 10
+STRIC K0 PROF7MAJ PROF7MIN PROF7MAJ K0
+X/Z 0.00 5.70 2.00 4.70 32.00 3.70 62.00 2.70
+X/Z 66.00 0.70 86.00 0.70 90.00 2.70 120.00 3.70
+X/Z 150.00 4.70 152.00 5.70
+ACTIF 2 3 4
+LIT MAJD 2
+LIT MINEUR 3
+LIT MAJG 4
+LIT STOCKAGE 1 5
+*
+PROFIL PROF6A
+LIMITEJ 1 3 4 7 8 10
+STRIC K0 PROF6AMAJ PROF6AMIN PROF6AMAJ K0
+X/Z 0.00 5.60 2.00 4.60 32.00 3.60 62.00 2.60
+X/Z 66.00 0.60 86.00 0.60 90.00 2.60 120.00 3.60
+X/Z 150.00 4.60 152.00 5.60
+ACTIF 2 3 4
+LIT MAJD 2
+LIT MINEUR 3
+LIT MAJG 4
+LIT STOCKAGE 1 5
+*
+PROFIDEM PROF6B PROF6A 0.
+*PROFIL PROF6B
+*LIMITEJ 1 3 4 7 8 10
+*STRIC K0 PROF6BMAJ PROF6BMIN PROF6BMAJ K0
+*X/Z 0.00 5.60 2.00 4.60 32.00 3.60 62.00 2.60
+*X/Z 66.00 0.60 86.00 0.60 90.00 2.60 120.00 3.60
+*X/Z 150.00 4.60 152.00 5.60
+*ACTIF 2 3 4
+*LIT MAJD 2
+*LIT MINEUR 3
+*LIT MAJG 4
+*LIT STOCKAGE 1 5
+*
+PROFINT PROF5
+*PROFIL PROF5
+*LIMITEJ 1 3 4 7 8 10
+*STRIC K0 PROF5MAJ PROF5MIN PROF5MAJ K0
+*X/Z 0.00 5.50 2.00 4.50 32.00 3.50 62.00 2.50
+*X/Z 66.00 0.50 86.00 0.50 90.00 2.50 120.00 3.50
+*X/Z 150.00 4.50 152.00 5.50
+*ACTIF 2 3 4
+*LIT MAJD 2
+*LIT MINEUR 3
+*LIT MAJG 4
+*LIT STOCKAGE 1 5
+*
+PROFIL PROF4
+LIMITEJ 1 3 4 7 8 10
+STRIC K0 PROF4MAJ PROF4MIN PROF4MAJ K0
+X/Z 0.00 5.40 2.00 4.40 32.00 3.40 62.00 2.40
+X/Z 66.00 0.40 86.00 0.40 90.00 2.40 120.00 3.40
+X/Z 150.00 4.40 152.00 5.40
+ACTIF 2 3 4
+LIT MAJD 2
+LIT MINEUR 3
+LIT MAJG 4
+LIT STOCKAGE 1 5
+*
+PROFIL PROF3A
+LIMITEJ 1 3 4 7 8 10
+STRIC K0 PROF3AMAJ PROF3AMIN PROF3AMAJ K0
+X/Z 0.00 5.30 2.00 4.30 32.00 3.30 62.00 2.30
+X/Z 66.00 0.30 86.00 0.30 90.00 2.30 120.00 3.30
+X/Z 150.00 4.30 152.00 5.30
+ACTIF 2 3 4
+LIT MAJD 2
+LIT MINEUR 3
+LIT MAJG 4
+LIT STOCKAGE 1 5
+*
+PROFIDEM PROF3AM PROF3A
+*PROFIL PROF3AM
+*LIMITEJ 1 3 4 7 8 10
+*STRIC K0 PROF3AMMAJ PROF3AMMIN PROF3AMMAJ K0
+*X/Z 0.00 5.30 2.00 4.30 32.00 3.30 62.00 2.30
+*X/Z 66.00 0.30 86.00 0.30 90.00 2.30 120.00 3.30
+*X/Z 150.00 4.30 152.00 5.30
+*ACTIF 2 3 4
+*LIT MAJD 2
+*LIT MINEUR 3
+*LIT MAJG 4
+*LIT STOCKAGE 1 5
+*
+PROFIL PROF3AV
+LIMITEJ 1 3 4 7 8 10
+STRIC K0 PROF3AVMAJ PROF3AVMIN PROF3AVMAJ K0
+X/Z 0.00 5.30 2.00 4.30 32.00 3.30 62.00 2.30
+X/Z 66.00 0.30 86.00 0.30 90.00 2.30 120.00 3.30
+X/Z 150.00 4.30 152.00 5.30
+ACTIF 2 3 4
+LIT MAJD 2
+LIT MINEUR 3
+LIT MAJG 4
+LIT STOCKAGE 1 5
+*
+PROFIL PROF3B
+LIMITEJ 1 3 4 7 8 10
+STRIC K0 PROF3BMAJ PROF3BMIN PROF3BMAJ K0
+X/Z 0.00 5.30 2.00 4.30 32.00 3.30 62.00 2.30
+X/Z 66.00 0.30 86.00 0.30 90.00 2.30 120.00 3.30
+X/Z 150.00 4.30 152.00 5.30
+ACTIF 2 3 4
+LIT MAJD 2
+LIT MINEUR 3
+LIT MAJG 4
+LIT STOCKAGE 1 5
+*
+PROFIL PROF2
+LIMITEJ 1 3 4 7 8 10
+STRIC K0 PROF2MAJ PROF2MIN PROF2MAJ K0
+X/Z 0.00 5.20 2.00 4.20 32.00 3.20 62.00 2.20
+X/Z 66.00 0.20 86.00 0.20 90.00 2.20 120.00 3.20
+X/Z 150.00 4.20 152.00 5.20
+ACTIF 2 3 4
+LIT MAJD 2
+LIT MINEUR 3
+LIT MAJG 4
+LIT STOCKAGE 1 5
+*
+PROFIL PROF1
+LIMITEJ 1 3 4 7 8 10
+STRIC K0 PROF1MAJ PROF1MIN PROF1MAJ K0
+X/Z 0.00 5.10 2.00 4.10 32.00 3.10 62.00 2.10
+X/Z 66.00 0.10 86.00 0.10 90.00 2.10 120.00 3.10
+X/Z 150.00 4.10 152.00 5.10
+ACTIF 2 3 4
+LIT MAJD 2
+LIT MINEUR 3
+LIT MAJG 4
+LIT STOCKAGE 1 5
+*
+* Profils Strickler
+PROFIL PROFSTR1
+LIMITEJ 1 4
+STRIC PROFSTR1MIN
+X/Z 0.00 2.00 0.00 0.80 50.00 0.80 50.00 2.00
+*
+PROFIL PROFSTR2
+STRIC PROFSTR2MIN
+LIMITEJ 1 4
+X/Z 0.00 2.00 0.00 0.40 50.00 0.40 50.00 2.00
+*
+*
+* D\xE9finition des casiers
+* --------------------------
+*
+CASIER N6
+RUIS 0.000000
+PROFCAS 100.00
+LIMITEJ 1 2
+X/Z 0.00 0.30 100.00 0.30
+PROFCAS 100.00
+LIMITEJ 2 4
+X/Z -100.00 0.50 0.00 0.40
+X/Z 50.00 0.30 100.00 0.20
+SBATI 5000 0.35
+*
+CASIER N7
+RUIS 0.000000
+* nbval xlong ideb ifin
+PROFCAS 200.00
+LIMITEJ 1 2
+X/Z 0.00 0.20 100.00 0.20
Added: trunk/soft/fudaa-crue/dodic...
[truncated message content] |
|
From: <de...@us...> - 2009-10-19 21:45:23
|
Revision: 5403
http://fudaa.svn.sourceforge.net/fudaa/?rev=5403&view=rev
Author: deniger
Date: 2009-10-19 21:45:11 +0000 (Mon, 19 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
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/CrueConverterDRSO.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/neuf/AbstractCrue9Writer.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/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/EMH.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/projet/ScenarioExporterCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/CruePrefix.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateEMHProperties.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateModeleScenario.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/common/commonMessages.properties
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/etu-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/TestRequete.java
trunk/soft/fudaa-crue/dodico/src/test/resources/Etude.etu.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Etude.etu.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Etude2.etu.xml
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioSaverUI.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMHBrancheContientNoeud.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMHBrancheContientSection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/FactoryEMH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/FactoryEMHRelation.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/metier/emh/
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/metier/emh/TestCatEMHNoeud.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/FactoryEMH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/FactoryEMHRelation.java
Modified: 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/CrueConverterDFRT.java 2009-10-19 16:08:06 UTC (rev 5402)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDFRT.java 2009-10-19 21:45:11 UTC (rev 5403)
@@ -7,9 +7,9 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.common.CrueData;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDLHY.DaoLoiFF;
-import org.fudaa.dodico.crue.metier.FactoryEMH;
import org.fudaa.dodico.crue.metier.emh.DonFrt;
import org.fudaa.dodico.crue.metier.emh.DonFrtStrickler;
+import org.fudaa.dodico.crue.metier.helper.FactoryEMH;
/**
* Factory qui se charge de remplir les structures DAO dufichier DFRT avec les donn�es m�tier et inversement.
Modified: 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/CrueConverterDRSO.java 2009-10-19 16:08:06 UTC (rev 5402)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDRSO.java 2009-10-19 21:45:11 UTC (rev 5403)
@@ -15,9 +15,9 @@
import org.fudaa.dodico.crue.io.common.CrueDataImpl;
import org.fudaa.dodico.crue.io.common.EnumsConverter;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDRSO.*;
-import org.fudaa.dodico.crue.metier.FactoryEMHRelation;
import org.fudaa.dodico.crue.metier.emh.*;
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
+import org.fudaa.dodico.crue.metier.helper.FactoryEMHRelation;
/**
* Factory qui se charge de remplir les structures DAO du fichier DRSO avec les données métier et inversement.
@@ -304,7 +304,7 @@
// -- on remplit les sections persistantes avec celle de la branche --//
if (branchePersist.Sections != null) {
- branche.setListeSections(remplirSectionsBrancheAvecPersistanceDRSO(res, isSaintVenant,
+ branche.setListeSections(remplirSectionsBrancheAvecPersistanceDRSO(branche, res, isSaintVenant,
branchePersist.Sections, analyser));
}
@@ -489,8 +489,8 @@
* @param data
* @return
*/
- private List<RelationEMH> remplirSectionsBrancheAvecPersistanceDRSO(final CrueData res, final boolean isSaintVenant,
- final List listePersistanteSections, final CtuluAnalyze analyser) {
+ private List<RelationEMH> remplirSectionsBrancheAvecPersistanceDRSO(final CatEMHBranche branche, final CrueData res,
+ final boolean isSaintVenant, final List listePersistanteSections, final CtuluAnalyze analyser) {
final List<RelationEMH> listeRelationEMH = new ArrayList<RelationEMH>();
if (CollectionUtils.isEmpty(listePersistanteSections)) {
// CrueHelper.listEmpty("Branches", analyser);
@@ -506,8 +506,8 @@
// -- commun aux objets --//
if (section != null) {
- final RelationEMHSectionDansBranche relation = FactoryEMHRelation.createSectionDansBranche(isSaintVenant,
- section);
+ final RelationEMHSectionDansBranche relation = FactoryEMHRelation.createSectionDansBranche(branche,
+ isSaintVenant, section);
relation.setXp(sectionPersist.Xp);
relation.setPos((EnumPositionSection) sectionPositionConverter.fromString(sectionPersist.Pos));
if (isSaintVenant) {
Modified: 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/CrueConverterPCAL.java 2009-10-19 16:08:06 UTC (rev 5402)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPCAL.java 2009-10-19 21:45:11 UTC (rev 5403)
@@ -11,10 +11,10 @@
import org.fudaa.dodico.crue.io.common.EnumsConverter;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructurePCAL.PdtCouplagePersist;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructurePCAL.PdtRes;
-import org.fudaa.dodico.crue.metier.FactoryEMH;
import org.fudaa.dodico.crue.metier.emh.EnumVerbosite;
import org.fudaa.dodico.crue.metier.emh.ParamCalcScenario;
import org.fudaa.dodico.crue.metier.emh.PdtCst;
+import org.fudaa.dodico.crue.metier.helper.FactoryEMH;
import org.joda.time.Duration;
/**
Modified: 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/AbstractCrue9Writer.java 2009-10-19 16:08:06 UTC (rev 5402)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/AbstractCrue9Writer.java 2009-10-19 21:45:11 UTC (rev 5403)
@@ -73,7 +73,7 @@
if (StringUtils.isBlank(commentaire)) {
commentaire = "Generé par FUDAA le " + DateFormat.getInstance().format(new Date(System.currentTimeMillis()));
}
- final String[] titles = StringUtils.split(commentaire, '|');
+ final String[] titles = StringUtils.splitPreserveAllTokens(commentaire, '|');
for (int i = 0; i < Math.min(NB_LINES_TITLE, titles.length); i++) {
if (writeTitre) {
fortranWriter.stringField(0, CrueIODico.TITRE);
Modified: 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/DCFileReader.java 2009-10-19 16:08:06 UTC (rev 5402)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java 2009-10-19 21:45:11 UTC (rev 5403)
@@ -11,6 +11,8 @@
import com.memoire.fu.FuLogCrue;
import com.thoughtworks.xstream.converters.SingleValueConverter;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.dodico.crue.common.CrueNumberUtils;
import org.fudaa.dodico.crue.io.common.CrueData;
@@ -18,9 +20,9 @@
import org.fudaa.dodico.crue.io.common.CrueIOResu;
import org.fudaa.dodico.crue.io.common.EnumsConverter;
import org.fudaa.dodico.crue.io.dao.CrueHelper;
-import org.fudaa.dodico.crue.metier.FactoryEMH;
import org.fudaa.dodico.crue.metier.emh.*;
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
+import org.fudaa.dodico.crue.metier.helper.FactoryEMH;
import org.fudaa.dodico.crue.validation.CruePrefix;
/**
@@ -129,16 +131,24 @@
listeRelationEmh.add(FactoryEMH.createRelationSectionDansBranche(branche, section, sumDistanceTotaleXP, coefPond,
coefConv, coefDiv));
}
-
- // -- on ajoute la liste des relations EMH à la branche --//
- branche.setListeSections(listeRelationEmh);
- if (!listeRelationEmh.isEmpty()) {
- ((RelationEMHSectionDansBranche) listeRelationEmh.get(0)).setPos(EnumPositionSection.AMONT);
+ // on cree 2 sections par défaut si pas de géometrie
+ if (listeRelationEmh.isEmpty()) {
+ double xp = 0;
+ if (CollectionUtils.isNotEmpty(listeDistance)) {
+ xp = listeDistance.get(0);
+ }
+ FactoryEMH.addSectionSansGeometrie(branche, xp);
+ } else {
+ // -- on ajoute la liste des relations EMH à la branche --//
+ branche.setListeSections(listeRelationEmh);
+ if (!listeRelationEmh.isEmpty()) {
+ ((RelationEMHSectionDansBranche) listeRelationEmh.get(0)).setPos(EnumPositionSection.AMONT);
+ }
+ if (listeRelationEmh.size() > 1) {
+ ((RelationEMHSectionDansBranche) listeRelationEmh.get(listeRelationEmh.size() - 1))
+ .setPos(EnumPositionSection.AVAL);
+ }
}
- if (listeRelationEmh.size() > 1) {
- ((RelationEMHSectionDansBranche) listeRelationEmh.get(listeRelationEmh.size() - 1))
- .setPos(EnumPositionSection.AVAL);
- }
}
@@ -1809,7 +1819,9 @@
}
}
-
+ if (resu.getMetier().getPretraitementsGeom() == null) {
+ createDefaultOPTG(resu.getMetier());
+ }
return resu;
}
@@ -2036,9 +2048,7 @@
*/
public void readRegles(final CrueData metier) throws IOException {
- final OrdPrtGeoModeleBase reglesOPTG = new OrdPrtGeoModeleBase();
- // -- ajout des données métier dans le cruedata --//
- metier.setPretraitementsGeom(reglesOPTG);
+ final OrdPrtGeoModeleBase reglesOPTG = createDefaultOPTG(metier);
while (CrueIODico.appartientReglesCarte(in_.stringField(0))) {
Regle regle = null;
// -- analyse du premier element de la ligne pour gerer la bonne lecture --//
@@ -2128,6 +2138,13 @@
}
}
+ private OrdPrtGeoModeleBase createDefaultOPTG(final CrueData metier) {
+ final OrdPrtGeoModeleBase reglesOPTG = new OrdPrtGeoModeleBase();
+ // -- ajout des données métier dans le cruedata --//
+ metier.setPretraitementsGeom(reglesOPTG);
+ return reglesOPTG;
+ }
+
private void createParamNum(final CrueData metier) {
if (metier.getParamNumModeleBase() == null) {
metier.setParamNumModeleBase(new ParamNumModeleBase());
@@ -2143,16 +2160,14 @@
public void readHeader(final CrueIOResu<CrueData> res) throws IOException {
final StringBuilder comm = new StringBuilder(420);
- boolean done = false;
boolean readSuite = true;
for (int i = 0; i < AbstractCrue9Reader.NB_LINES_TITLE; i++) {
- final String readAndAvoidLabel = readAndAvoidLabel(in_);
+ final String readAndAvoidLabel = readAndAvoidLabel(in_).trim();
if (readAndAvoidLabel.startsWith(CrueIODico.TITRE)) {
- if (!done) {
- done = true;
+ if (comm.length() > 0) {
comm.append('|');
}
- comm.append(in_.stringField(1));
+ comm.append(StringUtils.removeStart(in_.getLine(), CrueIODico.TITRE));
} else {
readSuite = false;
break;
Modified: 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/DHReader.java 2009-10-19 16:08:06 UTC (rev 5402)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java 2009-10-19 21:45:11 UTC (rev 5403)
@@ -22,9 +22,9 @@
import org.fudaa.dodico.crue.io.common.CrueData;
import org.fudaa.dodico.crue.io.common.CrueIOResu;
import org.fudaa.dodico.crue.io.common.EnumsConverter;
-import org.fudaa.dodico.crue.metier.FactoryEMH;
import org.fudaa.dodico.crue.metier.emh.*;
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
+import org.fudaa.dodico.crue.metier.helper.FactoryEMH;
import org.fudaa.dodico.crue.metier.helper.LoiFactory;
import org.fudaa.dodico.crue.metier.helper.LoiHelper;
import org.fudaa.dodico.crue.validation.CruePrefix;
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/FactoryEMH.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/FactoryEMH.java 2009-10-19 16:08:06 UTC (rev 5402)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/FactoryEMH.java 2009-10-19 21:45:11 UTC (rev 5403)
@@ -1,162 +0,0 @@
-/**
- * Licence GPL
- * Copyright Genesis
- */
-package org.fudaa.dodico.crue.metier;
-
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.commons.lang.StringUtils;
-import org.fudaa.dodico.crue.metier.emh.*;
-import org.fudaa.dodico.crue.validation.CruePrefix;
-import org.joda.time.Duration;
-
-/**
- * @author deniger
- */
-public final class FactoryEMH {
-
- private final static NumberFormat FMT_DISTMAX;
- private final static NumberFormat FMT_DISTMAX_FAIBLE;
- private final static NumberFormat FMT_PROFIL_CASIER;
- static {
- FMT_DISTMAX = NumberFormat.getIntegerInstance();
- FMT_DISTMAX.setGroupingUsed(false);
- FMT_DISTMAX.setMinimumIntegerDigits(5);
- // FMT_DISTMAX.setMaximumIntegerDigits(5);
-
- FMT_DISTMAX_FAIBLE = NumberFormat.getNumberInstance(Locale.US);
- FMT_DISTMAX_FAIBLE.setGroupingUsed(false);
- FMT_DISTMAX_FAIBLE.setMinimumIntegerDigits(4);
- // FMT_DISTMAX_FAIBLE.setMaximumIntegerDigits(4);
- FMT_DISTMAX_FAIBLE.setMinimumFractionDigits(1);
- FMT_DISTMAX_FAIBLE.setMaximumFractionDigits(1);
-
- FMT_PROFIL_CASIER = NumberFormat.getIntegerInstance();
- FMT_PROFIL_CASIER.setMinimumIntegerDigits(3);
- FMT_PROFIL_CASIER.setGroupingUsed(false);
- // FMT_PROFIL_CASIER.setMaximumIntegerDigits(3);
- }
-
- private FactoryEMH() {
-
- }
-
- /**
- * @param nomFrot le nom du frottement
- * @return le strickler correctement initialise
- */
- public static DonFrtStrickler createDonFrtStrickler(final String nomFrot) {
- final DonFrtStrickler frt = new DonFrtStrickler();
- frt.setNom(nomFrot);
- final LoiFF loiFF = new LoiFF();
- frt.setStrickler(loiFF);
- loiFF.setNom(nomFrot);
- // loiFF.setExtrapolInf("ValCst");
- loiFF.setType(EnumTypeLoi.LoiFK);
- loiFF.setEvolutionFF(new EvolutionFF());
- final List<PtEvolutionFF> pts = new ArrayList<PtEvolutionFF>();
- loiFF.getEvolutionFF().setPtEvolutionFF(pts);
- return frt;
- }
-
- /**
- * @param d la duree
- * @return le pdt constant
- */
- public static Pdt createPdtCst(final Duration d) {
- final PdtCst pdtCst = new PdtCst();
- pdtCst.setPdtCst(d);
- return pdtCst;
- }
-
- /**
- * @param idBranche
- * @return
- */
- public static DonCalcSansPrtBranchePdc createDCSPBranchePdcCrue9(final String idBranche) {
- final DonCalcSansPrtBranchePdc dataDCSP = new DonCalcSansPrtBranchePdc();
- final EvolutionFF listeEvolution = new EvolutionFF();
- final List<PtEvolutionFF> listePoints = new ArrayList<PtEvolutionFF>();
- listeEvolution.setPtEvolutionFF(listePoints);
- final LoiFF newLoi = new LoiFF();
- final String brancheNom = getBrancheNomWithoutPrefix(idBranche);
- newLoi.setNom(CruePrefix.addPrefixIfNeeded(EnumTypeLoi.LoiQPdc, brancheNom));
- newLoi.setEvolutionFF(listeEvolution);
- newLoi.setType(EnumTypeLoi.LoiQPdc);
- dataDCSP.setLoiQPdc(newLoi);
- return dataDCSP;
- }
-
- public static String getBrancheNomWithoutPrefix(final String idBranche) {
- return idBranche.startsWith(CruePrefix.P_BRANCHE) ? StringUtils.substringAfter(idBranche, CruePrefix.P_BRANCHE)
- : idBranche;
- }
-
- public static OrdPrtCIniModeleBase createOPTI() {
- return new OrdPrtCIniModeleBase();
- }
-
- public static EMHSectionInterpolee createSectionInterpoleFromDistmax(final double xpos, final String brancheNom,
- final double distmax) {
-
- NumberFormat fmt = FMT_DISTMAX;
- if (distmax < 10) {
- fmt = FMT_DISTMAX_FAIBLE;
- }
- final EMHSectionInterpolee interpol = new EMHSectionInterpolee(CruePrefix.changePrefix(brancheNom,
- CruePrefix.P_BRANCHE, CruePrefix.P_SECTION)
- + "_" + fmt.format(xpos));
- // interpol.setNom(CruePrefix.P_PROFIL_SECTION +
- // getBrancheNomWithoutPrefix(brancheNom) + "_" + fmt.format(xpos));
- return interpol;
- }
-
- /**
- * @param casier le casier a traiter
- * @param pos la position du profil dans le casier
- * @return le DonPrtGeoProfilCasier produit
- */
- public static DonPrtGeoProfilCasier createDonPrtGeoProfilCasier(final CatEMHCasier casier, final int pos) {
- final DonPrtGeoProfilCasier dataDPTG = new DonPrtGeoProfilCasier();
- dataDPTG.setNom(CruePrefix.changePrefix(casier.getNom(), CruePrefix.P_CASIER, CruePrefix.P_PROFIL_CASIER) + "_"
- + FMT_PROFIL_CASIER.format(pos));
- return dataDPTG;
- }
-
- /**
- * @param casier le casier a traiter
- * @param pos la position du profil dans le casier
- * @return le DonPrtGeoProfilCasier produit
- */
- public static DonPrtGeoBatiCasier createDonPrtGeoBatiCasier(final CatEMHCasier casier) {
- final DonPrtGeoBatiCasier dataDPTG = new DonPrtGeoBatiCasier();
- dataDPTG.setNom(CruePrefix.changePrefix(casier.getNom(), CruePrefix.P_CASIER, CruePrefix.P_BATI_CASIER));
- return dataDPTG;
- }
-
- // public static String createNomWithSuff(final String profilSection, final double suff) {
- // // final int nbToAdd = Math.max(1, CruePrefix.NB_CAR_MAX - profilSection.length());
- // final String nom = profilSection + new CtuluNumberFormatFixedFigure(nbToAdd).format(suff);
- // return nom;
- // }
-
- public static RelationEMHSectionDansBranche createRelationSectionDansBranche(final CatEMHBranche branche,
- final CatEMHSection section, final double xp, final double coefPond, final double coefConv, final double coefDiv) {
- final boolean isSaintVenant = branche instanceof EMHBrancheSaintVenant;
- final RelationEMHSectionDansBranche relation = FactoryEMHRelation.createSectionDansBranche(isSaintVenant, section);
- relation.setXp(xp);
- relation.setPos(EnumPositionSection.INTERNE);
- if (isSaintVenant) {
- final RelationEMHSectionDansBrancheSaintVenant stV = (RelationEMHSectionDansBrancheSaintVenant) relation;
- stV.setCoefConv(coefConv);
- stV.setCoefPond(coefPond);
- stV.setCoefDiv(coefDiv);
- }
- return relation;
- }
-
-}
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/FactoryEMHRelation.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/FactoryEMHRelation.java 2009-10-19 16:08:06 UTC (rev 5402)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/FactoryEMHRelation.java 2009-10-19 21:45:11 UTC (rev 5403)
@@ -1,93 +0,0 @@
-/**
- * Licence GPL
- * Copyright Genesis
- */
-package org.fudaa.dodico.crue.metier;
-
-import org.fudaa.dodico.crue.metier.emh.*;
-
-/**
- * @author deniger
- */
-public final class FactoryEMHRelation {
-
- /**
- * @param isSaintVenant true si branche de saintVenant.
- * @param section la section
- * @return la relation correctement initialisée
- */
- public static RelationEMHSectionDansBranche createSectionDansBranche(final boolean isSaintVenant,
- final CatEMHSection section) {
- final RelationEMHSectionDansBranche res = isSaintVenant ? new RelationEMHSectionDansBrancheSaintVenant()
- : new RelationEMHSectionDansBranche();
- res.setEmh(section);
- return res;
- }
-
- /**
- * @param nd le noeud pointe
- * @return la relation du noeud amond
- */
- public static RelationEMHNoeudDansBranche createNoeudAmont(final CatEMHNoeud nd) {
- final RelationEMHNoeudDansBranche res = createRelationNoeud(nd);
- res.setAmont(true);
- return res;
- }
-
- /**
- * @param nd le noeud pointe
- * @return la relation du noeud amond
- */
- public static RelationEMHNoeudDansBranche createNoeudAval(final CatEMHNoeud nd) {
- final RelationEMHNoeudDansBranche res = createRelationNoeud(nd);
- res.setAval(true);
- return res;
-
- }
-
- private static RelationEMHNoeudDansBranche createRelationNoeud(final CatEMHNoeud nd) {
- final RelationEMHNoeudDansBranche res = new RelationEMHNoeudDansBranche();
- res.setEmh(nd);
- return res;
- }
-
- /**
- * @param casier le casier de dest
- * @return une nouvelle relation casier dans noeud
- */
- public static RelationEMHCasierDansNoeud createCasierDansNoeud(final CatEMHCasier casier) {
- final RelationEMHCasierDansNoeud relationEMHCasierDansNoeud = new RelationEMHCasierDansNoeud();
- relationEMHCasierDansNoeud.setEmh(casier);
- return relationEMHCasierDansNoeud;
- }
-
- /**
- * @param noeud le noeud de dest
- * @return une nouvelle relation noeud contient casier
- */
- public static RelationEMHNoeudContientCasier createNoeudContientCasier(final CatEMHNoeud noeud) {
- final RelationEMHNoeudContientCasier relationEMHNoeudContientCasier = new RelationEMHNoeudContientCasier();
- relationEMHNoeudContientCasier.setEmh(noeud);
- return relationEMHNoeudContientCasier;
- }
-
- /**
- * @param section la section de ref
- * @return la relation RelationEMHSectionDansSectionIdem contenant la section
- */
- public static RelationEMH createSectionRef(final CatEMHSection section) {
- final RelationEMHSectionDansSectionIdem res = new RelationEMHSectionDansSectionIdem();
- res.setEmh(section);
- return res;
- }
-
- /**
- * @param section la section de ref
- * @return la relation RelationEMHSectionDansSectionIdem contenant la section
- */
- public static RelationEMH createRelationContient(final EMH emh) {
- final RelationEMHContient res = new RelationEMHContient();
- res.setEmh(emh);
- return res;
- }
-}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java 2009-10-19 16:08:06 UTC (rev 5402)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java 2009-10-19 21:45:11 UTC (rev 5403)
@@ -43,7 +43,7 @@
return EMHHelper.getListeRelationsSectionsSortedByXp(this);
}
- public void setListeSections(final List<RelationEMH> liste) {
+ public void setListeSections(final List<? extends RelationEMH> liste) {
EMHHelper.addListeSectionsToRelations(this, liste);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java 2009-10-19 16:08:06 UTC (rev 5402)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java 2009-10-19 21:45:11 UTC (rev 5403)
@@ -14,12 +14,28 @@
super(nom);
}
+ /**
+ * @return le noeud associe
+ */
public CatEMHNoeud getNoeud() {
return EMHHelper.getNoeudCasier(this);
}
+ /**
+ * @param noeud le noeud associe
+ */
public void setNoeud(final CatEMHNoeud noeud) {
EMHHelper.addNoeudCasier(this, noeud);
}
+ @Override
+ public boolean getActivated() {
+ boolean res = super.getActivated();
+ if (res) {
+ CatEMHNoeud noeud = getNoeud();
+ return noeud != null && noeud.getActivated();
+ }
+ return res;
+ }
+
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java 2009-10-19 16:08:06 UTC (rev 5402)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java 2009-10-19 21:45:11 UTC (rev 5403)
@@ -1,5 +1,7 @@
package org.fudaa.dodico.crue.metier.emh;
+import java.util.Collection;
+
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
/** @pdOid 4ad36f59-ea9d-417e-bd4d-5fa344f59862 */
@@ -19,8 +21,22 @@
return true;
}
+ @Override
+ public boolean getActivated() {
+ final boolean res = super.getActivated();
+ if (res) {
+ final Collection<RelationEMHBrancheContientNoeud> brs = EMHHelper.findRelationOfType(this,
+ RelationEMHBrancheContientNoeud.class);
+ for (final RelationEMHBrancheContientNoeud relationEMHNoeudDansBranche : brs) {
+ if (relationEMHNoeudDansBranche.getEmh().getActivated()) { return true; }
+
+ }
+ }
+ return false;
+ }
+
public String getIdCasier() {
- CatEMHCasier res = getCasier();
+ final CatEMHCasier res = getCasier();
return res == null ? null : res.getId();
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHSection.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHSection.java 2009-10-19 16:08:06 UTC (rev 5402)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHSection.java 2009-10-19 21:45:11 UTC (rev 5403)
@@ -1,5 +1,7 @@
package org.fudaa.dodico.crue.metier.emh;
+import org.fudaa.dodico.crue.metier.helper.EMHHelper;
+
/** @pdOid ffe729b0-d13a-487e-8352-a87a649183ef */
public abstract class CatEMHSection extends EMH {
/** @pdOid 7d40b636-34cd-4095-8fdb-e93bfa63b045 */
@@ -17,4 +19,19 @@
return true;
}
+ /**
+ * @return true si active et si contenue par une branche active.
+ */
+ @Override
+ public boolean getActivated() {
+ final boolean res = super.getActivated();
+ if (res) {
+ // une section appartient a une seule branche.
+ final RelationEMHBrancheContientSection brs = EMHHelper.getFirstOfClass(getRelationEMH(),
+ RelationEMHBrancheContientSection.class);
+ return brs != null && brs.getEmh() != null && brs.getEmh().getActivated();
+
+ }
+ return res;
+ }
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java 2009-10-19 16:08:06 UTC (rev 5402)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java 2009-10-19 21:45:11 UTC (rev 5403)
@@ -34,6 +34,14 @@
public abstract boolean getActive();
/**
+ * @return la valeur réelle affectée à l'EMH. Prend en compte les relations de l'EMH. Par exemple, une section
+ * appartenant a une branche non active n'est pas active.
+ */
+ public boolean getActivated() {
+ return getActive();
+ }
+
+ /**
* Retourne l'info DonCalcSansPrt de la liste des infosEMH. Utilis� pour le fichier (DSCP)
*
* @return
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMHBrancheContientNoeud.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMHBrancheContientNoeud.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMHBrancheContientNoeud.java 2009-10-19 21:45:11 UTC (rev 5403)
@@ -0,0 +1,22 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.metier.emh;
+
+/**
+ * Relation qui permet de connaitre la branche contenant un noeud. Est-ce utile ou la relation RelationEMHContient
+ * suffit ?
+ *
+ * @author deniger
+ */
+public class RelationEMHBrancheContientNoeud extends...
[truncated message content] |
|
From: <de...@us...> - 2009-10-20 20:46:25
|
Revision: 5406
http://fudaa.svn.sourceforge.net/fudaa/?rev=5406&view=rev
Author: deniger
Date: 2009-10-20 20:46:13 +0000 (Tue, 20 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
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/CustomFileFormat.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/metier/helper/FactoryEMH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaverCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/common/commonMessages.properties
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/ScenarioSaverUI.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CustomFileFilterExtension.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/java/org/
trunk/soft/fudaa-crue/fudaa/src/main/java/view/
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-10-20 16:26:05 UTC (rev 5405)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormat.java 2009-10-20 20:46:13 UTC (rev 5406)
@@ -35,22 +35,9 @@
}
- @SuppressWarnings("serial")
@Override
public BuFileFilter createFileFilter() {
- return new BuFileFilter(extensions, getDescription()) {
- @Override
- public String getExtension(final File _f) {
- // on redefinit pour recuperer le premier point.
- if (_f != null) {
- final String filename = _f.getName();
- final int i = filename.indexOf('.');
- if ((i > 0) && (i < filename.length() - 1)) { return filename.substring(i + 1).toLowerCase(); }
- }
- return null;
- }
-
- };
+ return new CustomFileFilterExtension(extensions, getDescription());
}
/**
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CustomFileFilterExtension.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CustomFileFilterExtension.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CustomFileFilterExtension.java 2009-10-20 20:46:13 UTC (rev 5406)
@@ -0,0 +1,46 @@
+package org.fudaa.dodico.crue.io;
+
+import java.io.File;
+
+import com.memoire.bu.BuFileFilter;
+
+/**
+ * @author deniger
+ */
+@SuppressWarnings("serial")
+public final class CustomFileFilterExtension extends BuFileFilter {
+ String[] extensions;
+
+ /**
+ * @param filters
+ * @param description
+ */
+ public CustomFileFilterExtension(final String[] filters, final String description) {
+ super(filters, description);
+ extensions = filters;
+ }
+
+ private boolean isSelected(final String name) {
+ for (int i = 0; i < extensions.length; i++) {
+ final String ext = extensions[i].charAt(0) == '.' ? extensions[i] : ".".concat(extensions[i]);
+ if (name.endsWith(ext)) { return true; }
+ }
+ return false;
+ }
+
+ @Override
+ public boolean accept(final File _f) {
+ if (_f != null) {
+ if (_f.isDirectory()) { return true; }
+ if (isSelected(_f.getName())) { return true; }
+ }
+ return false;
+ }
+
+ @Override
+ public boolean accept(final File _d, final String _fn) {
+ final File f = new File(_fn);
+ if (f.isDirectory()) { return false; }
+ return isSelected(f.getName());
+ }
+}
\ No newline at end of file
Modified: 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/CustomFileFormat.java 2009-10-20 16:26:05 UTC (rev 5405)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CustomFileFormat.java 2009-10-20 20:46:13 UTC (rev 5406)
@@ -87,7 +87,7 @@
* @return un filtre correspondant aux extension
*/
public BuFileFilter createFileFilter() {
- return new BuFileFilter(extensions, nom);
+ return new CustomFileFilterExtension(extensions, nom);
}
/**
Modified: 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/DCFileReader.java 2009-10-20 16:26:05 UTC (rev 5405)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java 2009-10-20 20:46:13 UTC (rev 5406)
@@ -137,7 +137,7 @@
if (CollectionUtils.isNotEmpty(listeDistance)) {
xp = listeDistance.get(0);
}
- FactoryEMH.addSectionSansGeometrie(branche, xp);
+ FactoryEMH.addSectionSansGeometrie(branche, xp, metier);
} else {
// -- on ajoute la liste des relations EMH à la branche --//
branche.setListeSections(listeRelationEmh);
@@ -999,6 +999,10 @@
seuil.setLargeur(in_.doubleField(1));
seuil.setZseuil(in_.doubleField(2));
seuil.setCoefD(in_.doubleField(3));
+ // lecture de cpert
+ if (in_.getNumberOfFields() > 4) {
+ seuil.setCoefPdc(in_.doubleField(4));
+ }
// -- ajout du seuil --//
dataDCSP.addElemSeuilAvecPdc(seuil);
// }
@@ -1778,7 +1782,7 @@
if (element.toUpperCase().equals(CrueIODico.NOEUD)) {
// -- lecture des Noeuds --//
readNoeuds(metier);
- } else if (CrueIODico.appartientReglesCarte(in_.getLine())) {
+ } else if (in_.getNumberOfFields() > 0 && CrueIODico.appartientReglesCarte(in_.stringField(0))) {
// -- lecture des regles --//
readRegles(metier);
} else if (CrueIODico.isAnewBrancheDefinition(in_.getLine())) {
Modified: 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/DCFileWriter.java 2009-10-20 16:26:05 UTC (rev 5405)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileWriter.java 2009-10-20 20:46:13 UTC (rev 5406)
@@ -9,7 +9,6 @@
import org.apache.commons.collections.CollectionUtils;
import org.fudaa.ctulu.CtuluActivity;
-import org.fudaa.ctulu.CtuluLib;
import org.fudaa.dodico.crue.io.common.CrueData;
import org.fudaa.dodico.crue.io.common.CrueIOResu;
import org.fudaa.dodico.crue.io.common.EnumsConverter;
@@ -137,12 +136,12 @@
* Ecrit les regles.
*
* @author Adrien Hadoux
- * @param data
+ * @param metier
* @throws IOException
*/
public void writeRules(final CrueData metier) throws IOException {
writeCom("");
- writeCom(" Definition des Regles");
+ writeCom(" Configuration generale");
// -- regles PNUM --//
if (metier.getParamNumModeleBase() != null) {
fortranWriter.stringField(0, CrueIODico.ZREF);
@@ -156,7 +155,6 @@
fortranWriter.writeFields();
}
}
- // writeCom("Regles ecrites dans le fichier dh");
if (metier.getPretraitementsGeom() != null && metier.getPretraitementsGeom().getRegle() != null) {
for (final Regle regle : metier.getPretraitementsGeom().getRegle()) {
@@ -164,42 +162,42 @@
if (EnumRegle.PROF_PLAT.equals(regle.getType())) {
final double val = regle.getSeuilDetect();
- if (!CtuluLib.isEquals(val, DefaultValues.PM_PROF_PLAT, 1e-6)) {
- writeCarteValeur(CrueIODico.R_PRPLAT, val * 100);
- }
+ // if (!CtuluLib.isEquals(val, DefaultValues.PM_PROF_PLAT, 1e-6)) {
+ writeCarteValeur(CrueIODico.R_PRPLAT, val * 100);
+ // }
} else if (EnumRegle.PENTE_RUPTURE.equals(regle.getType())) {
final double val = regle.getSeuilDetect();
- if (!CtuluLib.isEquals(val, DefaultValues.PM_PENTE_RUPTURE, 1e-7)) {
- writeCarteValeur(CrueIODico.R_RUPENT, val);
- }
+ // if (!CtuluLib.isEquals(val, DefaultValues.PM_PENTE_RUPTURE, 1e-7)) {
+ writeCarteValeur(CrueIODico.R_RUPENT, val);
+ // }
} else if (EnumRegle.DECAL.equals(regle.getType())) {
final double val = regle.getSeuilDetect();
- if (!CtuluLib.isEquals(val, DefaultValues.PM_DECAL, 1e-5)) {
- writeCarteValeur(CrueIODico.R_DECAL, val);
- }
+ // if (!CtuluLib.isEquals(val, DefaultValues.PM_DECAL, 1e-5)) {
+ writeCarteValeur(CrueIODico.R_DECAL, val);
+ // }
} else if (EnumRegle.LARG_SEUIL.equals(regle.getType())) {
final double val = regle.getSeuilDetect();
- if (!CtuluLib.isEquals(val, DefaultValues.PM_LARG_SEUIL, 1e-3)) {
- writeCarteValeur(CrueIODico.R_SLARGE, val);
- }
+ // if (!CtuluLib.isEquals(val, DefaultValues.PM_LARG_SEUIL, 1e-3)) {
+ writeCarteValeur(CrueIODico.R_SLARGE, val);
+ // }
} else if (EnumRegle.PDX_MAX.equals(regle.getType())) {
final double val = regle.getSeuilDetect();
- if (!CtuluLib.isEquals(val, DefaultValues.PM_PDX_MAX, 1e-3)) {
- writeCarteValeur(CrueIODico.R_DXMAX, val);
- }
+ // if (!CtuluLib.isEquals(val, DefaultValues.PM_PDX_MAX, 1e-3)) {
+ writeCarteValeur(CrueIODico.R_DXMAX, val);
+ // }
} else if (EnumRegle.VAR_PDX_MAX.equals(regle.getType())) {
final ValParamEntier val = (ValParamEntier) regle.getValParam();
final int var = val.getValeur();
- if (Math.abs(DefaultValues.PM_VAR_PDX_MAX - var) > 1) {
- fortranWriter.stringField(0, CrueIODico.R_VDXMAX);
- fortranWriter.intField(1, var);
- fortranWriter.writeFields();
- }
+ // if (Math.abs(DefaultValues.PM_VAR_PDX_MAX - var) > 1) {
+ fortranWriter.stringField(0, CrueIODico.R_VDXMAX);
+ fortranWriter.intField(1, var);
+ fortranWriter.writeFields();
+ // }
} else if (EnumRegle.PENTE_MAX.equals(regle.getType())) {
final double val = regle.getSeuilDetect();
- if (!CtuluLib.isEquals(val, DefaultValues.PM_PENTE_MAX, 1e-6)) {
- writeCarteValeur(CrueIODico.R_PENMAX, val * 100);
- }
+ // if (!CtuluLib.isEquals(val, DefaultValues.PM_PENTE_MAX, 1e-6)) {
+ writeCarteValeur(CrueIODico.R_PENMAX, val * 100);
+ // }
} else if (EnumRegle.REB_DEB.equals(regle.getType())) {
fortranWriter.stringField(0, CrueIODico.R_REBDEB);
@@ -971,6 +969,7 @@
fortranWriter.doubleField(1, seuil.getLargeur());
fortranWriter.doubleField(2, seuil.getZseuil());
fortranWriter.doubleField(3, seuil.getCoefD());
+ fortranWriter.doubleField(4, seuil.getCoefPdc());
fortranWriter.writeFields();
}
@@ -1041,6 +1040,7 @@
fortranWriter.doubleField(1, seuil.getLargeur());
fortranWriter.doubleField(2, seuil.getZseuil());
fortranWriter.doubleField(3, seuil.getCoefD());
+ fortranWriter.doubleField(4, seuil.getCoefPdc());
fortranWriter.writeFields();
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/FactoryEMH.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/FactoryEMH.java 2009-10-20 16:26:05 UTC (rev 5405)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/FactoryEMH.java 2009-10-20 20:46:13 UTC (rev 5406)
@@ -11,6 +11,7 @@
import java.util.Locale;
import org.apache.commons.lang.StringUtils;
+import org.fudaa.dodico.crue.io.common.CrueData;
import org.fudaa.dodico.crue.metier.emh.*;
import org.fudaa.dodico.crue.validation.CruePrefix;
import org.joda.time.Duration;
@@ -119,14 +120,17 @@
/**
* @param branche pour laquelle on initalise 2 sections sans geometrie: une amont et une aval.
* @param longueur la longueur de la branche
+ * @param metier structure dans laquelle seront ajoutés les sections.
*/
- public static void addSectionSansGeometrie(final CatEMHBranche branche, final double longueur) {
+ public static void addSectionSansGeometrie(final CatEMHBranche branche, final double longueur, CrueData metier) {
final EMHSectionSansGeometrie amont = new EMHSectionSansGeometrie(CruePrefix.changePrefix(branche.getNom(),
CruePrefix.P_BRANCHE, CruePrefix.P_SECTION)
+ "_Amont");
final EMHSectionSansGeometrie aval = new EMHSectionSansGeometrie(CruePrefix.changePrefix(branche.getNom(),
CruePrefix.P_BRANCHE, CruePrefix.P_SECTION)
+ "_Aval");
+ metier.add(amont);
+ metier.add(aval);
branche.setListeSections(Arrays
.asList(createRelationSectionDansBranche(branche, amont, 0, EnumPositionSection.AMONT),
createRelationSectionDansBranche(branche, aval, longueur, EnumPositionSection.AVAL)));
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java 2009-10-20 16:26:05 UTC (rev 5405)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java 2009-10-20 20:46:13 UTC (rev 5406)
@@ -179,18 +179,20 @@
final String nom = rptg.getProfilNom(i);
final String id = nom.toUpperCase();
// c'est un profil de casier
+ CatEMHCasier casier = null;
if (id.indexOf('#') > 0) {
final String ndNom = StringUtils.substringBeforeLast(id, "#");
final CatEMHNoeud nd = data.findNoeudByReference(ndNom);
if (nd == null) {
analyze.addError("rptg.NoeudForCasier.notFound", ndNom, id);
error = true;
+ } else {
+ casier = nd.getCasier();
+ if (casier == null) {
+ analyze.addError("rptg.casier.notExist", ndNom);
+ error = true;
+ }
}
- final CatEMHCasier casier = nd.getCasier();
- if (casier == null) {
- analyze.addError("rptg.casier.notExist", ndNom);
- error = true;
- }
final List<DonPrtGeoProfilCasier> profilCasier = EMHHelper.selectClass(casier.getInfosEMH(),
DonPrtGeoProfilCasier.class);
// PC_N6_002
@@ -201,7 +203,7 @@
if (profil == null) {
analyze.addError("rptg.profilCasier.notExist", donPrtSearch);
error = true;
- } else {
+ } else if (casier != null) {
casier.addInfosEMH(rptg.getResultatOnProfil(nom));
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaverCrue9.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaverCrue9.java 2009-10-20 16:26:05 UTC (rev 5405)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioSaverCrue9.java 2009-10-20 20:46:13 UTC (rev 5406)
@@ -32,11 +32,16 @@
this.errorManager = errorManager;
}
+ /**
+ * @param files la liste id->Dile
+ * @return true si sauvegarde effectuée.
+ */
public boolean save(final Map<String, File> files) {
final CtuluAnalyze analyzer = errorManager.getMainAnalyze();
+ // on effectue quand même l'opératio
if (!scenario.isCompatibleCrue9()) {
- analyzer.addFatalError("scenario.nonCompatible.crue9");
- return false;
+ analyzer.addError("scenario.nonCompatible.crue9");
+ // return false;
}
// -- recherche des fichiers sous modeles --//
final List<ManagerEMHModeleBase> fils = scenario.getFils();
Modified: trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/common/commonMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/common/commonMessages.properties 2009-10-20 16:26:05 UTC (rev 5405)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/common/commonMessages.properties 2009-10-20 20:46:13 UTC (rev 5406)
@@ -53,7 +53,7 @@
rptg.profilCasier.notExist = Le profil de casier {0} est d\u00E9fini dans les r\u00E9sultats de pr\u00E9traitement mais il n'existe pas dans l'\u00E9tude
rptg.section.notFound = La section {0} n''est pas d\u00E9finie dans l''\u00E9tude. Les r\u00E9sultats de pr\u00E9traitement ne correspondent pas aux donn\u00E9es.
-scenario.nonCompatible.crue9 = Le sc\u00E9nario n''est pas compatible avec Crue9
+scenario.nonCompatible.crue9 = Le sc\u00E9nario ne sera pas compatible avec Crue9
valid.line = Ligne
valid.nom.notUnique = Le nom {0} n''est pas unique
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-10-20 16:26:05 UTC (rev 5405)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java 2009-10-20 20:46:13 UTC (rev 5406)
@@ -85,8 +85,8 @@
infoCrue_.banner = new BuIcon(pathLogo);
// infoCrue_.logo = new BuIcon(pathLogo);
infoCrue_.name = "Fudaa-Crue";
- infoCrue_.version = "0.8";
- infoCrue_.date = "15-Juillet-2009";
+ infoCrue_.version = "0.10";
+ infoCrue_.date = "21-Octobre-2009";
infoCrue_.rights = "";
infoCrue_.contact = "fu...@ge...";
infoCrue_.license = "GPL2";
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioSaverUI.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioSaverUI.java 2009-10-20 16:26:05 UTC (rev 5405)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioSaverUI.java 2009-10-20 20:46:13 UTC (rev 5406)
@@ -81,8 +81,8 @@
public boolean generateInCrue9() {
if (!scenarioToPersist.isCompatibleCrue9()) {
- projet.getImpl().error(CommonMessages.getString("scenario.nonCompatible.crue9"));
- return false;
+ projet.getImpl().warn(FCrueResource.getS("ihm.export.crue9"),
+ CommonMessages.getString("scenario.nonCompatible.crue9"));
}
ScenarioExporterCrue9 loader = new ScenarioExporterCrue9(fichierModele, CrueDataImpl
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-24 01:02:29
|
Revision: 5449
http://fudaa.svn.sourceforge.net/fudaa/?rev=5449&view=rev
Author: deniger
Date: 2009-10-24 01:02:21 +0000 (Sat, 24 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/DateDurationConverter.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/dao/CrueConverterDRSO.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/CatEMHBranche.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DefaultValues.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/ParamNumCalcTrans.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/PdtCst.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/FactoryEMH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/LoiFactory.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue10.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/CruePrefix.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateEMHProperties.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/common/commonMessages.properties
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/ioMessages.properties
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/TestCrueDH.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/TestEMHPropertiesValidator.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/TestValidateModeleScenario.java
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/validation/ValidateModeleScenarioWithSchema.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/TestCruePrefix.java
trunk/soft/fudaa-crue/dodico/src/test/resources/Etu3-2/
trunk/soft/fudaa-crue/dodico/src/test/resources/Etu3-2/M3-2_c9.dc
trunk/soft/fudaa-crue/dodico/src/test/resources/Etu3-2/M3-2_c9.dh
trunk/soft/fudaa-crue/dodico/src/test/resources/Etu4-0/
trunk/soft/fudaa-crue/dodico/src/test/resources/Etu4-0/M4-0_c9.dc
trunk/soft/fudaa-crue/dodico/src/test/resources/Etu4-0/M4-0_c9.dh
trunk/soft/fudaa-crue/dodico/src/test/resources/Etu4-0/M4-0_e1c9.dh
trunk/soft/fudaa-crue/dodico/src/test/resources/Etu4-0/M4-0_v1c9.dh
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateModeleScenario.java
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/DateDurationConverter.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/DateDurationConverter.java 2009-10-23 20:34:57 UTC (rev 5448)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/DateDurationConverter.java 2009-10-24 01:02:21 UTC (rev 5449)
@@ -5,7 +5,6 @@
package org.fudaa.dodico.crue.common;
import org.apache.commons.lang.StringUtils;
-import org.fudaa.dodico.crue.metier.helper.LoiFactory;
import org.joda.time.Duration;
import org.joda.time.LocalDateTime;
import org.joda.time.MutablePeriod;
@@ -23,6 +22,11 @@
*/
public final class DateDurationConverter {
+ /**
+ * La date null
+ */
+ public final static LocalDateTime ZERO_DATE = new LocalDateTime(01, 01, 01, 0, 0, 0, 0);
+
private DateDurationConverter() {
// classe utilitaire
}
@@ -85,7 +89,7 @@
* @return la date en partant du zero de Crue.
*/
public static LocalDateTime getDateFromZeroDate(final Duration p) {
- return LoiFactory.ZERO_DATE.plus(p);
+ return DateDurationConverter.ZERO_DATE.plus(p);
}
/**
@@ -164,7 +168,7 @@
*/
public static String dateToCrueFormat(final LocalDateTime date) {
if (date == null) { return CRUE_ZERO; }
- return durationToCrueFormat(new Duration(LoiFactory.ZERO_DATE.toDateTime(), date.toDateTime()));
+ return durationToCrueFormat(new Duration(DateDurationConverter.ZERO_DATE.toDateTime(), date.toDateTime()));
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java 2009-10-23 20:34:57 UTC (rev 5448)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java 2009-10-24 01:02:21 UTC (rev 5449)
@@ -102,6 +102,7 @@
final CrueIOResu<CrueData> source = (CrueIOResu<CrueData>) read.getSource();
analyzer.merge(read.getAnalyze());
analyzer.setDesc(IOMessages.getString("read.file", url.toString()));
+ source.setAnalyse(analyzer);
return source;
}
Modified: 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/CrueConverterDRSO.java 2009-10-23 20:34:57 UTC (rev 5448)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDRSO.java 2009-10-24 01:02:21 UTC (rev 5449)
@@ -304,7 +304,7 @@
// -- on remplit les sections persistantes avec celle de la branche --//
if (branchePersist.Sections != null) {
- branche.setListeSections(remplirSectionsBrancheAvecPersistanceDRSO(branche, res, isSaintVenant,
+ branche.addListeSections(remplirSectionsBrancheAvecPersistanceDRSO(branche, res, isSaintVenant,
branchePersist.Sections, analyser));
}
Modified: 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/DCFileReader.java 2009-10-23 20:34:57 UTC (rev 5448)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java 2009-10-24 01:02:21 UTC (rev 5449)
@@ -140,7 +140,7 @@
FactoryEMH.addSectionSansGeometrie(branche, xp, metier);
} else {
// -- on ajoute la liste des relations EMH à la branche --//
- branche.setListeSections(listeRelationEmh);
+ branche.addListeSections(listeRelationEmh);
if (!listeRelationEmh.isEmpty()) {
((RelationEMHSectionDansBranche) listeRelationEmh.get(0)).setPos(EnumPositionSection.AMONT);
}
@@ -261,62 +261,47 @@
public void completeSaintVenantWithDistMax(final EMHBrancheSaintVenant branche, final double distmax,
final CrueData data) {
- final List<RelationEMH> relationEMH = branche.getRelationEMH();
- for (int i = 0; i < relationEMH.size(); i++) {
-
- final RelationEMH relation1 = relationEMH.get(i);
-
+ final List<RelationEMHSectionDansBranche> sectionEMH = branche.getListeSections();
+ if (CollectionUtils.isEmpty(sectionEMH)) { return; }
+ branche.getRelationEMH().removeAll(sectionEMH);
+ // branche.getRelationEMH().add(relation2);
+ branche.getRelationEMH().add(sectionEMH.get(0));
+ for (int i = 0; i < sectionEMH.size() - 1; i++) {
+ final RelationEMHSectionDansBranche relation1 = sectionEMH.get(i);
// -- si la relation concerne les sections --//
- if (relation1.getEmh() instanceof CatEMHSection) {
- RelationEMH relation2 = null;
- // -- on recherche la prochaine relation --//
- for (int j = i + 1; j < relationEMH.size() && relation2 == null; j++) {
- if (relationEMH.get(j).getEmh() instanceof CatEMHSection) {
- relation2 = relationEMH.get(j);
- }
- }
+ final RelationEMHSectionDansBranche relation2 = sectionEMH.get(i + 1);
+ final double xpos1 = relation1.getXp();
+ final double xpos2 = relation2.getXp();
- if (relation2 == null) { return; }
+ double distance = Math.abs(xpos1 - xpos2);
+ if (distmax < distance) {
- final double xpos1 = EMHHelper.getXpSection(relation1);
- final double xpos2 = EMHHelper.getXpSection(relation2);
+ // -- il faut ajouter des profils interpolées --//
- double distance = Math.abs(xpos1 - xpos2);
- if (distmax < distance) {
+ // -- etape 1: on compte combien on en ajoute --//
+ final int nbProfilsToAdd = EMHHelper.getDistDiviseurForDistMax(distmax, distance);
- // -- il faut ajouter des profils interpolées --//
-
- // -- etape 1: on compte combien on en ajoute --//
- final int nbProfilsToAdd = EMHHelper.getDistDiviseurForDistMax(distmax, distance);
-
- // -- on creer une section interpolee pour chaque besoin et on l'ajoute dans cruedata puis dans les relations
- // branche --//.
- final double distMaxCorrige = distance / nbProfilsToAdd;
- // on commence a 1: c'est normal on cree un prol
- for (int k = 1; k < nbProfilsToAdd; k++) {
- final double xpos = xpos1 + (k) * distMaxCorrige;
- double doubleForNom = xpos;
- if (doubleForNom >= 1) {
- doubleForNom = Math.floor(doubleForNom);
- }
- final EMHSectionInterpolee interpol = FactoryEMH.createSectionInterpoleFromDistmax(doubleForNom, branche
- .getNom(), distMaxCorrige);
- final RelationEMH relation = FactoryEMH.createRelationSectionDansBranche(branche, interpol, xpos);
- // -- ajout dans metier --//
- data.add(interpol);
-
- // -- ajout de la relation a l'emplacement k+1 a partir de i--//
- branche.getRelationEMH().add((i + k), relation);
-
+ // -- on creer une section interpolee pour chaque besoin et on l'ajoute dans cruedata puis dans les relations
+ // branche --//.
+ final double distMaxCorrige = distance / nbProfilsToAdd;
+ // on commence a 1: c'est normal on cree un prol
+ for (int k = 1; k < nbProfilsToAdd; k++) {
+ final double xpos = xpos1 + (k) * distMaxCorrige;
+ double doubleForNom = xpos;
+ if (doubleForNom >= 1) {
+ doubleForNom = Math.floor(doubleForNom);
}
+ final EMHSectionInterpolee interpol = FactoryEMH.createSectionInterpoleFromDistmax(doubleForNom, branche
+ .getNom(), distMaxCorrige);
+ final RelationEMH relation = FactoryEMH.createRelationSectionDansBranche(branche, interpol, xpos);
+ // -- ajout dans metier --//
+ data.add(interpol);
+ branche.getRelationEMH().add(relation);
- // -- on translate i de k+1 itérations pour revenir a l'indice de la relation2 --//
- i += nbProfilsToAdd;
- // ATTENTION, le k+1 ici est indirect, car le +1 sera ajouté par la boucle for.
}
}
-
+ branche.getRelationEMH().add(relation2);
}
}
Modified: 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/DHReader.java 2009-10-23 20:34:57 UTC (rev 5448)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java 2009-10-24 01:02:21 UTC (rev 5449)
@@ -361,14 +361,14 @@
// lecture Ligne E : Niveaux d'eau initiaux des branches / sections
if (ile == 0) {
- reader.readLine();
- final int iligne = reader.intField(0);
// On doit avoir autant de lignes e2 ou e3 que de branches.
// final int nbBranche = getNbBranches();
final int nbBranche = nomsBranches.size();
String brancheName = null;
for (int i = 0; i < nbBranche; i++) {
reader.readLine();
+ final int iligne = reader.intField(0);
+ reader.readLine();
brancheName = nomsBranches.get(i);
final CatEMHBranche br = res.findBrancheByReference(brancheName);
@@ -395,16 +395,16 @@
int idxOnLine = 0;
int maxOnLine = reader.getNumberOfFields();
for (int j = 0; j < nbDataToRead; j++) {
- final double niveauEauPourProfilJ = reader.doubleField(idxOnLine++);
- final DonPrtCIniSection section = new DonPrtCIniSection();
- section.setZini(niveauEauPourProfilJ);
- sectionsBranche.get(j).getEmh().addInfosEMH(section);
// données sur plusieurs lignes
if (idxOnLine >= maxOnLine) {
reader.readLine();
maxOnLine = reader.getNumberOfFields();
idxOnLine = 0;
}
+ final double niveauEauPourProfilJ = reader.doubleField(idxOnLine++);
+ final DonPrtCIniSection section = new DonPrtCIniSection();
+ section.setZini(niveauEauPourProfilJ);
+ sectionsBranche.get(j).getEmh().addInfosEMH(section);
}
} else if (iligne == 2) { // Ligne E3
@@ -427,9 +427,9 @@
}
}
- reader.readLine();// lecture de la ligne FIN
- if (!FIN.equalsIgnoreCase(reader.stringField(0))) {
- analyze_.addErrorFromFile("io.dh.tagFINNotFound.error", reader.getCurrent() //$NON-NLS-1$
+ // reader.readLine();// lecture de la ligne FIN
+ if (FIN.equalsIgnoreCase(reader.stringField(0))) {
+ analyze_.addErrorFromFile("io.dh.tagFINFound.error", reader.getCurrent() //$NON-NLS-1$
.getLineNumber());
}
@@ -1292,8 +1292,19 @@
final List<PtEvolutionFF> pts = new ArrayList<PtEvolutionFF>();
evolutionFF.setPtEvolutionFF(pts);
// les pas de temps
+ Duration lastDuration = null;
while (!FIN.equalsIgnoreCase(reader.stringField(0))) {
+ if (reader.getNumberOfFields() != 5) {
+ analyze_.addError("io.dh.ref.emh.ligneE2.error", reader.getLineNumber());
+ return;
+ }
final Duration date = readDuration(reader);
+ if (lastDuration != null && lastDuration.compareTo(date) > 0) {
+ analyze_.addError("io.dh.ref.emh.ligneE2.notCroissant.error", reader.getLineNumber());
+ return;
+ }
+
+ lastDuration = date;
final PtEvolutionFF pt = new PtEvolutionFF();
// on cree une date avec des secondes uniquement, pour l'instant
pt.setX(date.getStandardSeconds());
Modified: 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/io/neuf/DHWriter.java 2009-10-23 20:34:57 UTC (rev 5448)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHWriter.java 2009-10-24 01:02:21 UTC (rev 5449)
@@ -256,12 +256,11 @@
// Ecriture ligne E1
writeCom(" ligne ");
- fortranWriter.intField(0, 1);
- fortranWriter.writeFields();
// Ecriture lignes E2
for (int i = 0, branchesDptiSize = branchesDPTI.size(); i < branchesDptiSize; i++) {
-
+ fortranWriter.intField(0, 1);
+ fortranWriter.writeFields();
final CatEMHBranche brancheDPTI = branchesDPTI.get(i);
final List<RelationEMHSectionDansBranche> sectionsBrancheDPTI = brancheDPTI.getListeSections();
final List<DonPrtCIni> dptis = brancheDPTI.getDPTI();
@@ -278,7 +277,7 @@
int idxOnLine = 0;
for (int j = 0; j < countSectionsBranche; j++) {
- final DonPrtCIniSection dpti = EMHHelper.getFirstOfClass(sectionsBrancheDPTI.get(i).getEmh().getInfosEMH(),
+ final DonPrtCIniSection dpti = EMHHelper.getFirstOfClass(sectionsBrancheDPTI.get(j).getEmh().getInfosEMH(),
DonPrtCIniSection.class);
double zIniPourProfilJ = 0;
if (dpti != null) {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java 2009-10-23 20:34:57 UTC (rev 5448)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java 2009-10-24 01:02:21 UTC (rev 5449)
@@ -43,7 +43,7 @@
return EMHHelper.getListeRelationsSectionsSortedByXp(this);
}
- public void setListeSections(final List<? extends RelationEMH> liste) {
+ public void addListeSections(final List<? extends RelationEMH> liste) {
EMHHelper.addListeSectionsToRelations(this, liste);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DefaultValues.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DefaultValues.java 2009-10-23 20:34:57 UTC (rev 5448)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DefaultValues.java 2009-10-24 01:02:21 UTC (rev 5449)
@@ -1,6 +1,8 @@
package org.fudaa.dodico.crue.metier.emh;
import org.fudaa.dodico.crue.common.CrueNumberUtils;
+import org.fudaa.dodico.crue.common.DateDurationConverter;
+import org.joda.time.Duration;
/**
* Valeures par defaut des EMHs. Ces valeurs sont statiques finales et sont distinguees par fichiers xml.
@@ -169,6 +171,16 @@
public static final double PM_TOL_ND_Z = 0.01;
/**
+ * P0Y0M1DT0H0M0S
+ */
+ public static final Duration DUREE_SCENARIO = DateDurationConverter.getDuration(1, 0, 0, 0);
+
+ /**
+ * P0Y0M0DT1H0M0S
+ */
+ public static final PdtCst PDT_ONE_HOUR = new PdtCst(DateDurationConverter.getDuration(0, 1, 0, 0));
+
+ /**
* @param ordPrtGeoModeleBase
*/
public static void initDefaultValues(final OrdPrtGeoModeleBase ordPrtGeoModeleBase) {
Modified: 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/ParamCalcScenario.java 2009-10-23 20:34:57 UTC (rev 5448)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamCalcScenario.java 2009-10-24 01:02:21 UTC (rev 5449)
@@ -6,19 +6,20 @@
package org.fudaa.dodico.crue.metier.emh;
+import org.fudaa.dodico.crue.common.DateDurationConverter;
import org.joda.time.Duration;
import org.joda.time.LocalDateTime;
/** @pdOid 06f3be55-38bc-4c84-9e40-14ede80db7b1 */
public class ParamCalcScenario implements InfosEMH {
/** @pdOid f78103e1-696e-4ea2-aa7c-954d686c8627 */
- private LocalDateTime dateDebSce;
+ private LocalDateTime dateDebSce = DateDurationConverter.ZERO_DATE;
/** @pdOid 11a96da7-c43a-4dc1-aef8-c665519a8279 */
- private Duration dureeSce;
+ private Duration dureeSce = DefaultValues.DUREE_SCENARIO;
/** @pdOid a02b0fc0-f0f1-4cfe-9d2f-fd13a9d64afb */
private Pdt pdtCouplage;
/** @pdOid 2b6da816-3b11-4e15-b77d-0345ce751910 */
- private Pdt pdtRes;
+ private Pdt pdtRes = DefaultValues.PDT_ONE_HOUR;
/** @pdOid b53800e8-dc94-4d00-8455-7270f28b7f9a */
private EnumVerbosite verbosite = DefaultValues.VERBOSITE;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcTrans.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcTrans.java 2009-10-23 20:34:57 UTC (rev 5448)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcTrans.java 2009-10-24 01:02:21 UTC (rev 5449)
@@ -16,7 +16,7 @@
private double thetaPreissmann = DefaultValues.THETA;
/** @pdRoleInfo migr=no name=Pdt assc=association115 mult=1..1 type=Composition */
- private Pdt pdt;
+ private Pdt pdt = DefaultValues.PDT_ONE_HOUR;
/** @pdGenerated default parent getter */
public Pdt getPdt() {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/PdtCst.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/PdtCst.java 2009-10-23 20:34:57 UTC (rev 5448)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/PdtCst.java 2009-10-24 01:02:21 UTC (rev 5449)
@@ -14,7 +14,19 @@
/** @pdOid 88c6bab9-ffcb-42d5-bff1-2dd665af42ed */
private Duration pdtCst;
+ public PdtCst() {
+
+ }
+
/**
+ * @param pdtCst le pas de temps
+ */
+ public PdtCst(Duration pdtCst) {
+ super();
+ this.pdtCst = pdtCst;
+ }
+
+ /**
* @return the pdtCst
*/
public Duration getPdtCst() {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/FactoryEMH.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/FactoryEMH.java 2009-10-23 20:34:57 UTC (rev 5448)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/FactoryEMH.java 2009-10-24 01:02:21 UTC (rev 5449)
@@ -131,7 +131,7 @@
+ "_Aval");
metier.add(amont);
metier.add(aval);
- branche.setListeSections(Arrays
+ branche.addListeSections(Arrays
.asList(createRelationSectionDansBranche(branche, amont, 0, EnumPositionSection.AMONT),
createRelationSectionDansBranche(branche, aval, longueur, EnumPositionSection.AVAL)));
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/LoiFactory.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/LoiFactory.java 2009-10-23 20:34:57 UTC (rev 5448)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/LoiFactory.java 2009-10-24 01:02:21 UTC (rev 5449)
@@ -6,13 +6,13 @@
import java.util.ArrayList;
import java.util.List;
+import org.fudaa.dodico.crue.common.DateDurationConverter;
import org.fudaa.dodico.crue.metier.emh.EnumTypeLoi;
import org.fudaa.dodico.crue.metier.emh.EvolutionFF;
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.metier.emh.PtEvolutionFF;
-import org.joda.time.LocalDateTime;
/**
* @author cde
@@ -37,7 +37,7 @@
public static void alimenteDebutLoiDF(final LoiDF loiDF, final String nom, final EnumTypeLoi type) {
alimenteDebutLoi(loiDF, nom, type);
- loiDF.setDateZeroLoiDF(ZERO_DATE);
+ loiDF.setDateZeroLoiDF(DateDurationConverter.ZERO_DATE);
}
/**
@@ -99,9 +99,4 @@
return null;
}
- /**
- * La date null
- */
- public final static LocalDateTime ZERO_DATE = new LocalDateTime(01, 01, 01, 0, 0, 0, 0);
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java 2009-10-23 20:34:57 UTC (rev 5448)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java 2009-10-24 01:02:21 UTC (rev 5449)
@@ -84,7 +84,7 @@
final ValidateEMHProperties propValidator = new ValidateEMHProperties();
emhScenario.setNom(scenario.getNom());
final List<EMH> allEMH = emhScenario.getAllEMH();
- final IdValidator res = propValidator.validateNoms(allEMH, false);
+ final IdValidator res = propValidator.validateNoms(allEMH);
final CtuluAnalyze nomValidationRes = res.getRes();
validationBilan.addAnalyzer(nomValidationRes);
scenario.setCompatibleCrue9(res.isCrue9Compatible());
@@ -96,7 +96,8 @@
// finalement tout va bien:
scenario.setEmh(emhScenario);
if (scenario.getEmh() != null) {
- final List<CtuluAnalyze> validateValues = propValidator.validateValues(scenario.getEmh().getAllEMH());
+ final List<CtuluAnalyze> validateValues = propValidator.validateValues(scenario.getEmh().getAllEMH(), scenario
+ .getEmh());
validationBilan.getAnalyser().addAll(validateValues);
}
return errorMng;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue10.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue10.java 2009-10-23 20:34:57 UTC (rev 5448)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue10.java 2009-10-24 01:02:21 UTC (rev 5449)
@@ -29,7 +29,7 @@
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
import org.fudaa.dodico.crue.metier.emh.EMHSousModele;
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
-import org.fudaa.dodico.crue.validation.ValidateModeleScenario;
+import org.fudaa.dodico.crue.validation.ValidateModeleScenarioWithSchema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -77,7 +77,7 @@
protected EMHScenario compute(final Map<String, File> files) {
// pour crue10, on vérifie les fichiers xml
- final ValidateModeleScenario crue10Valid = new ValidateModeleScenario(createFrom(files), scenario);
+ final ValidateModeleScenarioWithSchema crue10Valid = new ValidateModeleScenarioWithSchema(createFrom(files), scenario);
crue10Valid.validate(errorMng);
if (errorMng.containsError()) { return null; }
return ordonnanceChargementCrue10(files);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/CruePrefix.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/CruePrefix.java 2009-10-23 20:34:57 UTC (rev 5448)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/CruePrefix.java 2009-10-24 01:02:21 UTC (rev 5449)
@@ -3,10 +3,7 @@
*/
package org.fudaa.dodico.crue.validation;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.*;
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluAnalyze;
@@ -119,13 +116,13 @@
}
/**
- * Renvoie true si le préfixe doit être ajouté au nom.
+ * Renvoie true si le préfixe doit être ajouté au nom. Comparaison case sensitive
*
* @param prefixe
* @param nom
* @return true si le préfixe doit être ajouté au nom
*/
- public static boolean prefixMustBeAdded(final String prefixe, final String nom) {
+ private static boolean prefixMustBeAdded(final String prefixe, final String nom) {
// On n'ajoute pas de préfixe si le nom est null ou si le préfixe est null ou vide
if (nom == null || prefixe == null || prefixe.length() == 0) { return false; }
@@ -133,23 +130,37 @@
return !nom.startsWith(prefixe);
}
- public static String getPrefix(final EnumTypeLoi typeLoi) {
+ private static String getPrefix(final EnumTypeLoi typeLoi) {
return typeLoi.toString() + "_";
}
+ /**
+ * @param nom le nom a modifier
+ * @param oldPref le prefixe a enleve: non case sensitive. Si non présent, dans le nom initial il n'est pas enleve.
+ * @param newPref le nouveau prefixe. Si le nom initial commence déja par ce newPrefixe, il est remplace par le
+ * prefixe case-sensitive.
+ * @return le nom modifie
+ */
public static String changePrefix(final String nom, final String oldPref, final String newPref) {
- return newPref + StringUtils.removeStart(nom, oldPref);
+ if (oldPref != null && StringUtils.startsWithIgnoreCase(nom, oldPref)) { return newPref
+ + StringUtils.removeStartIgnoreCase(nom, oldPref); }
+ return newPref + StringUtils.removeStartIgnoreCase(nom, newPref);
}
+ private static String addPrefix(final String newPref, final String nom) {
+ return changePrefix(nom, null, newPref);
+ }
+
public static String getNom(final EnumTypeLoi typeLoi, final String suffixe) {
- return getPrefix(typeLoi) + suffixe;
+ return addPrefix(getPrefix(typeLoi), suffixe);
}
public static String addPrefixIfNeeded(final EnumTypeLoi typeLoi, final String init) {
+
if (init == null) { return null; }
final String pref = getPrefix(typeLoi);
if (init.startsWith(pref)) { return init; }
- return getPrefix(typeLoi) + init;
+ return getNom(typeLoi, init);
}
/**
@@ -174,11 +185,11 @@
return prefix;
}
- public static String getNomAvecPrefix(final Loi loi) {
- if (loi == null) { return null; }
- final String prefix = getPrefix(loi.getType());
- return getNomAvecPrefixe(prefix, loi.getNom());
- }
+ // public static String getNomAvecPrefix(final Loi loi) {
+ // if (loi == null) { return null; }
+ // final String prefix = getPrefix(loi.getType());
+ // return getNomAvecPrefixe(prefix, loi.getNom());
+ // }
/**
* La taille max autorisé pour les noms crue 9
@@ -193,25 +204,38 @@
*/
public static final int NB_CAR_MAX = 32;
- pro...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X