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

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

09 Dec '10

Author: chatellier Date: 2010-12-09 14:30:24 +0000 (Thu, 09 Dec 2010) New Revision: 383 Log: Fix graph frames Modified: 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-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphFrame.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.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/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-12-09 14:06:27 UTC (rev 382) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-12-09 14:30:24 UTC (rev 383) @@ -67,7 +67,7 @@ coser.business.control.step.xworks=Line checks \: %s (%d%%) coser.business.line=Line coser.business.matrix.density=Density -coser.business.matrix.lengthstructure=Length structure +coser.business.matrix.lengthstructure=Length structures coser.business.matrix.occurrence=Occurrence coser.business.matrix.samplingeffort=Sampling effort coser.business.publication.errorexportlines=Lines 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-09 14:06:27 UTC (rev 382) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-12-09 14:30:24 UTC (rev 383) @@ -67,7 +67,7 @@ coser.business.control.step.xworks=Validation par lignes \: %s (%d%%) coser.business.line=Ligne coser.business.matrix.density=Densit\u00E9 -coser.business.matrix.lengthstructure=Structure en taille +coser.business.matrix.lengthstructure=Structures en taille coser.business.matrix.occurrence=Occurrence coser.business.matrix.samplingeffort=Effort d'\u00E9chantillonnage coser.business.publication.errorexportlines=Lignes Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphFrame.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphFrame.jaxx 2010-12-09 14:06:27 UTC (rev 382) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphFrame.jaxx 2010-12-09 14:30:24 UTC (rev 383) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JFrame title="coser.ui.control.graphtitle"> +<JFrame title="coser.ui.graph.compareNumberCatchSize" name="catchLengthCompareFrame"> <ControlHandler id="handler" javaBean="null" /> 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-09 14:06:27 UTC (rev 382) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-12-09 14:30:24 UTC (rev 383) @@ -26,8 +26,6 @@ import static org.nuiton.i18n.I18n._; import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Desktop; import java.awt.GridBagConstraints; import java.awt.Insets; import java.awt.Point; @@ -37,7 +35,6 @@ import java.awt.event.MouseEvent; import java.beans.Introspector; import java.io.File; -import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -77,6 +74,7 @@ import org.nuiton.math.matrix.viewer.MatrixViewerPanel; import org.nuiton.math.matrix.viewer.renderer.MatrixChartRenderer; import org.nuiton.math.matrix.viewer.renderer.MatrixInfoTableRenderer; +import org.nuiton.widget.SwingSession; import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserConstants.Category; @@ -836,20 +834,24 @@ final Project project = view.getContextValue(Project.class); final PublicationService publicationService = view.getContextValue(PublicationService.class); + final SwingSession session = view.getContextValue(SwingSession.class); SwingUtilities.invokeLater(new Runnable() { public void run() { try { setWaitCursor(view); + + // get matrix Map<String, JFreeChart> charts = publicationService.getCompareCatchLengthGraph(project, project.getControl(), null); List<String> species = new ArrayList<String>(charts.keySet()); - + ControlGraphFrame frame = new ControlGraphFrame(view); frame.setHandler(ControlHandler.this); frame.setContextValue(charts); frame.getSpecyComboModel().setSpecy(species); frame.pack(); frame.setLocationRelativeTo(view); + session.add(frame); // session restore frame.setVisible(true); } finally { @@ -868,6 +870,7 @@ public void displayLengthStructureGraph(final ControlView view) { final Project project = view.getContextValue(Project.class); final ProjectService projectService = view.getContextValue(ProjectService.class); + final SwingSession session = view.getContextValue(SwingSession.class); SwingUtilities.invokeLater(new Runnable() { public void run() { @@ -878,7 +881,8 @@ MatrixND matrix = projectService.getLengthStructure(project, project.getControl()); // display matrix viewer component - JFrame matrixViewerFrame = new JFrame(_("coser.ui.control.graph.lengthstructure")); + JFrame matrixViewerFrame = new JFrame(_("coser.ui.graph.lengthStructure")); + matrixViewerFrame.setName("lengthstructureframe"); MatrixViewerPanel panel = new MatrixViewerPanel(); panel.addMatrixRenderer(new MatrixInfoTableRenderer()); panel.addMatrixRenderer(new MatrixChartRenderer()); @@ -886,6 +890,7 @@ matrixViewerFrame.add(panel); matrixViewerFrame.pack(); matrixViewerFrame.setLocationRelativeTo(view); + session.add(matrixViewerFrame); // session restore matrixViewerFrame.setVisible(true); } finally { 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-09 14:06:27 UTC (rev 382) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-09 14:30:24 UTC (rev 383) @@ -39,9 +39,7 @@ coser.ui.control.globalErrorMenuGenerateHTML=Export as HTML coser.ui.control.globalErrorMenuLabel=Error menu coser.ui.control.globalErrorMenuSelectAll=Select all lines -coser.ui.control.graph.lengthstructure= coser.ui.control.graph.species=Species \: -coser.ui.control.graphtitle=Graph coser.ui.control.logreport=Modification report coser.ui.control.progressStep=Step %d/%d \: %s coser.ui.control.project.requiredauthor=Author field is required 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-09 14:06:27 UTC (rev 382) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-09 14:30:24 UTC (rev 383) @@ -39,9 +39,7 @@ coser.ui.control.globalErrorMenuGenerateHTML=Exporter en HTML coser.ui.control.globalErrorMenuLabel=Menu des erreurs coser.ui.control.globalErrorMenuSelectAll=S\u00E9lectionner toutes les lignes -coser.ui.control.graph.lengthstructure= coser.ui.control.graph.species=Esp\u00E8ces \: -coser.ui.control.graphtitle=Graphique 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

