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

r1004 - in trunk: . coser-business coser-ui coser-web
by maven-release＠users.forge.codelutin.com 04 May '12

04 May '12

Author: maven-release Date: 2012-05-04 10:21:29 +0200 (Fri, 04 May 2012) New Revision: 1004 Url: http://forge.codelutin.com/repositories/revision/coser/1004 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 2012-05-04 08:21:22 UTC (rev 1003) +++ trunk/coser-business/pom.xml 2012-05-04 08:21:29 UTC (rev 1004) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.6</version> + <version>1.2.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2012-05-04 08:21:22 UTC (rev 1003) +++ trunk/coser-ui/pom.xml 2012-05-04 08:21:29 UTC (rev 1004) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.6</version> + <version>1.2.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2012-05-04 08:21:22 UTC (rev 1003) +++ trunk/coser-web/pom.xml 2012-05-04 08:21:29 UTC (rev 1004) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.6</version> + <version>1.2.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-04 08:21:22 UTC (rev 1003) +++ trunk/pom.xml 2012-05-04 08:21:29 UTC (rev 1004) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.6</version> + <version>1.2.7-SNAPSHOT</version> <packaging>pom</packaging> <modules> @@ -353,9 +353,9 @@ </properties> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.2.6</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.2.6</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/coser/tags/coser-1.2.6</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/coser/trunk</url> </scm> <build>

1 0

r1003 - tags
by maven-release＠users.forge.codelutin.com 04 May '12

04 May '12

Author: maven-release Date: 2012-05-04 10:21:22 +0200 (Fri, 04 May 2012) New Revision: 1003 Url: http://forge.codelutin.com/repositories/revision/coser/1003 Log: [maven-release-plugin] copy for tag coser-1.2.6 Added: tags/coser-1.2.6/

1 0

r1002 - in trunk: . coser-business coser-ui coser-web
by maven-release＠users.forge.codelutin.com 04 May '12

04 May '12

Author: maven-release Date: 2012-05-04 10:21:12 +0200 (Fri, 04 May 2012) New Revision: 1002 Url: http://forge.codelutin.com/repositories/revision/coser/1002 Log: [maven-release-plugin] prepare release coser-1.2.6 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 2012-05-03 13:57:04 UTC (rev 1001) +++ trunk/coser-business/pom.xml 2012-05-04 08:21:12 UTC (rev 1002) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.2.6</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2012-05-03 13:57:04 UTC (rev 1001) +++ trunk/coser-ui/pom.xml 2012-05-04 08:21:12 UTC (rev 1002) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.2.6</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2012-05-03 13:57:04 UTC (rev 1001) +++ trunk/coser-web/pom.xml 2012-05-04 08:21:12 UTC (rev 1002) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.2.6</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-03 13:57:04 UTC (rev 1001) +++ trunk/pom.xml 2012-05-04 08:21:12 UTC (rev 1002) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.2.6</version> <packaging>pom</packaging> <modules> @@ -353,9 +353,9 @@ </properties> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/coser/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.2.6</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.2.6</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/coser/tags/coser-1.2.6</url> </scm> <build>

1 0

r1001 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui
by echatellier＠users.forge.codelutin.com 03 May '12

03 May '12

Author: echatellier Date: 2012-05-03 15:57:04 +0200 (Thu, 03 May 2012) New Revision: 1001 Url: http://forge.codelutin.com/repositories/revision/coser/1001 Log: fixes #1218 NPE lorsque l'on rejoue une selection 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 2012-05-03 13:44:36 UTC (rev 1000) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2012-05-03 13:57:04 UTC (rev 1001) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2012 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 @@ -529,6 +529,12 @@ * Apply it, and display report to user. */ public void replaySelection() { + + // les données vont être déchargées pour creer la nouvelle selection + // il faut surtout pas conserver d'affichage sinon, ca devient + // incohérent + showSummaryView(); + SelectionReplayView replayView = new SelectionReplayView((JAXXContext)view, view); SelectionReplayHandler handler = replayView.getHandler(); handler.initReplayView(replayView);

