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

r613 - in trunk: coser-business/src/site/rst coser-ui/src/site/rst coser-web/src/site/rst src/site/rst
by chatellier＠users.labs.libre-entreprise.org 28 Jan '11

28 Jan '11

Author: chatellier Date: 2011-01-28 11:49:15 +0000 (Fri, 28 Jan 2011) New Revision: 613 Log: Fix site Removed: trunk/coser-business/src/site/rst/release-note.rst trunk/coser-ui/src/site/rst/release-note.rst trunk/coser-web/src/site/rst/release-note.rst trunk/src/site/rst/release-note.rst Modified: trunk/src/site/rst/download.rst Deleted: trunk/coser-business/src/site/rst/release-note.rst =================================================================== --- trunk/coser-business/src/site/rst/release-note.rst 2011-01-28 08:59:01 UTC (rev 612) +++ trunk/coser-business/src/site/rst/release-note.rst 2011-01-28 11:49:15 UTC (rev 613) @@ -1,24 +0,0 @@ -.. - -.. * #%L -.. * Coser :: Business -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin -.. * %% -.. * 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% -.. - Deleted: trunk/coser-ui/src/site/rst/release-note.rst =================================================================== --- trunk/coser-ui/src/site/rst/release-note.rst 2011-01-28 08:59:01 UTC (rev 612) +++ trunk/coser-ui/src/site/rst/release-note.rst 2011-01-28 11:49:15 UTC (rev 613) @@ -1,24 +0,0 @@ -.. - -.. * #%L -.. * Coser :: UI -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin -.. * %% -.. * 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% -.. - Deleted: trunk/coser-web/src/site/rst/release-note.rst =================================================================== --- trunk/coser-web/src/site/rst/release-note.rst 2011-01-28 08:59:01 UTC (rev 612) +++ trunk/coser-web/src/site/rst/release-note.rst 2011-01-28 11:49:15 UTC (rev 613) @@ -1,23 +0,0 @@ -.. - -.. * #%L -.. * Coser :: Web -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin -.. * %% -.. * This program is free software: you can redistribute it and/or modify -.. * it under the terms of the GNU Affero 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 Affero General Public License -.. * along with this program. If not, see <http://www.gnu.org/licenses/>. -.. * #L% -.. - Modified: trunk/src/site/rst/download.rst =================================================================== --- trunk/src/site/rst/download.rst 2011-01-28 08:59:01 UTC (rev 612) +++ trunk/src/site/rst/download.rst 2011-01-28 11:49:15 UTC (rev 613) @@ -25,8 +25,15 @@ Lancement ========= +Lancement en ligne +------------------ Vous pouvez lancer l'application directement en ligne (JavaWebStart) depuis `cette page`_. +Téléchargement +-------------- +Vous pouvez également télécharger l'application pour la lancer localement : +`télécharger coser`_. + .. _cette page: coser-ui/jnlp-report.html - +.. _télécharger coser: http://labs.libre-entreprise.org/frs/?group_id=164 Deleted: trunk/src/site/rst/release-note.rst =================================================================== --- trunk/src/site/rst/release-note.rst 2011-01-28 08:59:01 UTC (rev 612) +++ trunk/src/site/rst/release-note.rst 2011-01-28 11:49:15 UTC (rev 613) @@ -1,31 +0,0 @@ -.. - -.. * #%L -.. * Coser -.. * -.. * $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% -.. - -Coser release notes -=================== - -1.0.0-beta1 ------------ - - * Initial beta release.

1 0

r612 - in trunk: . coser-business coser-ui coser-web
by chatellier＠users.labs.libre-entreprise.org 28 Jan '11

28 Jan '11

