August 2012 - Coser-commits - mailman.cloud.codelutin.com

r1061 - in trunk/coser-business/src: main/java/fr/ifremer/coser/services test/java/fr/ifremer/coser/services
by echatellier＠users.forge.codelutin.com Aug. 20, 2012

Aug. 20, 2012

Author: echatellier Date: 2012-08-20 18:38:27 +0200 (Mon, 20 Aug 2012) New Revision: 1061 Url: http://forge.codelutin.com/repositories/revision/coser/1061 Log: Dans les rapports pdf : le controle.pdf est en fait le modification.pdf. Il manque actuellement le controle.pdf avec les warning etc. Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2012-08-20 16:37:59 UTC (rev 1060) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2012-08-20 16:38:27 UTC (rev 1061) @@ -88,6 +88,7 @@ import fr.ifremer.coser.command.DeleteLineCommand; import fr.ifremer.coser.command.MergeSpeciesCommand; import fr.ifremer.coser.command.ModifyFieldCommand; +import fr.ifremer.coser.control.ControlError; import fr.ifremer.coser.data.AbstractDataEntity; import fr.ifremer.coser.data.Catch; import fr.ifremer.coser.data.Haul; @@ -844,10 +845,11 @@ * Genère également les PDF des rapports de contrôle. * * @param project project to save + * @param validationErrors controls errors used to fill pdf * @throws CoserBusinessException * @since 1.3 */ - public void validControl(Project project) throws CoserBusinessException { + public void validControl(Project project, List<ControlError> validationErrors) throws CoserBusinessException { Control control = project.getControl(); control.setValidated(true); @@ -860,7 +862,7 @@ File projectDirectory = new File(projectsDirectory, project.getName()); File controlDirectory = new File(projectDirectory, CoserConstants.STORAGE_CONTROL_DIRECTORY); File controlReportPdf = new File(controlDirectory, "control.pdf"); - publicationService.extractControlLogAsPDF(project, control, controlReportPdf); + publicationService.extractControlLogAsPDF(project, control, validationErrors, controlReportPdf); } /** Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2012-08-20 16:37:59 UTC (rev 1060) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2012-08-20 16:38:27 UTC (rev 1061) @@ -52,6 +52,7 @@ import java.util.TreeMap; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -73,6 +74,7 @@ import org.jfree.data.category.DefaultCategoryDataset; import org.jfree.data.statistics.DefaultStatisticalCategoryDataset; import org.jfree.util.ShapeUtilities; +import org.nuiton.util.FileUtil; import org.w3c.dom.Document; import org.xhtmlrenderer.pdf.ITextRenderer; @@ -260,15 +262,6 @@ protected JFreeChart displayGraph(CategoryDataset categoryDataSet, String title) { - // create a chart with the dataset - //DefaultCategoryDataset dataset = new DefaultCategoryDataset(); - - /*for (Map.Entry<String, SortedMap<String, Double>> resultSerie : resultSeries.entrySet()) { - for (Map.Entry<String, Double> data : resultSerie.getValue().entrySet()) { - dataset.setValue(data.getValue(), resultSerie.getKey(), data.getKey()); - } - }*/ - CategoryAxis categoryAxis = new CategoryAxis(_("coser.business.common.year")); categoryAxis.setCategoryMargin(0); // label horizontaux @@ -282,11 +275,6 @@ Shape firstShape = ShapeUtilities.createDiamond(5F); renderer.setSeriesShape(0, firstShape); - // n'affiche pas les nombre sur le graphique - //StandardCategoryItemLabelGenerator itemLabelGenerator = new StandardCategoryItemLabelGenerator(); - //renderer.setBaseItemLabelGenerator(itemLabelGenerator); - //renderer.setBaseItemLabelsVisible(true); - CategoryToolTipGenerator cttg = new StandardCategoryToolTipGenerator("{0}: {2}", NumberFormat.getInstance()); renderer.setBaseToolTipGenerator(cttg); @@ -311,135 +299,171 @@ * @return export html file * @throws CoserBusinessException */ - public File exportErrorsAsHTML(Project project, AbstractDataContainer container, List<ControlError> validationErrors) throws CoserBusinessException { + public File exportErrorsAsHTML(Project project, AbstractDataContainer container, + List<ControlError> validationErrors) throws CoserBusinessException { File exportHtmlFile = null; - PrintStream out = null; + Writer out = null; try { exportHtmlFile = File.createTempFile("errors-", ".html"); + exportHtmlFile.deleteOnExit(); if (log.isInfoEnabled()) { log.info("Generating HTML report to " + exportHtmlFile.getAbsolutePath()); } - List<String> speciesGraph = new ArrayList<String>(); - File imageDirectory = new File(exportHtmlFile.getParentFile(), "images"); - imageDirectory.mkdirs(); - out = new PrintStream(exportHtmlFile, "utf-8"); - out.println("<html><head>"); - out.println("<title>" + _("coser.business.publication.errorexporttitle", project.getName())+ "</title>"); - out.println("<meta http-equiv='Content-Type' content='text/html; charset=utf-8'>"); - out.println("</head><body>"); + out = new OutputStreamWriter(new FileOutputStream(exportHtmlFile), "utf-8"); - // convert all errors as tree (code duplicated from ui tree model) - Map<String, List<ControlErrorGroup>> validationCategoryChild = new HashMap<String, List<ControlErrorGroup>>(); - Map<ControlErrorGroup, List<ControlError>> validationErrorsChilds = new HashMap<ControlErrorGroup, List<ControlError>>(); - for (ControlError validationError : validationErrors) { + exportErrorsAsHTML(project, container, validationErrors, out, false); + } catch (IOException ex) { + throw new CoserBusinessException("Can't export errors", ex); + } finally { + IOUtils.closeQuietly(out); + } + return exportHtmlFile; + } + + /** + * Export la liste d'erreurs dans un fichier html avec la liste des graphes + * si necessaire. + * + * Genere les graphes en fin de fichier avec des liens html pour voir les + * graphes depuis les erreurs. + * + * @param project project + * @param container data container + * @param validationErrors errors list + * @param includeProjectInfo add project info to generate persistant pdf + * @return export html file + * @throws CoserBusinessException + * @throws IOException + */ + protected void exportErrorsAsHTML(Project project, AbstractDataContainer container, + List<ControlError> validationErrors, Writer out, boolean includeProjectInfo) throws CoserBusinessException, IOException { - String category = validationError.getCategory() == null ? _("coser.business.control.error.allCategories") : _(validationError.getCategory().getTranslationKey()); - List<ControlErrorGroup> errorGroup = validationCategoryChild.get(category); - if (errorGroup == null) { - errorGroup = new ArrayList<ControlErrorGroup>(); - validationCategoryChild.put(category, errorGroup); - } - ControlErrorGroup group = new ControlErrorGroup(validationError.getCategory(), validationError.getLevel(), validationError.getMessage()); - List<ControlError> childErrors = validationErrorsChilds.get(group); - if (childErrors == null) { - childErrors = new ArrayList<ControlError>(); - validationErrorsChilds.put(group, childErrors); - errorGroup.add(group); - } + List<String> speciesGraph = new ArrayList<String>(); + File imageDirectory = FileUtil.createTempDirectory("images", "pdf"); + imageDirectory.mkdirs(); + imageDirectory.deleteOnExit(); - if (validationError instanceof SpeciesControlError) { - SpeciesControlError diffError = (SpeciesControlError)validationError; - speciesGraph.add(diffError.getSpecies()); - } - childErrors.add(validationError); + out.write("<html><head>"); + out.write("<title>" + _("coser.business.publication.errorexporttitle", project.getName())+ "</title>"); + out.write("<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />"); + out.write("</head><body>"); + + // convert all errors as tree (code duplicated from ui tree model) + Map<String, List<ControlErrorGroup>> validationCategoryChild = new HashMap<String, List<ControlErrorGroup>>(); + Map<ControlErrorGroup, List<ControlError>> validationErrorsChilds = new HashMap<ControlErrorGroup, List<ControlError>>(); + for (ControlError validationError : validationErrors) { + + String category = validationError.getCategory() == null ? _("coser.business.control.error.allCategories") : _(validationError.getCategory().getTranslationKey()); + List<ControlErrorGroup> errorGroup = validationCategoryChild.get(category); + if (errorGroup == null) { + errorGroup = new ArrayList<ControlErrorGroup>(); + validationCategoryChild.put(category, errorGroup); } - - Map<String, JFreeChart> charts = getCompareCatchLengthGraph(project, container, speciesGraph); + ControlErrorGroup group = new ControlErrorGroup(validationError.getCategory(), validationError.getLevel(), validationError.getMessage()); + List<ControlError> childErrors = validationErrorsChilds.get(group); + if (childErrors == null) { + childErrors = new ArrayList<ControlError>(); + validationErrorsChilds.put(group, childErrors); + errorGroup.add(group); + } - // render output html - out.println("<h1 style='text-align:center'>" + _("coser.business.publication.errorexporttitle", project.getName()) + "</h1>"); - for (Map.Entry<String, List<ControlErrorGroup>> categoriesEntry : validationCategoryChild.entrySet()) { - out.println("<h2>" + categoriesEntry.getKey() + "</h2>"); + if (validationError instanceof SpeciesControlError) { + SpeciesControlError diffError = (SpeciesControlError)validationError; + speciesGraph.add(diffError.getSpecies()); + } + childErrors.add(validationError); + } + + Map<String, JFreeChart> charts = getCompareCatchLengthGraph(project, container, speciesGraph); - out.println("<ul>"); - for (ControlErrorGroup group : categoriesEntry.getValue()) { + // render output html + out.write("<h1 style='text-align:center'>" + _("coser.business.publication.errorexporttitle", project.getName()) + "</h1>"); - out.println("<li style='margin-bottom:20px'><span style='color:"); - switch (group.getValidationLevel()) { - case FATAL: - out.print("rgb(88,0,0)"); - break; - case ERROR: - out.print("red"); - break; - case WARNING: - out.print("orange"); - break; - case INFO: - out.print("green"); - break; - } - out.print(";font-weight:bold'>" + _(group.getMessage())); - out.println("</span>"); + if (includeProjectInfo) { + // partie detail + extractProjectReport(project, out); + // partie specific : commandes + extractHistoryCommandReport(project, container, out); + } - out.println("<ul>"); - for (ControlError error : validationErrorsChilds.get(group)) { - out.println("<li type='circle'>"); - out.print(_(error.getDetailMessage())); - List<String> lineNumbers = error.getLineNumbers(); - if (CollectionUtils.isNotEmpty(lineNumbers)) { - out.print(" (" + _("coser.business.publication.errorexportlines") + " : "); - Iterator<String> itLineNumbers = lineNumbers.iterator(); - while (itLineNumbers.hasNext()) { - out.print(itLineNumbers.next()); - if (itLineNumbers.hasNext()) { - out.print(", "); - } + for (Map.Entry<String, List<ControlErrorGroup>> categoriesEntry : validationCategoryChild.entrySet()) { + out.write("<h2>" + categoriesEntry.getKey() + "</h2>"); + + out.write("<ul>"); + for (ControlErrorGroup group : categoriesEntry.getValue()) { + + out.write("<li style='margin-bottom:20px'><span style='color:"); + switch (group.getValidationLevel()) { + case FATAL: + out.write("rgb(88,0,0)"); + break; + case ERROR: + out.write("red"); + break; + case WARNING: + out.write("orange"); + break; + case INFO: + out.write("green"); + break; + } + out.write(";font-weight:bold'>" + _(group.getMessage())); + out.write("</span>"); + + out.write("<ul>"); + for (ControlError error : validationErrorsChilds.get(group)) { + out.write("<li type='circle'>"); + out.write(_(error.getDetailMessage())); + List<String> lineNumbers = error.getLineNumbers(); + if (CollectionUtils.isNotEmpty(lineNumbers)) { + out.write(" (" + _("coser.business.publication.errorexportlines") + " : "); + Iterator<String> itLineNumbers = lineNumbers.iterator(); + while (itLineNumbers.hasNext()) { + out.write(itLineNumbers.next()); + if (itLineNumbers.hasNext()) { + out.write(", "); } - out.println(")"); } - - // ajout d'un graph si necessaire - if (error instanceof DiffCatchLengthControlError) { - DiffCatchLengthControlError diffError = (DiffCatchLengthControlError)error; - String species = diffError.getSpecies(); - out.println(" (<a href='#graph" + species + "'>" + _("coser.business.publication.errorgraph") + "</a>)"); - } + out.write(")"); + } + + // ajout d'un graph si necessaire + if (error instanceof DiffCatchLengthControlError) { + DiffCatchLengthControlError diffError = (DiffCatchLengthControlError)error; + String species = diffError.getSpecies(); + out.write(" (<a href='#graph" + species + "'>" + _("coser.business.publication.errorgraph") + "</a>)"); + } - String tipMessage = _(error.getTipMessage()); - if (StringUtils.isNotEmpty(error.getTipMessage())) { - out.println("<p style='font-style:italic'>" + tipMessage + "</p>"); - } - - out.println("</li>"); + String tipMessage = _(error.getTipMessage()); + if (StringUtils.isNotEmpty(error.getTipMessage())) { + out.write("<p style='font-style:italic'>" + tipMessage + "</p>"); } - out.println("</ul>"); - out.println("</li>"); + + out.write("</li>"); } - out.println("</ul>"); + out.write("</ul>"); + out.write("</li>"); } + out.write("</ul>"); + } - out.println("<h2>" + _("coser.business.publication.errorgraphs") + "</h2>"); - out.println("<ul>"); - // generation des graphiques - for (Map.Entry<String, JFreeChart> chartEntry : charts.entrySet()) { - JFreeChart chart = chartEntry.getValue(); - File tmpChartImage = File.createTempFile("chart-", ".jpg", imageDirectory); - ChartUtilities.saveChartAsJPEG(tmpChartImage, chart, 800, 400); - out.println("<li><p><a name='graph" + chartEntry.getKey() + "'>" + chartEntry.getKey() + "</a></p>"); - out.println("<img src='images/" + tmpChartImage.getName() + "' /></li>"); - } - out.println("</ul>"); + out.write("<h2>" + _("coser.business.publication.errorgraphs") + "</h2>"); + out.write("<ul>"); + // generation des graphiques + for (Map.Entry<String, JFreeChart> chartEntry : charts.entrySet()) { + JFreeChart chart = chartEntry.getValue(); + File tmpChartImage = File.createTempFile("chart-", ".jpg", imageDirectory); + tmpChartImage.deleteOnExit(); + ChartUtilities.saveChartAsJPEG(tmpChartImage, chart, 600, 300); + out.write("<li><p><a name='graph" + chartEntry.getKey() + "'>"); + out.write(project.getDisplaySpeciesText(chartEntry.getKey()) + "</a></p>"); + out.write("<img src='" + imageDirectory.getName() + "/" + tmpChartImage.getName() + "' /></li>"); + } + out.write("</ul>"); - out.println("</body></html>"); - } catch (IOException ex) { - throw new CoserBusinessException("Can't export errors", ex); - } finally { - IOUtils.closeQuietly(out); - } - return exportHtmlFile; + out.write("</body></html>"); } /** @@ -504,6 +528,7 @@ * * @param project project * @param control data container + * @param validationErrors * @param pdfFile output pdf file * @return extractedFile * @throws CoserBusinessException @@ -511,13 +536,14 @@ * * @see AbstractDataContainer#getHistoryCommands() */ - public void extractControlLogAsPDF(Project project, Control control, File pdfFile) throws CoserBusinessException { + public void extractControlLogAsPDF(Project project, Control control, + List<ControlError> validationErrors, File pdfFile) throws CoserBusinessException { OutputStream os = null; try { Writer out = new StringWriter(); - extractControlLogAsHTML(project, control, out); + exportErrorsAsHTML(project, control, validationErrors, out, true); out.flush(); // get content as w3c document @@ -527,7 +553,9 @@ os = new FileOutputStream(pdfFile); ITextRenderer renderer = new ITextRenderer(); - renderer.setDocument(document, null); + // TODO la base de generation est fixé en dur a java.io.tmpdir + // car je sais que exportErrorsAsHTML genere les images dedans + renderer.setDocument(document, "file://" + System.getProperty("java.io.tmpdir") + "/"); renderer.layout(); renderer.createPDF(os); @@ -556,6 +584,7 @@ Writer out = null; try { exportHtmlFile = File.createTempFile("log-", ".html"); + exportHtmlFile.deleteOnExit(); if (log.isInfoEnabled()) { log.info("Generating HTML report to " + exportHtmlFile.getAbsolutePath()); } Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2012-08-20 16:37:59 UTC (rev 1060) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2012-08-20 16:38:27 UTC (rev 1061) @@ -162,7 +162,7 @@ @Test public void testValidControl() throws CoserBusinessException { Project project = createTestProject(projectService, false); - projectService.validControl(project); + projectService.validControl(project, Collections.EMPTY_LIST); Assert.assertTrue(project.getControl().isValidated()); Assert.assertTrue(getFile(config.getProjectsDirectory(),

