Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4671] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2009-04-21 22:32:30
|
Revision: 4671
http://fudaa.svn.sourceforge.net/fudaa/?rev=4671&view=rev
Author: deniger
Date: 2009-04-21 22:32:19 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/.pmd
trunk/soft/fudaa-crue/dodico/.pmd
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/AbstractCrueDao.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDLHY.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterOPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterORES.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDCLM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDLHY.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoETU.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoOPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoORES.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CrueFileFormatManager.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHModeleBase.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHScenario.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/AbstractTest.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDC.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDCLMFile.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/TestCrueDH.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueDLHYFile.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/TestCrueETUFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueOPTGFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/dao/TestCrueORESFile.java
trunk/soft/fudaa-crue/fudaa/.pmd
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueProjet.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueXmlReaderWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueXmlReaderWriterImpl.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9DCFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9DHFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9FileFormatFactory.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CrueIOData.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CustomFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CustomFileFormatUnique.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CustomFileFormatVersionInterface.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/AbstractCrue9Reader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/AbstractCrue9Writer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/CrueIODico.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHFileReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHFileWriter.java
trunk/soft/fudaa-crue/dodico/src/test/java/idea/TestItPointDF.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/AbstractCrueFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueIOData.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue09reader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9FileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue9writer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CrueFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CrueIODico.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/DCFileReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/DCFileWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/DHFileReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/DHFileWriter.java
trunk/soft/fudaa-crue/dodico/src/test/java/idea/testPointDF.java
trunk/soft/fudaa-crue/src/main/config/eclipse-codetemplates.xml
Modified: trunk/soft/fudaa-crue/.pmd
===================================================================
--- trunk/soft/fudaa-crue/.pmd 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/.pmd 2009-04-21 22:32:19 UTC (rev 4671)
@@ -204,18 +204,10 @@
<ruleset>Java Logging Rules</ruleset>
</rule>
<rule>
- <name>UnnecessaryConstructor</name>
- <ruleset>Controversial Rules</ruleset>
- </rule>
- <rule>
<name>NullAssignment</name>
<ruleset>Controversial Rules</ruleset>
</rule>
<rule>
- <name>OnlyOneReturn</name>
- <ruleset>Controversial Rules</ruleset>
- </rule>
- <rule>
<name>UnusedModifier</name>
<ruleset>Controversial Rules</ruleset>
</rule>
@@ -224,10 +216,6 @@
<ruleset>Controversial Rules</ruleset>
</rule>
<rule>
- <name>AtLeastOneConstructor</name>
- <ruleset>Controversial Rules</ruleset>
- </rule>
- <rule>
<name>DontImportSun</name>
<ruleset>Controversial Rules</ruleset>
</rule>
@@ -256,10 +244,6 @@
<ruleset>Controversial Rules</ruleset>
</rule>
<rule>
- <name>AvoidFinalLocalVariable</name>
- <ruleset>Controversial Rules</ruleset>
- </rule>
- <rule>
<name>AvoidUsingShortType</name>
<ruleset>Controversial Rules</ruleset>
</rule>
@@ -476,10 +460,6 @@
<ruleset>Optimization Rules</ruleset>
</rule>
<rule>
- <name>AvoidInstantiatingObjectsInLoops</name>
- <ruleset>Optimization Rules</ruleset>
- </rule>
- <rule>
<name>UseArrayListInsteadOfVector</name>
<ruleset>Optimization Rules</ruleset>
</rule>
@@ -945,4 +925,5 @@
</rule>
</rules>
<includeDerivedFiles>false</includeDerivedFiles>
+ <violationsAsErrors>true</violationsAsErrors>
</pmd>
Modified: trunk/soft/fudaa-crue/dodico/.pmd
===================================================================
--- trunk/soft/fudaa-crue/dodico/.pmd 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/.pmd 2009-04-21 22:32:19 UTC (rev 4671)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<pmd>
<useProjectRuleSet>true</useProjectRuleSet>
- <ruleSetFile>C:\devel\fudaa\Fudaa-Crue\Fudaa-Crue root\src\main\config\pmd.xml</ruleSetFile>
+ <ruleSetFile>..\src\main\config\pmd.xml</ruleSetFile>
<includeDerivedFiles>false</includeDerivedFiles>
<violationsAsErrors>true</violationsAsErrors>
</pmd>
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/AbstractCrueFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/AbstractCrueFileFormat.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/AbstractCrueFileFormat.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -1,34 +0,0 @@
-/**
- * Licence GPL
- * Copyright Genesis
- */
-package org.fudaa.dodico.crue.common;
-
-import org.fudaa.ctulu.fileformat.FileFormatUnique;
-import org.fudaa.ctulu.fileformat.FileReadOperationAbstract;
-import org.fudaa.ctulu.fileformat.FileWriteOperationAbstract;
-
-/**
- * @author deniger
- * @param <M> la classe métier générée par ce fileformat
- */
-public abstract class AbstractCrueFileFormat<M> extends FileFormatUnique {
-
- /**
- *
- */
- public AbstractCrueFileFormat() {
- super(1);
- }
-
- @Deprecated
- public FileReadOperationAbstract createReader() {// NOPMD
- return null;
- }
-
- @Deprecated
- public FileWriteOperationAbstract createWriter() {// NOPMD
- return null;
- }
-
-}
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueIOData.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueIOData.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueIOData.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -1,73 +0,0 @@
-/**
- * Licence GPL
- * Copyright Genesis
- */
-package org.fudaa.dodico.crue.common;
-
-/**
- * @author deniger
- */
-public class CrueIOData<M> {
-
- private M metier;
- private String crueVersion;
- private String crueXsd;
- private String crueCommentaire;
-
- /**
- * @return the metier
- */
- public M getMetier() {
- return metier;
- }
-
- /**
- * @param metier the metier to set
- */
- public void setMetier(M metier) {
- this.metier = metier;
- }
-
- /**
- * @return the crueVersion
- */
- public String getCrueVersion() {
- return crueVersion;
- }
-
- /**
- * @param crueVersion the crueVersion to set
- */
- public void setCrueVersion(String crueVersion) {
- this.crueVersion = crueVersion;
- }
-
- /**
- * @return the crueXsd
- */
- public String getCrueXsd() {
- return crueXsd;
- }
-
- /**
- * @param crueXsd the crueXsd to set
- */
- public void setCrueXsd(String crueXsd) {
- this.crueXsd = crueXsd;
- }
-
- /**
- * @return the crueCommentaire
- */
- public String getCrueCommentaire() {
- return crueCommentaire;
- }
-
- /**
- * @param crueCommentaire the crueCommentaire to set
- */
- public void setCrueCommentaire(String crueCommentaire) {
- this.crueCommentaire = crueCommentaire;
- }
-
-}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/AbstractCrueDao.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/AbstractCrueDao.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/AbstractCrueDao.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -10,13 +10,14 @@
/**
* En tete xsd
*/
- public String xmlns = "http://www.fudaa.fr/xsd/crue";
- public String xmlnsxsi = "http://www.w3.org/2001/XMLSchema-instance";
- public final String xsischemaLocation;
+ protected String xmlns = "http://www.fudaa.fr/xsd/crue";
+ protected String xmlnsxsi = "http://www.w3.org/2001/XMLSchema-instance";
+ protected String xsischemaLocation;
- public AbstractCrueDao(final String xsdVersionValidator) {
- xsischemaLocation = "http://www.fudaa.fr/xsd/crue http://www.fudaa.fr" + xsdVersionValidator;
+ public AbstractCrueDao() {}
+ protected void setXsdName(final String xsdFile) {
+ xsischemaLocation = "http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/" + xsdFile;
}
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverter.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverter.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverter.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -11,7 +11,7 @@
* @param <D> Represente la structure DAO
* @param <M> Represente le modele Metier
*/
-public interface CrueConverter<D, M> {
+public interface CrueConverter<D extends AbstractCrueDao, M> {
/**
* Remplit les infos de la classe persistantes avec les données métier appropriées. Cette méthode est appelée dans le
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDCSP.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDCSP.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDCSP.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -34,7 +34,6 @@
import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.SectionProfil;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.SectionSansGeometrie;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDCSP.Zasso;
-import org.fudaa.dodico.crue.io.Crue10FileFormat;
import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
import org.fudaa.dodico.crue.metier.emh.CatEMHSection;
import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrt;
@@ -93,7 +92,7 @@
}
public CrueDaoDCSP convertMetierToDao(final List<EMH> metier, final CtuluAnalyze analyser) {
- final CrueDaoDCSP res = new CrueDaoDCSP(Crue10FileFormat.getDCSPFileFormat().getXsdValidator());
+ final CrueDaoDCSP res = new CrueDaoDCSP();
CrueConverterDCSP.toDAO(res, metier, analyser);
return res;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDFRT.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDFRT.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDFRT.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -9,7 +9,6 @@
import org.fudaa.dodico.crue.dao.CrueDaoStructureDFRT.StriRefHPersist;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDFRT.StriRefPersist;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDFRT.StriRefZPersist;
-import org.fudaa.dodico.crue.io.Crue10FileFormat;
import org.fudaa.dodico.crue.metier.emh.DonFrt;
import org.fudaa.dodico.crue.metier.emh.FrottementPoint;
import org.fudaa.dodico.crue.metier.emh.StriRefC;
@@ -28,7 +27,7 @@
}
public CrueDaoDFRT convertMetierToDao(final List<DonFrt> metier, final CtuluAnalyze analyser) {
- final CrueDaoDFRT res = new CrueDaoDFRT(Crue10FileFormat.getDFRTFileFormat().getXsdValidator());
+ final CrueDaoDFRT res = new CrueDaoDFRT();
res.listeFrottement = CrueConverterDFRT.convertToDao(metier, analyser);
return res;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDLHY.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDLHY.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDLHY.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -13,7 +13,6 @@
import org.fudaa.dodico.crue.dao.CrueDaoStructureDLHY.Tarrage;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDLHY.VannePasseDessous;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDLHY.VannePasseDessus;
-import org.fudaa.dodico.crue.io.Crue10FileFormat;
import org.fudaa.dodico.crue.metier.emh.CrueDate;
import org.fudaa.dodico.crue.metier.emh.EvolutionDF;
import org.fudaa.dodico.crue.metier.emh.EvolutionFF;
@@ -83,7 +82,7 @@
*/
public CrueDaoDLHY convertMetierToDao(final List<Loi> metier, final CtuluAnalyze analyser) {
- final CrueDaoDLHY res = new CrueDaoDLHY(Crue10FileFormat.getDLHYFileFormat().getXsdValidator());
+ final CrueDaoDLHY res = new CrueDaoDLHY();
res.Tarrages = new ArrayList<Tarrage>();
res.Hydrogrammes = new ArrayList<Hydrogramme>();
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDPTG.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDPTG.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDPTG.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -13,7 +13,6 @@
import org.fudaa.dodico.crue.dao.CrueDaoStructureDPTG.ProfilSection;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDPTG.SectionIdem;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDPTG.profilDPTG;
-import org.fudaa.dodico.crue.io.Crue10FileFormat;
import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
import org.fudaa.dodico.crue.metier.emh.CatEMHSection;
import org.fudaa.dodico.crue.metier.emh.CrueData;
@@ -53,7 +52,7 @@
}
public CrueDaoDPTG convertMetierToDao(final CrueData metier, final CtuluAnalyze analyser) {
- final CrueDaoDPTG res = new CrueDaoDPTG(Crue10FileFormat.getDPTGFileFormat().getXsdValidator());
+ final CrueDaoDPTG res = new CrueDaoDPTG();
CrueConverterDPTG.remplirPersistanceDPTG(res, metier, analyser);
return res;
}
@@ -231,7 +230,7 @@
profilPersistant.Serie = new CrueDaoStructureCommon.SerieFF();
profilPersistant.Serie.listePoints = new ArrayList<String>();
for (final PtProfil serie : prtgeo.getListeProfils()) {
- final String buff = "" + serie.getYP() + " " + serie.getZ();
+ final String buff = serie.getYP() + " " + serie.getZ();
profilPersistant.Serie.listePoints.add(buff);
}
} else {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDPTI.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDPTI.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDPTI.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -26,7 +26,6 @@
import org.fudaa.dodico.crue.dao.CrueDaoStructureDPTI.SectionRefInterpolee;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDPTI.SectionRefProfil;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDPTI.SectionRefSansGeometrie;
-import org.fudaa.dodico.crue.io.Crue10FileFormat;
import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
@@ -96,7 +95,7 @@
}
public CrueDaoDPTI convertMetierToDao(final CrueData metier, final CtuluAnalyze analyser) {
- final CrueDaoDPTI res = new CrueDaoDPTI(Crue10FileFormat.getDPTIFileFormat().getXsdValidator());
+ final CrueDaoDPTI res = new CrueDaoDPTI();
// -- etape 1: on remplit les infso des noeuds --//
res.Noeuds = CrueConverterDPTI.remplirPersistanceAvecNoeudDPTI(metier.getNoeuds(), analyser);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDRSO.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDRSO.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterDRSO.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -37,7 +37,6 @@
import org.fudaa.dodico.crue.dao.CrueDaoStructureDRSO.SectionRefSansGeometrie;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDRSO.SectionReferenceeParIdem;
import org.fudaa.dodico.crue.dao.CrueDaoStructureDRSO.SectionSansGeometrie;
-import org.fudaa.dodico.crue.io.Crue10FileFormat;
import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
@@ -103,7 +102,7 @@
}
public CrueDaoDRSO convertMetierToDao(final CrueData metier, final CtuluAnalyze analyser) {
- final CrueDaoDRSO res = new CrueDaoDRSO(Crue10FileFormat.getDRSOFileFormat().getXsdValidator());
+ final CrueDaoDRSO res = new CrueDaoDRSO();
// -- etape 1: on remplit les infso des noeuds --//
res.Noeuds = CrueConverterDRSO.remplirPersistanceAvecNoeudDRSO(metier.getNoeuds(), analyser);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterOPTG.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterOPTG.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterOPTG.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -18,7 +18,6 @@
import org.fudaa.dodico.crue.dao.CrueDaoStructureOPTG.RegleRebDeb;
import org.fudaa.dodico.crue.dao.CrueDaoStructureOPTG.RegleSeuilDetect;
import org.fudaa.dodico.crue.dao.CrueDaoStructureOPTG.RegleVarPdxMax;
-import org.fudaa.dodico.crue.io.Crue10FileFormat;
import org.fudaa.dodico.crue.metier.emh.DonPrtReseau;
import org.fudaa.dodico.crue.metier.emh.Regle;
import org.fudaa.dodico.crue.metier.helper.RegleHelper;
@@ -72,7 +71,7 @@
}
public CrueDaoOPTG convertMetierToDao(final DonPrtReseau metier, final CtuluAnalyze analyser) {
- final CrueDaoOPTG dao = new CrueDaoOPTG(Crue10FileFormat.getOPTGFileFormat().getXsdValidator());
+ final CrueDaoOPTG dao = new CrueDaoOPTG();
dao.Planimetrage = new Planimetrage();
dao.Planimetrage.NbrPdz = metier.getNbRpdz();
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterORES.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterORES.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueConverterORES.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -26,7 +26,6 @@
import org.fudaa.dodico.crue.dao.CrueDaoStructureORES.SectionInterpoleePersist;
import org.fudaa.dodico.crue.dao.CrueDaoStructureORES.SectionProfilPersist;
import org.fudaa.dodico.crue.dao.CrueDaoStructureORES.SectionSansGeometriePersist;
-import org.fudaa.dodico.crue.io.Crue10FileFormat;
import org.fudaa.dodico.crue.metier.emh.OrdResCalcul;
import org.fudaa.dodico.crue.metier.emh.OrdResCalculBrancheBarrageFilEau;
import org.fudaa.dodico.crue.metier.emh.OrdResCalculBrancheBarrageGenerique;
@@ -230,7 +229,7 @@
*/
public CrueDaoORES convertMetierToDao(OrdResCalcul metier, CtuluAnalyze analyser) {
- final CrueDaoORES res = new CrueDaoORES(Crue10FileFormat.getORESFileFormat().getXsdValidator());
+ final CrueDaoORES res = new CrueDaoORES();
res.Noeuds = new ArrayList<NoeudNiveauContinuPersist>();
res.Casiers = new ArrayList<CasierAbstractPersist>();
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDCLM.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDCLM.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDCLM.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -20,8 +20,7 @@
*
* @param xsdVersionValidator chemin relatif du XSD
*/
- public CrueDaoDCLM(final String xsdVersionValidator) {
- super(xsdVersionValidator);
+ public CrueDaoDCLM() {
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDCSP.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDCSP.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDCSP.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -13,9 +13,7 @@
*/
public class CrueDaoDCSP extends AbstractCrueDao {
- public CrueDaoDCSP(final String xsdVersionValidator) {
- super(xsdVersionValidator);
- }
+ public CrueDaoDCSP() {}
public String VersionCrue = CrueHelper.VersionCrue;
public String Commentaire = CrueHelper.Commentaire;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDFRT.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDFRT.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDFRT.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -11,9 +11,7 @@
* @author Adrien Hadoux
*/
public class CrueDaoDFRT extends AbstractCrueDao {
- public CrueDaoDFRT(final String xsdVersionValidator) {
- super(xsdVersionValidator);
- }
+ public CrueDaoDFRT() {}
/**
* Suffixe ajout� aux r�f�rences des objets emh du fichier dpti pour indiquer qu'ils r�f�rent aux objets d�finis dans
@@ -30,23 +28,4 @@
*/
List<StriRefPersist> listeFrottement;
- // @Override
- // public void fillFromMetier(final List<DonFrt> data, final CtuluAnalyze analyser) {
- // listeFrottement = CrueConverterDFRT.convertToDao(data, analyser);
- //
- // }
- //
- // @Override
- // public List<DonFrt> convertToMetier(final CtuluAnalyze analyser, final Object data) {
- // return CrueConverterDFRT.convertToEMH(listeFrottement, analyser);
- // }
-
- // @Override
- // public XStream initXmlParser() {
- // final XStream xstream = new XStream(new DomDriver());
- // // -- initialisation du format de la structure des documents --//
- // CrueDaoStructuresFormatDFRT.initXmlParserForDFRT(xstream);
- // return xstream;
- // }
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDLHY.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDLHY.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDLHY.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -29,13 +29,4 @@
protected List<Tarrage> Tarrages;
protected Manoeuvres Manoeuvres;
- /**
- * Constructeur
- *
- * @param xsdVersionValidator
- */
- public CrueDaoDLHY(final String xsdVersionValidator) {
- super(xsdVersionValidator);
- }
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDPTG.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDPTG.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDPTG.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -15,9 +15,6 @@
* @author Adrien Hadoux
*/
public class CrueDaoDPTG extends AbstractCrueDao {
- public CrueDaoDPTG(final String xsdVersionValidator) {
- super(xsdVersionValidator);
- }
public static final String SUFFIXE_REF_DPTG = "DPTG#";
@@ -29,30 +26,4 @@
List<SectionIdem> Sections;
List<BrancheSaintVenant> Branches;
- // @Override
- // public void fillFromMetier(final CrueData data, final CtuluAnalyze listeMessageError) {
- // CrueConverterDPTG.remplirPersistanceDPTG(this, data, listeMessageError);
- //
- // }
-
- // @Override
- // public CrueData convertToMetier(final CtuluAnalyze listeMessageError, final Object dataLinked) {
- // if (dataLinked != null && (dataLinked instanceof CrueData)) {
- // final CrueData structure = (CrueData) dataLinked;
- // CrueConverterDPTG.remplirMetierDPTG(this, structure, listeMessageError);
- // return structure;
- //
- // } else {
- // return null;
- // }
- // }
-
- // @Override
- // public XStream initXmlParser() {
- // final XStream xstream = new XStream(new DomDriver());
- // // -- initialisation du format de la structure des documents --//
- // CrueDaoStructuresFormatDPTG.initXmlParserForDPTG(xstream);
- // return xstream;
- // }
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDPTI.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDPTI.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDPTI.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -15,10 +15,6 @@
*/
public class CrueDaoDPTI extends AbstractCrueDao {
- public CrueDaoDPTI(final String xsdVersionValidator) {
- super(xsdVersionValidator);
- }
-
public String VersionCrue = CrueHelper.VersionCrue;
public String Commentaire = CrueHelper.Commentaire;
@@ -42,57 +38,4 @@
*/
List<SectionAbstract> Sections;
- // @Override
- // public void fillFromMetier(final CrueData data, final CtuluAnalyze listeMessageError) {
- // // TODO Auto-generated method stub
- // // -- etape 1: on remplit les infso des noeuds --//
- // Noeuds = CrueConverterDPTI.remplirPersistanceAvecNoeudDPTI(data.getNoeuds(), listeMessageError);
- //
- // // -- etape 2: on remplit les infso des branches --//
- // Branches = CrueConverterDPTI.remplirPersistanceAvecBrancheDPTI(data.getBranches(), listeMessageError);
- //
- // // -- etape 3: on remplit les infso des casiers --//
- // Casiers = CrueConverterDPTI.remplirPersistanceAvecCasierDPTI(data.getCasiers(), listeMessageError);
- //
- // // -- etape 4: on remplit les infso des sections --//
- // Sections = CrueConverterDPTI.remplirPersistanceAvecSectionDPTI(data.getSections(), listeMessageError);
- //
- // }
-
- // @Override
- // CrueData convertToMetier(final CtuluAnalyze listeMessageError, final Object dataLinked) {
- //
- // if (dataLinked == null || !(dataLinked instanceof CrueData)) {
- // listeMessageError
- // .addFatalError(CrueResource
- // .getS("Impossible de r�cup�rer les donn�es r�saux (DRSO). Les r�f�rences du fichier DPTI ne pourront etre utilis�es."));
- // return null;
- // }
- // final CrueData dataCrue = (CrueData) dataLinked;
- //
- // // -- remplissage des noeuds --//
- // CrueConverterDPTI.remplirNoeudAvecPersistanceDPTI(Noeuds, dataCrue.getNoeuds(), listeMessageError);
- //
- // // -- remplissage des branches --//
- // CrueConverterDPTI.remplirBrancheAvecPersistanceDPTI(Branches, dataCrue.getBranches(), listeMessageError);
- //
- // // -- remplissage des casiers --//
- // CrueConverterDPTI.remplirCasierAvecPersistanceDPTI(Casiers, dataCrue.getCasiers(), listeMessageError);
- //
- // // -- remplissage des sections --//
- // CrueConverterDPTI.remplirSectionsAvecPersistanceDPTI(Sections, dataCrue.getSections(), listeMessageError);
- //
- // // TODO pour le moment rien mais il faudrait demander des pr�cisions --//
- //
- // return dataCrue;
- // }
-
- // @Override
- // public XStream initXmlParser() {
- // final XStream xstream = new XStream(new DomDriver());
- // // -- init du parser --//
- // CrueDaoStructuresFormatDPTI.initXmlParserForDPTI(xstream);
- // return xstream;
- // }
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDRSO.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDRSO.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoDRSO.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -15,11 +15,6 @@
*/
public class CrueDaoDRSO extends AbstractCrueDao {
- public CrueDaoDRSO(final String xsdVersionValidator) {
- super(xsdVersionValidator);
-
- }
-
public String VersionCrue = CrueHelper.VersionCrue;
public String Commentaire = CrueHelper.Commentaire;
@@ -48,59 +43,4 @@
*/
List<BrancheAbstract> Branches;
- // @Override
- // public XStream initXmlParser() {
- // final XStream xstream = new XStream(new DomDriver());
- // // -- initialisation du format de la structure des documents --//
- // CrueDaoStructuresFormatDRSO.initXmlParserForDRSO(xstream);
- // return xstream;
- // }
-
- // @Override
- // public void fillFromMetier(final CrueData data, final CtuluAnalyze listeMessageError) {
- //
- // // -- etape 1: on remplit les infso des noeuds --//
- // Noeuds = CrueConverterDRSO.remplirPersistanceAvecNoeudDRSO(data.getNoeuds(), listeMessageError);
- //
- // // -- etape 2: on remplit les infso des casiers --//
- // Casiers = CrueConverterDRSO.remplirPersistanceAvecCasierDRSO(data.getCasiers(), listeMessageError);
- //
- // // -- etape 3: on remplit les infso des sections --//
- // Sections = CrueConverterDRSO.remplirPersistanceAvecSectionsDRSO(data.getSections(), listeMessageError);
- //
- // // -- etape 4: on remplit les infso des branches --//
- // Branches = CrueConverterDRSO.remplirPersistanceAvecBrancheDRSO(data.getAllEMH(), listeMessageError);
- //
- // }
-
- // @Override
- // public CrueData convertToMetier(final CtuluAnalyze listeMessageError, final Object dataLinked) {
- // final CrueData res = new CrueData();
- // CrueConverterDRSO.cptEntries = 1;
- //
- // // -- etape 1: on remplit les infso des noeuds --//
- // final List<CatEMHNoeud> listeNoeuds = CrueConverterDRSO.remplirNoeudAvecPersistanceDRSO(Noeuds, listeMessageError);
- //
- // // -- etape 2: les casiers --//
- // final List<CatEMHCasier> listeCasiers = CrueConverterDRSO.remplirCasierAvecPersistanceDRSO(Casiers, listeNoeuds,
- // listeMessageError);
- //
- // // -- etape 3: les sections a partir des sections--//
- //
- // final List<CatEMHSection> listeSections = CrueConverterDRSO.remplirSectionsAvecPersistanceDRSO(Sections,
- // listeMessageError);
- //
- // // -- etape 4: les branches et les sections de bransche cr�es lors du remplissage des sections --//
- // final List<CatEMHBranche> listeBranches = CrueConverterDRSO.remplirBrancheAvecPersistanceDRSO(Branches,
- // listeSections, listeNoeuds, listeMessageError);
- //
- // // -- on ajoute tout dans la liste compl�te --//
- // res.setNoeuds(listeNoeuds);
- // res.setBranches(listeBranches);
- // res.setSections(listeSections);
- // res.setCasiers(listeCasiers);
- //
- // return res;
- // }
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoETU.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoETU.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoETU.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -16,10 +16,6 @@
*/
public class CrueDaoETU extends AbstractCrueDao {
- public CrueDaoETU(final String xsdVersionValidator) {
- super(xsdVersionValidator);
- }
-
public String Commentaire = CrueHelper.Commentaire;
public String Creation;
public String DateCreation;
@@ -34,23 +30,4 @@
public String Rapports;
public List<Scenario> Scenarios;
- // @Override
- // public void fillFromMetier(final EMHproject data, final CtuluAnalyze analyser) {
- //
- // // -- on ne fais pas d'�criture pour ce fichier --//
- // }
- //
- // @Override
- // public EMHproject convertToMetier(final CtuluAnalyze analyser, final Object dataLinked) {
- // return CrueConverterETU.remplirMetierETU(this, analyser);
- // }
-
- // @Override
- // public XStream initXmlParser() {
- // final XStream xstream = new XStream(new DomDriver());
- // // -- initialisation du format de la structure des documents --//
- // CrueDaoStructuresFormatETU.initXmlParserForETU(xstream);
- // return xstream;
- // }
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoOPTG.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoOPTG.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoOPTG.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -14,10 +14,6 @@
@SuppressWarnings("PMD.VariableNamingConventions")
public class CrueDaoOPTG extends AbstractCrueDao {
- public CrueDaoOPTG(final String xsdVersionValidator) {
- super(xsdVersionValidator);
- }
-
public String VersionCrue = CrueHelper.VersionCrue;
public String Commentaire = CrueHelper.Commentaire;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoORES.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoORES.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueDaoORES.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -32,11 +32,4 @@
/** Représente la balise portant le même nom dans le fichier XML */
public List<BrancheAbstractPersist> Branches;
- /**
- * @param xsdVersionValidator
- */
- public CrueDaoORES(String xsdVersionValidator) {
- super(xsdVersionValidator);
- }
-
}
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueXmlReaderWriter.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueXmlReaderWriter.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueXmlReaderWriter.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -0,0 +1,87 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.dao;
+
+import java.io.File;
+import java.io.OutputStream;
+import java.net.URL;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+
+/**
+ * @author deniger
+ * @param <M> l'objet metier supporte
+ */
+public interface CrueXmlReaderWriter<M> {
+
+ /**
+ * @return l'identifiant: dfrt par exemple.
+ */
+ String getXsdId();
+
+ /**
+ * @return le path du fichier xsd correspondant
+ */
+ String getXsdValidator();
+
+ /**
+ * @return true si le fichier demandé s'auto-suffit. Si il a besoin d'autre fichiers (ref ou dépendances) retourne
+ * false.
+ */
+ boolean isIndependant();
+
+ /**
+ * Lit les données dans le fichier f avec les données liées.
+ *
+ * @param dataLinked
+ * @return l'objet metier lu.
+ */
+ M readXML(final File f, final CtuluAnalyze analyzer, final Object dataLinked);
+
+ /**
+ * Lit les données dans le fichier f avec les données liées.
+ *
+ * @param dataLinked
+ * @return
+ */
+ M readXML(final String pathToResource, final CtuluAnalyze analyzer, final Object dataLinked);
+
+ /**
+ * Lit les données dans le fichier f avec les données liées.
+ *
+ * @param dataLinked
+ * @return
+ */
+ M read(final URL f, final CtuluAnalyze analyzer, final Object dataLinked);
+
+ boolean isValide(final File xml, final CtuluAnalyze res);
+
+ boolean isValide(final String xml, final CtuluAnalyze res);
+
+ boolean isValide(final URL xml, final CtuluAnalyze res);
+
+ /**
+ * MEthode qui permet d'�crire les datas dans le fichier f sp�cifi�.
+ *
+ * @param data
+ * @param f
+ * @return
+ */
+ boolean writeXML(final M metier, final File f, final CtuluAnalyze analyzer);
+
+ /**
+ * @param out le flux de sortie qui ne sera pas ferme
+ * @param metier l'objet metier
+ * @param analyser
+ * @return true si reussite
+ */
+ boolean writeXML(final OutputStream out, final M metier, final CtuluAnalyze analyser);
+
+ /**
+ * @param isIndependant the isInpendant to set
+ */
+ public void setIndependant(final boolean isIndependant);
+
+}
\ No newline at end of file
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueXmlReaderWriterImpl.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueXmlReaderWriterImpl.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/dao/CrueXmlReaderWriterImpl.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -0,0 +1,432 @@
+package org.fudaa.dodico.crue.dao;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.xml.XMLConstants;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.ctulu.CtuluLibFile;
+import org.fudaa.dodico.crue.common.CrueResource;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+import com.memoire.fu.FuLog;
+import com.thoughtworks.xstream.InitializationException;
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.XStreamException;
+import com.thoughtworks.xstream.converters.ConversionException;
+import com.thoughtworks.xstream.converters.reflection.ObjectAccessException;
+import com.thoughtworks.xstream.core.TreeMarshaller.CircularReferenceException;
+import com.thoughtworks.xstream.io.StreamException;
+import com.thoughtworks.xstream.io.xml.DomDriver;
+import com.thoughtworks.xstream.mapper.CannotResolveClassException;
+
+/**
+ * File format customisé pour Crue. Indique si le fichier est de type crue 9 ou 10. Contient un validator xsd pour le
+ * fichier donné. Contient une méthode statique très pratique qui permet de retourner automatiquement le bon FileFormat
+ * en fonction du type renvoyé. T correspond à la structure métier associée au format du fichier
+ *
+ * @param <D> Represente la structure DAO
+ * @param <M> Represente le modele Metier
+ * @author Adrien Hadoux
+ */
+public class CrueXmlReaderWriterImpl<D extends AbstractCrueDao, M> implements CrueXmlReaderWriter<M> {
+
+ /**
+ * @author deniger
+ */
+ private static final class ErrorHandlerDefault implements ErrorHandler {
+ private boolean hasError;
+ /**
+ *
+ */
+ private final CtuluAnalyze res;
+
+ /**
+ * @param res
+ */
+ private ErrorHandlerDefault(final CtuluAnalyze res) {
+ this.res = res;
+ }
+
+ public void error(final SAXParseException exception) throws SAXException {
+ hasError = true;
+ res.addError(exception.getMessage(), exception.getLineNumber());
+ }
+
+ public void fatalError(final SAXParseException exception) throws SAXException {
+ hasError = true;
+ res.addFatalError(exception.getMessage());
+
+ }
+
+ /**
+ * @return the hasError
+ */
+ protected boolean isHasError() {
+ return hasError;
+ }
+
+ public void warning(final SAXParseException exception) throws SAXException {
+ res.addWarn(exception.getMessage(), exception.getLineNumber());
+
+ }
+ }
+
+ private final CrueConverter<D, M> converter;
+ private final CrueDaoStructure daoConfigurer;
+
+ boolean isIndependant;
+ /**
+ * La version du fichier
+ */
+ private final String version;
+
+ /**
+ * le nom du fichier xsd a utiliser
+ */
+ private final String xsdId;
+
+ /**
+ * La path complet du fichier xsd
+ */
+ private final String xsdPath;
+ private final String xsdFile;
+
+ /**
+ * @param type le type en Upper case comme par exemple DFRT.
+ */
+ public CrueXmlReaderWriterImpl(final String xsdId, final CrueConverter<D, M> converter,
+ final CrueDaoStructure daoConfigurer) {
+ this(xsdId, "1.0", converter, daoConfigurer);
+ }
+
+ /**
+ * @param type le type en Upper case comme par exemple DFRT.
+ */
+ protected CrueXmlReaderWriterImpl(final String xsdId, final String version, final CrueConverter<D, M> converter,
+ final CrueDaoStructure daoConfigurer) {
+ this.daoConfigurer = daoConfigurer;
+ this.converter = converter;
+ this.version = version;
+ this.xsdId = xsdId;
+ this.xsdFile = xsdId + "-" + version + ".xsd";
+ xsdPath = "/xsd/" + xsdFile;
+
+ }
+
+ /**
+ * @return the xsdId
+ */
+ public String getXsdId() {
+ return xsdId;
+ }
+
+ protected final void configureXStream(final XStream xstream) {
+ daoConfigurer.configureXStream(xstream);
+ }
+
+ /**
+ * @return the version
+ */
+ public String getVersion() {
+ return version;
+ }
+
+ /**
+ * @return le path dans jar vers le fichier xsd correspondant
+ */
+ public final String getXsdValidator() {
+ return xsdPath;
+ }
+
+ protected XStream initXmlParser() {
+ final XStream xstream = new XStream(new DomDriver());
+ // -- creation des alias pour que ce soit + parlant dans le xml file --//
+
+ // -- alias pour les entete xsd --//
+
+ xstream.aliasAttribute("xmlns:xsi", "xmlnsxsi");
+ xstream.aliasAttribute("xsi:schemaLocation", "xsischemaLocation");
+
+ xstream.useAttributeFor(AbstractCrueDao.class, "xmlns");
+ xstream.useAttributeFor(AbstractCrueDao.class, "xmlnsxsi");
+ xstream.useAttributeFor(AbstractCrueDao.class, "xsischemaLocation");
+
+ configureXStream(xstream);
+ return xstream;
+ }
+
+ /**
+ * @return true si le fichier demandé s'auto-suffit. Si il a besoin d'autre fichiers (ref ou dépendances) retourne
+ * false.
+ */
+ public final boolean isIndependant() {
+ return isIndependant;
+ }
+
+ public boolean isValide(final File xml, final CtuluAnalyze res) {
+ try {
+ return isValide(xml.toURL(), res);
+ } catch (final MalformedURLException e) {
+ res.manageException(e);
+ FuLog.error(e);
+ return false;
+ }
+ }
+
+ public boolean isValide(final String xml, final CtuluAnalyze res) {
+ return isValide(getClass().getResource(xml), res);
+ }
+
+ public boolean isValide(final URL xml, final CtuluAnalyze res) {
+ final ErrorHandlerDefault handler = new ErrorHandlerDefault(res);
+ try {
+ final URL xsdURL = getClass().getResource(xsdPath);
+ final SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+ final Schema schema = schemaFactory.newSchema(xsdURL);
+ final Validator validator = schema.newValidator();
+ validator.validate(new SAXSource(new InputSource(xml.toString())));
+
+ } catch (final Exception e) {
+ res.manageException(e);
+ FuLog.error(e);
+ return false;
+ }
+ return !handler.isHasError();
+ }
+
+ /**
+ * Lit les données dans le fichier f avec les données liées.
+ *
+ * @param dataLinked
+ * @return
+ */
+ public final M read(final URL f, final CtuluAnalyze analyzer, final Object dataLinked) {
+ final D d = readDao(f, analyzer, dataLinked);
+ if (d != null) { return converter.convertDaoToMetier(d, dataLinked, analyzer); }
+ return null;
+
+ }
+
+ /**
+ * @param fichier
+ * @return
+ */
+ public D readDao(final File fichier, final CtuluAnalyze analyser, final Object dataLinked) {
+ // TODO a remettre if (!isValide(fichier, analyser)) { return null; }
+ FileInputStream in = null;
+ D newData = null;
+ try {
+ in = new FileInputStream(fichier);
+ newData = readDao(in, analyser, dataLinked);
+ } catch (final FileNotFoundException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur d'ecriture du fichier"));
+ } finally {
+ CtuluLibFile.close(in);
+ }
+ return newData;
+
+ }
+
+ /**
+ * @param in
+ * @return le dao
+ */
+ protected D readDao(final InputStream in, final CtuluAnalyze analyser, final Object dataLinked) {
+ D newData = null;
+ try {
+ final XStream parser = initXmlParser();
+
+ final BufferedReader contentRead = new BufferedReader(new InputStreamReader(in, "UTF-8"));
+
+ newData = (D) parser.fromXML(contentRead);
+ } catch (final CircularReferenceException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur de lecture du fichier"));
+
+ } catch (final ConversionException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur de lecture du fichier"));
+
+ } catch (final InitializationException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur de lecture du fichier"));
+ } catch (final ObjectAccessException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur de lecture du fichier"));
+ } catch (final StreamException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur de lecture du fichier"));
+
+ } catch (final CannotResolveClassException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur d'ecriture du fichier"));
+
+ } catch (final XStreamException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur de lecture du fichier"));
+ } catch (final UnsupportedEncodingException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur de lecture du fichier"));
+ }
+ return newData;
+
+ }
+
+ /**
+ * @param pathToResource l'adresse du fichier a charger commencant par /
+ * @param analyser
+ * @param dataLinked
+ * @return
+ */
+ protected D readDao(final String pathToResource, final CtuluAnalyze analyser, final Object dataLinked) {
+ return readDao(getClass().getResource(pathToResource), analyser, dataLinked);
+ }
+
+ /**
+ * @param fichier
+ * @return
+ */
+ public D readDao(final URL url, final CtuluAnalyze analyser, final Object dataLinked) {
+ if (url == null) {
+ analyser.addFatalError("file.url.null", -1);
+ return null;
+ }
+ // TODO a remetter if (!isValide(url, analyser)) { return null; }
+ InputStream in = null;
+ D newData = null;
+ try {
+ in = url.openStream();
+ newData = readDao(in, analyser, dataLinked);
+ } catch (final IOException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur d'ecriture du fichier"));
+ } finally {
+ CtuluLibFile.close(in);
+ }
+ return newData;
+
+ }
+
+ /**
+ * Lit les données dans le fichier f avec les données liées.
+ *
+ * @param dataLinked
+ * @return
+ */
+ public final M readXML(final File f, final CtuluAnalyze analyzer, final Object dataLinked) {
+ final D d = readDao(f, analyzer, dataLinked);
+ if (d != null) { return converter.convertDaoToMetier(d, dataLinked, analyzer); }
+ return null;
+
+ }
+
+ /**
+ * Lit les données dans le fichier f avec les données liées.
+ *
+ * @param dataLinked
+ * @return
+ */
+ public final M readXML(final String pathToResource, final CtuluAnalyze analyzer, final Object dataLinked) {
+ final D d = readDao(pathToResource, analyzer, dataLinked);
+ if (d != null) { return converter.convertDaoToMetier(d, dataLinked, analyzer); }
+ return null;
+
+ }
+
+ /**
+ * @param isIndependant the isInpendant to set
+ */
+ public void setIndependant(final boolean isIndependant) {
+ this.isIndependant = isIndependant;
+ }
+
+ protected boolean writeDAO(final File file, final D dao, final CtuluAnalyze analyser) {
+ FileOutputStream out = null;
+ boolean ok = true;
+ try {
+ out = new FileOutputStream(file);
+ ok = writeDAO(out, dao, analyser);
+ } catch (final FileNotFoundException e) {
+ FuLog.error(e);
+ ok = false;
+ } finally {
+ CtuluLibFile.close(out);
+ }
+ return ok;
+
+ }
+
+ /**
+ * @param out le flux de sortie
+ * @param dao le dao a persister
+ * @param analyser le receveur d'information
+ * @return
+ */
+ protected boolean writeDAO(final OutputStream out, final D dao, final CtuluAnalyze analyser) {
+ boolean isOk = true;
+ try {
+ final BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out, "UTF-8"));
+ writer.write(ValidatorXml.enteteXml + "\n");
+ final XStream parser = initXmlParser();
+ parser.toXML(dao, writer);
+
+ } catch (final IOException e) {
+ FuLog.debug(e.getMessage());
+ analyser.addFatalError(CrueResource.getS("Erreur d'ecriture du fichier"));
+ isOk = false;
+ }
+ return isOk;
+ }
+
+ /**
+ * MEthode qui permet d'�crire les datas dans le fichier f sp�cifi�.
+ *
+ * @param data
+ * @param f
+ * @return
+ */
+ public final boolean writeXML(final M metier, final File f, final CtuluAnalyze analyzer) {
+ final D d = converter.convertMetierToDao(metier, analyzer);
+ if (d != null) {
+ d.setXsdName(xsdFile);
+ return writeDAO(f, d, analyzer);
+ }
+ return false;
+ }
+
+ /**
+ * @param out le flux de sortie qui ne sera pas ferme
+ * @param metier l'objet metier
+ * @param analyser
+ * @return true si reussite
+ */
+ public boolean writeXML(final OutputStream out, final M metier, final CtuluAnalyze analyser) {
+
+ final D d = converter.convertMetierToDao(metier, analyser);
+ if (d != null) { return writeDAO(out, d, analyser); }
+ return false;
+ }
+
+}
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -0,0 +1,75 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.io;
+
+import java.io.File;
+import java.io.OutputStream;
+import java.net.URL;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.ctulu.CtuluIOOperationSynthese;
+import org.fudaa.dodico.crue.dao.CrueHelper;
+import org.fudaa.dodico.crue.io.neuf.AbstractCrue9Reader;
+import org.fudaa.dodico.crue.io.neuf.AbstractCrue9Writer;
+import org.fudaa.dodico.crue.metier.emh.CrueData;
+
+/**
+ * @author deniger
+ */
+public abstract class AbstractCrue9FileFormat extends CustomFileFormatUnique<CrueData> {
+
+ /**
+ * @param id identifiant du format
+ */
+ public AbstractCrue9FileFormat(final String id) {
+ super(1);
+ nom = id;
+ this.id = nom;
+ extensions = new String[] { id.toLowerCase() };
+ description = nom + ".file";
+ }
+
+ /**
+ * @return le reader qui va bien
+ */
+ protected abstract AbstractCrue9Reader createReader();
+
+ /**
+ * @return
+ */
+ protected abstract AbstractCrue9Writer createWriter();
+
+ public CrueData read(final File f, final CtuluAnalyze analyzer, final Object dataLinked) {
+ final AbstractCrue9Reader reader = createReader();
+ final CtuluIOOperationSynthese operation = reader.read(f, null);
+
+ CrueHelper.copyAnalyzer(analyzer, operation.getAnalyze());
+
+ if (operation.getSource() != null) { return (CrueData) operation.getSource(); }
+ return null;
+ }
+
+ public CrueData read(final String pathToResource, final CtuluAnalyze analyzer, final Object dataLinked) {
+ throw new IllegalAccessError("Must be done");
+ }
+
+ public CrueData read(final URL url, final CtuluAnalyze analyzer, final Object dataLinked) {
+ throw new IllegalAccessError("Must be done");
+ }
+
+ public boolean write(final CrueData metier, final File f, final CtuluAnalyze analyzer) {
+ final AbstractCrue9Writer writer = createWriter();
+ final CtuluIOOperationSynthese operation = writer.write(metier);
+
+ CrueHelper.copyAnalyzer(analyzer, operation.getAnalyze());
+
+ return operation != null && (operation.containsClosingError() || operation.containsFatalError());
+ }
+
+ public boolean write(final OutputStream out, final CrueData metier, final CtuluAnalyze analyser) {
+ throw new IllegalAccessError("Must be done");
+ }
+
+}
\ No newline at end of file
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue09reader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue09reader.java 2009-04-21 19:57:39 UTC (rev 4670)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue09reader.java 2009-04-21 22:32:19 UTC (rev 4671)
@@ -1,97 +0,0 @@
-package org.fudaa.dodico.crue.io;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.fudaa.ctulu.CtuluActivity;
-import org.fudaa.dodico.fortran.FileOpReadCharSimpleAbstract;
-
-/**
- * G�re la lecteure du format crue 09. Utilise fortran reader
- *
- * @author Adrien Hadoux
- */
-public abstract class Crue09reader extends FileOpReadCharSimpleAbstract implements CtuluActivity {
-
- /**
- * Toutes les lignes qui commencent par * sont des dlignes caracteres
- */
- public final static String CARACT_COMMENT = "*";
-
- /**
- * Nb de lignes qui composent le titre en début de fichier. Valable pour dc et dh.
- */
- public final static int nbLignesTitre_deb = 5;
-
- /**
- * mot clef qui sépare les définitions des objets.
- */
- public final static String keyWordDefinition = "Définition";
-
- /**
- * retourne true si la ligne est null ou commence par *.
- *
- * @param lineRead
- * @return
- */
- public boolean isACommentLine(final String lineRead) {
-
- return lineRead == null ? true : lineRead.startsWith(CARACT_COMMENT);
-
- }
-
- /**
- * Retourne true si il s'agit d'un nouveau mot clef définition.
- *
- * @param lineRead
- * @return
- */
- public boolean isAKeyWordDefinition(final String lineRead) {
-
- return lineRead == null ? false : lineRead.contains(keyWordDefinition);
-
- }
-
- /**
- * Methode qui lit tous les commentair...
[truncated message content] |
