Author: kmorin Date: 2013-05-17 16:06:05 +0200 (Fri, 17 May 2013) New Revision: 961 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/961 Log: add the species in the title of the caracteristic editor of the accidental batches and individual observations Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnUIHandler.java 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/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-05-17 13:38:02 UTC (rev 960) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-05-17 14:06:05 UTC (rev 961) @@ -398,6 +398,10 @@ } public void setIndividualObservationSelectedCard(String card) { + setIndividualObservationSelectedCard(card, null); + } + + public void setIndividualObservationSelectedCard(String card, Species species) { JPanel panel = ui.getIndividualObservationTabPanel(); CardLayout2Ext layout = (CardLayout2Ext) panel.getLayout(); if (!card.equals(layout.getSelected())) { @@ -420,7 +424,7 @@ title = n_("tutti.createIndividualObservationBatch.title"); } else if (EDIT_CARACTERISTICS_CARD.equals(card)) { - titlePanel = ui.getIndividualObservationTabFishingOperationReminderLabel(); + titlePanel = ui.getIndividualObservationCaracteristicMapEditorReminderLabel(); title = n_("tutti.editCaracteristics.title"); } @@ -428,13 +432,17 @@ registerValidators(tuttiUi.getHandler().getValidator()); } if (titlePanel != null) { - titlePanel.setTitle(ui.getIndividualObservationTabCreateBatchReminderLabel().getTitle() + " - " + _(title)); + titlePanel.setTitle(ui.getIndividualObservationTabFishingOperationReminderLabel().getTitle() + " - " + _(title, decorate(species))); } } } } public void setAccidentalSelectedCard(String card) { + setAccidentalSelectedCard(card, null); + } + + public void setAccidentalSelectedCard(String card, Species species) { JPanel panel = ui.getAccidentalTabPanel(); CardLayout2Ext layout = (CardLayout2Ext) panel.getLayout(); if (!card.equals(layout.getSelected())) { @@ -466,7 +474,7 @@ registerValidators(tuttiUi.getHandler().getValidator()); } if (titlePanel != null) { - titlePanel.setTitle(ui.getAccidentalTabCreateBatchReminderLabel().getTitle() + " - " + _(title)); + titlePanel.setTitle(ui.getAccidentalTabFishingOperationReminderLabel().getTitle() + " - " + _(title, decorate(species))); } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-05-17 13:38:02 UTC (rev 960) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-05-17 14:06:05 UTC (rev 961) @@ -417,9 +417,9 @@ } @Override - public void showCaracteristicMapEditor() { + public void showCaracteristicMapEditor(Species species) { EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); - parent.getHandler().setAccidentalSelectedCard(EditCatchesUIHandler.EDIT_CARACTERISTICS_CARD); + parent.getHandler().setAccidentalSelectedCard(EditCatchesUIHandler.EDIT_CARACTERISTICS_CARD, species); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-05-17 13:38:02 UTC (rev 960) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-05-17 14:06:05 UTC (rev 961) @@ -409,9 +409,9 @@ } @Override - public void showCaracteristicMapEditor() { + public void showCaracteristicMapEditor(Species species) { EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); - parent.getHandler().setIndividualObservationSelectedCard(EditCatchesUIHandler.EDIT_CARACTERISTICS_CARD); + parent.getHandler().setIndividualObservationSelectedCard(EditCatchesUIHandler.EDIT_CARACTERISTICS_CARD, species); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2013-05-17 13:38:02 UTC (rev 960) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2013-05-17 14:06:05 UTC (rev 961) @@ -202,7 +202,7 @@ CaracteristicMapColumnUIHandler handler = (CaracteristicMapColumnUIHandler) ui.getHandler(); CaracteristicMapEditorUI caracteristicMapEditor = handler.getCaracteristicMapEditor(); caracteristicMapEditor.getHandler().editBatch(editRow, this, caracteristicsUsed); - handler.showCaracteristicMapEditor(); + handler.showCaracteristicMapEditor(editRow.getSpecies()); } public void validateEdition(CaracteristicMapEditorUIModel caracteristicMapEditorModel) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnRowModel.java 2013-05-17 13:38:02 UTC (rev 960) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnRowModel.java 2013-05-17 14:06:05 UTC (rev 961) @@ -26,6 +26,7 @@ import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.Species; import java.io.Serializable; @@ -37,4 +38,6 @@ CaracteristicMap getCaracteristics(); void setCaracteristics(CaracteristicMap map); + + Species getSpecies(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnUIHandler.java 2013-05-17 13:38:02 UTC (rev 960) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnUIHandler.java 2013-05-17 14:06:05 UTC (rev 961) @@ -25,6 +25,7 @@ */ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.Species; import java.util.Set; @@ -36,7 +37,7 @@ CaracteristicMapEditorUI getCaracteristicMapEditor(); - void showCaracteristicMapEditor(); + void showCaracteristicMapEditor(Species species); void hideCaracteristicMapEditor(); 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-17 13:38:02 UTC (rev 960) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-17 14:06:05 UTC (rev 961) @@ -401,7 +401,7 @@ tutti.editBenthosFrequencies.label.no.configuration=< Pas de configuration > tutti.editBenthosFrequencies.simpleCountingAndFrequencies=Des mensurations ont été saisies dans le tableau. Saisir un simple dénombrement les effacera. tutti.editBenthosFrequencies.title=Mensuration -tutti.editCaracteristics.title=Autres caractéristiques +tutti.editCaracteristics.title=%s - Autres caractéristiques tutti.editCatchBatch.action.cancelEditCatchBatch=Réinitialiser tutti.editCatchBatch.action.cancelEditCatchBatch.mnemonic=R tutti.editCatchBatch.action.cancelEditCatchBatch.tip=Réinitialiser l'édition de la capture