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

r433 - trunk
by chatellier＠users.labs.libre-entreprise.org Dec. 21, 2010

Dec. 21, 2010

Author: chatellier Date: 2010-12-21 14:27:07 +0000 (Tue, 21 Dec 2010) New Revision: 433 Log: Switch to 4.1-beta1 (4.0.3 do not work for file upload) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-21 09:28:08 UTC (rev 432) +++ trunk/pom.xml 2010-12-21 14:27:07 UTC (rev 433) @@ -89,14 +89,14 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.0.3</version> + <version>4.1-beta1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> - <version>4.0.3</version> + <version>4.1-beta1</version> <scope>compile</scope> </dependency>

1 0

r432 - trunk/coser-ui/src/main/java/fr/ifremer/coser
by chatellier＠users.labs.libre-entreprise.org Dec. 21, 2010

Dec. 21, 2010

Author: chatellier Date: 2010-12-21 09:28:08 +0000 (Tue, 21 Dec 2010) New Revision: 432 Log: Default laf to default jvm laf Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2010-12-21 08:59:36 UTC (rev 431) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2010-12-21 09:28:08 UTC (rev 432) @@ -94,7 +94,7 @@ public static enum CoserOption implements OptionDef { CONFIG_FILE(CONFIG_FILE_NAME, _("coser.config.config.file.description"), "coser.properties", String.class, true, true), - LOOKANDFEEL("coser.lookandfeel", _("coser.config.lookandfeel.description"), "Nimbus", String.class, false, false), + LOOKANDFEEL("coser.lookandfeel", _("coser.config.lookandfeel.description"), null, String.class, false, false), APPLICATION_VERSION("coser.application.version", _("coser.config.application.version.description"), null, String.class, false, false), SMTP_HOST("coser.smtp.host", _("coser.config.smtp.host.description"), "smtp", String.class, false, false), SUPPORT_EMAIL("coser.support.email", _("coser.config.support.email.description"), "support at codelutin.com", String.class, false, false),

1 0

r431 - in trunk: . coser-business
by chatellier＠users.labs.libre-entreprise.org Dec. 21, 2010

Dec. 21, 2010

Author: chatellier Date: 2010-12-21 08:59:36 +0000 (Tue, 21 Dec 2010) New Revision: 431 Log: Add httpclient dependency Modified: trunk/coser-business/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2010-12-20 17:58:01 UTC (rev 430) +++ trunk/coser-business/pom.xml 2010-12-21 08:59:36 UTC (rev 431) @@ -59,6 +59,14 @@ <artifactId>commons-math</artifactId> </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpmime</artifactId> + </dependency> + <dependency> <groupId>net.sf.opencsv</groupId> <artifactId>opencsv</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-20 17:58:01 UTC (rev 430) +++ trunk/pom.xml 2010-12-21 08:59:36 UTC (rev 431) @@ -85,6 +85,20 @@ <version>1.2</version> <scope>compile</scope> </dependency> + + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.0.3</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpmime</artifactId> + <version>4.0.3</version> + <scope>compile</scope> + </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -205,10 +219,10 @@ </dependency> <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - <version>${struts.version}</version> - <scope>compile</scope> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + <version>${struts.version}</version> + <scope>compile</scope> </dependency> <dependency>

1 0

r430 - trunk/coser-ui/src/main/assembly
by chatellier＠users.labs.libre-entreprise.org Dec. 20, 2010

Dec. 20, 2010

Author: chatellier Date: 2010-12-20 17:58:01 +0000 (Mon, 20 Dec 2010) New Revision: 430 Log: Retrait du script go.sh Removed: trunk/coser-ui/src/main/assembly/go.sh Deleted: trunk/coser-ui/src/main/assembly/go.sh =================================================================== --- trunk/coser-ui/src/main/assembly/go.sh 2010-12-20 17:57:37 UTC (rev 429) +++ trunk/coser-ui/src/main/assembly/go.sh 2010-12-20 17:58:01 UTC (rev 430) @@ -1,28 +0,0 @@ -### -# #%L -# Coser :: UI -# -# $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 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 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-3.0.html>. -# #L% -### -#!/bin/sh - -MX=512M -java -Xmx$MX -Xms$MX -jar coser.jar "$@" \ No newline at end of file

1 0

r429 - in trunk/coser-business/src/main/java/fr/ifremer/coser: services util
by chatellier＠users.labs.libre-entreprise.org Dec. 20, 2010

Dec. 20, 2010

Author: chatellier Date: 2010-12-20 17:57:37 +0000 (Mon, 20 Dec 2010) New Revision: 429 Log: Replace progress reader by progress stream (can be used in more context) Added: trunk/coser-business/src/main/java/fr/ifremer/coser/util/ProgressStream.java Removed: trunk/coser-business/src/main/java/fr/ifremer/coser/util/ProgressReader.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java 2010-12-17 16:45:00 UTC (rev 428) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java 2010-12-20 17:57:37 UTC (rev 429) @@ -33,6 +33,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.io.Reader; @@ -62,7 +63,7 @@ import fr.ifremer.coser.storage.DataStorage; import fr.ifremer.coser.storage.MemoryDataStorage; import fr.ifremer.coser.util.ProgressMonitor; -import fr.ifremer.coser.util.ProgressReader; +import fr.ifremer.coser.util.ProgressStream; /** * File import/export service. @@ -127,10 +128,11 @@ CSVReader csvReader = null; try { - Reader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), CoserConstants.CSV_FILE_ENCODING)); + InputStream stream = new FileInputStream(file); if (progress != null) { - reader = new ProgressReader(reader, progress); + stream = new ProgressStream(stream, progress); } + Reader reader = new BufferedReader(new InputStreamReader(stream, CoserConstants.CSV_FILE_ENCODING)); csvReader = new CSVReader(reader, CoserConstants.CSV_SEPARATOR_CHAR); // check header Deleted: trunk/coser-business/src/main/java/fr/ifremer/coser/util/ProgressReader.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/util/ProgressReader.java 2010-12-17 16:45:00 UTC (rev 428) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/util/ProgressReader.java 2010-12-20 17:57:37 UTC (rev 429) @@ -1,72 +0,0 @@ -/* - * #%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.util; - -import java.io.IOException; -import java.io.Reader; - -/** - * Reader that notify read progression. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class ProgressReader extends Reader { - - public Reader delegateReader; - - public ProgressMonitor delegateProgress; - - public ProgressReader(Reader delegateReader, ProgressMonitor delegateProgress) { - super(); - this.delegateReader = delegateReader; - this.delegateProgress = delegateProgress; - } - - /* - * @see java.io.Reader#read(char[], int, int) - */ - @Override - public int read(char[] cbuf, int off, int len) throws IOException { - - int nb = delegateReader.read(cbuf, off, len); - if (nb >= 0) { - delegateProgress.addCurrent(nb); - } - return nb; - } - - /* - * @see java.io.Reader#close() - */ - @Override - public void close() throws IOException { - delegateReader.close(); - } -} Added: trunk/coser-business/src/main/java/fr/ifremer/coser/util/ProgressStream.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/util/ProgressStream.java (rev 0) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/util/ProgressStream.java 2010-12-20 17:57:37 UTC (rev 429) @@ -0,0 +1,71 @@ +/* + * #%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 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.util; + +import java.io.IOException; +import java.io.InputStream; + +/** + * Stream that notify read progression. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class ProgressStream extends InputStream { + + public InputStream delegateStream; + + public ProgressMonitor delegateProgress; + + public ProgressStream(InputStream delegateStream, ProgressMonitor delegateProgress) { + super(); + this.delegateStream = delegateStream; + this.delegateProgress = delegateProgress; + } + + /* + * @see java.io.InputStream#read() + */ + @Override + public int read() throws IOException { + int nb = delegateStream.read(); + if (nb != -1) { + delegateProgress.addCurrent(1); + } + return nb; + } + + /* + * @see java.io.Reader#close() + */ + @Override + public void close() throws IOException { + delegateStream.close(); + } +} Property changes on: trunk/coser-business/src/main/java/fr/ifremer/coser/util/ProgressStream.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r428 - trunk/coser-ui/src/main/assembly
by chatellier＠users.labs.libre-entreprise.org Dec. 17, 2010