1 0

r1060 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by echatellier＠users.forge.codelutin.com Aug. 20, 2012

Aug. 20, 2012

Author: echatellier Date: 2012-08-20 18:37:59 +0200 (Mon, 20 Aug 2012) New Revision: 1060 Url: http://forge.codelutin.com/repositories/revision/coser/1060 Log: D?\195?\169placement dans la barre d'outils Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2012-08-20 16:37:37 UTC (rev 1059) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2012-08-20 16:37:59 UTC (rev 1060) @@ -55,6 +55,10 @@ <row> <cell columns="8" weightx="1" insets="0" fill="horizontal"> <JToolBar floatable="false"> + <JButton icon="chart_curve.png" text="coser.ui.graph.compareNumberCatchLength" + onActionPerformed="getHandler().displayCompareNumberCatchGraph(this)" /> + <JButton icon="chart_bar.png" text="coser.ui.graph.lengthStructure" + onActionPerformed="getHandler().displayLengthStructureGraph(this)" /> <Component initializer="javax.swing.Box.createHorizontalGlue()" /> <JButton id="validSelectionButton" text="coser.ui.selection.details.validSelection" icon="accept.png" onActionPerformed="getHandler().validSelection(this)" /> @@ -76,8 +80,7 @@ </cell> </row> <row> - <cell /> - <cell /> + <cell columns="2"> <cell fill="horizontal" insets="0" columns="2"> <Table> <row> @@ -114,16 +117,7 @@ </row> </Table> </cell> - <cell fill="horizontal" insets="0" columns="2"> - <JPanel> - <JButton icon="chart_curve.png" toolTipText="coser.ui.graph.compareNumberCatchLength" - onActionPerformed="getHandler().displayCompareNumberCatchGraph(this)" /> - <JButton icon="chart_bar.png" toolTipText="coser.ui.graph.lengthStructure" - onActionPerformed="getHandler().displayLengthStructureGraph(this)" /> - </JPanel> - </cell> - <cell /> - <cell /> + <cell columns="4"> </row> <row> <cell weighty="1" weightx="1" fill="both" columns="2">

