Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4619] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2009-04-07 21:18:57
|
Revision: 4619
http://fudaa.svn.sourceforge.net/fudaa/?rev=4619&view=rev
Author: deniger
Date: 2009-04-07 21:18:54 +0000 (Tue, 07 Apr 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10writer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DCSPFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DFRTFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTGFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTIFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DRSOFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/OPTGFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalculPermanent.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalculTransitoire.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHSection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMBrancheOrifice.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMNoeudNiveauContinu.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheBarrageGenerique.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBranche.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBrancheSaintVenant.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EvolutionDF.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EvolutionFF.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Loi.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/LoiDF.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/LoiFF.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/PtEvolutionDF.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/PtEvolutionFF.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/StriRefC.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHBrancheHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHCasierHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHNoeudHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHSectionHelper.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/AppCrueTest.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/RemplissageData.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDCSPFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDFRTFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDPTGFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDPTIFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDRSOFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueETU.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueInterface.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueOPTGFile.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/test/AppCrueTest.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/resources/org/
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDRSO.xsd
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/IO/
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/ValidatorXml.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/dao/xsd/valideDRSO.xsd
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10reader.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -10,11 +10,9 @@
import org.fudaa.dodico.crue.dao.CrueDaoPersistDFRT;
import org.fudaa.dodico.crue.dao.CrueDaoPersistDPTG;
import org.fudaa.dodico.crue.dao.CrueDaoPersistDPTI;
-import org.fudaa.dodico.crue.dao.CrueDaoPersistDRSO;
-import org.fudaa.dodico.crue.dao.CrueDaoPersistETU;
import org.fudaa.dodico.crue.dao.CrueDaoPersistOPTG;
import org.fudaa.dodico.crue.dao.CrueDaoPersit;
-import org.fudaa.dodico.crue.dao.validatorXml.ValidatorXml;
+import org.fudaa.dodico.crue.dao.ValidatorXml;
import org.fudaa.dodico.crue.inout.fileformat.DCSPFileFormat;
import org.fudaa.dodico.crue.inout.fileformat.DFRTFileFormat;
import org.fudaa.dodico.crue.inout.fileformat.DPTGFileFormat;
@@ -45,10 +43,10 @@
CtuluAnalyze listeMessageError;
Object[] dataLinked;
- public ReaderWithExtra( final CtuluAnalyze analyzer) {
-
+ public ReaderWithExtra(final CtuluAnalyze analyzer) {
+
this.listeMessageError = analyzer;
-
+
}
/**
@@ -58,12 +56,13 @@
* @param validatorXSDfile
* @return
*/
- public T read(final CrueDaoPersit<T> data, final File fichier, final String validatorXSDfile,final Object... dataLinked) {
+ public T read(final CrueDaoPersit<T> data, final File fichier, final String validatorXSDfile,
+ final Object... dataLinked) {
listeMessageError.setDesc(CrueResource.getS(" Analyse du Fichier " + fichier.getName()));
// -- evaluation du fichier avec la xsd --//
- if (!ValidatorXml.validXMLWithDOM(fichier.getAbsolutePath(), validatorXSDfile, listeMessageError)) {
+ if (!ValidatorXml.validXMLWithDOMFromFile(fichier, validatorXSDfile, listeMessageError)) {
listeMessageError.addWarn(CrueResource.getS("Fichier " + fichier.getName() + " non valid\xE9 par la XSD "
+ validatorXSDfile), 0);
}
@@ -83,8 +82,8 @@
* que des references vers les objets d\xE9crits dans DRSO.
*/
public static EMHproject readETUFile(final File fichierETU, final CtuluAnalyze listeMessageError) {
- return EtuFileFormat.getInstance().readData(fichierETU, listeMessageError, null);
- }
+ return EtuFileFormat.getInstance().readData(fichierETU, listeMessageError, null);
+ }
/**
* lit le fichier xml DRSO DRSO - Fichier des donn\xE9es du r\xE9seau (xml) et retourne les donn\xE9es m\xE9tier correspondantes.
@@ -93,7 +92,7 @@
* @return
*/
public static CrueData readDRSOFile(final File fichierDRSO, final CtuluAnalyze listeMessageError) {
- return DRSOFileFormat.getInstance().readData(fichierDRSO, listeMessageError, null);
+ return DRSOFileFormat.getInstance().readData(fichierDRSO, listeMessageError, null);
}
/**
@@ -102,8 +101,8 @@
* contient que des references vers les objets d\xE9crits dans DRSO.
*/
public static void readDPTIFile(final File fichierDPTI, final CrueData dataDRSO, final CtuluAnalyze listeMessageError) {
- (new ReaderWithExtra<CrueData>(listeMessageError)).read(new CrueDaoPersistDPTI(),fichierDPTI,
- DPTIFileFormat.xsdDPTI,dataDRSO);
+ (new ReaderWithExtra<CrueData>(listeMessageError)).read(new CrueDaoPersistDPTI(), fichierDPTI,
+ DPTIFileFormat.xsdDPTI, dataDRSO);
}
/**
@@ -114,8 +113,8 @@
public static void readDPTGFile(final File fichierDPTG, final CrueData dataDRSOetDFRT,
final CtuluAnalyze listeMessageError) {
- (new ReaderWithExtra<CrueData>( listeMessageError)).read(new CrueDaoPersistDPTG(), fichierDPTG,
- DPTGFileFormat.xsdDPTG,dataDRSOetDFRT);
+ (new ReaderWithExtra<CrueData>(listeMessageError)).read(new CrueDaoPersistDPTG(), fichierDPTG,
+ DPTGFileFormat.xsdDPTG, dataDRSOetDFRT);
}
/**
@@ -124,8 +123,8 @@
* DSCP ne contient que des references vers les objets d\xE9crits dans DRSO.
*/
public static void readDSCPFile(final File fichierDSCP, final List<EMH> dataDRSO, final CtuluAnalyze listeMessageError) {
- (new ReaderWithExtra<List<EMH>>(listeMessageError)).read(new CrueDaoPersistDCSP(),fichierDSCP,
- DCSPFileFormat.xsdDCSP,dataDRSO);
+ (new ReaderWithExtra<List<EMH>>(listeMessageError)).read(new CrueDaoPersistDCSP(), fichierDSCP,
+ DCSPFileFormat.xsdDCSP, dataDRSO);
}
/**
@@ -135,8 +134,8 @@
* @return
*/
public static List<DonFrt> readDFRTFile(final File fichierDFRT, final CtuluAnalyze listeMessageError) {
- return (new ReaderWithExtra<List<DonFrt>>( listeMessageError)).read(new CrueDaoPersistDFRT(),fichierDFRT,
- DFRTFileFormat.xsdDFRT,null);
+ return (new ReaderWithExtra<List<DonFrt>>(listeMessageError)).read(new CrueDaoPersistDFRT(), fichierDFRT,
+ DFRTFileFormat.xsdDFRT, null);
}
@@ -148,8 +147,8 @@
* @return
*/
public static DonPrtReseau readOPTGFile(final File fichierOPTG, final CtuluAnalyze listeMessageError) {
- return (new ReaderWithExtra<DonPrtReseau>( listeMessageError)).read(new CrueDaoPersistOPTG(),fichierOPTG,
- OPTGFileFormat.xsdOPTG,null);
+ return (new ReaderWithExtra<DonPrtReseau>(listeMessageError)).read(new CrueDaoPersistOPTG(), fichierOPTG,
+ OPTGFileFormat.xsdOPTG, null);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10writer.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10writer.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/Crue10writer.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -27,15 +27,14 @@
public static class WriterWithExtra<T> {
- CtuluAnalyze analyzer;
-
+ CtuluAnalyze analyzer;
- public WriterWithExtra( final CtuluAnalyze analyzer ) {
+ public WriterWithExtra(final CtuluAnalyze analyzer) {
this.analyzer = analyzer;
-
+
}
- public boolean write(final CrueDaoPersit<T> data,final T dataMetier, final File f) {
+ public boolean write(final CrueDaoPersit<T> data, final T dataMetier, final File f) {
analyzer.setDesc(CrueResource.getS(" Analyse du Fichier " + f.getName()));
@@ -51,7 +50,7 @@
* m\xE9tiers fournies.
*/
public static boolean writeDRSOFile(final CrueData data, final File fichierDRSO, final CtuluAnalyze listeMessageError) {
- return (new WriterWithExtra<CrueData>(listeMessageError)).write(new CrueDaoPersistDRSO(),data, fichierDRSO);
+ return (new WriterWithExtra<CrueData>(listeMessageError)).write(new CrueDaoPersistDRSO(), data, fichierDRSO);
}
/**
@@ -60,7 +59,7 @@
*/
public static boolean writeDPTIFile(final CrueData data, final File fichierDPTI, final CtuluAnalyze listeMessageError) {
- return (new WriterWithExtra<CrueData>(listeMessageError )).write(new CrueDaoPersistDPTI(), data, fichierDPTI);
+ return (new WriterWithExtra<CrueData>(listeMessageError)).write(new CrueDaoPersistDPTI(), data, fichierDPTI);
}
/**
@@ -68,7 +67,7 @@
* branches a partir des donn\xE9es m\xE9tiers fournies.
*/
public static boolean writeDSCPFile(final List<EMH> data, final File fichierDSCP, final CtuluAnalyze listeMessageError) {
- return (new WriterWithExtra<List<EMH>>(listeMessageError )).write(new CrueDaoPersistDCSP(), data, fichierDSCP);
+ return (new WriterWithExtra<List<EMH>>(listeMessageError)).write(new CrueDaoPersistDCSP(), data, fichierDSCP);
}
/**
@@ -77,7 +76,7 @@
*/
public static boolean writeDFRTFile(final List<DonFrt> data, final File fichierDFRT,
final CtuluAnalyze listeMessageError) {
- return (new WriterWithExtra<List<DonFrt>>(listeMessageError )).write(new CrueDaoPersistDFRT(), data, fichierDFRT);
+ return (new WriterWithExtra<List<DonFrt>>(listeMessageError)).write(new CrueDaoPersistDFRT(), data, fichierDFRT);
}
/**
@@ -85,7 +84,7 @@
* partir des donn\xE9es m\xE9tiers fournies.
*/
public static boolean writeDPTGFile(final CrueData data, final File fichierDPTG, final CtuluAnalyze listeMessageError) {
- return (new WriterWithExtra<CrueData>(listeMessageError )).write(new CrueDaoPersistDPTG(), data, fichierDPTG);
+ return (new WriterWithExtra<CrueData>(listeMessageError)).write(new CrueDaoPersistDPTG(), data, fichierDPTG);
}
/**
@@ -98,7 +97,7 @@
public static boolean writeOPTGFile(final DonPrtReseau data, final File fichierOPTG,
final CtuluAnalyze listeMessageError) {
final CrueDaoPersistOPTG dataPersistante = new CrueDaoPersistOPTG();
- return (new WriterWithExtra<DonPrtReseau>(listeMessageError )).write(new CrueDaoPersistOPTG(), data, fichierOPTG);
+ return (new WriterWithExtra<DonPrtReseau>(listeMessageError)).write(new CrueDaoPersistOPTG(), data, fichierOPTG);
}
/**
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/CrueFileFormat.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -1,117 +1,111 @@
package org.fudaa.dodico.crue.inout.fileformat;
import java.io.File;
-import java.util.Map;
import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.ctulu.CtuluIOOperationSynthese;
-import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.fileformat.FileFormatUnique;
import org.fudaa.ctulu.fileformat.FileReadOperationAbstract;
import org.fudaa.ctulu.fileformat.FileWriteOperationAbstract;
import org.fudaa.dodico.commun.DodicoLib;
-import org.fudaa.dodico.crue.dao.CrueDaoPersit;
import org.fudaa.dodico.crue.inout.Crue10reader.ReaderWithExtra;
import org.fudaa.dodico.crue.inout.Crue10writer.WriterWithExtra;
-import org.fudaa.dodico.mesure.EvolutionFileFormatVersion;
/**
* File format customis\xE9 pour Crue. Indique si le fichier est de type crue 9 ou 10. Contient un validator xsd pour le
* fichier donn\xE9. Contient une m\xE9thode statique tr\xE8s pratique qui permet de retourner automatiquement le bon FileFormat
- * en fonction du type renvoy\xE9.
+ * en fonction du type renvoy\xE9. T correspond \xE0 la structure m\xE9tier associ\xE9e au format du fichier
*
- * T correspond \xE0 la structure m\xE9tier associ\xE9e au format du fichier
- *
* @author Adrien Hadoux
*/
-public abstract class CrueFileFormat<T> extends FileFormatUnique {
+public abstract class CrueFileFormat<T> extends FileFormatUnique {
- /**
- * Le type du fichier (cf cruedaoCommomFactory.)
- */
- String type;
+ /**
+ * Le type du fichier (cf cruedaoCommomFactory.)
+ */
+ String type;
- protected CrueFileFormat(final String type) {
- super(1);
- extensions_ = getExtensions();
- id_ = "Crue";
- nom_ = "Crue";
- description_ = DodicoLib.getS("Fichier Crue");
- // software_ = FileFormatSoftware.TELEMAC_IS;
- this.type = type;
+ protected CrueFileFormat(final String type) {
+ super(1);
+ extensions_ = getExtensions();
+ id_ = "Crue";
+ nom_ = "Crue";
+ description_ = DodicoLib.getS("Fichier Crue");
+ this.type = type;
- }
+ }
- /**
- * retourne les extensions acceptables par le fichier
- */
- @Override
- public abstract String[] getExtensions();
+ /**
+ * retourne les extensions acceptables par le fichier
+ */
+ @Override
+ public abstract String[] getExtensions();
- /**
- * retourne l'infos : est du type crue 10 sinon 9.
- *
- * @return
- */
- public abstract boolean isCrue10();
+ /**
+ * retourne l'infos : est du type crue 10 sinon 9.
+ *
+ * @return
+ */
+ public abstract boolean isCrue10();
- /**
- * retourne le validator xsd.
- */
- public abstract String getXsdValidator();
+ /**
+ * retourne le validator xsd.
+ */
+ public abstract String getXsdValidator();
- /**
- * @return true si le fichier demand\xE9 s'auto-suffit. Si il a besoin d'autre fichiers (ref ou d\xE9pendances) retourne
- * false.
- */
- public abstract boolean isIndependant();
+ /**
+ * @return true si le fichier demand\xE9 s'auto-suffit. Si il a besoin d'autre fichiers (ref ou d\xE9pendances) retourne
+ * false.
+ */
+ public abstract boolean isIndependant();
- /**
- * Obtenir le reader associ\xE9 au format DRSO
- * @return
- */
- protected ReaderWithExtra<T> getReader( CtuluAnalyze analyzer ){
+ /**
+ * Obtenir le reader associ\xE9 au format DRSO
+ *
+ * @return
+ */
+ protected ReaderWithExtra<T> getReader(CtuluAnalyze analyzer) {
- return new ReaderWithExtra<T>(analyzer);
- }
+ return new ReaderWithExtra<T>(analyzer);
+ }
- /**
- * MEthode qui permet d'\xE9crire les datas dans le fichier f sp\xE9cifi\xE9.
- * @param data
- * @param f
- * @return
- */
- public abstract boolean writeData(T data, File f,CtuluAnalyze analyzer);
+ /**
+ * MEthode qui permet d'\xE9crire les datas dans le fichier f sp\xE9cifi\xE9.
+ *
+ * @param data
+ * @param f
+ * @return
+ */
+ public abstract boolean writeData(T data, File f, CtuluAnalyze analyzer);
- /**
- * Lit les donn\xE9es dans le fichier f avec les donn\xE9es li\xE9es.
- * @param dataLinked
- * @return
- */
- public abstract T readData(final File f,CtuluAnalyze analyzer,final Object... dataLinked);
- /**
- * Obtenir le wtriter associ\xE9.
- * @param data
- * @param dataMetier
- * @return
- */
- protected WriterWithExtra<T> getWriter(final CtuluAnalyze analyzer){
- return new WriterWithExtra<T>(analyzer);
- }
+ // FIXME adrien a quoi sert dataLinked ?
+ //
+ /**
+ * Lit les donn\xE9es dans le fichier f avec les donn\xE9es li\xE9es.
+ *
+ * @param dataLinked
+ * @return
+ */
+ public abstract T readData(final File f, CtuluAnalyze analyzer, final Object... dataLinked);
+ /**
+ * Obtenir le wtriter associ\xE9.
+ *
+ * @param data
+ * @param dataMetier
+ * @return
+ */
+ protected WriterWithExtra<T> getWriter(final CtuluAnalyze analyzer) {
+ return new WriterWithExtra<T>(analyzer);
+ }
+ public FileReadOperationAbstract createReader() {
+ // return new ScopeReaderSorT(this);
+ return null;
+ }
+ public FileWriteOperationAbstract createWriter() {
+ // return new ScopeWriterSorT(this);
+ return null;
+ }
- public FileReadOperationAbstract createReader() {
- // return new ScopeReaderSorT(this);
- return null;
- }
-
- public FileWriteOperationAbstract createWriter() {
- // return new ScopeWriterSorT(this);
- return null;
- }
-
-
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DCSPFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DCSPFileFormat.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DCSPFileFormat.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -8,60 +8,54 @@
import org.fudaa.dodico.crue.dao.CrueDaoPersistDCSP;
import org.fudaa.dodico.crue.metier.emh.EMH;
-
/**
- * File format pour DPTI.
- * Le parametre template correspond \xE0 la donn\xE9es m\xE9tier attendue.
+ * File format pour DPTI. Le parametre template correspond \xE0 la donn\xE9es m\xE9tier attendue.
+ *
* @author Adrien Hadoux
- *
*/
public class DCSPFileFormat extends CrueFileFormat<List<EMH>> {
- public static final String xsdDCSP = "valideDCSP.xsd";
- private static DCSPFileFormat INSTANCE;
+ public static final String xsdDCSP = "valideDCSP.xsd";
+ private static DCSPFileFormat INSTANCE;
+ protected DCSPFileFormat(String type) {
+ super(type);
+ }
+ public static CrueFileFormat<List<EMH>> getInstance() {
+ if (INSTANCE == null) INSTANCE = new DCSPFileFormat(CrueDaoConverterCommon.DCSP);
+ return INSTANCE;
+ }
- protected DCSPFileFormat(String type) {
- super(type);
- }
+ @Override
+ public String[] getExtensions() {
+ return new String[] { "dcsp", "dcsp.xml" };
+ }
- public static CrueFileFormat<List<EMH>> getInstance() {
- if (INSTANCE == null) INSTANCE = new DCSPFileFormat(CrueDaoConverterCommon.DCSP);
- return INSTANCE;
- }
+ @Override
+ public String getXsdValidator() {
+ return xsdDCSP;
+ }
- @Override
- public String[] getExtensions() {
- return new String[] { "dcsp", "dcsp.xml" };
- }
+ @Override
+ public boolean isCrue10() {
+ return true;
+ }
- @Override
- public String getXsdValidator() {
- return xsdDCSP;
- }
+ @Override
+ public boolean isIndependant() {
+ return false;
+ }
- @Override
- public boolean isCrue10() {
- return true;
- }
+ @Override
+ public List<EMH> readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ return getReader(analyzer).read(new CrueDaoPersistDCSP(), f, getXsdValidator(), dataLinked);
- @Override
- public boolean isIndependant() {
- return false;
- }
+ }
- @Override
- public List<EMH> readData(File f,CtuluAnalyze analyzer, Object... dataLinked) {
- return getReader(analyzer).read(new CrueDaoPersistDCSP(), f, getXsdValidator(), dataLinked);
+ @Override
+ public boolean writeData(List<EMH> data, File f, CtuluAnalyze analyzer) {
+ return getWriter(analyzer).write(new CrueDaoPersistDCSP(), data, f);
+ }
- }
-
- @Override
- public boolean writeData(List<EMH> data, File f,CtuluAnalyze analyzer) {
- return getWriter(analyzer).write(new CrueDaoPersistDCSP(), data, f);
- }
-
-
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DFRTFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DFRTFileFormat.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DFRTFileFormat.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -10,56 +10,52 @@
/**
* Format de fichier DFRT.
+ *
* @author Adrien Hadoux
- *
*/
public class DFRTFileFormat extends CrueFileFormat<List<DonFrt>> {
- public static final String xsdDFRT = "valideDFRT.xsd";
- private static DFRTFileFormat INSTANCE;
+ public static final String xsdDFRT = "valideDFRT.xsd";
+ private static DFRTFileFormat INSTANCE;
+ protected DFRTFileFormat(String type) {
+ super(type);
+ }
+ public static CrueFileFormat<List<DonFrt>> getInstance() {
+ if (INSTANCE == null) INSTANCE = new DFRTFileFormat(CrueDaoConverterCommon.DFRT);
+ return INSTANCE;
+ }
- protected DFRTFileFormat(String type) {
- super(type);
- }
+ @Override
+ public String[] getExtensions() {
+ return new String[] { "dfrt", "dfrt.xml" };
+ }
- public static CrueFileFormat<List<DonFrt>> getInstance() {
- if (INSTANCE == null) INSTANCE = new DFRTFileFormat(CrueDaoConverterCommon.DFRT);
- return INSTANCE;
- }
+ @Override
+ public String getXsdValidator() {
+ return xsdDFRT;
+ }
- @Override
- public String[] getExtensions() {
- return new String[] { "dfrt", "dfrt.xml" };
- }
+ @Override
+ public boolean isCrue10() {
+ return true;
+ }
- @Override
- public String getXsdValidator() {
- return xsdDFRT;
- }
+ @Override
+ public boolean isIndependant() {
+ return false;
+ }
- @Override
- public boolean isCrue10() {
- return true;
- }
+ @Override
+ public List<DonFrt> readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ return getReader(analyzer).read(new CrueDaoPersistDFRT(), f, getXsdValidator(), dataLinked);
- @Override
- public boolean isIndependant() {
- return false;
- }
+ }
- @Override
- public List<DonFrt> readData(File f,CtuluAnalyze analyzer, Object... dataLinked) {
- return getReader(analyzer).read(new CrueDaoPersistDFRT(), f, getXsdValidator(), dataLinked);
+ @Override
+ public boolean writeData(List<DonFrt> data, File f, CtuluAnalyze analyzer) {
+ return getWriter(analyzer).write(new CrueDaoPersistDFRT(), data, f);
+ }
- }
-
- @Override
- public boolean writeData(List<DonFrt> data, File f,CtuluAnalyze analyzer) {
- return getWriter(analyzer).write(new CrueDaoPersistDFRT(), data, f);
- }
-
-
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTGFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTGFileFormat.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTGFileFormat.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -1,65 +1,60 @@
package org.fudaa.dodico.crue.inout.fileformat;
import java.io.File;
+
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.dao.CrueDaoConverterCommon;
import org.fudaa.dodico.crue.dao.CrueDaoPersistDPTG;
import org.fudaa.dodico.crue.metier.emh.CrueData;
-
/**
* Format DPTG.
+ *
* @author Adrien Hadoux
- *
*/
public class DPTGFileFormat extends CrueFileFormat<CrueData> {
+ public static final String xsdDPTG = "valideDPTG.xsd";
+ private static DPTGFileFormat INSTANCE;
- public static final String xsdDPTG = "valideDPTG.xsd";
- private static DPTGFileFormat INSTANCE;
+ protected DPTGFileFormat(String type) {
+ super(type);
+ }
+ public static CrueFileFormat<CrueData> getInstance() {
+ if (INSTANCE == null) INSTANCE = new DPTGFileFormat(CrueDaoConverterCommon.DCSP);
+ return INSTANCE;
+ }
+ @Override
+ public String[] getExtensions() {
+ return new String[] { "dptg", "dptg.xml" };
+ }
- protected DPTGFileFormat(String type) {
- super(type);
- }
+ @Override
+ public String getXsdValidator() {
+ return xsdDPTG;
+ }
- public static CrueFileFormat<CrueData> getInstance() {
- if (INSTANCE == null) INSTANCE = new DPTGFileFormat(CrueDaoConverterCommon.DCSP);
- return INSTANCE;
- }
+ @Override
+ public boolean isCrue10() {
+ return true;
+ }
- @Override
- public String[] getExtensions() {
- return new String[] { "dptg", "dptg.xml" };
- }
+ @Override
+ public boolean isIndependant() {
+ return false;
+ }
- @Override
- public String getXsdValidator() {
- return xsdDPTG;
- }
+ @Override
+ public CrueData readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ return getReader(analyzer).read(new CrueDaoPersistDPTG(), f, getXsdValidator(), dataLinked);
- @Override
- public boolean isCrue10() {
- return true;
- }
+ }
- @Override
- public boolean isIndependant() {
- return false;
- }
+ @Override
+ public boolean writeData(CrueData data, File f, CtuluAnalyze analyzer) {
+ return getWriter(analyzer).write(new CrueDaoPersistDPTG(), data, f);
+ }
- @Override
- public CrueData readData(File f,CtuluAnalyze analyzer, Object... dataLinked) {
- return getReader(analyzer).read(new CrueDaoPersistDPTG(), f, getXsdValidator(), dataLinked);
-
- }
-
- @Override
- public boolean writeData(CrueData data, File f,CtuluAnalyze analyzer) {
- return getWriter(analyzer).write(new CrueDaoPersistDPTG(), data, f);
- }
-
-
-
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTIFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTIFileFormat.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DPTIFileFormat.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -7,61 +7,55 @@
import org.fudaa.dodico.crue.dao.CrueDaoPersistDPTI;
import org.fudaa.dodico.crue.metier.emh.CrueData;
-
/**
- * File format pour DPTI.
- * Le parametre template correspond \xE0 la donn\xE9es m\xE9tier attendue.
+ * File format pour DPTI. Le parametre template correspond \xE0 la donn\xE9es m\xE9tier attendue.
+ *
* @author Adrien Hadoux
- *
*/
public class DPTIFileFormat extends CrueFileFormat<CrueData> {
- public static final String xsdDPTI = "valideDPTI.xsd";
- private static DPTIFileFormat INSTANCE;
+ public static final String xsdDPTI = "valideDPTI.xsd";
+ private static DPTIFileFormat INSTANCE;
+ protected DPTIFileFormat(String type) {
+ super(type);
+ }
+ public static CrueFileFormat<CrueData> getInstance() {
+ if (INSTANCE == null) INSTANCE = new DPTIFileFormat(CrueDaoConverterCommon.DPTI);
+ return INSTANCE;
+ }
- protected DPTIFileFormat(String type) {
- super(type);
- }
+ @Override
+ public String[] getExtensions() {
+ return new String[] { "dpti", "dpti.xml" };
+ }
- public static CrueFileFormat<CrueData> getInstance() {
- if (INSTANCE == null) INSTANCE = new DPTIFileFormat(CrueDaoConverterCommon.DPTI);
- return INSTANCE;
- }
+ @Override
+ public String getXsdValidator() {
+ return xsdDPTI;
+ }
- @Override
- public String[] getExtensions() {
- return new String[] { "dpti", "dpti.xml" };
- }
+ @Override
+ public boolean isCrue10() {
+ return true;
+ }
- @Override
- public String getXsdValidator() {
- return xsdDPTI;
- }
+ @Override
+ public boolean isIndependant() {
+ return false;
+ }
- @Override
- public boolean isCrue10() {
- return true;
- }
+ @Override
+ public CrueData readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ return getReader(analyzer).read(new CrueDaoPersistDPTI(), f, getXsdValidator(), dataLinked);
- @Override
- public boolean isIndependant() {
- return false;
- }
+ }
- @Override
- public CrueData readData(File f,CtuluAnalyze analyzer, Object... dataLinked) {
- return getReader(analyzer).read(new CrueDaoPersistDPTI(), f, getXsdValidator(), dataLinked);
+ @Override
+ public boolean writeData(CrueData data, File f, CtuluAnalyze analyzer) {
+ return getWriter(analyzer).write(new CrueDaoPersistDPTI(), data, f);
+ }
- }
-
- @Override
- public boolean writeData(CrueData data, File f,CtuluAnalyze analyzer) {
- return getWriter(analyzer).write(new CrueDaoPersistDPTI(), data, f);
- }
-
-
-
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DRSOFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DRSOFileFormat.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/DRSOFileFormat.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -5,62 +5,56 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.dao.CrueDaoConverterCommon;
import org.fudaa.dodico.crue.dao.CrueDaoPersistDRSO;
-import org.fudaa.dodico.crue.metier.EMHproject;
import org.fudaa.dodico.crue.metier.emh.CrueData;
/**
- * File format pour DRSO.
- * Le parametre template correspond \xE0 la donn\xE9es m\xE9tier attendue.
+ * File format pour DRSO. Le parametre template correspond \xE0 la donn\xE9es m\xE9tier attendue.
+ *
* @author Adrien Hadoux
- *
*/
public class DRSOFileFormat extends CrueFileFormat<CrueData> {
- public static final String xsdDRSO = "valideDRSO.xsd";
- private static DRSOFileFormat INSTANCE;
+ public static final String xsdDRSO = "valideDRSO.xsd";
+ private static DRSOFileFormat INSTANCE;
+ protected DRSOFileFormat(String type) {
+ super(type);
+ }
+ public static CrueFileFormat<CrueData> getInstance() {
+ if (INSTANCE == null) INSTANCE = new DRSOFileFormat(CrueDaoConverterCommon.DRSO);
+ return INSTANCE;
+ }
- protected DRSOFileFormat(String type) {
- super(type);
- }
+ @Override
+ public String[] getExtensions() {
+ return new String[] { "drso", "drso.xml" };
+ }
- public static CrueFileFormat<CrueData> getInstance() {
- if (INSTANCE == null) INSTANCE = new DRSOFileFormat(CrueDaoConverterCommon.DRSO);
- return INSTANCE;
- }
+ @Override
+ public String getXsdValidator() {
+ return xsdDRSO;
+ }
- @Override
- public String[] getExtensions() {
- return new String[] { "drso", "drso.xml" };
- }
+ @Override
+ public boolean isCrue10() {
+ return true;
+ }
- @Override
- public String getXsdValidator() {
- return xsdDRSO;
- }
+ @Override
+ public boolean isIndependant() {
+ return true;
+ }
- @Override
- public boolean isCrue10() {
- return true;
- }
+ @Override
+ public CrueData readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ return getReader(analyzer).read(new CrueDaoPersistDRSO(), f, getXsdValidator(), dataLinked);
- @Override
- public boolean isIndependant() {
- return true;
- }
+ }
- @Override
- public CrueData readData(File f,CtuluAnalyze analyzer, Object... dataLinked) {
- return getReader(analyzer).read(new CrueDaoPersistDRSO(), f, getXsdValidator(), dataLinked);
+ @Override
+ public boolean writeData(CrueData data, File f, CtuluAnalyze analyzer) {
+ return getWriter(analyzer).write(new CrueDaoPersistDRSO(), data, f);
+ }
- }
-
- @Override
- public boolean writeData(CrueData data, File f,CtuluAnalyze analyzer) {
- return getWriter(analyzer).write(new CrueDaoPersistDRSO(), data, f);
- }
-
-
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/EtuFileFormat.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -4,7 +4,6 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.dao.CrueDaoConverterCommon;
-import org.fudaa.dodico.crue.dao.validatorXml.ValidatorXml;
import org.fudaa.dodico.crue.metier.EMHproject;
/**
@@ -47,16 +46,16 @@
return true;
}
-@Override
-public EMHproject readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
- // TODO Auto-generated method stub
- return null;
-}
+ @Override
+ public EMHproject readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ // TODO Auto-generated method stub
+ return null;
+ }
-@Override
-public boolean writeData(EMHproject data, File f, CtuluAnalyze analyzer) {
- // TODO Auto-generated method stub
- return false;
-}
+ @Override
+ public boolean writeData(EMHproject data, File f, CtuluAnalyze analyzer) {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/OPTGFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/OPTGFileFormat.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/inout/fileformat/OPTGFileFormat.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -1,62 +1,60 @@
package org.fudaa.dodico.crue.inout.fileformat;
import java.io.File;
+
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.dao.CrueDaoConverterCommon;
import org.fudaa.dodico.crue.dao.CrueDaoPersistOPTG;
import org.fudaa.dodico.crue.metier.emh.DonPrtReseau;
+
/**
* File format optg
+ *
* @author Adrien Hadoux
- *
*/
public class OPTGFileFormat extends CrueFileFormat<DonPrtReseau> {
- public static final String xsdOPTG = "valideOPTG.xsd";
- private static OPTGFileFormat INSTANCE;
+ public static final String xsdOPTG = "valideOPTG.xsd";
+ private static OPTGFileFormat INSTANCE;
+ protected OPTGFileFormat(String type) {
+ super(type);
+ }
+ public static CrueFileFormat<DonPrtReseau> getInstance() {
+ if (INSTANCE == null) INSTANCE = new OPTGFileFormat(CrueDaoConverterCommon.DPTI);
+ return INSTANCE;
+ }
- protected OPTGFileFormat(String type) {
- super(type);
- }
+ @Override
+ public String[] getExtensions() {
+ return new String[] { "optg", "optg.xml" };
+ }
- public static CrueFileFormat<DonPrtReseau> getInstance() {
- if (INSTANCE == null) INSTANCE = new OPTGFileFormat(CrueDaoConverterCommon.DPTI);
- return INSTANCE;
- }
+ @Override
+ public String getXsdValidator() {
+ return xsdOPTG;
+ }
- @Override
- public String[] getExtensions() {
- return new String[] { "optg", "optg.xml" };
- }
+ @Override
+ public boolean isCrue10() {
+ return true;
+ }
- @Override
- public String getXsdValidator() {
- return xsdOPTG;
- }
+ @Override
+ public boolean isIndependant() {
+ return true;
+ }
- @Override
- public boolean isCrue10() {
- return true;
- }
+ @Override
+ public DonPrtReseau readData(File f, CtuluAnalyze analyzer, Object... dataLinked) {
+ return getReader(analyzer).read(new CrueDaoPersistOPTG(), f, getXsdValidator(), dataLinked);
- @Override
- public boolean isIndependant() {
- return true;
- }
+ }
- @Override
- public DonPrtReseau readData(File f,CtuluAnalyze analyzer, Object... dataLinked) {
- return getReader(analyzer).read(new CrueDaoPersistOPTG(), f, getXsdValidator(), dataLinked);
+ @Override
+ public boolean writeData(DonPrtReseau data, File f, CtuluAnalyze analyzer) {
+ return getWriter(analyzer).write(new CrueDaoPersistOPTG(), data, f);
+ }
- }
-
- @Override
- public boolean writeData(DonPrtReseau data, File f,CtuluAnalyze analyzer) {
- return getWriter(analyzer).write(new CrueDaoPersistOPTG(), data, f);
- }
-
-
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalculPermanent.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalculPermanent.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalculPermanent.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -4,58 +4,55 @@
/**
* Definition d'un calcul permanent
+ *
* @author Adrien Hadoux
- *
*/
public class CalculPermanent {
- String nom;
- String description;
- String methodeCalcul;
-
- List<DonCLimMBrancheOrifice> listeDonClimBrancheOrifice;
- List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu;
-
-
- public List<DonCLimMNoeudNiveauContinu> getListeDonCLimMNoeudNiveauContinu() {
- return listeDonCLimMNoeudNiveauContinu;
- }
+ String nom;
+ String description;
+ String methodeCalcul;
- public void setListeDonCLimMNoeudNiveauContinu(
- List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu) {
- this.listeDonCLimMNoeudNiveauContinu = listeDonCLimMNoeudNiveauContinu;
- }
+ List<DonCLimMBrancheOrifice> listeDonClimBrancheOrifice;
+ List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu;
- public String getNom() {
- return nom;
- }
+ public List<DonCLimMNoeudNiveauContinu> getListeDonCLimMNoeudNiveauContinu() {
+ return listeDonCLimMNoeudNiveauContinu;
+ }
- public void setNom(String nom) {
- this.nom = nom;
- }
+ public void setListeDonCLimMNoeudNiveauContinu(List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu) {
+ this.listeDonCLimMNoeudNiveauContinu = listeDonCLimMNoeudNiveauContinu;
+ }
- public String getDescription() {
- return description;
- }
+ public String getNom() {
+ return nom;
+ }
- public void setDescription(String description) {
- this.description = description;
- }
+ public void setNom(String nom) {
+ this.nom = nom;
+ }
- public String getMethodeCalcul() {
- return methodeCalcul;
- }
+ public String getDescription() {
+ return description;
+ }
- public void setMethodeCalcul(String methodeCalcul) {
- this.methodeCalcul = methodeCalcul;
- }
+ public void setDescription(String description) {
+ this.description = description;
+ }
- public List<DonCLimMBrancheOrifice> getListeDonClimBrancheOrifice() {
- return listeDonClimBrancheOrifice;
- }
+ public String getMethodeCalcul() {
+ return methodeCalcul;
+ }
- public void setListeDonClimBrancheOrifice(
- List<DonCLimMBrancheOrifice> listeDonClimBrancheOrifice) {
- this.listeDonClimBrancheOrifice = listeDonClimBrancheOrifice;
- }
-
+ public void setMethodeCalcul(String methodeCalcul) {
+ this.methodeCalcul = methodeCalcul;
+ }
+
+ public List<DonCLimMBrancheOrifice> getListeDonClimBrancheOrifice() {
+ return listeDonClimBrancheOrifice;
+ }
+
+ public void setListeDonClimBrancheOrifice(List<DonCLimMBrancheOrifice> listeDonClimBrancheOrifice) {
+ this.listeDonClimBrancheOrifice = listeDonClimBrancheOrifice;
+ }
+
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalculTransitoire.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalculTransitoire.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalculTransitoire.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -4,44 +4,46 @@
/**
* Calcul transitoire.
+ *
* @author Adrien Hadoux
- *
*/
public class CalculTransitoire {
- String nom;
- String description;
-
- List<DonCLimMBrancheOrifice> listeDonClimBrancheOrifice;
- List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu;
-
-
-
- public List<DonCLimMNoeudNiveauContinu> getListeDonCLimMNoeudNiveauContinu() {
- return listeDonCLimMNoeudNiveauContinu;
- }
- public void setListeDonCLimMNoeudNiveauContinu(
- List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu) {
- this.listeDonCLimMNoeudNiveauContinu = listeDonCLimMNoeudNiveauContinu;
- }
- public String getNom() {
- return nom;
- }
- public void setNom(String nom) {
- this.nom = nom;
- }
- public String getDescription() {
- return description;
- }
- public void setDescription(String description) {
- this.description = description;
- }
- public List<DonCLimMBrancheOrifice> getListeDonClimBrancheOrifice() {
- return listeDonClimBrancheOrifice;
- }
- public void setListeDonClimBrancheOrifice(
- List<DonCLimMBrancheOrifice> listeDonClimBrancheOrifice) {
- this.listeDonClimBrancheOrifice = listeDonClimBrancheOrifice;
- }
+ String nom;
+ String description;
+ List<DonCLimMBrancheOrifice> listeDonClimBrancheOrifice;
+ List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu;
+ public List<DonCLimMNoeudNiveauContinu> getListeDonCLimMNoeudNiveauContinu() {
+ return listeDonCLimMNoeudNiveauContinu;
+ }
+
+ public void setListeDonCLimMNoeudNiveauContinu(List<DonCLimMNoeudNiveauContinu> listeDonCLimMNoeudNiveauContinu) {
+ this.listeDonCLimMNoeudNiveauContinu = listeDonCLimMNoeudNiveauContinu;
+ }
+
+ public String getNom() {
+ return nom;
+ }
+
+ public void setNom(String nom) {
+ this.nom = nom;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public List<DonCLimMBrancheOrifice> getListeDonClimBrancheOrifice() {
+ return listeDonClimBrancheOrifice;
+ }
+
+ public void setListeDonClimBrancheOrifice(List<DonCLimMBrancheOrifice> listeDonClimBrancheOrifice) {
+ this.listeDonClimBrancheOrifice = listeDonClimBrancheOrifice;
+ }
+
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -20,19 +20,19 @@
private boolean isActive_;
-// /**
-// * Liste des sections d'une branche.
-// */
-// private List<CatEMHSection> listeSections_;
-//
-// /**
-// * noeud amont (DRSO)
-// */
-// private CatEMHNoeud noeudAmont_;
-// /**
-// * noeud aval (DRSO)
-// */
-// private CatEMHNoeud noeudAval_;
+ // /**
+ // * Liste des sections d'une branche.
+ // */
+ // private List<CatEMHSection> listeSections_;
+ //
+ // /**
+ // * noeud amont (DRSO)
+ // */
+ // private CatEMHNoeud noeudAmont_;
+ // /**
+ // * noeud aval (DRSO)
+ // */
+ // private CatEMHNoeud noeudAval_;
public CatEMHBranche(final String nom) {
super(nom);
@@ -43,9 +43,9 @@
return EMHHelper.getListeRelationsSections(this);
}
-public void setListeSections(List<RelationEMH> liste){
- EMHHelper.addListeSectionsToRelations(this,liste);
-}
+ public void setListeSections(List<RelationEMH> liste) {
+ EMHHelper.addListeSectionsToRelations(this, liste);
+ }
public boolean isActive() {
return isActive_;
@@ -60,17 +60,15 @@
}
public void setNoeudAmont(final CatEMHNoeud noeudAmont) {
- EMHHelper.addNoeudAmont(this, noeudAmont);
+ EMHHelper.addNoeudAmont(this, noeudAmont);
}
public CatEMHNoeud getNoeudAval() {
- return EMHHelper.getNoeudAval(this);
+ return EMHHelper.getNoeudAval(this);
}
public void setNoeudAval(final CatEMHNoeud noeudAval) {
- EMHHelper.addNoeudAval(this, noeudAval);
+ EMHHelper.addNoeudAval(this, noeudAval);
}
-
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -9,7 +9,6 @@
private boolean isActive_;
-
public CatEMHCasier(final String nom) {
super(nom);
// TODO Auto-generated constructor stub
@@ -31,7 +30,4 @@
EMHHelper.addNoeudCasier(this, noeud);
}
-
-
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -1,6 +1,5 @@
package org.fudaa.dodico.crue.metier.emh;
-
/**
* @author Adrien Hadoux
*/
@@ -11,6 +10,4 @@
}
-
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHSection.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHSection.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHSection.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -10,11 +10,10 @@
*/
public class CatEMHSection extends EMH {
-
-// String position;
-//
-//
-// double xp;
+ // String position;
+ //
+ //
+ // double xp;
/**
* recuperer les donnees (DSCP)
@@ -36,21 +35,20 @@
// TODO Auto-generated constructor stub
}
-// public String getPosition() {
-// return position;
-// }
-//
-// public void setPosition(final String position) {
-// this.position = position;
-// }
-//
-// public double getXp() {
-// return xp;
-// }
-//
-// public void setXp(final double xp) {
-// this.xp = xp;
-// }
+ // public String getPosition() {
+ // return position;
+ // }
+ //
+ // public void setPosition(final String position) {
+ // this.position = position;
+ // }
+ //
+ // public double getXp() {
+ // return xp;
+ // }
+ //
+ // public void setXp(final double xp) {
+ // this.xp = xp;
+ // }
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMBrancheOrifice.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMBrancheOrifice.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMBrancheOrifice.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -1,8 +1,9 @@
package org.fudaa.dodico.crue.metier.emh;
+
/**
* Definitio n de la donclim branche
+ *
* @author Adrien Hadoux
- *
*/
public class DonCLimMBrancheOrifice extends DonClimM {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMNoeudNiveauContinu.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMNoeudNiveauContinu.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMNoeudNiveauContinu.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -4,7 +4,6 @@
* DonclimNoeudNiveuContinu.
*
* @author Adrien Hadoux
- *
*/
public class DonCLimMNoeudNiveauContinu {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMScenario.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMScenario.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMScenario.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -4,30 +4,28 @@
/**
* Scenario pour les fichier DCLM.
+ *
* @author Adrien Hadoux
*/
-public class DonCLimMScenario extends DonClimM{
+public class DonCLimMScenario extends DonClimM {
-
- public List<CalculPermanent> listeCalculPermanents;
- public List<CalculTransitoire> listeCalculTransitoire;
+ public List<CalculPermanent> listeCalculPermanents;
+ public List<CalculTransitoire> listeCalculTransitoire;
- public List<CalculTransitoire> getListeCalculTransitoire() {
- return listeCalculTransitoire;
- }
+ public List<CalculTransitoire> getListeCalculTransitoire() {
+ return listeCalculTransitoire;
+ }
- public void setListeCalculTransitoire(
- List<CalculTransitoire> listeCalculTransitoire) {
- this.listeCalculTransitoire = listeCalculTransitoire;
- }
+ public void setListeCalculTransitoire(List<CalculTransitoire> listeCalculTransitoire) {
+ this.listeCalculTransitoire = listeCalculTransitoire;
+ }
- public List<CalculPermanent> getListeCalculPermanents() {
- return listeCalculPermanents;
- }
+ public List<CalculPermanent> getListeCalculPermanents() {
+ return listeCalculPermanents;
+ }
- public void setListeCalculPermanents(List<CalculPermanent> listeCalculPermanents) {
- this.listeCalculPermanents = listeCalculPermanents;
- }
-
-
+ public void setListeCalculPermanents(List<CalculPermanent> listeCalculPermanents) {
+ this.listeCalculPermanents = listeCalculPermanents;
+ }
+
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheBarrageGenerique.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheBarrageGenerique.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheBarrageGenerique.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -1,37 +1,38 @@
package org.fudaa.dodico.crue.metier.emh;
/**
- * Classe de la branche de barrage g\xE9n\xE9rique.
- * Utilis\xE9e pour le fichier DCSP
+ * Classe de la branche de barrage g\xE9n\xE9rique. Utilis\xE9e pour le fichier DCSP
+ *
* @author Adrien Hadoux
- *
*/
public class DonCalcSansPrtBrancheBarrageGenerique implements DonCalcSansPrt {
- private double QLimInf;
- private double QLimSup;
- private LoiFF regimeNoye;
-
-
-
- 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 LoiFF getRegimeNoye() {
- return regimeNoye;
- }
- public void setRegimeNoye(LoiFF regimeNoye) {
- this.regimeNoye = regimeNoye;
- }
-
-
+ private double QLimInf;
+ private double QLimSup;
+ private LoiFF regimeNoye;
+
+ 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 LoiFF getRegimeNoye() {
+ return regimeNoye;
+ }
+
+ public void setRegimeNoye(LoiFF regimeNoye) {
+ this.regimeNoye = regimeNoye;
+ }
+
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBranche.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBranche.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBranche.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -5,7 +5,6 @@
*/
public class DonPrtCInitBranche implements DonPrtClInit {
private double Qinit;
-
public double getQinit() {
return Qinit;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBrancheSaintVenant.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBrancheSaintVenant.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCInitBrancheSaintVenant.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -2,17 +2,17 @@
/**
* Condition init pour les branches Saint Venant.
+ *
* @author Adrien Hadoux
- *
*/
public class DonPrtCInitBrancheSaintVenant extends DonPrtCInitBranche {
- private double Qruis;
+ private double Qruis;
- public double getQruis() {
- return Qruis;
- }
+ public double getQruis() {
+ return Qruis;
+ }
- public void setQruis(final double qruis) {
- Qruis = qruis;
- }
+ public void setQruis(final double qruis) {
+ Qruis = qruis;
+ }
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -86,7 +86,7 @@
* @param dataCalcul
*/
public void addDSCP(final DonCalcSansPrt dataCalcul) {
- EMHHelper.addDSCP(this, dataCalcul);
+ EMHHelper.addDSCP(this, dataCalcul);
}
/**
@@ -95,7 +95,7 @@
* @return
*/
public List<DonCalcSansPrt> getDSCP() {
- return EMHHelper.getDSCP(this);
+ return EMHHelper.getDSCP(this);
}
@@ -106,8 +106,8 @@
* @return
*/
public List<DonPrtClInit> getDPTI() {
-
- return EMHHelper.getDPTI(this);
+
+ return EMHHelper.getDPTI(this);
}
/**
@@ -116,7 +116,7 @@
* @param dataCalcul
*/
public void addDPTI(final DonPrtClInit conditionInit) {
- EMHHelper.addDPTI(this, conditionInit);
+ EMHHelper.addDPTI(this, conditionInit);
}
/**
@@ -125,8 +125,8 @@
* @return
*/
public List<DonPrtGeo> getDPTG() {
-
- return EMHHelper.getDPTG(this);
+
+ return EMHHelper.getDPTG(this);
}
/**
@@ -137,7 +137,7 @@
* @param dataCalcul
*/
public void addDPTG(final DonPrtGeo donnee) {
- EMHHelper.addDPTG(this, donnee);
+ EMHHelper.addDPTG(this, donnee);
}
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EvolutionDF.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EvolutionDF.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EvolutionDF.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -1,20 +1,18 @@
package org.fudaa.dodico.crue.metier.emh;
-
import java.util.List;
+
/**
- *
* @author Adrien Hadoux
- *
*/
public class EvolutionDF {
- List<PtEvolutionDF> mpoints;
+ List<PtEvolutionDF> mpoints;
- public List<PtEvolutionDF> getMpoints() {
- return mpoints;
- }
+ public List<PtEvolutionDF> getMpoints() {
+ return mpoints;
+ }
- public void setMpoints(final List<PtEvolutionDF> mpoints) {
- this.mpoints = mpoints;
- }
+ public void setMpoints(final List<PtEvolutionDF> mpoints) {
+ this.mpoints = mpoints;
+ }
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EvolutionFF.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EvolutionFF.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EvolutionFF.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -1,11 +1,11 @@
package org.fudaa.dodico.crue.metier.emh;
+import java.util.List;
-import java.util.List;
/**
* Point evolution FF.
+ *
* @author Adrien Hadoux
- *
*/
public class EvolutionFF {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Loi.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Loi.java 2009-04-07 21:17:09 UTC (rev 4618)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/Loi.java 2009-04-07 21:18:54 UTC (rev 4619)
@@ -2,8 +2,8 @@
/**
* Objet g\xE9n\xE9rique loi.
+ *
* @author Adrien Hadoux
- *
*/
public interface Loi {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/LoiDF.java
===========...
[truncated message content] |
