Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[5570] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2009-12-22 01:55:02
|
Revision: 5570
http://fudaa.svn.sourceforge.net/fudaa/?rev=5570&view=rev
Author: deniger
Date: 2009-12-22 01:54:50 +0000 (Tue, 22 Dec 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ExecuteComparaison.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/FactoryEqualsTester.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/TesterHelper.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/common/CrueData.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataImpl.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractDaoLoi.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPNUM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructure.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDCLM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDLHY.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureETU.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureORES.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructurePCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructurePNUM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueXmlReaderWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueXmlReaderWriterImpl.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/DHReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHProjet.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermBrancheOrificeManoeuvre.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermBrancheSaintVenantQruis.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermCasierProfilQruis.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermNoeudNiveauContinuQapp.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermNoeudNiveauContinuZimpose.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransBrancheOrificeManoeuvre.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DefaultValues.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheBarrageFilEau.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/DonCalcSansPrtBrancheNiveauxAssocies.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheQ.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSaintVenant.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtCasierProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniBranche.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniBrancheOrifice.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniBrancheSaintVenant.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniCasierProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniNoeudNiveauContinu.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniSection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoBatiCasier.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoBrancheSaintVenant.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoProfilCasier.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoProfilSectionFenteData.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoSectionIdem.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ElemOrifice.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ElemPdt.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ElemSeuil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ElemSeuilAvecPdc.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumTypeLoi.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdPrtGeoModeleBase.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamCalcScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcPseudoPerm.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcTrans.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumModeleBase.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/PlanimetrageNbrPdzCst.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMHSectionDansBrancheSaintVenant.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/FactoryEMH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/FactoryEMHRelation.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue10.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CrueLoaderNature.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CrueLoaderProperty.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CrueNumberParser.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/PropertyValidator.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/CruePrefix.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ScenarioWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateEMHProperties.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateModeleScenarioWithSchema.java
trunk/soft/fudaa-crue/dodico/src/main/resources/configLoi.xml
trunk/soft/fudaa-crue/dodico/src/main/resources/crue-nature.csv
trunk/soft/fudaa-crue/dodico/src/main/resources/crue-variable.csv
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/ioMessages.properties
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/configLoi-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-common-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-dcsp-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-dfrt-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/scenario-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/TestComparaisonFactory.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/TestEqualsTesterLoi.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/TestExecuteComparaison.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/TestRequete.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/AbstractIOTestCase.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestConfigLoiReader.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDCLMFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDFRTFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDLHYFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueOCALFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/common/TestCrueDataImpl.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/property/TestCrueNatureAndPropertyLoader.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/ExampleValidationVariableBuilder.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/TestValidateModeleScenario.java
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3-1.dcsp.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dfrt.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele3.dlhy.xml
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/Modele4.dcsp.xml
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueTreeProject.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/EMHGeneralBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueEditorImplementation.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueProjet.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioComparaisonUI.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleEMH.java
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/crue/common/ihmMessages.properties
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CrueLoaderConfigLoi.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CrueLoaderProperties.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CrueLoaderPropertiesDefault.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CrueProperties.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CruePropertyContext.java
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-dlhy-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueOPTGFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueOPTIFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueORESFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCruePCALFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCruePNUMFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueSTO.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueSTR.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/EMHHelper/
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CrueConfigLoiLoader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CruePropertyDefinitionContainer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CruePropertyDefinitionNatureLoader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CruePropertyDefinitionNatureLoaderDefault.java
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-dfrt-1.0.0.xsd.svntmp
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueOCALFile.java.svntmp
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ExecuteComparaison.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ExecuteComparaison.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ExecuteComparaison.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -15,7 +15,7 @@
import org.fudaa.dodico.crue.comparaison.config.ConfCompare;
import org.fudaa.dodico.crue.comparaison.tester.FactoryEqualsTester;
import org.fudaa.dodico.crue.comparaison.tester.ResultatTest;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* @author deniger
@@ -28,7 +28,7 @@
/**
* @param in
*/
- public ExecuteComparaison(final ConfComparaisonConteneur in, CruePropertyDefinitionContainer props) {
+ public ExecuteComparaison(final ConfComparaisonConteneur in, CrueProperties props) {
this(in, new FactoryEqualsTester(props));
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -15,6 +15,7 @@
import org.apache.commons.lang.StringUtils;
import org.fudaa.dodico.crue.common.CustomPropertyUtilsBeanInstaller;
import org.fudaa.dodico.crue.comparaison.common.ComparaisonMessages;
+import org.fudaa.dodico.crue.metier.emh.InfosEMH;
import org.fudaa.dodico.crue.metier.emh.ObjetNomme;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -156,7 +157,11 @@
*/
private EqualsTester getTesterToUse(final Object parentObject, final String name, final TesterContext context,
final Object init) {
+ if ("emh".equals(name)) {
+ if (parentObject instanceof InfosEMH) { return null; }
+ }
final EqualsTester tester = factory.buildTesterFor(parentObject.getClass(), init.getClass(), name);
+
final boolean isComplexTest = TesterContextImpl.isComplexEqualsTester(tester);
if (isComplexTest) {
// la comparaison a été demandée explicitement par le user.
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/FactoryEqualsTester.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/FactoryEqualsTester.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/FactoryEqualsTester.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -8,7 +8,7 @@
import org.fudaa.dodico.crue.metier.emh.LoiDF;
import org.fudaa.dodico.crue.metier.emh.LoiFF;
import org.fudaa.dodico.crue.metier.emh.PtProfil;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* @author denf01a
@@ -17,9 +17,9 @@
*/
public class FactoryEqualsTester {
- private final CruePropertyDefinitionContainer propEps;
+ private final CrueProperties propEps;
- public CruePropertyDefinitionContainer getPropEps() {
+ public CrueProperties getPropEps() {
return propEps;
}
@@ -31,7 +31,7 @@
/**
* @param propEps la correspondance propertyName->Epsilon
*/
- public FactoryEqualsTester(final CruePropertyDefinitionContainer propEps) {
+ public FactoryEqualsTester(final CrueProperties propEps) {
super();
this.propEps = propEps;
knownTesterBuilder = new HashMap<Class, EqualsTesterItemBuilder>();
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/TesterHelper.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/TesterHelper.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/TesterHelper.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -4,7 +4,7 @@
import java.util.Iterator;
import org.apache.commons.collections.CollectionUtils;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* Methode utilitaire pour comparer des données
@@ -22,7 +22,7 @@
* @param props
* @return true si null, de taille 1 ou si tous les elements sont egaux.
*/
- public static boolean isSame(final Collection toCompare, final CruePropertyDefinitionContainer props) {
+ public static boolean isSame(final Collection toCompare, final CrueProperties props) {
if (CollectionUtils.isEmpty(toCompare) || toCompare.size() == 1) { return true; }
final Iterator it = toCompare.iterator();
final Object first = it.next();
Modified: 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/Crue10FileFormat.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormat.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -12,7 +12,7 @@
import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.common.CrueIOResu;
import org.fudaa.dodico.crue.io.dao.CrueXmlReaderWriter;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
import com.memoire.bu.BuFileFilter;
@@ -220,7 +220,7 @@
// }
public final boolean writeMetierDirect(final M metier, final File f, final CtuluAnalyze analyzer,
- CruePropertyDefinitionContainer props) {
+ CrueProperties props) {
return readerWriter.writeXMLMetier(new CrueIOResu<M>(metier), f, analyzer, props);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueData.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueData.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueData.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -31,7 +31,7 @@
import org.fudaa.dodico.crue.metier.emh.OrdResScenario;
import org.fudaa.dodico.crue.metier.emh.ParamCalcScenario;
import org.fudaa.dodico.crue.metier.emh.ParamNumModeleBase;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* @author deniger
@@ -257,6 +257,6 @@
*/
public void setCrue9ContientDistmax(boolean crue9ContientDistmax);
- public CruePropertyDefinitionContainer getCruePropertyDefinitionContainer();
+ public CrueProperties getCruePropertyDefinitionContainer();
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataImpl.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataImpl.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataImpl.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -37,7 +37,7 @@
import org.fudaa.dodico.crue.metier.emh.ParamCalcScenario;
import org.fudaa.dodico.crue.metier.emh.ParamNumModeleBase;
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* CrueData est un conteneur de donn�es Crue, il contient des donnees EMH de chaque cat�gorie pour optimiser leur acc�s.
@@ -71,7 +71,7 @@
* @return le crueData qui va bien
*/
public static CrueData buildFor(final CatEMHConteneur conteneur,
- final CruePropertyDefinitionContainer propertyDefContainer) {
+ final CrueProperties propertyDefContainer) {
if (conteneur.getCatType().equals(EnumTypeEMH.SCENARIO)) { return new CrueDataImpl((EMHScenario) conteneur, null,
((EMHScenario) conteneur).getConcatSousModele(), propertyDefContainer); }
if (conteneur.getCatType().equals(EnumTypeEMH.MODELE)) { return new CrueDataImpl(null, (EMHModeleBase) conteneur,
@@ -125,18 +125,18 @@
this.crue9ContientDistmax = crue9ContientDistmax;
}
- final CruePropertyDefinitionContainer propertyDefContainer;
+ final CrueProperties propertyDefContainer;
/**
* Données STO
*/
private STOSequentialReader sto;
- public CrueDataImpl(final CruePropertyDefinitionContainer propertyDefContainer) {
+ public CrueDataImpl(final CrueProperties propertyDefContainer) {
this(new EMHNoeudFactory(), propertyDefContainer);
}
- public CrueDataImpl(final EMHNoeudFactory nodeFactory, final CruePropertyDefinitionContainer propertyDefContainer) {
+ public CrueDataImpl(final EMHNoeudFactory nodeFactory, final CrueProperties propertyDefContainer) {
scenarioData = new EMHScenario(propertyDefContainer);
this.propertyDefContainer = propertyDefContainer;
ssModele = new EMHSousModele();
@@ -145,7 +145,7 @@
}
public CrueDataImpl(final EMHScenario scenarioData, final EMHModeleBase modele, final EMHSousModele ssModele,
- final CruePropertyDefinitionContainer propertyDefContainer) {
+ final CrueProperties propertyDefContainer) {
super();
this.propertyDefContainer = propertyDefContainer;
this.scenarioData = scenarioData;
@@ -160,7 +160,7 @@
}
}
- public CruePropertyDefinitionContainer getCruePropertyDefinitionContainer() {
+ public CrueProperties getCruePropertyDefinitionContainer() {
return propertyDefContainer;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractDaoLoi.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractDaoLoi.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/AbstractDaoLoi.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -1,16 +1,16 @@
package org.fudaa.dodico.crue.io.dao;
-import com.thoughtworks.xstream.XStream;
-
import org.fudaa.dodico.crue.io.common.AbstractSingleConverter;
import org.fudaa.dodico.crue.metier.emh.EnumTypeLoi;
import org.fudaa.dodico.crue.metier.emh.EvolutionFF;
import org.fudaa.dodico.crue.metier.emh.Loi;
import org.fudaa.dodico.crue.metier.emh.PtEvolutionFF;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.thoughtworks.xstream.XStream;
+
/**
* Classe abstraite qui permet de factoriser les attributs communs de toutes les lois
*/
@@ -35,9 +35,9 @@
private static final class EnumTypeLoiConverter extends AbstractSingleConverter {
- final CruePropertyDefinitionContainer crueProps;
+ final CrueProperties crueProps;
- public EnumTypeLoiConverter(CruePropertyDefinitionContainer crueProps) {
+ public EnumTypeLoiConverter(CrueProperties crueProps) {
super();
assert crueProps != null;
this.crueProps = crueProps;
@@ -64,10 +64,10 @@
private final static SingleConverterPointFF POINT_FF = new SingleConverterPointFF();
- public static void configureXstream(final XStream xstream, CruePropertyDefinitionContainer data) {
+ public static void configureXstream(final XStream xstream, CrueProperties data) {
xstream.alias("EvolutionFF", EvolutionFF.class);
xstream.alias("PointFF", PtEvolutionFF.class);
- xstream.aliasAttribute(AbstractDaoLoi.class, "Type", "xsi:type");
+ // xstream.aliasAttribute(AbstractDaoLoi.class, "Type", "xsi:type");
xstream.useAttributeFor(AbstractDaoLoi.class, "Type");
xstream.useAttributeFor(AbstractDaoLoi.class, "Nom");
xstream.registerConverter(POINT_FF);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPNUM.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPNUM.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPNUM.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -21,7 +21,7 @@
import org.fudaa.dodico.crue.metier.emh.Pdt;
import org.fudaa.dodico.crue.metier.emh.PdtCst;
import org.fudaa.dodico.crue.metier.emh.PdtVar;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* Classe qui se charge de remplir les structures DAO du fichier PNUM avec les donnees metier et inversement.
@@ -66,7 +66,7 @@
return dao;
}
- private Pdt daoToMetierPdt(final DaoPdt daoPdt, CruePropertyDefinitionContainer defs) {
+ private Pdt daoToMetierPdt(final DaoPdt daoPdt, CrueProperties defs) {
if (daoPdt == null) { return null; }
if (daoPdt.PdtCst == null) {
final PdtVar var = new PdtVar();
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructure.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructure.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructure.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -4,7 +4,7 @@
package org.fudaa.dodico.crue.io.dao;
import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
import com.thoughtworks.xstream.XStream;
@@ -20,6 +20,6 @@
* @param analyze l'anayze recevant les erreurs
* @param props les propriétés utilisées pour récuperer les types de loi.
*/
- void configureXStream(XStream xstream, CtuluAnalyze analyze, CruePropertyDefinitionContainer props);
+ void configureXStream(XStream xstream, CtuluAnalyze analyze, CrueProperties props);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDCLM.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDCLM.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDCLM.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -11,7 +11,7 @@
import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.common.EnumsConverter;
import org.fudaa.dodico.crue.metier.emh.EnumSensOuv;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* Structures utilisees dans la classe CrueDaoPersistDCLM
@@ -26,7 +26,7 @@
*
* @param xstream Parser XML
*/
- public void configureXStream(final XStream xstream, CtuluAnalyze analyze, CruePropertyDefinitionContainer props) {
+ public void configureXStream(final XStream xstream, CtuluAnalyze analyze, CrueProperties props) {
xstream.alias(CrueFileType.DCLM.toString(), CrueDaoDCLM.class);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDCSP.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDCSP.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDCSP.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -7,7 +7,7 @@
import org.fudaa.dodico.crue.io.common.EnumsConverter;
import org.fudaa.dodico.crue.metier.emh.EnumFormulePdc;
import org.fudaa.dodico.crue.metier.emh.EnumSensOrifice;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
import com.thoughtworks.xstream.XStream;
@@ -17,7 +17,7 @@
@SuppressWarnings("PMD.VariableNamingConventions")
public class CrueDaoStructureDCSP implements CrueDaoStructure {
- public void configureXStream(final XStream xstream, final CtuluAnalyze analyze, CruePropertyDefinitionContainer props) {
+ public void configureXStream(final XStream xstream, final CtuluAnalyze analyze, CrueProperties props) {
// -- creation des alias pour que ce soit + parlant dans le xml file --//
xstream.alias(CrueFileType.DCSP.toString(), CrueDaoDCSP.class);
// -- liste des initialisations nécessaires pour le formattage des donn�es--//
@@ -36,7 +36,7 @@
*
* @param xstream
*/
- protected static void initXmlParserBranche(final XStream xstream, CruePropertyDefinitionContainer data) {
+ protected static void initXmlParserBranche(final XStream xstream, CrueProperties data) {
// -- gestion des branches --//
xstream.alias("DonCalcSansPrtBrancheSaintVenant", DaoBrancheSaintVenant.class);
xstream.alias("DonCalcSansPrtBrancheSeuilLateral", DaoBrancheSeuilLateral.class);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDFRT.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDFRT.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDFRT.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -3,7 +3,7 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDLHY.DaoLoiFF;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
import com.thoughtworks.xstream.XStream;
@@ -16,7 +16,7 @@
@SuppressWarnings("PMD.VariableNamingConventions")
public class CrueDaoStructureDFRT implements CrueDaoStructure {
- public void configureXStream(final XStream xstream, CtuluAnalyze analyze, CruePropertyDefinitionContainer props) {
+ public void configureXStream(final XStream xstream, CtuluAnalyze analyze, CrueProperties props) {
// -- creation des alias pour que ce soit + parlant dans le xml file --//
xstream.alias(CrueFileType.DFRT.toString(), CrueDaoDFRT.class);
xstream.alias("LoiFF", DaoLoiFF.class);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDLHY.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDLHY.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDLHY.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -2,7 +2,7 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.common.CrueFileType;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
import com.thoughtworks.xstream.XStream;
@@ -14,7 +14,7 @@
@SuppressWarnings("PMD.VariableNamingConventions")
public class CrueDaoStructureDLHY implements CrueDaoStructure {
- public void configureXStream(final XStream xstream, final CtuluAnalyze analyze, CruePropertyDefinitionContainer props) {
+ public void configureXStream(final XStream xstream, final CtuluAnalyze analyze, CrueProperties props) {
xstream.alias(CrueFileType.DLHY.toString(), CrueDaoDLHY.class);
xstream.alias("LoiFF", DaoLoiFF.class);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDPTG.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDPTG.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDPTG.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -6,7 +6,7 @@
import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.metier.emh.EvolutionFF;
import org.fudaa.dodico.crue.metier.emh.PtProfil;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
import com.thoughtworks.xstream.XStream;
@@ -19,7 +19,7 @@
@SuppressWarnings("PMD.VariableNamingConventions")
public class CrueDaoStructureDPTG implements CrueDaoStructure {
- public void configureXStream(final XStream xstream, CtuluAnalyze analyze, CruePropertyDefinitionContainer props) {
+ public void configureXStream(final XStream xstream, CtuluAnalyze analyze, CrueProperties props) {
// -- creation des alias pour que ce soit + parlant dans le xml file --//
xstream.alias(CrueFileType.DPTG.toString(), CrueDaoDPTG.class);
// -- liste des initialisations n�cessaires pour le formattage des donn�es--//
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDPTI.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDPTI.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDPTI.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -4,7 +4,7 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.common.CrueFileType;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* Toutes les structures dao utilis�es et les inits du parser xml pour le format DPTI. Toutes ces structures sont
@@ -15,7 +15,7 @@
@SuppressWarnings("PMD.VariableNamingConventions")
public class CrueDaoStructureDPTI implements CrueDaoStructure {
- public void configureXStream(final XStream xstream, CtuluAnalyze analyze, CruePropertyDefinitionContainer props) {
+ public void configureXStream(final XStream xstream, CtuluAnalyze analyze, CrueProperties props) {
CrueDaoStructureDPTI.initXmlParserForDPTI(xstream);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDRSO.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDRSO.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDRSO.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -6,7 +6,7 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.common.CrueFileType;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* Toutes les structures dao utilis�es et les inits du parser xml pour le format DRSO. Toutes ces structures sont
@@ -17,7 +17,7 @@
@SuppressWarnings("PMD.VariableNamingConventions")
public class CrueDaoStructureDRSO implements CrueDaoStructure {
- public void configureXStream(final XStream xstream, CtuluAnalyze analyze, CruePropertyDefinitionContainer props) {
+ public void configureXStream(final XStream xstream, CtuluAnalyze analyze, CrueProperties props) {
// -- creation des alias pour que ce soit + parlant dans le xml file --//
xstream.alias(CrueFileType.DRSO.toString(), CrueDaoDRSO.class);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureETU.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureETU.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureETU.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -7,7 +7,7 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.common.CrueFileType;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* @author Adrien Hadoux
@@ -15,7 +15,7 @@
@SuppressWarnings("PMD.VariableNamingConventions")
public class CrueDaoStructureETU implements CrueDaoStructure {
- public void configureXStream(final XStream xstream, CtuluAnalyze analyze, CruePropertyDefinitionContainer props) {
+ public void configureXStream(final XStream xstream, CtuluAnalyze analyze, CrueProperties props) {
CrueDaoStructureETU.initXmlParserForETU(xstream);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOCAL.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOCAL.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOCAL.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -7,7 +7,7 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.common.CrueFileType;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* Structures utilisees dans la classe CrueDaoOCAL
@@ -20,7 +20,7 @@
/*
* @see org.fudaa.dodico.crue.dao.CrueDaoStructure#configureXStream(com.thoughtworks.xstream.XStream)
*/
- public void configureXStream(final XStream xstream, CtuluAnalyze analyze, CruePropertyDefinitionContainer props) {
+ public void configureXStream(final XStream xstream, CtuluAnalyze analyze, CrueProperties props) {
xstream.alias(CrueFileType.OCAL.toString(), CrueDaoOCAL.class);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOPTG.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOPTG.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOPTG.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -7,7 +7,7 @@
import com.thoughtworks.xstream.XStream;
import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* @author Adrien Hadoux
@@ -15,7 +15,7 @@
@SuppressWarnings("PMD.VariableNamingConventions")
public class CrueDaoStructureOPTG implements CrueDaoStructure {
- public void configureXStream(final XStream xstream, CtuluAnalyze analyze, CruePropertyDefinitionContainer props) {
+ public void configureXStream(final XStream xstream, CtuluAnalyze analyze, CrueProperties props) {
xstream.alias("OPTG", CrueDaoOPTG.class);
// xstream.addImplicitCollection(CrueDaoOPTG.class, "listeRegle");
xstream.alias("RegleRebDeb", RegleRebDeb.class);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOPTI.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOPTI.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOPTI.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -5,7 +5,7 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.metier.emh.EnumMethodeInterpolation;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* Structures de CrueDaoOPTI.
@@ -15,7 +15,7 @@
@SuppressWarnings("PMD.VariableNamingConventions")
public class CrueDaoStructureOPTI implements CrueDaoStructure {
- public void configureXStream(XStream xstream, CtuluAnalyze analyze, CruePropertyDefinitionContainer props) {
+ public void configureXStream(XStream xstream, CtuluAnalyze analyze, CrueProperties props) {
xstream.alias(CrueFileType.OPTI.toString(), CrueDaoOPTI.class);
// xstream.addImplicitCollection(CrueDaoOPTI.class, "listeInterpol");
xstream.alias("InterpolLineaire", InterpolLineaire.class);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureORES.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureORES.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureORES.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -7,7 +7,7 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.common.CrueFileType;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* Structures utilisées dans la classe CrueDaoORES
@@ -17,7 +17,7 @@
@SuppressWarnings("PMD.VariableNamingConventions")
public class CrueDaoStructureORES implements CrueDaoStructure {
- public void configureXStream(final XStream xstream, CtuluAnalyze analyze, CruePropertyDefinitionContainer props) {
+ public void configureXStream(final XStream xstream, CtuluAnalyze analyze, CrueProperties props) {
xstream.alias(CrueFileType.ORES.toString(), CrueDaoORES.class);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructurePCAL.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructurePCAL.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructurePCAL.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -7,7 +7,7 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.common.CrueFileType;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* Structures utilisées dans la classe CrueDaoPCAL
@@ -20,7 +20,7 @@
/*
* @see org.fudaa.dodico.crue.dao.CrueDaoStructure#configureXStream(com.thoughtworks.xstream.XStream)
*/
- public void configureXStream(final XStream xstream, CtuluAnalyze analyze, CruePropertyDefinitionContainer props) {
+ public void configureXStream(final XStream xstream, CtuluAnalyze analyze, CrueProperties props) {
xstream.alias(CrueFileType.PCAL.toString(), CrueDaoPCAL.class);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructurePNUM.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructurePNUM.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructurePNUM.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -9,7 +9,7 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.common.CrueFileType;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* Structures utilisées dans la classe CrueDaoPNUM
@@ -19,7 +19,7 @@
@SuppressWarnings("PMD.VariableNamingConventions")
public class CrueDaoStructurePNUM implements CrueDaoStructure {
- public void configureXStream(final XStream xstream, final CtuluAnalyze analyze, CruePropertyDefinitionContainer props) {
+ public void configureXStream(final XStream xstream, final CtuluAnalyze analyze, CrueProperties props) {
xstream.alias(CrueFileType.PNUM.toString(), CrueDaoPNUM.class);
xstream.alias("Pdt", DaoPdt.class);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueXmlReaderWriter.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueXmlReaderWriter.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueXmlReaderWriter.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -11,7 +11,7 @@
import org.fudaa.dodico.crue.io.common.CrueData;
import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.common.CrueIOResu;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* @author deniger
@@ -86,7 +86,7 @@
* @return true si reussite
*/
boolean writeXMLMetier(final CrueIOResu<M> metier, final OutputStream out, final CtuluAnalyze analyser,
- CruePropertyDefinitionContainer props);
+ CrueProperties props);
/**
* MEthode qui permet d'�crire les datas dans le fichier f sp�cifi�.
@@ -96,7 +96,7 @@
* @return
*/
boolean writeXMLMetier(final CrueIOResu<M> metier, final File f, final CtuluAnalyze analyzer,
- CruePropertyDefinitionContainer props);
+ CrueProperties props);
/**
* @param metier l'objet metier
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueXmlReaderWriterImpl.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueXmlReaderWriterImpl.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueXmlReaderWriterImpl.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -31,7 +31,7 @@
import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.common.CrueIOResu;
import org.fudaa.dodico.crue.io.common.IOMessages;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.InputSource;
@@ -106,7 +106,7 @@
}
protected final void configureXStream(final XStream xstream, final CtuluAnalyze analyse,
- CruePropertyDefinitionContainer props) {
+ CrueProperties props) {
daoConfigurer.configureXStream(xstream, analyse, props);
}
@@ -124,7 +124,7 @@
return xsdPath;
}
- protected XStream initXmlParser(final CtuluAnalyze analyse, CruePropertyDefinitionContainer props) {
+ protected XStream initXmlParser(final CtuluAnalyze analyse, CrueProperties props) {
final XmlFriendlyReplacer replacer = new XmlFriendlyReplacer("#", "_");
final DomDriver domDriver = new DomDriver("UTF-8", replacer);
final XStream xstream = new XStream(domDriver);
@@ -337,7 +337,7 @@
}
protected boolean writeDAO(final File file, final D dao, final CtuluAnalyze analyser,
- CruePropertyDefinitionContainer props) {
+ CrueProperties props) {
FileOutputStream out = null;
boolean ok = true;
try {
@@ -360,7 +360,7 @@
* @return
*/
protected boolean writeDAO(final OutputStream out, final D dao, final CtuluAnalyze analyser,
- CruePropertyDefinitionContainer props) {
+ CrueProperties props) {
boolean isOk = true;
try {
final BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out, "UTF-8"));
@@ -425,7 +425,7 @@
* @return
*/
public final boolean writeXMLMetier(final CrueIOResu<M> metier, final File f, final CtuluAnalyze analyzer,
- CruePropertyDefinitionContainer props) {
+ CrueProperties props) {
f.getParentFile().mkdirs();
analyzer.setDesc(IOMessages.getString("write.file", f.getName()));
analyzer.setDefaultResourceBundle(IOMessages.RESOURCE_BUNDLE);
@@ -445,7 +445,7 @@
* @return true si reussite
*/
public boolean writeXMLMetier(final CrueIOResu<M> metier, final OutputStream out, final CtuluAnalyze analyser,
- CruePropertyDefinitionContainer props) {
+ CrueProperties props) {
analyser.setDesc(IOMessages.getString("write.file", getFileType().toString()));
analyser.setDefaultResourceBundle(IOMessages.RESOURCE_BUNDLE);
final D d = converter.convertMetierToDao(metier.getMetier(), analyser);
Modified: 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/DCFileReader.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -82,7 +82,7 @@
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
import org.fudaa.dodico.crue.metier.helper.FactoryEMH;
import org.fudaa.dodico.crue.property.CrueNumberUtils;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionNatureLoaderDefault;
+import org.fudaa.dodico.crue.property.CrueLoaderPropertiesDefault;
import org.fudaa.dodico.crue.validation.CruePrefix;
/**
@@ -1833,7 +1833,7 @@
// -- on initialise le reader frotran avec les lignes commentaires par exemple --//
initReader();
if (dataLinked == null) {
- dataLinked = new CrueDataImpl(CruePropertyDefinitionNatureLoaderDefault.DEFAULT);
+ dataLinked = new CrueDataImpl(CrueLoaderPropertiesDefault.DEFAULT);
}
final CrueData metier = dataLinked;
final CrueIOResu<CrueData> resu = new CrueIOResu<CrueData>(metier);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -90,7 +90,7 @@
import org.fudaa.dodico.crue.metier.helper.FactoryEMH;
import org.fudaa.dodico.crue.metier.helper.LoiFactory;
import org.fudaa.dodico.crue.metier.helper.LoiHelper;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
import org.fudaa.dodico.crue.validation.CruePrefix;
import org.fudaa.dodico.fortran.FortranReader;
import org.joda.time.Duration;
@@ -700,7 +700,7 @@
*/
private void readDonneesPermanentes(final CompositeReader reader, final CrueData res, final double cru)
throws IOException {
- CruePropertyDefinitionContainer cruePropertyDefinitionContainer = dataLinked.getCruePropertyDefinitionContainer();
+ CrueProperties cruePropertyDefinitionContainer = dataLinked.getCruePropertyDefinitionContainer();
// Ligne A : DTPJ, DTPH, DTPM, DTPS, TOLZ, TOLQ, ICALMX, IPRINT, NDECOU
reader.readLine();
final Duration dtperm = readDuration(reader);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHProjet.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHProjet.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHProjet.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -9,7 +9,7 @@
import java.util.List;
import java.util.Map;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -23,12 +23,12 @@
private final static Logger LOGGER = LoggerFactory.getLogger(EMHProjet.class);
/**
- * Infos du projet, contient la base des fichiers de donn�es.
+ * Infos du projet, contient la base des fichiers de donnees.
*/
private EMHProjectInfos baseRessourcesInfos_;
/**
- * Base des sc�narios disponible pour tout le projet.
+ * Base des scenarios disponible pour tout le projet.
*/
private final List<ManagerEMHScenario> baseScenarios = new ArrayList<ManagerEMHScenario>();
private final Map<String, ManagerEMHModeleBase> idModele = new HashMap<String, ManagerEMHModeleBase>();
@@ -48,13 +48,13 @@
private final List<ManagerEMHModeleBase> externListModele = Collections.unmodifiableList(listeModele);
- private CruePropertyDefinitionContainer propDefinition;
+ private CrueProperties propDefinition;
- public void setPropDefinition(CruePropertyDefinitionContainer propDefinition) {
+ public void setPropDefinition(CrueProperties propDefinition) {
this.propDefinition = propDefinition;
}
- public CruePropertyDefinitionContainer getPropDefinition() {
+ public CrueProperties getPropDefinition() {
return propDefinition;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermBrancheOrificeManoeuvre.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermBrancheOrificeManoeuvre.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermBrancheOrificeManoeuvre.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -5,7 +5,7 @@
package org.fudaa.dodico.crue.metier.emh;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* CL de type 41 ou 42 en Crue9
@@ -18,7 +18,7 @@
/** @pdOid e48fd5c2-0df0-4fa8-ac9f-5b76376c23fa */
private EnumSensOuv sensOuv;
- public CalcPseudoPermBrancheOrificeManoeuvre(CruePropertyDefinitionContainer defaults) {
+ public CalcPseudoPermBrancheOrificeManoeuvre(CrueProperties defaults) {
ouv = defaults.getDefaultDoubleValue("ouv");
String enumValue = defaults.getDefaultStringEnumValue("sensOuv");
try {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermBrancheSaintVenantQruis.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermBrancheSaintVenantQruis.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermBrancheSaintVenantQruis.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -5,7 +5,7 @@
package org.fudaa.dodico.crue.metier.emh;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* CL de type ? en Crue9
@@ -16,7 +16,7 @@
/** @pdOid 51303fc4-11ad-4147-9538-584b666adaf4 */
private double qruis;
- public CalcPseudoPermBrancheSaintVenantQruis(CruePropertyDefinitionContainer defaults) {
+ public CalcPseudoPermBrancheSaintVenantQruis(CrueProperties defaults) {
qruis = defaults.getDefaultDoubleValue("qruis");
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermCasierProfilQruis.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermCasierProfilQruis.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermCasierProfilQruis.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -5,7 +5,7 @@
package org.fudaa.dodico.crue.metier.emh;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* CL n° ? en Crue9
@@ -16,7 +16,7 @@
/** @pdOid 95d468df-9a43-40a2-8387-c6002d2fae56 */
private double qruis;
- public CalcPseudoPermCasierProfilQruis(CruePropertyDefinitionContainer defaults) {
+ public CalcPseudoPermCasierProfilQruis(CrueProperties defaults) {
qruis = defaults.getDefaultDoubleValue("qruis");
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermNoeudNiveauContinuQapp.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermNoeudNiveauContinuQapp.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermNoeudNiveauContinuQapp.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -5,7 +5,7 @@
package org.fudaa.dodico.crue.metier.emh;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* CL de type 2 en Crue9
@@ -16,7 +16,7 @@
/** @pdOid 85cdbeef-f036-460f-909f-581b71981fe0 */
private double qapp;
- public CalcPseudoPermNoeudNiveauContinuQapp(CruePropertyDefinitionContainer def) {
+ public CalcPseudoPermNoeudNiveauContinuQapp(CrueProperties def) {
qapp = def.getDefaultDoubleValue("qapp");
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermNoeudNiveauContinuZimpose.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermNoeudNiveauContinuZimpose.java 2009-12-21 16:02:40 UTC (rev 5569)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermNoeudNiveauContinuZimpose.java 2009-12-22 01:54:50 UTC (rev 5570)
@@ -5,7 +5,7 @@
package org.fudaa.dodico.crue.metier.emh;
-import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* CL de type 1 en Crue9
@@ -16,7 +16,7 @@
/** @pdOid b26f3338-1f5f-460a-907f-d3c01160ace3 */
private double zimpose;
- public CalcPseudoPermNoeudNiveauContinuZimpose(CruePropertyDefinitionContainer def) {
+ public CalcPseudoPermNoeudNiveauContinuZimpose(CrueProperties def) {
zimpose = def.getDefaultDoubleValue("zimpose");
}
Modified: tru...
[truncated message content] |