1 0

r1059 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by echatellier＠users.forge.codelutin.com Aug. 20, 2012

Aug. 20, 2012

Author: echatellier Date: 2012-08-20 18:37:37 +0200 (Mon, 20 Aug 2012) New Revision: 1059 Url: http://forge.codelutin.com/repositories/revision/coser/1059 Log: Un double clic sur le warning taille aberrante dans la phase de contr?\195?\180le doit afficher le graph de la structure en taille de l'esp?\195?\168ce Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2012-08-20 16:37:16 UTC (rev 1058) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2012-08-20 16:37:37 UTC (rev 1059) @@ -1185,7 +1185,7 @@ Project project = view.getContextValue(Project.class); Selection selection = view.getContextValue(Selection.class); SwingSession session = view.getContextValue(SwingSession.class); - displayLengthStructureGraph(view, session, projectService, project, selection); + displayLengthStructureGraph(view, session, projectService, project, selection, null); } /**

1 0

r1058 - in trunk: coser-business/src/main/java/fr/ifremer/coser/control coser-business/src/main/java/fr/ifremer/coser/services coser-ui/src/main/java/fr/ifremer/coser/ui/common coser-ui/src/main/java/fr/ifremer/coser/ui/control
by echatellier＠users.forge.codelutin.com Aug. 20, 2012

