Author: kmorin Date: 2013-05-24 14:48:12 +0200 (Fri, 24 May 2013) New Revision: 1003 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1003 Log: fixes #2504 [CAPTURE] pr?\195?\169ciser sur quel fraction porte le message en pi?\195?\168ce jointe : benthos ou esp?\195?\168ces Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-05-24 12:39:52 UTC (rev 1002) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-05-24 12:48:12 UTC (rev 1003) @@ -110,9 +110,12 @@ // du "Poids total Vrac trié", demander confirmation que // le "Poids total VRAC" est bien une valeur observée // sinon la remplacer par le "Poids total Vrac trié" + + getUI().getTabPane().setSelectedIndex(1); + String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, - _("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message", rate), + _("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message.species", rate), _("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.help")); int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), @@ -135,9 +138,12 @@ // du "Poids total Vrac trié", demander confirmation que // le "Poids total VRAC" est bien une valeur observée // sinon la remplacer par le "Poids total Vrac trié" + + getUI().getTabPane().setSelectedIndex(2); + String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, - _("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message", rate), + _("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message.benthos", rate), _("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.help")); int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-05-24 12:39:52 UTC (rev 1002) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-05-24 12:48:12 UTC (rev 1003) @@ -187,7 +187,7 @@ </JPanel> <Table fill='both' constraints='BorderLayout.SOUTH'> <row> - <cell columns='2'> + <cell columns='6'> <JSeparator/> </cell> </row> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-05-24 12:39:52 UTC (rev 1002) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-05-24 12:48:12 UTC (rev 1003) @@ -187,7 +187,7 @@ </JPanel> <Table fill='both' constraints='BorderLayout.SOUTH'> <row> - <cell columns='2'> + <cell columns='6'> <JSeparator/> </cell> </row> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-24 12:39:52 UTC (rev 1002) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-24 12:48:12 UTC (rev 1003) @@ -450,7 +450,11 @@ tableModel.addNewRow(rowIndex, row); } - model.setTotalNumber(model.getTotalNumber() + 1); + Integer totalNumber = model.getTotalNumber(); + if (totalNumber == null) { + totalNumber = 0; + } + model.setTotalNumber(totalNumber + 1); getTable().scrollRowToVisible(rowIndex); } Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-24 12:39:52 UTC (rev 1002) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-24 12:48:12 UTC (rev 1003) @@ -436,6 +436,8 @@ tutti.editCatchBatch.action.computeWeights.mnemonic= tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.help= tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message= +tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message.benthos= +tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message.species= tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.title= tutti.editCatchBatch.action.computeWeights.tip= tutti.editCatchBatch.action.saveCatchBatch= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-24 12:39:52 UTC (rev 1002) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-24 12:48:12 UTC (rev 1003) @@ -422,7 +422,8 @@ tutti.editCatchBatch.action.computeWeights=Élever les poids tutti.editCatchBatch.action.computeWeights.mnemonic=p tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.help=Est-ce bien une valeur observée ?<ul><li><strong>Non</strong> pour remplacer la valeur saisie par le poids calculé</li><li><strong>Oui</strong> pour garder la valeur saisie</li></ul>. -tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message=Le Poids total VRAC saisi est supérieur de moins de %s%% au Poids total Vrac trié. +tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message.benthos=Le Poids total VRAC saisi sur le benthos est supérieur de moins de %s%% au Poids total Vrac trié. +tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message.species=Le Poids total VRAC saisi sur les espèces est supérieur de moins de %s%% au Poids total Vrac trié. tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.title=Poids total VRAC peu différent du Poids total Vrac trié tutti.editCatchBatch.action.computeWeights.tip=Élever les poids tutti.editCatchBatch.action.saveCatchBatch=Enregistrer