- Tutti-commits - mailman.cloud.codelutin.com

r961 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation/catches java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation java/fr/ifremer/tutti/ui/swing/util/caracteristics resources/i18n
by kmorin＠users.forge.codelutin.com 17 May '13

17 May '13

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

1 0

r960 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation/catches java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency resources/i18n
by kmorin＠users.forge.codelutin.com 17 May '13

17 May '13

Author: kmorin Date: 2013-05-17 15:38:02 +0200 (Fri, 17 May 2013) New Revision: 960 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/960 Log: fixes #2435 [MENSURATIONS] manque information sur l'esp?\195?\168ce en cours de saisie 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/benthos/frequency/BenthosFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 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/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 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/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.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/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-05-17 12:54:48 UTC (rev 959) +++ 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) @@ -279,10 +279,6 @@ } public void setSpeciesSelectedCard(String card) { - setSpeciesSelectedCard(card, null); - } - - public void setSpeciesSelectedCard(String card, Species editingSpecies) { JPanel panel = ui.getSpeciesTabPanel(); CardLayout2Ext layout = (CardLayout2Ext) panel.getLayout(); if (!card.equals(layout.getSelected())) { @@ -319,17 +315,13 @@ registerValidators(tuttiUi.getHandler().getValidator()); } if (titlePanel != null) { - titlePanel.setTitle(ui.getSpeciesTabFishingOperationReminderLabel().getTitle() + " - " + _(title, decorate(editingSpecies))); + titlePanel.setTitle(ui.getSpeciesTabFishingOperationReminderLabel().getTitle() + " - " + _(title)); } } } } public void setBenthosSelectedCard(String card) { - setBenthosSelectedCard(card, null); - } - - public void setBenthosSelectedCard(String card, Species editingSpecies) { JPanel panel = ui.getBenthosTabPanel(); CardLayout2Ext layout = (CardLayout2Ext) panel.getLayout(); if (!card.equals(layout.getSelected())) { @@ -366,7 +358,7 @@ registerValidators(tuttiUi.getHandler().getValidator()); } if (titlePanel != null) { - titlePanel.setTitle(ui.getBenthosTabFishingOperationReminderLabel().getTitle() + " - " + _(title, decorate(editingSpecies))); + titlePanel.setTitle(ui.getBenthosTabFishingOperationReminderLabel().getTitle() + " - " + _(title)); } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-05-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-05-17 13:38:02 UTC (rev 960) @@ -164,7 +164,7 @@ frequencyEditor.getHandler().editBatch(editRow, this); // open frequency editor - parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD, editRow.getSpecies()); + parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD); } public void validateEdition(BenthosFrequencyUIModel frequencyModel) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-05-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-05-17 13:38:02 UTC (rev 960) @@ -37,6 +37,26 @@ _help: {"tutti.editBenthosFrequencies.help"}; } +#batchSpeciesLabel { + text: "tutti.editBenthosFrequencies.batchSpecies"; +} + +#batchSpecies { + text: { handler.decorateSpecies(model.getBatch()) }; + editable: false; + enabled: false; +} + +#batchCategoryLabel { + text: "tutti.editBenthosFrequencies.batchCategory"; +} + +#batchCategory { + text: { handler.decorateCategory(model.getBatch()) }; + editable: false; + enabled: false; +} + #stepLabel { text: "tutti.editBenthosFrequencies.field.step"; toolTipText: "tutti.editBenthosFrequencies.field.step.tip"; 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-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-05-17 13:38:02 UTC (rev 960) @@ -89,6 +89,30 @@ <JPanel id='configurationPanel' layout='{new BorderLayout()}' constraints='BorderLayout.NORTH'> + <Table constraints='BorderLayout.NORTH' fill='both'> + <row> + <cell anchor='west'> + <JLabel id='batchSpeciesLabel'/> + </cell> + <cell weightx='1'> + <JTextField id='batchSpecies'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id='batchCategoryLabel'/> + </cell> + <cell weightx='1'> + <JTextField id='batchCategory'/> + </cell> + </row> + <row> + <cell columns='2'> + <JSeparator/> + </cell> + </row> + </Table> + <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> <VBox id='modePanel' constraints='BorderLayout.WEST' verticalAlignment='{SwingConstants.CENTER}'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-17 13:38:02 UTC (rev 960) @@ -49,8 +49,7 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import javax.swing.JComponent; -import javax.swing.JTextField; +import javax.swing.*; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.beans.PropertyChangeEvent; @@ -532,6 +531,15 @@ closeUI(ui); } + public String decorateSpecies(BenthosBatchRowModel object) { + return object == null ? "" : decorate(object.getSpecies()); + } + + public String decorateCategory(BenthosBatchRowModel object) { + return object == null ? "" : + decorate(object.getFinestCategory().getCategoryType()) + " / " + decorate(object.getFinestCategory().getCategoryValue()); + } + //------------------------------------------------------------------------// //-- Internal methods --// //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 2013-05-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 2013-05-17 13:38:02 UTC (rev 960) @@ -37,6 +37,8 @@ private static final long serialVersionUID = 1L; + public static final String PROPERTY_BATCH = "batch"; + public static final String PROPERTY_CONFIGURATION_MODE = "configurationMode"; public static final String PROPERTY_STEP = "step"; @@ -212,6 +214,7 @@ public void setBatch(BenthosBatchRowModel batch) { this.batch = batch; + firePropertyChange(PROPERTY_BATCH, null, batch); } public float getLengthStep(float lengthStep) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-05-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-05-17 13:38:02 UTC (rev 960) @@ -164,7 +164,7 @@ frequencyEditor.getHandler().editBatch(editRow, this); // open frequency editor - parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD, editRow.getSpecies()); + parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD); } public void validateEdition(SpeciesFrequencyUIModel frequencyModel) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-05-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-05-17 13:38:02 UTC (rev 960) @@ -37,6 +37,26 @@ _help: {"tutti.editSpeciesFrequencies.help"}; } +#batchSpeciesLabel { + text: "tutti.editSpeciesFrequencies.batchSpecies"; +} + +#batchSpecies { + text: { handler.decorateSpecies(model.getBatch()) }; + editable: false; + enabled: false; +} + +#batchCategoryLabel { + text: "tutti.editSpeciesFrequencies.batchCategory"; +} + +#batchCategory { + text: { handler.decorateCategory(model.getBatch()) }; + editable: false; + enabled: false; +} + #stepLabel { text: "tutti.editSpeciesFrequencies.field.step"; toolTipText: "tutti.editSpeciesFrequencies.field.step.tip"; 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-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-05-17 13:38:02 UTC (rev 960) @@ -89,6 +89,30 @@ <JPanel id='configurationPanel' layout='{new BorderLayout()}' constraints='BorderLayout.NORTH'> + <Table constraints='BorderLayout.NORTH' fill='both'> + <row> + <cell anchor='west'> + <JLabel id='batchSpeciesLabel'/> + </cell> + <cell weightx='1'> + <JTextField id='batchSpecies'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id='batchCategoryLabel'/> + </cell> + <cell weightx='1'> + <JTextField id='batchCategory'/> + </cell> + </row> + <row> + <cell columns='2'> + <JSeparator/> + </cell> + </row> + </Table> + <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> <VBox id='modePanel' constraints='BorderLayout.WEST' verticalAlignment='{SwingConstants.CENTER}'> 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-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-17 13:38:02 UTC (rev 960) @@ -29,6 +29,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.TuttiEntities; +import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; @@ -533,6 +534,15 @@ closeUI(ui); } + public String decorateSpecies(SpeciesBatchRowModel object) { + return object == null ? "" : decorate(object.getSpecies()); + } + + public String decorateCategory(SpeciesBatchRowModel object) { + return object == null ? "" : + decorate(object.getFinestCategory().getCategoryType()) + " / " + decorate(object.getFinestCategory().getCategoryValue()); + } + //------------------------------------------------------------------------// //-- Internal methods --// //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2013-05-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2013-05-17 13:38:02 UTC (rev 960) @@ -38,6 +38,8 @@ private static final long serialVersionUID = 1L; + public static final String PROPERTY_BATCH = "batch"; + public static final String PROPERTY_CONFIGURATION_MODE = "configurationMode"; public static final String PROPERTY_STEP = "step"; @@ -213,6 +215,7 @@ public void setBatch(SpeciesBatchRowModel batch) { this.batch = batch; + firePropertyChange(PROPERTY_BATCH, null, batch); } public float getLengthStep(float lengthStep) { 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-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-17 13:38:02 UTC (rev 960) @@ -382,6 +382,8 @@ tutti.editBenthosFrequencies.action.save= tutti.editBenthosFrequencies.action.save.mnemonic= tutti.editBenthosFrequencies.action.save.tip= +tutti.editBenthosFrequencies.batchCategory= +tutti.editBenthosFrequencies.batchSpecies= tutti.editBenthosFrequencies.field.lengthStepCaracteristic= tutti.editBenthosFrequencies.field.lengthStepCaracteristic.tip= tutti.editBenthosFrequencies.field.maxStep= @@ -899,6 +901,9 @@ tutti.editSpeciesFrequencies.action.save= tutti.editSpeciesFrequencies.action.save.mnemonic= tutti.editSpeciesFrequencies.action.save.tip= +tutti.editSpeciesFrequencies.batchCategory= +tutti.editSpeciesFrequencies.batchCategoryValue= +tutti.editSpeciesFrequencies.batchSpecies= tutti.editSpeciesFrequencies.field.lengthStepCaracteristic= tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.tip= tutti.editSpeciesFrequencies.field.maxStep= 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 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-17 13:38:02 UTC (rev 960) @@ -376,6 +376,8 @@ tutti.editBenthosFrequencies.action.save=Enregistrer tutti.editBenthosFrequencies.action.save.mnemonic=E tutti.editBenthosFrequencies.action.save.tip=Enregistrer les mensurations +tutti.editBenthosFrequencies.batchCategory=Catégorie +tutti.editBenthosFrequencies.batchSpecies=Espèce tutti.editBenthosFrequencies.field.lengthStepCaracteristic=Type de mesure tutti.editBenthosFrequencies.field.lengthStepCaracteristic.tip=Méthode de mensuration des individus tutti.editBenthosFrequencies.field.maxStep=Classe max @@ -398,7 +400,7 @@ tutti.editBenthosFrequencies.field.step.tip=Pas de la classe de taille pour cette espèce (ex. \: 1 cm, 0,5 cm, 1 mm etc.) 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=%s - Mensuration +tutti.editBenthosFrequencies.title=Mensuration tutti.editCaracteristics.title=Autres caractéristiques tutti.editCatchBatch.action.cancelEditCatchBatch=Réinitialiser tutti.editCatchBatch.action.cancelEditCatchBatch.mnemonic=R @@ -864,6 +866,8 @@ tutti.editSpeciesFrequencies.action.save=Enregistrer tutti.editSpeciesFrequencies.action.save.mnemonic=E tutti.editSpeciesFrequencies.action.save.tip=Enregistrer les mensurations +tutti.editSpeciesFrequencies.batchCategory=Catégorie +tutti.editSpeciesFrequencies.batchSpecies=Espèce tutti.editSpeciesFrequencies.field.lengthStepCaracteristic=Type de mesure tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.tip=Méthode de mensuration des individus tutti.editSpeciesFrequencies.field.maxStep=Classe max @@ -889,7 +893,7 @@ tutti.editSpeciesFrequencies.table.header.lengthStep=Classe de taille tutti.editSpeciesFrequencies.table.header.number=Nombre tutti.editSpeciesFrequencies.table.header.weight=Poids observé (kg) -tutti.editSpeciesFrequencies.title=%s - Mensuration +tutti.editSpeciesFrequencies.title=Mensuration tutti.error.about.could.not.reach.url=Récupération des versions de mises à jour impossible (l'url %s n'est pas joignable) tutti.error.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html> tutti.error.ui.business.error=Erreur

