[Fudaa-svn-commit] SF.net SVN: fudaa:[8338] trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/ fudaa/dodico/crue/io/rtfa

[<de...@us...>]

Revision: 8338
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8338&view=rev
Author:   deniger
Date:     2013-03-19 17:02:05 +0000 (Tue, 19 Mar 2013)
Log Message:
-----------


Modified Paths:
--------------
    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/RTFAWriteResultCallable.java

Added Paths:
-----------
    trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoader.java

Removed Paths:
-------------
    trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/CtfaWriteResultCallable1.java
    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/RtfaLineLoader.java

Deleted: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/CtfaWriteResultCallable1.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/CtfaWriteResultCallable1.java	2013-03-19 16:55:59 UTC (rev 8337)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/CtfaWriteResultCallable1.java	2013-03-19 17:02:05 UTC (rev 8338)
@@ -1,37 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.dodico.crue.io.rtfa;
-
-import java.io.File;
-import java.util.concurrent.Callable;
-import org.fudaa.ctulu.CtuluLog;
-import org.fudaa.dodico.crue.common.BusinessMessages;
-import org.fudaa.dodico.crue.common.io.CrueIOResu;
-import org.fudaa.dodico.crue.io.line.CrueLineResultReaderWriter;
-import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLineResult;
-import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLineResultComparaisons;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class CTFAWriteResultCallable implements Callable<Object> {
-  private final OtfaCampagneLineResult launch;
-  private final File targetDir;
-
-  public CTFAWriteResultCallable(OtfaCampagneLineResult launch, File targetDir) {
-    this.launch = launch;
-    this.targetDir = targetDir;
-  }
-
-  @Override
-  public CtuluLog call() throws Exception {
-    final CrueLineResultReaderWriter writer = new CrueLineResultReaderWriter(CrueRTFAReaderWriter.LAST_VERSION);
-    final CrueIOResu<OtfaCampagneLineResultComparaisons> resu = new CrueIOResu<OtfaCampagneLineResultComparaisons>(launch.getComparisonResult());
-    final CtuluLog log = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
-    File target = new File(targetDir, RtfaLines.getRtfaFileName(launch.getInitialLine()));
-    writer.writeXMLMetier(resu, target, log, null);
-    return log;
-  }
-}

Copied: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoader.java (from rev 8337, 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	                        (rev 0)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoader.java	2013-03-19 17:02:05 UTC (rev 8338)
@@ -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 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;
+  }
+}

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 16:55:59 UTC (rev 8337)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesSaver.java	2013-03-19 17:02:05 UTC (rev 8338)
@@ -5,9 +5,13 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.concurrent.Callable;
+import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.fudaa.ctulu.CtuluLibFile;
 import org.fudaa.ctulu.CtuluLog;
 import org.fudaa.ctulu.CtuluLogGroup;
@@ -15,10 +19,8 @@
 import org.fudaa.dodico.crue.common.BusinessMessages;
 import org.fudaa.dodico.crue.common.io.CrueIOResu;
 import org.fudaa.dodico.crue.comparaison.ExecuteComparaison;
-import org.fudaa.dodico.crue.io.line.CrueLineResultReaderWriter;
 import org.fudaa.dodico.crue.io.otfa.OtfaFileUtils;
 import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLineResult;
-import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLineResultComparaisons;
 import org.joda.time.LocalDateTime;
 
 /**
@@ -112,6 +114,8 @@
     final CrueIOResu<RTFALines> resu = new CrueIOResu<RTFALines>(lines);
     final CtuluLog log = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
     writer.writeXMLMetier(resu, rtfaFile, log, null);
+    File[] listFiles = tempDir.listFiles();
+    CtuluLibFile.zip(listFiles, rtfaZipFile);
     CtuluLibFile.deleteDir(tempDir);
   }
 
@@ -124,7 +128,19 @@
   }
 
   protected void createFiles(OtfaCampagneLineResult launch) {
-    executorService.invokeAll(this)
+    CTFAWriteResultCallable ctfaCallable = new CTFAWriteResultCallable(launch, tempDir);
+    RTFAWriteResultCallable rtfaCallable = new RTFAWriteResultCallable(launch, tempDir);
+    try {
+      List<Future<CtuluLog>> invokeAll = executorService.invokeAll(Arrays.asList(ctfaCallable, rtfaCallable));
+      for (Future<CtuluLog> future : invokeAll) {
+        CtuluLog log = future.get();
+        if (log != null && log.isNotEmpty()) {
+          addGlobalMainLog(log);
+        }
+      }
+    } catch (Exception ex) {
+      Logger.getLogger(RTFALinesSaver.class.getName()).log(Level.SEVERE, null, ex);
+    }
   }
 
   public void addResult(OtfaCampagneLineResult launch) {

Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAWriteResultCallable.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAWriteResultCallable.java	2013-03-19 16:55:59 UTC (rev 8337)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAWriteResultCallable.java	2013-03-19 17:02:05 UTC (rev 8338)
@@ -16,7 +16,8 @@
  *
  * @author Frederic Deniger
  */
-public class RTFAWriteResultCallable implements Callable<Object> {
+public class RTFAWriteResultCallable implements Callable<CtuluLog> {
+
   private final OtfaCampagneLineResult launch;
   private final File targetDir;
 

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-19 16:55:59 UTC (rev 8337)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLine.java	2013-03-19 17:02:05 UTC (rev 8338)
@@ -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;
-  }
-}

Deleted: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLineLoader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLineLoader.java	2013-03-19 16:55:59 UTC (rev 8337)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLineLoader.java	2013-03-19 17:02:05 UTC (rev 8338)
@@ -1,11 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.dodico.crue.io.rtfa;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class RtfaLinesLoader {
-}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.