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

r922 - trunk
by echatellier＠users.forge.codelutin.com 21 Dec '11

21 Dec '11

Author: echatellier Date: 2011-12-21 11:35:08 +0100 (Wed, 21 Dec 2011) New Revision: 922 Url: http://forge.codelutin.com/repositories/revision/coser/922 Log: Evolution #619: Update to struts 2.3.1 Evolution #621: Update to nuiton-utils 2.4.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-12 19:03:53 UTC (rev 921) +++ trunk/pom.xml 2011-12-21 10:35:08 UTC (rev 922) @@ -117,13 +117,13 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>2.4</version> + <version>2.4.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>2.4</version> + <version>2.4.1</version> <scope>compile</scope> </dependency> @@ -334,7 +334,7 @@  <jaxx.version>2.4.2</jaxx.version> <i18n.version>2.4.1</i18n.version> - <struts.version>2.2.3.1</struts.version> + <struts.version>2.3.1</struts.version> </properties> <scm>

1 0

r921 - in trunk: . coser-business coser-ui coser-web
by echatellier＠users.forge.codelutin.com 12 Dec '11

12 Dec '11

Author: echatellier Date: 2011-12-12 20:03:53 +0100 (Mon, 12 Dec 2011) New Revision: 921 Url: http://forge.codelutin.com/repositories/revision/coser/921 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2011-12-12 19:03:52 UTC (rev 920) +++ trunk/coser-business/pom.xml 2011-12-12 19:03:53 UTC (rev 921) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.1</version> + <version>1.1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2011-12-12 19:03:52 UTC (rev 920) +++ trunk/coser-ui/pom.xml 2011-12-12 19:03:53 UTC (rev 921) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.1</version> + <version>1.1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2011-12-12 19:03:52 UTC (rev 920) +++ trunk/coser-web/pom.xml 2011-12-12 19:03:53 UTC (rev 921) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.1</version> + <version>1.1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-12 19:03:52 UTC (rev 920) +++ trunk/pom.xml 2011-12-12 19:03:53 UTC (rev 921) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.1</version> + <version>1.1.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> @@ -338,9 +338,9 @@ </properties> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.1</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.1</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/coser/tags/coser-1.1</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/coser/trunk</url> </scm> <build>

1 0

r920 - tags
by echatellier＠users.forge.codelutin.com 12 Dec '11

12 Dec '11

Author: echatellier Date: 2011-12-12 20:03:52 +0100 (Mon, 12 Dec 2011) New Revision: 920 Url: http://forge.codelutin.com/repositories/revision/coser/920 Log: [maven-release-plugin] copy for tag coser-1.1 Added: tags/coser-1.1/

1 0

r919 - in trunk: . coser-business coser-ui coser-web
by echatellier＠users.forge.codelutin.com 12 Dec '11

12 Dec '11

Author: echatellier Date: 2011-12-12 20:03:50 +0100 (Mon, 12 Dec 2011) New Revision: 919 Url: http://forge.codelutin.com/repositories/revision/coser/919 Log: [maven-release-plugin] prepare release coser-1.1 Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2011-12-11 14:52:38 UTC (rev 918) +++ trunk/coser-business/pom.xml 2011-12-12 19:03:50 UTC (rev 919) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2011-12-11 14:52:38 UTC (rev 918) +++ trunk/coser-ui/pom.xml 2011-12-12 19:03:50 UTC (rev 919) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2011-12-11 14:52:38 UTC (rev 918) +++ trunk/coser-web/pom.xml 2011-12-12 19:03:50 UTC (rev 919) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-11 14:52:38 UTC (rev 918) +++ trunk/pom.xml 2011-12-12 19:03:50 UTC (rev 919) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> <packaging>pom</packaging> <modules> @@ -338,9 +338,9 @@ </properties> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/coser/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.1</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.1</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/coser/tags/coser-1.1</url> </scm> <build>

1 0

r918 - in trunk: coser-business/src/main/java/fr/ifremer/coser/control coser-business/src/main/resources/ftl coser-ui/src/license
by echatellier＠users.forge.codelutin.com 11 Dec '11

11 Dec '11