1 0

r1000 - trunk/coser-business/src/main/java/fr/ifremer/coser/bean
by echatellier＠users.forge.codelutin.com 03 May '12

03 May '12

Author: echatellier Date: 2012-05-03 15:44:36 +0200 (Thu, 03 May 2012) New Revision: 1000 Url: http://forge.codelutin.com/repositories/revision/coser/1000 Log: Fix doc Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/package-info.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/package-info.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/package-info.java 2012-05-03 13:42:55 UTC (rev 999) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/package-info.java 2012-05-03 13:44:36 UTC (rev 1000) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2012 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 @@ -23,6 +23,6 @@ * #L% */ /** - * Storage stucture classes. + * Storage structure classes. */ package fr.ifremer.coser.bean;

1 0

r999 - in trunk: coser-business/src/main/java/fr/ifremer/coser/command coser-business/src/main/resources/i18n coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay coser-ui/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com 03 May '12

03 May '12

Author: echatellier Date: 2012-05-03 15:42:55 +0200 (Thu, 03 May 2012) New Revision: 999 Url: http://forge.codelutin.com/repositories/revision/coser/999 Log: fixes #1219 Lors de rejouer une selection, l'?\195?\169tape rejouer les commandes n'est pas ergonomique Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.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-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/CommandListRenderer.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayView.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/command/MergeSpeciesCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2012-05-03 13:21:37 UTC (rev 998) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2012-05-03 13:42:55 UTC (rev 999) @@ -381,7 +381,8 @@ @Override public String getDescription(AbstractDataContainer container) { - String desc = _("coser.business.command.mergespecies.desc", newSpecyName, speciesNames.length); + String speciesAsString = StringUtils.join(speciesNames, ", "); + String desc = _("coser.business.command.mergespecies.desc", newSpecyName, speciesNames.length, speciesAsString); if (StringUtils.isNotBlank(comment)) { desc += " (" + comment + ")"; } 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 2012-05-03 13:21:37 UTC (rev 998) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2012-05-03 13:42:55 UTC (rev 999) @@ -29,7 +29,7 @@ coser.business.chart.compareCatchLengthNumberTitle=Comparison of numbers in Catch and Length (%s) coser.business.command.deleteline.desc=File %s, line %s deleted coser.business.command.deleteline.log=In file %s, line %s has been deleted -coser.business.command.mergespecies.desc=Merge %2$s species into "%1$s" +coser.business.command.mergespecies.desc=Merge %2$s species into "%1$s" \: %3$s coser.business.command.mergespecies.log=Species "%2$s" has been merged to "%1$s" coser.business.command.modifyfield.desc=File %1$s, %3$s field modification (line %2$s) coser.business.command.modifyfield.log=In file %s at line %s, field "%s" value as been modify from "%s" to "%s" 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 2012-05-03 13:21:37 UTC (rev 998) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2012-05-03 13:42:55 UTC (rev 999) @@ -29,7 +29,7 @@ coser.business.chart.compareCatchLengthNumberTitle=Comparaison des nombres dans Capture et Taille (%s) coser.business.command.deleteline.desc=Fichier %s, suppression de la ligne %s coser.business.command.deleteline.log=Dans le fichier %s, la ligne %s a été supprimée -coser.business.command.mergespecies.desc=%2$s espèces ont été fusionnées en "%1$s" +coser.business.command.mergespecies.desc=%2$s espèces ont été fusionnées en "%1$s" \: %3$s coser.business.command.mergespecies.log=Les espèces "%2$s" ont été fusionnées en "%1$s" coser.business.command.modifyfield.desc=Fichier %1$s, modification du champ "%3$s" (ligne %2$s) coser.business.command.modifyfield.log=Dans le ficher %s à la ligne %s, le champs "%s" est passé de la valeur "%s" à "%s" Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/CommandListRenderer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/CommandListRenderer.java 2012-05-03 13:21:37 UTC (rev 998) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/CommandListRenderer.java 2012-05-03 13:42:55 UTC (rev 999) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2012 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 @@ -54,7 +54,10 @@ // replay where merge command don't use container to get desc String commandDesc = command.getDescription(null); + // is selected is forced to "true", because user can't disable + // command in replay selection as of coser version 1.2.x + // may change in v 2.0 return super.getListCellRendererComponent(list, commandDesc, index, - isSelected, cellHasFocus); + true, cellHasFocus); } } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayView.jaxx 2012-05-03 13:21:37 UTC (rev 998) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayView.jaxx 2012-05-03 13:42:55 UTC (rev 999) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 - 2011 Ifremer, Codelutin + Copyright (C) 2010 - 2012 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 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 2012-05-03 13:21:37 UTC (rev 998) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2012-05-03 13:42:55 UTC (rev 999) @@ -220,7 +220,7 @@ coser.ui.selection.replay.choosespecies=Choose species to keep \: coser.ui.selection.replay.choosestrata=Choose strata to keep \: coser.ui.selection.replay.chooseyears=Choose years to keep \: -coser.ui.selection.replay.commands=Command list to replay \: +coser.ui.selection.replay.commands=For info, all following commands will be replayed \: coser.ui.selection.replay.finishselection=Finish coser.ui.selection.replay.missingspecies=Some species are missing in current selection \: %s coser.ui.selection.replay.missingstrata=Some strata are missing in current selection \: %s 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 2012-05-03 13:21:37 UTC (rev 998) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2012-05-03 13:42:55 UTC (rev 999) @@ -220,7 +220,7 @@ coser.ui.selection.replay.choosespecies=Choisissez les espèces à conserver \: coser.ui.selection.replay.choosestrata=Choisissez les strates à conserver \: coser.ui.selection.replay.chooseyears=Choisissez les années à conserver \: -coser.ui.selection.replay.commands=Liste de toutes les commandes à rejouer \: +coser.ui.selection.replay.commands=Pour info, toutes les commandes suivantes vont être rejouées \: coser.ui.selection.replay.finishselection=Terminer coser.ui.selection.replay.missingspecies=Certaines espèces de la séléction à rejouer sont manquantes \: %s coser.ui.selection.replay.missingstrata=Certaines strates de la séléction à rejouer sont manquantes \: %s