Aug. 20, 2012

Author: echatellier Date: 2012-08-20 18:37:16 +0200 (Mon, 20 Aug 2012) New Revision: 1058 Url: http://forge.codelutin.com/repositories/revision/coser/1058 Log: Un double clic sur le warning taille aberrante dans la phase de contr?\195?\180le doit afficher le graph de la structure en taille de l'esp?\195?\168ce Added: trunk/coser-business/src/main/java/fr/ifremer/coser/control/SpeciesLengthControlError.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java Added: trunk/coser-business/src/main/java/fr/ifremer/coser/control/SpeciesLengthControlError.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/control/SpeciesLengthControlError.java (rev 0) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/control/SpeciesLengthControlError.java 2012-08-20 16:37:16 UTC (rev 1058) @@ -0,0 +1,44 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer, Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.coser.control; + +/** + * Erreur de controls specifique aux taille des espèces devant par exemple + * afficher un type de graphique particulier dans l'UI. + * + * @author chatellier + * @version $Revision$ + * @since 1.3 + * + * Last update : $Date$ + * By : $Author$ + */ +public class SpeciesLengthControlError extends SpeciesControlError { + + /** serialVersionUID */ + private static final long serialVersionUID = 6646855823928956144L; + +} Property changes on: trunk/coser-business/src/main/java/fr/ifremer/coser/control/SpeciesLengthControlError.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2012-08-20 16:36:35 UTC (rev 1057) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2012-08-20 16:37:16 UTC (rev 1058) @@ -67,6 +67,7 @@ import fr.ifremer.coser.control.ControlError; import fr.ifremer.coser.control.DiffCatchLengthControlError; import fr.ifremer.coser.control.SpeciesControlError; +import fr.ifremer.coser.control.SpeciesLengthControlError; import fr.ifremer.coser.data.AbstractDataEntity; import fr.ifremer.coser.data.Catch; import fr.ifremer.coser.data.Haul; @@ -970,10 +971,11 @@ if (Math.abs(nombre - avg) > deviation * config.getStandardDeviationToAverage()) { String lineNumber = tuple[AbstractDataEntity.INDEX_LINE]; - ControlError error = new ControlError(); + SpeciesLengthControlError error = new SpeciesLengthControlError(); error.setCategory(Category.LENGTH); error.setLevel(ValidationLevel.WARNING); error.addLineNumber(lineNumber); + error.setSpecies(species); error.setMessage(_("coser.business.control.error.lengthOutliers", avg, deviation)); error.setDetailMessage(_("coser.business.control.error.lengthOutliersDetail", project.getDisplaySpeciesText(species), avg, deviation, lengthValue)); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java 2012-08-20 16:36:35 UTC (rev 1057) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java 2012-08-20 16:37:16 UTC (rev 1058) @@ -63,9 +63,11 @@ * @param projectService projectService * @param project project * @param container data container + * @param species selected species (can be null) */ public void displayLengthStructureGraph(final Component parent, final SwingSession session, - final ProjectService projectService, final Project project, final AbstractDataContainer container) { + final ProjectService projectService, final Project project, final AbstractDataContainer container, + final String species) { SwingUtilities.invokeLater(new Runnable() { public void run() { try { @@ -89,9 +91,17 @@ panel.addMatrixFilter(new LengthStructureMatrixFilter(project, container)); panel.setMatrix(matrix); // init default selection and rendering + String defaultSpecies = species; + if (defaultSpecies != null) { + // il faut quand même la traduire car les données + // contiennent les noms déjà traduits + defaultSpecies = project.getDisplaySpeciesText(defaultSpecies); + } else { + defaultSpecies = (String)matrix.getSemantic(1).get(0); + } panel.initRenderering(new List[]{ matrix.getSemantic(0), // select all length - Collections.singletonList(matrix.getSemantic(1).get(0)) // select first species + Collections.singletonList(defaultSpecies) // select first species }, new int[]{-1, -1, 0, 0}); // select dim 3 et 4 sum action matrixViewerFrame.add(panel); matrixViewerFrame.pack(); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2012-08-20 16:36:35 UTC (rev 1057) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2012-08-20 16:37:16 UTC (rev 1058) @@ -87,6 +87,7 @@ import fr.ifremer.coser.control.ControlError; import fr.ifremer.coser.control.ControlErrorGroup; import fr.ifremer.coser.control.SpeciesControlError; +import fr.ifremer.coser.control.SpeciesLengthControlError; import fr.ifremer.coser.data.AbstractDataEntity; import fr.ifremer.coser.data.Catch; import fr.ifremer.coser.data.Haul; @@ -642,7 +643,11 @@ if (userObject instanceof SpeciesControlError) { SpeciesControlError error = (SpeciesControlError)userObject; String species = error.getSpecies(); - displayCompareNumberCatchGraph(controlView, species); + if (userObject instanceof SpeciesLengthControlError) { + displayLengthStructureGraph(controlView, species); + } else { + displayCompareNumberCatchGraph(controlView, species); + } } } } @@ -1023,10 +1028,20 @@ * @param view view */ public void displayLengthStructureGraph(ControlView view) { + displayLengthStructureGraph(view, null); + } + + /** + * Display lengthStructure matrix in matrixviewerpanel. + * + * @param view view + * @param species selected species (can be null) + */ + public void displayLengthStructureGraph(ControlView view, String species) { Project project = view.getContextValue(Project.class); ProjectService projectService = view.getContextValue(ProjectService.class); SwingSession session = view.getContextValue(SwingSession.class); - displayLengthStructureGraph(view, session, projectService, project, project.getControl()); + displayLengthStructureGraph(view, session, projectService, project, project.getControl(), species); } /** @@ -1156,7 +1171,8 @@ ProjectService service = view.getContextValue(ProjectService.class); try { - service.validControl(project); + List<ControlError> controlErrors = view.getGlobalControlErrorModel().getControlErrors(); + service.validControl(project, controlErrors); JOptionPane.showMessageDialog(view, _("coser.ui.control.controlValidated"), _("coser.ui.control.controlTitle"), JOptionPane.INFORMATION_MESSAGE); } catch (CoserBusinessException ex) {