Author: echatellier Date: 2011-12-11 15:52:38 +0100 (Sun, 11 Dec 2011) New Revision: 918 Url: http://forge.codelutin.com/repositories/revision/coser/918 Log: Prepare release Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/control/ControlError.java trunk/coser-business/src/main/java/fr/ifremer/coser/control/ControlErrorGroup.java trunk/coser-business/src/main/java/fr/ifremer/coser/control/DiffCatchLengthControlError.java trunk/coser-business/src/main/resources/ftl/decharge.ftl trunk/coser-business/src/main/resources/ftl/map.ftl trunk/coser-business/src/main/resources/ftl/metainfo_en.ftl trunk/coser-business/src/main/resources/ftl/metainfo_fr.ftl trunk/coser-ui/src/license/THIRD-PARTY.properties Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/control/ControlError.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/control/ControlError.java 2011-12-11 14:31:20 UTC (rev 917) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/control/ControlError.java 2011-12-11 14:52:38 UTC (rev 918) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010,2011 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/control/ControlErrorGroup.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/control/ControlErrorGroup.java 2011-12-11 14:31:20 UTC (rev 917) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/control/ControlErrorGroup.java 2011-12-11 14:52:38 UTC (rev 918) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010,2011 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/control/DiffCatchLengthControlError.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/control/DiffCatchLengthControlError.java 2011-12-11 14:31:20 UTC (rev 917) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/control/DiffCatchLengthControlError.java 2011-12-11 14:52:38 UTC (rev 918) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010,2011 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Modified: trunk/coser-business/src/main/resources/ftl/decharge.ftl =================================================================== --- trunk/coser-business/src/main/resources/ftl/decharge.ftl 2011-12-11 14:31:20 UTC (rev 917) +++ trunk/coser-business/src/main/resources/ftl/decharge.ftl 2011-12-11 14:52:38 UTC (rev 918) @@ -1,3 +1,27 @@ +<#-- + #%L + Coser :: Business + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% +--> <html> <body> <h2>Réaction</h2> Modified: trunk/coser-business/src/main/resources/ftl/map.ftl =================================================================== --- trunk/coser-business/src/main/resources/ftl/map.ftl 2011-12-11 14:31:20 UTC (rev 917) +++ trunk/coser-business/src/main/resources/ftl/map.ftl 2011-12-11 14:52:38 UTC (rev 918) @@ -1,3 +1,27 @@ +<#-- + #%L + Coser :: Business + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% +--> <html> <body><p>L'objectif de cet atlas est de donner un aperçu de la distribution spatiale des espèces de poissons et de certains invertébrés marin à partir Modified: trunk/coser-business/src/main/resources/ftl/metainfo_en.ftl =================================================================== --- trunk/coser-business/src/main/resources/ftl/metainfo_en.ftl 2011-12-11 14:31:20 UTC (rev 917) +++ trunk/coser-business/src/main/resources/ftl/metainfo_en.ftl 2011-12-11 14:52:38 UTC (rev 918) @@ -1,3 +1,27 @@ +<#-- + #%L + Coser :: Business + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% +--> <html> <body> Modified: trunk/coser-business/src/main/resources/ftl/metainfo_fr.ftl =================================================================== --- trunk/coser-business/src/main/resources/ftl/metainfo_fr.ftl 2011-12-11 14:31:20 UTC (rev 917) +++ trunk/coser-business/src/main/resources/ftl/metainfo_fr.ftl 2011-12-11 14:52:38 UTC (rev 918) @@ -1,3 +1,27 @@ +<#-- + #%L + Coser :: Business + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% +--> <html> <body> Modified: trunk/coser-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/coser-ui/src/license/THIRD-PARTY.properties 2011-12-11 14:31:20 UTC (rev 917) +++ trunk/coser-ui/src/license/THIRD-PARTY.properties 2011-12-11 14:52:38 UTC (rev 918) @@ -26,11 +26,11 @@ # Please fill the missing licenses for dependencies : # # -#Thu Nov 17 12:28:13 CET 2011 +#Sun Dec 11 15:36:07 CET 2011 asm--asm--3.1=http\://asm.ow2.org/license.html asm--asm-commons--3.1=http\://asm.ow2.org/license.html asm--asm-tree--3.1=http\://asm.ow2.org/license.html -com.bbn--openmap--5.0.0-20111028=OpenMap Software License Agreement +com.bbn--openmap--5.0.0-20111210=OpenMap Software License Agreement commons-jxpath--commons-jxpath--1.3=Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0 javassist--javassist--3.8.0.GA=GNU Lesser General Public License

