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