Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4506] branches/Prepro-0.92-SNAPSHOT/Fudaa-crue
|
From: <had...@us...> - 2009-03-03 19:21:41
|
Revision: 4506
http://fudaa.svn.sourceforge.net/fudaa/?rev=4506&view=rev
Author: hadouxad
Date: 2009-03-03 19:21:31 +0000 (Tue, 03 Mar 2009)
Log Message:
-----------
* fignol?\195?\169 les lectures/?\195?\169critures DRSO. ca marche tr?\195?\168s bien
* r?\195?\169alis?\195?\169 les test junit (test affiche xml, test ?\195?\169criture/lecture/?\195?\169criture)
* j'ai persist?\195?\169 le fichier DRST (les frottements)
* test junit pour le fichier DRST.
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDRSO.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFillInfos.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoParsing.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/DaoStructuresFormatDRSO.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHSection.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonFrt.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheBarrageFilEau.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheBarrageGenerique.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheBarrageRhone.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheEnchainement.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheNiveauxAssocies.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheOrifice.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBranchePdc.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheSaintVenant.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheSeuilLongitudinale.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheSeuilTransversal.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheStrickler.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHCasierMNT.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHCasierProfil.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHNoeudNiveauContinu.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSectionIdem.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSectionInterpolee.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSectionProfil.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSectionSansGeometrie.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/StriRefC.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/StriRefH.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/StriRefZ.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/reader/Crue10reader.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/writer/Crue10writer.java
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/Fichiers_donnees_Crue/Questions-ModelisationDonnees.txt
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/Fichiers_donnees_Crue/testSave/
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/lib/fgis.jar
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/lib/fgis.src.jar
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDFRT.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/DaoStructuresFormatDFRT.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/fudaa/crue/Crue.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/fudaa/crue/CrueCommomImplementation.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/test/java/org/fudaa/fudaa/crue/AppCrueTest.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/test/java/org/fudaa/fudaa/crue/TestCrueDFRTFile.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/test/java/org/fudaa/fudaa/crue/TestCrueDRSOFile.java
Removed Paths:
-------------
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/fudaa/crue/App.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/test/java/org/fudaa/fudaa/crue/AppTest.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/test/java/org/fudaa/fudaa/crue/Crue.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/test/java/org/fudaa/fudaa/crue/CrueCommomImplementation.java
Added: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/Fichiers_donnees_Crue/Questions-ModelisationDonnees.txt
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/Fichiers_donnees_Crue/Questions-ModelisationDonnees.txt (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/Fichiers_donnees_Crue/Questions-ModelisationDonnees.txt 2009-03-03 19:21:31 UTC (rev 4506)
@@ -0,0 +1,33 @@
+-- Questions mod\xE9lisations \xE0 soumettre au CNR --
+
+
+***** CRUE 10 *****
+
+
+- G\xE9n\xE9ral: Important R\xE8gle \xE0 appliquer pour tous les fichiers xml
+ - Il faut appliquer les 2 r\xE8gles suivantes:
+ - le nom de balise < > doit \xEAtre unique par fichier.
+ - pour les occurences d'une m\xEAme balise: suffixer les autres balises r\xE9f\xE9rences par <balise-ref>.
+
+ exemple: fichier DRSO:
+ les balises sections sont pr\xE9sentes \xE0 la fois a l'int\xE9rieur de <Sections> et de <Branches> avec les m\xEAmes noms.
+ puisque dans la partie section <Sections> les balises sont des r\xE9f\xE9rences, elles seront suffix\xE9es en
+ <SectionProfil-ref> <SectionInterpolee-ref> ...
+
+
+***** FICHIERS XML CRUE 10*****
+
+- Fichier DRSO:
+ - balise casier: pourrait -n avoir des exemples de balises casierMNT (on a que des exemples casierProfil avec les fichiers pour le moment. )
+ - balise casier/branche: on fait appel \xE0 une r\xE9f\xE9rence \xE0 un profil: Ou est-il d\xE9crit?
+ - balise branche: seul les noms des balises changenet(type de branche, saintvenant, orifice...), la structure
+ est toujours la m\xEAme (actif,noeud amont,aval, liste des sections). Est-ce normal? N'y a t'il pas de donn\xE9es sp\xE9cifiques suppl\xE9mentaires selon le type (pas pr\xE9sent dans les fichiers exemples).
+ - balise <Branches>. y sont d\xE9crit compl\xE8tement les sections (Pos,Xp) alors que dans la balise <Sections> il y a seulement des r\xE9f\xE9rences vers ces sections. Il ne faudrait pas plutot faire l'inverse?
+ sinon la balise <Sections> est facultative?
+
+- Fichier OPTG:
+
+
+
+- Fichier DRSO:
+
\ No newline at end of file
Added: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/lib/fgis.jar
===================================================================
(Binary files differ)
Property changes on: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/lib/fgis.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/lib/fgis.src.jar
===================================================================
(Binary files differ)
Property changes on: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/lib/fgis.src.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDFRT.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDFRT.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDFRT.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -0,0 +1,50 @@
+package main.java.org.fudaa.dodico.crue.dao;
+
+import java.util.List;
+
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.DomDriver;
+
+import main.java.org.fudaa.dodico.crue.dao.DaoStructuresFormatDFRT.StriRefPersist;
+import main.java.org.fudaa.dodico.crue.metier.emh.DonFrt;
+import main.java.org.fudaa.dodico.crue.metier.emh.EMH;
+
+/**
+ * Classe persistante qui reprend la meme structure que le fichier xml
+ *DFRT - Fichier des donn\xE9es de frottement (xml)
+ * A persister telle qu'elle.
+ * @author Adrien Hadoux
+ *
+ */
+public class CrueDaoDFRT extends CrueDaoParsing<List<DonFrt>>{
+ //-- variables qui correspondent \xE0 celle du fichier xml --//
+ public String VersionCrue="10";
+ public String Commentaire="G\xE9n\xE9r\xE9 par Fudaa ";
+
+ /**
+ * Il faut ajouter un parametre dans xstream pour lui indiquer de degager les balises 'collections'
+ * car il n'y en a pas dans ce fichier.
+ */
+ List<StriRefPersist> listeFrottement;
+
+
+ public void fillInfosWith(List<DonFrt> data) {
+ listeFrottement=CrueDaoFillInfos.remplirPersistanceAvecFrottemetnsDFRT(data);
+
+ }
+
+
+ public List<DonFrt> fillInfosWithPersistant() {
+ return CrueDaoFillInfos.remplirFrottemetnsAvecPersistanceDFRT(listeFrottement);
+ }
+
+
+ public XStream initXmlParser() {
+ XStream xstream = new XStream(new DomDriver());
+ //-- initialisation du format de la structure des documents --//
+ (new DaoStructuresFormatDFRT()).initXmlParserForDFRT(xstream);
+ return xstream;
+ }
+
+
+}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDRSO.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDRSO.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDRSO.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -1,6 +1,7 @@
package main.java.org.fudaa.dodico.crue.dao;
import java.awt.font.MultipleMaster;
+import java.util.ArrayList;
import java.util.List;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.converters.SingleValueConverter;
@@ -10,6 +11,7 @@
/**
* Classe persistante qui reprend la meme structure que le fichier xml
* DRSO - Fichier des donn\xE9es du r\xE9seau (xml)
+ * A persister telle qu'elle.
* @author Adrien Hadoux
*
*/
@@ -71,8 +73,33 @@
@Override
public List<EMH> fillInfosWithPersistant() {
- // TODO Auto-generated method stub
- return null;
+
+ List<EMH> listeCompleteEMH=new ArrayList<EMH>();
+
+ //-- etape 1: on remplit les infso des noeuds --//
+ List<EMH> listeNoeuds=CrueDaoFillInfos.remplirNoeudAvecPersistanceDRSO(Noeuds);
+
+ //-- etape 2: les casiers --//
+ List<EMH> listeCasiers=CrueDaoFillInfos.remplirCasierAvecPersistanceDRSO(Casiers, listeNoeuds);
+
+
+ //-- etape 3: les branches et les sections de bransche --//
+ List<EMH> listeBranches=CrueDaoFillInfos.remplirBrancheAvecPersistanceDRSO(Branches, listeNoeuds);
+
+ //-- etape 3: les sections a partir des sections cr\xE9es lors du remplissage des branches --//
+
+ List<EMH> listeSections= CrueDaoFillInfos.remplirSectionsAvecPersistanceDRSO(Sections, listeBranches);
+
+
+
+
+
+ //-- on ajoute tout dans la liste compl\xE8te --//
+ listeCompleteEMH.addAll(listeNoeuds);
+ listeCompleteEMH.addAll(listeCasiers);
+ listeCompleteEMH.addAll(listeBranches);
+ listeCompleteEMH.addAll(listeSections);
+ return listeCompleteEMH;
}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFillInfos.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFillInfos.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoFillInfos.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -6,10 +6,12 @@
import com.lowagie.text.Section;
import main.java.org.fudaa.dodico.crue.dao.DaoStructuresFormatDRSO.*;
+import main.java.org.fudaa.dodico.crue.dao.DaoStructuresFormatDFRT.*;
import main.java.org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
import main.java.org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
import main.java.org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
import main.java.org.fudaa.dodico.crue.metier.emh.CatEMHSection;
+import main.java.org.fudaa.dodico.crue.metier.emh.DonFrt;
import main.java.org.fudaa.dodico.crue.metier.emh.EMH;
import main.java.org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageFilEau;
import main.java.org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageGenerique;
@@ -28,6 +30,9 @@
import main.java.org.fudaa.dodico.crue.metier.emh.EMHSectionInterpolee;
import main.java.org.fudaa.dodico.crue.metier.emh.EMHSectionProfil;
import main.java.org.fudaa.dodico.crue.metier.emh.EMHSectionSansGeometrie;
+import main.java.org.fudaa.dodico.crue.metier.emh.StriRefC;
+import main.java.org.fudaa.dodico.crue.metier.emh.StriRefH;
+import main.java.org.fudaa.dodico.crue.metier.emh.StriRefZ;
/**
* Classe qui se charge de remplir les structures DAO avec els donn\xE9es m\xE9tier.
@@ -53,6 +58,26 @@
}
return listePersistante;
}
+
+
+ /**
+ * Methode qui remplit une arrayList d'objets m\xE9tier EMH noeuds a partir des donn\xE9es persistantes qui constituent la premiere partie du fichier DRSO: les Noeuds.
+ * @param data
+ * @return
+ */
+ public static List<EMH> remplirNoeudAvecPersistanceDRSO(List listePersistants ){
+ List<EMH> listeEMH=new ArrayList();
+ for(Object persist:listePersistants ){
+ if(persist instanceof NoeudNiveauContinu){
+ NoeudNiveauContinu noeudPersist=(NoeudNiveauContinu) persist;
+ CatEMHNoeud noeud=new CatEMHNoeud(noeudPersist.Nom);
+ listeEMH.add(noeud);
+ }
+ }
+ return listeEMH;
+ }
+
+
/**
* Methode qui remplit une arrayList d'objets persistants qui constituent la deuxieme partie du fichier DRSO: les Branches.
@@ -64,15 +89,14 @@
for(EMH emh:data ){
if(emh instanceof CatEMHBranche){
CatEMHBranche branche=(CatEMHBranche) emh;
- Object branchePersist=null;
+ BrancheAbstract branchePersist=null;
if (branche instanceof EMHBrancheBarrageFilEau) {
EMHBrancheBarrageFilEau new_name = (EMHBrancheBarrageFilEau) branche;
branchePersist=new BrancheBarrageFilEau();
}else if (branche instanceof EMHBrancheBarrageGenerique) {
EMHBrancheBarrageGenerique new_name = (EMHBrancheBarrageGenerique) branche;
branchePersist=new BrancheBarrageGenerique();
- }
- else if (branche instanceof EMHBrancheBarrageRhone) {
+ }else if (branche instanceof EMHBrancheBarrageRhone) {
EMHBrancheBarrageRhone new_name = (EMHBrancheBarrageRhone) branche;
branchePersist=new BrancheBarrageRhone();
}else if (branche instanceof EMHBrancheEnchainement) {
@@ -101,8 +125,6 @@
branchePersist=new BrancheStrickler();
}
-
-
if(branchePersist!=null){
//-- commun --//
BrancheAbstract br=(BrancheAbstract) branchePersist;
@@ -111,19 +133,92 @@
if(branche.getNoeudAmont()!=null)
br.NdAm=new NdAm(branche.getNoeudAmont().getNom());
if(branche.getNoeudAval()!=null)
- br.NdAv=new NdAm(branche.getNoeudAval().getNom());
+ br.NdAv=new NdAv(branche.getNoeudAval().getNom());
//-- on remplit les sections persistantes avec celle de la branche --//
br.Sections=CrueDaoFillInfos.remplirPersistanceAvecSectionsBrancheDRSO(branche.getListeSections());
-
listePersistante.add(br);
}
-
}
}
return listePersistante;
}
+
+ public static List<EMH> remplirBrancheAvecPersistanceDRSO(List listePersistante,List<EMH> listeNoeuds){
+ List<EMH> data=new ArrayList();
+ for(Object objet:listePersistante ){
+ if(objet instanceof BrancheAbstract){
+ CatEMHBranche branche=null;
+ BrancheAbstract branchePersist=(BrancheAbstract) objet;
+ String nom=branchePersist.Nom;
+ if (branchePersist instanceof BrancheBarrageFilEau) {
+ branche = new EMHBrancheBarrageFilEau(nom);
+
+ }else if (branchePersist instanceof BrancheBarrageGenerique) {
+ branche = new EMHBrancheBarrageGenerique(nom);
+
+ }else if (branchePersist instanceof BrancheBarrageRhone) {
+ branche = new EMHBrancheBarrageRhone(nom);
+
+ }else if (branchePersist instanceof BrancheEnchainement) {
+ branche = new EMHBrancheEnchainement(nom);
+
+ }else if (branchePersist instanceof BrancheNiveauxAssocies) {
+ branche = new EMHBrancheNiveauxAssocies(nom);
+
+ }else if (branchePersist instanceof BrancheOrifice) {
+ branche = new EMHBrancheOrifice(nom);
+
+ }else if (branchePersist instanceof BranchePdc) {
+ branche = new EMHBranchePdc(nom);
+
+ }else if (branchePersist instanceof BrancheSaintVenant) {
+ branche = new EMHBrancheSaintVenant(nom);
+
+ }else if (branchePersist instanceof BrancheSeuilLateral) {
+ branche = new EMHBrancheSeuilLongitudinale(nom);
+
+ }else if (branchePersist instanceof BrancheSeuilTransversal) {
+ branche = new EMHBrancheSeuilTransversal(nom);
+
+ }else if (branchePersist instanceof BrancheStrickler) {
+ branche = new EMHBrancheStrickler(nom);
+
+ }
+ if(branche!=null){
+ //-- commun --//
+
+ branche.setActive(branchePersist.Active);
+ //branche.setNom(branchePersist.Nom);
+ if(branchePersist.NdAm!=null){
+ CatEMHNoeud noeudAmont=CatEMHNoeud.findByReference(branchePersist.NdAm.NomRef, listeNoeuds);
+ if(noeudAmont!=null)
+ branche.setNoeudAmont(noeudAmont);
+ }
+ if(branchePersist.NdAv!=null){
+ CatEMHNoeud noeudAval=CatEMHNoeud.findByReference(branchePersist.NdAv.NomRef, listeNoeuds);
+ if(noeudAval!=null)
+ branche.setNoeudAval(noeudAval);
+ }
+
+ //-- on remplit les sections persistantes avec celle de la branche --//
+ if(branchePersist.Sections!=null)
+ branche.setListeSections(CrueDaoFillInfos.remplirSectionsBrancheAvecPersistanceDRSO(branchePersist.Sections));
+
+
+ data.add(branche);
+ }
+ }
+ }
+ return data;
+ }
+
+ /**
+ * Methode qui remplit une arrayList d'objets persistants qui constituent la troisi\xE8me partie du fichier DRSO: les Casier.
+ * @param data
+ * @return
+ */
public static List remplirPersistanceAvecCasierDRSO(List<EMH> data){
List listePersistante=new ArrayList();
for(EMH emh:data ){
@@ -157,27 +252,170 @@
/**
- * Remplit les don\xE9nes persistantes avec la liste des sections .
+ * Methode qui remplit une arrayList d'objets m\xE9tier EMH casier a partir des donn\xE9es persistantes qui constituent a troisi\xE8me partie du fichier DRSO: les Casier.
* @param data
* @return
*/
+ public static List<EMH> remplirCasierAvecPersistanceDRSO(List listePersistants,List<EMH> listeNoeuds ){
+ List<EMH> listeEMH=new ArrayList();
+ for(Object persist:listePersistants ){
+ if(persist instanceof CasierAbstract){
+ CasierAbstract casierPersist=(CasierAbstract) persist;
+ String nom=casierPersist.Nom;
+ //-- on d\xE9clare une version abstraite EMH m\xE9tier du type --//
+ CatEMHCasier casier=null;
+
+ //-- on recherche sa sp\xE9cialisation --//
+ if(casierPersist instanceof CasierProfil){
+ casier=new EMHCasierProfil(nom);
+ if(((CasierProfil)casierPersist).Profil!=null)
+ ((EMHCasierProfil)casier).setNomProfil(((CasierProfil)casierPersist).Profil.NomRef);
+ }else if(casierPersist instanceof CasierMNT){
+ casier=new EMHCasierMNT(nom);
+ }
+
+ //-- commun aux objets --//
+ if(casier!=null){
+ casier.setActive(casierPersist.Active);
+ if(casierPersist.Noeud!=null){
+ String reference=casierPersist.Noeud.NomRef;
+
+
+ CatEMHNoeud noeudRef=CatEMHNoeud.findByReference(reference, listeNoeuds);
+ if(noeudRef!=null)
+ casier.setNoeud(noeudRef);
+ }
+
+ listeEMH.add(casier);
+ }
+ }
+ }
+ return listeEMH;
+ }
+
+
+
+ /**
+ * Methode qui remplit une arrayList d'objets persistants qui constituent la quatri\xE8me partie du fichier DRSO: les Sections-references.
+ * @param data
+ * @return
+ */
public static List remplirPersistanceAvecSectionsDRSO(List<EMH> data){
List listePersistante=new ArrayList();
for(EMH emh:data ){
if(emh instanceof CatEMHSection){
CatEMHSection section=(CatEMHSection)emh;
+ SectionAbstract sectionPersist=null;
+ if(section instanceof EMHSectionIdem){
+ sectionPersist=new SectionRefIdem();
+ }else
+ if(section instanceof EMHSectionInterpolee){
+ sectionPersist=new SectionRefInterpolee();
+ }else
+ if(section instanceof EMHSectionProfil){
+ sectionPersist=new SectionRefProfil();
+ }else
+ if(section instanceof EMHSectionSansGeometrie){
+ sectionPersist=new SectionRefSansGeometrie();
+ }
+
+ //-- commun --//
+ if(sectionPersist!=null){
+ sectionPersist.NomRef=section.getNom();
+ listePersistante.add(sectionPersist);
+ }
+ }
+ }
+ return listePersistante;
+ }
+
+ /**
+ * Methode qui remplit une arrayList d'objets m\xE9tier EMH sections de branches a partir des donn\xE9es persistantes qui constituent la partie interne d'une partie Branche du fichier DRSO: les Sections.
+ * @param data
+ * @return
+ */
+ public static List<CatEMHSection> remplirSectionsBrancheAvecPersistanceDRSO(List listePersistantsBranches){
+
+
+
+ List<CatEMHSection> listeEMH=new ArrayList<CatEMHSection>();
+ for(Object persist:listePersistantsBranches ){
+ if(persist instanceof SectionBrancheAbstract){
+ SectionBrancheAbstract sectionPersist=(SectionBrancheAbstract) persist;
+
+ //-- on d\xE9clare une version abstraite EMH m\xE9tier du type --//
+ CatEMHSection section=null;
+ String nom=sectionPersist.NomRef;
+ //-- on recherche sa sp\xE9cialisation --//
+ if(sectionPersist instanceof SectionIdem){
+ section=new EMHSectionIdem(nom);
+
+ }else if(sectionPersist instanceof SectionInterpolee){
+ section=new EMHSectionInterpolee(nom);
+ }else if(sectionPersist instanceof SectionProfil){
+ section=new EMHSectionProfil(nom);
+ }else if(sectionPersist instanceof SectionSansGeometrie){
+ section=new EMHSectionSansGeometrie(nom);
+ }
+
+ //-- commun aux objets --//
+ if(section!=null){
+
+ if(sectionPersist.Pos!=null)
+ section.setPosition(sectionPersist.Pos);
+ section.setXp(sectionPersist.Xp);
+ listeEMH.add(section);
+ }
+ }
+ }
+ return listeEMH;
+ }
+
+ /**
+ * Methode qui remplit une arrayList d'objets m\xE9tier EMH sections a partir des donn\xE9es persistantes qui constituent a quatrieme partie du fichier DRSO: les Sections.
+ * @param data
+ * @return
+ */
+ public static List<EMH> remplirSectionsAvecPersistanceDRSO(List listePersistantsSection,List<EMH> listeBranches){
+ List<EMH> listeEMH=new ArrayList<EMH>();
+ for(Object persist:listePersistantsSection ){
+ if(persist instanceof SectionAbstract){
+ SectionAbstract sectionPersist=(SectionAbstract) persist;
+
+ //-- on d\xE9clare une version abstraite EMH m\xE9tier du type --//
+ CatEMHSection section=null;
+ String reference=sectionPersist.NomRef;
+ section=CatEMHSection.findByReferenceFromBrancheOrSectionEMH(reference, listeBranches);
+ if(section!=null)
+ listeEMH.add(section);
+
+ }
+ }
+ return listeEMH;
+ }
+
+
+ /**
+ * Remplit les don\xE9nes persistantes avec la liste des sections d'une branche.
+ * Remplit toutes les donn\xE9es associ\xE9es aux sections
+ * @param data
+ * @return
+ */
+ public static List remplirPersistanceAvecSectionsBrancheDRSO(List<CatEMHSection> data){
+ List listePersistante=new ArrayList();
+ for(EMH emh:data ){
+ if(emh instanceof CatEMHSection){
+ CatEMHSection section=(CatEMHSection)emh;
SectionBrancheAbstract sectionPersist=null;
if(section instanceof EMHSectionIdem){
sectionPersist=new SectionIdem();
}else
if(section instanceof EMHSectionInterpolee){
sectionPersist=new SectionInterpolee();
- }
- else
+ }else
if(section instanceof EMHSectionProfil){
sectionPersist=new SectionProfil();
- }
- else
+ }else
if(section instanceof EMHSectionSansGeometrie){
sectionPersist=new SectionSansGeometrie();
}
@@ -185,28 +423,73 @@
//-- commun --//
if(sectionPersist!=null){
sectionPersist.NomRef=section.getNom();
- sectionPersist.Pos=section.getPosition();
- sectionPersist.Xp=section.getXp();
+ sectionPersist.Pos=section.getPosition();
+ sectionPersist.Xp=section.getXp();
+
+
listePersistante.add(sectionPersist);
}
-
}
-
-
}
-
return listePersistante;
}
+
+ /**
+ * remplir le fichier DFRT avec les frottemetns
+ * @param data
+ * @return
+ */
+ public static List<StriRefPersist> remplirPersistanceAvecFrottemetnsDFRT(List<DonFrt> data){
+ List<StriRefPersist> listeFrottement=new ArrayList<StriRefPersist>();
+ for(DonFrt frt:data){
+ StriRefPersist persist=null;
+ if(frt instanceof StriRefC)
+ persist=new StriRefCPersist(frt.getNom());
+ else
+ if(frt instanceof StriRefH)
+ persist=new StriRefHPersist(frt.getNom());
+ else
+ if(frt instanceof StriRefZ)
+ persist=new StriRefZPersist(frt.getNom());
+
+ //-- commun --//
+ if(persist!=null){
+ persist.listePoints=frt.getListePoints();
+ listeFrottement.add(persist);
+ }
+
+ }
+ return listeFrottement;
+ }
-
/**
- * Remplit les don\xE9nes persistantes avec la liste des sections d'une branche.
+ * remplir le fichier DFRT avec les frottemetns
* @param data
* @return
*/
- public static List remplirPersistanceAvecSectionsBrancheDRSO(List<CatEMHSection> data){
- return null;
+ public static List<DonFrt> remplirFrottemetnsAvecPersistanceDFRT(List<StriRefPersist> persistListe){
+ List<DonFrt> data=new ArrayList<DonFrt>();
+ for(StriRefPersist persist:persistListe){
+ DonFrt frt=null;
+ if(persist instanceof StriRefCPersist)
+ frt=new StriRefC(persist.Nom);
+ else
+ if(persist instanceof StriRefHPersist)
+ frt=new StriRefH(persist.Nom);
+ else
+ if(persist instanceof StriRefZPersist)
+ frt=new StriRefZ(persist.Nom);
+
+ //-- commun --//
+ if(persist!=null){
+ if(persist.listePoints!=null)
+ frt.setListePoints(persist.listePoints);
+ data.add(frt);
+ }
+
+ }
+ return data;
}
-
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoParsing.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoParsing.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoParsing.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -49,7 +49,7 @@
boolean isOk=true;
ObjectOutputStream out=null;
try {
- out = initXmlParser().createObjectOutputStream(new FileWriter(fichier));
+ out = initXmlParser().createObjectOutputStream(new FileWriter(fichier),"Fichier");
//--on enregistre la donn\xE9e au bon format --//
out.writeObject(this);
} catch (IOException e) {
Added: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/DaoStructuresFormatDFRT.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/DaoStructuresFormatDFRT.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/DaoStructuresFormatDFRT.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -0,0 +1,91 @@
+package main.java.org.fudaa.dodico.crue.dao;
+
+import java.awt.Point;
+import java.util.List;
+
+import org.fudaa.ebli.geometrie.GrPoint;
+
+import main.java.org.fudaa.dodico.crue.dao.DaoStructuresFormatDRSO.BrancheAbstract;
+import main.java.org.fudaa.dodico.crue.dao.DaoStructuresFormatDRSO.NoeudNiveauContinu;
+import main.java.org.fudaa.dodico.crue.dao.DaoStructuresFormatDRSO.NoeudNiveauContinuConverter;
+import main.java.org.fudaa.dodico.crue.metier.emh.StriRefC;
+import main.java.org.fudaa.dodico.crue.metier.emh.StriRefH;
+import main.java.org.fudaa.dodico.crue.metier.emh.StriRefZ;
+
+import com.thoughtworks.xstream.XStream;
+
+/**
+ * Toutes les structures dao utilis\xE9es et les inits du parser xml pour le format DFRT.
+ * Toutes ces structures sont n\xE9cessaires pour bien formatter le contenu xml.
+ * Ici il n'y a pas besoin de d\xE9finir de sttructures suppl\xE9mentaires.
+ * @author Adrien Hadoux
+ *
+ */
+public class DaoStructuresFormatDFRT {
+
+
+ public void initXmlParserForDFRT(XStream xstream ){
+ //-- creation des alias pour que ce soit + parlant dans le xml file --//
+ xstream.alias("DFRT", CrueDaoDFRT.class);
+ //-- liste des initialisations n\xE9cessaires pour le formattage des donn\xE9es--//
+ initXmlParserStriRef(xstream);
+
+
+
+
+
+ }
+
+ /**
+ * init parser pour les nodes et pouvoir mettre l'attribut Nom en d\xE9but de balise.
+ * @param xstream
+ */
+ public void initXmlParserStriRef(XStream xstream ){
+ //-- alias gestion pour les frottements --//
+ xstream.alias("StriRefC", StriRefCPersist.class);
+ xstream.alias("StriRefZ", StriRefZPersist.class);
+ xstream.alias("StriRefH", StriRefHPersist.class);
+
+ //-- custom pour les points grpoint qui composent le fichier --//
+ xstream.alias("PointFF", Point.class);
+
+ //-- il faut virer le type liste pour forcer a afficher les balises sans balises couvrantes --//
+ xstream.addImplicitCollection(CrueDaoDFRT.class, "listeFrottement");
+ xstream.addImplicitCollection(StriRefPersist.class, "listePoints");
+
+
+ }
+
+
+public static abstract class StriRefPersist {
+ public String Nom;
+ public List<Point> listePoints;
+ public StriRefPersist(String nom){
+ Nom=nom;
+ }
+
+ }
+
+
+
+
+public static class StriRefCPersist extends StriRefPersist{
+
+ public StriRefCPersist(String nom) {
+ super(nom);
+ // TODO Auto-generated constructor stub
+ }}
+public static class StriRefZPersist extends StriRefPersist{
+
+ public StriRefZPersist(String nom) {
+ super(nom);
+ // TODO Auto-generated constructor stub
+ }}
+public static class StriRefHPersist extends StriRefPersist{
+
+ public StriRefHPersist(String nom) {
+ super(nom);
+ // TODO Auto-generated constructor stub
+ }}
+
+}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/DaoStructuresFormatDRSO.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/DaoStructuresFormatDRSO.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/DaoStructuresFormatDRSO.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -62,48 +62,53 @@
xstream.alias("BrancheSeuilTransversal", BrancheSeuilTransversal.class);
xstream.alias("BrancheBarrageFilEau", BrancheBarrageFilEau.class);
xstream.alias("BranchePdc", BranchePdc.class);
+ xstream.alias("BrancheBarrageGenerique",BrancheBarrageGenerique.class);
-
//-- mettre attribut Nom comme attribut de la balise branche,noeud et section et son converter appropri\xE9 --//
//-- mettre le nom de la branche dans la balise --//
- xstream.useAttributeFor(BrancheSaintVenant.class, "Nom");
+ xstream.useAttributeFor(BrancheAbstract.class, "Nom");
+
+
+// xstream.useAttributeFor(BrancheSaintVenant.class, "Nom");
xstream.registerConverter(new BrancheSaintVenantConverter());
- xstream.useAttributeFor(BrancheSeuilLateral.class, "Nom");
+ // xstream.useAttributeFor(BrancheSeuilLateral.class, "Nom");
xstream.registerConverter(new BrancheSeuilLateralConverter());
- xstream.useAttributeFor(BrancheStrickler.class, "Nom");
+ // xstream.useAttributeFor(BrancheStrickler.class, "Nom");
xstream.registerConverter(new BrancheStricklerConverter());
- xstream.useAttributeFor(BrancheOrifice.class, "Nom");
+ //xstream.useAttributeFor(BrancheOrifice.class, "Nom");
xstream.registerConverter(new BrancheOrificeConverter());
- xstream.useAttributeFor(BrancheSeuilTransversal.class, "Nom");
+ //xstream.useAttributeFor(BrancheSeuilTransversal.class, "Nom");
xstream.registerConverter(new BrancheSeuilTransversalConverter());
- xstream.useAttributeFor(BrancheBarrageFilEau.class, "Nom");
+ // xstream.useAttributeFor(BrancheBarrageFilEau.class, "Nom");
xstream.registerConverter(new BrancheBarrageFilEauConverter());
- xstream.useAttributeFor(BranchePdc.class, "Nom");
+ //xstream.useAttributeFor(BranchePdc.class, "Nom");
xstream.registerConverter(new BranchePdcConverter());
- xstream.useAttributeFor(BrancheBarrageGenerique.class, "Nom");
+ //xstream.useAttributeFor(BrancheBarrageGenerique.class, "Nom");
xstream.registerConverter(new BrancheBarrageGeneriqueConverter());
- xstream.useAttributeFor(BrancheBarrageRhone.class, "Nom");
+ // xstream.useAttributeFor(BrancheBarrageRhone.class, "Nom");
xstream.registerConverter(new BrancheBarrageRhoneConverter());
- xstream.useAttributeFor(BrancheEnchainement.class, "Nom");
+ //xstream.useAttributeFor(BrancheEnchainement.class, "Nom");
xstream.registerConverter(new BrancheEnchainementConverter());
- xstream.useAttributeFor(BrancheNiveauxAssocies.class, "Nom");
+ //xstream.useAttributeFor(BrancheNiveauxAssocies.class, "Nom");
xstream.registerConverter(new BrancheNiveauxAssociesConverter());
//-- gestion des noeuds des branches --//
xstream.alias("NdAm", NdAm.class);
xstream.alias("NdAv", NdAv.class);
+
+
xstream.useAttributeFor(NdAm.class, "NomRef");
xstream.registerConverter(new NdAmConverter());
xstream.useAttributeFor(NdAv.class, "NomRef");
@@ -123,10 +128,11 @@
xstream.alias("Profil",ReferenceProfil.class);
xstream.alias("Noeud", ReferenceNoeud.class);
- xstream.useAttributeFor(CasierProfil.class, "Nom");
+ xstream.useAttributeFor(CasierAbstract.class, "Nom");
+ // xstream.useAttributeFor(CasierProfil.class, "Nom");
xstream.registerConverter(new CasierProfilConverter());
- xstream.useAttributeFor(CasierMNT.class, "Nom");
+ //xstream.useAttributeFor(CasierMNT.class, "Nom");
xstream.registerConverter(new CasierMNTConverter());
xstream.useAttributeFor(ReferenceProfil.class, "NomRef");
@@ -144,28 +150,38 @@
* @param xstream
*/
public void initXmlParserSection(XStream xstream ){
- //-- gestion des sections --//
+ //-- gestion des sections --//
xstream.alias("SectionIdem", SectionIdem.class);
xstream.alias("SectionSansGeometrie", SectionSansGeometrie.class);
xstream.alias("SectionProfil", SectionProfil.class);
xstream.alias("SectionInterpolee", SectionInterpolee.class);
xstream.alias("SectionPilote", SectionPilote.class);
- xstream.useAttributeFor(SectionIdem.class, "NomRef");
+
+ xstream.useAttributeFor(SectionBrancheAbstract.class, "NomRef");
xstream.registerConverter(new SectionIdemConverter());
-
- xstream.useAttributeFor(SectionSansGeometrie.class, "NomRef");
xstream.registerConverter(new SectionSansGeometrieConverter());
-
- xstream.useAttributeFor(SectionProfil.class, "NomRef");
xstream.registerConverter(new SectionProfilConverter());
-
- xstream.useAttributeFor(SectionInterpolee.class, "NomRef");
xstream.registerConverter(new SectionInterpoleeConverter());
+ xstream.registerConverter(new SectionPiloteConverter());
+ //-- gestion des REFERENCES sections --//
+ //NOTE ADRIEN: on est foutu si il existe plusieurs balises de meme nom
+ // il faut donc suffixer par des -ref
- xstream.useAttributeFor(SectionPilote.class, "NomRef");
- xstream.registerConverter(new SectionPiloteConverter());
+ xstream.alias("SectionIdem-ref", SectionRefIdem.class);
+ xstream.alias("SectionSansGeometrie-ref", SectionRefSansGeometrie.class);
+ xstream.alias("SectionProfil-ref", SectionRefProfil.class);
+ xstream.alias("SectionInterpolee-ref", SectionRefInterpolee.class);
+ xstream.alias("SectionPilote-ref", SectionRefPilote.class);
+
+
+ xstream.useAttributeFor(SectionAbstract.class, "NomRef");
+ xstream.registerConverter(new SectionRefIdemConverter());
+ xstream.registerConverter(new SectionRefSansGeometrieConverter());
+ xstream.registerConverter(new SectionRefProfilConverter());
+ xstream.registerConverter(new SectionRefInterpoleeConverter());
+ xstream.registerConverter(new SectionRefPiloteConverter());
}
@@ -189,7 +205,7 @@
return n;
}
public boolean canConvert(Class type) {
- return type.equals(NoeudNiveauContinu.class);
+ return type.isInstance(NoeudNiveauContinu.class);
}
}
@@ -203,8 +219,8 @@
public static class BrancheAbstract{
public String Nom;
public boolean Active;
- public ReferenceNoeud NdAm;
- public ReferenceNoeud NdAv;
+ public NdAm NdAm;
+ public NdAv NdAv;
List Sections;
}
@@ -314,18 +330,15 @@
}
- public static class NdAm extends ReferenceNoeud{
-
- public NdAm(String nomRef) {
- super(nomRef);
- // TODO Auto-generated constructor stub
+ public static class NdAm {
+ public String NomRef;
+ public NdAm(String nomRef) {
+ NomRef=nomRef;}}
+ public static class NdAv {
+ public String NomRef;
+ public NdAv(String nomRef) {
+ NomRef=nomRef;
}}
- public static class NdAv extends ReferenceNoeud{
-
- public NdAv(String nomRef) {
- super(nomRef);
- // TODO Auto-generated constructor stub
- }}
public class ReferenceNoeudConverter implements SingleValueConverter {
public String toString(Object obj) {
@@ -338,16 +351,16 @@
public boolean canConvert(Class type) {
return type.isInstance(ReferenceNoeud.class); }
}
- public class NdAmConverter extends ReferenceNoeudConverter{
- public Object fromString(String name) {
- NdAm n=new NdAm(name);
-
- return n; }}
- public class NdAvConverter extends ReferenceNoeudConverter{
- public Object fromString(String name) {
- NdAv n=new NdAv(name);
-
- return n; }}
+ public class NdAmConverter implements SingleValueConverter {
+ public Object fromString(String name) { return new NdAm(name); }
+ public String toString(Object obj) { return ((NdAm) obj).NomRef;}
+ public boolean canConvert(Class type) { return type.isInstance(NdAm.class); }
+ }
+
+ public class NdAvConverter implements SingleValueConverter {
+ public Object fromString(String name) {return new NdAv(name);}
+ public String toString(Object obj) { return ((NdAv) obj).NomRef;}
+ public boolean canConvert(Class type) { return type.isInstance(NdAv.class); }}
//-- gestion des sections --//
/**
* Elementsection qui se trouve dans branche,
@@ -464,11 +477,59 @@
return casier; } }
- //*************************GESTION DES SECTIONS *************************
+ //*************************GESTION DES SECTIONS REFERENCES*************************
public class ReferenceSection {
public String Nom;
}
+ public static class SectionAbstract{
+ public String NomRef;
+
+ }
+ public static class SectionRefIdem extends SectionAbstract{}
+ public static class SectionRefInterpolee extends SectionAbstract{}
+ public static class SectionRefProfil extends SectionAbstract{}
+ public static class SectionRefSansGeometrie extends SectionAbstract{}
+ public static class SectionRefPilote extends SectionAbstract{}
+ public abstract class SectionRefConverter implements SingleValueConverter {
+ public String toString(Object obj) {
+ return ((SectionAbstract) obj).NomRef;
+ }
+ public abstract Object fromString(String name);
+ public boolean canConvert(Class type) {
+ return type.isInstance(SectionAbstract.class);
+ }}
+ public class SectionRefIdemConverter extends SectionRefConverter{
+ public Object fromString(String name) {
+ SectionRefIdem section=new SectionRefIdem();
+ section.NomRef=name;
+ return section;}}
+
+ public class SectionRefInterpoleeConverter extends SectionRefConverter{
+ public Object fromString(String name) {
+ SectionRefInterpolee section=new SectionRefInterpolee();
+ section.NomRef=name;
+ return section;}}
+
+ public class SectionRefProfilConverter extends SectionRefConverter{
+ public Object fromString(String name) {
+ SectionRefProfil section=new SectionRefProfil();
+ section.NomRef=name;
+ return section;}}
+
+ public class SectionRefSansGeometrieConverter extends SectionRefConverter{
+ public Object fromString(String name) {
+ SectionRefSansGeometrie section=new SectionRefSansGeometrie();
+ section.NomRef=name;
+ return section;}}
+
+ public class SectionRefPiloteConverter extends SectionRefConverter{
+ public Object fromString(String name) {
+ SectionRefPilote section=new SectionRefPilote();
+ section.NomRef=name;
+ return section;}}
+
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -23,11 +23,16 @@
*
*/
public class CatEMHBranche extends EMH{
+
private boolean isActive_;
private List<CatEMHSection> listeSections_;
private CatEMHNoeud noeudAmont_;
private CatEMHNoeud noeudAval_;
- private String nom;
+
+ public CatEMHBranche(String nom) {
+ super(nom);
+ // TODO Auto-generated constructor stub
+ }
@@ -63,12 +68,5 @@
this.noeudAval_ = noeudAval;
}
- public String getNom() {
- return nom;
- }
-
- public void setNom(String nom) {
- this.nom = nom;
- }
}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -5,19 +5,18 @@
*
*/
public abstract class CatEMHCasier extends EMH{
+
+
private boolean isActive_;
private CatEMHNoeud noeud_;
-private String nom_;
-
-public String getNom() {
- return nom_;
+public CatEMHCasier(String nom) {
+ super(nom);
+ // TODO Auto-generated constructor stub
}
-public void setNom(String nom) {
- this.nom_ = nom;
-}
+
public boolean isActive() {
return isActive_;
}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -1,19 +1,40 @@
package main.java.org.fudaa.dodico.crue.metier.emh;
+import java.util.List;
+
/**
*
* @author Adrien Hadoux
*
*/
public class CatEMHNoeud extends EMH{
- String nom_;
+
- public String getNom() {
- return nom_;
+
+
+
+ public CatEMHNoeud(String nom) {
+ super(nom);
+
}
- public void setNom(String nom) {
- this.nom_ = nom;
+ /**
+ * Recherche le noeud par rapport \xE0 la r\xE9f\xE9rence fournie.
+ * @param listeMetier
+ * @return
+ */
+ public static CatEMHNoeud findByReference(String reference,List<EMH> listeMetier){
+ for(EMH emh:listeMetier){
+ if(emh instanceof CatEMHNoeud){
+ CatEMHNoeud noeud=(CatEMHNoeud) emh;
+ if(noeud.nom_.equals(reference))
+ return noeud;
+ }
+ }
+ return null;
+
+
}
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHSection.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHSection.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHSection.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -1,22 +1,25 @@
package main.java.org.fudaa.dodico.crue.metier.emh;
+import java.util.List;
+
/**
* la classe section.
* @author Adrien Hadoux
*
*/
public class CatEMHSection extends EMH{
+
String position;
double xp;
- String nom;
-
- public String getNom() {
- return nom;
+ String reference;
+
+ public CatEMHSection(String nom) {
+ super(nom);
+ // TODO Auto-generated constructor stub
}
- public void setNom(String nom) {
- this.nom = nom;
- }
+
+
public String getPosition() {
return position;
}
@@ -29,4 +32,35 @@
public void setXp(double xp) {
this.xp = xp;
}
+
+
+
+ /**
+ * Recherche le noeud par rapport \xE0 la r\xE9f\xE9rence fournie.
+ * @param listeMetier
+ * @return
+ */
+ public static CatEMHSection findByReferenceFromBrancheOrSectionEMH(String reference,List<EMH> listeMetier){
+ for(EMH emh:listeMetier){
+ if(emh instanceof CatEMHSection){
+ CatEMHSection section=(CatEMHSection) emh;
+ if(reference.equals(section.getNom())){
+ return section;
+ }
+ }else if(emh instanceof CatEMHBranche){
+ CatEMHBranche branche=(CatEMHBranche) emh;
+ if(branche.getListeSections()!=null){
+ for(CatEMHSection section:branche.getListeSections() ){
+ if(reference.equals(section.getNom())){
+ return section;
+ }
+ }
+ }
+ }
+ }
+ return null;
+
+
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonFrt.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonFrt.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonFrt.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -1,10 +1,58 @@
package main.java.org.fudaa.dodico.crue.metier.emh;
+import java.awt.Point;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.fudaa.ebli.geometrie.GrPoint;
+
/**
*
* @author Adrien Hadoux
*
*/
-public interface DonFrt {
+public abstract class DonFrt {
+ protected List<Point> point_;
+ /**
+ * reference.
+ */
+ protected String nom_;
+
+ public DonFrt(String nom){
+ nom_=nom;
+ point_=new ArrayList<Point>();
+ }
+
+ public String getNom() {
+ return nom_;
+ }
+ public void setNom(String nom) {
+ this.nom_ = nom;
+ }
+
+ public Point getPoint(int i) {
+ return point_.get(i);
+ }
+
+ public GrPoint getGrPoint(int i) {
+ GrPoint val=new GrPoint(point_.get(i).x,point_.get(i).y,0);
+ return val;
+ }
+
+ public void setPoint(Point point,int i) {
+ this.point_.set(i, point);
+ }
+
+
+ public boolean addPoint(Point p){
+ return point_.add(p);
+ }
+
+ public List<Point> getListePoints(){
+ return point_;
+ }
+ public void setListePoints( List<Point> liste){
+ point_=liste;
+ }
}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -11,9 +11,27 @@
* @author Adrien Hadoux
*
*/
-public class EMH {
+public abstract class EMH {
/**
+ * Reference nom de l'objet EMH.
+ * Tr\xE9s important, il sera manipul\xE9 par les donn\xE9es.
+ */
+ protected String nom_;
+
+ public String getNom() {
+ return nom_;
+ }
+
+ public void setNom(String nom) {
+ this.nom_ = nom;
+ }
+
+ public EMH(String nom){
+ nom_=nom;
+ }
+
+ /**
* CONTRAINTE : deux \xE9l\xE9ments nomm\xE9s (EMH, profils, frottements...) ne peuvent pas porter le m\xEAme nom.
*/
private List<InfosEMH> listeInfosEMH_;
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheBarrageFilEau.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheBarrageFilEau.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheBarrageFilEau.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -12,4 +12,9 @@
*/
public class EMHBrancheBarrageFilEau extends CatEMHBranche{
+ public EMHBrancheBarrageFilEau(String nom) {
+ super(nom);
+ // TODO Auto-generated constructor stub
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheBarrageGenerique.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheBarrageGenerique.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheBarrageGenerique.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -7,4 +7,9 @@
*/
public class EMHBrancheBarrageGenerique extends CatEMHBranche{
+ public EMHBrancheBarrageGenerique(String nom) {
+ super(nom);
+ // TODO Auto-generated constructor stub
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheBarrageRhone.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheBarrageRhone.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheBarrageRhone.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -6,4 +6,9 @@
*/
public class EMHBrancheBarrageRhone extends CatEMHBranche{
+ public EMHBrancheBarrageRhone(String nom) {
+ super(nom);
+ // TODO Auto-generated constructor stub
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheEnchainement.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheEnchainement.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheEnchainement.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -11,4 +11,9 @@
*/
public class EMHBrancheEnchainement extends CatEMHBranche{
+ public EMHBrancheEnchainement(String nom) {
+ super(nom);
+ // TODO Auto-generated constructor stub
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheNiveauxAssocies.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheNiveauxAssocies.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheNiveauxAssocies.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -7,4 +7,9 @@
*/
public class EMHBrancheNiveauxAssocies extends CatEMHBranche{
+ public EMHBrancheNiveauxAssocies(String nom) {
+ super(nom);
+ // TODO Auto-generated constructor stub
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheOrifice.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheOrifice.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheOrifice.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -8,4 +8,9 @@
*/
public class EMHBrancheOrifice extends CatEMHBranche {
+ public EMHBrancheOrifice(String nom) {
+ super(nom);
+ // TODO Auto-generated constructor stub
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBranchePdc.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBranchePdc.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBranchePdc.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -6,4 +6,9 @@
*/
public class EMHBranchePdc extends CatEMHBranche {
+ public EMHBranchePdc(String nom) {
+ super(nom);
+ // TODO Auto-generated constructor stub
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheSaintVenant.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheSaintVenant.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheSaintVenant.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -9,4 +9,9 @@
*/
public class EMHBrancheSaintVenant extends CatEMHBranche{
+ public EMHBrancheSaintVenant(String nom) {
+ super(nom);
+ // TODO Auto-generated constructor stub
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheSeuilLongitudinale.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheSeuilLongitudinale.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheSeuilLongitudinale.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -7,4 +7,9 @@
*/
public class EMHBrancheSeuilLongitudinale extends CatEMHBranche{
+ public EMHBrancheSeuilLongitudinale(String nom) {
+ super(nom);
+ // TODO Auto-generated constructor stub
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheSeuilTransversal.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheSeuilTransversal.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheSeuilTransversal.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -7,4 +7,9 @@
*/
public class EMHBrancheSeuilTransversal extends CatEMHBranche {
+ public EMHBrancheSeuilTransversal(String nom) {
+ super(nom);
+ // TODO Auto-generated constructor stub
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheStrickler.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheStrickler.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheStrickler.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -7,4 +7,9 @@
*/
public class EMHBrancheStrickler extends CatEMHBranche{
+ public EMHBrancheStrickler(String nom) {
+ super(nom);
+ // TODO Auto-generated constructor stub
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHCasierMNT.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHCasierMNT.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHCasierMNT.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -2,43 +2,39 @@
/**
- *Casier dont la g\xE9om\xE9trie est d\xE9finie
- *par des points de MNT et une fronti\xE8re
+ * Casier dont la g\xE9om\xE9trie est d\xE9finie
+ * par des points de MNT et une fronti\xE8re
* @author Adrien Hadoux
*
*/
public class EMHCasierMNT extends CatEMHCasier {
private int id_;
- private String nom_;
private double cotelInitiale_;
private int numero_;
-
-
-
-
+
+
+ public EMHCasierMNT(String nom){
+ super(nom);
+ }
+
public EMHCasierMNT(int id, String nom, double cotelInitiale, int numero) {
- super();
+ super(nom);
this.id_ = id;
- this.nom_ = nom;
+
this.cotelInitiale_ = cotelInitiale;
this.numero_ = numero;
}
-
+
public int getId() {
return id_;
}
-
+
public void setId(int id) {
this.id_ = id;
}
- public String getNom() {
- return nom_;
- }
- public void setNom(String nom) {
- this.nom_ = nom;
- }
+
public double getCotelInitiale() {
return cotelInitiale_;
}
@@ -51,6 +47,6 @@
public void setNumero(int numero) {
this.numero_ = numero;
}
-
-
+
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHCasierProfil.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHCasierProfil.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHCasierProfil.java 2009-03-03 19:21:31 UTC (rev 4506)
@@ -8,6 +8,11 @@
*/
public class EMHCasierProfil extends CatEMHCasier{
+ public EMHCasierProfil(String nom) {
+ super(nom);
+ // TODO Auto-generated constructor stub
+ }
+
String nomProfil_;
public String getNomProfil() {
Modified: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHNoeudNiveauContinu.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHNoeudNiveauContinu.java 2009-02-27 20:10:26 UTC (rev 4505)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHNoeudNiveauCon...
[truncated message content] |