1 0

r917 - in trunk: . coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by echatellier＠users.forge.codelutin.com 11 Dec '11

11 Dec '11

Author: echatellier Date: 2011-12-11 15:31:20 +0100 (Sun, 11 Dec 2011) New Revision: 917 Url: http://forge.codelutin.com/repositories/revision/coser/917 Log: Fix selection lists update after species list modification 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/SelectionHandler.java trunk/pom.xml 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 2011-12-11 14:30:12 UTC (rev 916) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2011-12-11 14:31:20 UTC (rev 917) @@ -276,7 +276,7 @@ <row> <cell anchor="east" columns="4"> <JButton id="validSpeciesButton" text="coser.ui.selection.details.validSpecies" - onActionPerformed="getHandler().validSelectionSpeciesData(this);setSpeciesValidated(true);saveSelectionButton.setEnabled(true)" + onActionPerformed="getHandler().validSelectionSpeciesData(this);setSpeciesValidated(true);saveSelectionButton.setEnabled(getErrorsTableModel().getRowCount() == 0)" enabled="{isYearsValidated() && isStrataValidated() && !isSpeciesValidated()}"/> </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 2011-12-11 14:30:12 UTC (rev 916) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-12-11 14:31:20 UTC (rev 917) @@ -28,7 +28,6 @@ import java.awt.Component; import java.awt.GridBagConstraints; import java.awt.Insets; -import java.awt.Point; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseEvent; @@ -63,9 +62,6 @@ import org.nuiton.math.matrix.gui.MatrixTableModelND; import org.nuiton.widget.SwingSession; -import com.bbn.openmap.gui.OMToolSet; -import com.bbn.openmap.gui.Tool; - import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserConfig; import fr.ifremer.coser.CoserException; @@ -99,7 +95,7 @@ /** * Appelé sur un changement d'onglet dans l'interface de sélection. * - * Les listes L1à4 n'ecoute pas directement les modifications du premier + * Les listes L1à4 n'ecoutent pas directement les modifications du premier * onglet. Opération manuelle, calcul de matrice en plus. * * @param view view @@ -107,74 +103,84 @@ */ public void selectionTabChanged(SelectionView view, ChangeEvent event) { - // selected tab is Lists - Component selectedComponent = view.getSelectedComponent(); - if (selectedComponent instanceof SelectionListsView) { - SelectionListsView selectionListsView = (SelectionListsView)selectedComponent; + try { + setWaitCursor(view); - if (log.isDebugEnabled()) { - log.debug("List details tab selected"); - } - - Selection selection = view.getContextValue(Selection.class); - - // si la selection n'est pas la même que que celle de la sélection - // on met à jour la liste de "Toutes les especes" (L1) - - List<String> currentList = selectionListsView.getSelectionAllSpeciesListModel().getSpecies(); - List<String> selectionSpeciesList = selection.getSelectedSpecies(); - - if (!selectionSpeciesList.equals(currentList)) { - + // selected tab is Lists + Component selectedComponent = view.getSelectedComponent(); + if (selectedComponent instanceof SelectionListsView) { + SelectionListsView selectionListsView = (SelectionListsView)selectedComponent; + if (log.isDebugEnabled()) { - log.debug("Data changed, fill default selection"); + log.debug("List details tab selected"); } - - // on calcul également les matrices de d'occurence, densité - Project project = view.getContextValue(Project.class); - ProjectService projectService = view.getContextValue(ProjectService.class); - MatrixND occurrence = projectService.getOccurrence(project, selection); - occurrence.meanOverDim(1); // moyenne sur les années - MatrixND density = projectService.getDensity(project, selection); - density.meanOverDim(1); // moyenne sur les années - Collection<String> speciesAllYear = projectService.getSpeciesWithSizeAllYears(selection); - Collection<String> speciesWithMaturity = projectService.getSpeciesWithMaturity(selection); - - // set matrix on list model - selectionListsView.getSelectionOccurrenceDensityListModel().setOccurrence(occurrence); - selectionListsView.getSelectionOccurrenceDensityListModel().setDensity(density); - - // fill all species data (at final) - selectionListsView.getSelectionAllSpeciesListModel().setSpecies(selectionSpeciesList); - ((CoserListSelectionModel)selectionListsView.getSelectionAllSpeciesList().getSelectionModel()).fillSelection(); - selectionListsView.getSelectionSizeAllYearListModel().setSizeAllYearSpecies(speciesAllYear); - selectionListsView.getSelectionMaturityListModel().setMaturitySpecies(speciesWithMaturity); - - // rechargement de la selection sauvegardée - // si aucune des autres listes n'est vide - if (!selection.getSelectedSpeciesOccDens().isEmpty() || - !selection.getSelectedSpeciesSizeAllYear().isEmpty() || - !selection.getSelectedSpeciesMaturity().isEmpty()) { - - selectionListsView.getSelectionFilterOccurrenceField().setText(String.valueOf(selection.getOccurrenceFilter())); - selectionListsView.getSelectionFilterDensityField().setText(String.valueOf(selection.getDensityFilter())); - - // restauration de la selection sauvegardée - ((CoserListSelectionModel)selectionListsView.getSelectionOccurrenceDensityList().getSelectionModel()).setSelectedObjects(selection.getSelectedSpeciesOccDens()); - ((CoserListSelectionModel)selectionListsView.getSelectionSizeAllYearList().getSelectionModel()).setSelectedObjects(selection.getSelectedSpeciesSizeAllYear()); - ((CoserListSelectionModel)selectionListsView.getSelectionMaturityList().getSelectionModel()).setSelectedObjects(selection.getSelectedSpeciesMaturity()); - } - else { - + + Selection selection = view.getContextValue(Selection.class); + + // si la selection n'est pas la même que que celle de la sélection + // on met à jour la liste de "Toutes les especes" (L1) + + List<String> currentList = selectionListsView.getSelectionAllSpeciesListModel().getSpecies(); + List<String> selectionSpeciesList = selection.getSelectedSpecies(); + + if (!selectionSpeciesList.equals(currentList)) { + if (log.isDebugEnabled()) { - log.debug("Apply occurrence/density filter"); + log.debug("Data changed, fill default selection"); } - - // select all list (not to do for reload) - // init allSize and maturity before (select all with updateOccurrenceDensityFilter) - updateOccurrenceDensityFilter(selectionListsView); + + // on calcul également les matrices de d'occurence, densité + Project project = view.getContextValue(Project.class); + ProjectService projectService = view.getContextValue(ProjectService.class); + MatrixND occurrence = projectService.getOccurrence(project, selection); + occurrence.meanOverDim(1); // moyenne sur les années + MatrixND density = projectService.getDensity(project, selection); + density.meanOverDim(1); // moyenne sur les années + Collection<String> speciesAllYear = projectService.getSpeciesWithSizeAllYears(selection); + Collection<String> speciesWithMaturity = projectService.getSpeciesWithMaturity(selection); + + // set matrix on list model + selectionListsView.getSelectionOccurrenceDensityListModel().setOccurrence(occurrence); + selectionListsView.getSelectionOccurrenceDensityListModel().setDensity(density); + + // useless line but fix a event update bug + // can take huge time becasue somes event are fired + selectionListsView.getSelectionAllSpeciesList().clearSelection(); + + // fill all species data (at final) + selectionListsView.getSelectionAllSpeciesListModel().setSpecies(selectionSpeciesList); + ((CoserListSelectionModel)selectionListsView.getSelectionAllSpeciesList().getSelectionModel()).fillSelection(); + selectionListsView.getSelectionSizeAllYearListModel().setSizeAllYearSpecies(speciesAllYear); + selectionListsView.getSelectionMaturityListModel().setMaturitySpecies(speciesWithMaturity); + + // rechargement de la selection sauvegardée + // si aucune des autres listes n'est vide + if (!selection.getSelectedSpeciesOccDens().isEmpty() || + !selection.getSelectedSpeciesSizeAllYear().isEmpty() || + !selection.getSelectedSpeciesMaturity().isEmpty()) { + + selectionListsView.getSelectionFilterOccurrenceField().setText(String.valueOf(selection.getOccurrenceFilter())); + selectionListsView.getSelectionFilterDensityField().setText(String.valueOf(selection.getDensityFilter())); + + // restauration de la selection sauvegardée + ((CoserListSelectionModel)selectionListsView.getSelectionOccurrenceDensityList().getSelectionModel()).setSelectedObjects(selection.getSelectedSpeciesOccDens()); + ((CoserListSelectionModel)selectionListsView.getSelectionSizeAllYearList().getSelectionModel()).setSelectedObjects(selection.getSelectedSpeciesSizeAllYear()); + ((CoserListSelectionModel)selectionListsView.getSelectionMaturityList().getSelectionModel()).setSelectedObjects(selection.getSelectedSpeciesMaturity()); + } + else { + + if (log.isDebugEnabled()) { + log.debug("Apply occurrence/density filter"); + } + + // select all list (not to do for reload) + // init allSize and maturity before (select all with updateOccurrenceDensityFilter) + updateOccurrenceDensityFilter(selectionListsView); + } } } + } finally { + setDefaultCursor(view); } } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-11 14:30:12 UTC (rev 916) +++ trunk/pom.xml 2011-12-11 14:31:20 UTC (rev 917) @@ -214,7 +214,7 @@ <dependency> <groupId>com.bbn</groupId> <artifactId>openmap</artifactId> - <version>5.0.0-20111117</version> + <version>5.0.0-20111210</version> <scope>compile</scope> </dependency>

