Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4623] trunk/soft/fudaa-crue
|
From: <had...@us...> - 2009-04-09 06:29:40
|
Revision: 4623
http://fudaa.svn.sourceforge.net/fudaa/?rev=4623&view=rev
Author: hadouxad
Date: 2009-04-09 06:29:30 +0000 (Thu, 09 Apr 2009)
Log Message:
-----------
# Corrections des formats DPTI et DRSO
* Pour DRSO il y avait d'autres modifications suppl?\195?\169mentaires ?\195?\160 prendre en compte
* pour DPTI, des modifs a faire pour les qruis et quini
# Modification des xsd
# Mise en place du format DLHY pour aider Carole
* Ce format permet de faire les liens avec les xsd et donne les reader/writer.
# Corrections des fichiers sur les formats DRSO et DPTI.
# Modif des relationEMH: HashMap
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoParsing.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDLHY.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistETU.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistOPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersit.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DCSPFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DFRTFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTGFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTIFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DRSOFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/OPTGFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSectionIdem.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHSectionHelper.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDFRT.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDRSO.xsd
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/RemplissageData.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDCSPFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDFRTFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDPTGFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDPTIFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDRSOFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueETU.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueOPTGFile.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.drso.xml
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/AppCrueTest.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DLHYFileFormat.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueContrat.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueInterface.java
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDRSO.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDRSO.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoConverterDRSO.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -1,40 +1,12 @@
package org.fudaa.dodico.crue.dao;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.common.CrueResource;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheAbstract;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheBarrageFilEau;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheBarrageGenerique;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheBarrageRhone;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheEnchainement;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheNiveauxAssocies;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheOrifice;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BranchePdc;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheSaintVenant;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheSeuilLateral;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheSeuilTransversal;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.BrancheStrickler;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.CasierAbstract;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.CasierMNT;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.CasierProfil;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.NdAm;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.NdAv;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.NoeudNiveauContinu;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.ReferenceNoeud;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.ReferenceProfil;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.SectionAbstract;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.SectionBrancheAbstract;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.SectionIdem;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.SectionInterpolee;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.SectionProfil;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.SectionRefIdem;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.SectionRefInterpolee;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.SectionRefProfil;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.SectionRefSansGeometrie;
-import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.SectionSansGeometrie;
+import org.fudaa.dodico.crue.dao.CrueDaoStructuresFormatDRSO.*;
import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
@@ -392,6 +364,9 @@
SectionAbstract sectionPersist = null;
if (section instanceof EMHSectionIdem) {
sectionPersist = new SectionRefIdem();
+ ((SectionRefIdem)sectionPersist).Section=new SectionReferenceeParIdem();
+ ((SectionRefIdem)sectionPersist).Section.NomRef=((EMHSectionIdem)section).getReference();
+
} else if (section instanceof EMHSectionInterpolee) {
sectionPersist = new SectionRefInterpolee();
} else if (section instanceof EMHSectionProfil) {
@@ -442,7 +417,7 @@
final List<RelationEMH> listeRelationEMH = new ArrayList<RelationEMH>();
if (listePersistanteSections == null || listePersistanteSections.size() == 0) {
analyser.addError(CrueDaoConverterCommon.listEmpty("Branches"), cptEntries++);
- } else for (final Object persist : listePersistanteSections) {
+ } else for (final Object persist : listePersistanteSections){
if (persist instanceof SectionBrancheAbstract) {
final SectionBrancheAbstract sectionPersist = (SectionBrancheAbstract) persist;
@@ -453,7 +428,14 @@
// -- commun aux objets --//
if (section != null) {
- RelationEMH relation = new RelationEMH(section, sectionPersist.Pos, new Double(sectionPersist.Xp));
+ HashMap<String,Object> map=new HashMap<String, Object>();
+ map.put(EMHHelper.Pos_section, sectionPersist.Pos);
+ map.put(EMHHelper.Xp_section, sectionPersist.Xp);
+ map.put(EMHHelper.Coeff_Pond, sectionPersist.CoefPond);
+ map.put(EMHHelper.Coeff_Div, sectionPersist.CoefDiv);
+ map.put(EMHHelper.Coeff_Conv, sectionPersist.CoefConv);
+
+ RelationEMH relation = new RelationEMH(section, map);
listeRelationEMH.add(relation);
} else {
@@ -486,6 +468,17 @@
// -- on recherche sa sp\xE9cialisation --//
if (sectionPersist instanceof SectionRefIdem) {
section = new EMHSectionIdem(nom);
+
+ SectionRefIdem sectionref=(SectionRefIdem)sectionPersist;
+ if(sectionref.Section!=null){
+ ((EMHSectionIdem)section).setReference(sectionref.Section.NomRef);
+
+ }
+ else{
+ analyser.addError(CrueDaoConverterCommon.unknowReference("Sections Idem", sectionPersist.Nom),
+ cptEntries++);
+ }
+
} else if (sectionPersist instanceof SectionRefInterpolee) {
section = new EMHSectionInterpolee(nom);
@@ -557,9 +550,14 @@
sectionPersist.NomRef = section.getNom();
sectionPersist.Pos = (String) EMHHelper.getPositionSection(relation);
- Object objet = EMHHelper.getXpSection(relation);
- if (objet instanceof Integer) sectionPersist.Xp = (Integer) objet;
- else sectionPersist.Xp = (Double) objet;
+
+ sectionPersist.Xp = EMHHelper.getXpSection(relation);
+
+ sectionPersist.CoefPond=EMHHelper.getPondSection(relation);
+ sectionPersist.CoefConv=EMHHelper.getConvSection(relation);
+ sectionPersist.CoefDiv=EMHHelper.getDivSection(relation);
+
+
listePersistante.add(sectionPersist);
}
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoParsing.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoParsing.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoParsing.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -44,7 +44,6 @@
contentXml = ValidatorXml.enteteXml + "\n" + contentXml;
writer.write(contentXml);
} catch (final IOException e) {
- // TODO Auto-generated catch block
FuLog.debug(e.getMessage());
analyser.addFatalError(CrueResource.getS("Erreur d'ecriture du fichier"));
isOk = false;
@@ -66,7 +65,7 @@
* @param fichier
* @return
*/
- public T getPersistData(final Object dataLinked, final File fichier, final CtuluAnalyze analyser) {
+ public T getPersistData( final File fichier, final CtuluAnalyze analyser,final Object... dataLinked) {
// -- la data a r\xE9cup\xE9rer --//
T newData = null;
try {
@@ -81,7 +80,7 @@
dataToPersist_ = (CrueDaoPersit<T>) resultat;
// -- on genere la donn\xE9es m\xE9tier a partir de la donnee persistante--//
- newData = dataToPersist_.fillInfosWithPersistant(dataLinked, analyser);
+ newData = dataToPersist_.fillInfosWithPersistant( analyser,dataLinked);
} catch (final XStreamException e) {
FuLog.debug(e.getMessage());
analyser.addFatalError(CrueResource.getS("Erreur d'ecriture du fichier"));
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDCSP.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDCSP.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDCSP.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -40,9 +40,9 @@
}
@Override
- List<EMH> fillInfosWithPersistant(final Object data, final CtuluAnalyze analyser) {
+ List<EMH> fillInfosWithPersistant( final CtuluAnalyze analyser,final Object data) {
- if (data == null || !(data instanceof List)) {
+ if (data == null || !(data instanceof List)) {
analyser
.addFatalError(CrueResource
.getS("Impossible de r\xE9cup\xE9rer les donn\xE9es r\xE9saux (DRSO). Les r\xE9f\xE9rences du fichier DSCP ne pourront etre utilis\xE9es."));
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDFRT.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDFRT.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDFRT.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -38,7 +38,7 @@
}
@Override
- public List<DonFrt> fillInfosWithPersistant(final Object data, final CtuluAnalyze analyser) {
+ public List<DonFrt> fillInfosWithPersistant( final CtuluAnalyze analyser,final Object data) {
return CrueDaoConverterDFRT.remplirFrottemetnsAvecPersistanceDFRT(listeFrottement, analyser);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDLHY.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDLHY.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDLHY.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -33,7 +33,7 @@
}
@Override
- List<Loi> fillInfosWithPersistant(Object dataLinked, CtuluAnalyze analyser) {
+ List<Loi> fillInfosWithPersistant( CtuluAnalyze analyser,Object dataLinked) {
final List<Loi> res = new ArrayList<Loi>();
CrueDaoConverterDLHY.cptEntries = 1;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTG.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTG.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTG.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -36,9 +36,9 @@
}
@Override
- public CrueData fillInfosWithPersistant(final Object dataLinked, final CtuluAnalyze listeMessageError) {
+ public CrueData fillInfosWithPersistant( final CtuluAnalyze listeMessageError,final Object dataLinked) {
// TODO Auto-generated method stub
- if (dataLinked instanceof CrueData) {
+ if (dataLinked!=null &&(dataLinked instanceof CrueData)) {
final CrueData structure = (CrueData) dataLinked;
CrueDaoConverterDPTG.remplirMetierDPTG(this, structure, listeMessageError);
return structure;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTI.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTI.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDPTI.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -61,15 +61,15 @@
}
@Override
- CrueData fillInfosWithPersistant(final Object data, final CtuluAnalyze listeMessageError) {
+ CrueData fillInfosWithPersistant( final CtuluAnalyze listeMessageError,final Object dataLinked) {
- if (data == null || !(data instanceof CrueData)) {
+ if (dataLinked == null || !(dataLinked instanceof CrueData)) {
listeMessageError
.addFatalError(CrueResource
.getS("Impossible de r\xE9cup\xE9rer les donn\xE9es r\xE9saux (DRSO). Les r\xE9f\xE9rences du fichier DPTI ne pourront etre utilis\xE9es."));
return null;
}
- final CrueData dataCrue = (CrueData) data;
+ final CrueData dataCrue = (CrueData) dataLinked;
// -- remplissage des noeuds --//
CrueDaoConverterDPTI.remplirNoeudAvecPersistanceDPTI(Noeuds, dataCrue.getNoeuds(), listeMessageError);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDRSO.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDRSO.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistDRSO.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -78,7 +78,7 @@
}
@Override
- public CrueData fillInfosWithPersistant(final Object data, final CtuluAnalyze listeMessageError) {
+ public CrueData fillInfosWithPersistant( final CtuluAnalyze listeMessageError,final Object dataLinked) {
final CrueData res = new CrueData();
CrueDaoConverterDRSO.cptEntries = 1;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistETU.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistETU.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistETU.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -42,7 +42,7 @@
}
@Override
- public EMHproject fillInfosWithPersistant(final Object dataLinked, final CtuluAnalyze analyser) {
+ public EMHproject fillInfosWithPersistant( final CtuluAnalyze analyser,final Object dataLinked) {
// TODO Auto-generated method stub
return CrueDaoConverterETU.remplirMetierETU(this, analyser);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistOPTG.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistOPTG.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersistOPTG.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -46,7 +46,7 @@
}
@Override
- public DonPrtReseau fillInfosWithPersistant(final Object data, final CtuluAnalyze listeMessageError) {
+ public DonPrtReseau fillInfosWithPersistant( final CtuluAnalyze listeMessageError,final Object dataLinked) {
final DonPrtReseau ordres = new DonPrtReseau();
ordres.setRegleProfPlat(RegleProfPlat);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersit.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersit.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoPersit.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -32,7 +32,7 @@
*
* @return
*/
- abstract T fillInfosWithPersistant(Object dataLinked, CtuluAnalyze analyser);
+ abstract T fillInfosWithPersistant( CtuluAnalyze analyser,Object dataLinked);
/**
* Execute la persistance des donn\xE9es dans le fichier donn\xE9 en parametre.
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDRSO.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDRSO.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoStructuresFormatDRSO.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -151,6 +151,10 @@
xstream.alias("SectionInterpolee", SectionRefInterpolee.class);
xstream.alias("SectionPilote", SectionRefPilote.class);
+ //-- cas particlier pour les sections --//
+ xstream.alias("Section", SectionReferenceeParIdem.class);
+ xstream.useAttributeFor( SectionReferenceeParIdem.class,"NomRef");
+
// -- implicite liste pour les references profils--//
xstream.addImplicitCollection(SectionRefProfil.class, "ProfilSection");
@@ -439,6 +443,9 @@
public String NomRef;
public String Pos;
public double Xp;
+ public double CoefPond;
+ public double CoefConv;
+ public double CoefDiv;
}
@@ -595,8 +602,14 @@
public String Nom;
}
+
+ public static class SectionReferenceeParIdem{
+ public String NomRef;
+ }
- public static class SectionRefIdem extends SectionAbstract {}
+ public static class SectionRefIdem extends SectionAbstract {
+ SectionReferenceeParIdem Section;
+ }
public static class SectionRefInterpolee extends SectionAbstract {}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -40,12 +40,12 @@
*/
public static class ReaderWithExtra<T> {
CrueDaoPersit<T> data;
- CtuluAnalyze listeMessageError;
+ CtuluAnalyze analyzer;
Object[] dataLinked;
public ReaderWithExtra(final CtuluAnalyze analyzer) {
- this.listeMessageError = analyzer;
+ this.analyzer = analyzer;
}
@@ -59,17 +59,17 @@
public T read(final CrueDaoPersit<T> data, final File fichier, final String validatorXSDfile,
final Object... dataLinked) {
- listeMessageError.setDesc(CrueResource.getS(" Analyse du Fichier " + fichier.getName()));
+ analyzer.setDesc(CrueResource.getS(" Analyse du Fichier " + fichier.getName()));
// -- evaluation du fichier avec la xsd --//
- if (!ValidatorXml.validXMLWithDOMFromFile(fichier, validatorXSDfile, listeMessageError)) {
- listeMessageError.addWarn(CrueResource.getS("Fichier " + fichier.getName() + " non valid\xE9 par la XSD "
+ if (!ValidatorXml.validXMLWithDOMFromFile(fichier, validatorXSDfile, analyzer)) {
+ analyzer.addWarn(CrueResource.getS("Fichier " + fichier.getName() + " non valid\xE9 par la XSD "
+ validatorXSDfile), 0);
}
// -- lecture des donn\xE9es --//
final CrueDaoParsing<T> parser = new CrueDaoParsing<T>(data);
- final T res = parser.getPersistData(dataLinked, fichier, listeMessageError);
+ final T res = parser.getPersistData( fichier, analyzer,dataLinked);
return res;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -85,7 +85,7 @@
* @param dataLinked
* @return
*/
- public abstract T readData(final File f, CtuluAnalyze analyzer, final Object... dataLinked);
+ public abstract T readData(final File f, CtuluAnalyze analyzer, final Object dataLinked);
/**
* Obtenir le wtriter associ\xE9.
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DCSPFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DCSPFileFormat.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DCSPFileFormat.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -48,7 +48,7 @@
}
@Override
- public List<EMH> readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ public List<EMH> readData(File f, CtuluAnalyze analyzer, Object dataLinked) {
return getReader(analyzer).read(new CrueDaoPersistDCSP(), f, getXsdValidator(), dataLinked);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DFRTFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DFRTFileFormat.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DFRTFileFormat.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -48,7 +48,7 @@
}
@Override
- public List<DonFrt> readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ public List<DonFrt> readData(File f, CtuluAnalyze analyzer, Object dataLinked) {
return getReader(analyzer).read(new CrueDaoPersistDFRT(), f, getXsdValidator(), dataLinked);
}
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DLHYFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DLHYFileFormat.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DLHYFileFormat.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -0,0 +1,62 @@
+package org.fudaa.dodico.crue.inout.fileformat;
+
+import java.io.File;
+import java.util.List;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.dao.CrueDaoConverterCommon;
+import org.fudaa.dodico.crue.dao.CrueDaoPersistDLHY;
+import org.fudaa.dodico.crue.metier.emh.Loi;
+
+public class DLHYFileFormat extends CrueFileFormat<List<Loi>>{
+
+ public static final String xsdDLHY = "valideDLHY.xsd";
+ private static DLHYFileFormat INSTANCE;
+
+
+ public static CrueFileFormat<List<Loi>> getInstance() {
+ if (INSTANCE == null) INSTANCE = new DLHYFileFormat(CrueDaoConverterCommon.DLHY);
+ return INSTANCE;
+ }
+
+ protected DLHYFileFormat(String type) {
+ super(type);
+ }
+
+
+ public String[] getExtensions() {
+
+ return new String[] { "dlhy", "dlhy.xml" };
+ }
+
+
+ public String getXsdValidator() {
+
+ return xsdDLHY;
+ }
+
+
+ public boolean isCrue10() {
+
+ return false;
+ }
+
+
+ public boolean isIndependant() {
+
+ return false;
+ }
+
+
+
+ public List<Loi> readData(File f, CtuluAnalyze analyzer, Object dataLinked) {
+ return getReader(analyzer).read(new CrueDaoPersistDLHY(), f, getXsdValidator(), dataLinked);
+
+ }
+
+
+ public boolean writeData(List<Loi> data, File f, CtuluAnalyze analyzer) {
+ return getWriter(analyzer).write(new CrueDaoPersistDLHY(), data, f);
+ }
+
+}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTGFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTGFileFormat.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTGFileFormat.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -47,7 +47,7 @@
}
@Override
- public CrueData readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ public CrueData readData(File f, CtuluAnalyze analyzer, Object dataLinked) {
return getReader(analyzer).read(new CrueDaoPersistDPTG(), f, getXsdValidator(), dataLinked);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTIFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTIFileFormat.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTIFileFormat.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -48,7 +48,7 @@
}
@Override
- public CrueData readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ public CrueData readData(File f, CtuluAnalyze analyzer, Object dataLinked) {
return getReader(analyzer).read(new CrueDaoPersistDPTI(), f, getXsdValidator(), dataLinked);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DRSOFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DRSOFileFormat.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DRSOFileFormat.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -47,7 +47,7 @@
}
@Override
- public CrueData readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ public CrueData readData(File f, CtuluAnalyze analyzer, Object dataLinked) {
return getReader(analyzer).read(new CrueDaoPersistDRSO(), f, getXsdValidator(), dataLinked);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -47,7 +47,7 @@
}
@Override
- public EMHproject readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ public EMHproject readData(File f, CtuluAnalyze analyzer, Object dataLinked) {
// TODO Auto-generated method stub
return null;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/OPTGFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/OPTGFileFormat.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/OPTGFileFormat.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -47,7 +47,7 @@
}
@Override
- public DonPrtReseau readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ public DonPrtReseau readData(File f, CtuluAnalyze analyzer, Object dataLinked) {
return getReader(analyzer).read(new CrueDaoPersistOPTG(), f, getXsdValidator(), dataLinked);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSectionIdem.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSectionIdem.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSectionIdem.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -7,7 +7,20 @@
*/
public class EMHSectionIdem extends CatEMHSection {
- public EMHSectionIdem(final String nom) {
+ /**
+ * Reference \xE0 la section.
+ */
+ String reference;
+
+ public String getReference() {
+ return reference;
+ }
+
+ public void setReference(String reference) {
+ this.reference = reference;
+ }
+
+public EMHSectionIdem(final String nom) {
super(nom);
// TODO Auto-generated constructor stub
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMH.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMH.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMH.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -1,6 +1,7 @@
package org.fudaa.dodico.crue.metier.emh;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
/**
@@ -12,31 +13,30 @@
public class RelationEMH {
EMH emh;
- List<Object> arguments;
+ HashMap<String,Object> arguments;
- public EMH getEmh() {
+ public EMH getEmh(){
return emh;
}
- public void setEmh(EMH emh) {
+ public void setEmh(EMH emh){
this.emh = emh;
}
- public RelationEMH(EMH emh, Object... objects) {
+ public RelationEMH(EMH emh, HashMap<String,Object> objects){
super();
this.emh = emh;
- arguments = new ArrayList<Object>();
+ arguments = objects;
- for (Object item : objects)
- arguments.add(item);
+
}
- public List<Object> getArguments() {
+ public HashMap<String,Object> getArguments() {
return arguments;
}
- public void setArguments(List<Object> arguments) {
+ public void setArguments(HashMap<String,Object> arguments) {
this.arguments = arguments;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -1,6 +1,7 @@
package org.fudaa.dodico.crue.metier.helper;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
@@ -18,8 +19,11 @@
public final static String id_NOEUD_AMONT = "NOEUD_AMONT";
public final static String id_NOEUD_AVAL = "NOEUD_AVAL";
- public final static int Pos_section = 0;
- public final static int Xp_section = 1;
+ public final static String Pos_section = "Pos_section";
+ public final static String Xp_section ="Xp_section";
+ public final static String Coeff_Pond = "Coeff_Pond";
+ public final static String Coeff_Conv = "Coeff_Conv";
+ public final static String Coeff_Div = "Coeff_Div";
/**
* Ajoute une infos (DSCP)
@@ -150,7 +154,7 @@
if (emh.getRelationsAvecEMH() != null) {
for (RelationEMH relation : emh.getRelationsAvecEMH()) {
if (relation != null && relation.getEmh() != null && relation.getEmh() instanceof CatEMHNoeud) {
- if (relation.getArguments() != null && relation.getArguments().contains(id_NOEUD_AMONT)) return (CatEMHNoeud) relation
+ if (relation.getArguments() != null && relation.getArguments().get(id_NOEUD_AMONT)!=null) return (CatEMHNoeud) relation
.getEmh();
}
}
@@ -168,7 +172,7 @@
if (emh.getRelationsAvecEMH() != null) {
for (RelationEMH relation : emh.getRelationsAvecEMH()) {
if (relation != null && relation.getEmh() != null && relation.getEmh() instanceof CatEMHNoeud) {
- if (relation.getArguments() != null && relation.getArguments().contains(id_NOEUD_AVAL)) return (CatEMHNoeud) relation
+ if (relation.getArguments() != null && relation.getArguments().get(id_NOEUD_AVAL)!=null) return (CatEMHNoeud) relation
.getEmh();
}
}
@@ -177,34 +181,123 @@
}
public static void addNoeudAmont(EMH emh, CatEMHNoeud noeud) {
- RelationEMH relation = new RelationEMH(noeud, id_NOEUD_AMONT);
+
+ HashMap<String,Object> map=new HashMap<String, Object>();
+ map.put(id_NOEUD_AMONT, id_NOEUD_AMONT);
+ RelationEMH relation = new RelationEMH(noeud, map);
if (emh.getRelationsAvecEMH() == null) emh.setRelationsAvecEMH(new ArrayList<RelationEMH>());
emh.getRelationsAvecEMH().add(relation);
}
public static void addNoeudAval(EMH emh, CatEMHNoeud noeud) {
- RelationEMH relation = new RelationEMH(noeud, id_NOEUD_AVAL);
+ HashMap<String,Object> map=new HashMap<String, Object>();
+ map.put(id_NOEUD_AVAL, id_NOEUD_AVAL);
+ RelationEMH relation = new RelationEMH(noeud, map);
if (emh.getRelationsAvecEMH() == null) emh.setRelationsAvecEMH(new ArrayList<RelationEMH>());
emh.getRelationsAvecEMH().add(relation);
}
public static void addNoeudCasier(CatEMHCasier emh, CatEMHNoeud noeud) {
- RelationEMH relation = new RelationEMH(noeud);
+ RelationEMH relation = new RelationEMH(noeud,null);
if (emh.getRelationsAvecEMH() == null) emh.setRelationsAvecEMH(new ArrayList<RelationEMH>());
emh.getRelationsAvecEMH().add(relation);
}
- public static Object getPositionSection(RelationEMH relation) {
- if (relation != null && relation.getArguments() != null) return relation.getArguments().get(Pos_section);
+ /**
+ * Reserv\xE9 pour DRSO les sections des branches. Pos
+ * @param relation
+ * @return
+ */
+ public static String getPositionSection(RelationEMH relation) {
+ if (relation != null && relation.getArguments() != null && relation.getArguments().get(Pos_section)!=null && relation.getArguments().get(Pos_section) instanceof String) return (String)relation.getArguments().get(Pos_section);
return null;
}
- public static Object getXpSection(RelationEMH relation) {
- if (relation != null && relation.getArguments() != null && relation.getArguments().get(Xp_section) != null) return relation
- .getArguments().get(Xp_section);
+ /**
+ * Reserv\xE9 pour DRSO les sections des branches. Xp
+ * @param relation
+ * @return
+ */
+ public static Double getXpSection(RelationEMH relation) {
+ if (relation != null && relation.getArguments() != null && relation.getArguments().get(Xp_section) != null)
+ {
+ Object val=relation.getArguments().get(Xp_section);
+ if(val instanceof Integer)
+ return new Double((Integer)val);
+ else
+ if(val instanceof Double)
+ return (Double)val;
+ return null;
+ }
+
return null;
}
+
+ /**
+ * Reserv\xE9 pour DRSO les sections des branches. Pond
+ * @param relation
+ * @return
+ */
+ public static Double getPondSection(RelationEMH relation) {
+ if (relation != null && relation.getArguments() != null && relation.getArguments().get(Coeff_Pond) != null)
+ {
+ Object val=relation.getArguments().get(Coeff_Pond);
+ if(val instanceof Integer)
+ return new Double((Integer)val);
+ else
+ if(val instanceof Double)
+ return (Double)val;
+ return null;
+ }
+
+ return null;
+ }
+
+
+ /**
+ * Reserv\xE9 pour DRSO les sections des branches. Conv
+ * @param relation
+ * @return
+ */
+ public static Double getConvSection(RelationEMH relation) {
+ if (relation != null && relation.getArguments() != null && relation.getArguments().get(Coeff_Conv) != null)
+ {
+ Object val=relation.getArguments().get(Coeff_Conv);
+ if(val instanceof Integer)
+ return new Double((Integer)val);
+ else
+ if(val instanceof Double)
+ return (Double)val;
+ return null;
+ }
+
+ return null;
+ }
+
+
+ /**
+ * Reserv\xE9 pour DRSO les sections des branches. Div
+ * @param relation
+ * @return
+ */
+ public static Double getDivSection(RelationEMH relation) {
+ if (relation != null && relation.getArguments() != null && relation.getArguments().get(Coeff_Div) != null)
+ {
+ Object val=relation.getArguments().get(Coeff_Div);
+ if(val instanceof Integer)
+ return new Double((Integer)val);
+ else
+ if(val instanceof Double)
+ return (Double)val;
+ return null;
+ }
+
+ return null;
+ }
+
+
+
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHSectionHelper.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHSectionHelper.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHSectionHelper.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -7,6 +7,7 @@
import org.fudaa.dodico.crue.metier.emh.CrueData;
import org.fudaa.dodico.crue.metier.emh.EMH;
import org.fudaa.dodico.crue.metier.emh.EMHSectionProfil;
+import org.fudaa.dodico.crue.metier.emh.RelationEMH;
/**
* Helper pour les sections.
@@ -15,44 +16,63 @@
*/
public class EMHSectionHelper {
- /**
- * Recherche le noeud par rapport \xE0 la r\xE9f\xE9rence fournie.
- *
- * @param listeMetier
- * @return
- */
- public static CatEMHSection findByReference(final String reference, final List<? extends EMH> listeSections) {
- for (final EMH emh : listeSections) {
- if (emh instanceof CatEMHSection) {
- final CatEMHSection section = (CatEMHSection) emh;
- if (reference.equals(section.getNom())) { return section; }
- }
- }
- return null;
- }
+ /**
+ * Recherche le noeud par rapport \xE0 la r\xE9f\xE9rence fournie.
+ *
+ * @param listeMetier
+ * @return
+ */
+ public static CatEMHSection findByReference(final String reference, final List<? extends EMH> listeSections) {
+ for (final EMH emh : listeSections) {
+ if (emh instanceof CatEMHSection) {
+ final CatEMHSection section = (CatEMHSection) emh;
+ if (reference.equals(section.getNom())) { return section; }
+ }
+ }
+ return null;
+ }
- public static CatEMHSection findByReference(final String reference, final CrueData dataMetier) {
- return findByReference(reference, dataMetier.getSections());
- }
+/**
+ * Recherche dans les relations l'existance de la section.
+ * @param reference
+ * @param listeRelationsSections
+ * @return
+ */
+ public static CatEMHSection findByReferenceInRelation(final String reference, final List<RelationEMH> listeRelationsSections) {
+ for (final RelationEMH relation : listeRelationsSections) {
+ if(relation!=null && relation.getEmh()!=null && relation.getEmh() instanceof CatEMHSection){
+ EMH emh=relation.getEmh();
+ if (emh instanceof CatEMHSection) {
+ final CatEMHSection section = (CatEMHSection) emh;
+ if (reference.equals(section.getNom())) { return section; }
+ }
+ }
+ }
+ return null;
+ }
- /**
- * Retrouve les sections Profil reference par le profil. Le profil est r\xE9f\xE9renc\xE9 dans le fichier DRSO. Il est ensuite
- * appel\xE9 dans le fichier DPTG.
- *
- * @param referenceProfil
- * @param listeMetier
- * @return
- */
- public static List<EMHSectionProfil> findByProfil(final String referenceProfil, final List<EMH> listeMetier) {
- final List<EMHSectionProfil> listeEmhProfils = new ArrayList<EMHSectionProfil>();
- for (final EMH emh : listeMetier) {
- if (emh instanceof EMHSectionProfil) {
- final EMHSectionProfil section = (EMHSectionProfil) emh;
- if (section.getListeReferencesProfil() != null) for (final String refProf : section.getListeReferencesProfil())
- if (refProf.equals(referenceProfil)) listeEmhProfils.add(section);
- }
- }
- return listeEmhProfils;
- }
+ public static CatEMHSection findByReference(final String reference, final CrueData dataMetier) {
+ return findByReference(reference, dataMetier.getSections());
+ }
+ /**
+ * Retrouve les sections Profil reference par le profil. Le profil est r\xE9f\xE9renc\xE9 dans le fichier DRSO. Il est ensuite
+ * appel\xE9 dans le fichier DPTG.
+ *
+ * @param referenceProfil
+ * @param listeMetier
+ * @return
+ */
+ public static List<EMHSectionProfil> findByProfil(final String referenceProfil, final List<EMH> listeMetier) {
+ final List<EMHSectionProfil> listeEmhProfils = new ArrayList<EMHSectionProfil>();
+ for (final EMH emh : listeMetier) {
+ if (emh instanceof EMHSectionProfil) {
+ final EMHSectionProfil section = (EMHSectionProfil) emh;
+ if (section.getListeReferencesProfil() != null) for (final String refProf : section.getListeReferencesProfil())
+ if (refProf.equals(referenceProfil)) listeEmhProfils.add(section);
+ }
+ }
+ return listeEmhProfils;
+ }
+
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDFRT.xsd
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDFRT.xsd 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDFRT.xsd 2009-04-09 06:29:30 UTC (rev 4623)
@@ -2,23 +2,23 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:complexType name="StriRefZ">
- <xs:choice minOccurs="2" maxOccurs="unbounded">
+ <xs:sequence minOccurs="2" maxOccurs="unbounded">
<xs:element name="PointFF" type="xs:string"/>
- </xs:choice>
+ </xs:sequence>
<xs:attribute name="Nom" type="xs:string"/>
</xs:complexType>
<xs:complexType name="StriRefC">
- <xs:choice minOccurs="2" maxOccurs="unbounded">
+ <xs:sequence minOccurs="2" maxOccurs="unbounded">
<xs:element name="PointFF" type="xs:string"/>
- </xs:choice>
+ </xs:sequence>
<xs:attribute name="Nom" type="xs:string"/>
</xs:complexType>
<xs:complexType name="StriRefH">
- <xs:choice minOccurs="2" maxOccurs="unbounded">
+ <xs:sequence minOccurs="2" maxOccurs="unbounded">
<xs:element name="PointFF" type="xs:string"/>
- </xs:choice>
+ </xs:sequence>
<xs:attribute name="Nom" type="xs:string"/>
</xs:complexType>
@@ -26,13 +26,13 @@
<xs:element name="DFRT" >
<xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element name="VersionCrue" type="xs:string"/>
- <xs:element name="Commentaire" type="xs:string"/>
+ <xs:sequence >
+ <xs:element name="VersionCrue" type="xs:string" minOccurs="0"/>
+ <xs:element name="Commentaire" type="xs:string" minOccurs="0"/>
<xs:element name="StriRefZ" type="StriRefZ"/>
<xs:element name="StriRefC" type="StriRefC"/>
<xs:element name="StriRefH" type="StriRefH"/>
- </xs:choice>
+ </xs:sequence>
</xs:complexType>
</xs:element>
Modified: trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDRSO.xsd
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDRSO.xsd 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDRSO.xsd 2009-04-09 06:29:30 UTC (rev 4623)
@@ -23,6 +23,9 @@
<xs:sequence>
<xs:element name="Pos" type="xs:string"/>
<xs:element name="Xp" type="xs:double"/>
+ <xs:element name="CoefPond" type="xs:double" minOccurs="0"/>
+ <xs:element name="CoefConv" type="xs:double" minOccurs="0"/>
+ <xs:element name="CoefDiv" type="xs:double" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="NomRef" type="xs:string"/>
</xs:complexType>
@@ -114,9 +117,23 @@
<xs:attribute name="Nom" type="xs:string"/>
</xs:complexType>
+
+ <xs:complexType name="SectionIdem">
+ <xs:sequence>
+ <xs:element name="Section" type="SectionDeSectionIdem"/>
+ </xs:sequence>
+ <xs:attribute name="Nom" type="xs:string"/>
+ </xs:complexType>
+
+ <xs:complexType name="SectionDeSectionIdem">
+ <xs:attribute name="NomRef" type="xs:string"/>
+ </xs:complexType>
+
+
+
<xs:complexType name="Sections">
<xs:choice minOccurs="1" maxOccurs="unbounded">
- <xs:element name="SectionIdem" type="Section"/>
+ <xs:element name="SectionIdem" type="SectionIdem"/>
<xs:element name="SectionInterpolee" type="Section"/>
<xs:element name="SectionProfil" type="SectionProfil"/>
<xs:element name="SectionSansGeometrie" type="Section"/>
Modified: trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/RemplissageData.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/RemplissageData.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/RemplissageData.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -1,6 +1,7 @@
package org.fudaa.dodico.crue.dao;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
@@ -45,6 +46,7 @@
import org.fudaa.dodico.crue.metier.emh.StriRefC;
import org.fudaa.dodico.crue.metier.emh.StriRefH;
import org.fudaa.dodico.crue.metier.emh.StriRefZ;
+import org.fudaa.dodico.crue.metier.helper.EMHHelper;
import org.fudaa.dodico.crue.metier.helper.EMHNoeudHelper;
public class RemplissageData {
@@ -209,8 +211,16 @@
dataCalcul.setCoeffRuisQdm(7.77);
branche1.addDSCP(dataCalcul);
List<RelationEMH> listeSections = new ArrayList<RelationEMH>();
- listeSections.add(new RelationEMH(interpol, "POSITION SECTION INTERPOL", 123.4));
- listeSections.add(new RelationEMH(geometrie, "POSITION SECTION GEOMETRIE", 123.4));
+ HashMap<String,Object> map=new HashMap<String, Object>();
+ map.put(EMHHelper.Pos_section, "POSITION SECTION INTERPOL");
+ map.put(EMHHelper.Xp_section, 123.4);
+
+ listeSections.add(new RelationEMH(interpol, map));
+ map=new HashMap<String, Object>();
+ map.put(EMHHelper.Pos_section, "POSITION SECTION GEOMETRIE");
+ map.put(EMHHelper.Xp_section, 123.4);
+
+ listeSections.add(new RelationEMH(geometrie, map));
branche1.setListeSections(listeSections);
// -- Donnees DPTG --//
@@ -243,7 +253,10 @@
branche2.addDSCP(dataCalcul1);
listeSections = new ArrayList<RelationEMH>();
- listeSections.add(new RelationEMH(profil, "POSITION SECTION PROFIL", 212.121));
+ map=new HashMap<String, Object>();
+ map.put(EMHHelper.Pos_section, "POSITION SECTION PROFIL");
+ map.put(EMHHelper.Xp_section, 212.121);
+ listeSections.add(new RelationEMH(profil,map));
branche2.setListeSections(listeSections);
data.add(branche2);
@@ -265,7 +278,10 @@
branche3.addDSCP(dataCalcul2);
listeSections = new ArrayList<RelationEMH>();
- listeSections.add(new RelationEMH(profil, "test", 777));
+ map=new HashMap<String, Object>();
+ map.put(EMHHelper.Pos_section, "Test");
+ map.put(EMHHelper.Xp_section, 777);
+ listeSections.add(new RelationEMH(profil, map));
branche3.setListeSections(listeSections);
data.add(branche3);
@@ -287,7 +303,10 @@
branche4.addDSCP(dataCalcul3);
listeSections = new ArrayList<RelationEMH>();
- listeSections.add(new RelationEMH(profil, "Profil test", 2548));
+ map=new HashMap<String, Object>();
+ map.put(EMHHelper.Pos_section, "Profil Test");
+ map.put(EMHHelper.Xp_section, 458);
+ listeSections.add(new RelationEMH(profil, map));
branche4.setListeSections(listeSections);
data.add(branche4);
@@ -309,7 +328,10 @@
branche5.addDSCP(dataCalcul4);
listeSections = new ArrayList<RelationEMH>();
- listeSections.add(new RelationEMH(profil, "Profil test 3", 457));
+ map=new HashMap<String, Object>();
+ map.put(EMHHelper.Pos_section, "Profil Test 3");
+ map.put(EMHHelper.Xp_section, 457);
+ listeSections.add(new RelationEMH(profil, map));
branche5.setListeSections(listeSections);
data.add(branche5);
@@ -335,7 +357,10 @@
branche6.addDSCP(dataCalcul5);
listeSections = new ArrayList<RelationEMH>();
- listeSections.add(new RelationEMH(profil, "VAR TEST profil", 111));
+ map=new HashMap<String, Object>();
+ map.put(EMHHelper.Pos_section, "VAR TEST profil");
+ map.put(EMHHelper.Xp_section, 111);
+ listeSections.add(new RelationEMH(profil, map));
branche6.setListeSections(listeSections);
data.add(branche6);
@@ -359,7 +384,10 @@
branche7.addDSCP(dataCalcul6);
listeSections = new ArrayList<RelationEMH>();
- listeSections.add(new RelationEMH(profil, "profil section", 12345));
+ map=new HashMap<String, Object>();
+ map.put(EMHHelper.Pos_section, "profil section");
+ map.put(EMHHelper.Xp_section, 12345);
+ listeSections.add(new RelationEMH(profil, map));
branche7.setListeSections(listeSections);
data.add(branche7);
Copied: trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueContrat.java (from rev 4621, trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueInterface.java)
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueContrat.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueContrat.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -0,0 +1,64 @@
+package org.fudaa.dodico.crue.dao;
+
+import java.io.File;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+
+/**
+ * Implementation crue qui centralise les methode importantes.
+ *
+ * @author Adrien Hadoux
+ */
+public interface TestCrueContrat {
+
+
+ /**
+ * test transformation en xml.
+ */
+ public void testToXml();
+
+ /**
+ * Test la validation xsd du fichier
+ *
+ * @param f
+ */
+ public void testXsdValidation();
+
+ /**
+ * Test lecture du fichier.
+ *
+ * @param f
+ */
+ public void testLecture();
+
+
+ /**
+ * Test ecriture du fichier.
+ *
+ * @param f
+ */
+ public void testConverterEMH();
+
+
+
+ /**
+ * R\xE9alise le cycle complet lecture/ecriture
+ */
+ public void testEcriture();
+
+ /**
+ * Execute la partie IHM du test: demande d'emplacement du fichier: dialog. Affiche les r\xE9sultats de l'analyse avec un
+ * arbre tree. .Reserv\xE9
+ */
+ public CtuluAnalyze execute();
+
+ /**
+ * Execute la partie IHM du test. realise une lecture ecriture simultan\xE9e. L'objet CtuluAnalyze retourn\xE9e indique les
+ * erreurs.
+ *
+ * @param fichierLecture
+ * @param fichierEcriture
+ */
+ public CtuluAnalyze testLectureEcriture(File fichierLecture, File fichierEcriture);
+
+}
Property changes on: trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueContrat.java
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDCSPFile.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDCSPFile.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDCSPFile.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -13,7 +13,7 @@
import com.thoughtworks.xstream.XStream;
-public class TestCrueDCSPFile extends TestCase implements TestCrueInterface {
+public class TestCrueDCSPFile extends TestCase implements TestCrueContrat {
public static boolean makeError = false;
// TODO pourquoi static ?
@@ -27,7 +27,7 @@
public static File fichierExistant = new File(fileLecture);
public static File fichierEcriture = new File(fileEcriture);
- public CtuluAnalyze testLectureEcriture() {
+ public void testEcriture() {
CtuluAnalyze analyzer = new CtuluAnalyze();
// -- lecture --//
@@ -35,10 +35,13 @@
DCSPFileFormat.getInstance().readData(fichierExistant, analyzer, jeuDonneesLue);
AppCrueTest.ecrireErrorMsg(analyzer);
+
+
+
// -- ecriture--//
DCSPFileFormat.getInstance().writeData(jeuDonneesLue.getAllEMH(), fichierEcriture, analyzer);
AppCrueTest.ecrireErrorMsg(analyzer);
- return analyzer;
+
}
public void testAssertEcriture() {
@@ -59,7 +62,7 @@
assertNotNull(jeuDonneesLue);
}
- public void testEcriture() {
+ public void testConverterEMH() {
CtuluAnalyze analyzer = new CtuluAnalyze();
CrueData jeuDonnees = RemplissageData.remplissageDonneeTest();
boolean res = DCSPFileFormat.getInstance().writeData(jeuDonnees.getAllEMH(), fichierEcriture, analyzer);
@@ -117,7 +120,7 @@
}
public CtuluAnalyze execute() {
- // TODO Auto-generated method stub
- return testLectureEcriture();
+ testEcriture();
+ return null;
}
}
Modified: trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDFRTFile.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDFRTFile.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDFRTFile.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -14,7 +14,7 @@
import com.thoughtworks.xstream.XStream;
-public class TestCrueDFRTFile extends TestCase implements TestCrueInterface {
+public class TestCrueDFRTFile extends TestCase implements TestCrueContrat {
/**
*
@@ -41,8 +41,8 @@
}
public CtuluAnalyze execute() {
- // TODO Auto-generated method stub
- return testLectureEcriture();
+ testEcriture();
+ return null;
}
public void testAssertEcriture() {
@@ -64,7 +64,7 @@
}
- public void testEcriture() {
+ public void testConverterEMH() {
CtuluAnalyze analyse = new CtuluAnalyze();
List<DonFrt> jeuDonnees = RemplissageData.remplissageDonneeTestDFRT();
DFRTFileFormat.getInstance().writeData(jeuDonnees, fichierEcriture, analyse);
@@ -81,7 +81,7 @@
/**
* Methode appel\xE9e JUNIT.
*/
- public CtuluAnalyze testLectureEcriture() {
+ public void testEcriture() {
CtuluAnalyze analyzer = new CtuluAnalyze();
List<DonFrt> jeuDonnees = DFRTFileFormat.getInstance().readData(fichierExistant, analyzer, null);
@@ -91,7 +91,7 @@
boolean res = DFRTFileFormat.getInstance().writeData(jeuDonnees, fichierEcriture, analyzer);
}
- return analyzer;
+
}
public CtuluAnalyze testLectureEcriture(File fichierLecture, File fichierEcriture) {
Modified: trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDPTGFile.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDPTGFile.java 2009-04-08 10:48:15 UTC (rev 4622)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDPTGFile.java 2009-04-09 06:29:30 UTC (rev 4623)
@@ -21,7 +21,7 @@
*
* @author Adrien Hadoux
*/
-public class TestCrueDPTGFile extends TestCase implements TestCrueInterface {
+public class TestCrueDPTGFile extends TestCase implements TestCrueContrat {
public static boolean makeError = false;
@@ -60,18 +60,18 @@
public void testAssertLecture() {}
- public void testEcriture() {
+ public void testConverterEMH() {
}
public void testXsdValidation() {}
- public CtuluAnalyze testLectureEcriture() {
- return null;
+ public void testEcriture() {
+
}
public CtuluAnalyze execute() {
- return testLectureEcriture();
+ return null;
}
public CtuluAnalyze testLectureEcriture(...
[truncated message content] |