1 0

r959 - in trunk/tutti-service/src/main: java/fr/ifremer/tutti/service java/fr/ifremer/tutti/service/referential resources/i18n
by kmorin＠users.forge.codelutin.com 17 May '13

17 May '13

Author: kmorin Date: 2013-05-17 14:54:48 +0200 (Fri, 17 May 2013) New Revision: 959 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/959 Log: fixes #2444 [DONNEES TEMPORAIRES] Import d'une esp?\195?\168ce temporaire qui existe d?\195?\169j?\195?\160. Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-05-17 12:12:39 UTC (rev 958) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-05-17 12:54:48 UTC (rev 959) @@ -108,6 +108,14 @@ public void newNotExistingValueColumn(String headerName, String propertyName, Set<String> universe) { newMandatoryColumn(headerName, propertyName, new NotExistingKeyValue(propertyName, universe)); } + + public void newNotExistingValueColumn(String propertyName, Set<String> universe, String errorMessage) { + newNotExistingValueColumn(propertyName, propertyName, universe, errorMessage); + } + + public void newNotExistingValueColumn(String headerName, String propertyName, Set<String> universe, String errorMessage) { + newMandatoryColumn(headerName, propertyName, new NotExistingKeyValue(propertyName, universe, errorMessage)); + } } public static abstract class AbstractTuttiExportModel<M> extends AbstractExportModel<M> { @@ -247,11 +255,21 @@ protected final Set<String> existingValues; + protected final String errorMessage; + public NotExistingKeyValue( String propertyName, Set<String> universe) { + this(propertyName, universe, "tutti.service.csv.parse.entityAlreadyDefined"); + } + + public NotExistingKeyValue( + String propertyName, + Set<String> universe, + String errorMessage) { this.propertyName = propertyName; this.existingValues = universe; + this.errorMessage = errorMessage; } @Override @@ -261,7 +279,7 @@ if (existingValues.contains(value)) { // entity already defined - throw new TuttiTechnicalException(_("tutti.service.csv.parse.entityAlreadyDefined", propertyName, value)); + throw new TuttiTechnicalException(_(errorMessage, propertyName, value)); } } return value; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java 2013-05-17 12:12:39 UTC (rev 958) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java 2013-05-17 12:54:48 UTC (rev 959) @@ -31,6 +31,8 @@ import java.util.Set; +import static org.nuiton.i18n.I18n.n_; + /** * Model to import / export {@link Gear} in csv format. * @@ -44,7 +46,7 @@ // import definition - newNotExistingValueColumn(Gear.PROPERTY_NAME, existingGearName); + newNotExistingValueColumn(Gear.PROPERTY_NAME, existingGearName, n_("tutti.service.referential.import.gear.existingName.error")); newMandatoryColumn(Gear.PROPERTY_LABEL); newMandatoryColumn(Gear.PROPERTY_SCIENTIFIC_GEAR, Common.PRIMITIVE_BOOLEAN); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesModel.java 2013-05-17 12:12:39 UTC (rev 958) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesModel.java 2013-05-17 12:54:48 UTC (rev 959) @@ -30,6 +30,8 @@ import java.util.Set; +import static org.nuiton.i18n.I18n.n_; + /** * Model to import / export {@link Species} in csv format. * @@ -43,7 +45,7 @@ // import definition - newNotExistingValueColumn(Species.PROPERTY_NAME, existingSpeciesName); + newNotExistingValueColumn(Species.PROPERTY_NAME, existingSpeciesName, n_("tutti.service.referential.import.species.existingName.error")); // export definition Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-05-17 12:12:39 UTC (rev 958) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-05-17 12:54:48 UTC (rev 959) @@ -46,6 +46,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.csv.Export; import org.nuiton.util.csv.Import; +import org.nuiton.util.csv.ImportRuntimeException; import java.io.BufferedWriter; import java.io.File; @@ -106,8 +107,13 @@ IOUtils.closeQuietly(importer); } reader.close(); + } catch (IOException e) { throw new IOException(_("tutti.service.referential.import.species.error", file), e); + + } catch (ImportRuntimeException e) { + throw new TuttiTechnicalException(e.getCause().getMessage()); + } finally { IOUtils.closeQuietly(reader); @@ -242,6 +248,10 @@ reader.close(); } catch (IOException e) { throw new IOException(_("tutti.service.referential.import.gears.error", file), e); + + } catch (ImportRuntimeException e) { + throw new TuttiTechnicalException(e.getCause().getMessage()); + } finally { IOUtils.closeQuietly(reader); Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-17 12:12:39 UTC (rev 958) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-17 12:54:48 UTC (rev 959) @@ -167,9 +167,11 @@ tutti.service.referential.export.person.error= tutti.service.referential.export.species.error= tutti.service.referential.export.vessel.error= +tutti.service.referential.import.gear.existingName.error= tutti.service.referential.import.gears.error= tutti.service.referential.import.persons.error= tutti.service.referential.import.species.error= +tutti.service.referential.import.species.existingName.error= tutti.service.referential.import.vessels.error= tutti.service.referential.import.vessels.existingValue.error= tutti.service.sumatra.export.error= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-17 12:12:39 UTC (rev 958) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-17 12:54:48 UTC (rev 959) @@ -137,9 +137,11 @@ tutti.service.referential.export.person.error=Erreur lors de l'export des personnes dans le fichier %s tutti.service.referential.export.species.error=Erreur lors de l'export des espèces dans le fichier %s tutti.service.referential.export.vessel.error=Erreur lors de l'export des navires dans le fichier %s +tutti.service.referential.import.gear.existingName.error=L'engin '%2$s' n'a pas été ajouté au référentiel car il est déjà présent tutti.service.referential.import.gears.error=Erreur lors de l'import des engins du fichier %s tutti.service.referential.import.persons.error=Erreur lors de l'import des personnes du fichier %s tutti.service.referential.import.species.error=Erreur lors de l'import des espèces du fichier %s +tutti.service.referential.import.species.existingName.error=L'espèce '%2$s' n'a pas été ajoutée au référentiel car elle est déjà présente tutti.service.referential.import.vessels.error=Erreur lors de l'import des navires du fichier %s tutti.service.referential.import.vessels.existingValue.error=Un navire avec le nom %1s et l'immatriculation %2s existe déjà dans le référentiel tutti.service.sumatra.export.error=Erreur lors de l'export Sumatra dans le fichier %s