1 0

r916 - trunk/coser-business/src/test/java/fr/ifremer/coser/services
by echatellier＠users.forge.codelutin.com 11 Dec '11

11 Dec '11

Author: echatellier Date: 2011-12-11 15:30:12 +0100 (Sun, 11 Dec 2011) New Revision: 916 Url: http://forge.codelutin.com/repositories/revision/coser/916 Log: Fix test. Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2011-12-06 17:18:23 UTC (rev 915) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2011-12-11 14:30:12 UTC (rev 916) @@ -100,7 +100,7 @@ @Test public void testGetZones() throws CoserBusinessException { DataStorage zones = webService.getZonesMap(); - Assert.assertEquals(22, zones.size()); + Assert.assertEquals(23, zones.size()); } /**

1 0

r915 - in trunk: coser-business/src/main/java/fr/ifremer/coser/services coser-business/src/main/java/fr/ifremer/coser/util coser-ui/src/main/java/fr/ifremer/coser/ui/maps
by echatellier＠users.forge.codelutin.com 06 Dec '11

06 Dec '11

Author: echatellier Date: 2011-12-06 18:18:23 +0100 (Tue, 06 Dec 2011) New Revision: 915 Url: http://forge.codelutin.com/repositories/revision/coser/915 Log: Display each haul series in differents colors Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-business/src/main/java/fr/ifremer/coser/util/Coordinate.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationHandler.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 2011-12-05 10:08:58 UTC (rev 914) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2011-12-06 17:18:23 UTC (rev 915) @@ -2886,12 +2886,22 @@ public List<Coordinate> getStrataHaulCoordinate(Selection selection, Collection<String> strataCollection) throws CoserBusinessException { List<Coordinate> hauls = new ArrayList<Coordinate>(); + + // serie cache to compute serie index + List<String> serieCache = new ArrayList<String>(); Iterator<String[]> itData = selection.getHaul().iterator(true); while (itData.hasNext()) { String[] tuple = itData.next(); String strata = tuple[Haul.INDEX_STRATUM]; + + // add it to cache (even not selected to stay same color + // in different display) + if (!serieCache.contains(strata)) { + serieCache.add(strata); + } + if (strataCollection.contains(strata)) { String stratum = tuple[Haul.INDEX_STRATUM]; String year = tuple[Haul.INDEX_YEAR]; @@ -2904,7 +2914,8 @@ double dlong = Double.parseDouble(longi); String name = _("coser.business.map.haulname", stratum, year, haul); - Coordinate coordinate = new Coordinate(name, dlat, dlong); + int serieIndex = serieCache.indexOf(strata); + Coordinate coordinate = new Coordinate(serieIndex, name, dlat, dlong); hauls.add(coordinate); } } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/util/Coordinate.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/util/Coordinate.java 2011-12-05 10:08:58 UTC (rev 914) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/util/Coordinate.java 2011-12-06 17:18:23 UTC (rev 915) @@ -41,6 +41,8 @@ /** serialVersionUID. */ private static final long serialVersionUID = -5111417883474394223L; + protected int serie; + protected String name; protected double latitude; @@ -51,13 +53,22 @@ } - public Coordinate(String name, double latitude, double longitude) { + public Coordinate(int serie, String name, double latitude, double longitude) { this(); + this.serie = serie; this.name = name; this.latitude = latitude; this.longitude = longitude; } + public int getSerie() { + return serie; + } + + public void setSerie(int serie) { + this.serie = serie; + } + public String getName() { return name; } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationHandler.java 2011-12-05 10:08:58 UTC (rev 914) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationHandler.java 2011-12-06 17:18:23 UTC (rev 915) @@ -46,11 +46,25 @@ */ public class HaulLocationHandler extends AbstractLocationHandler { + protected static Color[] markerColors = new Color[] { + Color.RED, + Color.BLUE, + Color.CYAN, + Color.GRAY, + Color.BLACK, + Color.GREEN, + Color.GREEN.darker(), + Color.MAGENTA, + Color.PINK, + Color.YELLOW, + new Color(165, 3, 63) // purple + }; + protected List<Coordinate> coordinates; public HaulLocationHandler(List<Coordinate> coordinates) { this.coordinates = coordinates; - setLocationColor(Color.RED); + setLocationColor(Color.GREEN); setShowLocations(true); } @@ -61,14 +75,14 @@ public OMGraphicList get(float nwLat, float nwLon, float seLat, float seLon, OMGraphicList graphicList) { for (Coordinate coordinate : coordinates) { + + // get color index in color array depending on serie + int serie = coordinate.getSerie(); + serie = serie % markerColors.length; + Location location = new BasicLocation(coordinate.getLatitude(), coordinate.getLongitude(), coordinate.getName(), null); location.setLocationHandler(this); - //location.getLabel().setLinePaint(Color.BLACK); - //location.getLabel().setMatted(true); - //location.setLinePaint(Color.BLUE); - location.setShowName(true); - location.setShowLocation(true); - + location.getLocationMarker().setLinePaint(markerColors[serie]); graphicList.add(location); }