Dec. 17, 2010

Author: chatellier Date: 2010-12-17 16:45:00 +0000 (Fri, 17 Dec 2010) New Revision: 428 Log: Update coser script Added: trunk/coser-ui/src/main/assembly/coser Modified: trunk/coser-ui/src/main/assembly/bin.xml Modified: trunk/coser-ui/src/main/assembly/bin.xml =================================================================== --- trunk/coser-ui/src/main/assembly/bin.xml 2010-12-17 16:41:42 UTC (rev 427) +++ trunk/coser-ui/src/main/assembly/bin.xml 2010-12-17 16:45:00 UTC (rev 428) @@ -51,7 +51,7 @@ <source>target/coser.exe</source> </file> <file> - <source>src/main/assembly/go.sh</source> + <source>src/main/assembly/coser</source> <fileMode>0755</fileMode> </file> </files> Copied: trunk/coser-ui/src/main/assembly/coser (from rev 207, trunk/coser-ui/src/main/assembly/go.sh) =================================================================== --- trunk/coser-ui/src/main/assembly/coser (rev 0) +++ trunk/coser-ui/src/main/assembly/coser 2010-12-17 16:45:00 UTC (rev 428) @@ -0,0 +1,33 @@ +### +# #%L +# Coser :: UI +# +# $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 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 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-3.0.html>. +# #L% +### +#!/bin/sh +MX=512M +cd `dirname $0` +if [ -n "$JAVA_HOME" ]; then + $JAVA_HOME/bin/java -Xmx$MX -Xms$MX -jar coser.jar $* +else + java -Xmx$MX -Xms$MX -jar coser.jar $* +fi +cd "$OLDPWD"