1 0

r382 - in trunk/coser-ui/src/main/java/fr/ifremer/coser/ui: . common control selection
by chatellier＠users.labs.libre-entreprise.org 09 Dec '10

09 Dec '10

Author: chatellier Date: 2010-12-09 14:06:27 +0000 (Thu, 09 Dec 2010) New Revision: 382 Log: Extract common method to inherited handler. Add length structure matrix display with matrix viewer. Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/ 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/LengthStructureMatrixDataset.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/control/ControlHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java Added: 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 (rev 0) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java 2010-12-09 14:06:27 UTC (rev 382) @@ -0,0 +1,88 @@ +/* + * #%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.ui.common; + +import static org.nuiton.i18n.I18n._; + +import java.awt.Component; +import java.awt.Cursor; +import java.awt.Desktop; +import java.io.File; +import java.io.IOException; + +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. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class CommonHandler { + + private static final Log log = LogFactory.getLog(ControlHandler.class); + + /** + * Install le curseur sablier. + * + * @param comp component to set cursor + */ + public void setWaitCursor(Component comp) { + comp.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); + } + + /** + * Repositionne le curseur a sa valeur par defaut. + * + * @param comp component to set cursor + */ + public void setDefaultCursor(Component comp) { + comp.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); + } + + /** + * Ouvre un fichier dans le navigateur systeme. + * + * @param parentComponent parent component + * @param report report to open + */ + protected void browseFile(Component parentComponent, File report) { + try { + Desktop.getDesktop().browse(report.toURI()); + } catch (IOException ex) { + JOptionPane.showMessageDialog(parentComponent, _("coser.ui.error.htmlReportCantBeOpened", report.getAbsolutePath()), + _("coser.ui.error.htmlReportError"), JOptionPane.WARNING_MESSAGE); + } + } +} Property changes on: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: 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 (rev 0) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java 2010-12-09 14:06:27 UTC (rev 382) @@ -0,0 +1,46 @@ +/* + * #%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.ui.common; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import fr.ifremer.coser.ui.control.ControlHandler; + +/** + * Data application handler. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class DataHandler extends CommonHandler { + + private static final Log log = LogFactory.getLog(ControlHandler.class); + +} Property changes on: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixDataset.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixDataset.java (rev 0) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixDataset.java 2010-12-09 14:06:27 UTC (rev 382) @@ -0,0 +1,66 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 Ifremer, CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ + +package fr.ifremer.coser.ui.common; + +import java.util.List; + +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.viewer.renderer.jfreechart.GraphMatrixNDDataset; + +/** + * LengthStructureMatrixDataset + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class LengthStructureMatrixDataset extends GraphMatrixNDDataset { + + /** serialVersionUID. */ + private static final long serialVersionUID = 6859245574029509304L; + + protected List<Double> categoryKeys; + + public LengthStructureMatrixDataset(MatrixND mat) { + this(mat.getSemantic(1), mat.getSemantic(0), mat); + } + + public LengthStructureMatrixDataset(List<?> seriesNames, List<?> categories, MatrixND mat) { + super(seriesNames, categories, mat); + } + + /*@Override + public Number getValue(int row, int column) { + Number number = super.getValue(row, column); + if (number.doubleValue() < 0.1) { + number = null; + } + return number; + }*/ + +} // GraphMatrixNDDataset Property changes on: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixDataset.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: 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 (rev 0) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixRenderer.java 2010-12-09 14:06:27 UTC (rev 382) @@ -0,0 +1,51 @@ +/* + * #%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.ui.common; + +import org.jfree.data.category.CategoryDataset; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.viewer.renderer.MatrixChartRenderer; + +/** + * JFreeChart matrix panel renderer. + * + * Only redefine {@link #getCategoryDataset(MatrixND)} because in coser, we need to + * generate graph with missing value. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class LengthStructureMatrixRenderer extends MatrixChartRenderer { + + @Override + protected CategoryDataset getCategoryDataset(MatrixND matrix) { + return new LengthStructureMatrixDataset(matrix); + } + +} Property changes on: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixRenderer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL 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-09 14:05:20 UTC (rev 381) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-12-09 14:06:27 UTC (rev 382) @@ -27,7 +27,6 @@ import java.awt.BorderLayout; import java.awt.Component; -import java.awt.Cursor; import java.awt.Desktop; import java.awt.GridBagConstraints; import java.awt.Insets; @@ -94,6 +93,7 @@ import fr.ifremer.coser.services.ControlService; import fr.ifremer.coser.services.ProjectService; import fr.ifremer.coser.services.PublicationService; +import fr.ifremer.coser.ui.common.DataHandler; import fr.ifremer.coser.ui.util.CoserProgressBar; /** @@ -105,29 +105,11 @@ * Last update : $Date$ * By : $Author$ */ -public class ControlHandler { +public class ControlHandler extends DataHandler { private static final Log log = LogFactory.getLog(ControlHandler.class); /** - * Install le curseur sablier. - * - * @param comp component to set cursor - */ - public void setWaitCursor(Component comp) { - comp.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); - } - - /** - * Repositionne le curseur a sa valeur par defaut. - * - * @param comp component to set cursor - */ - public void setDefaultCursor(Component comp) { - comp.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); - } - - /** * Return l'intance de la table qui est selectionnée. * * Les 4 table sont dupliquées juste pour concerver l'etat des colonnes. @@ -665,28 +647,13 @@ File htmlFile = null; try { htmlFile = publicationService.exportErrorsAsHTML(project, project.getControl(), controlErrors); - displayReport(controlView, htmlFile); + browseFile(controlView, htmlFile); } catch (CoserBusinessException ex) { throw new CoserException("Can't generate html report", ex); } } /** - * Ouvre un fichier html dans le navigateur systeme. - * - * @param component component - * @param report report to open - */ - protected void displayReport(Component component, File report) { - try { - Desktop.getDesktop().browse(report.toURI()); - } catch (IOException ex) { - JOptionPane.showMessageDialog(component, _("coser.ui.error.htmlReportCantBeOpened", report.getAbsolutePath()), - _("coser.ui.error.htmlReportError"), JOptionPane.WARNING_MESSAGE); - } - } - - /** * Contruit le panel d'edition du bean. * * Vide le panel si line est {@code null}. @@ -1071,7 +1038,7 @@ File htmlFile = null; try { htmlFile = publicationService.extractLogAsHTML(project, project.getControl()); - displayReport(controlView, htmlFile); + 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/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-12-09 14:05:20 UTC (rev 381) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-12-09 14:06:27 UTC (rev 382) @@ -26,14 +26,12 @@ import static org.nuiton.i18n.I18n._; import java.awt.Component; -import java.awt.Desktop; import java.awt.GridBagConstraints; import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseEvent; import java.io.File; -import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -69,7 +67,7 @@ import fr.ifremer.coser.bean.Selection; import fr.ifremer.coser.services.ProjectService; import fr.ifremer.coser.services.PublicationService; -import fr.ifremer.coser.ui.control.ControlView; +import fr.ifremer.coser.ui.common.DataHandler; import fr.ifremer.coser.ui.result.SelectionAddResultDialog; import fr.ifremer.coser.ui.selection.model.OccurrenceDensitySpecyListModel; import fr.ifremer.coser.ui.util.CoserListSelectionModel; @@ -83,7 +81,7 @@ * Last update : $Date$ * By : $Author$ */ -public class SelectionHandler { +public class SelectionHandler extends DataHandler { private static final Log log = LogFactory.getLog(SelectionHandler.class); @@ -1006,24 +1004,9 @@ File htmlFile = null; try { htmlFile = publicationService.extractLogAsHTML(project, selection); - displayReport(view, htmlFile); + browseFile(view, htmlFile); } catch (CoserBusinessException ex) { throw new CoserException("Can't generate html report", ex); } } - - /** - * Ouvre un fichier html dans le navigateur systeme. - * - * @param view view - * @param report report to open - */ - protected void displayReport(Component component, File report) { - try { - Desktop.getDesktop().browse(report.toURI()); - } catch (IOException ex) { - JOptionPane.showMessageDialog(component, _("coser.ui.error.htmlReportCantBeOpened", report.getAbsolutePath()), - _("coser.ui.error.htmlReportError"), JOptionPane.WARNING_MESSAGE); - } - } }

