From chatellier@users.labs.libre-entreprise.org Mon Jun 15 04:19:38 2026
From: chatellier@users.labs.libre-entreprise.org
To: coser-commits@list.forge.codelutin.com
Subject: [Coser-commits] r370 - in trunk/coser-business/src:
	main/java/fr/ifremer/coser/services main/resources/i18n
	test/java/fr/ifremer/coser/services
Date: Mon, 06 Dec 2010 15:42:51 +0100
Message-ID: <20101206144251.1BED62F187@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2873506887412113382=="

--===============2873506887412113382==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: chatellier
Date: 2010-12-06 14:42:50 +0000 (Mon, 06 Dec 2010)
New Revision: 370

Log:
G?\195?\169n?\195?\169ration des graphique en fin de rapport et liens depuis =
les erreurs

Modified:
   trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationSe=
rvice.java
   trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properti=
es
   trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properti=
es
   trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationSe=
rviceTest.java

Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/Public=
ationService.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationS=
ervice.java	2010-12-06 14:27:40 UTC (rev 369)
+++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationS=
ervice.java	2010-12-06 14:42:50 UTC (rev 370)
@@ -28,7 +28,6 @@
 import static org.nuiton.i18n.I18n._;
=20
 import java.awt.Shape;
-import java.awt.geom.Ellipse2D;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -47,7 +46,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jdesktop.swingx.util.ShapeUtils;
 import org.jfree.chart.ChartUtilities;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.axis.CategoryAxis;
@@ -276,6 +274,9 @@
      * Export la liste d'erreurs dans un fichier html avec la liste des grap=
hes
      * si necessaire.
      *=20
+     * Genere les graphes en fin de fichier avec des liens html pour voir les
+     * graphes depuis les erreurs.
+     *=20
      * @param project project
      * @param container data container
      * @param validationErrors errors list
@@ -371,18 +372,18 @@
                             }
                             out.println(")");
                         }
+                       =20
+                        // ajout d'un graph si necessaire
+                        if (error instanceof DiffCatchLengthControlError) {
+                            DiffCatchLengthControlError diffError =3D (DiffC=
atchLengthControlError)error;
+                            String species =3D diffError.getSpecies();
+                            out.println(" (<a href=3D'#graph" + species + "'=
>" + _("coser.business.publication.errorgraph") + "</a>)");
+                        }
+
                         String tipMessage =3D _(error.getTipMessage());
                         if (StringUtils.isNotEmpty(error.getTipMessage())) {
                             out.println("<p style=3D'font-style:italic'>" + =
tipMessage + "</p>");
                         }
-                        // ajout d'un graph si necessaire
-                        if (error instanceof DiffCatchLengthControlError) {
-                            DiffCatchLengthControlError diffError =3D (DiffC=
atchLengthControlError)error;
-                            JFreeChart chart =3D charts.get(diffError.getSpe=
cies());
-                            File tmpChartImage =3D File.createTempFile("char=
t-", ".jpg", imageDirectory);
-                            ChartUtilities.saveChartAsJPEG(tmpChartImage, ch=
art, 800, 400);
-                            out.println("<div><img src=3D'images/" + tmpChar=
tImage.getName() + "' /></div>");
-                        }
                        =20
                         out.println("</li>");
                     }
@@ -392,6 +393,18 @@
                 out.println("</ul>");
             }
=20
+            out.println("<h2>" + _("coser.business.publication.errorgraphs")=
 + "</h2>");
+            out.println("<ul>");
+            // generation des graphiques
+            for (Map.Entry<String, JFreeChart> chartEntry : charts.entrySet(=
)) {
+                JFreeChart chart =3D chartEntry.getValue();
+                File tmpChartImage =3D File.createTempFile("chart-", ".jpg",=
 imageDirectory);
+                ChartUtilities.saveChartAsJPEG(tmpChartImage, chart, 800, 40=
0);
+                out.println("<li><p><a name=3D'graph" + chartEntry.getKey() =
+ "'>" + chartEntry.getKey() + "</a></p>");
+                out.println("<img src=3D'images/" + tmpChartImage.getName() =
+ "' /></li>");
+            }
+            out.println("</ul>");
+
             out.println("</body></html>");
         }
         catch (IOException ex) {

Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.p=
roperties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.propert=
ies	2010-12-06 14:27:40 UTC (rev 369)
+++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.propert=
ies	2010-12-06 14:42:50 UTC (rev 370)
@@ -64,6 +64,8 @@
 coser.business.line=3DLine
 coser.business.publication.errorexportlines=3DLines
 coser.business.publication.errorexporttitle=3DError report for project %s
+coser.business.publication.errorgraph=3DGraph
+coser.business.publication.errorgraphs=3DGraphs
 coser.business.publication.logexporttitle=3DModifications list for project %s
 coser.business.result.rsufiResultAlreadyExists=3DResult %s already exists \!
 coser.business.selection.notValidatedControl=3DNot validated control \!

Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.p=
roperties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.propert=
ies	2010-12-06 14:27:40 UTC (rev 369)
+++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.propert=
ies	2010-12-06 14:42:50 UTC (rev 370)
@@ -64,6 +64,8 @@
 coser.business.line=3DLigne
 coser.business.publication.errorexportlines=3DLignes
 coser.business.publication.errorexporttitle=3DRapport d'erreur pour le proje=
t %s
+coser.business.publication.errorgraph=3DGraphique
+coser.business.publication.errorgraphs=3DGraphiques
 coser.business.publication.logexporttitle=3DListe des modifications pour le =
projet %s
 coser.business.result.rsufiResultAlreadyExists=3DLe r\u00E9sultat %D existe =
d\u00E9j\u00E0 \!
 coser.business.selection.notValidatedControl=3DContr\u00F4le non valid\u00E9=
 \!

Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/Public=
ationServiceTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationS=
erviceTest.java	2010-12-06 14:27:40 UTC (rev 369)
+++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationS=
erviceTest.java	2010-12-06 14:42:50 UTC (rev 370)
@@ -175,6 +175,6 @@
         Assert.assertTrue(fileContent.indexOf("from \"251.86\" to \"392.98\"=
") > 0);
=20
         // clean all
-        //htmlExport.delete();
+        htmlExport.delete();
     }
 }


--===============2873506887412113382==--