December 2010 - Coser-commits - mailman.cloud.codelutin.com

r423 - in trunk: . coser-business coser-ui
by chatellier＠users.labs.libre-entreprise.org 15 Dec '10

15 Dec '10

Author: chatellier Date: 2010-12-15 17:59:14 +0000 (Wed, 15 Dec 2010) New Revision: 423 Log: Use relocalized nuiton matrix Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2010-12-15 17:39:33 UTC (rev 422) +++ trunk/coser-business/pom.xml 2010-12-15 17:59:14 UTC (rev 423) @@ -23,7 +23,7 @@ <artifactId>nuiton-i18n</artifactId> </dependency> <dependency> - <groupId>org.nuiton.nuiton-matrix</groupId> + <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> </dependency> <dependency> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2010-12-15 17:39:33 UTC (rev 422) +++ trunk/coser-ui/pom.xml 2010-12-15 17:59:14 UTC (rev 423) @@ -38,11 +38,11 @@ <artifactId>nuiton-i18n</artifactId> </dependency> <dependency> - <groupId>org.nuiton.nuiton-matrix</groupId> + <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> </dependency> <dependency> - <groupId>org.nuiton.nuiton-matrix</groupId> + <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> </dependency> <dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-15 17:39:33 UTC (rev 422) +++ trunk/pom.xml 2010-12-15 17:59:14 UTC (rev 423) @@ -94,14 +94,14 @@ </dependency> <dependency> - <groupId>org.nuiton.nuiton-matrix</groupId> + <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> <version>2.1-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.nuiton.nuiton-matrix</groupId> + <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> <version>2.1-SNAPSHOT</version> <scope>compile</scope>

1 0

r422 - in trunk/coser-business/src: main/java/fr/ifremer/coser/services main/resources/i18n test/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 15 Dec '10

15 Dec '10

Author: chatellier Date: 2010-12-15 17:39:33 +0000 (Wed, 15 Dec 2010) New Revision: 422 Log: Ajout des details du projet dans les rapports Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.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 trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java 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 2010-12-15 17:21:36 UTC (rev 421) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2010-12-15 17:39:33 UTC (rev 422) @@ -44,7 +44,6 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -449,10 +448,13 @@ out.println("<title>" + _("coser.business.publication.controllogexporttitle", project.getName())+ "</title>"); out.println("<meta http-equiv='Content-Type' content='text/html; charset=utf-8'>"); out.println("</head><body>"); - + // header out.println("<h1 style='text-align:center'>" + _("coser.business.publication.controllogexporttitle", project.getName()) + "</h1>"); + // partie detail + extractProjectReport(project, out); + // partie specific : commandes extractHistoryCommandReport(project, control, out); @@ -492,10 +494,13 @@ out.println("<title>" + _("coser.business.publication.selectionlogexporttitle", selection.getName(), project.getName())+ "</title>"); out.println("<meta http-equiv='Content-Type' content='text/html; charset=utf-8'>"); out.println("</head><body>"); - + // header out.println("<h1 style='text-align:center'>" + _("coser.business.publication.selectionlogexporttitle", selection.getName(), project.getName()) + "</h1>"); + // partie detail + extractProjectReport(project, out); + // partie resumé de selection out.println("<h2>" + _("coser.business.publication.selectionchoices") + "</h2>"); out.println("<ul>"); @@ -503,7 +508,7 @@ out.println("<li>" + _("coser.business.common.strata") + " : " + StringUtils.join(selection.getSelectedStrata(), ", ") + "</li>"); out.println("<li>" + _("coser.business.common.species") + " : " + StringUtils.join(selection.getSelectedSpecies(), ", ") + "</li>"); out.println("</ul>"); - + // partie specific : commandes extractHistoryCommandReport(project, selection, out); @@ -519,6 +524,25 @@ } /** + * Extrait la partie "detail projet" vers le flux. + * + * @param project project + * @param out stream + */ + protected void extractProjectReport(Project project, PrintStream out) { + // partie projet + out.println("<h2>" + _("coser.business.publication.projectdetails") + "</h2>"); + out.println("<ul>"); + out.println("<li>" + _("coser.business.publication.author") + " : " + project.getAuthor() + "</li>"); + out.println("<li>" + _("coser.business.publication.catchfilename") + " : " + projectService.getDataStorageFileName(project, Category.CATCH, null) + "</li>"); + out.println("<li>" + _("coser.business.publication.lengthfilename") + " : " + projectService.getDataStorageFileName(project, Category.LENGTH, null) + "</li>"); + out.println("<li>" + _("coser.business.publication.haulfilename") + " : " + projectService.getDataStorageFileName(project, Category.HAUL, null) + "</li>"); + out.println("<li>" + _("coser.business.publication.stratafilename") + " : " + projectService.getDataStorageFileName(project, Category.STRATA, null) + "</li>"); + out.println("<li>" + _("coser.business.publication.comment") + " : " + project.getComment() + "</li>"); + out.println("</ul>"); + } + + /** * Partie commune aux export qui effectue en 2 passe la recuperation * des lignes d'erreur, la recuperation des données correspondant à * ces lignes dans les fichiers originaux et la sortie des erreurs. 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 2010-12-15 17:21:36 UTC (rev 421) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-12-15 17:39:33 UTC (rev 422) @@ -71,14 +71,21 @@ coser.business.matrix.lengthstructure=Length structures coser.business.matrix.occurrence=Occurrence coser.business.matrix.samplingeffort=Sampling effort +coser.business.publication.author=Author +coser.business.publication.catchfilename=Catch file name +coser.business.publication.comment=Comment coser.business.publication.controllogexporttitle=Selection report for %s (project %s) coser.business.publication.datamodification=Data modifications coser.business.publication.errorexportlines=Lines coser.business.publication.errorexporttitle=Error report for project %s coser.business.publication.errorgraph=Graph coser.business.publication.errorgraphs=Graphs +coser.business.publication.haulfilename=Haul file name +coser.business.publication.lengthfilename=Length file name +coser.business.publication.projectdetails=Project details coser.business.publication.selectionchoices=Selection choices coser.business.publication.selectionlogexporttitle= +coser.business.publication.stratafilename=Strata file name coser.business.result.rsufiResultAlreadyExists=Result %s already exists \! coser.business.selection.notValidatedControl=Not validated control \! coser.config.control.diffcatchlength.description=Percentage difference allowed between catch and length (in percent, for example 5% set 5.0) 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 2010-12-15 17:21:36 UTC (rev 421) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-12-15 17:39:33 UTC (rev 422) @@ -71,14 +71,21 @@ coser.business.matrix.lengthstructure=Structures en taille coser.business.matrix.occurrence=Occurrence coser.business.matrix.samplingeffort=Effort d'\u00E9chantillonnage +coser.business.publication.author=Auteur +coser.business.publication.catchfilename=Nom du fichier captures +coser.business.publication.comment=Commentaire coser.business.publication.controllogexporttitle=Rapport de contr\u00F4le (projet %s) coser.business.publication.datamodification=Modifications sur les donn\u00E9es coser.business.publication.errorexportlines=Lignes coser.business.publication.errorexporttitle=Rapport d'erreur pour le projet %s coser.business.publication.errorgraph=Graphique coser.business.publication.errorgraphs=Graphiques +coser.business.publication.haulfilename=Nom du fichier traits +coser.business.publication.lengthfilename=Nom du fichier tailles +coser.business.publication.projectdetails=D\u00E9tails du projet coser.business.publication.selectionchoices=Choix de s\u00E9lections coser.business.publication.selectionlogexporttitle=Rapport de la s\u00E9lection %s (projet %s) +coser.business.publication.stratafilename=Nom du fichier strates coser.business.result.rsufiResultAlreadyExists=Le r\u00E9sultat %D existe d\u00E9j\u00E0 \! coser.business.selection.notValidatedControl=Contr\u00F4le non valid\u00E9 \! coser.config.control.diffcatchlength.description=Pourcentage d'\u00E9cart tol\u00E9r\u00E9 entre les captures et les tailles (en pourcent, par exemple pour 5% mettre 5.0) Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java 2010-12-15 17:21:36 UTC (rev 421) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java 2010-12-15 17:39:33 UTC (rev 422) @@ -177,7 +177,7 @@ Assert.assertTrue(fileContent.indexOf("from \"251.86\" to \"392.98\"") > 0); // clean all - htmlExport.delete(); + //htmlExport.delete(); } /** @@ -216,6 +216,6 @@ Assert.assertTrue(fileContent.indexOf("COSER_SPECIES3") > 0); // clean all - htmlExport.delete(); + //htmlExport.delete(); } }