Author: chatellier Date: 2011-01-28 08:59:01 +0000 (Fri, 28 Jan 2011) New Revision: 612 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-01-28 08:58:59 UTC (rev 611) +++ trunk/coser-business/pom.xml 2011-01-28 08:59:01 UTC (rev 612) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.0-beta2</version> + <version>1.0.0-beta3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2011-01-28 08:58:59 UTC (rev 611) +++ trunk/coser-ui/pom.xml 2011-01-28 08:59:01 UTC (rev 612) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.0-beta2</version> + <version>1.0.0-beta3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2011-01-28 08:58:59 UTC (rev 611) +++ trunk/coser-web/pom.xml 2011-01-28 08:59:01 UTC (rev 612) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.0-beta2</version> + <version>1.0.0-beta3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-28 08:58:59 UTC (rev 611) +++ trunk/pom.xml 2011-01-28 08:59:01 UTC (rev 612) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.0-beta2</version> + <version>1.0.0-beta3-SNAPSHOT</version> <packaging>pom</packaging> <modules> @@ -325,9 +325,9 @@ </properties> <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/coser/tags/coser-1.0.0-beta2</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/coser/tags/coser-1.0.0-beta2</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/coser-1.0.0-beta2?root…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/coser/trunk</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/coser/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=coser</url> </scm> <build>

1 0

r611 - tags
by chatellier＠users.labs.libre-entreprise.org 28 Jan '11

28 Jan '11

Author: chatellier Date: 2011-01-28 08:58:59 +0000 (Fri, 28 Jan 2011) New Revision: 611 Log: [maven-release-plugin] copy for tag coser-1.0.0-beta2 Added: tags/coser-1.0.0-beta2/

1 0

r610 - in trunk: . coser-business coser-ui coser-web
by chatellier＠users.labs.libre-entreprise.org 28 Jan '11

28 Jan '11

Author: chatellier Date: 2011-01-28 08:58:55 +0000 (Fri, 28 Jan 2011) New Revision: 610 Log: [maven-release-plugin] prepare release coser-1.0.0-beta2 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-01-28 08:54:52 UTC (rev 609) +++ trunk/coser-business/pom.xml 2011-01-28 08:58:55 UTC (rev 610) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.0-beta2-SNAPSHOT</version> + <version>1.0.0-beta2</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2011-01-28 08:54:52 UTC (rev 609) +++ trunk/coser-ui/pom.xml 2011-01-28 08:58:55 UTC (rev 610) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.0-beta2-SNAPSHOT</version> + <version>1.0.0-beta2</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2011-01-28 08:54:52 UTC (rev 609) +++ trunk/coser-web/pom.xml 2011-01-28 08:58:55 UTC (rev 610) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.0-beta2-SNAPSHOT</version> + <version>1.0.0-beta2</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-28 08:54:52 UTC (rev 609) +++ trunk/pom.xml 2011-01-28 08:58:55 UTC (rev 610) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.0-beta2-SNAPSHOT</version> + <version>1.0.0-beta2</version> <packaging>pom</packaging> <modules> @@ -325,9 +325,9 @@ </properties> <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/coser/trunk</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/coser/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=coser</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/coser/tags/coser-1.0.0-beta2</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/coser/tags/coser-1.0.0-beta2</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/coser-1.0.0-beta2?root…</url> </scm> <build>

1 0

r609 - in trunk/coser-business/src/main/java/fr/ifremer/coser: command services
by chatellier＠users.labs.libre-entreprise.org 28 Jan '11

28 Jan '11