1 0

r427 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by chatellier＠users.labs.libre-entreprise.org Dec. 17, 2010

Dec. 17, 2010

Author: chatellier Date: 2010-12-17 16:41:42 +0000 (Fri, 17 Dec 2010) New Revision: 427 Log: Vidage des lignes si le contenu sup?\195?\169rieur a chang?\195?\169. Am?\195?\169lioration de la coh?\195?\169rence apres rechargement des donn?\195?\169es. Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-12-17 16:39:06 UTC (rev 426) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-12-17 16:41:42 UTC (rev 427) @@ -174,14 +174,11 @@ * @param view view */ public void initSelection(SelectionView view) { - Selection selection = view.getContextValue(Selection.class); // initialize la liste de toutes les années // c'est normalement la seule initialisation a faire SelectionDetailsView detailView = view.getSelectionDetailsTab(); - detailView.getYearsListModel().setYears(selection.getAllYears()); - // tout est selectionné par defaut - ((CoserListSelectionModel)detailView.getYearsList().getSelectionModel()).setSelectedObjects(selection.getSelectedYears()); + initSelectionYears(detailView); view.setCreationState(true); @@ -189,8 +186,30 @@ view.setEnabledAt(1, false); // selection lists view.setEnabledAt(2, false); // rsufi } - + /** + * Initialise la listes des années disponible dans les données + * chargées. + * + * @param view view + */ + public void initSelectionYears(SelectionDetailsView view) { + Selection selection = view.getContextValue(Selection.class); + view.getYearsListModel().setYears(selection.getAllYears()); + + // tout est selectionné par defaut + ((CoserListSelectionModel)view.getYearsList().getSelectionModel()).setSelectedObjects(selection.getSelectedYears()); + + // clear other lists + view.getStrataListModel().setStrata(new ArrayList<String>()); + view.getStrataList().clearSelection(); + view.getFilteredSpeciesListModel().setSpecies(new ArrayList<String>()); + view.getFilteredSpeciesList().clearSelection(); + view.getSelectedSpeciesListModel().setSpecies(new ArrayList<String>()); + view.getSelectedSpeciesList().clearSelection(); + } + + /** * Recharge la selection en valorisant les différentes listes. * * Fait ici, car sinon, les evenements ne se déclenchent pas au même @@ -213,7 +232,7 @@ ((CoserListSelectionModel)detailView.getYearsList().getSelectionModel()).setSelectedObjects(selectedYears); // details view : fill strata data and selection - updateSelectionYearsData(detailView); + updateSelectionYearsData(detailView, true); List<String> selectedStrata = selection.getSelectedStrata(); ((CoserListSelectionModel)detailView.getStrataList().getSelectionModel()).setSelectedObjects(selectedStrata); @@ -256,16 +275,10 @@ _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); // affiche les années + initSelectionYears(view); view.getValidDatesButton().setEnabled(true); view.getDetailAccordionPane().setSelected(1); - - // vide les autres listes - view.getStrataListModel().setStrata(new ArrayList<String>()); - view.getStrataList().clearSelection(); - view.getFilteredSpeciesListModel().setSpecies(new ArrayList<String>()); - view.getFilteredSpeciesList().clearSelection(); - view.getSelectedSpeciesListModel().setSpecies(new ArrayList<String>()); - view.getSelectedSpeciesList().clearSelection(); + } catch (CoserBusinessException ex) { throw new CoserException("Can't reload control data", ex); } @@ -275,9 +288,11 @@ /** * Rafraichit la liste des zones suite à la selection des années. * + * N'affiche pas de message utilsateur dans le cas d'un reload. + * * @param view view */ - public void updateSelectionYearsData(SelectionDetailsView view) { + protected void updateSelectionYearsData(SelectionDetailsView view, boolean reload) { Project project = view.getContextValue(Project.class); Selection selection = view.getContextValue(Selection.class); ProjectService projectService = view.getContextValue(ProjectService.class); @@ -301,14 +316,35 @@ // auto selectionne les strates par default view.getStrataList().addSelectionInterval(0, strata.size() - 1); - + + // clear other sublists + view.getFilteredSpeciesListModel().setSpecies(new ArrayList<String>()); + view.getFilteredSpeciesList().clearSelection(); + view.getSelectedSpeciesListModel().setSpecies(new ArrayList<String>()); + view.getSelectedSpeciesList().clearSelection(); + + if (!reload) { + JOptionPane.showMessageDialog(view, _("coser.ui.selection.detail.yearsvalidated"), + _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); + } + if (log.isDebugEnabled()) { - log.debug("Strata list refreshed"); + log.debug("Years list refreshed"); } } catch (CoserBusinessException ex) { throw new CoserException("Can't filters data with specified years", ex); } } + + /** + * Rafraichit la liste des zones suite à la selection des années et affiche + * un message utilsateur. + * + * @param view view + */ + public void updateSelectionYearsData(SelectionDetailsView view) { + updateSelectionYearsData(view, false); + } /** * Init openmap toolbar and openmap layers.

1 0

r426 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui
by chatellier＠users.labs.libre-entreprise.org Dec. 17, 2010

Dec. 17, 2010

Author: chatellier Date: 2010-12-17 16:39:06 +0000 (Fri, 17 Dec 2010) New Revision: 426 Log: Auto selection du premier onglet (car le swing session selectionne le dernier sauvegard?\195?\169) Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-12-17 16:38:20 UTC (rev 425) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-12-17 16:39:06 UTC (rev 426) @@ -300,6 +300,8 @@ /** * Show selection view to create new selection. + * + * TODO echatellier 20101217 revoir les 3 méthodes de selection (code dupliqués) */ public void showSelectionView() { @@ -325,7 +327,11 @@ // restore session size SwingSession session = (SwingSession)view.getContextValue(SwingSession.class); session.add(selectionView); - + + // fix la restauration de la selection + // seule le 1er onglet doit etre selectionné + selectionView.setSelectedIndex(0); + setMainComponent(selectionView); } catch (CoserBusinessException ex) { JOptionPane.showMessageDialog(view, ex.getMessage(), _("coser.ui.selection.createError"), @@ -367,7 +373,11 @@ // restore session size SwingSession session = (SwingSession)view.getContextValue(SwingSession.class); session.add(selectionView); - + + // fix la restauration de la selection + // seule le 1er onglet doit etre selectionné + selectionView.setSelectedIndex(0); + setMainComponent(selectionView); } catch (CoserBusinessException ex) { throw new CoserException("Can't reload selection data", ex); @@ -431,6 +441,14 @@ // FIXME chatellier 20101126 il faut faire un mix de init && reload handler.initSelection(selectionView); + // restore session size + SwingSession session = (SwingSession)view.getContextValue(SwingSession.class); + session.add(selectionView); + + // fix la restauration de la selection + // seule le 1er onglet doit etre selectionné + selectionView.setSelectedIndex(0); + setMainComponent(selectionView); } catch (Exception ex) {

1 0

r425 - in trunk: coser-business/src/main/java/fr/ifremer/coser coser-business/src/main/java/fr/ifremer/coser/bean coser-business/src/main/java/fr/ifremer/coser/services coser-business/src/main/resources/i18n coser-business/src/test/java/fr/ifremer/coser/services coser-ui/src/main/java/fr/ifremer/coser coser-ui/src/main/java/fr/ifremer/coser/ui/project coser-ui/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org Dec. 17, 2010

Dec. 17, 2010

Author: chatellier Date: 2010-12-17 16:38:20 +0000 (Fri, 17 Dec 2010) New Revision: 425 Log: Ajout de la date de creation du projet Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java 2010-12-16 17:22:30 UTC (rev 424) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java 2010-12-17 16:38:20 UTC (rev 425) @@ -28,6 +28,7 @@ import static org.nuiton.i18n.I18n._; import java.io.File; +import java.util.Locale; import org.nuiton.util.ApplicationConfig; @@ -72,6 +73,15 @@ return result; } + public Locale getLocale() { + Locale result = getOption(Locale.class, CoserBusinessOption.LOCALE.key); + return result; + } + + public void setLocale(Locale locale) { + setOption(CoserBusinessOption.LOCALE.key, locale.toString()); + } + public String getReferenceSpeciesPath() { String result = getOption(CoserBusinessOption.REFERENCE_SPECIES.key); return result; @@ -113,6 +123,8 @@ PROJECTS_DIRECTORY("coser.projects.directory", _("coser.config.projects.directory.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "projects", String.class, false, false), VALIDATOR_DIRECTORY("coser.validator.directory", _("coser.config.validator.directory.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "validators", String.class, false, false), + LOCALE("coser.locale", _("coser.config.locale.description"), Locale.FRANCE.toString(), Locale.class, false, false), + REFERENCE_SPECIES("coser.reference.species", _("coser.config.reference.species.description"), "", String.class, false, false), REFERENCE_TYPE_ESPECES("coser.reference.typeSpecies", _("coser.config.reference.typeSpecies.description"), "", String.class, false, false), Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2010-12-16 17:22:30 UTC (rev 424) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2010-12-17 16:38:20 UTC (rev 425) @@ -27,6 +27,7 @@ import java.io.File; import java.util.ArrayList; +import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -101,7 +102,10 @@ protected String comment; protected Control control; - + + // FIXME echatellier 20101217 compabilité avec les projets beta (a retirer pour la v1) + protected Date creationDate = new Date(0); + protected Map<String, Selection> selections; /** Reftax SIH. */ @@ -220,6 +224,14 @@ getPropertyChangeSupport().firePropertyChange("comment", oldValue, comment); } + public Date getCreationDate() { + return creationDate; + } + + public void setCreationDate(Date creationDate) { + this.creationDate = creationDate; + } + public Control getControl() { return control; } @@ -305,6 +317,9 @@ if (comment != null) { props.setProperty("project.comment", comment); } + if (creationDate != null) { + props.setProperty("project.creationdate", String.valueOf(creationDate.getTime())); + } return props; } @@ -336,5 +351,9 @@ if (props.containsKey("project.comment")) { setComment(props.getProperty("project.comment")); } + if (props.containsKey("project.creationdate")) { + Date date = new Date(Long.parseLong(props.getProperty("project.creationdate"))); + setCreationDate(date); + } } } 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-16 17:22:30 UTC (rev 424) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-12-17 16:38:20 UTC (rev 425) @@ -42,6 +42,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Comparator; +import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -160,6 +161,9 @@ throw new CoserBusinessException(_("Project %s already exist", project.getName())); } + // set project date + project.setCreationDate(new Date()); + // first free memory, clear all data project.clearData(); Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2010-12-16 17:22:30 UTC (rev 424) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2010-12-17 16:38:20 UTC (rev 425) @@ -31,9 +31,11 @@ import java.io.File; import java.io.IOException; import java.io.PrintStream; +import java.text.DateFormat; import java.text.NumberFormat; import java.util.ArrayList; import java.util.Collection; +import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -530,15 +532,26 @@ * @param out stream */ protected void extractProjectReport(Project project, PrintStream out) { + + DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT, config.getLocale()); + + // date du rapport + out.println("<div style='text-align:right;font-style:italic'>" + + _("coser.business.publication.date") +" : " + + dateFormat.format(new Date()) + "</div>"); + // partie projet out.println("<h2>" + _("coser.business.publication.projectdetails") + "</h2>"); out.println("<ul>"); + out.println("<li>" + _("coser.business.publication.creationdate") + " : " + dateFormat.format(project.getCreationDate())); out.println("<li>" + _("coser.business.publication.author") + " : " + project.getAuthor() + "</li>"); out.println("<li>" + _("coser.business.publication.catchfilename") + " : " + projectService.getDataStorageFileName(project, Category.CATCH, null) + "</li>"); out.println("<li>" + _("coser.business.publication.lengthfilename") + " : " + projectService.getDataStorageFileName(project, Category.LENGTH, null) + "</li>"); out.println("<li>" + _("coser.business.publication.haulfilename") + " : " + projectService.getDataStorageFileName(project, Category.HAUL, null) + "</li>"); out.println("<li>" + _("coser.business.publication.stratafilename") + " : " + projectService.getDataStorageFileName(project, Category.STRATA, null) + "</li>"); - out.println("<li>" + _("coser.business.publication.comment") + " : " + project.getComment() + "</li>"); + if (StringUtils.isNotEmpty(project.getComment())) { + out.println("<li>" + _("coser.business.publication.comment") + " : " + project.getComment() + "</li>"); + } out.println("</ul>"); } 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-16 17:22:30 UTC (rev 424) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-12-17 16:38:20 UTC (rev 425) @@ -75,7 +75,9 @@ coser.business.publication.catchfilename=Catch file name coser.business.publication.comment=Comment coser.business.publication.controllogexporttitle=Selection report for %s (project %s) +coser.business.publication.creationdate=Creation date coser.business.publication.datamodification=Data modifications +coser.business.publication.date=On coser.business.publication.errorexportlines=Lines coser.business.publication.errorexporttitle=Error report for project %s coser.business.publication.errorgraph=Graph @@ -92,6 +94,7 @@ coser.config.control.nobsmin.description=Minimal observation number coser.config.control.typeFish.description=Fish species code type coser.config.database.directory.description=Coser database directory (all Coser data) +coser.config.locale.description=Application's locale coser.config.projects.directory.description=Coser projects directory coser.config.reference.species.description=Species reference file location (reftax) coser.config.reference.typeSpecies.description=Code type species file location 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-16 17:22:30 UTC (rev 424) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-12-17 16:38:20 UTC (rev 425) @@ -75,7 +75,9 @@ coser.business.publication.catchfilename=Nom du fichier captures coser.business.publication.comment=Commentaire coser.business.publication.controllogexporttitle=Rapport de contr\u00F4le (projet %s) +coser.business.publication.creationdate=Date de cr\u00E9action coser.business.publication.datamodification=Modifications sur les donn\u00E9es +coser.business.publication.date=Le coser.business.publication.errorexportlines=Lignes coser.business.publication.errorexporttitle=Rapport d'erreur pour le projet %s coser.business.publication.errorgraph=Graphique @@ -92,6 +94,7 @@ coser.config.control.nobsmin.description=Nombre minimal d'observation coser.config.control.typeFish.description=Nom du type d'esp\u00E8ces correspondant aux poissons coser.config.database.directory.description=Emplacement du dossier de toutes les donn\u00E9es relatives \u00E0 Coser +coser.config.locale.description=Langue de l'application coser.config.projects.directory.description=Emplacement du dossier de sauvegarde des projets coser.config.reference.species.description=Emplacement du fichier de r\u00E9f\u00E9rence des esp\u00E8ces (Reftax) coser.config.reference.typeSpecies.description=Emplacement du fichier de code type des esp\u00E8ces Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java 2010-12-16 17:22:30 UTC (rev 424) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java 2010-12-17 16:38:20 UTC (rev 425) @@ -177,7 +177,7 @@ Assert.assertTrue(fileContent.indexOf("from \"251.86\" to \"392.98\"") > 0); // clean all - //htmlExport.delete(); + htmlExport.delete(); } /** Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2010-12-16 17:22:30 UTC (rev 424) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2010-12-17 16:38:20 UTC (rev 425) @@ -54,15 +54,6 @@ } } - public Locale getLocale() { - Locale result = getOption(Locale.class, CoserOption.LOCALE.key); - return result; - } - - public void setLocale(Locale locale) { - setOption(CoserOption.LOCALE.key, locale.toString()); - } - public String getLookAndFeel() { String className = getOption(CoserOption.LOOKANDFEEL.key); return className; @@ -103,7 +94,6 @@ public static enum CoserOption implements OptionDef { CONFIG_FILE(CONFIG_FILE_NAME, _("coser.config.config.file.description"), "coser.properties", String.class, true, true), - LOCALE("coser.locale", _("coser.config.locale.description"), Locale.FRANCE.toString(), Locale.class, false, false), LOOKANDFEEL("coser.lookandfeel", _("coser.config.lookandfeel.description"), "Nimbus", String.class, false, false), APPLICATION_VERSION("coser.application.version", _("coser.config.application.version.description"), null, String.class, false, false), SMTP_HOST("coser.smtp.host", _("coser.config.smtp.host.description"), "smtp", String.class, false, false), Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx 2010-12-16 17:22:30 UTC (rev 424) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx 2010-12-17 16:38:20 UTC (rev 425) @@ -40,6 +40,14 @@ </row> <row> <cell anchor="west"> + <JLabel text="coser.ui.project.projectcreation" /> + </cell> + <cell anchor="west"> + <JLabel text="{java.text.DateFormat.getDateTimeInstance(java.text.DateFormat.LONG, java.text.DateFormat.SHORT, getContextValue(fr.ifremer.coser.CoserConfig.class).getLocale()).format(getProject().getCreationDate())}" /> + </cell> + </row> + <row> + <cell anchor="west"> <JLabel text="coser.ui.project.projectauthor" /> </cell> <cell anchor="west"> 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-16 17:22:30 UTC (rev 424) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-17 16:38:20 UTC (rev 425) @@ -6,7 +6,6 @@ coser.config.category.path=Path coser.config.category.path.description=File and directory configuration coser.config.config.file.description=Coser configuration file -coser.config.locale.description=Application's locale coser.config.lookandfeel.description=Application's swing theme coser.config.smtp.host.description=SMTP host address coser.config.support.email.description=Support email address @@ -108,6 +107,7 @@ coser.ui.project.project=Project \: coser.ui.project.projectauthor=Author \: coser.ui.project.projectcomment=Comment \: +coser.ui.project.projectcreation=Creation date \: coser.ui.project.projectname=Project name \: coser.ui.project.removeMaps=Remove map coser.ui.project.saveProject=Save project @@ -155,6 +155,7 @@ coser.ui.selection.detail.speciesAccordion=Species coser.ui.selection.detail.strataAccordion=Strata coser.ui.selection.detail.yearAccordion=Years +coser.ui.selection.detail.yearsvalidated=Years validated. coser.ui.selection.details.addToSelectedListTip=Add selected species to selected species list. coser.ui.selection.details.comment=Comments \: coser.ui.selection.details.description=Description \: 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-16 17:22:30 UTC (rev 424) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-17 16:38:20 UTC (rev 425) @@ -6,7 +6,6 @@ coser.config.category.path=Chemins coser.config.category.path.description=Configuration des fichiers et r\u00E9pertoires coser.config.config.file.description=Fichier de configuration de Coser -coser.config.locale.description=Langue de l'application coser.config.lookandfeel.description=Themes graphique Swing de l'application coser.config.smtp.host.description=Adresse du serveur SMTP pour envoyer les mails coser.config.support.email.description=Adresse de support pour l'envoi des erreurs @@ -108,6 +107,7 @@ coser.ui.project.project=Projet \: coser.ui.project.projectauthor=Auteur \: coser.ui.project.projectcomment=Commentaire \: +coser.ui.project.projectcreation=Date de cr\u00E9ation \: coser.ui.project.projectname=Nom du projet \: coser.ui.project.removeMaps=Supprimer coser.ui.project.saveProject=Sauver le projet @@ -155,6 +155,7 @@ coser.ui.selection.detail.speciesAccordion=Esp\u00E8ces coser.ui.selection.detail.strataAccordion=Strates coser.ui.selection.detail.yearAccordion=Ann\u00E9es +coser.ui.selection.detail.yearsvalidated=Ann\u00E9es valid\u00E9es. coser.ui.selection.details.addToSelectedListTip=Ajoute les esp\u00E8ces s\u00E9lectionn\u00E9es \u00E0 la liste des especes s\u00E9lectionn\u00E9es. coser.ui.selection.details.comment=Commentaire \: coser.ui.selection.details.description=Description \:

1 0

r424 - in trunk: coser-business/src/main/java/fr/ifremer/coser/services coser-ui/src/main/java/fr/ifremer/coser/ui/common
by chatellier＠users.labs.libre-entreprise.org Dec. 16, 2010

Dec. 16, 2010

Author: chatellier Date: 2010-12-16 17:22:30 +0000 (Thu, 16 Dec 2010) New Revision: 424 Log: Modify length structure graph using matrix proxy and provider (less memory usage / java heap space for big matrix) Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.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-15 17:59:14 UTC (rev 423) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-12-16 17:22:30 UTC (rev 424) @@ -62,8 +62,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.math.util.MathUtils; +import org.nuiton.math.matrix.DimensionHelper; import org.nuiton.math.matrix.MatrixFactory; import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixProvider; import fr.ifremer.coser.CoserBusinessConfig; import fr.ifremer.coser.CoserBusinessException; @@ -2279,11 +2281,14 @@ * Calcul. Sommer TAILLES$Nombres par classe de longueur (TAILLES$Longueur) * sur tous les traits d'une année (ou tous les années si regroupé) * + * * @param project project * @param dataContainer data container * @return matrix 4 dimension + * + * @deprecated replaced by matrix proxy */ - public MatrixND getLengthStructure(Project project, AbstractDataContainer dataContainer) { + public MatrixND getLengthStructureNonProxy(Project project, AbstractDataContainer dataContainer) { // load map traitname > stratename Map<String, String> haulAndStratas = new HashMap<String, String>(); @@ -2455,8 +2460,239 @@ return matrix; } + + /** + * Présentation du graphique : histogramme de distribution en tailles par + * espèce, par strate et par année (une planche par espèce et par année) + * pour toute la série. Avec la possibilité de voir regroupé l'ensemble des + * années. + * + * Données. TAILLES$Nombres et TAILLES$Longueur + * Calcul. Sommer TAILLES$Nombres par classe de longueur (TAILLES$Longueur) + * sur tous les traits d'une année (ou tous les années si regroupé) + * + * Second version : matrix proxy et provider. + * + * @param project project + * @param dataContainer data container + * @return matrix proxy with 4 dimension + */ + public MatrixND getLengthStructure(Project project, AbstractDataContainer dataContainer) { + // load map traitname > stratename + Map<String, String> haulAndStratas = new HashMap<String, String>(); + Iterator<String[]> itHaul = dataContainer.getHaul().iterator(); + itHaul.next(); // skip header + while (itHaul.hasNext()) { + String[] tuple = itHaul.next(); + String haul = tuple[Haul.INDEX_HAUL]; + String strataName = tuple[Haul.INDEX_STRATUM]; + haulAndStratas.put(haul, strataName); + } + + // dimensions + Set<Double> lengthSet = new HashSet<Double>(); + Set<String> speciesSet = new HashSet<String>(); + Set<String> strataSet = new HashSet<String>(); + Set<String> yearsSet = new HashSet<String>(); + + Iterator<String[]> itData = dataContainer.getLength().iterator(); + itData.next(); // skip header + while (itData.hasNext()) { + String[] tuple = itData.next(); + + String year = tuple[Length.INDEX_YEAR]; + String haul = tuple[Length.INDEX_HAUL]; + String species = tuple[Length.INDEX_SPECIES]; + String lengthAsString = tuple[Length.INDEX_LENGTH]; + 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); + yearsSet.add(year); + + // get correct length step + // plain or half centimeters + try { + double length = Double.parseDouble(lengthAsString); + + // get length step to use + double ceil = Math.ceil(length); + double floor = Math.floor(length); + // ne pas prendre 0.5 car 10.0 serait arrondit à 10.5 + double round = Math.floor(length + 0.499999); + + // on prend le pas ou demi pas le plus proche + if (ceil == round) { + length = floor + 0.5; + } + else { + length = floor; + } + + lengthSet.add(length); + } + catch (NumberFormatException ex) { + if (log.isWarnEnabled()) { + log.warn("Can't parse length as double : " + lengthAsString); + } + } + } + + // 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); + Collections.sort(strataSem); + List<String> yearsSem = new ArrayList<String>(yearsSet); + Collections.sort(yearsSem); + + if (log.isDebugEnabled()) { + log.debug(_("Creating matrix : %d*%d*%d*%d", lengthSem.size(), speciesSem.size(), strataSem.size(), yearsSem.size())); + } + + MatrixND matrix = MatrixFactory.getInstance().createProxy(n_("coser.business.matrix.lengthstructure"), + new List<?>[] { lengthSem , speciesSem, strataSem, yearsSem}, + new String[] {n_("coser.business.common.length"), + n_("coser.business.common.species"), + n_("coser.business.common.strata"), + n_("coser.business.common.years")}, + new LengthStructureMatrixProvider(project, dataContainer)); + + return matrix; + } + /** + * Length structure matrix provider. + */ + class LengthStructureMatrixProvider implements MatrixProvider { + + protected Project project; + + protected AbstractDataContainer container; + + public LengthStructureMatrixProvider(Project project, AbstractDataContainer container) { + this.project = project; + this.container = container; + } + + /* + * @see org.nuiton.math.matrix.MatrixProvider#fillValues(org.nuiton.math.matrix.MatrixND) + */ + @Override + public void fillValues(MatrixND matrix) { + fillLengthStructureMatrix(project, container, matrix); + } + } + + /** + * Length structure matrix provider filler part. + * + * @param project project + * @param dataContainer data container + * @param matrix non proxy matrix to fill (inited with 0.0) + */ + public void fillLengthStructureMatrix(Project project, AbstractDataContainer dataContainer, MatrixND matrix) { + + // load map traitname > stratename + Map<String, String> haulAndStratas = new HashMap<String, String>(); + Iterator<String[]> itHaul = dataContainer.getHaul().iterator(); + itHaul.next(); // skip header + while (itHaul.hasNext()) { + String[] tuple = itHaul.next(); + String haul = tuple[Haul.INDEX_HAUL]; + String strataName = tuple[Haul.INDEX_STRATUM]; + haulAndStratas.put(haul, strataName); + } + DimensionHelper dimHelper = new DimensionHelper(); + + Iterator<String[]> itData = dataContainer.getLength().iterator(); + itData.next(); // skip header + while (itData.hasNext()) { + String[] tuple = itData.next(); + + String year = tuple[Length.INDEX_YEAR]; + String haul = tuple[Length.INDEX_HAUL]; + String species = tuple[Length.INDEX_SPECIES]; + String lengthAsString = tuple[Length.INDEX_LENGTH]; + 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; + } + + // quitte l'iteration courante si les dimensions demandée + // ne sont pas dans la matrice reduite + if (!matrix.getSemantic(1).contains(species)) { + continue; + } + if (!matrix.getSemantic(2).contains(strata)) { + continue; + } + if (!matrix.getSemantic(3).contains(year)) { + continue; + } + + // get correct length step + // plain or half centimeters + try { + double length = Double.parseDouble(lengthAsString); + + // get length step to use + double ceil = Math.ceil(length); + double floor = Math.floor(length); + // ne pas prendre 0.5 car 10.0 serait arrondit à 10.5 + double round = Math.floor(length + 0.499999); + + // on prend le pas ou demi pas le plus proche + if (ceil == round) { + length = floor + 0.5; + } + else { + length = floor; + } + + if (!matrix.getSemantic(0).contains(length)) { + continue; + } + + try { + double number = Double.parseDouble(numberAsString); + + // dimHelper is more performant + double currentNumber = matrix.getValue(dimHelper.get(length, species, strata, year)); + currentNumber += number; + matrix.setValue(dimHelper.get(length, species, strata, year), currentNumber); + } + catch (NumberFormatException ex) { + if (log.isWarnEnabled()) { + log.warn("Can't parse number as double : " + numberAsString); + } + } + } + catch (NumberFormatException ex) { + if (log.isWarnEnabled()) { + log.warn("Can't parse length as double : " + lengthAsString); + } + } + } + } + + /** * Extrait les données de la selection * * @param project project Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java 2010-12-15 17:59:14 UTC (rev 423) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java 2010-12-16 17:22:30 UTC (rev 424) @@ -65,10 +65,10 @@ public void run() { try { setWaitCursor(parent); - + // get matrix MatrixND matrix = projectService.getLengthStructure(project, container); - + // display matrix viewer component JFrame matrixViewerFrame = new JFrame(_("coser.ui.graph.lengthStructure")); matrixViewerFrame.setName("lengthstructureframe");

1 0