1 0

r914 - trunk/coser-business/src/test/resources
by oberthel＠users.forge.codelutin.com 05 Dec '11

05 Dec '11

Author: oberthel Date: 2011-12-05 11:08:58 +0100 (Mon, 05 Dec 2011) New Revision: 914 Url: http://forge.codelutin.com/repositories/revision/coser/914 Log: Petites modif de texte pour crustaflam Modified: trunk/coser-business/src/test/resources/webzones.csv Modified: trunk/coser-business/src/test/resources/webzones.csv =================================================================== --- trunk/coser-business/src/test/resources/webzones.csv 2011-12-05 09:31:54 UTC (rev 913) +++ trunk/coser-business/src/test/resources/webzones.csv 2011-12-05 10:08:58 UTC (rev 914) @@ -10,7 +10,7 @@ "noursom";"mancheorientale";"Manche orientale";"Baie de Somme";"1994 >";"Noursom";;"C_Noursom.png" "nurvil";"atlantique";"Atlantique";"Baie de Vilaine";"1997 >";"Nurvil";"";"C_Nurvil.png" "noursein";"mancheorientale";"Manche orientale";"Baie de Seine";"1995 - 2010";"Noursein";"Série arrêtée en 2010";"C_Noursein.png" -"crustaflam";"mancheoccidentale";"Manche occidentale";"Abords du cap de Flamanville";"1985 >";"Crustaflam";;"C_Crustaflam.png" +"crustaflam";"mancheoccidentale";"Manche occidentale";"Abords du cap de Flamanville";"Juin 1985 >";"Crustaflam";"Série du mois de juin";"C_Crustaflam.png" "crustaflam2";"mancheoccidentale";"Manche occidentale";"Abords du cap de Flamanville";"Sept. – 1985 >";"Crustaflam";"Série du mois de septembre";"C_Crustaflam.png" "gdgmc";"atlantique";"Atlantique";"Golfe de Gascogne + mer Celtique";"1997 >";"Evhoe";"Ensemble de la couverture Evhoe";"C_GdG-MC.png" "mcech";"atlantique";"Atlantique";"Mer Celtique (strates d'échantillonnage)";"1997 >";"Evhoe";;"C_MC-Ech.png"