1 0

r958 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service
by kmorin＠users.forge.codelutin.com 17 May '13

17 May '13

Author: kmorin Date: 2013-05-17 14:12:39 +0200 (Fri, 17 May 2013) New Revision: 958 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/958 Log: fixes #2463 [CAMPAGNE] Modification du navire de la campagne entraine la perte de l'engin du trait Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-05-17 10:00:39 UTC (rev 957) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-05-17 12:12:39 UTC (rev 958) @@ -293,10 +293,13 @@ if (vesselChanged) { Vessel vessel = bean.getVessel(); List<FishingOperation> operations = fishingOperationService.getAllFishingOperation(bean.getId()); + List<FishingOperation> operationsToSave = Lists.newArrayList(); for (FishingOperation operation : operations) { - operation.setVessel(vessel); + FishingOperation modifiedOperation = fishingOperationService.getFishingOperation(operation.getId()); + modifiedOperation.setVessel(vessel); + operationsToSave.add(modifiedOperation); } - fishingOperationService.saveFishingOperations(operations); + fishingOperationService.saveFishingOperations(operationsToSave); } return bean;

1 0

r957 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation/catches java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency resources/i18n
by kmorin＠users.forge.codelutin.com 17 May '13

17 May '13

Author: kmorin Date: 2013-05-17 12:00:39 +0200 (Fri, 17 May 2013) New Revision: 957 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/957 Log: fixes #2437 [MENSURATIONS] Tutti n'enregistre pas les mesures de la derni?\195?\168re ligne fixes #2435 [MENSURATIONS] manque information sur l'esp?\195?\168ce en cours de saisie 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/benthos/frequency/BenthosFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.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-16 16:28:15 UTC (rev 956) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-05-17 10:00:39 UTC (rev 957) @@ -25,6 +25,7 @@ */ import com.google.common.collect.Sets; +import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUIHandler; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; @@ -278,6 +279,10 @@ } public void setSpeciesSelectedCard(String card) { + setSpeciesSelectedCard(card, null); + } + + public void setSpeciesSelectedCard(String card, Species editingSpecies) { JPanel panel = ui.getSpeciesTabPanel(); CardLayout2Ext layout = (CardLayout2Ext) panel.getLayout(); if (!card.equals(layout.getSelected())) { @@ -314,13 +319,17 @@ registerValidators(tuttiUi.getHandler().getValidator()); } if (titlePanel != null) { - titlePanel.setTitle(ui.getSpeciesTabFishingOperationReminderLabel().getTitle() + " - " + _(title)); + titlePanel.setTitle(ui.getSpeciesTabFishingOperationReminderLabel().getTitle() + " - " + _(title, decorate(editingSpecies))); } } } } public void setBenthosSelectedCard(String card) { + setBenthosSelectedCard(card, null); + } + + public void setBenthosSelectedCard(String card, Species editingSpecies) { JPanel panel = ui.getBenthosTabPanel(); CardLayout2Ext layout = (CardLayout2Ext) panel.getLayout(); if (!card.equals(layout.getSelected())) { @@ -357,7 +366,7 @@ registerValidators(tuttiUi.getHandler().getValidator()); } if (titlePanel != null) { - titlePanel.setTitle(ui.getBenthosTabFishingOperationReminderLabel().getTitle() + " - " + _(title)); + titlePanel.setTitle(ui.getBenthosTabFishingOperationReminderLabel().getTitle() + " - " + _(title, decorate(editingSpecies))); } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-05-16 16:28:15 UTC (rev 956) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-05-17 10:00:39 UTC (rev 957) @@ -164,7 +164,7 @@ frequencyEditor.getHandler().editBatch(editRow, this); // open frequency editor - parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD); + parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD, editRow.getSpecies()); } public void validateEdition(BenthosFrequencyUIModel frequencyModel) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2013-05-16 16:28:15 UTC (rev 956) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2013-05-17 10:00:39 UTC (rev 957) @@ -87,6 +87,7 @@ } } BenthosFrequencyRowModel result = new BenthosFrequencyRowModel(); + result.setLengthStepCaracteristic(uiModel.getLengthStepCaracteristic()); result.setLengthStep(defaultStep); result.setValid(false); return result; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-16 16:28:15 UTC (rev 956) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-17 10:00:39 UTC (rev 957) @@ -193,7 +193,7 @@ // FIXME 20130128 kmorin: the species have no technical id speciesProtocol = Maps.newHashMap(); - for (SpeciesProtocol sp : protocol.getSpecies()) { + for (SpeciesProtocol sp : protocol.getBenthos()) { speciesProtocol.put(sp.getSpeciesReferenceTaxonId(), sp); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-05-16 16:28:15 UTC (rev 956) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-05-17 10:00:39 UTC (rev 957) @@ -164,7 +164,7 @@ frequencyEditor.getHandler().editBatch(editRow, this); // open frequency editor - parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD); + parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD, editRow.getSpecies()); } public void validateEdition(SpeciesFrequencyUIModel frequencyModel) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2013-05-16 16:28:15 UTC (rev 956) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2013-05-17 10:00:39 UTC (rev 957) @@ -87,6 +87,7 @@ } } SpeciesFrequencyRowModel result = new SpeciesFrequencyRowModel(); + result.setLengthStepCaracteristic(uiModel.getLengthStepCaracteristic()); result.setLengthStep(defaultStep); result.setValid(false); return result; 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-16 16:28:15 UTC (rev 956) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-17 10:00:39 UTC (rev 957) @@ -398,7 +398,7 @@ tutti.editBenthosFrequencies.field.step.tip=Pas de la classe de taille pour cette espèce (ex. \: 1 cm, 0,5 cm, 1 mm etc.) 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.editBenthosFrequencies.title=%s - Mensuration tutti.editCaracteristics.title=Autres caractéristiques tutti.editCatchBatch.action.cancelEditCatchBatch=Réinitialiser tutti.editCatchBatch.action.cancelEditCatchBatch.mnemonic=R @@ -889,7 +889,7 @@ tutti.editSpeciesFrequencies.table.header.lengthStep=Classe de taille tutti.editSpeciesFrequencies.table.header.number=Nombre tutti.editSpeciesFrequencies.table.header.weight=Poids observé (kg) -tutti.editSpeciesFrequencies.title=Mensuration +tutti.editSpeciesFrequencies.title=%s - Mensuration tutti.error.about.could.not.reach.url=Récupération des versions de mises à jour impossible (l'url %s n'est pas joignable) tutti.error.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html> tutti.error.ui.business.error=Erreur

