Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4891] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2009-06-27 19:59:35
|
Revision: 4891
http://fudaa.svn.sourceforge.net/fudaa/?rev=4891&view=rev
Author: deniger
Date: 2009-06-27 19:57:53 +0000 (Sat, 27 Jun 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrueBinaryFileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CrueFileFormatManager.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CustomFileFormatVersionInterface.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/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/common/Messages.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.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/CrueConverterDFRT.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDLHY.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDRSO.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/CrueConverterOCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterORES.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPCAL.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/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/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/metier/EMHproject.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/FichierCrue.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/FichierCrueManager.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerContrat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHContainer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHContainerBase.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHModeleBase.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/ManagerEMHSousModele.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ProjetMessages.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/validation/ValidateModeleScenario.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/ioMessages.properties
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/projet/projetMessages.properties
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/ctulu/ExampleCtuluDefaultLogFormatter.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDC.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/TestCrueDCSPFile.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/TestCrueDH.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/TestCrueDPTGFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDPTIFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDRSOFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueETUFile.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/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/TestCrueValidationModele.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/ScenarioLoaderUI.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioSaver.java
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/crue/common/messages.properties
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueMessageHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueFileType.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/OrdonnanceurCrue10.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
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueConstants.java
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -146,9 +146,9 @@
* @param _m
* @param arg
*/
- public void addFatalError(final String _m, final Object arg) {
+ public void addFatalError(final String _m, final Object... arg) {
// TODO a continuer
- addError(_m);
+ addError(_m, arg);
}
/**
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueMessageHelper.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueMessageHelper.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueMessageHelper.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -0,0 +1,29 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.common;
+
+import java.text.MessageFormat;
+import java.util.ResourceBundle;
+
+import org.fudaa.ctulu.CtuluLibArray;
+
+/**
+ * @author deniger
+ */
+public final class CrueMessageHelper {
+
+ /**
+ * @param bundle
+ * @param s le message initial
+ * @param args les arguements a utiliser pour le message
+ * @return la chaine traduite
+ */
+ public static String getS(ResourceBundle bundle, final String s, Object... args) {
+ String res = bundle.getString(s);
+ if (!CtuluLibArray.isEmpty(args)) { return new MessageFormat(res).format(args); }
+ return res;
+ }
+
+}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrue9FileFormat.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -87,7 +87,7 @@
return source;
}
- public boolean write(final CrueIOResu<CrueData> metier, final File f, final CtuluAnalyze analyzer) {
+ public boolean writeMetier(final CrueIOResu<CrueData> metier, final File f, final CtuluAnalyze analyzer) {
analyzer.setDesc(f.getName());
final AbstractCrue9Writer writer = createWriter();
writer.setFile(f);
@@ -99,8 +99,16 @@
return (ok && (operation.containsClosingError() || operation.containsFatalError()));
}
- public boolean write(final OutputStream out, final CrueIOResu<CrueData> metier, final CtuluAnalyze analyser) {
+ public boolean writeMetier(final CrueIOResu<CrueData> metier, final OutputStream out, final CtuluAnalyze analyser) {
throw new IllegalAccessError("Must be done");
}
+ public boolean write(CrueData metier, File f, CtuluAnalyze analyzer) {
+ return writeMetier(new CrueIOResu<CrueData>(metier), f, analyzer);
+ }
+
+ public boolean write(CrueData metier, OutputStream out, CtuluAnalyze analyser) {
+ return writeMetier(new CrueIOResu<CrueData>(metier), out, analyser);
+ }
+
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrueBinaryFileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrueBinaryFileFormat.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/AbstractCrueBinaryFileFormat.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -79,12 +79,20 @@
throw new IllegalArgumentException("Not supported");
}
- public boolean write(CrueIOResu<M> metier, File f, CtuluAnalyze analyzer) {
+ public boolean writeMetier(CrueIOResu<M> metier, File f, CtuluAnalyze analyzer) {
throw new IllegalArgumentException("Not supported");
}
- public boolean write(OutputStream out, CrueIOResu<M> metier, CtuluAnalyze analyser) {
+ public boolean write(CrueData metier, File f, CtuluAnalyze analyzer) {
throw new IllegalArgumentException("Not supported");
}
+ public boolean write(CrueData metier, OutputStream out, CtuluAnalyze analyser) {
+ throw new IllegalArgumentException("Not supported");
+ }
+
+ public boolean writeMetier(CrueIOResu<M> metier, OutputStream out, CtuluAnalyze analyser) {
+ throw new IllegalArgumentException("Not supported");
+ }
+
}
\ No newline at end of file
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-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormat.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -3,6 +3,7 @@
import java.io.File;
import java.io.OutputStream;
import java.net.URL;
+import java.util.Map;
import com.memoire.bu.BuFileFilter;
@@ -10,6 +11,7 @@
import org.fudaa.ctulu.fileformat.FileReadOperationAbstract;
import org.fudaa.ctulu.fileformat.FileWriteOperationAbstract;
import org.fudaa.dodico.crue.io.common.CrueData;
+import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.dao.CrueXmlReaderWriter;
/**
@@ -27,8 +29,9 @@
/**
* @param type le type en Upper case comme par exemple DFRT.
*/
- protected Crue10FileFormat(final CrueXmlReaderWriter<M> readerWriter) {
- this(readerWriter.getXsdId(), readerWriter);
+ protected Crue10FileFormat(final CrueXmlReaderWriter<M> readerWriter, final Map<CrueFileType, Crue10FileFormat> saver) {
+ this(readerWriter.getFileType(), readerWriter, saver);
+
}
@SuppressWarnings("serial")
@@ -52,14 +55,21 @@
/**
* @param type le type en Upper case comme par exemple DFRT.
*/
- protected Crue10FileFormat(final String type, final CrueXmlReaderWriter<M> readerWriter) {
+ protected Crue10FileFormat(final CrueFileType type, final CrueXmlReaderWriter<M> readerWriter,
+ final Map<CrueFileType, Crue10FileFormat> saver) {
super(1);
this.readerWriter = readerWriter;
- nom = type.toLowerCase();
+ nom = type.toString().toLowerCase();
id = nom;
extensions = new String[] { nom + ".xml" };
description = nom + ".file";
+ }
+ /**
+ * @return type du fichier supporte.
+ */
+ public CrueFileType getFileType() {
+ return readerWriter.getFileType();
}
/**
@@ -189,18 +199,28 @@
* @param analyzer
* @return true si l'écriture s'est bien passée
*/
- public final boolean write(final M metier, final File f, final CtuluAnalyze analyzer) {
+ public final boolean write(final CrueData metier, final File f, final CtuluAnalyze analyzer) {
return readerWriter.writeXML(metier, f, analyzer);
}
+ public boolean write(final CrueData metier, final OutputStream out, final CtuluAnalyze analyser) {
+ return readerWriter.writeXML(metier, out, analyser);
+ }
+
+ public boolean writeMetier(final M metier, final OutputStream out, final CtuluAnalyze analyser) {
+ return readerWriter.writeXMLMetier(metier, out, analyser);
+ }
+
/**
- * @param out le flux de sortie qui ne sera pas ferme
- * @param metier l'objet metier
- * @param analyser
- * @return true si reussite
+ * Méthode qui permet d'écrire les datas dans le fichier f spécifié.
+ *
+ * @param metier
+ * @param f
+ * @param analyzer
+ * @return true si l'écriture s'est bien passée
*/
- public boolean write(final OutputStream out, final M metier, final CtuluAnalyze analyser) {
- return readerWriter.writeXML(out, metier, analyser);
+ public final boolean writeMetier(final M metier, final File f, final CtuluAnalyze analyzer) {
+ return readerWriter.writeXMLMetier(metier, f, analyzer);
}
}
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-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -1,9 +1,11 @@
package org.fudaa.dodico.crue.io;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
-import org.fudaa.dodico.crue.io.common.CrueConstants;
import org.fudaa.dodico.crue.io.common.CrueData;
+import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.dao.*;
import org.fudaa.dodico.crue.metier.EMHproject;
import org.fudaa.dodico.crue.metier.emh.*;
@@ -13,166 +15,185 @@
*
* @author Adrien Hadoux
*/
-public class Crue10FileFormatFactory {
+public final class Crue10FileFormatFactory {
- private final static Crue10FileFormat<CrueData> DCSP = new Crue10FileFormat<CrueData>(
- new CrueXmlReaderWriterImpl<CrueDaoDCSP, CrueData>(CrueConstants.DCSP, new CrueConverterDCSP(),
- new CrueDaoStructureDCSP()));
+ private final Map<CrueFileType, Crue10FileFormat> fnts = new HashMap<CrueFileType, Crue10FileFormat>();
- private final static Crue10FileFormat<List<DonFrt>> DFRT = new Crue10FileFormat<List<DonFrt>>(
- new CrueXmlReaderWriterImpl<CrueDaoDFRT, List<DonFrt>>(CrueConstants.DFRT, new CrueConverterDFRT(),
- new CrueDaoStructureDFRT()));
+ private final Crue10FileFormat<CrueData> dcsp = new Crue10FileFormat<CrueData>(
+ new CrueXmlReaderWriterImpl<CrueDaoDCSP, CrueData>(CrueFileType.DCSP, new CrueConverterDCSP(),
+ new CrueDaoStructureDCSP()), fnts);
- private final static Crue10FileFormat<List<Loi>> DLHY = new Crue10FileFormat<List<Loi>>(
- new CrueXmlReaderWriterImpl<CrueDaoDLHY, List<Loi>>(CrueConstants.DLHY, new CrueConverterDLHY(),
- new CrueDaoStructureDLHY()));
+ private final Crue10FileFormat<List<DonFrt>> dfrt = new Crue10FileFormat<List<DonFrt>>(
+ new CrueXmlReaderWriterImpl<CrueDaoDFRT, List<DonFrt>>(CrueFileType.DFRT, new CrueConverterDFRT(),
+ new CrueDaoStructureDFRT()), fnts);
- private final static Crue10FileFormat<CrueData> DPTG = new Crue10FileFormat<CrueData>(
- new CrueXmlReaderWriterImpl<CrueDaoDPTG, CrueData>(CrueConstants.DPTG, new CrueConverterDPTG(),
- new CrueDaoStructureDPTG()));
+ private final Crue10FileFormat<List<Loi>> dlhy = new Crue10FileFormat<List<Loi>>(
+ new CrueXmlReaderWriterImpl<CrueDaoDLHY, List<Loi>>(CrueFileType.DLHY, new CrueConverterDLHY(),
+ new CrueDaoStructureDLHY()), fnts);
- private final static Crue10FileFormat<CrueData> DPTI = new Crue10FileFormat<CrueData>(
- new CrueXmlReaderWriterImpl<CrueDaoDPTI, CrueData>(CrueConstants.DPTI, new CrueConverterDPTI(),
- new CrueDaoStructureDPTI()));
+ private final Crue10FileFormat<CrueData> dptg = new Crue10FileFormat<CrueData>(
+ new CrueXmlReaderWriterImpl<CrueDaoDPTG, CrueData>(CrueFileType.DPTG, new CrueConverterDPTG(),
+ new CrueDaoStructureDPTG()), fnts);
- private final static Crue10FileFormat<CrueData> DRSO = new Crue10FileFormat<CrueData>(
- new CrueXmlReaderWriterImpl<CrueDaoDRSO, CrueData>(CrueConstants.DRSO, new CrueConverterDRSO(),
- new CrueDaoStructureDRSO()));
+ private final Crue10FileFormat<CrueData> dpti = new Crue10FileFormat<CrueData>(
+ new CrueXmlReaderWriterImpl<CrueDaoDPTI, CrueData>(CrueFileType.DPTI, new CrueConverterDPTI(),
+ new CrueDaoStructureDPTI()), fnts);
- private final static Crue10FileFormat<EMHproject> ETU = new Crue10FileFormat<EMHproject>(CrueConstants.ETU,
- new CrueXmlReaderWriterImpl<CrueDaoETU, EMHproject>(CrueConstants.ETU, new CrueConverterETU(),
- new CrueDaoStructureETU()));
+ private final Crue10FileFormat<CrueData> drso = new Crue10FileFormat<CrueData>(
+ new CrueXmlReaderWriterImpl<CrueDaoDRSO, CrueData>(CrueFileType.DRSO, new CrueConverterDRSO(),
+ new CrueDaoStructureDRSO()), fnts);
- private final static Crue10FileFormat<OrdPrtGeoModeleBase> OPTG = new Crue10FileFormat<OrdPrtGeoModeleBase>(
- new CrueXmlReaderWriterImpl<CrueDaoOPTG, OrdPrtGeoModeleBase>(CrueConstants.OPTG, new CrueConverterOPTG(),
- new CrueDaoStructureOPTG()));
+ private final Crue10FileFormat<EMHproject> etu = new Crue10FileFormat<EMHproject>(
+ new CrueXmlReaderWriterImpl<CrueDaoETU, EMHproject>(CrueFileType.ETU, new CrueConverterETU(),
+ new CrueDaoStructureETU()), fnts);
- private final static Crue10FileFormat<DonCLimMScenario> DCLM = new Crue10FileFormat<DonCLimMScenario>(
- new CrueXmlReaderWriterImpl<CrueDaoDCLM, DonCLimMScenario>(CrueConstants.DCLM, new CrueConverterDCLM(),
- new CrueDaoStructureDCLM()));
+ private final Crue10FileFormat<OrdPrtGeoModeleBase> optg = new Crue10FileFormat<OrdPrtGeoModeleBase>(
+ new CrueXmlReaderWriterImpl<CrueDaoOPTG, OrdPrtGeoModeleBase>(CrueFileType.OPTG, new CrueConverterOPTG(),
+ new CrueDaoStructureOPTG()), fnts);
- private final static Crue10FileFormat<OrdResScenario> ORES = new Crue10FileFormat<OrdResScenario>(
- new CrueXmlReaderWriterImpl<CrueDaoORES, OrdResScenario>(CrueConstants.ORES, new CrueConverterORES(),
- new CrueDaoStructureORES()));
+ private final Crue10FileFormat<DonCLimMScenario> dclm = new Crue10FileFormat<DonCLimMScenario>(
+ new CrueXmlReaderWriterImpl<CrueDaoDCLM, DonCLimMScenario>(CrueFileType.DCLM, new CrueConverterDCLM(),
+ new CrueDaoStructureDCLM()), fnts);
- private final static Crue10FileFormat<OrdCalcScenario> OCAL = new Crue10FileFormat<OrdCalcScenario>(
- new CrueXmlReaderWriterImpl<CrueDaoOCAL, OrdCalcScenario>(CrueConstants.OCAL, new CrueConverterOCAL(),
- new CrueDaoStructureOCAL()));
+ private final Crue10FileFormat<OrdResScenario> ores = new Crue10FileFormat<OrdResScenario>(
+ new CrueXmlReaderWriterImpl<CrueDaoORES, OrdResScenario>(CrueFileType.ORES, new CrueConverterORES(),
+ new CrueDaoStructureORES()), fnts);
- private final static Crue10FileFormat<ParamCalcScenario> PCAL = new Crue10FileFormat<ParamCalcScenario>(
- new CrueXmlReaderWriterImpl<CrueDaoPCAL, ParamCalcScenario>(CrueConstants.PCAL, new CrueConverterPCAL(),
- new CrueDaoStructurePCAL()));
+ private final Crue10FileFormat<OrdCalcScenario> ocal = new Crue10FileFormat<OrdCalcScenario>(
+ new CrueXmlReaderWriterImpl<CrueDaoOCAL, OrdCalcScenario>(CrueFileType.OCAL, new CrueConverterOCAL(),
+ new CrueDaoStructureOCAL()), fnts);
- private final static Crue10FileFormat<ParamNumModeleBase> PNUM = new Crue10FileFormat<ParamNumModeleBase>(
- new CrueXmlReaderWriterImpl<CrueDaoPNUM, ParamNumModeleBase>(CrueConstants.PNUM, new CrueConverterPNUM(),
- new CrueDaoStructurePNUM()));
+ private final Crue10FileFormat<ParamCalcScenario> pcal = new Crue10FileFormat<ParamCalcScenario>(
+ new CrueXmlReaderWriterImpl<CrueDaoPCAL, ParamCalcScenario>(CrueFileType.PCAL, new CrueConverterPCAL(),
+ new CrueDaoStructurePCAL()), fnts);
- private final static Crue10FileFormat<OrdPrtCIniModeleBase> OPTI = new Crue10FileFormat<OrdPrtCIniModeleBase>(
- new CrueXmlReaderWriterImpl<CrueDaoOPTI, OrdPrtCIniModeleBase>(CrueConstants.OPTI, new CrueConverterOPTI(),
- new CrueDaoStructureOPTI()));
+ private final Crue10FileFormat<ParamNumModeleBase> pnum = new Crue10FileFormat<ParamNumModeleBase>(
+ new CrueXmlReaderWriterImpl<CrueDaoPNUM, ParamNumModeleBase>(CrueFileType.PNUM, new CrueConverterPNUM(),
+ new CrueDaoStructurePNUM()), fnts);
- static {
- Crue10FileFormatFactory.DRSO.setIndependant(true);
- ETU.setIndependant(true);
- OPTG.setIndependant(true);
+ private final Crue10FileFormat<OrdPrtCIniModeleBase> opti = new Crue10FileFormat<OrdPrtCIniModeleBase>(
+ new CrueXmlReaderWriterImpl<CrueDaoOPTI, OrdPrtCIniModeleBase>(CrueFileType.OPTI, new CrueConverterOPTI(),
+ new CrueDaoStructureOPTI()), fnts);
+
+ private static final Crue10FileFormatFactory INSTANCE = new Crue10FileFormatFactory();
+
+ /**
+ * @return le singleton
+ */
+ public static final Crue10FileFormatFactory getInstance() {
+ return INSTANCE;
}
+ private Crue10FileFormatFactory() {
+ drso.setIndependant(true);
+ etu.setIndependant(true);
+ optg.setIndependant(true);
+ }
+
/**
+ * @param type le type voulu
+ * @return le fileformat correspondant
+ */
+ public Crue10FileFormat getFileFormat(final CrueFileType type) {
+ return fnts.get(type);
+ }
+
+ /**
* @return DCSP : objet CrueFileFormat qui contient le DAO et le métier de DCSP
*/
- public static Crue10FileFormat<CrueData> getDCSPFileFormat() {
- return DCSP;
+ public Crue10FileFormat<CrueData> getDCSP() {
+ return dcsp;
}
/**
* @return DFRT : objet CrueFileFormat qui contient le DAO et le métier de DFRT
*/
- public static Crue10FileFormat<List<DonFrt>> getDFRTFileFormat() {
- return DFRT;
+ public Crue10FileFormat<List<DonFrt>> getDFRT() {
+ return dfrt;
}
/**
* @return DLHY : objet CrueFileFormat qui contient le DAO et le métier de DLHY
*/
- public static Crue10FileFormat<List<Loi>> getDLHYFileFormat() {
- return DLHY;
+ public Crue10FileFormat<List<Loi>> getDLHY() {
+ return dlhy;
}
/**
* @return DCLM : objet CrueFileFormat qui contient le DAO et le métier de DCLM
*/
- public static Crue10FileFormat<DonCLimMScenario> getDCLMFileFormat() {
- return DCLM;
+ public Crue10FileFormat<DonCLimMScenario> getDCLM() {
+ return dclm;
}
/**
* @return ORES : objet CrueFileFormat qui contient le DAO et le métier de ORES
*/
- public static Crue10FileFormat<OrdResScenario> getORESFileFormat() {
- return ORES;
+ public Crue10FileFormat<OrdResScenario> getORES() {
+ return ores;
}
/**
* @return DPTG : objet CrueFileFormat qui contient le DAO et le métier de DPTG
*/
- public static Crue10FileFormat<CrueData> getDPTGFileFormat() {
- return DPTG;
+ public Crue10FileFormat<CrueData> getDPTG() {
+ return dptg;
}
/**
* @return DPTI : objet CrueFileFormat qui contient le DAO et le métier de DPTI
*/
- public static Crue10FileFormat<CrueData> getDPTIFileFormat() {
- return DPTI;
+ public Crue10FileFormat<CrueData> getDPTI() {
+ return dpti;
}
/**
* @return DRSO : objet CrueFileFormat qui contient le DAO et le métier de DRSO
*/
- public static Crue10FileFormat<CrueData> getDRSOFileFormat() {
- return DRSO;
+ public Crue10FileFormat<CrueData> getDRSO() {
+ return drso;
}
/**
* @return ETU : objet CrueFileFormat qui contient le DAO et le métier de ETU
*/
- public static Crue10FileFormat<EMHproject> getETUFileFormat() {
- return ETU;
+ public Crue10FileFormat<EMHproject> getETU() {
+ return etu;
}
/**
* @return OPTG : objet CrueFileFormat qui contient le DAO et le métier de OPTG
*/
- public static Crue10FileFormat<OrdPrtGeoModeleBase> getOPTGFileFormat() {
- return OPTG;
+ public Crue10FileFormat<OrdPrtGeoModeleBase> getOPTG() {
+ return optg;
}
/**
* @return OCAL : objet CrueFileFormat qui contient le DAO et le métier de OCAL
*/
- public static Crue10FileFormat<OrdCalcScenario> getOCALFileFormat() {
- return OCAL;
+ public Crue10FileFormat<OrdCalcScenario> getOCAL() {
+ return ocal;
}
/**
* @return OPTI : objet CrueFileFormat qui contient le DAO et le métier de OPTI
*/
- public static Crue10FileFormat<OrdPrtCIniModeleBase> getOPTIFileFormat() {
- return OPTI;
+ public Crue10FileFormat<OrdPrtCIniModeleBase> getOPTI() {
+ return opti;
}
/**
* @return PCAL : objet CrueFileFormat qui contient le DAO et le métier de PCAL
*/
- public static Crue10FileFormat<ParamCalcScenario> getPCALFileFormat() {
- return PCAL;
+ public Crue10FileFormat<ParamCalcScenario> getPCAL() {
+ return pcal;
}
/**
* @return PNUM : objet CrueFileFormat qui contient le DAO et le métier de PNUM
*/
- public static Crue10FileFormat<ParamNumModeleBase> getPNUMFileFormat() {
- return PNUM;
+ public Crue10FileFormat<ParamNumModeleBase> getPNUM() {
+ return pnum;
}
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CrueFileFormatManager.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CrueFileFormatManager.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CrueFileFormatManager.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -24,7 +24,7 @@
final List<CustomFileFormat> r = new ArrayList<CustomFileFormat>();
// -- format du fichier ETU --//
- r.add(Crue10FileFormatFactory.getETUFileFormat());
+ r.add(Crue10FileFormatFactory.getInstance().getETU());
return r.toArray(new CustomFileFormat[r.size()]);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CustomFileFormatVersionInterface.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CustomFileFormatVersionInterface.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/CustomFileFormatVersionInterface.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -69,13 +69,31 @@
* @param analyzer Conteneur des messages d'erreurs
* @return true si l'écriture du fichier s'est bien passée
*/
- boolean write(final M metier, final File f, final CtuluAnalyze analyzer);
+ boolean write(final CrueData metier, final File f, final CtuluAnalyze analyzer);
/**
+ * @param data l'objet metier
* @param out le flux de sortie qui ne sera pas ferme
+ * @param analyser Conteneur des messages d'erreurs
+ * @return true si reussite
+ */
+ boolean write(final CrueData data, final OutputStream out, final CtuluAnalyze analyser);
+
+ /**
+ * Méthode qui permet d'écrire les datas dans le fichier f spécifié.
+ *
* @param metier l'objet metier
+ * @param f Fichier à écrire
+ * @param analyzer Conteneur des messages d'erreurs
+ * @return true si l'écriture du fichier s'est bien passée
+ */
+ boolean writeMetier(final M metier, final File f, final CtuluAnalyze analyzer);
+
+ /**
+ * @param metier l'objet metier
+ * @param out le flux de sortie qui ne sera pas ferme
* @param analyser Conteneur des messages d'erreurs
* @return true si reussite
*/
- boolean write(final OutputStream out, final M metier, final CtuluAnalyze analyser);
+ boolean writeMetier(final M metier, final OutputStream out, final CtuluAnalyze analyser);
}
\ No newline at end of file
Deleted: 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 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueConstants.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -1,36 +0,0 @@
-/**
- * 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/CrueData.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueData.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueData.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -23,6 +23,8 @@
EMHScenario getScenarioData();
+ EMHModeleBase getModele();
+
public Calc findCalcByNom(String nom);
/**
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-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataImpl.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -17,19 +17,21 @@
*/
public class CrueDataImpl implements CrueData {
- private final Map<String, DonPrtGeoBatiCasier> idBatiCasierUse = new HashMap<String, DonPrtGeoBatiCasier>(50);
+ /**
+ * @param sc le conteneur
+ * @return CrueData correspondant au scenario n'ayant un seul modele
+ */
+ public static CrueData buildConcatFor(final EMHScenario sc) {
+ final List<EMHModeleBase> fils = EMHHelper.getEMHInRelationEMHContient(sc, EnumTypeEMH.MODELE);
+ if (fils.size() > 1) { return null; }
+ final EMHModeleBase base = fils.get(0);
+ return new CrueDataImpl(sc, base, base.getConcatSousModele());
- private final Map<String, DonPrtGeoProfilCasier> idProfilCasierUse = new HashMap<String, DonPrtGeoProfilCasier>(50);
+ }
- private final Map<String, DonPrtGeoProfilSection> idProfilSectionUse = new HashMap<String, DonPrtGeoProfilSection>(50);
+ public static CrueData buildConcatFor(final EMHScenario sc, final EMHModeleBase conteneur) {
+ return new CrueDataImpl(sc, conteneur, conteneur.getConcatSousModele());
- List<ResPrtGeo> rptg;
-
- public CrueDataImpl(final EMHScenario scenarioData, final EMHModeleBase modele, final EMHSousModele ssModele) {
- super();
- this.scenarioData = scenarioData;
- this.ssModele = ssModele;
- this.modele = modele;
}
/**
@@ -49,31 +51,24 @@
}
- /**
- * @param sc le conteneur
- * @return CrueData correspondant au scenario n'ayant un seul modele
- */
- public static CrueData buildConcatFor(final EMHScenario sc) {
- final List<EMHModeleBase> fils = EMHHelper.getEMHInRelationEMHContient(sc, EnumTypeEMH.MODELE);
- if (fils.size() > 1) { return null; }
- final EMHModeleBase base = fils.get(0);
- return new CrueDataImpl(sc, base, base.getConcatSousModele());
+ private final Map<String, DonPrtGeoBatiCasier> idBatiCasierUse = new HashMap<String, DonPrtGeoBatiCasier>(50);
- }
+ private final Map<String, EMH> idEMH = new HashMap<String, EMH>();
- public static CrueData buildConcatFor(final EMHScenario sc, final EMHModeleBase conteneur) {
- return new CrueDataImpl(sc, conteneur, conteneur.getConcatSousModele());
+ private final Map<String, DonPrtGeoProfilCasier> idProfilCasierUse = new HashMap<String, DonPrtGeoProfilCasier>(50);
- }
+ private final Map<String, DonPrtGeoProfilSection> idProfilSectionUse = new HashMap<String, DonPrtGeoProfilSection>(50);
+ private final EMHModeleBase modele;
+
+ private List<ResPrtGeo> rptg;
+
private final EMHScenario scenarioData;
private final EMHSousModele ssModele;
- private final EMHModeleBase modele;
-
/**
* Données STO
*/
- STOSequentialReader sto;
+ private STOSequentialReader sto;
public CrueDataImpl() {
scenarioData = new EMHScenario();
@@ -81,7 +76,12 @@
modele = new EMHModeleBase();
}
- Map<String, EMH> idEMH = new HashMap<String, EMH>();
+ public CrueDataImpl(final EMHScenario scenarioData, final EMHModeleBase modele, final EMHSousModele ssModele) {
+ super();
+ this.scenarioData = scenarioData;
+ this.ssModele = ssModele;
+ this.modele = modele;
+ }
/**
* Ajoute automatiquement l'objet emh dans la bonne structure.
@@ -145,18 +145,6 @@
return listeTotale;
}
- public EMHSousModele getSousModele() {
- return ssModele;
- }
-
- public List<CatEMHSection> getSections() {
- return EMHHelper.getEMHInRelationEMHContient(ssModele, EnumTypeEMH.SECTION);
- }
-
- public List<CatEMHNoeud> getNoeuds() {
- return EMHHelper.getEMHInRelationEMHContient(ssModele, EnumTypeEMH.NOEUD);
- }
-
public List<CatEMHBranche> getBranches() {
return EMHHelper.getEMHInRelationEMHContient(ssModele, EnumTypeEMH.BRANCHE);
}
@@ -191,6 +179,14 @@
return (OrdPrtCIniModeleBase) EMHHelper.getInfoEMH(modele, EnumInfosEMH.ORD_PRT_CINI_MODELE_BASE);
}
+ public EMHModeleBase getModele() {
+ return modele;
+ }
+
+ public List<CatEMHNoeud> getNoeuds() {
+ return EMHHelper.getEMHInRelationEMHContient(ssModele, EnumTypeEMH.NOEUD);
+ }
+
/**
* @return the ordCalc
*/
@@ -232,6 +228,14 @@
return scenarioData;
}
+ public List<CatEMHSection> getSections() {
+ return EMHHelper.getEMHInRelationEMHContient(ssModele, EnumTypeEMH.SECTION);
+ }
+
+ public EMHSousModele getSousModele() {
+ return ssModele;
+ }
+
/**
* @return the sto
*/
Copied: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueFileType.java (from rev 4839, 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/CrueFileType.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueFileType.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -0,0 +1,14 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.dodico.crue.io.common;
+
+/**
+ * @author deniger
+ */
+public enum CrueFileType {
+
+ ETU, DRSO, ORES, OCAL, PCAL, DCLM, DLHY, OPTR, OPTG, OPTI, PNUM, DPTI, DCSP, DPTG, DFRT, DC, DH, RPTR, RPTG, RPTI, RCAL
+
+}
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-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/Messages.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -4,63 +4,14 @@
*/
package org.fudaa.dodico.crue.io.common;
-import java.util.*;
+import java.util.ResourceBundle;
/**
* @author deniger
*/
public final class Messages {
- // ATTENTION: tricky
- // pour éviter que tout le monde tape dans les mêmes fichiers de propriétés, plusieurs ont été créés
- // ils seront mergés par la suite
- // en les créant de la sorte, ALL_RESOURCE_BUNDLE et le parent de DC_RESOURCE qui est le parent de RESOURCE_BUNDLE
- private static final ResourceBundle ALL_RESOURCE_BUNDLE = ResourceBundle
- .getBundle("org.fudaa.dodico.crue.io.ioMessages");
- // private static final ResourceBundle DC_RESOURCE_BUNDLE = ResourceBundle
- // .getBundle("org.fudaa.dodico.crue.io.adrienMessages");
- // private static final ResourceBundle DH_RESOURCE_BUNDLE = ResourceBundle
- // .getBundle("org.fudaa.dodico.crue.io.caroleMessages");
- // /** 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);
- public static final ResourceBundle RESOURCE_BUNDLE = ALL_RESOURCE_BUNDLE;
+ public static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle("org.fudaa.dodico.crue.io.ioMessages");
- protected static class TempResourceBundle extends ResourceBundle {
-
- final Collection<ResourceBundle> bundles;
-
- public TempResourceBundle(final ResourceBundle... bundles) {
- super();
- this.bundles = Arrays.asList(bundles);
- }
-
- @Override
- public Enumeration<String> getKeys() {
- final List<String> res = new ArrayList<String>();
- for (final ResourceBundle it : bundles) {
- res.addAll(Collections.list(it.getKeys()));
- }
- return Collections.enumeration(res);
- }
-
- @Override
- protected Object handleGetObject(final String key) {
- for (final ResourceBundle it : bundles) {
- Object res;
- try {
- res = it.getObject(key);
- if (res != null) { return res; }
- } catch (final Exception e) {
- // c'est pas grave si on ne trouve pas...
-
- }
-
- }
- return null;
- }
- }
-
private Messages() {}
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverter.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverter.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverter.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -23,10 +23,15 @@
* @param dataLinked
* @return l'objet metier
*/
- // CrueIOData<M> convertDaoToMetier(D dao, Object dataLinked, CtuluAnalyze analyser);
M convertDaoToMetier(D dao, CrueData dataLinked, CtuluAnalyze analyser);
/**
+ * @param in les données
+ * @return les données gérées par ce converter
+ */
+ M getConverterData(CrueData in);
+
+ /**
* Crée une structure métier à partir des informations persistantes. Utiliser pour le remplissage de la structure
* métier apr�s lecture du fichier xml. Utilise en plus des données liées.
*
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -65,6 +65,10 @@
return donnees;
}
+ public DonCLimMScenario getConverterData(CrueData in) {
+ return in.getConditionsLim();
+ }
+
/**
* Convertit les objets métier en objets persistants
*/
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-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCSP.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -6,8 +6,8 @@
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.common.CrueData;
+import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.*;
import org.fudaa.dodico.crue.metier.emh.*;
@@ -35,6 +35,10 @@
return dataLinked;
}
+ public CrueData getConverterData(CrueData in) {
+ return in;
+ }
+
public CrueDaoDCSP convertMetierToDao(final CrueData data, final CtuluAnalyze analyser) {
final CrueDaoDCSP res = new CrueDaoDCSP();
res.Sections = new ArrayList<SectionBrancheAbstract>();
@@ -42,7 +46,7 @@
List<EMH> metier = data.getAllEMH();
if (CollectionUtils.isEmpty(metier)) {
- CrueHelper.emhEmpty(CrueConstants.DCSP, analyser);
+ CrueHelper.emhEmpty(CrueFileType.DCSP, analyser);
} else {
for (final EMH emh : metier) {
if (emh instanceof CatEMHBranche) {
@@ -55,7 +59,7 @@
if (dataCalc != null) {
CrueConverterDCSP.metierToDaoBranches(res.DonCalcSansPrtBranches, branche, dataCalc, analyser);
} else {
- CrueHelper.unknowdataFromFile("Branches", CrueConstants.DCSP, branche.getNom(), analyser);
+ CrueHelper.unknowdataFromFile("Branches", branche.getNom(), analyser);
}
}
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDFRT.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDFRT.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDFRT.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -59,6 +59,10 @@
return out;
}
+ public List<DonFrt> getConverterData(CrueData in) {
+ return in.getFrottements().getListFrt();
+ }
+
public CrueDaoDFRT convertMetierToDao(final List<DonFrt> metier, final CtuluAnalyze analyser) {
final CrueDaoDFRT res = new CrueDaoDFRT();
res.LoiFFs = new ArrayList<DaoLoiFF>(metier.size());
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDLHY.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDLHY.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDLHY.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -97,6 +97,10 @@
return outLoi;
}
+ public List<Loi> getConverterData(CrueData in) {
+ return in.getLois();
+ }
+
/**
* Convertit les objets métier en objets persistants
*/
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTG.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTG.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTG.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -43,6 +43,10 @@
return null;
}
+ public CrueData getConverterData(CrueData in) {
+ return in;
+ }
+
public CrueDaoDPTG convertMetierToDao(final CrueData metier, final CtuluAnalyze analyser) {
final CrueDaoDPTG res = new CrueDaoDPTG();
// -- liste qui assure d'ajouter une seule référence de profil: car un meme profil peut etre referencé plusieurs
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTI.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTI.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTI.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -21,6 +21,10 @@
SingleValueConverter sensOuvConverter;
+ public CrueData getConverterData(CrueData in) {
+ return in;
+ }
+
/*
* @see org.fudaa.dodico.crue.io.dao.CrueConverter#convertDaoToMetier(org.fudaa.dodico.crue.io.dao.AbstractCrueDao,
* org.fudaa.dodico.crue.metier.CrueData, org.fudaa.ctulu.CtuluAnalyze)
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDRSO.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDRSO.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDRSO.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -28,6 +28,10 @@
private SingleValueConverter sectionPositionConverter;
+ public CrueData getConverterData(CrueData in) {
+ return in;
+ }
+
public CrueData convertDaoToMetier(final CrueDaoDRSO dao, final CrueData dataLinked, final CtuluAnalyze analyser) {
sectionPositionConverter = EnumsConverter.createEnumConverter(EnumPositionSection.class, analyser);
final CrueData res = dataLinked == null ? new CrueDataImpl() : dataLinked;
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-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterETU.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -10,6 +10,7 @@
import org.fudaa.ctulu.CtuluLibArray;
import org.fudaa.dodico.crue.common.DateDurationConverter;
import org.fudaa.dodico.crue.io.common.CrueData;
+import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureETU.*;
import org.fudaa.dodico.crue.metier.*;
@@ -24,6 +25,10 @@
return CrueConverterETU.remplirMetierETU(dao, analyser);
}
+ public EMHproject getConverterData(CrueData in) {
+ return null;
+ }
+
public CrueDaoETU convertMetierToDao(final EMHproject metier, final CtuluAnalyze analyser) {
return null;
}
@@ -162,7 +167,8 @@
final String type = res.getClass().getSimpleName().replace("FichierResultat", "");
- final FichierCrue metierRes = new FichierCrue(res.Nom, null, type);
+ final FichierCrue metierRes = new FichierCrue(res.Nom, null, CrueFileType
+ .valueOf(type.trim()));
listeFichierResultatsAssocies.add(metierRes);
}
@@ -418,7 +424,8 @@
if (fichierPersist.Nom != null && fichierPersist.Chemin != null && fichierPersist.getType() != null) {
- final FichierCrue file = new FichierCrue(fichierPersist.Nom, fichierPersist.Chemin, fichierPersist.getType());
+ final FichierCrue file = new FichierCrue(fichierPersist.Nom, fichierPersist.Chemin, CrueFileType
+ .valueOf(fichierPersist.getType().trim()));
if (!infoProjet.addCrueFileToProject(file)) {
CrueHelper.errorIdNonUnique("FichEtudes", file.getId(), analyser);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOCAL.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOCAL.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOCAL.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -20,6 +20,10 @@
*/
public class CrueConverterOCAL implements CrueConverter<CrueDaoOCAL, OrdCalcScenario> {
+ public OrdCalcScenario getConverterData(CrueData in) {
+ return in.getOrdCalc();
+ }
+
/**
* Conversion des objets DAO en objets métier
*/
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOPTG.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOPTG.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOPTG.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -20,6 +20,10 @@
*/
public class CrueConverterOPTG implements CrueConverter<CrueDaoOPTG, OrdPrtGeoModeleBase> {
+ public OrdPrtGeoModeleBase getConverterData(CrueData in) {
+ return in.getPretraitementsGeom();
+ }
+
public OrdPrtGeoModeleBase convertDaoToMetier(final CrueDaoOPTG dao, final CrueData dataLinked,
final CtuluAnalyze analyser) {
final OrdPrtGeoModeleBase ordres = new OrdPrtGeoModeleBase();
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOPTI.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOPTI.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOPTI.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -19,6 +19,10 @@
*/
public class CrueConverterOPTI implements CrueConverter<CrueDaoOPTI, OrdPrtCIniModeleBase> {
+ public OrdPrtCIniModeleBase getConverterData(CrueData in) {
+ return in.getMethodesInterpolation();
+ }
+
public OrdPrtCIniModeleBase convertDaoToMetier(final CrueDaoOPTI dao, final CrueData dataLinked,
final CtuluAnalyze analyser) {
/**
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterORES.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterORES.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterORES.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -17,6 +17,10 @@
*/
public class CrueConverterORES implements CrueConverter<CrueDaoORES, OrdResScenario> {
+ public OrdResScenario getConverterData(CrueData in) {
+ return in.getOrdRes();
+ }
+
/**
* Conversion de la couche persistance vers la couche métier
*/
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPCAL.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPCAL.java 2009-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPCAL.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -24,6 +24,10 @@
*/
public class CrueConverterPCAL implements CrueConverter<CrueDaoPCAL, ParamCalcScenario> {
+ public ParamCalcScenario getConverterData(CrueData in) {
+ return in.getParamCalc();
+ }
+
/**
* Conversion des objets DAO en objets métier
*/
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-06-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPNUM.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -23,6 +23,10 @@
*/
public class CrueConverterPNUM implements CrueConverter<CrueDaoPNUM, ParamNumModeleBase> {
+ public ParamNumModeleBase getConverterData(CrueData in) {
+ return in.getParamNumModeleBase();
+ }
+
/**
* Conversion des objets DAO en objets métier
*/
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-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDCLM.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -8,7 +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.CrueFileType;
import org.fudaa.dodico.crue.io.common.EnumsConverter;
import org.fudaa.dodico.crue.metier.emh.EnumSensOuv;
@@ -27,7 +27,7 @@
*/
public void configureXStream(final XStream xstream, CtuluAnalyze analyze) {
- xstream.alias(CrueConstants.DCLM, CrueDaoDCLM.class);
+ xstream.alias(CrueFileType.DCLM.toString(), 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-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDCSP.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -5,7 +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.CrueFileType;
import org.fudaa.dodico.crue.io.common.EnumsConverter;
import org.fudaa.dodico.crue.metier.emh.EnumFormulePdc;
import org.fudaa.dodico.crue.metier.emh.EnumSensOrifice;
@@ -18,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(CrueConstants.DCSP, CrueDaoDCSP.class);
+ xstream.alias(CrueFileType.DCSP.toString(), CrueDaoDCSP.class);
// -- liste des initialisations nécessaires pour le formattage des donn�es--//
initXmlParserBranche(xstream);
initXmlParserSection(xstream);
@@ -29,19 +29,6 @@
}
/**
- * init le parser xml avec toutes les converters et alias n�cessaires
- */
- protected static void initXmlParserForDSCP(final XStream xstream) {
- // -- creation des alias pour que ce soit + parlant dans le xml file --//
- xstream.alias(CrueConstants.DCSP, CrueDaoDCSP.class);
- // -- liste des initialisations nécessaires pour le formattage des donn�es--//
- initXmlParserBranche(xstream);
- initXmlParserSection(xstream);
- initXmlParserSeuils(xstream);
-
- }
-
- /**
* Init le parser avec les infos des branches.
*
* @param 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-27 00:21:34 UTC (rev 4890)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDFRT.java 2009-06-27 19:57:53 UTC (rev 4891)
@@ -3,7 +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.common.CrueFileType;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDLHY.DaoLoiFF;
/**
@@ -17,7 +17,7 @@
public void configureXStream(final XStream xstream, CtuluAnalyze analyze) {
// -- cr...
[truncated message content] |
