Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2012-11-20 10:00:08
|
Revision: 7911
http://fudaa.svn.sourceforge.net/fudaa/?rev=7911&view=rev
Author: deniger
Date: 2012-11-20 09:59:57 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-otfa/src/assemble/
trunk/soft/fudaa-crue/crue-otfa/src/assemble/archive/
trunk/soft/fudaa-crue/crue-otfa/src/assemble/archive/lisez-moi.txt
trunk/soft/fudaa-crue/crue-otfa/src/assemble/archive/otfa-batch.bat
trunk/soft/fudaa-crue/crue-otfa/src/assemble/archive/otfa-batch.sh
Added: trunk/soft/fudaa-crue/crue-otfa/src/assemble/archive/lisez-moi.txt
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/assemble/archive/lisez-moi.txt (rev 0)
+++ trunk/soft/fudaa-crue/crue-otfa/src/assemble/archive/lisez-moi.txt 2012-11-20 09:59:57 UTC (rev 7911)
@@ -0,0 +1,19 @@
+********** Information **********
+Version: ${artifact.version}
+Date création: ${timestamp}
+
+********** Configuration **********
+il faut editer le fichier otfa-batch.bat et préciser le chemin absolu vers le répertoire etc qui doit contenir le fichier FudaaCrue_Site.xml et le dossier coeurs.
+Voir le commentaire dans le fichier otfa-batch.bat.
+Un compte-rendu est accessible sur les sorties standards et d'erreurs.
+Si OTFA a pu être lancé, le compte-rendu du lancer par batch se trouvera dans le fichier "ctfa.xml".
+
+********** Pour lancer OTFA, il faut lancer la commande **********
+
+-> otfa-batch.bat "<monFichierOtfa>"
+
+avec <monFichierOtfa> le chemin absolu vers le fichier otfa.
+
+par exemple:
+
+-> otfa-batch.bat "C:\Data\otfa-simple-invalide.otfa.xml"
\ No newline at end of file
Added: trunk/soft/fudaa-crue/crue-otfa/src/assemble/archive/otfa-batch.bat
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/assemble/archive/otfa-batch.bat (rev 0)
+++ trunk/soft/fudaa-crue/crue-otfa/src/assemble/archive/otfa-batch.bat 2012-11-20 09:59:57 UTC (rev 7911)
@@ -0,0 +1,3 @@
+@echo on
+REM remplacer C:\Data\etc par le chemin vers le dossier contenu la configuration ( dossier etc)
+java -DSiteConfigDir="C:\Data\etc" -jar otfa-batch.jar %1
\ No newline at end of file
Added: trunk/soft/fudaa-crue/crue-otfa/src/assemble/archive/otfa-batch.sh
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/assemble/archive/otfa-batch.sh (rev 0)
+++ trunk/soft/fudaa-crue/crue-otfa/src/assemble/archive/otfa-batch.sh 2012-11-20 09:59:57 UTC (rev 7911)
@@ -0,0 +1,2 @@
+#REM remplacer C:\Data\etc par le chemin vers le dossier contenu la configuration ( dossier etc)
+java -DSiteConfigDir="$HOME/Fudaa-Crue/etc/" -jar otfa-batch.jar $1
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-20 07:43:59
|
Revision: 8342
http://fudaa.svn.sourceforge.net/fudaa/?rev=8342&view=rev
Author: deniger
Date: 2013-03-20 07:43:51 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/CrueConverterRTFA.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALines.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesSaver.java
trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueRTFA.java
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAResultLine.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/log/
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/CrueConverterRTFA.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/CrueConverterRTFA.java 2013-03-19 17:10:33 UTC (rev 8341)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/CrueConverterRTFA.java 2013-03-20 07:43:51 UTC (rev 8342)
@@ -31,8 +31,8 @@
return metier;
}
- private static RTFALine convertDaoToMetierLine(LigneRTFA dao, CtuluLog analyser) {
- RTFALine metier = new RTFALine();
+ private static RTFAResultLine convertDaoToMetierLine(LigneRTFA dao, CtuluLog analyser) {
+ RTFAResultLine metier = new RTFAResultLine();
metier.setInitialLine(CrueConverterCommonParameter.convertCampagneLineDaoToMetier(dao.LigneCampagne));
metier.setNbDifferences(dao.nbDifferences);
@@ -52,7 +52,7 @@
}
}
- private static LigneRTFA convertMetierToDaoLine(RTFALine metier, CtuluLog analyser) {
+ private static LigneRTFA convertMetierToDaoLine(RTFAResultLine metier, CtuluLog analyser) {
LigneRTFA dao = new LigneRTFA();
dao.LigneCampagne = CrueConverterCommonParameter.convertCampagneLineMetierToDao(metier.getInitialLine());
@@ -71,7 +71,7 @@
public RTFALines convertDaoToMetier(CrueDaoRTFA dao, CrueData dataLinked, CtuluLog analyser) {
RTFALines metier = new RTFALines();
metier.setHeader(convertDaoToMetierHeader(dao, analyser));
- final List<RTFALine> lines = new ArrayList<RTFALine>();
+ final List<RTFAResultLine> lines = new ArrayList<RTFAResultLine>();
for (LigneRTFA ligne : dao.Lignes) {
lines.add(convertDaoToMetierLine(ligne, analyser));
@@ -99,7 +99,7 @@
convertMetierToDaoHeader(dao, metier, analyser);
dao.Lignes = new ArrayList<CrueDaoStructureRTFA.LigneRTFA>();
- for (RTFALine line : metier.getLines()) {
+ for (RTFAResultLine line : metier.getLines()) {
dao.Lignes.add(convertMetierToDaoLine(line, analyser));
}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALines.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALines.java 2013-03-19 17:10:33 UTC (rev 8341)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALines.java 2013-03-20 07:43:51 UTC (rev 8342)
@@ -19,7 +19,7 @@
private OtfaCampagneResultHeader header = new OtfaCampagneResultHeader();
private boolean batch;
- private List<RTFALine> lines = new ArrayList<RTFALine>();
+ private List<RTFAResultLine> lines = new ArrayList<RTFAResultLine>();
/**
* @return the globalValidation
@@ -36,17 +36,17 @@
return line.getIndice() + ".ctfa-line.xml";
}
- public List<RTFALine> getLines() {
+ public List<RTFAResultLine> getLines() {
return Collections.unmodifiableList(lines);
}
- public void addLines(Collection<RTFALine> lines) {
+ public void addLines(Collection<RTFAResultLine> lines) {
if (lines != null) {
this.lines.addAll(lines);
}
}
- public void addLine(RTFALine line) {
+ public void addLine(RTFAResultLine line) {
if (line != null) {
this.lines.add(line);
}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesSaver.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesSaver.java 2013-03-19 17:10:33 UTC (rev 8341)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesSaver.java 2013-03-20 07:43:51 UTC (rev 8342)
@@ -144,7 +144,7 @@
}
public void addResult(OtfaCampagneLineResult launch) {
- RTFALine line = new RTFALine();
+ RTFAResultLine line = new RTFAResultLine();
line.setInitialLine(launch.getInitialLine());
final CtuluLogGroup logs = launch.getLogs();
line.setNbSevereError(logs.getNbOccurence(CtuluLogLevel.SEVERE));
Copied: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAResultLine.java (from rev 8337, trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLine.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAResultLine.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAResultLine.java 2013-03-20 07:43:51 UTC (rev 8342)
@@ -0,0 +1,122 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.io.rtfa;
+
+import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLine;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class RTFAResultLine {
+
+ private OtfaCampagneLine initialLine;
+ private int nbDifferences = -1;
+ private int nbSevereError;
+ private int nbError;
+ private int nbWarn;
+ private int nbInfo;
+
+ public RTFAResultLine() {
+ }
+
+ public RTFAResultLine(OtfaCampagneLine initialLine) {
+ this.initialLine = initialLine;
+ }
+
+ public OtfaCampagneLine getInitialLine() {
+ return initialLine;
+ }
+
+ public void setInitialLine(OtfaCampagneLine initialLine) {
+ this.initialLine = initialLine;
+ }
+
+ public int getNbDifferences() {
+ return nbDifferences;
+ }
+
+ public void setNbDifferences(int nbDifferences) {
+ this.nbDifferences = nbDifferences;
+ }
+
+ public int getNbSevereError() {
+ return nbSevereError;
+ }
+
+ public boolean isSameCount(RTFAResultLine other) {
+ if (other == null) {
+ return false;
+ }
+ return nbDifferences == other.nbDifferences
+ && nbSevereError == other.nbSevereError
+ && nbError == other.nbError
+ && nbWarn == other.nbWarn
+ && nbInfo == other.nbInfo;
+ }
+
+ public void setNbSevereError(int nbSevereError) {
+ this.nbSevereError = nbSevereError;
+ }
+
+ public int getNbError() {
+ return nbError;
+ }
+
+ public void setNbError(int nbError) {
+ this.nbError = nbError;
+ }
+
+ public boolean containsErrorOrSevereError() {
+ return nbError > 0 || nbSevereError > 0;
+ }
+
+ public boolean containsWarning() {
+ return nbWarn > 0;
+ }
+
+ public int getNbWarn() {
+ return nbWarn;
+ }
+
+ public void setNbWarn(int nbWarn) {
+ this.nbWarn = nbWarn;
+ }
+
+ public int getNbInfo() {
+ return nbInfo;
+ }
+
+ public void setNbInfo(int nbInfo) {
+ this.nbInfo = nbInfo;
+ }
+
+ public boolean hasLog() {
+ return nbSevereError > 0 || nbError > 0 || nbWarn > 0 || nbInfo > 0;
+ }
+
+ public boolean hasDifferences() {
+ return nbDifferences > 0;
+ }
+
+ public void initForm(RTFAResultLine result) {
+ if (result == null) {
+ return;
+ }
+ initialLine = new OtfaCampagneLine(result.getInitialLine());
+ nbDifferences = result.nbDifferences;
+ nbSevereError = result.nbSevereError;
+ nbError = result.nbError;
+ nbWarn = result.nbWarn;
+ nbInfo = result.nbInfo;
+ }
+
+ public int getNbLogs() {
+ return nbSevereError + nbError + nbWarn + nbInfo;
+ }
+
+ public boolean hasComparaison() {
+ return nbDifferences >= 0;
+ }
+}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueRTFA.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueRTFA.java 2013-03-19 17:10:33 UTC (rev 8341)
+++ trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueRTFA.java 2013-03-20 07:43:51 UTC (rev 8342)
@@ -19,7 +19,7 @@
import org.fudaa.dodico.crue.io.AbstractIOTestCase;
import org.fudaa.dodico.crue.io.log.CrueLOGTest;
import org.fudaa.dodico.crue.io.rtfa.CrueRTFAReaderWriter;
-import org.fudaa.dodico.crue.io.rtfa.RTFALine;
+import org.fudaa.dodico.crue.io.rtfa.RTFAResultLine;
import org.fudaa.dodico.crue.io.rtfa.RTFALines;
import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneResultHeader;
import org.joda.time.LocalDateTime;
@@ -42,7 +42,7 @@
}
public static void assertCorrect(RTFALines compPart) {
- final List<RTFALine> lines = compPart.getLines();
+ final List<RTFAResultLine> lines = compPart.getLines();
assertHeaderCorrect(compPart.getHeader());
assertEquals(2, lines.size());
@@ -50,16 +50,16 @@
assertCorrectCompPartLine2(lines.get(1));
}
- public static void assertCorrectCompPartLine1(RTFALine line) {
+ public static void assertCorrectCompPartLine1(RTFAResultLine line) {
- RTFALine initLine1 = createResultCompPartLine1();
+ RTFAResultLine initLine1 = createResultCompPartLine1();
assertTrue(line.getInitialLine().equals(initLine1.getInitialLine()));
assertTrue(initLine1.isSameCount(line));
}
- public static void assertCorrectCompPartLine2(RTFALine line) {
+ public static void assertCorrectCompPartLine2(RTFAResultLine line) {
- RTFALine initLine2 = createResultCompPartLine2();
+ RTFAResultLine initLine2 = createResultCompPartLine2();
assertTrue(line.getInitialLine().equals(initLine2.getInitialLine()));
assertTrue(initLine2.isSameCount(line));
}
@@ -149,8 +149,8 @@
return part;
}
- public static List<RTFALine> createResultLogsCompLines() {
- final List<RTFALine> lines = new ArrayList<RTFALine>();
+ public static List<RTFAResultLine> createResultLogsCompLines() {
+ final List<RTFAResultLine> lines = new ArrayList<RTFAResultLine>();
lines.add(createResultCompPartLine1());
lines.add(createResultCompPartLine2());
@@ -158,8 +158,8 @@
return lines;
}
- public static RTFALine createResultCompPartLine1() {
- final RTFALine line = new RTFALine();
+ public static RTFAResultLine createResultCompPartLine1() {
+ final RTFAResultLine line = new RTFAResultLine();
line.setInitialLine(TestOtfaCampagneLineCreator.createCampagneLine1());
line.setNbDifferences(10);
line.setNbSevereError(9);
@@ -169,8 +169,8 @@
return line;
}
- public static RTFALine createResultCompPartLine2() {
- final RTFALine line = new RTFALine();
+ public static RTFAResultLine createResultCompPartLine2() {
+ final RTFAResultLine line = new RTFAResultLine();
line.setInitialLine(TestOtfaCampagneLineCreator.createCampagneLine2());
line.setNbDifferences(5);
line.setNbSevereError(4);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-20 07:45:54
|
Revision: 8343
http://fudaa.svn.sourceforge.net/fudaa/?rev=8343&view=rev
Author: deniger
Date: 2013-03-20 07:45:46 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoaderTest.java
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAResultLinesLoader.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoader.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLine.java
Deleted: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoader.java 2013-03-20 07:43:51 UTC (rev 8342)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoader.java 2013-03-20 07:45:46 UTC (rev 8343)
@@ -1,85 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.dodico.crue.io.rtfa;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import org.fudaa.ctulu.CtuluLog;
-import org.fudaa.ctulu.CtuluLogGroup;
-import org.fudaa.dodico.crue.common.BusinessMessages;
-import org.fudaa.dodico.crue.common.io.CrueIOResu;
-import org.fudaa.dodico.crue.io.line.CrueLineLogReaderWriter;
-import org.fudaa.dodico.crue.io.line.CrueLineResultReaderWriter;
-import org.fudaa.dodico.crue.io.otfa.OtfaFileUtils;
-import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLine;
-import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLineResultComparaisons;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class RTFALinesLoader {
-
- private final File rtfaZipFile;
-
- public RTFALinesLoader(File rtfaZipFile) {
- this.rtfaZipFile = OtfaFileUtils.getRtfaZipFile(rtfaZipFile);
- }
-
- public CrueIOResu<CtuluLogGroup> loadLogs(OtfaCampagneLine line) {
- CrueIOResu<CtuluLogGroup> res = null;
- CrueLineLogReaderWriter reader = new CrueLineLogReaderWriter(CrueRTFAReaderWriter.LAST_VERSION);
- ZipFile file = null;
- InputStream inputStream = null;
- try {
- file = new ZipFile(rtfaZipFile);
- inputStream = file.getInputStream(new ZipEntry(RTFALines.getCtfaFileName(line)));
- CtuluLog log = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
- res = reader.readXML(inputStream, log, null);
- } catch (Exception e) {
- Logger.getLogger(RTFALinesLoader.class.getName()).log(Level.INFO, "message {0}", e);
- } finally {
- if (file != null) {
- try {
- file.close();
- } catch (IOException ex) {
- Logger.getLogger(RTFALinesLoader.class.getName()).log(Level.SEVERE, null, ex);
- }
- }
- }
-
- return res;
-
- }
-
- public CrueIOResu<OtfaCampagneLineResultComparaisons> loadResults(OtfaCampagneLine line) {
- CrueLineResultReaderWriter reader = new CrueLineResultReaderWriter(CrueRTFAReaderWriter.LAST_VERSION);
- CrueIOResu<OtfaCampagneLineResultComparaisons> res = null;
- ZipFile file = null;
- InputStream inputStream = null;
- try {
- file = new ZipFile(rtfaZipFile);
- inputStream = file.getInputStream(new ZipEntry(RTFALines.getRtfaFileName(line)));
- CtuluLog log = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
- res = reader.readXML(inputStream, log, null);
- } catch (Exception e) {
- Logger.getLogger(RTFALinesLoader.class.getName()).log(Level.INFO, "message {0}", e);
- } finally {
- if (file != null) {
- try {
- file.close();
- } catch (IOException ex) {
- Logger.getLogger(RTFALinesLoader.class.getName()).log(Level.SEVERE, null, ex);
- }
- }
- }
-
- return res;
- }
-}
Copied: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAResultLinesLoader.java (from rev 8341, trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoader.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAResultLinesLoader.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAResultLinesLoader.java 2013-03-20 07:45:46 UTC (rev 8343)
@@ -0,0 +1,85 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.io.rtfa;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import org.fudaa.ctulu.CtuluLog;
+import org.fudaa.ctulu.CtuluLogGroup;
+import org.fudaa.dodico.crue.common.BusinessMessages;
+import org.fudaa.dodico.crue.common.io.CrueIOResu;
+import org.fudaa.dodico.crue.io.line.CrueLineLogReaderWriter;
+import org.fudaa.dodico.crue.io.line.CrueLineResultReaderWriter;
+import org.fudaa.dodico.crue.io.otfa.OtfaFileUtils;
+import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLine;
+import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLineResultComparaisons;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class RTFAResultLinesLoader {
+
+ private final File rtfaZipFile;
+
+ public RTFAResultLinesLoader(File rtfaZipFile) {
+ this.rtfaZipFile = OtfaFileUtils.getRtfaZipFile(rtfaZipFile);
+ }
+
+ public CrueIOResu<CtuluLogGroup> loadLogs(OtfaCampagneLine line) {
+ CrueIOResu<CtuluLogGroup> res = null;
+ CrueLineLogReaderWriter reader = new CrueLineLogReaderWriter(CrueRTFAReaderWriter.LAST_VERSION);
+ ZipFile file = null;
+ InputStream inputStream = null;
+ try {
+ file = new ZipFile(rtfaZipFile);
+ inputStream = file.getInputStream(new ZipEntry(RTFALines.getCtfaFileName(line)));
+ CtuluLog log = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
+ res = reader.readXML(inputStream, log, null);
+ } catch (Exception e) {
+ Logger.getLogger(RTFAResultLinesLoader.class.getName()).log(Level.INFO, "message {0}", e);
+ } finally {
+ if (file != null) {
+ try {
+ file.close();
+ } catch (IOException ex) {
+ Logger.getLogger(RTFAResultLinesLoader.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ }
+ }
+
+ return res;
+
+ }
+
+ public CrueIOResu<OtfaCampagneLineResultComparaisons> loadResults(OtfaCampagneLine line) {
+ CrueLineResultReaderWriter reader = new CrueLineResultReaderWriter(CrueRTFAReaderWriter.LAST_VERSION);
+ CrueIOResu<OtfaCampagneLineResultComparaisons> res = null;
+ ZipFile file = null;
+ InputStream inputStream = null;
+ try {
+ file = new ZipFile(rtfaZipFile);
+ inputStream = file.getInputStream(new ZipEntry(RTFALines.getRtfaFileName(line)));
+ CtuluLog log = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
+ res = reader.readXML(inputStream, log, null);
+ } catch (Exception e) {
+ Logger.getLogger(RTFAResultLinesLoader.class.getName()).log(Level.INFO, "message {0}", e);
+ } finally {
+ if (file != null) {
+ try {
+ file.close();
+ } catch (IOException ex) {
+ Logger.getLogger(RTFAResultLinesLoader.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ }
+ }
+
+ return res;
+ }
+}
Deleted: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLine.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLine.java 2013-03-20 07:43:51 UTC (rev 8342)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLine.java 2013-03-20 07:45:46 UTC (rev 8343)
@@ -1,122 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.dodico.crue.io.rtfa;
-
-import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLine;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class RTFALine {
-
- private OtfaCampagneLine initialLine;
- private int nbDifferences = -1;
- private int nbSevereError;
- private int nbError;
- private int nbWarn;
- private int nbInfo;
-
- public RTFALine() {
- }
-
- public RTFALine(OtfaCampagneLine initialLine) {
- this.initialLine = initialLine;
- }
-
- public OtfaCampagneLine getInitialLine() {
- return initialLine;
- }
-
- public void setInitialLine(OtfaCampagneLine initialLine) {
- this.initialLine = initialLine;
- }
-
- public int getNbDifferences() {
- return nbDifferences;
- }
-
- public void setNbDifferences(int nbDifferences) {
- this.nbDifferences = nbDifferences;
- }
-
- public int getNbSevereError() {
- return nbSevereError;
- }
-
- public boolean isSameCount(RTFALine other) {
- if (other == null) {
- return false;
- }
- return nbDifferences == other.nbDifferences
- && nbSevereError == other.nbSevereError
- && nbError == other.nbError
- && nbWarn == other.nbWarn
- && nbInfo == other.nbInfo;
- }
-
- public void setNbSevereError(int nbSevereError) {
- this.nbSevereError = nbSevereError;
- }
-
- public int getNbError() {
- return nbError;
- }
-
- public void setNbError(int nbError) {
- this.nbError = nbError;
- }
-
- public boolean containsErrorOrSevereError() {
- return nbError > 0 || nbSevereError > 0;
- }
-
- public boolean containsWarning() {
- return nbWarn > 0;
- }
-
- public int getNbWarn() {
- return nbWarn;
- }
-
- public void setNbWarn(int nbWarn) {
- this.nbWarn = nbWarn;
- }
-
- public int getNbInfo() {
- return nbInfo;
- }
-
- public void setNbInfo(int nbInfo) {
- this.nbInfo = nbInfo;
- }
-
- public boolean hasLog() {
- return nbSevereError > 0 || nbError > 0 || nbWarn > 0 || nbInfo > 0;
- }
-
- public boolean hasDifferences() {
- return nbDifferences > 0;
- }
-
- public void initForm(RTFALine result) {
- if (result == null) {
- return;
- }
- initialLine = new OtfaCampagneLine(result.getInitialLine());
- nbDifferences = result.nbDifferences;
- nbSevereError = result.nbSevereError;
- nbError = result.nbError;
- nbWarn = result.nbWarn;
- nbInfo = result.nbInfo;
- }
-
- public int getNbLogs() {
- return nbSevereError + nbError + nbWarn + nbInfo;
- }
-
- public boolean hasComparaison() {
- return nbDifferences >= 0;
- }
-}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoaderTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoaderTest.java 2013-03-20 07:43:51 UTC (rev 8342)
+++ trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoaderTest.java 2013-03-20 07:45:46 UTC (rev 8343)
@@ -31,7 +31,7 @@
CtuluLibFile.getFileFromJar("/rtfa/otfa-conversion.rtfa.zip", targetFile);
assertTrue(targetFile.exists());
assertTrue(targetFile.length() > 0);
- RTFALinesLoader loader = new RTFALinesLoader(targetFile);
+ RTFAResultLinesLoader loader = new RTFAResultLinesLoader(targetFile);
OtfaCampagneLine line = new OtfaCampagneLine();
line.setIndice(1);
CrueIOResu<CtuluLogGroup> loadLogs = loader.loadLogs(line);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X