1 0

r956 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise
by kmorin＠users.forge.codelutin.com 16 May '13

16 May '13

Author: kmorin Date: 2013-05-16 18:28:15 +0200 (Thu, 16 May 2013) New Revision: 956 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/956 Log: fixes #2445 [CAMPAGNE] Raccourcis clavier pour l'?\195?\169dition des caract?\195?\169ristiques des engins Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-05-16 16:09:46 UTC (rev 955) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-05-16 16:28:15 UTC (rev 956) @@ -39,11 +39,15 @@ import fr.ifremer.tutti.ui.swing.util.CloseableUI; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import jaxx.runtime.validator.swing.SwingValidator; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTable; import javax.swing.*; import java.awt.*; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; @@ -235,19 +239,57 @@ Gear gear = (Gear) jList.getSelectedValue(); boolean editMenuEnabled = false; + boolean viewMenuEnabled = false; if (gear != null) { editMenuEnabled = !getModel().isCreate() && !getModel().isModify() && (!gear.isScientificGear() || persistenceService.isTemporary(gear)); + viewMenuEnabled = true; ui.setContextValue(gear); } ui.getEditGearCaracteristicsItem().setEnabled(editMenuEnabled); + ui.getViewGearCaracteristicsItem().setEnabled(viewMenuEnabled); ui.getGearMenuPopup().show(jList, e.getX(), e.getY()); //and show the menu } } }); + ui.getGearList().getSelectedList().addKeyListener(new KeyAdapter() { + @Override + public void keyPressed(KeyEvent e) { + if (e.getKeyCode() == KeyEvent.VK_CONTEXT_MENU) { + JList source = (JList) e.getSource(); + // get the lowest selected row + int[] selectedRows = source.getSelectedIndices(); + int lowestRow = -1; + for (int row : selectedRows) { + lowestRow = Math.max(lowestRow, row); + } + Rectangle r = source.getCellBounds(lowestRow, lowestRow); + + // get the point in the middle lower of the cell + Point p = new Point(r.x + r.width / 2, r.y + r.height); + + List<Gear> gears = source.getSelectedValuesList(); + + boolean editMenuEnabled = false; + boolean viewMenuEnabled = false; + if (gears != null && gears.size() == 1) { + Gear gear = gears.get(0); + editMenuEnabled = !getModel().isCreate() && !getModel().isModify() + && (!gear.isScientificGear() || persistenceService.isTemporary(gear)); + viewMenuEnabled = true; + ui.setContextValue(gear); + } + ui.getEditGearCaracteristicsItem().setEnabled(editMenuEnabled); + ui.getViewGearCaracteristicsItem().setEnabled(viewMenuEnabled); + ui.getGearMenuPopup().show(source, p.x, p.y); //and show the menu + + } + } + }); + SwingValidator validator = ui.getValidator(); listenValidatorValid(validator, model);

