Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4839] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2009-06-03 22:59:49
|
Revision: 4839
http://fudaa.svn.sourceforge.net/fudaa/?rev=4839&view=rev
Author: deniger
Date: 2009-06-03 22:59:45 +0000 (Wed, 03 Jun 2009)
Log Message:
-----------
Modified Paths:
--------------
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/common/Messages.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterETU.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/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/CrueHelper.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/DHWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/CrueDataImpl.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/EMHModeleRun.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHproject.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueScenarioBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CommomLib.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/FCrueResource.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueApplicationManager.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueSupervisorImplementation.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/ScenarioLoader.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioSaver.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueErrorManager.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheScenario.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleComparaisonScenario.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleEMH.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleGenerationCrue9.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleInfosGenerales.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleScenarioManager.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueConstants.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHContainer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/FichierCrueManager.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueCommonImplementation.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/common/Messages.java
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/crue/
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/crue/common/
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/crue/common/bookmark-add.png
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/crue/common/messages.properties
Removed Paths:
-------------
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/common/CrueCommomImplementation.java
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-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormat.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -4,6 +4,8 @@
import java.io.OutputStream;
import java.net.URL;
+import com.memoire.bu.BuFileFilter;
+
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.fileformat.FileReadOperationAbstract;
import org.fudaa.ctulu.fileformat.FileWriteOperationAbstract;
@@ -29,6 +31,24 @@
this(readerWriter.getXsdId(), readerWriter);
}
+ @SuppressWarnings("serial")
+ @Override
+ public BuFileFilter createFileFilter() {
+ return new BuFileFilter(extensions, getDescription()) {
+ @Override
+ public String getExtension(final File _f) {
+ // on redefinit pour recuperer le premier point.
+ if (_f != null) {
+ final String filename = _f.getName();
+ final int i = filename.indexOf('.');
+ if ((i > 0) && (i < filename.length() - 1)) { return filename.substring(i + 1).toLowerCase(); }
+ }
+ return null;
+ }
+
+ };
+ }
+
/**
* @param type le type en Upper case comme par exemple DFRT.
*/
Modified: 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/Crue10FileFormatFactory.java 2009-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -2,6 +2,7 @@
import java.util.List;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
import org.fudaa.dodico.crue.io.dao.CrueConverterDCLM;
import org.fudaa.dodico.crue.io.dao.CrueConverterDCSP;
import org.fudaa.dodico.crue.io.dao.CrueConverterDFRT;
@@ -44,7 +45,6 @@
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureORES;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructurePCAL;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructurePNUM;
-import org.fudaa.dodico.crue.io.dao.CrueHelper;
import org.fudaa.dodico.crue.io.dao.CrueXmlReaderWriterImpl;
import org.fudaa.dodico.crue.metier.CrueData;
import org.fudaa.dodico.crue.metier.EMHproject;
@@ -67,59 +67,59 @@
public class Crue10FileFormatFactory {
private final static Crue10FileFormat<List<EMH>> DCSP = new Crue10FileFormat<List<EMH>>(
- new CrueXmlReaderWriterImpl<CrueDaoDCSP, List<EMH>>(CrueHelper.DCSP, new CrueConverterDCSP(),
+ new CrueXmlReaderWriterImpl<CrueDaoDCSP, List<EMH>>(CrueConstants.DCSP, new CrueConverterDCSP(),
new CrueDaoStructureDCSP()));
private final static Crue10FileFormat<List<DonFrt>> DFRT = new Crue10FileFormat<List<DonFrt>>(
- new CrueXmlReaderWriterImpl<CrueDaoDFRT, List<DonFrt>>(CrueHelper.DFRT, new CrueConverterDFRT(),
+ new CrueXmlReaderWriterImpl<CrueDaoDFRT, List<DonFrt>>(CrueConstants.DFRT, new CrueConverterDFRT(),
new CrueDaoStructureDFRT()));
private final static Crue10FileFormat<List<AbstractLoi>> DLHY = new Crue10FileFormat<List<AbstractLoi>>(
- new CrueXmlReaderWriterImpl<CrueDaoDLHY, List<AbstractLoi>>(CrueHelper.DLHY, new CrueConverterDLHY(),
+ new CrueXmlReaderWriterImpl<CrueDaoDLHY, List<AbstractLoi>>(CrueConstants.DLHY, new CrueConverterDLHY(),
new CrueDaoStructureDLHY()));
private final static Crue10FileFormat<CrueData> DPTG = new Crue10FileFormat<CrueData>(
- new CrueXmlReaderWriterImpl<CrueDaoDPTG, CrueData>(CrueHelper.DPTG, new CrueConverterDPTG(),
+ new CrueXmlReaderWriterImpl<CrueDaoDPTG, CrueData>(CrueConstants.DPTG, new CrueConverterDPTG(),
new CrueDaoStructureDPTG()));
private final static Crue10FileFormat<CrueData> DPTI = new Crue10FileFormat<CrueData>(
- new CrueXmlReaderWriterImpl<CrueDaoDPTI, CrueData>(CrueHelper.DPTI, new CrueConverterDPTI(),
+ new CrueXmlReaderWriterImpl<CrueDaoDPTI, CrueData>(CrueConstants.DPTI, new CrueConverterDPTI(),
new CrueDaoStructureDPTI()));
private final static Crue10FileFormat<CrueData> DRSO = new Crue10FileFormat<CrueData>(
- new CrueXmlReaderWriterImpl<CrueDaoDRSO, CrueData>(CrueHelper.DRSO, new CrueConverterDRSO(),
+ new CrueXmlReaderWriterImpl<CrueDaoDRSO, CrueData>(CrueConstants.DRSO, new CrueConverterDRSO(),
new CrueDaoStructureDRSO()));
- private final static Crue10FileFormat<EMHproject> ETU = new Crue10FileFormat<EMHproject>(CrueHelper.ETU,
- new CrueXmlReaderWriterImpl<CrueDaoETU, EMHproject>(CrueHelper.ETU, new CrueConverterETU(),
+ private final static Crue10FileFormat<EMHproject> ETU = new Crue10FileFormat<EMHproject>(CrueConstants.ETU,
+ new CrueXmlReaderWriterImpl<CrueDaoETU, EMHproject>(CrueConstants.ETU, new CrueConverterETU(),
new CrueDaoStructureETU()));
private final static Crue10FileFormat<OrdPrtGeoModeleBase> OPTG = new Crue10FileFormat<OrdPrtGeoModeleBase>(
- new CrueXmlReaderWriterImpl<CrueDaoOPTG, OrdPrtGeoModeleBase>(CrueHelper.OPTG, new CrueConverterOPTG(),
+ new CrueXmlReaderWriterImpl<CrueDaoOPTG, OrdPrtGeoModeleBase>(CrueConstants.OPTG, new CrueConverterOPTG(),
new CrueDaoStructureOPTG()));
private final static Crue10FileFormat<DonCLimMScenario> DCLM = new Crue10FileFormat<DonCLimMScenario>(
- new CrueXmlReaderWriterImpl<CrueDaoDCLM, DonCLimMScenario>(CrueHelper.DCLM, new CrueConverterDCLM(),
+ new CrueXmlReaderWriterImpl<CrueDaoDCLM, DonCLimMScenario>(CrueConstants.DCLM, new CrueConverterDCLM(),
new CrueDaoStructureDCLM()));
private final static Crue10FileFormat<OrdResScenario> ORES = new Crue10FileFormat<OrdResScenario>(
- new CrueXmlReaderWriterImpl<CrueDaoORES, OrdResScenario>(CrueHelper.ORES, new CrueConverterORES(),
+ new CrueXmlReaderWriterImpl<CrueDaoORES, OrdResScenario>(CrueConstants.ORES, new CrueConverterORES(),
new CrueDaoStructureORES()));
private final static Crue10FileFormat<OrdCalcScenario> OCAL = new Crue10FileFormat<OrdCalcScenario>(
- new CrueXmlReaderWriterImpl<CrueDaoOCAL, OrdCalcScenario>(CrueHelper.OCAL, new CrueConverterOCAL(),
+ new CrueXmlReaderWriterImpl<CrueDaoOCAL, OrdCalcScenario>(CrueConstants.OCAL, new CrueConverterOCAL(),
new CrueDaoStructureOCAL()));
private final static Crue10FileFormat<ParamCalcScenario> PCAL = new Crue10FileFormat<ParamCalcScenario>(
- new CrueXmlReaderWriterImpl<CrueDaoPCAL, ParamCalcScenario>(CrueHelper.PCAL, new CrueConverterPCAL(),
+ new CrueXmlReaderWriterImpl<CrueDaoPCAL, ParamCalcScenario>(CrueConstants.PCAL, new CrueConverterPCAL(),
new CrueDaoStructurePCAL()));
private final static Crue10FileFormat<ParamNumModeleBase> PNUM = new Crue10FileFormat<ParamNumModeleBase>(
- new CrueXmlReaderWriterImpl<CrueDaoPNUM, ParamNumModeleBase>(CrueHelper.PNUM, new CrueConverterPNUM(),
+ new CrueXmlReaderWriterImpl<CrueDaoPNUM, ParamNumModeleBase>(CrueConstants.PNUM, new CrueConverterPNUM(),
new CrueDaoStructurePNUM()));
private final static Crue10FileFormat<OrdPrtCIniModeleBase> OPTI = new Crue10FileFormat<OrdPrtCIniModeleBase>(
- new CrueXmlReaderWriterImpl<CrueDaoOPTI, OrdPrtCIniModeleBase>(CrueHelper.OPTI, new CrueConverterOPTI(),
+ new CrueXmlReaderWriterImpl<CrueDaoOPTI, OrdPrtCIniModeleBase>(CrueConstants.OPTI, new CrueConverterOPTI(),
new CrueDaoStructureOPTI()));
static {
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueConstants.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueConstants.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueConstants.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -0,0 +1,36 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.io.common;
+
+/**
+ * @author deniger
+ *
+ */
+public class CrueConstants {
+
+ // -- listing des diff�rents fichiers et leur noms utilisés --//
+ public final static String ETU = "ETU"; //$NON-NLS-1$
+ public final static String DRSO = "DRSO"; //$NON-NLS-1$
+ public final static String ORES = "ORES"; //$NON-NLS-1$
+ public final static String OCAL = "OCAL"; //$NON-NLS-1$
+ public final static String PCAL = "PCAL"; //$NON-NLS-1$
+ public final static String DCLM = "DCLM"; //$NON-NLS-1$
+ public final static String DLHY = "DLHY"; //$NON-NLS-1$
+ public final static String OPTR = "OPTR"; //$NON-NLS-1$
+ public final static String OPTG = "OPTG"; //$NON-NLS-1$
+ public final static String OPTI = "OPTI"; //$NON-NLS-1$
+ public final static String PNUM = "PNUM"; //$NON-NLS-1$
+ public final static String DPTI = "DPTI"; //$NON-NLS-1$
+ public final static String DCSP = "DCSP"; //$NON-NLS-1$
+ public final static String DPTG = "DPTG"; //$NON-NLS-1$
+ public final static String DFRT = "DFRT"; //$NON-NLS-1$
+ public final static String DC = "DC"; //$NON-NLS-1$
+ public final static String DH = "DH"; //$NON-NLS-1$
+ public final static String RPTR = "RPTR"; //$NON-NLS-1$
+ public final static String RPTG = "RPTG"; //$NON-NLS-1$
+ public final static String RPTI = "RPTI"; //$NON-NLS-1$
+ public final static String RCAL = "RCAL"; //$NON-NLS-1$
+
+}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/Messages.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/Messages.java 2009-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/Messages.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -4,13 +4,7 @@
*/
package org.fudaa.dodico.crue.io.common;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.ResourceBundle;
+import java.util.*;
/**
* @author deniger
@@ -26,11 +20,9 @@
.getBundle("org.fudaa.dodico.crue.io.adrienMessages");
private static final ResourceBundle DH_RESOURCE_BUNDLE = ResourceBundle
.getBundle("org.fudaa.dodico.crue.io.caroleMessages");
- private static final ResourceBundle IHM_RESOURCE_BUNDLE = ResourceBundle
- .getBundle("org.fudaa.dodico.crue.io.ihmMessages");
/** ResourceBundle regroupant tous les ResourceBundle définis par des fichiers properties distincts */
public static final ResourceBundle RESOURCE_BUNDLE = new TempResourceBundle(ALL_RESOURCE_BUNDLE, DC_RESOURCE_BUNDLE,
- DH_RESOURCE_BUNDLE, IHM_RESOURCE_BUNDLE);
+ DH_RESOURCE_BUNDLE);
protected static class TempResourceBundle extends ResourceBundle {
@@ -69,11 +61,4 @@
private Messages() {}
- // public static String getString(String key) {
- // try {
- // return RESOURCE_BUNDLE.getString(key);
- // } catch (MissingResourceException e) {
- // return '!' + key + '!';
- // }
- // }
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCSP.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCSP.java 2009-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCSP.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -6,6 +6,7 @@
import org.apache.commons.collections.CollectionUtils;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheAbstract;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheBarrageFilEau;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheBarrageFilEauAbstract;
@@ -81,7 +82,7 @@
res.DonCalcSansPrtBranches = new ArrayList<DaoBrancheAbstract>();
if (CollectionUtils.isEmpty(metier)) {
- CrueHelper.emhEmpty(CrueHelper.DCSP, analyser);
+ CrueHelper.emhEmpty(CrueConstants.DCSP, analyser);
} else {
for (final EMH emh : metier) {
if (emh instanceof CatEMHBranche) {
@@ -94,7 +95,7 @@
if (dataCalc != null) {
CrueConverterDCSP.metierToDaoBranches(res.DonCalcSansPrtBranches, branche, dataCalc, analyser);
} else {
- CrueHelper.unknowdataFromFile("Branches", CrueHelper.DCSP, branche.getNom(), analyser);
+ CrueHelper.unknowdataFromFile("Branches", CrueConstants.DCSP, branche.getNom(), analyser);
}
}
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterETU.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterETU.java 2009-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterETU.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -7,25 +7,8 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluLibArray;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureETU.FichierResultat;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureETU.Modele;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureETU.ModeleRun;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureETU.Ref;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureETU.Repertoire;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureETU.Run;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureETU.Scenario;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureETU.SousModele;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureETU.TypeFichierDispo;
-import org.fudaa.dodico.crue.metier.CrueData;
-import org.fudaa.dodico.crue.metier.EMHInfosVersion;
-import org.fudaa.dodico.crue.metier.EMHModeleBase;
-import org.fudaa.dodico.crue.metier.EMHModeleEnchainement;
-import org.fudaa.dodico.crue.metier.EMHModeleRun;
-import org.fudaa.dodico.crue.metier.EMHProjectInfos;
-import org.fudaa.dodico.crue.metier.EMHRun;
-import org.fudaa.dodico.crue.metier.EMHScenario;
-import org.fudaa.dodico.crue.metier.EMHproject;
-import org.fudaa.dodico.crue.metier.FichierCrue;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureETU.*;
+import org.fudaa.dodico.crue.metier.*;
/**
* Factory qui se charge de remplir les structures DAO dufichier ETU avec les donn�es m�tier et inversement.
@@ -121,7 +104,7 @@
// -- on essaie de retrouver la reference du fichier --//
if (reference.NomRef != null && infos.existFileInBase(reference.NomRef)) {
final FichierCrue fichierData = infos.getFileFromBase(reference.NomRef);
- newScenar.addFichierDonneesToScenario(fichierData);
+ newScenar.addFichierDonnees(fichierData);
} else {
CrueHelper.unknowReference("Fichier", reference.NomRef, analyser);
}
@@ -129,7 +112,17 @@
}
// -- ajout des modeles concernes --//
- if (CtuluLibArray.isEmpty(scenarPersist.Modeles)) {
+ // cas de v9:
+ if (scenarPersist.ScenarioModeleV9 != null) {
+ if (scenarPersist.ScenarioModeleV9.NomRef != null
+ && baseModeles.existModeleInBase(scenarPersist.ScenarioModeleV9.NomRef)) {
+ final EMHModeleBase modeleData = baseModeles.getModeleFromBase(scenarPersist.ScenarioModeleV9.NomRef);
+ // -- ajout du modele dans le scenar --//
+ newScenar.addModeleDonneesToScenario(modeleData);
+ } else {
+ CrueHelper.unknowReference("Modele v9", scenarPersist.ScenarioModeleV9.NomRef, analyser);
+ }
+ } else if (CtuluLibArray.isEmpty(scenarPersist.Modeles)) {
CrueHelper.listEmpty("Modele de Scenario" + " " + scenarPersist.Nom, analyser);
} else {
for (final Ref reference : scenarPersist.Modeles) {
@@ -139,7 +132,7 @@
// -- ajout du modele dans le scenar --//
newScenar.addModeleDonneesToScenario(modeleData);
} else {
- CrueHelper.unknowReference("SousModele", reference.NomRef, analyser);
+ CrueHelper.unknowReference("Modele", reference.NomRef, analyser);
}
}
}
@@ -260,7 +253,7 @@
// -- on essaie de retrouver la reference du fichier --//
if (reference.NomRef != null && infos.existFileInBase(reference.NomRef)) {
final FichierCrue fichierData = infos.getFileFromBase(reference.NomRef);
- smMetier.addFichierDonneesToModele(fichierData);
+ smMetier.addFichierDonnees(fichierData);
} else {
CrueHelper.unknowReference("Fichier", reference.NomRef, analyser);
}
@@ -307,7 +300,7 @@
// -- on essaie de retrouver la reference du fichier --//
if (reference.NomRef != null && infos.existFileInBase(reference.NomRef)) {
final FichierCrue fichierData = infos.getFileFromBase(reference.NomRef);
- newModeleMetier.addFichierDonneesToModele(fichierData);
+ newModeleMetier.addFichierDonnees(fichierData);
} else {
CrueHelper.unknowReference("Fichier", reference.NomRef, analyser);
}
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-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDCLM.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -8,6 +8,7 @@
import com.thoughtworks.xstream.XStream;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
import org.fudaa.dodico.crue.io.common.EnumsConverter;
import org.fudaa.dodico.crue.metier.emh.EnumSensOuv;
@@ -26,7 +27,7 @@
*/
public void configureXStream(final XStream xstream, CtuluAnalyze analyze) {
- xstream.alias(CrueHelper.DCLM, CrueDaoDCLM.class);
+ xstream.alias(CrueConstants.DCLM, CrueDaoDCLM.class);
xstream.addImplicitCollection(CrueDaoDCLM.class, "listeCalculs");
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-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDCSP.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -5,6 +5,7 @@
import com.thoughtworks.xstream.XStream;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
import org.fudaa.dodico.crue.io.common.EnumsConverter;
import org.fudaa.dodico.crue.metier.emh.EnumFormulePdc;
import org.fudaa.dodico.crue.metier.emh.EnumSensOrifice;
@@ -17,7 +18,7 @@
public void configureXStream(final XStream xstream, CtuluAnalyze analyze) {
// -- creation des alias pour que ce soit + parlant dans le xml file --//
- xstream.alias(CrueHelper.DCSP, CrueDaoDCSP.class);
+ xstream.alias(CrueConstants.DCSP, CrueDaoDCSP.class);
// -- liste des initialisations nécessaires pour le formattage des donn�es--//
initXmlParserBranche(xstream);
initXmlParserSection(xstream);
@@ -32,7 +33,7 @@
*/
protected static void initXmlParserForDSCP(final XStream xstream) {
// -- creation des alias pour que ce soit + parlant dans le xml file --//
- xstream.alias(CrueHelper.DCSP, CrueDaoDCSP.class);
+ xstream.alias(CrueConstants.DCSP, CrueDaoDCSP.class);
// -- liste des initialisations nécessaires pour le formattage des donn�es--//
initXmlParserBranche(xstream);
initXmlParserSection(xstream);
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-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDFRT.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -3,6 +3,7 @@
import com.thoughtworks.xstream.XStream;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDLHY.DaoLoiFF;
/**
@@ -16,7 +17,7 @@
public void configureXStream(final XStream xstream, CtuluAnalyze analyze) {
// -- creation des alias pour que ce soit + parlant dans le xml file --//
- xstream.alias(CrueHelper.DFRT, CrueDaoDFRT.class);
+ xstream.alias(CrueConstants.DFRT, CrueDaoDFRT.class);
xstream.alias("LoiFF", DaoLoiFF.class);
xstream.omitField(DaoLoiFF.class, "DateZeroLoiDF");
xstream.useAttributeFor(AbstractDaoLoi.class, "Nom");
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-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDLHY.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -1,6 +1,7 @@
package org.fudaa.dodico.crue.io.dao;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
import com.thoughtworks.xstream.XStream;
@@ -14,7 +15,7 @@
public void configureXStream(final XStream xstream, final CtuluAnalyze analyze) {
- xstream.alias(CrueHelper.DLHY, CrueDaoDLHY.class);
+ xstream.alias(CrueConstants.DLHY, CrueDaoDLHY.class);
xstream.alias("LoiFF", DaoLoiFF.class);
xstream.alias("LoiDF", DaoLoiDF.class);
xstream.omitField(DaoLoiFF.class, "DateZeroLoiDF");
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-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDPTG.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -5,6 +5,7 @@
import com.thoughtworks.xstream.XStream;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
import org.fudaa.dodico.crue.metier.emh.EvolutionFF;
import org.fudaa.dodico.crue.metier.emh.PtProfil;
@@ -19,7 +20,7 @@
public void configureXStream(final XStream xstream, CtuluAnalyze analyze) {
// -- creation des alias pour que ce soit + parlant dans le xml file --//
- xstream.alias(CrueHelper.DPTG, CrueDaoDPTG.class);
+ xstream.alias(CrueConstants.DPTG, CrueDaoDPTG.class);
// -- liste des initialisations n�cessaires pour le formattage des donn�es--//
initXmlParserSectionProfils(xstream);
initXmlParserSections(xstream);
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-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDPTI.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -3,6 +3,7 @@
import com.thoughtworks.xstream.XStream;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
/**
* Toutes les structures dao utilis�es et les inits du parser xml pour le format DPTI. Toutes ces structures sont
@@ -19,7 +20,7 @@
public static void initXmlParserForDPTI(final XStream xstream) {
// -- creation des alias pour que ce soit + parlant dans le xml file --//
- xstream.alias(CrueHelper.DPTI, CrueDaoDPTI.class);
+ xstream.alias(CrueConstants.DPTI, CrueDaoDPTI.class);
// -- liste des initialisations n�cessaires pour le formattage des donn�es--//
initXmlParserNode(xstream);
initXmlParserBranche(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-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDRSO.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -5,6 +5,7 @@
import com.thoughtworks.xstream.XStream;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
/**
* Toutes les structures dao utilis�es et les inits du parser xml pour le format DRSO. Toutes ces structures sont
@@ -17,7 +18,7 @@
public void configureXStream(final XStream xstream, CtuluAnalyze analyze) {
// -- creation des alias pour que ce soit + parlant dans le xml file --//
- xstream.alias(CrueHelper.DRSO, CrueDaoDRSO.class);
+ xstream.alias(CrueConstants.DRSO, CrueDaoDRSO.class);
// -- liste des initialisations n�cessaires pour le formattage des donn�es--//
CrueDaoStructureDRSO.initXmlParserNode(xstream);
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-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureETU.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -6,6 +6,7 @@
import com.thoughtworks.xstream.converters.SingleValueConverter;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
/**
* @author Adrien Hadoux
@@ -19,7 +20,7 @@
public static void initXmlParserForETU(final XStream xstream) {
// -- creation des alias pour que ce soit + parlant dans le xml file --//
- xstream.alias(CrueHelper.ETU, CrueDaoETU.class);
+ xstream.alias(CrueConstants.ETU, CrueDaoETU.class);
xstream.omitField(CrueDaoETU.class, "VersionCrue");
// -- liste des initialisations n�cessaires pour le formattage des donn�es--//
initXmlParserForScenario(xstream);
@@ -101,22 +102,22 @@
// -- dans la les balsies <FichEtudes> --//
// xstream.alias("Fichier", Ref.class);
- xstream.alias(CrueHelper.DC, Ref.class);
- xstream.alias(CrueHelper.DH, Ref.class);
- xstream.alias(CrueHelper.DCLM, Ref.class);
- xstream.alias(CrueHelper.DCSP, Ref.class);
- xstream.alias(CrueHelper.DFRT, Ref.class);
- xstream.alias(CrueHelper.DLHY, Ref.class);
- xstream.alias(CrueHelper.DPTG, Ref.class);
- xstream.alias(CrueHelper.DPTI, Ref.class);
- xstream.alias(CrueHelper.DRSO, Ref.class);
- xstream.alias(CrueHelper.PNUM, Ref.class);
- xstream.alias(CrueHelper.PCAL, Ref.class);
- xstream.alias(CrueHelper.OCAL, Ref.class);
- xstream.alias(CrueHelper.OPTG, Ref.class);
- xstream.alias(CrueHelper.OPTI, Ref.class);
- xstream.alias(CrueHelper.OPTR, Ref.class);
- xstream.alias(CrueHelper.ORES, Ref.class);
+ xstream.alias(CrueConstants.DC, Ref.class);
+ xstream.alias(CrueConstants.DH, Ref.class);
+ xstream.alias(CrueConstants.DCLM, Ref.class);
+ xstream.alias(CrueConstants.DCSP, Ref.class);
+ xstream.alias(CrueConstants.DFRT, Ref.class);
+ xstream.alias(CrueConstants.DLHY, Ref.class);
+ xstream.alias(CrueConstants.DPTG, Ref.class);
+ xstream.alias(CrueConstants.DPTI, Ref.class);
+ xstream.alias(CrueConstants.DRSO, Ref.class);
+ xstream.alias(CrueConstants.PNUM, Ref.class);
+ xstream.alias(CrueConstants.PCAL, Ref.class);
+ xstream.alias(CrueConstants.OCAL, Ref.class);
+ xstream.alias(CrueConstants.OPTG, Ref.class);
+ xstream.alias(CrueConstants.OPTI, Ref.class);
+ xstream.alias(CrueConstants.OPTR, Ref.class);
+ xstream.alias(CrueConstants.ORES, Ref.class);
// -- dans la balise <Modele> --//
xstream.alias("Modele-SousModele", Ref.class);
@@ -140,10 +141,10 @@
xstream.addImplicitCollection(ModeleRun.class, "fichiersRes");
// -- gestion des fichiers resultats du modele run --//
- xstream.alias(CrueHelper.RCAL, FichierResultatRCAL.class);
- xstream.alias(CrueHelper.RPTG, FichierResultatRPTG.class);
- xstream.alias(CrueHelper.RPTI, FichierResultatRPTI.class);
- xstream.alias(CrueHelper.RPTR, FichierResultatRPTR.class);
+ xstream.alias(CrueConstants.RCAL, FichierResultatRCAL.class);
+ xstream.alias(CrueConstants.RPTG, FichierResultatRPTG.class);
+ xstream.alias(CrueConstants.RPTI, FichierResultatRPTI.class);
+ xstream.alias(CrueConstants.RPTR, FichierResultatRPTR.class);
// xstream.alias("Run-Fichier", FichierResultat.class);
xstream.useAttributeFor(FichierResultat.class, "Nom");
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-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOCAL.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -6,6 +6,7 @@
import com.thoughtworks.xstream.XStream;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
/**
* Structures utilisees dans la classe CrueDaoOCAL
@@ -20,7 +21,7 @@
*/
public void configureXStream(final XStream xstream, CtuluAnalyze analyze) {
- xstream.alias(CrueHelper.OCAL, CrueDaoOCAL.class);
+ xstream.alias(CrueConstants.OCAL, CrueDaoOCAL.class);
xstream.addImplicitCollection(CrueDaoOCAL.class, "listeOrdCalculs");
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-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureOPTI.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -1,6 +1,7 @@
package org.fudaa.dodico.crue.io.dao;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
import com.thoughtworks.xstream.XStream;
@@ -13,7 +14,7 @@
public class CrueDaoStructureOPTI implements CrueDaoStructure {
public void configureXStream(XStream xstream, CtuluAnalyze analyze) {
- xstream.alias(CrueHelper.OPTI, CrueDaoOPTI.class);
+ xstream.alias(CrueConstants.OPTI, CrueDaoOPTI.class);
// xstream.addImplicitCollection(CrueDaoOPTI.class, "listeInterpol");
xstream.alias("InterpolLineaire", InterpolLineaire.class);
xstream.alias("InterpolSaintVenant", InterpolSaintVenant.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-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureORES.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -6,6 +6,7 @@
import com.thoughtworks.xstream.XStream;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
/**
* Structures utilisées dans la classe CrueDaoORES
@@ -17,7 +18,7 @@
public void configureXStream(final XStream xstream, CtuluAnalyze analyze) {
- xstream.alias(CrueHelper.ORES, CrueDaoORES.class);
+ xstream.alias(CrueConstants.ORES, CrueDaoORES.class);
xstream.alias("OrdResNoeudNiveauContinu", NoeudNiveauContinuPersist.class);
xstream.alias("OrdResCasierProfil", CasierProfilPersist.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-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructurePCAL.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -6,6 +6,7 @@
import com.thoughtworks.xstream.XStream;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
/**
* Structures utilisées dans la classe CrueDaoPCAL
@@ -20,7 +21,7 @@
*/
public void configureXStream(final XStream xstream, CtuluAnalyze analyze) {
- xstream.alias(CrueHelper.PCAL, CrueDaoPCAL.class);
+ xstream.alias(CrueConstants.PCAL, CrueDaoPCAL.class);
xstream.alias("PdtCouplage", PdtCouplagePersist.class);
xstream.alias("PdtRes", PdtRes.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-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructurePNUM.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -8,6 +8,7 @@
import com.thoughtworks.xstream.XStream;
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.io.common.CrueConstants;
/**
* Structures utilisées dans la classe CrueDaoPNUM
@@ -19,7 +20,7 @@
public void configureXStream(final XStream xstream, CtuluAnalyze analyze) {
- xstream.alias(CrueHelper.PNUM, CrueDaoPNUM.class);
+ xstream.alias(CrueConstants.PNUM, CrueDaoPNUM.class);
xstream.alias("Pdt", DaoPdt.class);
xstream.alias("ElemPdt", DaoElemPdt.class);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueHelper.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueHelper.java 2009-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueHelper.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -21,36 +21,9 @@
*/
public final static String symboleConnection = "-"; //$NON-NLS-1$
- // -- listing des diff�rents fichiers et leur noms utilisés --//
- public final static String ETU = "ETU"; //$NON-NLS-1$
-
- public final static String DRSO = "DRSO"; //$NON-NLS-1$
- public final static String ORES = "ORES"; //$NON-NLS-1$
- public final static String OCAL = "OCAL"; //$NON-NLS-1$
- public final static String PCAL = "PCAL"; //$NON-NLS-1$
- public final static String DCLM = "DCLM"; //$NON-NLS-1$
- public final static String DLHY = "DLHY"; //$NON-NLS-1$
- public final static String OPTR = "OPTR"; //$NON-NLS-1$
- public final static String OPTG = "OPTG"; //$NON-NLS-1$
- public final static String OPTI = "OPTI"; //$NON-NLS-1$
- public final static String PNUM = "PNUM"; //$NON-NLS-1$
- public final static String DPTI = "DPTI"; //$NON-NLS-1$
- public final static String DCSP = "DCSP"; //$NON-NLS-1$
- public final static String DPTG = "DPTG"; //$NON-NLS-1$
- public final static String DFRT = "DFRT"; //$NON-NLS-1$
- public final static String DC = "DC"; //$NON-NLS-1$
- public final static String DH = "DH"; //$NON-NLS-1$
-
// -- fichiers de resultats --//
public final static String FICHIERRESULTAT = "RESULTAT"; //$NON-NLS-1$
- public final static String RPTR = "RPTR"; //$NON-NLS-1$
- public final static String RPTG = "RPTG"; //$NON-NLS-1$
- public final static String RPTI = "RPTI"; //$NON-NLS-1$
- public final static String RCAL = "RCAL"; //$NON-NLS-1$
-
-
-
/**
* Compare l'égalité de 2 pt profils
*
Modified: 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/AbstractCrue9Writer.java 2009-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/AbstractCrue9Writer.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -87,6 +87,7 @@
public void setFile(final File _f) {
analyze_ = new CtuluAnalyze();
analyze_.setResource(_f.getAbsolutePath());
+ analyze_.setDesc(_f.getName());
analyze_.setDefaultResourceBundle(Messages.RESOURCE_BUNDLE);
try {
out_ = new FileWriter(_f);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHWriter.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHWriter.java 2009-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHWriter.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -10,6 +10,8 @@
import java.util.List;
import java.util.StringTokenizer;
+import com.thoughtworks.xstream.converters.SingleValueConverter;
+
import org.apache.commons.collections.CollectionUtils;
import org.fudaa.ctulu.CtuluActivity;
import org.fudaa.ctulu.fileformat.FortranInterface;
@@ -17,53 +19,8 @@
import org.fudaa.dodico.crue.io.common.EnumsConverter;
import org.fudaa.dodico.crue.metier.CrueData;
import org.fudaa.dodico.crue.metier.CrueDate;
-import org.fudaa.dodico.crue.metier.emh.AbstractLoi;
-import org.fudaa.dodico.crue.metier.emh.CalcPseudoPerm;
-import org.fudaa.dodico.crue.metier.emh.CalcPseudoPermBrancheOrificeManoeuvre;
-import org.fudaa.dodico.crue.metier.emh.CalcPseudoPermBrancheSaintVenantQruis;
-import org.fudaa.dodico.crue.metier.emh.CalcPseudoPermNoeudNiveauContinuQapp;
-import org.fudaa.dodico.crue.metier.emh.CalcPseudoPermNoeudNiveauContinuZimpose;
-import org.fudaa.dodico.crue.metier.emh.CalcTrans;
-import org.fudaa.dodico.crue.metier.emh.CalcTransBrancheOrificeManoeuvre;
-import org.fudaa.dodico.crue.metier.emh.CalcTransBrancheSaintVenantQruis;
-import org.fudaa.dodico.crue.metier.emh.CalcTransItem;
-import org.fudaa.dodico.crue.metier.emh.CalcTransNoeudNiveauContinuLimnigramme;
-import org.fudaa.dodico.crue.metier.emh.CalcTransNoeudNiveauContinuQapp;
-import org.fudaa.dodico.crue.metier.emh.CalcTransNoeudNiveauContinuTarrage;
-import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
-import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
-import org.fudaa.dodico.crue.metier.emh.CatEMHSection;
-import org.fudaa.dodico.crue.metier.emh.DonCLimMScenario;
-import org.fudaa.dodico.crue.metier.emh.DonPrtCIni;
-import org.fudaa.dodico.crue.metier.emh.DonPrtCIniBranche;
-import org.fudaa.dodico.crue.metier.emh.DonPrtCIniNoeudNiveauContinu;
-import org.fudaa.dodico.crue.metier.emh.DonPrtCIniSection;
-import org.fudaa.dodico.crue.metier.emh.DonPrtGeo;
-import org.fudaa.dodico.crue.metier.emh.DonPrtGeoProfilSection;
-import org.fudaa.dodico.crue.metier.emh.Duration;
-import org.fudaa.dodico.crue.metier.emh.EMHSectionProfil;
-import org.fudaa.dodico.crue.metier.emh.ElemPdt;
-import org.fudaa.dodico.crue.metier.emh.EnumSensOuv;
-import org.fudaa.dodico.crue.metier.emh.EvolutionFF;
-import org.fudaa.dodico.crue.metier.emh.LoiDF;
-import org.fudaa.dodico.crue.metier.emh.LoiFF;
-import org.fudaa.dodico.crue.metier.emh.OrdCalcPerm;
-import org.fudaa.dodico.crue.metier.emh.OrdCalcPseudoPerm;
-import org.fudaa.dodico.crue.metier.emh.OrdCalcPseudoPermIniCalcReprise;
-import org.fudaa.dodico.crue.metier.emh.OrdCalcScenario;
-import org.fudaa.dodico.crue.metier.emh.ParamCalcScenario;
-import org.fudaa.dodico.crue.metier.emh.ParamNumCalcPseudoPerm;
-import org.fudaa.dodico.crue.metier.emh.ParamNumCalcTrans;
-import org.fudaa.dodico.crue.metier.emh.ParamNumModeleBase;
-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.metier.emh.PtEvolutionFF;
-import org.fudaa.dodico.crue.metier.emh.PtProfil;
-import org.fudaa.dodico.crue.metier.emh.RelationEMH;
+import org.fudaa.dodico.crue.metier.emh.*;
-import com.thoughtworks.xstream.converters.SingleValueConverter;
-
/**
* Writer de la structure DH.
*
@@ -86,11 +43,13 @@
final Hashtable coeffsRuisParCalcPerm = new Hashtable();
writeDonneesGenerales(data, coeffsRuisParCalcPerm);
+ if (aDonneesPerm) {
+ writeDonneesPermanentes(data, coeffsRuisParCalcPerm);
+ }
+ if (aDonneesTrans) {
+ writeDonneesTransitoires(data);
+ }
- writeDonneesPermanentes(data, coeffsRuisParCalcPerm);
-
- writeDonneesTransitoires(data);
-
} catch (final IOException e) {
analyze_.manageException(e);
} finally {
@@ -109,6 +68,9 @@
return fortranWriter_;
}
+ boolean aDonneesPerm = false;
+ boolean aDonneesTrans = false;
+
/**
* @param data
* @throws IOException
@@ -135,8 +97,6 @@
// ical
boolean aDonneesGen = false;
- boolean aDonneesPerm = false;
- boolean aDonneesTrans = false;
// Si au moins une branche a un DPTI, cela signifie qu'on a une ligne C dans les données générales
final List<CatEMHBranche> branches = data.getBranches();
@@ -156,9 +116,9 @@
// On a des données transitoires si au moins un calcul transitoire existe dans DCLM
final DonCLimMScenario dclm = data.getConditionsLim();
if (dclm != null) {
- List<CalcPseudoPerm> calcPseudoPerm = dclm.getCalcPseudoPerm();
+ final List<CalcPseudoPerm> calcPseudoPerm = dclm.getCalcPseudoPerm();
aDonneesPerm = CollectionUtils.isNotEmpty(calcPseudoPerm);
- List<CalcTrans> calcTrans = dclm.getCalcTrans();
+ final List<CalcTrans> calcTrans = dclm.getCalcTrans();
aDonneesTrans = CollectionUtils.isNotEmpty(calcTrans);
// cru
@@ -1117,22 +1077,22 @@
// Parcours des noeuds niveau continu
// final int listeNNCsSize = listeNNCs.size();
- for (CalcTransItem lim : calcTrans.getCalcTransNoeudNiveauContinuLimnigramme()) {
+ for (final CalcTransItem lim : calcTrans.getCalcTransNoeudNiveauContinuLimnigramme()) {
// nomEmh = emhs.get(countDonCLimM).getNom();
manageTranItem(lim, typesCL, lignesE);
}
- for (CalcTransNoeudNiveauContinuQapp lim : calcTrans.getCalcTransNoeudNiveauContinuQapp()) {
+ for (final CalcTransNoeudNiveauContinuQapp lim : calcTrans.getCalcTransNoeudNiveauContinuQapp()) {
manageTranItem(lim, typesCL, lignesE);
}
- for (CalcTransNoeudNiveauContinuTarrage lim : calcTrans.getCalcTransNoeudNiveauContinuTarrage()) {
+ for (final CalcTransNoeudNiveauContinuTarrage lim : calcTrans.getCalcTransNoeudNiveauContinuTarrage()) {
manageTranItem(lim, typesCL, lignesE);
}
- for (CalcTransBrancheOrificeManoeuvre lim : calcTrans.getCalcTransBrancheOrificeManoeuvre()) {
+ for (final CalcTransBrancheOrificeManoeuvre lim : calcTrans.getCalcTransBrancheOrificeManoeuvre()) {
manageTranItem(lim, typesCL, lignesE);
}
@@ -1184,12 +1144,12 @@
}
- private void manageTranItem(CalcTransItem lim, final TObjectIntHashMap typesCL, final List<AbstractLoi> lignesE)
+ private void manageTranItem(final CalcTransItem lim, final TObjectIntHashMap typesCL, final List<AbstractLoi> lignesE)
throws IOException {
fortranWriter_.stringField(0, lim.getNomEMH());
int typeCL = typesCL.get(lim.getClass());
if (lim instanceof CalcTransBrancheOrificeManoeuvre) {
- CalcTransBrancheOrificeManoeuvre or = (CalcTransBrancheOrificeManoeuvre) lim;
+ final CalcTransBrancheOrificeManoeuvre or = (CalcTransBrancheOrificeManoeuvre) lim;
if (EnumSensOuv.OUV_VERS_BAS.equals(or.getSensOuv())) {
typeCL++;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/CrueDataImpl.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/CrueDataImpl.java 2009-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/CrueDataImpl.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -4,25 +4,7 @@
import java.util.List;
import org.fudaa.dodico.crue.io.neuf.STOSequentialReader;
-import org.fudaa.dodico.crue.metier.emh.AbstractLoi;
-import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
-import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
-import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
-import org.fudaa.dodico.crue.metier.emh.CatEMHSection;
-import org.fudaa.dodico.crue.metier.emh.DonCLimMScenario;
-import org.fudaa.dodico.crue.metier.emh.DonFrt;
-import org.fudaa.dodico.crue.metier.emh.DonFrtStrickler;
-import org.fudaa.dodico.crue.metier.emh.EMH;
-import org.fudaa.dodico.crue.metier.emh.EvolutionFF;
-import org.fudaa.dodico.crue.metier.emh.LoiFF;
-import org.fudaa.dodico.crue.metier.emh.OrdCalcScenario;
-import org.fudaa.dodico.crue.metier.emh.OrdPrtCIniModeleBase;
-import org.fudaa.dodico.crue.metier.emh.OrdPrtGeoModeleBase;
-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.metier.emh.PtEvolutionFF;
-import org.fudaa.dodico.crue.metier.emh.ResPrtGeo;
+import org.fudaa.dodico.crue.metier.emh.*;
import org.fudaa.dodico.crue.metier.helper.EMHBrancheHelper;
import org.fudaa.dodico.crue.metier.helper.EMHCasierHelper;
import org.fudaa.dodico.crue.metier.helper.EMHNoeudHelper;
@@ -138,6 +120,26 @@
frottements = new ArrayList<DonFrt>();
}
+ public CrueDataImpl(CrueData copy) {
+ this();
+ if (copy != null) {
+ noeuds = copy.getNoeuds();
+ branches = copy.getBranches();
+ sections = copy.getSections();
+ casiers = copy.getCasiers();
+ frottements = copy.getFrottements();
+ lois = copy.getLois();
+ conditionsLim = copy.getConditionsLim();
+ ordCalc = copy.getOrdCalc();
+ ordRes = copy.getOrdRes();
+ this.dataParamNumModeleBase = copy.getParamNumModeleBase();
+ this.methodesInterpolation = copy.getMethodesInterpolation();
+ this.paramCalc = copy.getParamCalc();
+ this.pretraitementsGeom = copy.getPretraitementsGeom();
+ this.rptg = copy.getRptg();
+ }
+ }
+
/**
* Ajoute automatiquement l'objet emh dans la bonne structure.
*
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHContainer.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHContainer.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHContainer.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -0,0 +1,58 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.metier;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author deniger
+ */
+public class EMHContainer {
+
+ /**
+ * Les donnees crueData du scenario .
+ */
+ private CrueData dataSource;
+ /**
+ * Liste des fichiers rattach�s au scenario . Ces fichiers proviennent de la classe EMHProjetInfos qui contient la
+ * base des fichiers du projet. Ces fichiers sont uniquement des fichiers r�sultat ?
+ */
+ private FichierCrueManager listeFichiers_;
+
+ /**
+ * @return le manager des fichiers
+ */
+ public final FichierCrueManager getListeFichiers() {
+ return listeFichiers_;
+ }
+
+ public final void setListeFichiers(final List<FichierCrue> listeFichiersResultatsScenario) {
+ this.listeFichiers_ = new FichierCrueManager(listeFichiersResultatsScenario);
+ }
+
+ /**
+ * Ajoute un fichier .
+ *
+ * @param fichier
+ * @return
+ */
+ public final boolean addFichierDonnees(final FichierCrue fichier) {
+ if (listeFichiers_ == null) {
+ listeFichiers_ = new FichierCrueManager(Arrays.asList(fichier));
+ }
+ listeFichiers_.addFile(fichier);
+ return true;
+ }
+
+ public final CrueData getDataSource() {
+ return dataSource;
+ }
+
+ public final void setDataSource(CrueData dataSources) {
+ this.dataSource = dataSources;
+ }
+
+}
Modified: 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/EMHModeleBase.java 2009-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHModeleBase.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -1,6 +1,5 @@
package org.fudaa.dodico.crue.metier;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -8,7 +7,7 @@
*
* @author Adrien Hadoux
*/
-public class EMHModeleBase {
+public class EMHModeleBase extends EMHContainer {
/**
* Id unique.
@@ -16,11 +15,6 @@
protected String id_;
/**
- * Les donnees crueData du scenario .
- */
- CrueData dataSources;
-
- /**
* La liste des sous modeles associ�s au modele. ETU
*/
protected EMHModeleEnchainement listeSousModeles_;
@@ -30,14 +24,6 @@
*/
protected EMHInfosVersion infosVersions_;
- /**
- * Liste des fichiers rattach�s au modeles (respectivement sous) modele. Ces fichiers proviennent de la classe
- * EMHProjetInfos qui contient la base desfichiers du projet.
- *
- * @param id
- */
- protected List<FichierCrue> listeFichiersModele_;
-
public EMHModeleBase(final String id) {
id_ = id;
}
@@ -83,19 +69,6 @@
}
/**
- * Ajoute un fichier .
- *
- * @param fichier
- * @return
- */
- public boolean addFichierDonneesToModele(final FichierCrue fichier) {
- if (listeFichiersModele_ == null) {
- listeFichiersModele_ = new ArrayList<FichierCrue>();
- }
- return listeFichiersModele_.add(fichier);
- }
-
- /**
* Ajoute un sous modele .
*
* @param sousModele
@@ -108,20 +81,4 @@
return listeSousModeles_.ajouteModele(sousModele);
}
- public List<FichierCrue> getListeFichiersCrue() {
- return listeFichiersModele_;
- }
-
- public void setListeFichiersCrue(final List<FichierCrue> listeFichiersCrue) {
- this.listeFichiersModele_ = listeFichiersCrue;
- }
-
- public CrueData getDataSources() {
- return dataSources;
- }
-
- public void setDataSources(CrueData dataSources) {
- this.dataSources = dataSources;
- }
-
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHModeleRun.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHModeleRun.java 2009-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHModeleRun.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -3,19 +3,19 @@
import java.util.List;
/**
- * Contient un modele et sa liste de fichier de r\xE9sultats associ\xE9s Contenu dans Run.
+ * Contient un modele et sa liste de fichier de r�sultats associ�s Contenu dans Run.
*
* @author Adrien Hadoux
*/
public class EMHModeleRun {
/**
- * modele associ\xE9 au run et aux fichiers r\xE9sultats.
+ * modele associ� au run et aux fichiers r�sultats.
*/
private final EMHModeleBase modeleRun;
/**
- * Liste des fichiers de r\xE9sultats rattach\xE9s au modele du runrun . Ces fichiers sont uniquement des fichiers r\xE9sultat.
+ * Liste des fichiers de r�sultats rattach�s au modele du runrun . Ces fichiers sont uniquement des fichiers r�sultat.
*
* @param id_
*/
@@ -31,7 +31,7 @@
return modeleRun;
}
- public List<FichierCrue> getListeFichiersResultatsAssocies_() {
+ public List<FichierCrue> getListeFichiers() {
return listeFichiersResultatsAssocies_;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHScenario.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHScenario.java 2009-06-03 17:48:49 UTC (rev 4838)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/EMHScenario.java 2009-06-03 22:59:45 UTC (rev 4839)
@@ -3,12 +3,14 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.collections.CollectionUtils;
+
/**
* Entite organisant les calculs sur des modeles simples ou enchaines
*
* @author Adrien Hadoux
*/
-public class EMHScenario {
+public class EMHScenario extends EMHContainer {
private final String id_;
/**
@@ -17,11 +19,6 @@
private EMHModeleEnchainement gestionModele_;
/**
- * Les donnees crueData du scenario .
- */
- private CrueData dataSources;
-
- /**
* la liste des runs associes au sc�nraio.
*/
private List<EMHRun> listeRuns_;
@@ -37,20 +34,6 @@
private EMHInfosVersion infosVersions_;
/**
- * Liste des fichiers rattach�s au scenario . Ces fichiers proviennent de la classe EMHProjetInfos qui contient la
- * base des fichiers du projet. Ces fichiers sont uniquement des fichiers r�sultat ?
- */
- private List<FichierCrue> listeFichiersScenario_;
-
- public List<FichierCrue> getListeFichiersScenario() {
- return listeFichiersScenario_;
- }
-
- public void setListeFichiersScenario(final List<FichierCrue> listeFichiersResultatsScenario) {
- this.listeFichiersScenario_ = listeFichiersResultatsScenario;
- }
-
- /**
* Ajoute un Run .
*
* @param fichier
@@ -64,6 +47,39 @@
}
/**
+ * @return true si contient des données.
+ */
+ public boolean isLoaded() {
+ return getDataSource() != null;
+ }
+
+ public void clean() {
+ setDataSource(null);
+ if (getGe...
[truncated message content] |
