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

r617 - in trunk/coser-ui/src/main/java/fr/ifremer/coser/ui: common project result selection
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 13:24:51 +0000 (Mon, 31 Jan 2011) New Revision: 617 Log: Select file chooser with defaut current directory Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java 2011-01-31 13:14:19 UTC (rev 616) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java 2011-01-31 13:24:51 UTC (rev 617) @@ -52,11 +52,13 @@ * Retourne une unique instance du file chooser pour conserver * le répertoire de sélection d'un appel sur l'autre. * + * @param currentDirectory current directory * @return file chooser */ - protected JFileChooser getFileChooserInstance() { + protected JFileChooser getFileChooserInstance(File currentDirectory) { if (fileChooserInstance == null) { fileChooserInstance = new JFileChooser(); + fileChooserInstance.setCurrentDirectory(currentDirectory); } return fileChooserInstance; } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java 2011-01-31 13:14:19 UTC (rev 616) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java 2011-01-31 13:24:51 UTC (rev 617) @@ -97,7 +97,8 @@ * @param textComponent text component to fill */ public void selectInputFile(ProjectCreationView projectView, JTextField textComponent) { - JFileChooser selectFileChooser = getFileChooserInstance(); + CoserConfig config = projectView.getContextValue(CoserConfig.class); + JFileChooser selectFileChooser = getFileChooserInstance(config.getProjectsDirectory()); selectFileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY); int result = selectFileChooser.showOpenDialog(projectView); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java 2011-01-31 13:14:19 UTC (rev 616) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java 2011-01-31 13:24:51 UTC (rev 617) @@ -254,7 +254,8 @@ * @param textComponent text component to set selected file */ public void selectExportDirectory(ExportUploadDialog view, JTextField textComponent) { - JFileChooser selectFileChooser = getFileChooserInstance(); + CoserConfig config = view.getContextValue(CoserConfig.class); + JFileChooser selectFileChooser = getFileChooserInstance(config.getProjectsDirectory()); selectFileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); int result = selectFileChooser.showOpenDialog(view); 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-01-31 13:14:19 UTC (rev 616) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-01-31 13:24:51 UTC (rev 617) @@ -65,6 +65,7 @@ import com.bbn.openmap.gui.Tool; import fr.ifremer.coser.CoserBusinessException; +import fr.ifremer.coser.CoserConfig; import fr.ifremer.coser.CoserException; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.bean.RSufiResult; @@ -1143,7 +1144,8 @@ * @param textComponent text component to set selected directory */ public void selectOutputDirectory(SelectionRsufiView view, JTextField textComponent) { - JFileChooser selectFileChooser = getFileChooserInstance(); + CoserConfig config = view.getContextValue(CoserConfig.class); + JFileChooser selectFileChooser = getFileChooserInstance(config.getProjectsDirectory()); selectFileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); int result = selectFileChooser.showOpenDialog(view); @@ -1183,7 +1185,8 @@ * @param textComponent text component to set selected file */ public void selectResultFile(SelectionAddResultDialog view, JTextField textComponent) { - JFileChooser selectFileChooser = getFileChooserInstance(); + CoserConfig config = view.getContextValue(CoserConfig.class); + JFileChooser selectFileChooser = getFileChooserInstance(config.getProjectsDirectory()); selectFileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY); int result = selectFileChooser.showOpenDialog(view); @@ -1200,7 +1203,8 @@ * @param textComponent text component to set selected directory */ public void selectMapsDirectory(SelectionAddResultDialog view, JTextField textComponent) { - JFileChooser selectFileChooser = getFileChooserInstance(); + CoserConfig config = view.getContextValue(CoserConfig.class); + JFileChooser selectFileChooser = getFileChooserInstance(config.getProjectsDirectory()); selectFileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); int result = selectFileChooser.showOpenDialog(view); @@ -1217,7 +1221,8 @@ * @param listComponent list component to set selected file */ public void selectResultFileOrDirectory(SelectionAddResultDialog view, JList listComponent) { - JFileChooser selectFileChooser = getFileChooserInstance(); + CoserConfig config = view.getContextValue(CoserConfig.class); + JFileChooser selectFileChooser = getFileChooserInstance(config.getProjectsDirectory()); selectFileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES); int result = selectFileChooser.showOpenDialog(view);

1 0

r616 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 13:14:19 +0000 (Mon, 31 Jan 2011) New Revision: 616 Log: Fix les valeurs bornes apres les valeurs nulles. 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/LengthStructureMatrixFilter.java 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 2011-01-31 13:01:26 UTC (rev 615) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java 2011-01-31 13:14:19 UTC (rev 616) @@ -81,6 +81,7 @@ matrixViewerFrame.add(panel); matrixViewerFrame.pack(); matrixViewerFrame.setLocationRelativeTo(parent); + matrixViewerFrame.toFront(); session.add(matrixViewerFrame); // session restore matrixViewerFrame.setVisible(true); } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixFilter.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixFilter.java 2011-01-31 13:01:26 UTC (rev 615) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixFilter.java 2011-01-31 13:14:19 UTC (rev 616) @@ -73,9 +73,10 @@ if ("coser.business.common.length".equals(semantic0Name)) { List<?> semantic0 = matrix.getSemantic(0); - double first = (Double)matrix.getSemantic(0).get(0); - double last = (Double)matrix.getSemantic(0).get(matrix.getSemantic(0).size() - 1); - + double first = Double.MAX_VALUE; + double last = Double.MIN_VALUE; + boolean atLeastOneAdujments = false; + // on cherche les bornes qui ont des valeurs sup à 0.0 // sinon, ya du vide autour des choses demandées // mais le vide entre est requis (trou de données) @@ -90,10 +91,19 @@ if (last < category) { last = category; } + atLeastOneAdujments = true; } } } + // cas ou toutes les valeurs sont a zero et les + // bornes ne sont pas ajustées + // chose incohérente... + if (!atLeastOneAdujments) { + first = (Double)matrix.getSemantic(0).get(0); + last = (Double)matrix.getSemantic(0).get(matrix.getSemantic(0).size() - 1); + } + // on verifie toutes les valeurs pour savoir si c'est un // pas entier ou un demi pas boolean haltStep = false;

1 0

r615 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 13:01:26 +0000 (Mon, 31 Jan 2011) New Revision: 615 Log: Remember configuration window size 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 2011-01-28 11:49:24 UTC (rev 614) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2011-01-31 13:01:26 UTC (rev 615) @@ -201,6 +201,11 @@ dialogUI.add(configUI); dialogUI.pack(); dialogUI.setLocationRelativeTo(view); + + // restore session size + SwingSession session = (SwingSession)view.getContextValue(SwingSession.class); + session.add(dialogUI); + dialogUI.setVisible(true); }

1 0

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

28 Jan '11

Author: chatellier Date: 2011-01-28 11:49:24 +0000 (Fri, 28 Jan 2011) New Revision: 614 Log: Update libs Modified: trunk/changelog.txt trunk/pom.xml Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-01-28 11:49:15 UTC (rev 613) +++ trunk/changelog.txt 2011-01-28 11:49:24 UTC (rev 614) @@ -1,12 +1,18 @@ Coser release notes =================== +1.0.0-beta3 +----------- + + * Update jaxx to 2.3 + * Update nuiton-widgets to 1.1.1 + * Update nuiton-i18n to 2.2 + 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.0-beta1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-28 11:49:15 UTC (rev 613) +++ trunk/pom.xml 2011-01-28 11:49:24 UTC (rev 614) @@ -147,12 +147,6 @@ <artifactId>jaxx-validator</artifactId> <version>${jaxx.version}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>com.opensymphony</groupId> - <artifactId>xwork</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -193,7 +187,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-widgets</artifactId> - <version>1.1</version> + <version>1.1.1-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -319,8 +313,8 @@ <license.organizationName>Ifremer, Codelutin</license.organizationName>  - <jaxx.version>2.2.5</jaxx.version> - <i18n.version>2.1</i18n.version> + <jaxx.version>2.3</jaxx.version> + <i18n.version>2.2</i18n.version> <struts.version>2.2.1.1</struts.version> </properties>

1 0

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