1 0

r955 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table
by kmorin＠users.forge.codelutin.com 16 May '13

16 May '13

Author: kmorin Date: 2013-05-16 18:09:46 +0200 (Thu, 16 May 2013) New Revision: 955 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/955 Log: fixes #2451 [ESPECES et MENSURATIONS] Probl?\195?\168me de saisie et de navigation dans les tableaux Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-05-16 16:00:37 UTC (rev 954) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-05-16 16:09:46 UTC (rev 955) @@ -434,8 +434,7 @@ } previousCellAction.actionPerformed(null); - } else if (//e.getKeyCode() == KeyEvent.VK_ENTER || - keyCode == KeyEvent.VK_RIGHT || + } else if (keyCode == KeyEvent.VK_RIGHT || keyCode == KeyEvent.VK_TAB) { e.consume(); if (editor != null) { @@ -450,7 +449,8 @@ } previousRowAction.actionPerformed(null); - } else if (keyCode == KeyEvent.VK_DOWN) { + } else if (e.getKeyCode() == KeyEvent.VK_ENTER || + keyCode == KeyEvent.VK_DOWN) { e.consume(); if (editor != null) { editor.stopCellEditing();

1 0

r954 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/referential resources/i18n
by kmorin＠users.forge.codelutin.com 16 May '13