1 0

r1057 - in trunk/coser-business/src/main: java/fr/ifremer/coser/command resources/i18n
by echatellier＠users.forge.codelutin.com Aug. 20, 2012

Aug. 20, 2012

Author: echatellier Date: 2012-08-20 18:36:35 +0200 (Mon, 20 Aug 2012) New Revision: 1057 Url: http://forge.codelutin.com/repositories/revision/coser/1057 Log: Quand je renomme j'ai "Les esp?\195?\168ces "ALLOSUB" ont ?\195?\169t?\195?\169 fusionn?\195?\169es en "ALLOMED"" il faudrait avoir "L'esp?\195?\168ce "ALLOSUB" a ?\195?\169t?\195?\169 renomm?\195?\169e en "ALLOMED" Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2012-08-20 10:09:05 UTC (rev 1056) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2012-08-20 16:36:35 UTC (rev 1057) @@ -376,13 +376,24 @@ @Override public String getLogString(AbstractDataContainer container) { String speciesAsString = StringUtils.join(speciesNames, ", "); - return _("coser.business.command.mergespecies.log", newSpecyName, speciesAsString); + String log = null; + if (speciesNames.length == 1) { + log = _("coser.business.command.mergespecies.rename.log", newSpecyName, speciesAsString); + } else { + log = _("coser.business.command.mergespecies.log", newSpecyName, speciesAsString); + } + return log; } @Override public String getDescription(AbstractDataContainer container) { String speciesAsString = StringUtils.join(speciesNames, ", "); - String desc = _("coser.business.command.mergespecies.desc", newSpecyName, speciesNames.length, speciesAsString); + String desc = null; + if (speciesNames.length == 1) { + desc = _("coser.business.command.mergespecies.rename.desc", newSpecyName, speciesNames.length, speciesAsString); + } else { + desc = _("coser.business.command.mergespecies.desc", newSpecyName, speciesNames.length, speciesAsString); + } if (StringUtils.isNotBlank(comment)) { desc += " (" + comment + ")"; } Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2012-08-20 10:09:05 UTC (rev 1056) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2012-08-20 16:36:35 UTC (rev 1057) @@ -32,6 +32,8 @@ coser.business.command.deleteline.log=In file %s, line %s has been deleted coser.business.command.mergespecies.desc=Merge %2$s species into "%1$s" \: %3$s coser.business.command.mergespecies.log=Species "%2$s" has been merged to "%1$s" +coser.business.command.mergespecies.rename.desc=Species "%3$s" has been renamed to "%1$s" +coser.business.command.mergespecies.rename.log=Species "%2$s" has been renamed to "%1$s" coser.business.command.modifyfield.desc=File %1$s, %3$s field modification (line %2$s) coser.business.command.modifyfield.log=In file %s at line %s, field "%s" value as been modify from "%s" to "%s" coser.business.common.length=Length Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2012-08-20 10:09:05 UTC (rev 1056) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2012-08-20 16:36:35 UTC (rev 1057) @@ -32,6 +32,8 @@ coser.business.command.deleteline.log=Dans le fichier %s, la ligne %s a été supprimée coser.business.command.mergespecies.desc=%2$s espèces ont été fusionnées en "%1$s" \: %3$s coser.business.command.mergespecies.log=Les espèces "%2$s" ont été fusionnées en "%1$s" +coser.business.command.mergespecies.rename.desc=L'espèce "%3$s" a été renommée en "%1$s" +coser.business.command.mergespecies.rename.log=L'espèce "%2$s" a été renommée en "%1$s" coser.business.command.modifyfield.desc=Fichier %1$s, modification du champ "%3$s" (ligne %2$s) coser.business.command.modifyfield.log=Dans le ficher %s à la ligne %s, le champs "%s" est passé de la valeur "%s" à "%s" coser.business.common.length=Taille @@ -133,7 +135,7 @@ coser.business.publication.selectionchoices=Choix de sélections coser.business.publication.selectionlogexporttitle=Rapport de la sélection %s (projet %s) coser.business.publication.stratafilename=Nom du fichier strates -coser.business.result.rsufiResultAlreadyExists=Le résultat %D existe déjà \! +coser.business.result.rsufiResultAlreadyExists=Le résultat %s existe déjà \! coser.business.resultupload.duplicatedresult=Le résultat %s/%s/%s duplique un autre résultat pour la zone %s \! coser.business.selection.notValidatedControl=Contrôle non validé \! coser.business.uploadresult.checkcollision=Vérification des collisions de zones