1 0

r381 - in trunk/coser-web/src/main: java/fr/ifremer/coser/web/actions webapp/WEB-INF/content
by chatellier＠users.labs.libre-entreprise.org 09 Dec '10

09 Dec '10

Author: chatellier Date: 2010-12-09 14:05:20 +0000 (Thu, 09 Dec 2010) New Revision: 381 Log: Begin directory listing Added: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectIndicatorAction.java Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/WelcomeUserAction.java trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result-success.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result.jsp Added: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java (rev 0) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java 2010-12-09 14:05:20 UTC (rev 381) @@ -0,0 +1,81 @@ +/* + * #%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.web.actions; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import org.nuiton.util.ArgumentsParserException; + +import com.opensymphony.xwork2.ActionSupport; + +import fr.ifremer.coser.web.CoserWebConfig; + +/** + * Action index, recupere la liste des resultats. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class IndexAction extends ActionSupport { + + /** serialVersionUID. */ + private static final long serialVersionUID = 1663244944108703571L; + + protected List<String> results; + + public List<String> getResults() { + return results; + } + + @Override + public String execute() { + + CoserWebConfig config = new CoserWebConfig(); + try { + config.parse(new String[]{}); + } catch (ArgumentsParserException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + File directory = config.getResultDirectory(); + File[] subDirectories = directory.listFiles(); + + results = new ArrayList<String>(); + for (File subDirectory : subDirectories) { + if (subDirectory.isDirectory()) { + results.add(subDirectory.getName()); + } + } + + return SUCCESS; + } +} Property changes on: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectIndicatorAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectIndicatorAction.java (rev 0) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectIndicatorAction.java 2010-12-09 14:05:20 UTC (rev 381) @@ -0,0 +1,90 @@ +/* + * #%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.web.actions; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import org.nuiton.util.ArgumentsParserException; + +import com.opensymphony.xwork2.ActionSupport; + +import fr.ifremer.coser.web.CoserWebConfig; + +/** + * Action index, recupere la liste des resultats. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class SelectIndicatorAction extends ActionSupport { + + /** serialVersionUID. */ + private static final long serialVersionUID = 1663244944108703571L; + + protected String result; + + protected List<String> indicatorNames; + + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + + public List<String> getIndicatorNames() { + return indicatorNames; + } + + public void setIndicatorNames(List<String> indicatorNames) { + this.indicatorNames = indicatorNames; + } + + @Override + public String execute() { + + CoserWebConfig config = new CoserWebConfig(); + try { + config.parse(new String[]{}); + } catch (ArgumentsParserException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + File directory = config.getResultDirectory(); + File resultDirectory = new File(directory, result); + + + + return SUCCESS; + } +} Property changes on: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectIndicatorAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/WelcomeUserAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/WelcomeUserAction.java 2010-12-09 14:04:55 UTC (rev 380) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/WelcomeUserAction.java 2010-12-09 14:05:20 UTC (rev 381) @@ -26,9 +26,6 @@ package fr.ifremer.coser.web.actions; import org.apache.struts2.convention.annotation.Action; -import org.apache.struts2.convention.annotation.Namespace; -import org.apache.struts2.convention.annotation.Result; -import org.apache.struts2.convention.annotation.ResultPath; import com.opensymphony.xwork2.ActionSupport; Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp 2010-12-09 14:04:55 UTC (rev 380) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp 2010-12-09 14:05:20 UTC (rev 381) @@ -16,5 +16,9 @@ <s:textfield name="userName" label="User Name" /> <s:submit /> </s:form> + <hr /> + <s:form action="select-indicator"> + <s:select name="result" list="results" label="Result name"/> + </s:form> </body> </html> \ No newline at end of file Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result-success.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result-success.jsp 2010-12-09 14:04:55 UTC (rev 380) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result-success.jsp 2010-12-09 14:05:20 UTC (rev 381) @@ -7,6 +7,7 @@ <title>Hello World</title> </head> <body> + Success !!! <s:form action="upload-result" method="post" enctype="multipart/form-data"> <s:file name="resultFile" label="Result archive" /> <s:submit /> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result.jsp 2010-12-09 14:04:55 UTC (rev 380) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result.jsp 2010-12-09 14:05:20 UTC (rev 381) @@ -7,7 +7,8 @@ <title>Hello World</title> </head> <body> - Success !!! + <s:a action="index">Index</s:a> + <s:form action="upload-result" method="post" enctype="multipart/form-data"> <s:actionerror /> <s:file name="resultFile" label="Result archive" />