16 May '13

Author: kmorin Date: 2013-05-16 18:00:37 +0200 (Thu, 16 May 2013) New Revision: 954 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/954 Log: fixes #2433 [ERGO] intitul?\195?\169 du bouton dans r?\195?\169f?\195?\169rentiel temporaire Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.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/referential/ExportTemporaryGearExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-05-16 15:40:07 UTC (rev 953) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-05-16 16:00:37 UTC (rev 954) @@ -67,7 +67,7 @@ "exportGearExample.csv", getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.exportTemporaryGearExampleFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialGearFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.export"), "^.*\\.csv", _("tutti.common.file.csv") ); if (file == null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-05-16 15:40:07 UTC (rev 953) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-05-16 16:00:37 UTC (rev 954) @@ -68,7 +68,7 @@ "exportPersonExample.csv", getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.exportTemporaryPersonExampleFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.export"), "^.*\\.csv", _("tutti.common.file.csv") ); if (file == null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-05-16 15:40:07 UTC (rev 953) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-05-16 16:00:37 UTC (rev 954) @@ -67,7 +67,7 @@ "exportSpeciesExample.csv", getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.exportTemporarySpeciesExampleFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.export"), "^.*\\.csv", _("tutti.common.file.csv") ); if (file == null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-05-16 15:40:07 UTC (rev 953) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-05-16 16:00:37 UTC (rev 954) @@ -67,7 +67,7 @@ "exportVesselExample.csv", getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.exportTemporaryVesselExampleFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.export"), "^.*\\.csv", _("tutti.common.file.csv") ); if (file == null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java 2013-05-16 15:40:07 UTC (rev 953) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java 2013-05-16 16:00:37 UTC (rev 954) @@ -65,7 +65,7 @@ file = TuttiUIUtil.chooseFile( getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.importTemporaryGearFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialGearFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import"), "^.*\\.csv", _("tutti.common.file.csv")); doAction = file != null; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java 2013-05-16 15:40:07 UTC (rev 953) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java 2013-05-16 16:00:37 UTC (rev 954) @@ -65,7 +65,7 @@ file = TuttiUIUtil.chooseFile( getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.importTemporaryPersonFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import"), "^.*\\.csv", _("tutti.common.file.csv")); doAction = file != null; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java 2013-05-16 15:40:07 UTC (rev 953) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java 2013-05-16 16:00:37 UTC (rev 954) @@ -64,7 +64,7 @@ file = TuttiUIUtil.chooseFile( getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.importTemporarySpeciesFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import"), "^.*\\.csv", _("tutti.common.file.csv")); doAction = file != null; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java 2013-05-16 15:40:07 UTC (rev 953) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java 2013-05-16 16:00:37 UTC (rev 954) @@ -64,7 +64,7 @@ file = TuttiUIUtil.chooseFile( getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import"), "^.*\\.csv", _("tutti.common.file.csv")); doAction = file != null; 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-16 15:40:07 UTC (rev 953) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-16 16:00:37 UTC (rev 954) @@ -1092,16 +1092,24 @@ tutti.main.title.selectedProgram= tutti.main.title.selectedProtocol= tutti.manageTemporaryReferential.action.chooseReferentialGearFile= +tutti.manageTemporaryReferential.action.chooseReferentialGearFile.export= tutti.manageTemporaryReferential.action.chooseReferentialGearFile.export.success= +tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import= tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import.success= tutti.manageTemporaryReferential.action.chooseReferentialPersonFile= +tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.export= tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.export.success= +tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import= tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import.success= tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile= +tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.export= tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.export.success= +tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import= tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import.success= tutti.manageTemporaryReferential.action.chooseReferentialVesselFile= +tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.export= tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.export.success= +tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import= tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import.success= tutti.manageTemporaryReferential.action.exportTemporaryGearExample= tutti.manageTemporaryReferential.action.exportTemporaryGearExample.tip= 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-16 15:40:07 UTC (rev 953) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-16 16:00:37 UTC (rev 954) @@ -1054,17 +1054,21 @@ tutti.main.title.selectedCruise=Campagne %s tutti.main.title.selectedProgram=Série de campagne %s tutti.main.title.selectedProtocol=Protocole %s -tutti.manageTemporaryReferential.action.chooseReferentialGearFile=Choisir le fichier de référentiel engin +tutti.manageTemporaryReferential.action.chooseReferentialGearFile.export=Exporter tutti.manageTemporaryReferential.action.chooseReferentialGearFile.export.success=Exemple de référentiel temporaire d'engins exporté dans le fichier %s +tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import=Importer tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import.success=Référentiel temporaire d'engins importé depuis le fichier %s -tutti.manageTemporaryReferential.action.chooseReferentialPersonFile=Choisir le fichier de référentiel personne +tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.export=Exporter tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.export.success=Exemple de référentiel temporaire de personnes exporté dans le fichier %s +tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import=Importer tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import.success=Référentiel temporaire de personnes importé depuis le fichier %s -tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile=Choisir le fichier de référentiel espèce +tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.export=Exporter tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.export.success=Exemple de référentiel temporaire d'espèces exporté dans le fichier %s +tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import=Importer tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import.success=Référentiel temporaire d'espèces importé depuis le fichier %s -tutti.manageTemporaryReferential.action.chooseReferentialVesselFile=Choisir le fichier de référentiel navire +tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.export=Exporter tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.export.success=Exemple de référentiel temporaire de navires exporté dans le fichier %s +tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import=Importer tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import.success=Référentiel temporaire de navires importé depuis le fichier %s tutti.manageTemporaryReferential.action.exportTemporaryGearExample=Exporter tutti.manageTemporaryReferential.action.exportTemporaryGearExample.tip=Exporter un exemple de référentiel Engin