1 0

r1056 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize
by echatellier＠users.forge.codelutin.com Aug. 20, 2012

Aug. 20, 2012

Author: echatellier Date: 2012-08-20 12:09:05 +0200 (Mon, 20 Aug 2012) New Revision: 1056 Url: http://forge.codelutin.com/repositories/revision/coser/1056 Log: Correction de la mise ?\195?\160 jour de la frise Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeModel.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java 2012-08-20 09:41:28 UTC (rev 1055) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java 2012-08-20 10:09:05 UTC (rev 1056) @@ -37,6 +37,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import fr.ifremer.coser.bean.Control; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.bean.Selection; import fr.ifremer.coser.ui.CoserFrame; @@ -86,11 +87,31 @@ } if (FreizeModel.PROPERTY_PROJECT.equals(propertyName)) { + Project oldProject = (Project)evt.getOldValue(); + if (oldProject != null) { + oldProject.getControl().removePropertyChangeListener(this); + } + Project newProject = (Project)evt.getNewValue(); + if (newProject != null) { + newProject.getControl().addPropertyChangeListener(this); + } updateUi(); } else if (FreizeModel.PROPERTY_SELECTION.equals(propertyName)) { + Selection oldSelection = (Selection)evt.getOldValue(); + if (oldSelection != null) { + oldSelection.removePropertyChangeListener(this); + } + Selection newSelection = (Selection)evt.getNewValue(); + if (newSelection != null) { + newSelection.addPropertyChangeListener(this); + } updateUi(); - } else if (FreizeModel.PROPERTY_R_SUFI_RESULT.equals(propertyName)) { + } else if (Selection.PROPERTY_RSUFI_RESULTS.equals(propertyName)) { updateUi(); + } else if (Control.PROPERTY_VALIDATED.equals(propertyName) || + Selection.PROPERTY_VALIDATED.equals(propertyName)) { + // c'est les même propriétés, mais ca ne pose pas de pbs + updateUi(); } } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeModel.java 2012-08-20 09:41:28 UTC (rev 1055) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeModel.java 2012-08-20 10:09:05 UTC (rev 1056) @@ -35,7 +35,6 @@ public static final String PROPERTY_PROJECT = "project"; public static final String PROPERTY_SELECTION = "selection"; - public static final String PROPERTY_R_SUFI_RESULT = "rSufiResult"; public static final String PROPERTY_STEP0_ENABLED = "step0Enabled"; public static final String PROPERTY_STEP1_ENABLED = "step1Enabled"; public static final String PROPERTY_STEP2_ENABLED = "step2Enabled"; @@ -75,16 +74,6 @@ this.selection = selection; pcs.firePropertyChange(PROPERTY_SELECTION, oldValue, selection); } - - public RSufiResult getrSufiResult() { - return rSufiResult; - } - - public void setrSufiResult(RSufiResult rSufiResult) { - RSufiResult oldValue = this.rSufiResult; - this.rSufiResult = rSufiResult; - pcs.firePropertyChange(PROPERTY_R_SUFI_RESULT, oldValue, rSufiResult); - } public boolean isStep0Enabled() { return step0Enabled;