1 0

r380 - trunk/coser-web/src/main/webapp/WEB-INF
by chatellier＠users.labs.libre-entreprise.org 09 Dec '10

09 Dec '10

Author: chatellier Date: 2010-12-09 14:04:55 +0000 (Thu, 09 Dec 2010) New Revision: 380 Log: Working configuration Modified: trunk/coser-web/src/main/webapp/WEB-INF/web.xml Modified: trunk/coser-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/web.xml 2010-12-09 14:04:21 UTC (rev 379) +++ trunk/coser-web/src/main/webapp/WEB-INF/web.xml 2010-12-09 14:04:55 UTC (rev 380) @@ -36,15 +36,12 @@ <filter> <filter-name>struts2</filter-name> - <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class> + <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class> + actionPackages <init-param> - <param-name>struts.convention.action.packages</param-name> + <param-name>actionPackages</param-name> <param-value>fr.ifremer.coser.web</param-value> </init-param> -  <init-param> <param-name>struts.devMode</param-name> <param-value>true</param-value>

1 0

r379 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 09 Dec '10

09 Dec '10

Author: chatellier Date: 2010-12-09 14:04:21 +0000 (Thu, 09 Dec 2010) New Revision: 379 Log: Generate zero filled intermediate value in matrix 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 2010-12-08 16:55:58 UTC (rev 378) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-12-09 14:04:21 UTC (rev 379) @@ -2215,11 +2215,13 @@ // map lengthstep, species , strata , year > count Map<Double, Map<String, Map<String, Map<String, Double>>>> countForLengthSpeciesStrataYear = new HashMap<Double, Map<String, Map<String, Map<String, Double>>>>(); - Set<Double> lengthSet = new HashSet<Double>(); Set<String> speciesSet = new HashSet<String>(); Set<String> strataSet = new HashSet<String>(); Set<String> yearsSet = new HashSet<String>(); - + double minLength = Double.MAX_VALUE; + double maxLength = Double.MIN_VALUE; + boolean halfStep = false; + Iterator<String[]> itData = dataContainer.getLength().iterator(); itData.next(); // skip header while (itData.hasNext()) { @@ -2232,6 +2234,13 @@ String numberAsString = tuple[Length.INDEX_NUMBER]; String strata = haulAndStratas.get(haul); + if (strata == null) { + if (log.isWarnEnabled()) { + log.warn("No strata for haul " + haul); + } + continue; + } + // remember for matrix spemantics speciesSet.add(species); strataSet.add(strata); @@ -2241,8 +2250,30 @@ // plain or half centimeters try { double length = Double.parseDouble(lengthAsString); - lengthSet.add(length); + // get length step to use + double ceil = Math.ceil(length); + double floor = Math.floor(length); + double round = Math.round(length); + + // on prend le pas ou demi pas le plus proche + if (ceil == round) { + length = floor + 0.5; + } + else { + length = floor; + } + + if (length < minLength) { + minLength = length; + } + if (length > maxLength) { + maxLength = length; + } + if (length - Math.floor(length) != 0.0) { + halfStep = true; + } + try { double number = Double.parseDouble(numberAsString); @@ -2287,6 +2318,11 @@ } } + Set<Double> lengthSet = new HashSet<Double>(); + for (double length = minLength ; length <= maxLength ; length += (halfStep) ? 0.5 : 1) { + lengthSet.add(length); + } + // convert map to matrixND List<Double> lengthSem = new ArrayList<Double>(lengthSet); Collections.sort(lengthSem); @@ -2304,7 +2340,7 @@ matrix.setDimensionName(2, n_("coser.business.common.strata")); matrix.setDimensionName(3, n_("coser.business.common.years")); - for (Map.Entry<Double, Map<String, Map<String, Map<String, Double>>>> lengthTuple : countForLengthSpeciesStrataYear.entrySet()) { + /*for (Map.Entry<Double, Map<String, Map<String, Map<String, Double>>>> lengthTuple : countForLengthSpeciesStrataYear.entrySet()) { Double length = lengthTuple.getKey(); for (Map.Entry<String, Map<String, Map<String, Double>>> speciesTuple : lengthTuple.getValue().entrySet()) { String species = speciesTuple.getKey(); @@ -2316,6 +2352,31 @@ } } } + }*/ + + for (double length = minLength ; length <= maxLength ; length += (halfStep) ? 0.5 : 1) { + for (String species : speciesSem) { + for (String strata : strataSem) { + for (String year : yearsSem) { + + double value = 0.0; + Map<String, Map<String, Map<String, Double>>> lengthTuple = countForLengthSpeciesStrataYear.get(length); + if (lengthTuple != null) { + Map<String, Map<String, Double>> speciesTuple = lengthTuple.get(species); + if (speciesTuple != null) { + Map<String, Double> strataTuple = speciesTuple.get(strata); + if (strataTuple != null) { + Double number = strataTuple.get(year); + if (number != null) { + value = number; + } + } + } + } + matrix.setValue(new Object[]{length, species, strata, year}, value); + } + } + } } return matrix;