1 0

r913 - trunk/coser-business/src/test/resources
by oberthel＠users.forge.codelutin.com 05 Dec '11

05 Dec '11

Author: oberthel Date: 2011-12-05 10:31:54 +0100 (Mon, 05 Dec 2011) New Revision: 913 Url: http://forge.codelutin.com/repositories/revision/coser/913 Log: ajout?\195?\169 campagne nurvil et modifi?\195?\169 texte de crustaflam (chang?\195?\169 1986 et 1985) Modified: trunk/coser-business/src/test/resources/webzones.csv Modified: trunk/coser-business/src/test/resources/webzones.csv =================================================================== --- trunk/coser-business/src/test/resources/webzones.csv 2011-12-04 21:50:34 UTC (rev 912) +++ trunk/coser-business/src/test/resources/webzones.csv 2011-12-05 09:31:54 UTC (rev 913) @@ -8,9 +8,10 @@ "cieme7d";"mancheorientale";"Manche orientale";"Est de 1° 15' O";"1988 >";"CGFS";;"C_Ciem-E7d.png" "ciem7d";"mancheorientale";"Manche orientale";"Ensemble Manche orientale";"1990 >";"CGFS";"Correspond à l'ensemble de la zone VIId du CIEM";"C_Ciem-7d.png" "noursom";"mancheorientale";"Manche orientale";"Baie de Somme";"1994 >";"Noursom";;"C_Noursom.png" +"nurvil";"atlantique";"Atlantique";"Baie de Vilaine";"1997 >";"Nurvil";"";"C_Nurvil.png" "noursein";"mancheorientale";"Manche orientale";"Baie de Seine";"1995 - 2010";"Noursein";"Série arrêtée en 2010";"C_Noursein.png" -"crustaflam";"mancheoccidentale";"Manche occidentale";"Abords du cap de Flamanville";"1986 >";"Crustaflam";;"C_Crustaflam.png" -"crustaflam2";"mancheoccidentale";"Manche occidentale";"Abords du cap de Flamanville";"Sept. – 1986 >";"Crustaflam";"Série du mois de septembre";"C_Crustaflam.png" +"crustaflam";"mancheoccidentale";"Manche occidentale";"Abords du cap de Flamanville";"1985 >";"Crustaflam";;"C_Crustaflam.png" +"crustaflam2";"mancheoccidentale";"Manche occidentale";"Abords du cap de Flamanville";"Sept. – 1985 >";"Crustaflam";"Série du mois de septembre";"C_Crustaflam.png" "gdgmc";"atlantique";"Atlantique";"Golfe de Gascogne + mer Celtique";"1997 >";"Evhoe";"Ensemble de la couverture Evhoe";"C_GdG-MC.png" "mcech";"atlantique";"Atlantique";"Mer Celtique (strates d'échantillonnage)";"1997 >";"Evhoe";;"C_MC-Ech.png" "mcciem7";"atlantique";"Atlantique";"Mer Celtique (zone VII du CIEM)";"1997 >";"Evhoe";"La limite sud de la zone VII du CIEM (48 °N) constitue aussi une limite de régions de la DCSMM";"C_MC-Ciem-7.png"

1 0