1 0

r1055 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui/selection resources/i18n
by echatellier＠users.forge.codelutin.com Aug. 20, 2012

Aug. 20, 2012

Author: echatellier Date: 2012-08-20 11:41:28 +0200 (Mon, 20 Aug 2012) New Revision: 1055 Url: http://forge.codelutin.com/repositories/revision/coser/1055 Log: Adapter les labels lors d'un simple renommage. Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesFusionDialog.jaxx trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2012-08-20 09:12:36 UTC (rev 1054) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2012-08-20 09:41:28 UTC (rev 1055) @@ -772,6 +772,13 @@ // init selected element String firstSelected = (String)view.getFilteredSpeciesList().getSelectedValue(); speciesFusionDialog.getSpeciesCombo().setSelectedItem(firstSelected); + + Object[] selectedValues = view.getFilteredSpeciesList().getSelectedValues(); + if (selectedValues.length == 1) { + speciesFusionDialog.setTitle(_("coser.ui.selection.fusion.rename.title")); + } else { + speciesFusionDialog.setTitle(_("coser.ui.selection.fusion.title")); + } speciesFusionDialog.setLocationRelativeTo(view); speciesFusionDialog.setVisible(true); @@ -1065,8 +1072,13 @@ // supprime la selection apres fusion (demande utilisateur) parent.getFilteredSpeciesListSelectionModel().clearSelection(); - JOptionPane.showMessageDialog(view, _("coser.ui.selection.speciesMerged"), - _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); + if (speciesCodes.length == 1) { + JOptionPane.showMessageDialog(view, _("coser.ui.selection.speciesRenamed"), + _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); + } else { + JOptionPane.showMessageDialog(view, _("coser.ui.selection.speciesMerged"), + _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); + } } catch (CoserBusinessException ex) { JOptionPane.showMessageDialog(view, ex.getMessage(), Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesFusionDialog.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesFusionDialog.jaxx 2012-08-20 09:12:36 UTC (rev 1054) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesFusionDialog.jaxx 2012-08-20 09:41:28 UTC (rev 1055) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog title="coser.ui.selection.fusion.title" modal="true"> +<JDialog modal="true"> <SelectionHandler id="handler" javaBean="null" /> <Table> <row> Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2012-08-20 09:12:36 UTC (rev 1054) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2012-08-20 09:41:28 UTC (rev 1055) @@ -207,7 +207,7 @@ coser.ui.selection.details.displayDiffCatchLengthGraph=Comparison catch/length graphs coser.ui.selection.details.displayDiffCatchLengthGraphTip=Comparison catch/length graphs coser.ui.selection.details.filteredSpecies=Filtered species (%d/%d) \: -coser.ui.selection.details.mergeSpeciesTip=Merge +coser.ui.selection.details.mergeSpeciesTip=Merge/Rename coser.ui.selection.details.name=Selection name \: coser.ui.selection.details.removeFromSelectedListTip=Remove selected species from selected species list coser.ui.selection.details.saveSelection=Save selection @@ -232,8 +232,9 @@ coser.ui.selection.filter.occurrence=Occurrence \: coser.ui.selection.filter.occurrenceunit=% coser.ui.selection.fusion.comment=Comment \: -coser.ui.selection.fusion.description=Species merge. Fill new species name with name existing in referential. +coser.ui.selection.fusion.description=Fill new species name with name existing in referential. coser.ui.selection.fusion.name=New name \: +coser.ui.selection.fusion.rename.title=Rename coser.ui.selection.fusion.title=Merge coser.ui.selection.maturitySpecies=L4 \: Species with maturity (%d/%d) coser.ui.selection.nonJustifiedMaturity=Maturity species list is not all selected.\nYou must justify this selection with a comment. @@ -269,6 +270,7 @@ coser.ui.selection.sizeAllYearSpecies=L3 \: Species with size all year (%d/%d) coser.ui.selection.speciesMenuFusion=Merge coser.ui.selection.speciesMerged=Species merged. +coser.ui.selection.speciesRenamed=Species renamed. coser.ui.selection.tab.details=Selection details coser.ui.selection.tab.lists=Species lists coser.ui.selection.tab.rsufi=RSufi Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2012-08-20 09:12:36 UTC (rev 1054) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2012-08-20 09:41:28 UTC (rev 1055) @@ -207,7 +207,7 @@ coser.ui.selection.details.displayDiffCatchLengthGraph=Graphiques des différences captures/tailles coser.ui.selection.details.displayDiffCatchLengthGraphTip=Graphiques des différences captures/tailles coser.ui.selection.details.filteredSpecies=Espèces filtrées (%d/%d) \: -coser.ui.selection.details.mergeSpeciesTip=Fusion +coser.ui.selection.details.mergeSpeciesTip=Fusion/Renommage coser.ui.selection.details.name=Nom de la sélection \: coser.ui.selection.details.removeFromSelectedListTip=Retire les espèces sélectionnées de la liste des espèces sélectionnées coser.ui.selection.details.saveSelection=Sauvegarder la sélection @@ -232,8 +232,9 @@ coser.ui.selection.filter.occurrence=Occurence \: coser.ui.selection.filter.occurrenceunit=% coser.ui.selection.fusion.comment=Commentaire \: -coser.ui.selection.fusion.description=Fusion d'espèces. Veuillez renseigner un nouveau nom présent dans le référentiel. +coser.ui.selection.fusion.description=Veuillez renseigner un nouveau nom présent dans le référentiel. coser.ui.selection.fusion.name=Nouveau nom \: +coser.ui.selection.fusion.rename.title=Renommage coser.ui.selection.fusion.title=Fusion coser.ui.selection.maturitySpecies=L4 \: Espèces avec maturité (%d/%d) coser.ui.selection.nonJustifiedMaturity=La liste espèces avec maturité n'est pas entièrement sélectionnée.\nVous devez justifier cette sélection par un commentaire. @@ -269,6 +270,7 @@ coser.ui.selection.sizeAllYearSpecies=L3 \: Espèces avec taille pour toutes les années (%d/%d) coser.ui.selection.speciesMenuFusion=Fusion coser.ui.selection.speciesMerged=Espèces fusionnées. +coser.ui.selection.speciesRenamed=Espèce renommée. coser.ui.selection.tab.details=Détails de la sélection coser.ui.selection.tab.lists=Listes des espèces coser.ui.selection.tab.rsufi=RSufi