Author: chatellier Date: 2011-01-28 08:54:52 +0000 (Fri, 28 Jan 2011) New Revision: 609 Log: Fix javadoc Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2011-01-28 08:45:35 UTC (rev 608) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2011-01-28 08:54:52 UTC (rev 609) @@ -190,9 +190,9 @@ * * Somme les "Nombre" et "Poids" * - * @param mergeTuple - * @param tuple - * @return + * @param tuple1 first tuple to merge + * @param tuple2 second tuple to merge + * @return merged tuples */ protected String[] mergeLengths(String[] tuple1, String[] tuple2) { @@ -228,8 +228,8 @@ /** * Return true if a value * - * @param data - * @return + * @param data data value to check + * @return {@code true} if value is empty or NA */ protected boolean isNotAvailableData(String data) { boolean result = false; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-01-28 08:45:35 UTC (rev 608) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-01-28 08:54:52 UTC (rev 609) @@ -717,9 +717,9 @@ * est refusé, il ne descend pas dans les sous répertoire alors que dans * notre cas il le faut. * - * @param directory directory - * @param projectsDirectory - * @param indicatorsFileFilter + * @param srcDir source directory to copy + * @param destDir destination directory + * @param indicatorsFileFilter file filter for file to copy * @throws IOException */ protected void customCopyDirectory(File srcDir, @@ -1300,7 +1300,7 @@ * * @param project project * @param resultDirectory rsufi result directory - * @param rSUfiResult rsufi result + * @param rsufiResult rsufi result * @return map with each species code/species name * @throws CoserBusinessException */ @@ -1452,7 +1452,6 @@ * * @param resultDirectory rsufi result directory * @param rsufiResult result - * @param species to get indicator * @param locale locale ({@code fr} ou {@code en}) * @return indicator for species * @throws CoserBusinessException @@ -1613,7 +1612,7 @@ * @param selectionDirectory selection directory * @param resultDirectory rsufi result directory * @param rSufiResult rsufi result - * @param string species species (can be null for community) + * @param species species (can be null for community) * @param indicator indicator * @param locale locale (fr/en) * @return generated file (auto delete when jvm shutdown)

1 0

r608 - trunk
by chatellier＠users.labs.libre-entreprise.org 28 Jan '11

28 Jan '11

Author: chatellier Date: 2011-01-28 08:45:35 +0000 (Fri, 28 Jan 2011) New Revision: 608 Log: Update changelog Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-01-28 08:39:41 UTC (rev 607) +++ trunk/changelog.txt 2011-01-28 08:45:35 UTC (rev 608) @@ -4,6 +4,7 @@ 1.0.0-beta2 ----------- + * Fix input stream progress read() buffer bug * Add selection name in rsufi extracted information file * Add trace to time import file * Add missing images : C_Crustaflam.png et C_Noursom.png

1 0

r607 - in trunk/coser-business/src/main: java/fr/ifremer/coser/services java/fr/ifremer/coser/util resources/i18n
by chatellier＠users.labs.libre-entreprise.org 28 Jan '11

28 Jan '11

Author: chatellier Date: 2011-01-28 08:39:41 +0000 (Fri, 28 Jan 2011) New Revision: 607 Log: Fix stream progress buffer bug Added: 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 trunk/coser-business/src/main/java/fr/ifremer/coser/util/ProgressStream.java trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 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 2011-01-27 10:54:55 UTC (rev 606) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java 2011-01-28 08:39:41 UTC (rev 607) @@ -63,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.ProgressStream; +import fr.ifremer.coser.util.ProgressReader; /** * File import/export service. @@ -129,10 +129,10 @@ try { InputStream stream = new FileInputStream(file); + Reader reader = new BufferedReader(new InputStreamReader(stream, CoserConstants.CSV_FILE_ENCODING)); if (progress != null) { - stream = new ProgressStream(stream, progress); + reader = new ProgressReader(reader, progress); } - Reader reader = new BufferedReader(new InputStreamReader(stream, CoserConstants.CSV_FILE_ENCODING)); csvReader = new CSVReader(reader, CoserConstants.CSV_SEPARATOR_CHAR); // check header Added: trunk/coser-business/src/main/java/fr/ifremer/coser/util/ProgressReader.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/util/ProgressReader.java (rev 0) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/util/ProgressReader.java 2011-01-28 08:39:41 UTC (rev 607) @@ -0,0 +1,149 @@ +/* + * #%L + * + * + * $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% + */ + +package fr.ifremer.coser.util; + +import java.io.IOException; +import java.io.Reader; +import java.nio.CharBuffer; + +/** + * Reader that notify read progression. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class ProgressReader extends Reader { + + /** Delegate reader */ + protected Reader delegateReader; + + /** Progress monitor notified. */ + protected ProgressMonitor delegateProgress; + + public ProgressReader(Reader delegateReader, ProgressMonitor delegateProgress) { + 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 != -1) { + delegateProgress.addCurrent(nb); + } + return nb; + } + + /* + * @see java.io.Reader#read(java.nio.CharBuffer) + */ + @Override + public int read(CharBuffer target) throws IOException { + int nb = delegateReader.read(target); + if (nb != -1) { + delegateProgress.addCurrent(nb); + } + return nb; + } + + /* + * @see java.io.Reader#read() + */ + @Override + public int read() throws IOException { + int nb = delegateReader.read(); + if (nb != -1) { + delegateProgress.addCurrent(nb); + } + return nb; + } + + /* + * @see java.io.Reader#read(char[]) + */ + @Override + public int read(char[] cbuf) throws IOException { + int nb = delegateReader.read(cbuf); + if (nb != -1) { + delegateProgress.addCurrent(nb); + } + return nb; + } + + /* + * @see java.io.Reader#skip(long) + */ + @Override + public long skip(long n) throws IOException { + return delegateReader.skip(n); + } + + /* + * @see java.io.Reader#ready() + */ + @Override + public boolean ready() throws IOException { + return delegateReader.ready(); + } + + /* + * @see java.io.Reader#markSupported() + */ + @Override + public boolean markSupported() { + return delegateReader.markSupported(); + } + + /* + * @see java.io.Reader#mark(int) + */ + @Override + public void mark(int readAheadLimit) throws IOException { + delegateReader.mark(readAheadLimit); + } + + /* + * @see java.io.Reader#reset() + */ + @Override + public void reset() throws IOException { + delegateReader.reset(); + } + + /* + * @see java.io.Reader#close() + */ + @Override + public void close() throws IOException { + delegateReader.close(); + } +} Property changes on: trunk/coser-business/src/main/java/fr/ifremer/coser/util/ProgressReader.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/util/ProgressStream.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/util/ProgressStream.java 2011-01-27 10:54:55 UTC (rev 606) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/util/ProgressStream.java 2011-01-28 08:39:41 UTC (rev 607) @@ -57,15 +57,79 @@ public int read() throws IOException { int nb = delegateStream.read(); if (nb != -1) { - delegateProgress.addCurrent(1); + delegateProgress.addCurrent(nb); } return nb; } /* - * @see java.io.Reader#close() + * @see java.io.InputStream#read(byte[], int, int) */ @Override + public int read(byte[] b, int off, int len) throws IOException { + int nb = delegateStream.read(b, off, len); + if (nb != -1) { + delegateProgress.addCurrent(nb); + } + return nb; + } + + /* + * @see java.io.InputStream#read(byte[]) + */ + @Override + public int read(byte[] b) throws IOException { + int nb = delegateStream.read(b); + if (nb != -1) { + delegateProgress.addCurrent(nb); + } + return nb; + } + + /* + * @see java.io.InputStream#skip(long) + */ + @Override + public long skip(long n) throws IOException { + return delegateStream.skip(n); + } + + /* + * @see java.io.InputStream#available() + */ + @Override + public int available() throws IOException { + return delegateStream.available(); + } + + /* + * @see java.io.InputStream#mark(int) + */ + @Override + public synchronized void mark(int readlimit) { + delegateStream.mark(readlimit); + } + + /* + * @see java.io.InputStream#reset() + */ + @Override + public synchronized void reset() throws IOException { + delegateStream.reset(); + } + + /* + * @see java.io.InputStream#markSupported() + */ + @Override + public boolean markSupported() { + return delegateStream.markSupported(); + } + + /* + * @see java.io.InputStream#close() + */ + @Override public void close() throws IOException { delegateStream.close(); } 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 2011-01-27 10:54:55 UTC (rev 606) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-01-28 08:39:41 UTC (rev 607) @@ -69,7 +69,7 @@ coser.business.extract.projectAuthor=Auteur du projet \: coser.business.extract.projectComment=Commentaire du projet \: coser.business.extract.projectName=Nom du project \: -coser.business.extract.selectionNameNom de la s\u00E9lection \: +coser.business.extract.selectionName=Nom de la s\u00E9lection \: coser.business.line=Ligne coser.business.matrix.density=Densit\u00E9 coser.business.matrix.lengthstructure=Structures en taille

1 0

r606 - in trunk: . coser-business/src/main/java/fr/ifremer/coser/services coser-business/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 27 Jan '11

27 Jan '11

Author: chatellier Date: 2011-01-27 10:54:55 +0000 (Thu, 27 Jan 2011) New Revision: 606 Log: Add selection name in rsufi extracted information file Modified: trunk/changelog.txt 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/changelog.txt =================================================================== --- trunk/changelog.txt 2011-01-27 10:21:33 UTC (rev 605) +++ trunk/changelog.txt 2011-01-27 10:54:55 UTC (rev 606) @@ -0,0 +1,14 @@ +Coser release notes +=================== + +1.0.0-beta2 +----------- + + * Add selection name in rsufi extracted information file + * Add trace to time import file + * Add missing images : C_Crustaflam.png et C_Noursom.png + +1.0.0-beta1 +----------- + + * Initial beta release. \ No newline at end of file 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-01-27 10:21:33 UTC (rev 605) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2011-01-27 10:54:55 UTC (rev 606) @@ -2663,6 +2663,7 @@ out.println(_("coser.business.extract.projectName") + project.getName()); out.println(_("coser.business.extract.projectAuthor") + project.getAuthor()); out.println(_("coser.business.extract.projectComment") + project.getComment()); + out.println(_("coser.business.extract.selectionName") + selection.getName()); } catch (IOException ex) { throw new CoserBusinessException("Can't save project information file", ex); } 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 2011-01-27 10:21:33 UTC (rev 605) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-01-27 10:54:55 UTC (rev 606) @@ -69,6 +69,7 @@ coser.business.extract.projectAuthor=Project author \: coser.business.extract.projectComment=Project comment \: coser.business.extract.projectName=Project name \: +coser.business.extract.selectionName=Selection name \: coser.business.line=Line coser.business.matrix.density=Density coser.business.matrix.lengthstructure=Length structures 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 2011-01-27 10:21:33 UTC (rev 605) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-01-27 10:54:55 UTC (rev 606) @@ -69,6 +69,7 @@ coser.business.extract.projectAuthor=Auteur du projet \: coser.business.extract.projectComment=Commentaire du projet \: coser.business.extract.projectName=Nom du project \: +coser.business.extract.selectionNameNom de la s\u00E9lection \: coser.business.line=Ligne coser.business.matrix.density=Densit\u00E9 coser.business.matrix.lengthstructure=Structures en taille

1 0

r605 - trunk/coser-web/src/main/webapp/images/zones
by chatellier＠users.labs.libre-entreprise.org 27 Jan '11

27 Jan '11

Author: chatellier Date: 2011-01-27 10:21:33 +0000 (Thu, 27 Jan 2011) New Revision: 605 Log: Ajout de 2 images manquantes Added: trunk/coser-web/src/main/webapp/images/zones/C_Crustaflam.png trunk/coser-web/src/main/webapp/images/zones/C_Noursom.png Added: trunk/coser-web/src/main/webapp/images/zones/C_Crustaflam.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/zones/C_Crustaflam.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/coser-web/src/main/webapp/images/zones/C_Noursom.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/zones/C_Noursom.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r604 - trunk
by chatellier＠users.labs.libre-entreprise.org 27 Jan '11

27 Jan '11

Author: chatellier Date: 2011-01-27 09:20:51 +0000 (Thu, 27 Jan 2011) New Revision: 604 Log: Update mavenpom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-27 08:33:29 UTC (rev 603) +++ trunk/pom.xml 2011-01-27 09:20:51 UTC (rev 604) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.4.2</version> + <version>2.4.3</version> </parent> <groupId>fr.ifremer</groupId>

1 0