1 0

r998 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui
by echatellier＠users.forge.codelutin.com 03 May '12

03 May '12

Author: echatellier Date: 2012-05-03 15:21:37 +0200 (Thu, 03 May 2012) New Revision: 998 Url: http://forge.codelutin.com/repositories/revision/coser/998 Log: fixes #1217 : La fenetre de rejouer une selection n'est pas rattach?\195?\169 a son parent 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 2012-05-03 13:16:19 UTC (rev 997) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2012-05-03 13:21:37 UTC (rev 998) @@ -529,7 +529,7 @@ * Apply it, and display report to user. */ public void replaySelection() { - SelectionReplayView replayView = new SelectionReplayView((JAXXContext)view); + SelectionReplayView replayView = new SelectionReplayView((JAXXContext)view, view); SelectionReplayHandler handler = replayView.getHandler(); handler.initReplayView(replayView); replayView.setLocationRelativeTo(view);

1 0

r997 - in trunk/coser-business/src: main/java/fr/ifremer/coser/command test/java/fr/ifremer/coser/services
by echatellier＠users.forge.codelutin.com 03 May '12

03 May '12

Author: echatellier Date: 2012-05-03 15:16:19 +0200 (Thu, 03 May 2012) New Revision: 997 Url: http://forge.codelutin.com/repositories/revision/coser/997 Log: Fix merge species Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.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 2012-05-02 08:46:26 UTC (rev 996) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2012-05-03 13:16:19 UTC (rev 997) @@ -151,8 +151,12 @@ Integer firstLineFound = firstLineForKey.get(key); if (firstLineFound == null) { + // on modifie le nom de la ligne dans tout les cas + tuple[Length.INDEX_SPECIES] = newSpecyName; + container.getLength().set(lineIndex, tuple); + firstLineForKey.put(key, lineIndex); - ++lineIndex; + lineIndex++; } else { String[] previousTuple = container.getLength().get(firstLineFound); @@ -279,8 +283,12 @@ Integer firstLineFound = firstLineForKey.get(key); if (firstLineFound == null) { + // on modifie le nom de la ligne dans tout les cas + tuple[Catch.INDEX_SPECIES] = newSpecyName; + container.getCatch().set(lineIndex, tuple); + firstLineForKey.put(key, lineIndex); - ++lineIndex; + lineIndex++; } else { String[] previousTuple = container.getCatch().get(firstLineFound); Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2012-05-02 08:46:26 UTC (rev 996) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2012-05-03 13:16:19 UTC (rev 997) @@ -332,13 +332,19 @@ Assert.assertEquals(25, selection.getCatch().size()); Assert.assertEquals(30, selection.getLength().size()); + // first merge project = projectService.mergeSpecies(project, selection, "COSER_SPECIES_1_3", null, "COSER_SPECIES1", "COSER_SPECIES3"); Assert.assertEquals(19, selection.getCatch().size()); Assert.assertEquals(28, selection.getLength().size()); + Assert.assertTrue(projectService.getProjectSpecies(selection).contains("COSER_SPECIES_1_3")); + Assert.assertFalse(projectService.getProjectSpecies(selection).contains("COSER_SPECIES1")); + // second merge project = projectService.mergeSpecies(project, selection, "COSER_SPECIES_2_4", null, "COSER_SPECIES2", "COSER_SPECIES4"); Assert.assertEquals(13, selection.getCatch().size()); Assert.assertEquals(26, selection.getLength().size()); + Assert.assertTrue(projectService.getProjectSpecies(selection).contains("COSER_SPECIES_2_4")); + Assert.assertFalse(projectService.getProjectSpecies(selection).contains("COSER_SPECIES4")); projectService.createProjectSelection(project, selection); }