1 0

r1054 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by echatellier＠users.forge.codelutin.com Aug. 20, 2012

Aug. 20, 2012

Author: echatellier Date: 2012-08-20 11:12:36 +0200 (Mon, 20 Aug 2012) New Revision: 1054 Url: http://forge.codelutin.com/repositories/revision/coser/1054 Log: Suppression du dossier "results" s'il n'y a plus de r?\195?\169sultats Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2012-08-20 09:06:33 UTC (rev 1053) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2012-08-20 09:12:36 UTC (rev 1054) @@ -1274,10 +1274,18 @@ File rsufiResultDirectory = new File(resultsDirectory, rsufiResult.getName()); FileUtils.deleteDirectory(rsufiResultDirectory); + List<RSufiResult> results = selection.getRsufiResults(); results.remove(rsufiResult); // this way to fire change event (do not remove) selection.setRsufiResults(results); + + // s'il n'y a plus de résultat, suppprimer le dossier + // result + File[] resultFiles = resultsDirectory.listFiles(); + if (ArrayUtils.isEmpty(resultFiles)) { + resultsDirectory.delete(); + } } catch (IOException ex) { throw new CoserBusinessException("Can't delete directory", ex); }

1 0

r1053 - trunk/src/site/rst/devel
by echatellier＠users.forge.codelutin.com Aug. 20, 2012

Aug. 20, 2012

Author: echatellier Date: 2012-08-20 11:06:33 +0200 (Mon, 20 Aug 2012) New Revision: 1053 Url: http://forge.codelutin.com/repositories/revision/coser/1053 Log: Mise ?\195?\160 jour du site Modified: trunk/src/site/rst/devel/textupdate.rst Modified: trunk/src/site/rst/devel/textupdate.rst =================================================================== --- trunk/src/site/rst/devel/textupdate.rst 2012-08-17 09:04:25 UTC (rev 1052) +++ trunk/src/site/rst/devel/textupdate.rst 2012-08-20 09:06:33 UTC (rev 1053) @@ -89,7 +89,8 @@ traductions soit en adequation avec les fichiers html. Une fois les modifications effectuées, vous pouvez commiter ces modifications -sur le serveur avec votre client svn. +sur le serveur avec votre client svn. Les identifiant et mot de passe qui vous +seront demandés sont ceux de votre compte sur la forge. Mise en prod

1 0

r1052 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control
by echatellier＠users.forge.codelutin.com Aug. 17, 2012

Aug. 17, 2012

Author: echatellier Date: 2012-08-17 11:04:25 +0200 (Fri, 17 Aug 2012) New Revision: 1052 Url: http://forge.codelutin.com/repositories/revision/coser/1052 Log: Fix javadoc Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalControlErrorModel.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalControlErrorModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalControlErrorModel.java 2012-08-17 09:00:05 UTC (rev 1051) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalControlErrorModel.java 2012-08-17 09:04:25 UTC (rev 1052) @@ -73,7 +73,8 @@ * Utilise une simple liste d'erreur issue du contôle pour en faire * une représentation sous forme d'arbre pour l'utilisateur. * - * @param errors errors list to render + * @param project project (to get species real names) + * @param validationErrors validation errors list to render */ protected void buildGlobalControlErrorTreeModel(Project project, List<ControlError> validationErrors) {

1 0