1 0

r953 - in trunk: tutti-service/src/main/java/fr/ifremer/tutti/service/catches tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise
by kmorin＠users.forge.codelutin.com 16 May '13

16 May '13

Author: kmorin Date: 2013-05-16 17:40:07 +0200 (Thu, 16 May 2013) New Revision: 953 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/953 Log: add progression on validation loading Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2013-05-16 15:38:53 UTC (rev 952) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2013-05-16 15:40:07 UTC (rev 953) @@ -29,6 +29,7 @@ import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.InvalidBatchModelException; +import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; @@ -48,6 +49,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.decorator.Decorator; import org.nuiton.validator.NuitonValidatorResult; import org.nuiton.validator.NuitonValidatorScope; @@ -90,17 +92,22 @@ * * @return a map containing the operations and the validation results */ - public Map<FishingOperation, NuitonValidatorResult> validateCruiseOperations() { + public Map<FishingOperation, NuitonValidatorResult> validateCruiseOperations(ProgressionModel progressionModel) { Map<FishingOperation, NuitonValidatorResult> result = Maps.newHashMap(); TuttiDataContext dataContext = context.getDataContext(); List<FishingOperation> operations = persistenceService.getAllFishingOperation(dataContext.getCruiseId()); + progressionModel.setTotal(operations.size()); + + Decorator<FishingOperation> decorator = decoratorService.getDecoratorByType(FishingOperation.class); for (FishingOperation operation : operations) { operation = persistenceService.getFishingOperation(operation.getId()); + progressionModel.setMessage(_("tutti.service.validateCruise.operations.progress", decorator.toString(operation))); NuitonValidatorResult validator = validationService.validateFishingOperation(operation, ValidationService.VALIDATION_CONTEXT_VALIDATE); checkOperation(operation, validator); result.put(operation, validator); + progressionModel.increments(1); } return result; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java 2013-05-16 15:38:53 UTC (rev 952) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java 2013-05-16 15:40:07 UTC (rev 953) @@ -26,6 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; +import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.catches.ValidateCruiseOperationsService; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; @@ -34,6 +35,7 @@ import fr.ifremer.tutti.ui.swing.util.RemoveablePropertyChangeListener; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; +import fr.ifremer.tutti.ui.swing.util.action.TuttiActionUIModel; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; @@ -85,7 +87,11 @@ ValidateCruiseUIModel model = new ValidateCruiseUIModel(); - model.setValidator(validationService.validateCruiseOperations()); + ProgressionModel progressionModel = new ProgressionModel(); + TuttiActionUIModel actionUIModel = context.getActionUI().getModel(); + actionUIModel.setProgressionModel(progressionModel); + model.setValidator(validationService.validateCruiseOperations(progressionModel)); + actionUIModel.setProgressionModel(null); model.addPropertyChangeListener(ValidateCruiseUIModel.PROPERTY_SELECTED_FISHING_OPERATION, new RemoveablePropertyChangeListener() {

1 0

r952 - in trunk/tutti-service/src/main: java/fr/ifremer/tutti/service/referential resources/i18n
by kmorin＠users.forge.codelutin.com 16 May '13

16 May '13

Author: kmorin Date: 2013-05-16 17:38:53 +0200 (Thu, 16 May 2013) New Revision: 952 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/952 Log: fixes #2430 [REF TEMPORAIRE] erreur sur import navire temporaire Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-05-16 14:19:51 UTC (rev 951) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-05-16 15:38:53 UTC (rev 952) @@ -26,10 +26,11 @@ import com.google.common.base.Charsets; import com.google.common.base.Function; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; +import com.google.common.base.Optional; +import com.google.common.base.Predicate; +import com.google.common.collect.*; import com.google.common.io.Files; +import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; import fr.ifremer.tutti.persistence.entities.referential.Gear; @@ -40,6 +41,7 @@ import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiServiceContext; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.csv.Export; @@ -49,8 +51,7 @@ import java.io.File; import java.io.IOException; import java.io.Reader; -import java.util.List; -import java.util.Set; +import java.util.*; import static org.nuiton.i18n.I18n._; @@ -122,31 +123,35 @@ log.info("Will import vessels from file: " + file); } - // get all vessel names - Set<String> existingVesselName = Sets.newHashSet(Iterables.transform(persistenceService.getAllFishingVessel(), new Function<Vessel, String>() { - @Override - public String apply(Vessel input) { - return input.getName(); - } - })); + // get all vessels + List<Vessel> existingVessels = Lists.newArrayList(persistenceService.getAllFishingVessel()); + existingVessels.addAll(persistenceService.getAllScientificVessel()); - existingVesselName.addAll(Lists.transform(persistenceService.getAllScientificVessel(), new Function<Vessel, String>() { - @Override - public String apply(Vessel input) { - return input.getName(); - } - })); - List<Vessel> toImport = Lists.newArrayList(); Reader reader = Files.newReader(file, Charsets.UTF_8); - VesselModel csvModel = new VesselModel(getCsvSeparator(), existingVesselName); + VesselModel csvModel = new VesselModel(getCsvSeparator()); try { Import<Vessel> importer = Import.newImport(csvModel, reader); try { - for (Vessel bean : importer) { + for (final Vessel bean : importer) { + Optional<Vessel> found = Iterables.tryFind(existingVessels, new Predicate<Vessel>() { + @Override + public boolean apply(Vessel input) { + String name1 = input.getName(); + String name2 = bean.getName(); + String code1 = input.getInternationalRegistrationCode(); + String code2 = bean.getInternationalRegistrationCode(); + boolean result = StringUtils.equals(name1, name2) && StringUtils.equals(code1, code2); + return result; + } + }); + if (found.isPresent()) { + throw new TuttiTechnicalException(_("tutti.service.referential.import.vessels.existingValue.error", + bean.getName(), bean.getInternationalRegistrationCode())); + } toImport.add(bean); } importer.close(); @@ -309,7 +314,7 @@ v.setScientificVessel(true); toExport.add(v); - VesselModel csvModel = new VesselModel(getCsvSeparator(), null); + VesselModel csvModel = new VesselModel(getCsvSeparator()); BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8); try { Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java 2013-05-16 14:19:51 UTC (rev 951) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java 2013-05-16 15:38:53 UTC (rev 952) @@ -39,12 +39,12 @@ */ public class VesselModel extends TuttiCsvUtil.AbstractTuttiImportExportModel<Vessel> { - public VesselModel(char separator, Set<String> existingVesselName) { + public VesselModel(char separator) { super(separator); // import definition - newNotExistingValueColumn(Vessel.PROPERTY_NAME, existingVesselName); + newMandatoryColumn(Vessel.PROPERTY_NAME); newMandatoryColumn(Vessel.PROPERTY_INTERNATIONAL_REGISTRATION_CODE); newMandatoryColumn(Vessel.PROPERTY_SCIENTIFIC_VESSEL, Common.PRIMITIVE_BOOLEAN); Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-16 14:19:51 UTC (rev 951) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-16 15:38:53 UTC (rev 952) @@ -171,6 +171,7 @@ tutti.service.referential.import.persons.error= tutti.service.referential.import.species.error= tutti.service.referential.import.vessels.error= +tutti.service.referential.import.vessels.existingValue.error= tutti.service.sumatra.export.error= tutti.service.validateCruise.exportResult.error= tutti.service.validateCruise.operations.progress= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-16 14:19:51 UTC (rev 951) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-16 15:38:53 UTC (rev 952) @@ -141,6 +141,7 @@ tutti.service.referential.import.persons.error=Erreur lors de l'import des personnes du fichier %s tutti.service.referential.import.species.error=Erreur lors de l'import des espèces du fichier %s tutti.service.referential.import.vessels.error=Erreur lors de l'import des navires du fichier %s +tutti.service.referential.import.vessels.existingValue.error=Un navire avec le nom %1s et l'immatriculation %2s existe déjà dans le référentiel tutti.service.sumatra.export.error=Erreur lors de l'export Sumatra dans le fichier %s tutti.service.validateCruise.exportResult.error=Erreur lors de l'export des résultats de validation de la campagne dans le fichier %s tutti.service.validateCruise.operations.progress=Vérification du trait %s

1 0