1 0

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

08 Dec '10

Author: chatellier Date: 2010-12-08 16:55:58 +0000 (Wed, 08 Dec 2010) New Revision: 378 Log: Add modification report in selection ui Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.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/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/control/ControlHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-12-08 16:55:37 UTC (rev 377) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-12-08 16:55:58 UTC (rev 378) @@ -46,6 +46,7 @@ import java.util.Set; import java.util.UUID; +import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenuItem; import javax.swing.JOptionPane; @@ -61,7 +62,6 @@ import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.event.TreeSelectionEvent; -import javax.swing.table.TableColumn; import javax.swing.tree.TreePath; import jaxx.runtime.JAXXUtil; @@ -74,6 +74,10 @@ import org.apache.commons.logging.LogFactory; import org.jfree.chart.ChartPanel; import org.jfree.chart.JFreeChart; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.viewer.MatrixViewerPanel; +import org.nuiton.math.matrix.viewer.renderer.MatrixChartRenderer; +import org.nuiton.math.matrix.viewer.renderer.MatrixInfoTableRenderer; import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserConstants.Category; @@ -670,15 +674,15 @@ /** * Ouvre un fichier html dans le navigateur systeme. * - * @param controlView view + * @param component component * @param report report to open */ - protected void displayReport(ControlView controlView, File report) { + protected void displayReport(Component component, File report) { try { Desktop.getDesktop().browse(report.toURI()); } catch (IOException ex) { - JOptionPane.showMessageDialog(controlView, _("coser.ui.control.htmlReportCantBeOpened", report.getAbsolutePath()), - _("coser.ui.control.htmlReportError"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(component, _("coser.ui.error.htmlReportCantBeOpened", report.getAbsolutePath()), + _("coser.ui.error.htmlReportError"), JOptionPane.WARNING_MESSAGE); } } @@ -894,8 +898,34 @@ * * @param view view */ - public void displayLengthStructureGraph(ControlView view) { - + public void displayLengthStructureGraph(final ControlView view) { + final Project project = view.getContextValue(Project.class); + final ProjectService projectService = view.getContextValue(ProjectService.class); + + SwingUtilities.invokeLater(new Runnable() { + public void run() { + try { + setWaitCursor(view); + + // get matrix + MatrixND matrix = projectService.getLengthStructure(project, project.getControl()); + + // display matrix viewer component + JFrame matrixViewerFrame = new JFrame(_("coser.ui.control.graph.lengthstructure")); + MatrixViewerPanel panel = new MatrixViewerPanel(); + panel.addMatrixRenderer(new MatrixInfoTableRenderer()); + panel.addMatrixRenderer(new MatrixChartRenderer()); + panel.addMatrix(matrix); + matrixViewerFrame.add(panel); + matrixViewerFrame.pack(); + matrixViewerFrame.setLocationRelativeTo(view); + matrixViewerFrame.setVisible(true); + } + finally { + setDefaultCursor(view); + } + } + }); } /** 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-08 16:55:37 UTC (rev 377) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-12-08 16:55:58 UTC (rev 378) @@ -58,6 +58,8 @@ <JToolBar floatable="false"> <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" /> </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-08 16:55:37 UTC (rev 377) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-12-08 16:55:58 UTC (rev 378) @@ -26,12 +26,14 @@ import static org.nuiton.i18n.I18n._; import java.awt.Component; +import java.awt.Desktop; import java.awt.GridBagConstraints; import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseEvent; import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -67,6 +69,7 @@ import fr.ifremer.coser.bean.Selection; import fr.ifremer.coser.services.ProjectService; import fr.ifremer.coser.services.PublicationService; +import fr.ifremer.coser.ui.control.ControlView; import fr.ifremer.coser.ui.result.SelectionAddResultDialog; import fr.ifremer.coser.ui.selection.model.OccurrenceDensitySpecyListModel; import fr.ifremer.coser.ui.util.CoserListSelectionModel; @@ -988,4 +991,39 @@ view.getOtherDataFileListModel().add(selectedFile); } } + + /** + * Genere le log des modifications faites lors du control en HTML + * et l'ouvre dans le navigateur systeme. + * + * @param view + */ + public void displayLogReport(SelectionDetailsView view) { + PublicationService publicationService = view.getContextValue(PublicationService.class); + Project project = view.getContextValue(Project.class); + Selection selection = view.getContextValue(Selection.class); + + File htmlFile = null; + try { + htmlFile = publicationService.extractLogAsHTML(project, selection); + displayReport(view, htmlFile); + } catch (CoserBusinessException ex) { + throw new CoserException("Can't generate html report", ex); + } + } + + /** + * Ouvre un fichier html dans le navigateur systeme. + * + * @param view view + * @param report report to open + */ + protected void displayReport(Component component, File report) { + try { + Desktop.getDesktop().browse(report.toURI()); + } catch (IOException ex) { + JOptionPane.showMessageDialog(component, _("coser.ui.error.htmlReportCantBeOpened", report.getAbsolutePath()), + _("coser.ui.error.htmlReportError"), JOptionPane.WARNING_MESSAGE); + } + } } 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-08 16:55:37 UTC (rev 377) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-08 16:55:58 UTC (rev 378) @@ -39,10 +39,9 @@ coser.ui.control.globalErrorMenuGenerateHTML=Export as HTML coser.ui.control.globalErrorMenuLabel=Error menu coser.ui.control.globalErrorMenuSelectAll=Select all lines +coser.ui.control.graph.lengthstructure= coser.ui.control.graph.species=Species \: coser.ui.control.graphtitle=Graph -coser.ui.control.htmlReportCantBeOpened=HTML report as been generated in \:\n%s\nbut it can't be opened because default system browser in undefined \! -coser.ui.control.htmlReportError=Open error coser.ui.control.logreport=Modification report coser.ui.control.progressStep=Step %d/%d \: %s coser.ui.control.project.requiredauthor=Author field is required @@ -59,6 +58,8 @@ coser.ui.control.save=Save coser.ui.control.validcontrol=Valid control coser.ui.control.validcontroltip=Mark control as validated. Can be done only after data check ended without errors. +coser.ui.error.htmlReportCantBeOpened=HTML report as been generated in \:\n%s\nbut it can't be opened because default system browser in undefined \! +coser.ui.error.htmlReportError=Open error coser.ui.error.htmlmessage=An error occurs \: %s coser.ui.error.reportSendTo=A repport has been sent to %s coser.ui.error.title=Global application error @@ -176,6 +177,7 @@ 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. 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-08 16:55:37 UTC (rev 377) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-08 16:55:58 UTC (rev 378) @@ -39,10 +39,9 @@ coser.ui.control.globalErrorMenuGenerateHTML=Exporter en HTML coser.ui.control.globalErrorMenuLabel=Menu des erreurs coser.ui.control.globalErrorMenuSelectAll=S\u00E9lectionner toutes les lignes +coser.ui.control.graph.lengthstructure= coser.ui.control.graph.species=Esp\u00E8ces \: coser.ui.control.graphtitle=Graphique -coser.ui.control.htmlReportCantBeOpened=Le rapport HTML a \u00E9t\u00E9 g\u00E9n\u00E9r\u00E9 dans le fichier \:\n%s\nmais ne peut pas \u00EAtre ouvert automatiquement car le navigateur\npar d\u00E9faut du syst\u00E8me n'est pas d\u00E9fini \! -coser.ui.control.htmlReportError=Erreur d'ouverture 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 @@ -59,6 +58,8 @@ coser.ui.control.save=Sauvegarder coser.ui.control.validcontrol=Valider le contr\u00F4le coser.ui.control.validcontroltip=Marque le contr\u00F4le comme valid\u00E9. Ne peut \u00EAtre effectu\u00E9 qu'apr\u00E8s une v\u00E9rification des donn\u00E9es termin\u00E9e sans erreurs. +coser.ui.error.htmlReportCantBeOpened=Le rapport HTML a \u00E9t\u00E9 g\u00E9n\u00E9r\u00E9 dans le fichier \:\n%s\nmais ne peut pas \u00EAtre ouvert automatiquement car le navigateur\npar d\u00E9faut du syst\u00E8me n'est pas d\u00E9fini \! +coser.ui.error.htmlReportError=Erreur d'ouverture coser.ui.error.htmlmessage=Une erreur s'est produite \: %s coser.ui.error.reportSendTo=Un rapport a \u00E9t\u00E9 envoy\u00E9 \u00E0 %s coser.ui.error.title=Erreur globale @@ -176,6 +177,7 @@ 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.

1 0

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

08 Dec '10

Author: chatellier Date: 2010-12-08 16:55:37 +0000 (Wed, 08 Dec 2010) New Revision: 377 Log: Use nuiton-matrix multimodules 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-08 16:03:36 UTC (rev 376) +++ trunk/coser-business/pom.xml 2010-12-08 16:55:37 UTC (rev 377) @@ -23,7 +23,7 @@ <artifactId>nuiton-i18n</artifactId> </dependency> <dependency> - <groupId>org.nuiton</groupId> + <groupId>org.nuiton.nuiton-matrix</groupId> <artifactId>nuiton-matrix</artifactId> </dependency> <dependency> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2010-12-08 16:03:36 UTC (rev 376) +++ trunk/coser-ui/pom.xml 2010-12-08 16:55:37 UTC (rev 377) @@ -38,10 +38,14 @@ <artifactId>nuiton-i18n</artifactId> </dependency> <dependency> - <groupId>org.nuiton</groupId> + <groupId>org.nuiton.nuiton-matrix</groupId> <artifactId>nuiton-matrix</artifactId> </dependency> <dependency> + <groupId>org.nuiton.nuiton-matrix</groupId> + <artifactId>nuiton-matrix-gui</artifactId> + </dependency> + <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-08 16:03:36 UTC (rev 376) +++ trunk/pom.xml 2010-12-08 16:55:37 UTC (rev 377) @@ -94,11 +94,18 @@ </dependency> <dependency> - <groupId>org.nuiton</groupId> + <groupId>org.nuiton.nuiton-matrix</groupId> <artifactId>nuiton-matrix</artifactId> <version>2.1-SNAPSHOT</version> <scope>compile</scope> </dependency> + + <dependency> + <groupId>org.nuiton.nuiton-matrix</groupId> + <artifactId>nuiton-matrix-gui</artifactId> + <version>2.1-SNAPSHOT</version> + <scope>compile</scope> + </dependency> <dependency> <groupId>org.nuiton.i18n</groupId>

1 0

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

08 Dec '10

Author: chatellier Date: 2010-12-08 16:03:36 +0000 (Wed, 08 Dec 2010) New Revision: 376 Log: Add/rename matrix name and dimensions Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.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/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-12-08 10:24:17 UTC (rev 375) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-12-08 16:03:36 UTC (rev 376) @@ -26,6 +26,7 @@ package fr.ifremer.coser.services; import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; import java.beans.Introspector; import java.io.BufferedOutputStream; @@ -1854,15 +1855,15 @@ Collections.sort(lineNames2); List<String> columnsNames2 = new ArrayList<String>(columns); Collections.sort(columnsNames2); - MatrixND matrix = MatrixFactory.getInstance().create("sampling effort", new List<?>[] { + MatrixND matrix = MatrixFactory.getInstance().create(n_("coser.business.matrix.samplingeffort"), new List<?>[] { lineNames2 , columnsNames2}); - + for (Map.Entry<String, Map<String, Double>> dynMatrixEntry : dynMatrix.entrySet()) { for (Map.Entry<String, Double> haulCountForYearEntry : dynMatrixEntry.getValue().entrySet()) { matrix.setValue(dynMatrixEntry.getKey(), haulCountForYearEntry.getKey(), haulCountForYearEntry.getValue()); } } - + return matrix; } @@ -1951,7 +1952,7 @@ Collections.sort(lineNames2); List<String> columnsNames2 = new ArrayList<String>(columns); Collections.sort(columnsNames2); - MatrixND matrix = MatrixFactory.getInstance().create("occurence", new List<?>[] { + MatrixND matrix = MatrixFactory.getInstance().create(n_("coser.business.matrix.occurrence"), new List<?>[] { lineNames2 , columnsNames2}); for (Map.Entry<String, Map<String, Set<String>>> dynMatrixEntry : dynMatrix.entrySet()) { @@ -2142,7 +2143,7 @@ Collections.sort(sortedSpecies); List<String> sortedYears = new ArrayList<String>(yearsList); Collections.sort(sortedYears); - MatrixND matrix = MatrixFactory.getInstance().create("density", new List<?>[] { + MatrixND matrix = MatrixFactory.getInstance().create(n_("coser.business.matrix.density"), new List<?>[] { sortedSpecies , sortedYears}); for (Map.Entry<String, Map<String, Map<String, Set<Double>>>> dynMatrixEntry : densityPerSpecyStrataYear.entrySet()) { @@ -2217,7 +2218,7 @@ Set<Double> lengthSet = new HashSet<Double>(); Set<String> speciesSet = new HashSet<String>(); Set<String> strataSet = new HashSet<String>(); - Set<String> yearSet = new HashSet<String>(); + Set<String> yearsSet = new HashSet<String>(); Iterator<String[]> itData = dataContainer.getLength().iterator(); itData.next(); // skip header @@ -2234,7 +2235,7 @@ // remember for matrix spemantics speciesSet.add(species); strataSet.add(strata); - yearSet.add(year); + yearsSet.add(year); // get correct length step // plain or half centimeters @@ -2288,12 +2289,20 @@ // convert map to matrixND List<Double> lengthSem = new ArrayList<Double>(lengthSet); + Collections.sort(lengthSem); List<String> speciesSem = new ArrayList<String>(speciesSet); + Collections.sort(speciesSem); List<String> strataSem = new ArrayList<String>(strataSet); - List<String> yearSem = new ArrayList<String>(yearSet); + Collections.sort(strataSem); + List<String> yearsSem = new ArrayList<String>(yearsSet); + Collections.sort(yearsSem); - MatrixND matrix = MatrixFactory.getInstance().create("density", new List<?>[] { - lengthSem , speciesSem, strataSem, yearSem}); + MatrixND matrix = MatrixFactory.getInstance().create(n_("coser.business.matrix.lengthstructure"), new List<?>[] { + lengthSem , speciesSem, strataSem, yearsSem}); + matrix.setDimensionName(0, n_("coser.business.common.length")); + matrix.setDimensionName(1, n_("coser.business.common.species")); + matrix.setDimensionName(2, n_("coser.business.common.strata")); + matrix.setDimensionName(3, n_("coser.business.common.years")); for (Map.Entry<Double, Map<String, Map<String, Map<String, Double>>>> lengthTuple : countForLengthSpeciesStrataYear.entrySet()) { Double length = lengthTuple.getKey(); 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-08 10:24:17 UTC (rev 375) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-12-08 16:03:36 UTC (rev 376) @@ -28,8 +28,12 @@ coser.business.command.deleteline.log=In file %s, line %s has been deleted coser.business.command.mergespecies.log=Species "%2$s" has been merged to "%1$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 coser.business.common.number=Number +coser.business.common.species=Species +coser.business.common.strata=Strata coser.business.common.year=Year +coser.business.common.years=Years coser.business.control.error.allCategories=All categories coser.business.control.error.diffCatchLength=Differences between length and catch coser.business.control.error.diffCatchLengthDetail=Differences between length and catch for species %s (year \: %s) @@ -62,6 +66,10 @@ coser.business.control.step.observation=Checking observation number \: %s (%d%%) coser.business.control.step.xworks=Line checks \: %s (%d%%) coser.business.line=Line +coser.business.matrix.density=Density +coser.business.matrix.lengthstructure=Length structure +coser.business.matrix.occurrence=Occurrence +coser.business.matrix.samplingeffort=Sampling effort coser.business.publication.errorexportlines=Lines coser.business.publication.errorexporttitle=Error report for project %s coser.business.publication.errorgraph=Graph 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-08 10:24:17 UTC (rev 375) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-12-08 16:03:36 UTC (rev 376) @@ -28,8 +28,12 @@ coser.business.command.deleteline.log=Dans le fichier %s, la ligne %s a \u00E9t\u00E9 supprim\u00E9e coser.business.command.mergespecies.log=Les esp\u00E8ces "%2$s" ont \u00E9t\u00E9 fusionn\u00E9es en "%1$s" coser.business.command.modifyfield.log=Dans le ficher %s \u00E0 la ligne %s, le champs "%s" est pass\u00E9 de la valeur "%s" \u00E0 "%s" +coser.business.common.length=Taille coser.business.common.number=Nombre +coser.business.common.species=Esp\u00E8ces +coser.business.common.strata=Strates coser.business.common.year=Ann\u00E9e +coser.business.common.years=Ann\u00E9es coser.business.control.error.allCategories=Toutes les cat\u00E9gories coser.business.control.error.diffCatchLength=Diff\u00E9rence entre les captures et taille coser.business.control.error.diffCatchLengthDetail=Diff\u00E9rence entre les captures et taille pour l'esp\u00E8ce %s (ann\u00E9e %s) @@ -62,6 +66,10 @@ coser.business.control.step.observation=V\u00E9rification du nombre d'observation \: %s (%d%%) coser.business.control.step.xworks=Validation par lignes \: %s (%d%%) coser.business.line=Ligne +coser.business.matrix.density=Densit\u00E9 +coser.business.matrix.lengthstructure=Structure en taille +coser.business.matrix.occurrence=Occurrence +coser.business.matrix.samplingeffort=Effort d'\u00E9chantillonnage coser.business.publication.errorexportlines=Lignes coser.business.publication.errorexporttitle=Rapport d'erreur pour le projet %s coser.business.publication.errorgraph=Graphique

1 0

r375 - trunk/coser-ui/src/main/jnlp
by chatellier＠users.labs.libre-entreprise.org 08 Dec '10

08 Dec '10

Author: chatellier Date: 2010-12-08 10:24:17 +0000 (Wed, 08 Dec 2010) New Revision: 375 Log: Reduce default memory. Modified: trunk/coser-ui/src/main/jnlp/coser-jnlp.vm Modified: trunk/coser-ui/src/main/jnlp/coser-jnlp.vm =================================================================== --- trunk/coser-ui/src/main/jnlp/coser-jnlp.vm 2010-12-07 13:15:53 UTC (rev 374) +++ trunk/coser-ui/src/main/jnlp/coser-jnlp.vm 2010-12-08 10:24:17 UTC (rev 375) @@ -18,7 +18,7 @@ </security> #end <resources> - <j2se version="$j2seVersion" java-vm-args="-Xmx1024M"/> + <j2se version="$j2seVersion" java-vm-args="-Xmx512M"/> $dependencies $extensions </resources>

1 0

r374 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 07 Dec '10

07 Dec '10

Author: chatellier Date: 2010-12-07 13:15:53 +0000 (Tue, 07 Dec 2010) New Revision: 374 Log: Switch signature to data container 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 2010-12-07 13:13:56 UTC (rev 373) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-12-07 13:15:53 UTC (rev 374) @@ -2195,14 +2195,14 @@ * sur tous les traits d'une année (ou tous les années si regroupé) * * @param project project - * @param selection data container + * @param dataContainer data container * @return matrix 4 dimension */ - public MatrixND getLengthStructure(Project project, Selection selection) { + public MatrixND getLengthStructure(Project project, AbstractDataContainer dataContainer) { // load map traitname > stratename Map<String, String> haulAndStratas = new HashMap<String, String>(); - Iterator<String[]> itHaul = selection.getHaul().iterator(); + Iterator<String[]> itHaul = dataContainer.getHaul().iterator(); itHaul.next(); // skip header while (itHaul.hasNext()) { String[] tuple = itHaul.next(); @@ -2219,9 +2219,8 @@ Set<String> strataSet = new HashSet<String>(); Set<String> yearSet = new HashSet<String>(); - Iterator<String[]> itData = selection.getLength().iterator(); + Iterator<String[]> itData = dataContainer.getLength().iterator(); itData.next(); // skip header - while (itData.hasNext()) { String[] tuple = itData.next();

1 0