1 0

r421 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common
by chatellier＠users.labs.libre-entreprise.org 15 Dec '10

15 Dec '10

Author: chatellier Date: 2010-12-15 17:21:36 +0000 (Wed, 15 Dec 2010) New Revision: 421 Log: Personnalisation du titre du graphique Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixRenderer.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java 2010-12-15 17:10:28 UTC (rev 420) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java 2010-12-15 17:21:36 UTC (rev 421) @@ -33,11 +33,6 @@ import javax.swing.JOptionPane; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import fr.ifremer.coser.ui.control.ControlHandler; - /** * Common application handler. * @@ -49,8 +44,6 @@ */ public class CommonHandler { - private static final Log log = LogFactory.getLog(ControlHandler.class); - /** * Install le curseur sablier. * 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 2010-12-15 17:10:28 UTC (rev 420) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java 2010-12-15 17:21:36 UTC (rev 421) @@ -30,8 +30,6 @@ import javax.swing.JFrame; import javax.swing.SwingUtilities; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; import org.nuiton.math.matrix.viewer.MatrixViewerPanel; import org.nuiton.math.matrix.viewer.renderer.MatrixInfoTableRenderer; @@ -52,8 +50,6 @@ */ public class DataHandler extends CommonHandler { - private static final Log log = LogFactory.getLog(DataHandler.class); - /** * Display lengthStructure matrix in matrixviewerpanel. * @@ -77,7 +73,7 @@ JFrame matrixViewerFrame = new JFrame(_("coser.ui.graph.lengthStructure")); matrixViewerFrame.setName("lengthstructureframe"); MatrixViewerPanel panel = new MatrixViewerPanel(); - panel.addMatrixRenderer(new LengthStructureMatrixRenderer()); + panel.addMatrixRenderer(new LengthStructureMatrixRenderer(project, container)); panel.addMatrixRenderer(new MatrixInfoTableRenderer()); panel.addMatrix(matrix); matrixViewerFrame.add(panel); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixRenderer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixRenderer.java 2010-12-15 17:10:28 UTC (rev 420) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixRenderer.java 2010-12-15 17:21:36 UTC (rev 421) @@ -23,14 +23,21 @@ package fr.ifremer.coser.ui.common; +import static org.nuiton.i18n.I18n._; + import java.util.List; +import org.jfree.chart.JFreeChart; import org.jfree.data.category.CategoryDataset; import org.jfree.data.category.DefaultCategoryDataset; import org.nuiton.math.matrix.MatrixND; import org.nuiton.math.matrix.viewer.renderer.MatrixChartRenderer; import org.nuiton.math.matrix.viewer.renderer.jfreechart.GraphMatrixNDDataset; +import fr.ifremer.coser.bean.AbstractDataContainer; +import fr.ifremer.coser.bean.Project; +import fr.ifremer.coser.bean.Selection; + /** * JFreeChart matrix panel renderer. * @@ -45,6 +52,30 @@ */ public class LengthStructureMatrixRenderer extends MatrixChartRenderer { + protected Project project; + + protected AbstractDataContainer container; + + public LengthStructureMatrixRenderer(Project project, AbstractDataContainer container) { + this.project = project; + this.container = container; + } + + /** + * Pour modification du titre du graphique. + * + * Coser : projecttitle : selectiontitle + */ + protected JFreeChart getJFreeChart(MatrixND matrix) { + String title = "Coser: " + project.getName(); + if (container instanceof Selection) { + title += ": " + ((Selection)container).getName(); + } + JFreeChart chart = new JFreeChart(title, JFreeChart.DEFAULT_TITLE_FONT, + getCategoryPlot(matrix), true); + return chart; + } + @Override protected CategoryDataset getCategoryDataset(MatrixND matrix) { return getLengthStructureDataSet(matrix);

1 0

r420 - in trunk/coser-business/src: main/java/fr/ifremer/coser/command main/java/fr/ifremer/coser/services test/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 15 Dec '10

15 Dec '10

Author: chatellier Date: 2010-12-15 17:10:28 +0000 (Wed, 15 Dec 2010) New Revision: 420 Log: Affichage des donn?\195?\169es d'origine dans les rapports Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java 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/PublicationServiceTest.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java 2010-12-15 16:18:22 UTC (rev 419) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java 2010-12-15 17:10:28 UTC (rev 420) @@ -265,7 +265,8 @@ int index = ArrayUtils.indexOf(headers, fieldName); // 0 = header - String realFieldName = dataStorage.get(0)[index]; + // +1 = les données contiennent le champs 'line' en plus + String realFieldName = dataStorage.get(0)[index + 1]; return realFieldName; } } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java 2010-12-15 16:18:22 UTC (rev 419) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java 2010-12-15 17:10:28 UTC (rev 420) @@ -38,7 +38,10 @@ import java.io.Reader; import java.io.Writer; import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; @@ -121,11 +124,10 @@ DataStorage content = new MemoryDataStorage(); - Reader reader = null; CSVReader csvReader = null; try { - reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), CoserConstants.CSV_FILE_ENCODING)); + Reader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), CoserConstants.CSV_FILE_ENCODING)); if (progress != null) { reader = new ProgressReader(reader, progress); } @@ -165,7 +167,6 @@ } finally { IOUtils.closeQuietly(csvReader); - IOUtils.closeQuietly(reader); } return content; @@ -267,10 +268,9 @@ public void storeData(Project project, DataStorage content, File file) throws CoserBusinessException { // save content - Writer writer = null; CSVWriter csvWriter = null; try { - writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), CoserConstants.CSV_FILE_ENCODING)); + Writer writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), CoserConstants.CSV_FILE_ENCODING)); csvWriter = new CSVWriter(writer, CoserConstants.CSV_SEPARATOR_CHAR); Iterator<String[]> itContent = content.iterator(); @@ -282,7 +282,47 @@ } finally { IOUtils.closeQuietly(csvWriter); - IOUtils.closeQuietly(writer); } } + + /** + * Lit le fichier demandé et sauve dans une map les lignes demandées. + * + * @param file file to read + * @param lines lines to save content + * @return saved content + * @throws CoserBusinessException + */ + public Map<String, String[]> getOriginalFileContent(File file, Collection<String> lines) throws CoserBusinessException { + Map<String, String[]> content = new HashMap<String, String[]>(); + + CSVReader csvReader = null; + try { + + Reader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), CoserConstants.CSV_FILE_ENCODING)); + csvReader = new CSVReader(reader, CoserConstants.CSV_SEPARATOR_CHAR); + + // skip header + String[] line = csvReader.readNext(); + + // pour alimenter la line index (si non reloading) + // dans coser, la numérotation des lignes commence à 1 + int lineIndex = 1; + while ((line = csvReader.readNext()) != null) { + String stringLine = String.valueOf(lineIndex); + if (lines.contains(stringLine)) { + content.put(stringLine, line); + } + lineIndex++; + } + } + catch (IOException ex) { + throw new CoserBusinessException("Can't read file", ex); + } + finally { + IOUtils.closeQuietly(csvReader); + } + + return content; + } } 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 2010-12-15 16:18:22 UTC (rev 419) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-12-15 17:10:28 UTC (rev 420) @@ -1409,7 +1409,7 @@ break; case HAUL: currentBeanData = new Haul(); - newBeanData = new Catch(); + newBeanData = new Haul(); lineIndex = control.getHaul().indexOf(lineNumber); currentBeanData.setData(control.getHaul().get(lineIndex)); break; @@ -2526,4 +2526,35 @@ IOUtils.closeQuietly(out); } } + + /** + * Lit tout le fichier associé à la categorie demandé, mais ne retourne + * que les données correspondant au numéro de lignes demandée. + * + * Le contenu retourné ne contient pas le numéro de ligne. + * + * @param project project + * @param category category + * @param lines lines to get content + * @return content for lines + * @throws CoserBusinessException + */ + public Map<String, String[]> getOriginalContent(Project project, Category category, Collection<String> lines) throws CoserBusinessException { + Map<String, String[]> contents = null; + + // ne lit pas un fichier entier pour ne rien chercher + if (CollectionUtils.isEmpty(lines)) { + return new HashMap<String, String[]>(); + } + + File projectsDirectory = config.getProjectsDirectory(); + File projectDirectory = new File(projectsDirectory, project.getName()); + File originalDirectory = new File(projectDirectory, CoserConstants.STORAGE_ORIGINAL_DIRECTORY); + String storageFileName = getDataStorageFileName(project, category, null); + File dataFile = new File(originalDirectory, storageFileName); + + contents = importService.getOriginalFileContent(dataFile, lines); + + return contents; + } } 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 2010-12-15 16:18:22 UTC (rev 419) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2010-12-15 17:10:28 UTC (rev 420) @@ -35,6 +35,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -43,6 +44,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -68,6 +70,7 @@ import fr.ifremer.coser.bean.Control; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.bean.Selection; +import fr.ifremer.coser.command.CategoryLineCommand; import fr.ifremer.coser.command.Command; import fr.ifremer.coser.control.ControlError; import fr.ifremer.coser.control.ControlErrorGroup; @@ -90,8 +93,11 @@ protected CoserBusinessConfig config; + protected ProjectService projectService; + public PublicationService(CoserBusinessConfig config) { this.config = config; + projectService = new ProjectService(config); } /** @@ -422,13 +428,13 @@ * Extrait les logs des modifications faites sur un control au format html. * * @param project project - * @param container data container + * @param control data container * @return extractedFile * @throws CoserBusinessException * * @see AbstractDataContainer#getHistoryCommand() */ - public File extractControlLogAsHTML(Project project, Control container) throws CoserBusinessException { + public File extractControlLogAsHTML(Project project, Control control) throws CoserBusinessException { File exportHtmlFile = null; PrintStream out = null; try { @@ -448,12 +454,8 @@ out.println("<h1 style='text-align:center'>" + _("coser.business.publication.controllogexporttitle", project.getName()) + "</h1>"); // partie specific : commandes - out.println("<h2>" + _("coser.business.publication.datamodification") + "</h2>"); - out.println("<ol>"); - for (Command command : container.getHistoryCommand()) { - out.println("<li>" + command.getLogString(container) + "</li>"); - } - out.println("</ol>"); + extractHistoryCommandReport(project, control, out); + out.println("</body></html>"); } catch (IOException ex) { @@ -497,18 +499,14 @@ // partie resumé de selection out.println("<h2>" + _("coser.business.publication.selectionchoices") + "</h2>"); out.println("<ul>"); - out.println("<li>" + _("coser.business.common.years") + " : " + StringUtils.join(selection.getSelectedYears(), " ,") + "</li>"); - out.println("<li>" + _("coser.business.common.strata") + " : " + StringUtils.join(selection.getSelectedStrata(), " ,") + "</li>"); - out.println("<li>" + _("coser.business.common.species") + " : " + StringUtils.join(selection.getSelectedSpecies(), " ,") + "</li>"); + out.println("<li>" + _("coser.business.common.years") + " : " + StringUtils.join(selection.getSelectedYears(), ", ") + "</li>"); + out.println("<li>" + _("coser.business.common.strata") + " : " + StringUtils.join(selection.getSelectedStrata(), ", ") + "</li>"); + out.println("<li>" + _("coser.business.common.species") + " : " + StringUtils.join(selection.getSelectedSpecies(), ", ") + "</li>"); out.println("</ul>"); // partie specific : commandes - out.println("<h2>" + _("coser.business.publication.datamodification") + "</h2>"); - out.println("<ol>"); - for (Command command : selection.getHistoryCommand()) { - out.println("<li>" + command.getLogString(selection) + "</li>"); - } - out.println("</ol>"); + extractHistoryCommandReport(project, selection, out); + out.println("</body></html>"); } catch (IOException ex) { @@ -519,4 +517,90 @@ } return exportHtmlFile; } + + /** + * Partie commune aux export qui effectue en 2 passe la recuperation + * des lignes d'erreur, la recuperation des données correspondant à + * ces lignes dans les fichiers originaux et la sortie des erreurs. + * + * @param project project + * @param container data container + * @param out output stream + * @throws CoserBusinessException + */ + protected void extractHistoryCommandReport(Project project, AbstractDataContainer container, PrintStream out) throws CoserBusinessException { + + // first get lines index to get content + Set<String> catchLines = new HashSet<String>(); + Set<String> lengthLines = new HashSet<String>(); + Set<String> haulLines = new HashSet<String>(); + Set<String> strataLines = new HashSet<String>(); + + for (Command command : container.getHistoryCommand()) { + Category category = null; + String line = null; + if (command instanceof CategoryLineCommand) { + category = ((CategoryLineCommand)command).getCategory(); + line = ((CategoryLineCommand)command).getLineNumber(); + } + if (category != null && line != null) { + switch (category) { + case CATCH: + catchLines.add(line); + break; + case LENGTH: + lengthLines.add(line); + break; + case HAUL: + haulLines.add(line); + break; + case STRATA: + strataLines.add(line); + break; + } + } + } + + // second get content for lines + Map<String, String[]> catchContent = projectService.getOriginalContent(project, Category.CATCH, catchLines); + Map<String, String[]> lengthContent = projectService.getOriginalContent(project, Category.LENGTH, lengthLines); + Map<String, String[]> haulContent = projectService.getOriginalContent(project, Category.HAUL, haulLines); + Map<String, String[]> strataContent = projectService.getOriginalContent(project, Category.STRATA, strataLines); + + // third, generate html report + out.println("<h2>" + _("coser.business.publication.datamodification") + "</h2>"); + out.println("<ol>"); + for (Command command : container.getHistoryCommand()) { + Category category = null; + String line = null; + if (command instanceof CategoryLineCommand) { + category = ((CategoryLineCommand)command).getCategory(); + line = ((CategoryLineCommand)command).getLineNumber(); + } + if (category != null && line != null) { + String[] data = null; + switch (category) { + case CATCH: + data = catchContent.get(line); + break; + case LENGTH: + data = lengthContent.get(line); + break; + case HAUL: + data = haulContent.get(line); + break; + case STRATA: + data = strataContent.get(line); + break; + } + out.println("<li>" + command.getLogString(container) + "<br/>"); + out.println("<tt style='color:#5F5A59'>" + StringUtils.join(data, ", ") + "</tt><br /></li>"); + } + else { + out.println("<li>" + command.getLogString(container) + "</li>"); + } + } + out.println("</ol>"); + } + } Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java 2010-12-15 16:18:22 UTC (rev 419) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java 2010-12-15 17:10:28 UTC (rev 420) @@ -177,7 +177,7 @@ Assert.assertTrue(fileContent.indexOf("from \"251.86\" to \"392.98\"") > 0); // clean all - //htmlExport.delete(); + htmlExport.delete(); } /**

1 0

r419 - trunk/coser-business/src/main/java/fr/ifremer/coser/command
by chatellier＠users.labs.libre-entreprise.org 15 Dec '10

15 Dec '10

Author: chatellier Date: 2010-12-15 16:18:22 +0000 (Wed, 15 Dec 2010) New Revision: 419 Log: Ajout d'une classe abstraite commune aux erreur portant sur une categorie et une ligne en particulier Added: trunk/coser-business/src/main/java/fr/ifremer/coser/command/CategoryLineCommand.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java Added: trunk/coser-business/src/main/java/fr/ifremer/coser/command/CategoryLineCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/CategoryLineCommand.java (rev 0) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/CategoryLineCommand.java 2010-12-15 16:18:22 UTC (rev 419) @@ -0,0 +1,63 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 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.command; + +import fr.ifremer.coser.CoserConstants.Category; + +/** + * Commande faite une une category de fichier a une ligne specifique. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public abstract class CategoryLineCommand extends Command { + + /** Category de données sur lequel porte l'action. */ + protected Category category; + + /** Line index of object to do command to. */ + protected String lineNumber; + + public Category getCategory() { + return category; + } + + public void setCategory(Category category) { + this.category = category; + } + + public String getLineNumber() { + return lineNumber; + } + + public void setLineNumber(String lineNumber) { + this.lineNumber = lineNumber; + } + +} Property changes on: trunk/coser-business/src/main/java/fr/ifremer/coser/command/CategoryLineCommand.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java 2010-12-15 15:55:26 UTC (rev 418) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java 2010-12-15 16:18:22 UTC (rev 419) @@ -46,30 +46,8 @@ * Last update : $Date$ * By : $Author$ */ -public class DeleteLineCommand extends Command { +public class DeleteLineCommand extends CategoryLineCommand { - /** Category de données sur lequel porte l'action. */ - protected Category category; - - /** Line index of object to do command to. */ - protected String lineNumber; - - public Category getCategory() { - return category; - } - - public void setCategory(Category category) { - this.category = category; - } - - public String getLineNumber() { - return lineNumber; - } - - public void setLineNumber(String lineNumber) { - this.lineNumber = lineNumber; - } - @Override public void doCommand(Project project, AbstractDataContainer container) throws CoserBusinessException { Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java 2010-12-15 15:55:26 UTC (rev 418) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java 2010-12-15 16:18:22 UTC (rev 419) @@ -55,14 +55,8 @@ * Last update : $Date$ * By : $Author$ */ -public class ModifyFieldCommand extends Command { +public class ModifyFieldCommand extends CategoryLineCommand { - /** Category de données sur lequel porte l'action. */ - protected Category category; - - /** Line index of object to do command to. */ - protected String lineNumber; - /** Field index to to command. */ protected String fieldName; @@ -72,22 +66,6 @@ /** Field new value. */ protected String newValue; - public Category getCategory() { - return category; - } - - public void setCategory(Category category) { - this.category = category; - } - - public String getLineNumber() { - return lineNumber; - } - - public void setLineNumber(String lineNumber) { - this.lineNumber = lineNumber; - } - public String getFieldName() { return fieldName; }

1 0

r418 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common
by chatellier＠users.labs.libre-entreprise.org 15 Dec '10

15 Dec '10

Author: chatellier Date: 2010-12-15 15:55:26 +0000 (Wed, 15 Dec 2010) New Revision: 418 Log: Recherche des bornes min/max ?\195?\160 partir desquelles il y a des donn?\195?\169es Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixRenderer.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixRenderer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixRenderer.java 2010-12-15 15:35:37 UTC (rev 417) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixRenderer.java 2010-12-15 15:55:26 UTC (rev 418) @@ -23,9 +23,6 @@ package fr.ifremer.coser.ui.common; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; - import java.util.List; import org.jfree.data.category.CategoryDataset; @@ -34,8 +31,6 @@ import org.nuiton.math.matrix.viewer.renderer.MatrixChartRenderer; import org.nuiton.math.matrix.viewer.renderer.jfreechart.GraphMatrixNDDataset; -import fr.ifremer.coser.CoserConstants.Category; - /** * JFreeChart matrix panel renderer. * @@ -62,10 +57,30 @@ if ("coser.business.common.length".equals(semantic0Name)) { DefaultCategoryDataset defaultDataset = new DefaultCategoryDataset(); List<?> semantic0 = matrix.getSemantic(0); - double first = (Double)semantic0.get(0); - double last = (Double)semantic0.get(semantic0.size() - 1); + double first = Double.MAX_VALUE; + double last = Double.MIN_VALUE; + + // on cherche les bornes qui ont des valeurs sup à 0.0 + // sinon, ya du vide autour des choses demandées + // mais le vide entre est requis (trou de données) + for (Object categorySem : matrix.getSemantic(0)) { + for (Object serieSem : matrix.getSemantic(1)) { + Double value = matrix.getValue(new Object[] { categorySem, serieSem }); + if (value > 0.0) { + double category = (Double)categorySem; + if (first > category) { + first = category; + } + if (last < category) { + last = category; + } + } + } + } + + // on verifie toutes les valeurs pour savoir si c'est un + // pas entier ou un demi pas boolean haltStep = false; - for (Object number : semantic0) { double dNumber = (Double)number; if (dNumber - Math.floor(dNumber) > 0) { @@ -73,12 +88,14 @@ break; } } - + for (double index = first ; index <= last ; index += (haltStep) ? 0.5 : 1) { for (Object serieSem : matrix.getSemantic(1)) { Double value = null; + // il n'y a pas de valeur dans la matrices + // pour les pas intermédiaires ajouté if (semantic0.contains(index)) { value = matrix.getValue(new Object[] { index, serieSem }); }

1 0

r417 - in trunk: coser-business/src/main/java/fr/ifremer/coser/services coser-business/src/main/resources/i18n coser-business/src/test/java/fr/ifremer/coser/services coser-ui/src/main/java/fr/ifremer/coser/ui/control coser-ui/src/main/java/fr/ifremer/coser/ui/selection coser-ui/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 15 Dec '10

15 Dec '10

Author: chatellier Date: 2010-12-15 15:35:37 +0000 (Wed, 15 Dec 2010) New Revision: 417 Log: Modification des rapports (controle/selection) Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.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 trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 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-business/src/main/java/fr/ifremer/coser/services/PublicationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2010-12-15 15:01:13 UTC (rev 416) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2010-12-15 15:35:37 UTC (rev 417) @@ -65,7 +65,9 @@ import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserConstants.Category; import fr.ifremer.coser.bean.AbstractDataContainer; +import fr.ifremer.coser.bean.Control; import fr.ifremer.coser.bean.Project; +import fr.ifremer.coser.bean.Selection; import fr.ifremer.coser.command.Command; import fr.ifremer.coser.control.ControlError; import fr.ifremer.coser.control.ControlErrorGroup; @@ -417,7 +419,7 @@ } /** - * Extrait les logs des modifications faites sur un conteneur au format html. + * Extrait les logs des modifications faites sur un control au format html. * * @param project project * @param container data container @@ -426,7 +428,7 @@ * * @see AbstractDataContainer#getHistoryCommand() */ - public File extractLogAsHTML(Project project, AbstractDataContainer container) throws CoserBusinessException { + public File extractControlLogAsHTML(Project project, Control container) throws CoserBusinessException { File exportHtmlFile = null; PrintStream out = null; try { @@ -438,13 +440,15 @@ out = new PrintStream(exportHtmlFile, "utf-8"); out.println("<html><head>"); - out.println("<title>" + _("coser.business.publication.logexporttitle", project.getName())+ "</title>"); + out.println("<title>" + _("coser.business.publication.controllogexporttitle", project.getName())+ "</title>"); out.println("<meta http-equiv='Content-Type' content='text/html; charset=utf-8'>"); out.println("</head><body>"); - out.println("<h1 style='text-align:center'>" + _("coser.business.publication.logexporttitle", project.getName()) + "</h1>"); + // header + out.println("<h1 style='text-align:center'>" + _("coser.business.publication.controllogexporttitle", project.getName()) + "</h1>"); // partie specific : commandes + out.println("<h2>" + _("coser.business.publication.datamodification") + "</h2>"); out.println("<ol>"); for (Command command : container.getHistoryCommand()) { out.println("<li>" + command.getLogString(container) + "</li>"); @@ -460,4 +464,59 @@ } return exportHtmlFile; } + + /** + * Extrait les logs des modifications faites sur une selection au format html. + * + * @param project project + * @param selection data container + * @return extractedFile + * @throws CoserBusinessException + * + * @see AbstractDataContainer#getHistoryCommand() + */ + public File extractSelectionLogAsHTML(Project project, Selection selection) throws CoserBusinessException { + File exportHtmlFile = null; + PrintStream out = null; + try { + exportHtmlFile = File.createTempFile("log-", ".html"); + if (log.isInfoEnabled()) { + log.info("Generating HTML report to " + exportHtmlFile.getAbsolutePath()); + } + + out = new PrintStream(exportHtmlFile, "utf-8"); + + out.println("<html><head>"); + out.println("<title>" + _("coser.business.publication.selectionlogexporttitle", selection.getName(), project.getName())+ "</title>"); + out.println("<meta http-equiv='Content-Type' content='text/html; charset=utf-8'>"); + out.println("</head><body>"); + + // header + out.println("<h1 style='text-align:center'>" + _("coser.business.publication.selectionlogexporttitle", selection.getName(), project.getName()) + "</h1>"); + + // partie resumé de selection + out.println("<h2>" + _("coser.business.publication.selectionchoices") + "</h2>"); + out.println("<ul>"); + out.println("<li>" + _("coser.business.common.years") + " : " + StringUtils.join(selection.getSelectedYears(), " ,") + "</li>"); + out.println("<li>" + _("coser.business.common.strata") + " : " + StringUtils.join(selection.getSelectedStrata(), " ,") + "</li>"); + out.println("<li>" + _("coser.business.common.species") + " : " + StringUtils.join(selection.getSelectedSpecies(), " ,") + "</li>"); + out.println("</ul>"); + + // partie specific : commandes + out.println("<h2>" + _("coser.business.publication.datamodification") + "</h2>"); + out.println("<ol>"); + for (Command command : selection.getHistoryCommand()) { + out.println("<li>" + command.getLogString(selection) + "</li>"); + } + out.println("</ol>"); + out.println("</body></html>"); + } + catch (IOException ex) { + throw new CoserBusinessException("Can't export logs", ex); + } + finally { + IOUtils.closeQuietly(out); + } + return exportHtmlFile; + } } 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 2010-12-15 15:01:13 UTC (rev 416) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-12-15 15:35:37 UTC (rev 417) @@ -71,11 +71,14 @@ coser.business.matrix.lengthstructure=Length structures coser.business.matrix.occurrence=Occurrence coser.business.matrix.samplingeffort=Sampling effort +coser.business.publication.controllogexporttitle=Selection report for %s (project %s) +coser.business.publication.datamodification=Data modifications coser.business.publication.errorexportlines=Lines coser.business.publication.errorexporttitle=Error report for project %s coser.business.publication.errorgraph=Graph coser.business.publication.errorgraphs=Graphs -coser.business.publication.logexporttitle=Modifications list for project %s +coser.business.publication.selectionchoices=Selection choices +coser.business.publication.selectionlogexporttitle= coser.business.result.rsufiResultAlreadyExists=Result %s already exists \! coser.business.selection.notValidatedControl=Not validated control \! coser.config.control.diffcatchlength.description=Percentage difference allowed between catch and length (in percent, for example 5% set 5.0) 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 2010-12-15 15:01:13 UTC (rev 416) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-12-15 15:35:37 UTC (rev 417) @@ -71,11 +71,14 @@ coser.business.matrix.lengthstructure=Structures en taille coser.business.matrix.occurrence=Occurrence coser.business.matrix.samplingeffort=Effort d'\u00E9chantillonnage +coser.business.publication.controllogexporttitle=Rapport de contr\u00F4le (projet %s) +coser.business.publication.datamodification=Modifications sur les donn\u00E9es coser.business.publication.errorexportlines=Lignes coser.business.publication.errorexporttitle=Rapport d'erreur pour le projet %s coser.business.publication.errorgraph=Graphique coser.business.publication.errorgraphs=Graphiques -coser.business.publication.logexporttitle=Liste des modifications pour le projet %s +coser.business.publication.selectionchoices=Choix de s\u00E9lections +coser.business.publication.selectionlogexporttitle=Rapport de la s\u00E9lection %s (projet %s) coser.business.result.rsufiResultAlreadyExists=Le r\u00E9sultat %D existe d\u00E9j\u00E0 \! coser.business.selection.notValidatedControl=Contr\u00F4le non valid\u00E9 \! coser.config.control.diffcatchlength.description=Pourcentage d'\u00E9cart tol\u00E9r\u00E9 entre les captures et les tailles (en pourcent, par exemple pour 5% mettre 5.0) Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java 2010-12-15 15:01:13 UTC (rev 416) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java 2010-12-15 15:35:37 UTC (rev 417) @@ -30,6 +30,7 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -47,7 +48,9 @@ import fr.ifremer.coser.CoserConstants.Category; import fr.ifremer.coser.CoserConstants.ValidationLevel; import fr.ifremer.coser.bean.Project; +import fr.ifremer.coser.bean.Selection; import fr.ifremer.coser.command.DeleteLineCommand; +import fr.ifremer.coser.command.MergeSpeciesCommand; import fr.ifremer.coser.command.ModifyFieldCommand; import fr.ifremer.coser.control.DiffCatchLengthControlError; import fr.ifremer.coser.control.ControlError; @@ -140,16 +143,15 @@ } /** - * Test le rapport de log en html. + * Test le rapport de control en html. * * @throws CoserBusinessException * @throws IOException */ @Test - public void testLogExportHtml() throws CoserBusinessException, IOException { + public void testControlLogExportHtml() throws CoserBusinessException, IOException { Project project = createTestProject(projectService, false); - Assert.assertEquals(30, project.getControl().getLength().size()); // delete line 2 DeleteLineCommand command = new DeleteLineCommand(); @@ -166,7 +168,7 @@ commandService.doAction(command2, project, project.getControl()); - File htmlExport = publicationService.extractLogAsHTML(project, project.getControl()); + File htmlExport = publicationService.extractControlLogAsHTML(project, project.getControl()); // some asserts String fileContent = FileUtils.readFileToString(htmlExport); @@ -175,6 +177,45 @@ Assert.assertTrue(fileContent.indexOf("from \"251.86\" to \"392.98\"") > 0); // clean all + //htmlExport.delete(); + } + + /** + * Test le rapport de selection en html. + * + * @throws CoserBusinessException + * @throws IOException + */ + @Test + public void testSelectionLogExportHtml() throws CoserBusinessException, IOException { + + Project project = createTestProject(projectService, true); + Selection selection = projectService.initProjectSelection(project); + selection.setSelectedYears(Collections.singletonList("2010")); + selection.setSelectedStrata(Collections.singletonList("EG34EB")); + selection.setSelectedSpecies(Collections.singletonList("COSER_SPECIES1")); + + // merge species + MergeSpeciesCommand command = new MergeSpeciesCommand(); + command.setComment("marged because i wanted to !"); + command.setNewSpecyName("TESTMERGE"); + command.setSpeciesNames(new String[]{"COSER_SPECIES2","COSER_SPECIES3"}); + commandService.doAction(command, project, selection); + + commandService.doAction(command, project, selection); + + File htmlExport = publicationService.extractSelectionLogAsHTML(project, selection); + + // some asserts + String fileContent = FileUtils.readFileToString(htmlExport); + Assert.assertTrue(fileContent.indexOf("COSER_SPECIES1") > 0); + Assert.assertTrue(fileContent.indexOf("2010") > 0); + Assert.assertTrue(fileContent.indexOf("EG34EB") > 0); + Assert.assertTrue(fileContent.indexOf("TESTMERGE") > 0); + Assert.assertTrue(fileContent.indexOf("COSER_SPECIES2") > 0); + Assert.assertTrue(fileContent.indexOf("COSER_SPECIES3") > 0); + + // clean all htmlExport.delete(); } } 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 2010-12-15 15:01:13 UTC (rev 416) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-12-15 15:35:37 UTC (rev 417) @@ -1045,7 +1045,7 @@ File htmlFile = null; try { - htmlFile = publicationService.extractLogAsHTML(project, project.getControl()); + htmlFile = publicationService.extractControlLogAsHTML(project, project.getControl()); browseFile(controlView, htmlFile); } catch (CoserBusinessException ex) { throw new CoserException("Can't generate html report", ex); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2010-12-15 15:01:13 UTC (rev 416) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2010-12-15 15:35:37 UTC (rev 417) @@ -60,7 +60,7 @@ onActionPerformed="getHandler().displayLengthStructureGraph(this)"/> <JToolBar.Separator /> <JButton icon="report.png" onActionPerformed="getHandler().displayLogReport(this)" - text="coser.ui.control.logreport" /> + text="coser.ui.control.controlreport" /> <JToolBar.Separator /> <JButton icon="accept.png" onActionPerformed="getHandler().validControl(this)" text="coser.ui.control.validcontrol" toolTipText="coser.ui.control.validcontroltip" Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-12-15 15:01:13 UTC (rev 416) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-12-15 15:35:37 UTC (rev 417) @@ -59,7 +59,7 @@ <JButton id="saveSelectionButton" text="coser.ui.selection.details.saveSelection" icon="disk.png" onActionPerformed="getHandler().saveSelection(this)" /> <JButton icon="report.png" onActionPerformed="getHandler().displayLogReport(this)" - text="coser.ui.selection.logreport" /> + text="coser.ui.selection.selectionreport" /> <JToolBar.Separator /> <JButton icon="arrow_rotate_clockwise.png" onActionPerformed="getHandler().reloadControlData(this)" text="coser.ui.selection.reloadcontroldata" /> 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 2010-12-15 15:01:13 UTC (rev 416) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-12-15 15:35:37 UTC (rev 417) @@ -1180,7 +1180,7 @@ File htmlFile = null; try { - htmlFile = publicationService.extractLogAsHTML(project, selection); + htmlFile = publicationService.extractSelectionLogAsHTML(project, selection); browseFile(view, htmlFile); } catch (CoserBusinessException ex) { throw new CoserException("Can't generate html report", ex); 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 2010-12-15 15:01:13 UTC (rev 416) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-15 15:35:37 UTC (rev 417) @@ -28,6 +28,7 @@ coser.ui.control.controlSaved=Control saved. coser.ui.control.controlTitle=Control coser.ui.control.controlValidated=Control validated and saved. +coser.ui.control.controlreport=Control report coser.ui.control.dataMenuDeleteSelected=Deleted selected lines coser.ui.control.dataMenuLabel=Data menu coser.ui.control.dataMenuReplace=Replace in %s for selection @@ -39,7 +40,6 @@ coser.ui.control.globalErrorMenuGenerateHTML=Export as HTML coser.ui.control.globalErrorMenuSelectAll=Select all lines coser.ui.control.graph.species=Species \: -coser.ui.control.logreport=Modification report coser.ui.control.progressStep=Step %d/%d \: %s coser.ui.control.project.requiredauthor=Author field is required coser.ui.control.project.requiredcatchFile=Catch file is required @@ -184,7 +184,6 @@ coser.ui.selection.fusion.title=Merge coser.ui.selection.fusionError=Merge error coser.ui.selection.invalidFusionName=Selection fusion name not found in referential \! -coser.ui.selection.logreport=Modification report 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. coser.ui.selection.nonJustifiedOccurenceDensity=Filtered list selection doesn't match filter selection.\nYou must justify this selection with a comment. @@ -203,6 +202,7 @@ coser.ui.selection.selectionSaved=Selection saved. coser.ui.selection.selectionTitle=Selection coser.ui.selection.selectionValidated=Selection validated and saved. +coser.ui.selection.selectionreport=Selection report coser.ui.selection.sizeAllYearSpecies=L3 \: Species with size all year (%d/%d) coser.ui.selection.speciesMenuFusion=Merge coser.ui.selection.speciesMerged=Species merged. 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 2010-12-15 15:01:13 UTC (rev 416) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-15 15:35:37 UTC (rev 417) @@ -28,6 +28,7 @@ coser.ui.control.controlSaved=Contr\u00F4le sauv\u00E9. coser.ui.control.controlTitle=Contr\u00F4le coser.ui.control.controlValidated=Contr\u00F4le valid\u00E9 et sauv\u00E9. +coser.ui.control.controlreport=Rapport de contr\u00F4le coser.ui.control.dataMenuDeleteSelected=Supprimer les lignes s\u00E9lectionn\u00E9es coser.ui.control.dataMenuLabel=Menu des donn\u00E9es coser.ui.control.dataMenuReplace=Remplacer dans %s pour la s\u00E9lection @@ -39,7 +40,6 @@ coser.ui.control.globalErrorMenuGenerateHTML=Exporter en HTML coser.ui.control.globalErrorMenuSelectAll=S\u00E9lectionner toutes les lignes coser.ui.control.graph.species=Esp\u00E8ces \: -coser.ui.control.logreport=Rapport des modifications coser.ui.control.progressStep=\u00C9tape %d/%d \: %s coser.ui.control.project.requiredauthor=Le champ 'auteur' est requis coser.ui.control.project.requiredcatchFile=Le fichier 'capture' est requis @@ -184,7 +184,6 @@ coser.ui.selection.fusion.title=Fusion coser.ui.selection.fusionError=Erreur de fusion coser.ui.selection.invalidFusionName=Le nom de fusion choisit n'est pas pr\u00E9sent de le r\u00E9f\u00E9rentiel \! -coser.ui.selection.logreport=Rapport des modifications coser.ui.selection.maturitySpecies=L4 \: Esp\u00E8ces avec maturit\u00E9 (%d/%d) coser.ui.selection.nonJustifiedMaturity=La liste esp\u00E8ces avec maturit\u00E9 n'est pas enti\u00E8rement s\u00E9lectionn\u00E9e.\nVous devez justifier cette s\u00E9lection par un commentaire. coser.ui.selection.nonJustifiedOccurenceDensity=La s\u00E9lection de la liste filtr\u00E9e ne correspond pas \u00E0 la s\u00E9lection op\u00E9r\u00E9e par le filtre.\nVous devez justifier cette s\u00E9lection par un commentaire. @@ -203,6 +202,7 @@ coser.ui.selection.selectionSaved=S\u00E9lection sauv\u00E9e. coser.ui.selection.selectionTitle=S\u00E9lection coser.ui.selection.selectionValidated=S\u00E9lection valid\u00E9e et sauv\u00E9e. +coser.ui.selection.selectionreport=Rapport de la s\u00E9lection coser.ui.selection.sizeAllYearSpecies=L3 \: Esp\u00E8ces avec taille pour toutes les ann\u00E9es (%d/%d) coser.ui.selection.speciesMenuFusion=Fusion coser.ui.selection.speciesMerged=Esp\u00E8ces fusionn\u00E9es.

1 0

r416 - in trunk: coser-business/src/main/java/fr/ifremer/coser/services coser-ui/src/main/java/fr/ifremer/coser/ui/project coser-ui/src/main/java/fr/ifremer/coser/ui/selection coser-ui/src/main/java/fr/ifremer/coser/ui/util coser-ui/src/main/resources/i18n coser-ui/src/main/resources/icons
by chatellier＠users.labs.libre-entreprise.org 15 Dec '10

15 Dec '10

Author: chatellier Date: 2010-12-15 15:01:13 +0000 (Wed, 15 Dec 2010) New Revision: 416 Log: Ajout de la possibilit?\195?\169 de recharger les donn?\195?\169es dans une selection en cours Added: trunk/coser-ui/src/main/resources/icons/arrow_rotate_clockwise.png Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/CoserListSelectionModel.java 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-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-12-15 10:50:42 UTC (rev 415) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-12-15 15:01:13 UTC (rev 416) @@ -1456,6 +1456,23 @@ } /** + * Recharge les données de control et les copies dans la selection. + * + * Utilisé lors d'un rechargement utilisateur, ou lors de la mise à jour + * des années. + * + * @param project project + * @param selection selection to copy data to + * @return project + * @throws CoserBusinessException + */ + public Project loadControlDataToSelection(Project project, Selection selection) throws CoserBusinessException { + Project newProject = loadControlData(project); + copyControlDataToSelection(newProject, selection); + return newProject; + } + + /** * Get zones name in project with data in [{@code beginYear}-{@code endYear}]. * * This methods set {@link Selection#setSelectedYears(List)}, and use @@ -1476,8 +1493,7 @@ // la liste des nouvelles année est plus grande que la liste // actuelle des données de la selection // les données doivent être rechargée - project = loadControlData(project); - copyControlDataToSelection(project, selection); + project = loadControlDataToSelection(project, selection); } List<String> result = new ArrayList<String>(); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java 2010-12-15 10:50:42 UTC (rev 415) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java 2010-12-15 15:01:13 UTC (rev 416) @@ -277,9 +277,12 @@ parent.getHandler().showControlView(false); } } catch (Exception ex) { - throw new CoserException("Can't create project", ex); + // conserve le meme mesage que la cause + throw new CoserException(ex.getMessage(), ex); } - setDefaultCursor(projectView); + finally { + setDefaultCursor(projectView); + } } }; task.execute(); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-12-15 10:50:42 UTC (rev 415) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-12-15 15:01:13 UTC (rev 416) @@ -60,6 +60,9 @@ icon="disk.png" onActionPerformed="getHandler().saveSelection(this)" /> <JButton icon="report.png" onActionPerformed="getHandler().displayLogReport(this)" text="coser.ui.selection.logreport" /> + <JToolBar.Separator /> + <JButton icon="arrow_rotate_clockwise.png" onActionPerformed="getHandler().reloadControlData(this)" + text="coser.ui.selection.reloadcontroldata" /> </JToolBar> </cell> </row> 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 2010-12-15 10:50:42 UTC (rev 415) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-12-15 15:01:13 UTC (rev 416) @@ -182,7 +182,7 @@ detailView.getYearsListModel().setYears(selection.getAllYears()); // tout est selectionné par defaut ((CoserListSelectionModel)detailView.getYearsList().getSelectionModel()).setSelectedObjects(selection.getSelectedYears()); - + view.setCreationState(true); // disable tabs @@ -229,6 +229,50 @@ } /** + * Recharge les données de controle sur action utilsateur. + * + * Si confirmation: + * <ul> + * <li>recharge les données + * <li>reactive le bouton année + * <li>affiche l'accordeon année + * </ul> + * + * @param view view + */ + public void reloadControlData(SelectionDetailsView view) { + + int response = JOptionPane.showConfirmDialog(view, _("coser.ui.selection.detail.confirmcontrolreload"), + _("coser.ui.selection.selectionTitle"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); + + if (response == JOptionPane.YES_OPTION) { + Project project = view.getContextValue(Project.class); + Selection selection = view.getContextValue(Selection.class); + ProjectService projectService = view.getContextValue(ProjectService.class); + try { + projectService.loadControlDataToSelection(project, selection); + + JOptionPane.showMessageDialog(view, _("coser.ui.selection.detail.controldatareloaded"), + _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); + + // affiche les années + view.getValidDatesButton().setEnabled(true); + view.getDetailAccordionPane().setSelected(1); + + // vide les autres listes + view.getStrataListModel().setStrata(new ArrayList<String>()); + view.getStrataList().clearSelection(); + view.getFilteredSpeciesListModel().setSpecies(new ArrayList<String>()); + view.getFilteredSpeciesList().clearSelection(); + view.getSelectedSpeciesListModel().setSpecies(new ArrayList<String>()); + view.getSelectedSpeciesList().clearSelection(); + } catch (CoserBusinessException ex) { + throw new CoserException("Can't reload control data", ex); + } + } + } + + /** * Rafraichit la liste des zones suite à la selection des années. * * @param view view @@ -573,8 +617,10 @@ } } catch (CoserBusinessException ex) { + if (log.isErrorEnabled()) { + log.error("Can't save selection", ex); + } JOptionPane.showMessageDialog(view, ex.getMessage(), _("coser.ui.selection.saveError"), JOptionPane.ERROR_MESSAGE); - throw new CoserException("Can't save selection", ex); } // enable tabs @@ -588,17 +634,22 @@ * @param view parent view */ public void saveSelection(SelectionListsView view) { - saveProjectSelection(view); - JOptionPane.showMessageDialog(view, _("coser.ui.selection.selectionSaved"), + boolean saved = saveProjectSelection(view); + if (saved) { + JOptionPane.showMessageDialog(view, _("coser.ui.selection.selectionSaved"), _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); + } } /** * Sauvegarde la sélection (partie listes de selection). * * @param view parent view + * @return {@code true} is slection has been saved */ - protected void saveProjectSelection(SelectionListsView view) { + protected boolean saveProjectSelection(SelectionListsView view) { + boolean saved = false; + Project project = view.getContextValue(Project.class); Selection selection = view.getContextValue(Selection.class); ProjectService service = view.getContextValue(ProjectService.class); @@ -608,14 +659,18 @@ try { service.saveProjectSelection(project, selection); + saved = true; } catch (CoserBusinessException ex) { + if (log.isErrorEnabled()) { + log.error("Can't save selection", ex); + } JOptionPane.showMessageDialog(view, ex.getMessage(), _("coser.ui.selection.saveError"), JOptionPane.ERROR_MESSAGE); - throw new CoserException("Can't save selection", ex); } // enable tabs selectionView.setEnabledAt(2, selection.isValidated()); // selection lists + return saved; } /** @@ -665,10 +720,11 @@ boolean canBeValidated = checkSelectionListComments(view, selection); if (canBeValidated) { selection.setValidated(true); - saveProjectSelection(view); - - JOptionPane.showMessageDialog(view, _("coser.ui.selection.selectionValidated"), + boolean saved = saveProjectSelection(view); + if (saved) { + JOptionPane.showMessageDialog(view, _("coser.ui.selection.selectionValidated"), _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); + } } } @@ -834,7 +890,7 @@ updateSelectionSpecies(parent); // supprime la selection apres fusion (demande utilisateur) - parent.getFilteredSpeciesList().clearSelection(); + parent.getFilteredSpeciesListSelectionModel().clearSelection(); view.dispose(); JOptionPane.showMessageDialog(view, _("coser.ui.selection.speciesMerged"), _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/CoserListSelectionModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/CoserListSelectionModel.java 2010-12-15 10:50:42 UTC (rev 415) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/CoserListSelectionModel.java 2010-12-15 15:01:13 UTC (rev 416) @@ -45,7 +45,7 @@ * des données reste la même au niveau des objets (sinon, les indices * ne correspondent pas au données précédent le changement. * - * ATTENTION : {@link #selectedObjects} ne refelte pas la selection + * ATTENTION : {@link #selectedObjects} ne reflete pas la selection * de la liste. Certains de ces élements peuvent être mémorisé selectionné, * mais non présente dans le modele de la liste, donc hors selection. * @@ -170,6 +170,8 @@ @Override public void clearSelection() { super.clearSelection(); - registerSelection(0, coserListModel.getSize() - 1); + //ne peut pas retirer des elements qui ne sont plus dans le model... + //registerSelection(0, coserListModel.getSize() - 1); + selectedObjects.clear(); } } 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 2010-12-15 10:50:42 UTC (rev 415) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-15 15:01:13 UTC (rev 416) @@ -12,7 +12,6 @@ coser.config.support.email.description=Support email address coser.config.website.description=Coser website coser.ui.common.cancel=Cancel -coser.ui.common.comment=Comment coser.ui.common.selectAll=Select all coser.ui.common.selectAll.short=All coser.ui.common.selectFile=Select\u2026 @@ -150,6 +149,8 @@ coser.ui.selection.allSpecies=L1 \: All species (%d/%d) coser.ui.selection.comment=Comment \: coser.ui.selection.createError=Creation error +coser.ui.selection.detail.confirmcontrolreload=Are you sure you want to reload control data ?\nAll modifications done on current selection will be lost. +coser.ui.selection.detail.controldatareloaded=Control data reloaded. coser.ui.selection.detail.mainAccordion=Details coser.ui.selection.detail.speciesAccordion=Species coser.ui.selection.detail.strataAccordion=Strata @@ -191,6 +192,7 @@ coser.ui.selection.nonJustifiedTitle=Unjustified selection coser.ui.selection.occurrenceDensitySpecies=L2 \: Filtered species (%d/%d) coser.ui.selection.occurrencedensityrenderer=<html>%s<span style\='font-size\:85%%;color\:gray;'>(Occ\=%.2f, Dens\=%.2f)</span></html> +coser.ui.selection.reloadcontroldata=Reload control data coser.ui.selection.replayerror=Replay error coser.ui.selection.rsufidataextracted=RSufi data extracted. coser.ui.selection.saveError=Save error 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 2010-12-15 10:50:42 UTC (rev 415) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-15 15:01:13 UTC (rev 416) @@ -12,7 +12,6 @@ coser.config.support.email.description=Adresse de support pour l'envoi des erreurs coser.config.website.description=Site internet de Coser coser.ui.common.cancel=Annuler -coser.ui.common.comment=Commentaire coser.ui.common.selectAll=S\u00E9lectionner tout coser.ui.common.selectAll.short=Tout coser.ui.common.selectFile=S\u00E9lectionner\u2026 @@ -150,6 +149,8 @@ coser.ui.selection.allSpecies=L1 \: Toutes les esp\u00E8ces (%d/%d) coser.ui.selection.comment=Commentaire \: coser.ui.selection.createError=Erreur de cr\u00E9action +coser.ui.selection.detail.confirmcontrolreload=\u00CAtes vous s\u00FBr de vouloir recharger les donn\u00E9es de contr\u00F4le ?\nToutes les modifications de la s\u00E9lection en cours seront perdues. +coser.ui.selection.detail.controldatareloaded=Donn\u00E9es de contr\u00F4le recharg\u00E9es. coser.ui.selection.detail.mainAccordion=D\u00E9tails coser.ui.selection.detail.speciesAccordion=Esp\u00E8ces coser.ui.selection.detail.strataAccordion=Strates @@ -191,6 +192,7 @@ coser.ui.selection.nonJustifiedTitle=S\u00E9lection non justifi\u00E9e coser.ui.selection.occurrenceDensitySpecies=L2 \: Esp\u00E8ces filtr\u00E9es (%d/%d) coser.ui.selection.occurrencedensityrenderer=<html>%s<span style\='font-size\:85%%;color\:gray;'>(Occ\=%.2f, Dens\=%.2f)</span></html> +coser.ui.selection.reloadcontroldata=Recharger les donn\u00E9es de contr\u00F4le coser.ui.selection.replayerror=Erreur de reapplication coser.ui.selection.rsufidataextracted=Donn\u00E9es RSufi extraites. coser.ui.selection.saveError=Erreur de sauvegarde Added: trunk/coser-ui/src/main/resources/icons/arrow_rotate_clockwise.png =================================================================== (Binary files differ) Property changes on: trunk/coser-ui/src/main/resources/icons/arrow_rotate_clockwise.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r415 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by chatellier＠users.labs.libre-entreprise.org 15 Dec '10

15 Dec '10

Author: chatellier Date: 2010-12-15 10:50:42 +0000 (Wed, 15 Dec 2010) New Revision: 415 Log: Remove JXtextArea Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesFusionDialog.jaxx 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 2010-12-15 10:49:18 UTC (rev 414) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesFusionDialog.jaxx 2010-12-15 10:50:42 UTC (rev 415) @@ -44,7 +44,7 @@ </cell> <cell weightx="2" weighty="1" fill="both" columns="3"> <JScrollPane> - <JXTextArea id="commentField" constructorParams='_("coser.ui.common.comment")' rows="3" /> + <JTextArea id="commentField" rows="3" /> </JScrollPane> </cell> </row>

1 0

r414 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by chatellier＠users.labs.libre-entreprise.org 15 Dec '10

15 Dec '10

Author: chatellier Date: 2010-12-15 10:49:18 +0000 (Wed, 15 Dec 2010) New Revision: 414 Log: Clear selection after merge 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 2010-12-15 10:48:51 UTC (rev 413) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-12-15 10:49:18 UTC (rev 414) @@ -833,7 +833,7 @@ } updateSelectionSpecies(parent); - // supprime la selection apres fusion (demande client) + // supprime la selection apres fusion (demande utilisateur) parent.getFilteredSpeciesList().clearSelection(); view.dispose(); JOptionPane.showMessageDialog(view, _("coser.ui.selection.speciesMerged"),

1 0