Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4505] branches/Prepro-0.92-SNAPSHOT/Fudaa-crue
|
From: <had...@us...> - 2009-02-27 20:10:30
|
Revision: 4505
http://fudaa.svn.sourceforge.net/fudaa/?rev=4505&view=rev
Author: hadouxad
Date: 2009-02-27 20:10:26 +0000 (Fri, 27 Feb 2009)
Log Message:
-----------
* ?\195?\169criture compl?\195?\168te des donn?\195?\169es EMH (classes et interface): attention, ton fichier power amc est obsol?\195?\168te
* ?\195?\169criture des attributs selon les donn?\195?\169es des fichiers (d?\195?\169crits dans le dictionnaire donn?\195?\169e) et rapport entre classe et fichier sur le mod?\195?\168le power amc.
* Mise en place du syst?\195?\168me dao de persistance xml des donn?\195?\169es m?\195?\169tier:
o CrueDaoParsing<T> : c'est une classe template qui accueille une structure m?\195?\169tier et la remplit/?\195?\169crit au format xml appropri?\195?\169.
o DaoStructuresFormatDRSO : accueille toutes les structures interm?\195?\169diaires , les alias et les converter du parser pour g?\195?\169rer les donn?\195?\169es sous le m?\195?\170me format
o CrueDaoFillInfos: remplit les informations persistantes ?\195?\160 partier des donn?\195?\169es m?\195?\169tier et inversement
Modified Paths:
--------------
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/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/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/writer/Crue10writer.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/fudaa/crue/projet/CrueScenario.java
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/.settings/
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/CrueDaoOPTG.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/DonCalcSansPrt.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBarrageFilEau.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheOrifice.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBranchePDC.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSaintVenant.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSeuilLateral.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSeuilTransversal.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtSection.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonClimM.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/DonGeoLoc.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBranche.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBranchePdc.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitNoeud.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitSection.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtClInit.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeo.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoBrancheSaintVenant.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoCasierProfil.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoSectionIdem.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtSectionProfil.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/EMHBrancheSeuilLongitudinale.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/ElemOrifice.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/ElemSeuil.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/ElemSeuilAvecPdc.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/Evolution.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/InfosEMH.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/LigneForce.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/LimAxeHydraulique.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/LitNomme.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/LitNumerote.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/Loi.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/ProfilCasier.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/PtProfil.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/ResCalcul.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtClinit.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeo.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeoCasier.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeoSection.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtReseau.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/metier/emh/VariableOrdonnee.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/ZDeYprim.java
Removed Paths:
-------------
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/Branche.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CaractEMH.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/Casier.java
branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHBrancheSeuilLateral.java
Added: 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 (rev 0)
+++ 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)
@@ -0,0 +1,84 @@
+package main.java.org.fudaa.dodico.crue.dao;
+
+import java.awt.font.MultipleMaster;
+import java.util.List;
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.SingleValueConverter;
+import com.thoughtworks.xstream.io.xml.DomDriver;
+import main.java.org.fudaa.dodico.crue.metier.emh.EMH;
+
+/**
+ * Classe persistante qui reprend la meme structure que le fichier xml
+ * DRSO - Fichier des donn\xE9es du r\xE9seau (xml)
+ * @author Adrien Hadoux
+ *
+ */
+public class CrueDaoDRSO extends CrueDaoParsing<List<EMH>>{
+
+ //-- variables qui correspondent \xE0 celle du fichier xml --//
+ public String VersionCrue="10";
+ public String Commentaire="G\xE9n\xE9r\xE9 par Fudaa ";
+
+ /**
+ * la liste des noeuds
+ */
+ private List Noeuds;
+ /**
+ * la liste des branches
+ */
+ private List Branches;
+
+ /**
+ * la liste des casiers
+ */
+ private List Casiers;
+
+
+ /**
+ * la liste des sections
+ */
+ private List Sections;
+
+ @Override
+ public XStream initXmlParser(){
+ XStream xstream = new XStream(new DomDriver());
+ //-- initialisation du format de la structure des documents --//
+ (new DaoStructuresFormatDRSO()).initXmlParserForDRSO(xstream);
+ return xstream;
+ }
+
+ @Override
+ public void fillInfosWith(List<EMH> data) {
+
+ //-- etape 1: on remplit les infso des noeuds --//
+ Noeuds=CrueDaoFillInfos.remplirPersistanceAvecNoeudDRSO(data);
+
+ //-- etape 2: on remplit les infso des branches --//
+ Branches=CrueDaoFillInfos.remplirPersistanceAvecBrancheDRSO(data);
+
+
+ //-- etape 3: on remplit les infso des casiers --//
+ Casiers=CrueDaoFillInfos.remplirPersistanceAvecCasierDRSO(data);
+
+
+ //-- etape 4: on remplit les infso des sections --//
+ Sections=CrueDaoFillInfos.remplirPersistanceAvecSectionsDRSO(data);
+
+
+
+
+ }
+
+ @Override
+ public List<EMH> fillInfosWithPersistant() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+
+
+
+
+
+}
Added: 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 (rev 0)
+++ 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)
@@ -0,0 +1,212 @@
+package main.java.org.fudaa.dodico.crue.dao;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.lowagie.text.Section;
+
+import main.java.org.fudaa.dodico.crue.dao.DaoStructuresFormatDRSO.*;
+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.EMH;
+import main.java.org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageFilEau;
+import main.java.org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageGenerique;
+import main.java.org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageRhone;
+import main.java.org.fudaa.dodico.crue.metier.emh.EMHBrancheEnchainement;
+import main.java.org.fudaa.dodico.crue.metier.emh.EMHBrancheNiveauxAssocies;
+import main.java.org.fudaa.dodico.crue.metier.emh.EMHBrancheOrifice;
+import main.java.org.fudaa.dodico.crue.metier.emh.EMHBranchePdc;
+import main.java.org.fudaa.dodico.crue.metier.emh.EMHBrancheSaintVenant;
+import main.java.org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilLongitudinale;
+import main.java.org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilTransversal;
+import main.java.org.fudaa.dodico.crue.metier.emh.EMHBrancheStrickler;
+import main.java.org.fudaa.dodico.crue.metier.emh.EMHCasierMNT;
+import main.java.org.fudaa.dodico.crue.metier.emh.EMHCasierProfil;
+import main.java.org.fudaa.dodico.crue.metier.emh.EMHSectionIdem;
+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;
+
+/**
+ * Classe qui se charge de remplir les structures DAO avec els donn\xE9es m\xE9tier.
+ * @author Adrien Hadoux
+ *
+ */
+public class CrueDaoFillInfos {
+
+ /**
+ * Methode qui remplit une arrayList d'objets persistants qui constituent la premiere partie du fichier DRSO: les Noeuds.
+ * @param data
+ * @return
+ */
+ public static List remplirPersistanceAvecNoeudDRSO(List<EMH> data){
+ List listePersistante=new ArrayList();
+ for(EMH emh:data ){
+ if(emh instanceof CatEMHNoeud){
+ CatEMHNoeud noeud=(CatEMHNoeud) emh;
+ NoeudNiveauContinu noeudPersist=new NoeudNiveauContinu();
+ noeudPersist.Nom=noeud.getNom();
+ listePersistante.add(noeudPersist);
+ }
+ }
+ return listePersistante;
+ }
+
+ /**
+ * Methode qui remplit une arrayList d'objets persistants qui constituent la deuxieme partie du fichier DRSO: les Branches.
+ * @param data
+ * @return
+ */
+ public static List remplirPersistanceAvecBrancheDRSO(List<EMH> data){
+ List listePersistante=new ArrayList();
+ for(EMH emh:data ){
+ if(emh instanceof CatEMHBranche){
+ CatEMHBranche branche=(CatEMHBranche) emh;
+ Object 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) {
+ EMHBrancheBarrageRhone new_name = (EMHBrancheBarrageRhone) branche;
+ branchePersist=new BrancheBarrageRhone();
+ }else if (branche instanceof EMHBrancheEnchainement) {
+ EMHBrancheEnchainement new_name = (EMHBrancheEnchainement) branche;
+ branchePersist=new BrancheEnchainement();
+ }else if (branche instanceof EMHBrancheNiveauxAssocies) {
+ EMHBrancheNiveauxAssocies new_name = (EMHBrancheNiveauxAssocies) branche;
+ branchePersist=new BrancheNiveauxAssocies();
+ }else if (branche instanceof EMHBrancheOrifice) {
+ EMHBrancheOrifice new_name = (EMHBrancheOrifice) branche;
+ branchePersist=new BrancheOrifice();
+ }else if (branche instanceof EMHBranchePdc) {
+ EMHBranchePdc new_name = (EMHBranchePdc) branche;
+ branchePersist=new BranchePdc();
+ }else if (branche instanceof EMHBrancheSaintVenant) {
+ EMHBrancheSaintVenant new_name = (EMHBrancheSaintVenant) branche;
+ branchePersist=new BrancheSaintVenant();
+ }else if (branche instanceof EMHBrancheSeuilLongitudinale) {
+ EMHBrancheSeuilLongitudinale new_name = (EMHBrancheSeuilLongitudinale) branche;
+ branchePersist=new BrancheSeuilLateral();
+ }else if (branche instanceof EMHBrancheSeuilTransversal) {
+ EMHBrancheSeuilTransversal new_name = (EMHBrancheSeuilTransversal) branche;
+ branchePersist=new BrancheSeuilTransversal();
+ }else if (branche instanceof EMHBrancheStrickler) {
+ EMHBrancheStrickler new_name = (EMHBrancheStrickler) branche;
+ branchePersist=new BrancheStrickler();
+ }
+
+
+
+ if(branchePersist!=null){
+ //-- commun --//
+ BrancheAbstract br=(BrancheAbstract) branchePersist;
+ br.Active=branche.isActive();
+ br.Nom=branche.getNom();
+ if(branche.getNoeudAmont()!=null)
+ br.NdAm=new NdAm(branche.getNoeudAmont().getNom());
+ if(branche.getNoeudAval()!=null)
+ br.NdAv=new NdAm(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 remplirPersistanceAvecCasierDRSO(List<EMH> data){
+ List listePersistante=new ArrayList();
+ for(EMH emh:data ){
+ if(emh instanceof CatEMHCasier){
+ CatEMHCasier casier=(CatEMHCasier)emh;
+ CasierAbstract casierPersist=null;
+ if(casier instanceof EMHCasierMNT){
+ casierPersist=new CasierMNT();
+ }else if(casier instanceof EMHCasierProfil){
+ casierPersist= new CasierProfil();
+ EMHCasierProfil casierProfil=(EMHCasierProfil) casier;
+
+ ((CasierProfil)casierPersist).Profil= new ReferenceProfil();
+ ((CasierProfil)casierPersist).Profil.NomRef=casierProfil.getNomProfil();
+ }
+ //-- commun --//
+ if(casierPersist!=null){
+ casierPersist.Active=casier.isActive();
+ if(casier.getNoeud()!=null)
+ casierPersist.Noeud=new ReferenceNoeud(casier.getNoeud().getNom());
+ casierPersist.Nom=casier.getNom();
+ listePersistante.add(casierPersist);
+ }
+
+
+ }
+ }
+
+ return listePersistante;
+ }
+
+
+ /**
+ * Remplit les don\xE9nes persistantes avec la liste des sections .
+ * @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;
+ SectionBrancheAbstract sectionPersist=null;
+ if(section instanceof EMHSectionIdem){
+ sectionPersist=new SectionIdem();
+ }else
+ if(section instanceof EMHSectionInterpolee){
+ sectionPersist=new SectionInterpolee();
+ }
+ else
+ if(section instanceof EMHSectionProfil){
+ sectionPersist=new SectionProfil();
+ }
+ else
+ if(section instanceof EMHSectionSansGeometrie){
+ sectionPersist=new SectionSansGeometrie();
+ }
+
+ //-- commun --//
+ if(sectionPersist!=null){
+ sectionPersist.NomRef=section.getNom();
+ sectionPersist.Pos=section.getPosition();
+ sectionPersist.Xp=section.getXp();
+
+ listePersistante.add(sectionPersist);
+ }
+
+ }
+
+
+ }
+
+ return listePersistante;
+ }
+
+
+ /**
+ * Remplit les don\xE9nes persistantes avec la liste des sections d'une branche.
+ * @param data
+ * @return
+ */
+ public static List remplirPersistanceAvecSectionsBrancheDRSO(List<CatEMHSection> data){
+ return null;
+ }
+
+}
Added: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoOPTG.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoOPTG.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoOPTG.java 2009-02-27 20:10:26 UTC (rev 4505)
@@ -0,0 +1,75 @@
+package main.java.org.fudaa.dodico.crue.dao;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+
+import main.java.org.fudaa.dodico.crue.metier.emh.ElemSeuil;
+
+import org.fudaa.ebli.courbe.EGAxeHorizontalPersist;
+import org.fudaa.ebli.courbe.EGAxeVerticalPersist;
+import org.fudaa.ebli.courbe.EGCourbePersist;
+import org.fudaa.ebli.courbe.EGGroupPersist;
+
+import com.memoire.fu.FuLog;
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.DomDriver;
+
+/**
+ * Classe persistante qui reprend la meme structure que le fichier xml
+ * OPTG - Fichier des ordres pour le pr\xE9traitement g\xE9om\xE9trique (xml).
+ *
+ * Cela permettra de persister plus facilement la donn\xE9e via xstream
+ * @author Adrien Hadoux
+ *
+ */
+public class CrueDaoOPTG extends CrueDaoParsing<ElemSeuil>{
+
+ String VersionCrue;
+ String Commentaire;
+ double RegleProfPlat;
+ double ReglePenteRupture;
+ double RegleDecal;
+ double RegleLargSeuil;
+ double ReglePdxMax;
+ double RegleVarPdxMax;
+ double ReglePenteMax;
+
+ /**
+ * Prend en parametre un objet m\xE9tier correspondant:
+ */
+ public CrueDaoOPTG(ElemSeuil element){
+ //-- appel a fillInfosWith --//
+ fillInfosWith(element);
+ }
+
+
+ public XStream initXmlParser(){
+ XStream xstream = new XStream(new DomDriver());
+ //-- creation des alias pour que ce soit + parlant dans le xml file --//
+ xstream.alias("OPTG", CrueDaoOPTG.class);
+ return xstream;
+ }
+
+
+
+ public void fillInfosWith(ElemSeuil data) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public ElemSeuil fillInfosWithPersistant() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+
+
+
+
+
+
+
+}
Added: 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 (rev 0)
+++ 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)
@@ -0,0 +1,110 @@
+package main.java.org.fudaa.dodico.crue.dao;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+import main.java.org.fudaa.dodico.crue.metier.emh.ElemSeuil;
+
+import com.memoire.fu.FuLog;
+import com.thoughtworks.xstream.XStream;
+
+/**
+ * classe dao parsing qui propose et impose les m\xE9thode utiles pour simplifier le parsing xml des donn\xE9es.
+ * utilise le template T qui repr\xE9sente la classe \xE0 persister.
+ * @author Adrien Hadoux
+ *
+ */
+public abstract class CrueDaoParsing<T> {
+
+
+ /**
+ * Initiazlise le parser xstream avec les bons alias des noms de balises.
+ * @return
+ */
+ abstract XStream initXmlParser();
+
+ /**
+ * Remplit les infos de la classe persistantesq avec les donn\xE9es m\xE9tier appropri\xE9es.
+ * Cette m\xE9thode est appel\xE9e dans le constructeur.
+ * @param data
+ */
+ abstract void fillInfosWith(T data);
+
+ /**
+ * Cr\xE9e une structure m\xE9tier \xE0 partir des informations persistantes.
+ * Utiliser poru le remplissage de la structure m\xE9tier apr\xE8s lecture du fichier xml.
+ * @return
+ */
+ abstract T fillInfosWithPersistant();
+
+ /**
+ * Execute la persistance des donn\xE9es dans le fichier donn\xE9 en parametre.
+ * @return
+ */
+ public boolean persistData(File fichier) {
+ boolean isOk=true;
+ ObjectOutputStream out=null;
+ try {
+ out = initXmlParser().createObjectOutputStream(new FileWriter(fichier));
+ //--on enregistre la donn\xE9e au bon format --//
+ out.writeObject(this);
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ FuLog.debug(e.getMessage());
+ isOk=false;
+ }
+ finally{
+ try {
+ out.close();
+ return isOk;
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ FuLog.debug(e.getMessage());
+ }
+ }
+ return false;
+ }
+
+ /**
+ * R\xE9cup\xE8re la donn\xE9e m\xE9tier a partir de la donn\xE9e persistante.
+ * @param fichier
+ * @return
+ */
+ public T getPersistData(File fichier){
+ //-- la data a r\xE9cup\xE9rer --//
+ T newData=null;
+ boolean isOk=true;
+ ObjectInputStream in=null;
+ try {
+ in = initXmlParser().createObjectInputStream(new FileReader(fichier));
+ //--on charge la donn\xE9e persistante au bon format --//
+ CrueDaoParsing<T> dataPersistante=(CrueDaoParsing<T>) in.readObject();
+
+ //-- on genere la donn\xE9es m\xE9tier a partir de la donnee persistante--//
+ newData=dataPersistante.fillInfosWithPersistant();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ FuLog.debug(e.getMessage());
+ isOk=false;
+ } catch (ClassNotFoundException e) {
+ // TODO Auto-generated catch block
+ FuLog.debug(e.getMessage());
+ isOk=false;
+ }
+ finally{
+ try {
+ in.close();
+ return newData;
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ FuLog.debug(e.getMessage());
+ }
+ }
+ return null;
+ }
+
+}
Added: 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 (rev 0)
+++ 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)
@@ -0,0 +1,474 @@
+package main.java.org.fudaa.dodico.crue.dao;
+
+
+
+import java.util.List;
+
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.SingleValueConverter;
+import com.thoughtworks.xstream.io.xml.DomDriver;
+
+
+/**
+ * Toutes les structures dao utilis\xE9es et les inits du parser xml pour le format DRSO.
+ * Toutes ces structures sont n\xE9cessaires pour bien formatter le contenu xml.
+ * @author Adrien Hadoux
+ *
+ */
+public class DaoStructuresFormatDRSO {
+
+
+ /**
+ * init le parser xml avec toutes les converters et alias n\xE9cessaires
+ * @return
+ */
+ public void initXmlParserForDRSO(XStream xstream ){
+ //-- creation des alias pour que ce soit + parlant dans le xml file --//
+ xstream.alias("DRSO", CrueDaoDRSO.class);
+ //-- liste des initialisations n\xE9cessaires pour le formattage des donn\xE9es--//
+ initXmlParserNode(xstream);
+ initXmlParserBranche(xstream);
+ initXmlParserCasier(xstream);
+ initXmlParserSection(xstream);
+
+
+
+
+ }
+
+ /**
+ * init parser pour les nodes et pouvoir mettre l'attribut Nom en d\xE9but de balise.
+ * @param xstream
+ */
+ public void initXmlParserNode(XStream xstream ){
+ //-- alias gestion pour les noeuds --//
+ xstream.alias("NoeudNiveauContinu", NoeudNiveauContinu.class);
+ //-- mettre attribut Nom comme attribut de la balise Noeud et son converter appropri\xE9 --//
+ //-- creation des alias pour que ce soit + parlant dans le xml file --//
+ xstream.useAttributeFor(NoeudNiveauContinu.class, "Nom");
+ xstream.registerConverter(new NoeudNiveauContinuConverter());
+ }
+
+ /**
+ * Init le parser avec les infos des branches.
+ * @param xstream
+ */
+ public void initXmlParserBranche(XStream xstream ){
+ //-- gestion des branches --//
+ xstream.alias("BrancheSaintVenant", BrancheSaintVenant.class);
+ xstream.alias("BrancheSeuilLateral", BrancheSeuilLateral.class);
+ xstream.alias("BrancheStrickler", BrancheStrickler.class);
+ xstream.alias("BrancheOrifice", BrancheOrifice.class);
+ xstream.alias("BrancheSeuilTransversal", BrancheSeuilTransversal.class);
+ xstream.alias("BrancheBarrageFilEau", BrancheBarrageFilEau.class);
+ xstream.alias("BranchePdc", BranchePdc.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.registerConverter(new BrancheSaintVenantConverter());
+
+ xstream.useAttributeFor(BrancheSeuilLateral.class, "Nom");
+ xstream.registerConverter(new BrancheSeuilLateralConverter());
+
+ xstream.useAttributeFor(BrancheStrickler.class, "Nom");
+ xstream.registerConverter(new BrancheStricklerConverter());
+
+ xstream.useAttributeFor(BrancheOrifice.class, "Nom");
+ xstream.registerConverter(new BrancheOrificeConverter());
+
+ xstream.useAttributeFor(BrancheSeuilTransversal.class, "Nom");
+ xstream.registerConverter(new BrancheSeuilTransversalConverter());
+
+ xstream.useAttributeFor(BrancheBarrageFilEau.class, "Nom");
+ xstream.registerConverter(new BrancheBarrageFilEauConverter());
+
+ xstream.useAttributeFor(BranchePdc.class, "Nom");
+ xstream.registerConverter(new BranchePdcConverter());
+
+ xstream.useAttributeFor(BrancheBarrageGenerique.class, "Nom");
+ xstream.registerConverter(new BrancheBarrageGeneriqueConverter());
+
+ xstream.useAttributeFor(BrancheBarrageRhone.class, "Nom");
+ xstream.registerConverter(new BrancheBarrageRhoneConverter());
+
+ xstream.useAttributeFor(BrancheEnchainement.class, "Nom");
+ xstream.registerConverter(new BrancheEnchainementConverter());
+
+ 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");
+ xstream.registerConverter(new NdAvConverter());
+
+
+
+ }
+
+ /**
+ * Init le parser avec les infos des casiers.
+ * @param xstream
+ */
+ public void initXmlParserCasier(XStream xstream ){
+ xstream.alias("CasierProfil", CasierProfil.class);
+ xstream.alias("CasierMNT", CasierMNT.class);
+ xstream.alias("Profil",ReferenceProfil.class);
+ xstream.alias("Noeud", ReferenceNoeud.class);
+
+ xstream.useAttributeFor(CasierProfil.class, "Nom");
+ xstream.registerConverter(new CasierProfilConverter());
+
+ xstream.useAttributeFor(CasierMNT.class, "Nom");
+ xstream.registerConverter(new CasierMNTConverter());
+
+ xstream.useAttributeFor(ReferenceProfil.class, "NomRef");
+ xstream.registerConverter(new ReferenceProfilConverter());
+
+
+ //-- alias et converter du noeud referenc\xE9 --//
+ xstream.useAttributeFor(ReferenceNoeud.class, "NomRef");
+ xstream.registerConverter(new ReferenceNoeudConverter());
+
+ }
+
+ /**
+ * Init le parser avec les infos des sections.
+ * @param xstream
+ */
+ public void initXmlParserSection(XStream xstream ){
+ //-- 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.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.useAttributeFor(SectionPilote.class, "NomRef");
+ xstream.registerConverter(new SectionPiloteConverter());
+ }
+
+
+ /**
+ * Element possible qui soit persist\xE9 dans la liste de noeuds
+ */
+ public static class NoeudNiveauContinu{
+ public String Nom;
+ }
+
+ /**
+ * Il faut cr\xE9er et ajouter ce converter pour inclure le nom du noeud niveau continu dans le fichier xml
+ */
+ public class NoeudNiveauContinuConverter implements SingleValueConverter {
+ public String toString(Object obj) {
+ return ((NoeudNiveauContinu) obj).Nom;
+ }
+ public Object fromString(String name) {
+ NoeudNiveauContinu n=new NoeudNiveauContinu();
+ n.Nom=name;
+ return n;
+ }
+ public boolean canConvert(Class type) {
+ return type.equals(NoeudNiveauContinu.class);
+ }
+ }
+
+ //*************************GESTION DES BRANCHES *************************
+
+ /**
+ * Element branche possible
+ * @author Adrien Hadoux
+ *
+ */
+ public static class BrancheAbstract{
+ public String Nom;
+ public boolean Active;
+ public ReferenceNoeud NdAm;
+ public ReferenceNoeud NdAv;
+ List Sections;
+ }
+
+
+ public static class BrancheSaintVenant extends BrancheAbstract{}
+ public static class BrancheSeuilLateral extends BrancheAbstract{}
+ public static class BrancheStrickler extends BrancheAbstract{}
+ public static class BrancheOrifice extends BrancheAbstract{}
+ public static class BrancheSeuilTransversal extends BrancheAbstract{}
+ public static class BrancheBarrageFilEau extends BrancheAbstract{}
+ public static class BranchePdc extends BrancheAbstract{}
+
+ public static class BrancheBarrageGenerique extends BrancheAbstract{}
+ public static class BrancheBarrageRhone extends BrancheAbstract{}
+ public static class BrancheEnchainement extends BrancheAbstract{}
+ public static class BrancheNiveauxAssocies extends BrancheAbstract{}
+ /**
+ * le converter abstract pour les branches.
+ * Il faudra ensuite en d\xE9clarer un pour chaque type de branche afin de cr\xE9er le bon type de modele.
+ * @author Adrien Hadoux
+ *
+ */
+ public abstract class BrancheConverter implements SingleValueConverter {
+ public String toString(Object obj) {
+ return ((BrancheAbstract) obj).Nom;
+ }
+ public abstract Object fromString(String name);
+ public boolean canConvert(Class type) {
+ return type.isInstance(BrancheAbstract.class);
+ }}
+
+
+
+
+ public class BrancheSaintVenantConverter extends BrancheConverter {
+ public Object fromString(String name) {
+ BrancheSaintVenant branche=new BrancheSaintVenant();
+ branche.Nom=name;
+ return branche;}}
+ public class BrancheSeuilLateralConverter extends BrancheConverter {
+ public Object fromString(String name) {
+ BrancheSeuilLateral branche=new BrancheSeuilLateral();
+ branche.Nom=name;
+ return branche;}}
+
+ public class BrancheStricklerConverter extends BrancheConverter {
+ public Object fromString(String name) {
+ BrancheStrickler branche=new BrancheStrickler();
+ branche.Nom=name;
+ return branche;}}
+
+ public class BrancheOrificeConverter extends BrancheConverter {
+ public Object fromString(String name) {
+ BrancheOrifice branche=new BrancheOrifice();
+ branche.Nom=name;
+ return branche;}}
+
+ public class BrancheSeuilTransversalConverter extends BrancheConverter {
+ public Object fromString(String name) {
+ BrancheSeuilTransversal branche=new BrancheSeuilTransversal();
+ branche.Nom=name;
+ return branche;}}
+
+ public class BrancheBarrageFilEauConverter extends BrancheConverter {
+ public Object fromString(String name) {
+ BrancheBarrageFilEau branche=new BrancheBarrageFilEau();
+ branche.Nom=name;
+ return branche;}}
+
+ public class BranchePdcConverter extends BrancheConverter {
+ public Object fromString(String name) {
+ BranchePdc branche=new BranchePdc();
+ branche.Nom=name;
+ return branche;}}
+
+ public class BrancheBarrageGeneriqueConverter extends BrancheConverter {
+ public Object fromString(String name) {
+ BrancheBarrageGenerique branche=new BrancheBarrageGenerique();
+ branche.Nom=name;
+ return branche;}}
+
+ public class BrancheBarrageRhoneConverter extends BrancheConverter {
+ public Object fromString(String name) {
+ BrancheBarrageRhone branche=new BrancheBarrageRhone();
+ branche.Nom=name;
+ return branche;}}
+
+ public class BrancheEnchainementConverter extends BrancheConverter {
+ public Object fromString(String name) {
+ BrancheEnchainement branche=new BrancheEnchainement();
+ branche.Nom=name;
+ return branche;}}
+
+ public class BrancheNiveauxAssociesConverter extends BrancheConverter {
+ public Object fromString(String name) {
+ BrancheNiveauxAssocies branche=new BrancheNiveauxAssocies();
+ branche.Nom=name;
+ return branche;}}
+
+
+ public static class ReferenceNoeud{
+ public String NomRef;
+
+ public ReferenceNoeud(String nomRef) {
+ NomRef = nomRef;
+ }
+
+ }
+
+ public static class NdAm extends ReferenceNoeud{
+
+ public NdAm(String nomRef) {
+ super(nomRef);
+ // TODO Auto-generated constructor stub
+ }}
+ 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) {
+ return ((ReferenceNoeud) obj).NomRef;
+ }
+ public Object fromString(String name) {
+ ReferenceNoeud n=new ReferenceNoeud(name);
+
+ return n; }
+ 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; }}
+ //-- gestion des sections --//
+ /**
+ * Elementsection qui se trouve dans branche,
+ * dispose d'une reference positionnee dans la balise de d\xE9but.
+ * @author Adrien Hadoux
+ * Pos: position.
+ *
+ */
+ public static class SectionBrancheAbstract{
+ public String NomRef;
+ public String Pos;
+ public double Xp;
+
+ }
+ public static class SectionIdem extends SectionBrancheAbstract{}
+ public static class SectionInterpolee extends SectionBrancheAbstract{}
+ public static class SectionProfil extends SectionBrancheAbstract{}
+ public static class SectionSansGeometrie extends SectionBrancheAbstract{}
+ public static class SectionPilote extends SectionBrancheAbstract{}
+ /**
+ * le converter abstract pour les sections dans branche.
+ * Il faudra ensuite en d\xE9clarer un pour chaque type de section afin de cr\xE9er le bon type de modele.
+ * @author Adrien Hadoux
+ *
+ */
+ public abstract class SectionBrancheConverter implements SingleValueConverter {
+ public String toString(Object obj) {
+ return ((SectionBrancheAbstract) obj).NomRef;
+ }
+ public abstract Object fromString(String name);
+ public boolean canConvert(Class type) {
+ return type.isInstance(SectionBrancheAbstract.class);
+ }}
+ public class SectionIdemConverter extends SectionBrancheConverter{
+ public Object fromString(String name) {
+ SectionIdem section=new SectionIdem();
+ section.NomRef=name;
+ return section;}}
+
+ public class SectionInterpoleeConverter extends SectionBrancheConverter{
+ public Object fromString(String name) {
+ SectionInterpolee section=new SectionInterpolee();
+ section.NomRef=name;
+ return section;}}
+
+ public class SectionProfilConverter extends SectionBrancheConverter{
+ public Object fromString(String name) {
+ SectionProfil section=new SectionProfil();
+ section.NomRef=name;
+ return section;}}
+
+ public class SectionSansGeometrieConverter extends SectionBrancheConverter{
+ public Object fromString(String name) {
+ SectionSansGeometrie section=new SectionSansGeometrie();
+ section.NomRef=name;
+ return section;}}
+
+ public class SectionPiloteConverter extends SectionBrancheConverter{
+ public Object fromString(String name) {
+ SectionPilote section=new SectionPilote();
+ section.NomRef=name;
+ return section;}}
+
+
+ //*************************GESTION DES CASIERS *************************
+ public static class CasierAbstract{
+ public String Nom;
+ public boolean Active;
+ public ReferenceNoeud Noeud;
+
+ }
+ /**
+ * la classe profil de casier inclus dans le CasierProfil.
+ * @author Adrien Hadoux
+ *
+ */
+ public static class ReferenceProfil {
+ public String NomRef;
+ }
+ public static class ReferenceProfilConverter implements SingleValueConverter {
+ public String toString(Object obj) {
+ return ((ReferenceProfil) obj).NomRef; }
+ public Object fromString(String name){
+ ReferenceProfil pf=new ReferenceProfil();
+ pf.NomRef=name;
+ return pf;
+ }
+ public boolean canConvert(Class type) {
+ return type.isInstance(ReferenceProfil.class);
+ }}
+
+ public static class CasierProfil extends CasierAbstract{
+ public ReferenceProfil Profil;
+ }
+ public static class CasierMNT extends CasierAbstract{}
+
+ public abstract class CasierAbstractConverter implements SingleValueConverter {
+ public String toString(Object obj) {
+ return ((CasierAbstract) obj).Nom; }
+ public abstract Object fromString(String name);
+ public boolean canConvert(Class type) {
+ return type.isInstance(CasierAbstract.class);
+ }}
+ public class CasierProfilConverter extends CasierAbstractConverter {
+ public Object fromString(String name){
+ CasierProfil casier=new CasierProfil();
+ casier.Nom=name;
+ return casier; } }
+
+ public class CasierMNTConverter extends CasierAbstractConverter {
+ public Object fromString(String name){
+ CasierMNT casier=new CasierMNT();
+ casier.Nom=name;
+ return casier; } }
+
+
+ //*************************GESTION DES SECTIONS *************************
+ public class ReferenceSection {
+ public String Nom;
+ }
+
+
+
+}
Deleted: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/Branche.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/Branche.java 2009-02-27 08:41:57 UTC (rev 4504)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/Branche.java 2009-02-27 20:10:26 UTC (rev 4505)
@@ -1,25 +0,0 @@
-package main.java.org.fudaa.dodico.crue.metier.emh;
-
-/**
- * Interface branche
- *
- * peut etre:
- *
- * EMHBranchePdc Branche 1: perte de charge singuli\xE8re
- * EMHBrancheSeuilTransversal Branche 2: seuil avec prise en compte de la charge dynamique
- * EMHBrancheSeuilLateral Branche 4: seuil sans prise en compte de la charge dynamique
- * EMHBrancheOrifice Branche 5: orifice, clapet, vanne
- * EMHBrancheStrickler Branche 6: loi d'\xE9coulement de Manning-Strickler
- * EMHBrancheBarrageGenerique Branche 14: ouvrage suivant une consigne fonction d'un d\xE9bit ailleurs, ou noy\xE9 (loi pt par pt)
- * EMHBrancheBarrageFilEau Branche 15: barrage suivant une consigne fonction d'un d\xE9bit ailleurs, ou noy\xE9 (De Marchi)
- * EMHBrancheSaintVenant Branche 20: loi d'\xE9coulement de Saint-Venant
- * EMHBrancheNiveauxAssocies Branche 12: vanne \xE0 niveaux associ\xE9s
- * EMHBrancheEnchainement Liaison entre n\x9Cuds appartenant \xE0 des mod\xE8les diff\xE9rents dans le but d'un encha\xEEnement
- *
- *
- * @author Adrien Hadoux
- *
- */
-public interface Branche {
-
-}
Deleted: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CaractEMH.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CaractEMH.java 2009-02-27 08:41:57 UTC (rev 4504)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CaractEMH.java 2009-02-27 20:10:26 UTC (rev 4505)
@@ -1,13 +0,0 @@
-package main.java.org.fudaa.dodico.crue.metier.emh;
-
-/**
- * Caract\xE9ristique EMH contenue dans EMH.
- * Cat\xE9gorie d'une Entit\xE9 de Mod\xE9lisation Hydraulique :
- * Branche, N\x9Cud, Section, Casier (les 4 cat\xE9gories d'EMH manipul\xE9es par le c\x9Cur de calcul) ou Ensemble (sc\xE9nario, mod\xE8le, sous-mod\xE8le, pour une vision utilisateur).
-
- * @author Adrien Hadoux
- *
- */
-public interface CaractEMH {
-
-}
Deleted: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/Casier.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/Casier.java 2009-02-27 08:41:57 UTC (rev 4504)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/Casier.java 2009-02-27 20:10:26 UTC (rev 4505)
@@ -1,5 +0,0 @@
-package main.java.org.fudaa.dodico.crue.metier.emh;
-
-public abstract class Casier implements CaractEMH{
-
-}
Copied: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java (from rev 4500, branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/Branche.java)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java (rev 0)
+++ 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)
@@ -0,0 +1,74 @@
+package main.java.org.fudaa.dodico.crue.metier.emh;
+
+import java.util.List;
+
+/**
+ * Interface branche
+ *
+ * peut etre:
+ *
+ * EMHBranchePdc Branche 1: perte de charge singuli\xE8re
+ * EMHBrancheSeuilTransversal Branche 2: seuil avec prise en compte de la charge dynamique
+ * EMHBrancheSeuilLateral Branche 4: seuil sans prise en compte de la charge dynamique
+ * EMHBrancheOrifice Branche 5: orifice, clapet, vanne
+ * EMHBrancheStrickler Branche 6: loi d'\xE9coulement de Manning-Strickler
+ * EMHBrancheBarrageGenerique Branche 14: ouvrage suivant une consigne fonction d'un d\xE9bit ailleurs, ou noy\xE9 (loi pt par pt)
+ * EMHBrancheBarrageFilEau Branche 15: barrage suivant une consigne fonction d'un d\xE9bit ailleurs, ou noy\xE9 (De Marchi)
+ * EMHBrancheSaintVenant Branche 20: loi d'\xE9coulement de Saint-Venant
+ * EMHBrancheNiveauxAssocies Branche 12: vanne \xE0 niveaux associ\xE9s
+ * EMHBrancheEnchainement Liaison entre n\x9Cuds appartenant \xE0 des mod\xE8les diff\xE9rents dans le but d'un encha\xEEnement
+ *
+ *
+ * @author Adrien Hadoux
+ *
+ */
+public class CatEMHBranche extends EMH{
+ private boolean isActive_;
+ private List<CatEMHSection> listeSections_;
+ private CatEMHNoeud noeudAmont_;
+ private CatEMHNoeud noeudAval_;
+ private String nom;
+
+
+
+ public List<CatEMHSection> getListeSections() {
+ return listeSections_;
+ }
+
+ public void setListeSections(List<CatEMHSection> listeSections) {
+ this.listeSections_ = listeSections;
+ }
+
+ public boolean isActive() {
+ return isActive_;
+ }
+
+ public void setActive(boolean isActive) {
+ this.isActive_ = isActive;
+ }
+
+ public CatEMHNoeud getNoeudAmont() {
+ return noeudAmont_;
+ }
+
+ public void setNoeudAmont(CatEMHNoeud noeudAmont) {
+ this.noeudAmont_ = noeudAmont;
+ }
+
+ public CatEMHNoeud getNoeudAval() {
+ return noeudAval_;
+ }
+
+ public void setNoeudAval(CatEMHNoeud noeudAval) {
+ this.noeudAval_ = noeudAval;
+ }
+
+ public String getNom() {
+ return nom;
+ }
+
+ public void setNom(String nom) {
+ this.nom = nom;
+ }
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java (from rev 4500, branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/Casier.java)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java (rev 0)
+++ 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)
@@ -0,0 +1,36 @@
+package main.java.org.fudaa.dodico.crue.metier.emh;
+/**
+ *
+ * @author Adrien Hadoux
+ *
+ */
+public abstract class CatEMHCasier extends EMH{
+private boolean isActive_;
+private CatEMHNoeud noeud_;
+private String nom_;
+
+
+public String getNom() {
+ return nom_;
+}
+
+public void setNom(String nom) {
+ this.nom_ = nom;
+}
+
+public boolean isActive() {
+ return isActive_;
+}
+
+public void setActive(boolean isActive) {
+ this.isActive_ = isActive;
+}
+
+public CatEMHNoeud getNoeud() {
+ return noeud_;
+}
+
+public void setNoeud(CatEMHNoeud noeud) {
+ this.noeud_ = noeud;
+}
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java
___________________________________________________________________
Added: svn:mergeinfo
+
Added: 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 (rev 0)
+++ 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)
@@ -0,0 +1,19 @@
+package main.java.org.fudaa.dodico.crue.metier.emh;
+
+/**
+ *
+ * @author Adrien Hadoux
+ *
+ */
+public class CatEMHNoeud extends EMH{
+ String nom_;
+
+ public String getNom() {
+ return nom_;
+ }
+
+ public void setNom(String nom) {
+ this.nom_ = nom;
+ }
+}
+
Added: 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 (rev 0)
+++ 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)
@@ -0,0 +1,32 @@
+package main.java.org.fudaa.dodico.crue.metier.emh;
+
+
+/**
+ * la classe section.
+ * @author Adrien Hadoux
+ *
+ */
+public class CatEMHSection extends EMH{
+ String position;
+ double xp;
+ String nom;
+
+ public String getNom() {
+ return nom;
+ }
+ public void setNom(String nom) {
+ this.nom = nom;
+ }
+ public String getPosition() {
+ return position;
+ }
+ public void setPosition(String position) {
+ this.position = position;
+ }
+ public double getXp() {
+ return xp;
+ }
+ public void setXp(double xp) {
+ this.xp = xp;
+ }
+}
Added: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrt.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrt.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrt.java 2009-02-27 20:10:26 UTC (rev 4505)
@@ -0,0 +1,9 @@
+package main.java.org.fudaa.dodico.crue.metier.emh;
+/**
+ *
+ * @author Adrien Hadoux
+ *
+ */
+public interface DonCalcSansPrt extends InfosEMH{
+
+}
Added: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBarrageFilEau.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBarrageFilEau.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBarrageFilEau.java 2009-02-27 20:10:26 UTC (rev 4505)
@@ -0,0 +1,42 @@
+package main.java.org.fudaa.dodico.crue.metier.emh;
+
+import java.util.List;
+
+/**
+ *
+ * @author Adrien Hadoux
+ *
+ */
+public class DonCalcSansPrtBarrageFilEau implements DonCalcSansPrt {
+
+ private double QLimInf;
+ private double QLimSup;
+ private Loi regimeDenove_Zam;
+ private List<ElemSeuil> listElt;
+
+ public List<ElemSeuil> getListElt() {
+ return listElt;
+ }
+ public void setListElt(List<ElemSeuil> listElt) {
+ this.listElt = listElt;
+ }
+ public double getQLimInf() {
+ return QLimInf;
+ }
+ public void setQLimInf(double limInf) {
+ QLimInf = limInf;
+ }
+ public double getQLimSup() {
+ return QLimSup;
+ }
+ public void setQLimSup(double limSup) {
+ QLimSup = limSup;
+ }
+ public Loi getRegimeDenove_Zam() {
+ return regimeDenove_Zam;
+ }
+ public void setRegimeDenove_Zam(Loi regimeDenove_Zam) {
+ this.regimeDenove_Zam = regimeDenove_Zam;
+ }
+
+}
Added: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheOrifice.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheOrifice.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheOrifice.java 2009-02-27 20:10:26 UTC (rev 4505)
@@ -0,0 +1,19 @@
+package main.java.org.fudaa.dodico.crue.metier.emh;
+/**
+ *
+ * @author Adrien Hadoux
+ *
+ */
+public class DonCalcSansPrtBrancheOrifice implements DonCalcSansPrt {
+ private ElemOrifice element;
+
+ public ElemOrifice getElement() {
+ return element;
+ }
+
+ public void setElement(ElemOrifice element) {
+ this.element = element;
+ }
+
+
+}
Added: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBranchePDC.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBranchePDC.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBranchePDC.java 2009-02-27 20:10:26 UTC (rev 4505)
@@ -0,0 +1,18 @@
+package main.java.org.fudaa.dodico.crue.metier.emh;
+/**
+ *
+ * @author Adrien Hadoux
+ *
+ */
+public class DonCalcSansPrtBranchePDC implements DonCalcSansPrt {
+ private Loi pdc_DZ;
+
+ public Loi getPdc_DZ() {
+ return pdc_DZ;
+ }
+
+ public void setPdc_DZ(Loi pdc_DZ) {
+ this.pdc_DZ = pdc_DZ;
+ }
+
+}
Added: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSaintVenant.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSaintVenant.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSaintVenant.java 2009-02-27 20:10:26 UTC (rev 4505)
@@ -0,0 +1,25 @@
+package main.java.org.fudaa.dodico.crue.metier.emh;
+/**
+ *
+ * @author Adrien Hadoux
+ *
+ */
+public class DonCalcSansPrtBrancheSaintVenant implements DonCalcSansPrt {
+private double coeffBeta;
+private double coeffRuisQdm;
+
+
+public double getCoeffBeta() {
+ return coeffBeta;
+}
+public void setCoeffBeta(double coeffBeta) {
+ this.coeffBeta = coeffBeta;
+}
+public double getCoeffRuisQdm() {
+ return coeffRuisQdm;
+}
+public void setCoeffRuisQdm(double coeffRuisQdm) {
+ this.coeffRuisQdm = coeffRuisQdm;
+}
+
+}
Added: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSeuilLateral.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSeuilLateral.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSeuilLateral.java 2009-02-27 20:10:26 UTC (rev 4505)
@@ -0,0 +1,29 @@
+package main.java.org.fudaa.dodico.crue.metier.emh;
+
+import java.util.List;
+
+/**
+ *
+ * @author Adrien Hadoux
+ *
+ */
+public class DonCalcSansPrtBrancheSeuilLateral implements DonCalcSansPrt{
+ String formulePdc;
+ List<ElemSeuilAvecPdc> listElt;
+ public List<ElemSeuilAvecPdc> getListElt() {
+ return listElt;
+ }
+
+ public void setListElt(List<ElemSeuilAvecPdc> listElt) {
+ this.listElt = listElt;
+ }
+
+ public String getFormulePdc() {
+ return formulePdc;
+ }
+
+ public void setFormulePdc(String formulePdc) {
+ this.formulePdc = formulePdc;
+ }
+
+}
Added: branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSeuilTransversal.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSeuilTransversal.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/Fudaa-crue/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSeuilTransversal.java 2009-02-27 20:10:26 UTC (rev 4505)
@@ -0,0 +1,29 @@
+package main.java.org.fudaa.dodico.crue.metier.emh;
+
+import java.util.List;
+
+/**
+ *
+ * @author Adrien Hadoux
+ *
+ */
+public class DonCalcSansPrtBrancheSeuilTransversal implements DonCalcSansPrt {
+String formulePdc;
+List<ElemSeuilAvecPdc> listElt;
+public List<ElemSeuilAvecPdc> getListElt() {
+ return listElt;
+}
+
+public void setListElt(List<ElemSeuilAvecPdc> listElt) {
+ this.listElt = listElt;
+}
+
+public String getFormulePdc() {
+ return formulePdc;
+}
+
+public void setFormulePdc(String formulePdc) {
+ this.formulePdc = formulePdc;
+}
+
+}
Added: branches/Prepro-0.92-SNAPSHOT/Fudaa-c...
[truncated message content] |