1 0

r996 - in trunk: . coser-business/src/main/java/fr/ifremer/coser/command coser-business/src/main/java/fr/ifremer/coser/services coser-business/src/test/java/fr/ifremer/coser/services coser-business/src/test/resources/csv/correct
by echatellier＠users.forge.codelutin.com 02 May '12

02 May '12

Author: echatellier Date: 2012-05-02 10:46:26 +0200 (Wed, 02 May 2012) New Revision: 996 Url: http://forge.codelutin.com/repositories/revision/coser/996 Log: closes #1189 : Les lignes non contigues ne sont pas merg?\195?\169es dans le fichier de taille 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 trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java trunk/coser-business/src/test/resources/csv/correct/testlength.csv trunk/coser-business/src/test/resources/csv/correct/testreftax.csv trunk/pom.xml 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 2012-03-26 16:18:13 UTC (rev 995) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2012-05-02 08:46:26 UTC (rev 996) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 - 2012 Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2012 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 @@ -29,10 +29,11 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Map; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -113,40 +114,14 @@ // Campagne;Annee;Trait;Espece;Sexe;Maturite;Longueur;Nombre;Poids;Age // regroupement par Campagne;Annee;Trait;Espece;Sexe;Maturite;Longueur;Age - String[] commonTuple = null; - String[] mergeTuple = null; - int mergeTupleIndex = -1; + Map<String, Integer> firstLineForKey = new HashMap<String, Integer>(); // parcours des elements Iterator<String[]> itTuple = container.getLength().iterator(true); - int index = 1; // header skipped - + int lineIndex = 1; // skip header while (itTuple.hasNext()) { String[] tuple = itTuple.next(); - // search for diff in commonTuple and current tuple - // 1 = skip line index (0) - boolean diffFound = false; - if (commonTuple != null) { - for (int tupleIndex = 0 ; tupleIndex < commonTuple.length && !diffFound; ++tupleIndex) { - if (tupleIndex != Length.INDEX_LINE && tupleIndex != Length.INDEX_NUMBER - && tupleIndex != Length.INDEX_WEIGHT && tupleIndex != Length.INDEX_SPECIES) { - if (!commonTuple[tupleIndex].equals(tuple[tupleIndex])) { - diffFound = true; - } - } - } - } - else { - diffFound = true; - } - - if (diffFound) { - mergeTuple = null; - // clone parce que si c'est un tuple de merge... - commonTuple = (String[])ArrayUtils.clone(tuple); - } - // test si l'espece en cours fait partie de celle a merger String species = tuple[Length.INDEX_SPECIES]; boolean specyFound = false; @@ -160,24 +135,37 @@ // principale a merge, ou on merge avec le tuple // principal si on a deja un tuple principal if (specyFound) { - if (mergeTuple == null) { - mergeTuple = tuple; - mergeTuple[Length.INDEX_SPECIES] = newSpecyName; - mergeTupleIndex = index; + + // compute key (attention a ne pas prendre en compte l'espece : elle change) + StringBuffer sb = new StringBuffer(); + for (int tupleIndex = 0 ; tupleIndex < tuple.length; ++tupleIndex) { + if (tupleIndex == Length.INDEX_SURVEY || tupleIndex == Length.INDEX_YEAR || + tupleIndex == Length.INDEX_HAUL || tupleIndex == Length.INDEX_SEX || + tupleIndex == Length.INDEX_MATURITY || tupleIndex == Length.INDEX_LENGTH || + tupleIndex == Length.INDEX_AGE) { + sb.append(tuple[tupleIndex]).append(';'); + } } + + String key = sb.toString(); + Integer firstLineFound = firstLineForKey.get(key); + + if (firstLineFound == null) { + firstLineForKey.put(key, lineIndex); + ++lineIndex; + } else { - mergeTuple = mergeLengths(mergeTuple, tuple); + String[] previousTuple = container.getLength().get(firstLineFound); + String[] mergedTuple = mergeLengths(previousTuple, tuple); // et on supprime le tuple // qui a ete merge itTuple.remove(); - // bidouille le remove decalle les index suivants - index--; + // on update le precedent qui contient maintenant le merge + container.getLength().set(firstLineFound, mergedTuple); } - - container.getLength().set(mergeTupleIndex, mergeTuple); + } else { + ++lineIndex; } - - index++; } return project; } @@ -252,43 +240,18 @@ */ protected Project mergeCatch(Project project, AbstractDataContainer container, String newSpecyName, String... speciesNames) { - + // "Campagne","Annee","Trait","Espece","Nombre","Poids" // regroupement par campagne/annee/trait - String[] commonTuple = null; - String[] mergeTuple = null; - int mergeTupleIndex = -1; + Map<String, Integer> firstLineForKey = new HashMap<String, Integer>(); // parcours des elements Iterator<String[]> itTuple = container.getCatch().iterator(true); - int index = 1; // header skiped + int lineIndex = 1; // header skiped while (itTuple.hasNext()) { String[] tuple = itTuple.next(); - // si les valeurs servant au bornes de regroupement - // on changer, on reset les données du merge - boolean diffFound = false; - if (commonTuple != null) { - for (int tupleIndex = 0 ; tupleIndex < commonTuple.length && !diffFound; ++tupleIndex) { - if (tupleIndex != Catch.INDEX_LINE && tupleIndex != Catch.INDEX_NUMBER - && tupleIndex != Catch.INDEX_WEIGHT && tupleIndex != Catch.INDEX_SPECIES) { - if (!commonTuple[tupleIndex].equals(tuple[tupleIndex])) { - diffFound = true; - } - } - } - } - else { - diffFound = true; - } - - if (diffFound) { - mergeTuple = null; - // clone parce que si c'est un tuple de merge... - commonTuple = (String[])ArrayUtils.clone(tuple); - } - // test si l'espece en cours fait partie de celle a merger String species = tuple[Catch.INDEX_SPECIES]; boolean specyFound = false; @@ -302,24 +265,37 @@ // principale a merge, ou on merge avec le tuple // principal si on a deja un tuple principal if (specyFound) { - if (mergeTuple == null) { - mergeTuple = tuple; - mergeTuple[Catch.INDEX_SPECIES] = newSpecyName; - mergeTupleIndex = index; + + // compute key (attention a ne pas prendre en compte l'espece : elle change) + StringBuffer sb = new StringBuffer(); + for (int tupleIndex = 0 ; tupleIndex < tuple.length; ++tupleIndex) { + if (tupleIndex == Catch.INDEX_SURVEY || tupleIndex == Catch.INDEX_YEAR || + tupleIndex == Catch.INDEX_HAUL) { + sb.append(tuple[tupleIndex]).append(';'); + } } + + String key = sb.toString(); + Integer firstLineFound = firstLineForKey.get(key); + + if (firstLineFound == null) { + firstLineForKey.put(key, lineIndex); + ++lineIndex; + } else { - mergeTuple = mergeCatches(mergeTuple, tuple); + String[] previousTuple = container.getCatch().get(firstLineFound); + String[] mergeTuple = mergeCatches(previousTuple, tuple); // et on supprime le tuple // qui a ete merge itTuple.remove(); - // bidouille le remove decalle les index suivants - index--; + // on update le precedent qui contient maintenant le merge + container.getCatch().set(firstLineFound, mergeTuple); } - container.getCatch().set(mergeTupleIndex, mergeTuple); + } else { + lineIndex++; } - - index++; + } return project; 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 2012-03-26 16:18:13 UTC (rev 995) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2012-05-02 08:46:26 UTC (rev 996) @@ -2064,7 +2064,7 @@ // be sure that data are available for this project // or it will fail - projectService.loadSelectionData(projectsDirectory,project, selection); + projectService.loadSelectionData(projectsDirectory, project, selection); result = generateSourceZip(project, selection, resultFile, rsufiResult, locale); } Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2012-03-26 16:18:13 UTC (rev 995) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2012-05-02 08:46:26 UTC (rev 996) @@ -327,15 +327,19 @@ Selection selection = projectService.initProjectSelection(project); selection.setName("test"); - Assert.assertTrue(projectService.isSpeciesNameExist(project, "COSER_SPECIES_MERGE")); + Assert.assertTrue(projectService.isSpeciesNameExist(project, "COSER_SPECIES_1_3")); + Assert.assertTrue(projectService.isSpeciesNameExist(project, "COSER_SPECIES_2_4")); Assert.assertEquals(25, selection.getCatch().size()); Assert.assertEquals(30, selection.getLength().size()); - project = projectService.mergeSpecies(project, selection, "COSER_SPECIES_MERGE", null, "COSER_SPECIES1", "COSER_SPECIES2"); + project = projectService.mergeSpecies(project, selection, "COSER_SPECIES_1_3", null, "COSER_SPECIES1", "COSER_SPECIES3"); + Assert.assertEquals(19, selection.getCatch().size()); + Assert.assertEquals(28, selection.getLength().size()); - Assert.assertEquals(19, selection.getCatch().size()); - Assert.assertEquals(29, selection.getLength().size()); - + project = projectService.mergeSpecies(project, selection, "COSER_SPECIES_2_4", null, "COSER_SPECIES2", "COSER_SPECIES4"); + Assert.assertEquals(13, selection.getCatch().size()); + Assert.assertEquals(26, selection.getLength().size()); + projectService.createProjectSelection(project, selection); } Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2012-03-26 16:18:13 UTC (rev 995) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2012-05-02 08:46:26 UTC (rev 996) @@ -138,7 +138,7 @@ * @throws CoserBusinessException */ @Test - public void testUploadDirectoyMerge() throws CoserBusinessException { + public void testUploadDirectoryMerge() throws CoserBusinessException { registerUploadedResult("/web/upload1.zip"); // second upload with merge Modified: trunk/coser-business/src/test/resources/csv/correct/testlength.csv =================================================================== --- trunk/coser-business/src/test/resources/csv/correct/testlength.csv 2012-03-26 16:18:13 UTC (rev 995) +++ trunk/coser-business/src/test/resources/csv/correct/testlength.csv 2012-05-02 08:46:26 UTC (rev 996) @@ -14,7 +14,7 @@ COSER_TEST;2010;TRAIT3;COSER_SPECIES1;i;NA;20.39;3.00;0.28;NA COSER_TEST;2010;TRAIT3;COSER_SPECIES2;i;NA;19.88;3.00;0.31;NA COSER_TEST;2010;TRAIT3;COSER_SPECIES3;i;NA;18.16;1.00;0.34;NA -COSER_TEST;2010;TRAIT3;COSER_SPECIES4;i;NA;10.22;2.00;0.31;NA +COSER_TEST;2010;TRAIT3;COSER_SPECIES4;i;NA;19.88;2.00;0.31;NA COSER_TEST;2010;TRAIT3;COSER_SPECIES4;f;NA;33.03;5.00;0.26;NA COSER_TEST;2011;TRAIT1;COSER_SPECIES1;i;NA;1.00;4.00;0.81;NA COSER_TEST;2011;TRAIT1;COSER_SPECIES2;i;NA;27.61;3.00;NA @@ -22,9 +22,9 @@ COSER_TEST;2011;TRAIT1;COSER_SPECIES4;i;NA;6.86;1.00;0.23;NA COSER_TEST;2011;TRAIT2;COSER_SPECIES1;i;NA;15.04;4.00;0.95;NA COSER_TEST;2011;TRAIT2;COSER_SPECIES2;i;NA;35.03;1.00;0.26;NA -COSER_TEST;2011;TRAIT2;COSER_SPECIES3;i;NA;19.41;1.00;0.51;NA +COSER_TEST;2011;TRAIT2;COSER_SPECIES3;i;NA;15.04;1.00;0.51;NA COSER_TEST;2011;TRAIT2;COSER_SPECIES4;i;NA;24.58;2.00;NA COSER_TEST;2011;TRAIT3;COSER_SPECIES1;i;NA;2.46;3.00;0.32;NA COSER_TEST;2011;TRAIT3;COSER_SPECIES2;i;NA;18.93;5.00;0.22;NA -COSER_TEST;2011;TRAIT3;COSER_SPECIES3;i;NA;23.77;5.00;0.12;NA +COSER_TEST;2011;TRAIT3;COSER_SPECIES3;i;NA;2.46;5.00;0.12;NA COSER_TEST;2011;TRAIT3;COSER_SPECIES4;i;NA;0.94;3.00;0.77;NA Modified: trunk/coser-business/src/test/resources/csv/correct/testreftax.csv =================================================================== --- trunk/coser-business/src/test/resources/csv/correct/testreftax.csv 2012-03-26 16:18:13 UTC (rev 995) +++ trunk/coser-business/src/test/resources/csv/correct/testreftax.csv 2012-05-02 08:46:26 UTC (rev 996) @@ -3,4 +3,5 @@ "2";"000002";"2";"COSER_SPECIES2";"L'espece de test coser 2";"";"";""; "3";"000003";"3";"COSER_SPECIES3";"L'espece de test coser 3";"";"";""; "4";"000004";"4";"COSER_SPECIES4";"L'espece de test coser 4";"";"";""; -"5";"000005";"5";"COSER_SPECIES_MERGE";"L'espece de test coser pour fusion";"";"";""; +"5";"000005";"5";"COSER_SPECIES_1_3";"L'espece de test coser pour fusion1";"";"";""; +"5";"000005";"5";"COSER_SPECIES_2_4";"L'espece de test coser pour fusion2";"";"";""; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-26 16:18:13 UTC (rev 995) +++ trunk/pom.xml 2012-05-02 08:46:26 UTC (rev 996) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.2</version> + <version>3.3</version> </parent> <groupId>fr.ifremer</groupId>

1 0