Author: tchemit Date: 2013-09-27 11:49:14 +0200 (Fri, 27 Sep 2013) New Revision: 1242 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1242 Log: fixes #3384: [PROTOCOLE] erreur si on ajoute, dans le protocole, une caract?\195?\169ristique ?\195?\160 observer pour les observations individuelle Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.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/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-09-27 08:22:45 UTC (rev 1241) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-09-27 09:49:14 UTC (rev 1242) @@ -1,5 +1,5 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Fri Sep 27 08:52:15 CEST 2013 +#Fri Sep 27 10:49:26 CEST 2013 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -252,6 +252,7 @@ tutti.editSpeciesBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureEspecesFields tutti.editSpeciesBatch.filterSpeciesBatch.help=editFishingOperation.html\#captureEspecesFields tutti.editSpeciesBatch.help=editFishingOperation.html\#captureEspeces +tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.help= tutti.editSpeciesFrequencies.action.cancel.help=editFishingOperation.html\#captureEspecesMensurationActions tutti.editSpeciesFrequencies.action.generate.help=editFishingOperation.html\#captureEspecesMensurationActions tutti.editSpeciesFrequencies.action.reset.help=editFishingOperation.html\#captureEspecesMensurationActions Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-09-27 08:22:45 UTC (rev 1241) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-09-27 09:49:14 UTC (rev 1242) @@ -1,5 +1,5 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Fri Sep 27 08:52:15 CEST 2013 +#Fri Sep 27 10:49:26 CEST 2013 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -252,6 +252,7 @@ tutti.editSpeciesBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureEspecesFields tutti.editSpeciesBatch.filterSpeciesBatch.help=editFishingOperation.html\#captureEspecesFields tutti.editSpeciesBatch.help=editFishingOperation.html\#captureEspeces +tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.help= tutti.editSpeciesFrequencies.action.cancel.help=editFishingOperation.html\#captureEspecesMensurationActions tutti.editSpeciesFrequencies.action.generate.help=editFishingOperation.html\#captureEspecesMensurationActions tutti.editSpeciesFrequencies.action.reset.help=editFishingOperation.html\#captureEspecesMensurationActions Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2013-09-27 08:22:45 UTC (rev 1241) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2013-09-27 09:49:14 UTC (rev 1242) @@ -43,6 +43,7 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.Cancelable; import fr.ifremer.tutti.ui.swing.util.TuttiUI; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; import jaxx.runtime.SwingUtil; @@ -57,9 +58,12 @@ import javax.swing.JComponent; import javax.swing.JLabel; +import javax.swing.JTextField; import java.awt.Dimension; import java.awt.GridBagConstraints; import java.awt.Insets; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; @@ -223,6 +227,25 @@ break; case TEXT: + final JTextField textField = new JTextField(); + String name = caracteristic.getId() + "TextField"; + editorModel.addPropertyChangeListener(CreateIndividualObservationBatchUIModel.CaracteristicMapPropertyEditor.PROPERTY_PROPERTY, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + textField.setText((String) evt.getNewValue()); + } + }); + textField.addKeyListener(new KeyAdapter() { + + @Override + public void keyReleased(KeyEvent e) { + String value = textField.getText(); + TuttiUIUtil.setProperty(editorModel, CreateIndividualObservationBatchUIModel.CaracteristicMapPropertyEditor.PROPERTY_PROPERTY, value); + } + }); + editor = textField; + ui.get$objectMap().put(name, editor); + initTextField(textField); break; } JLabel jLabel = new JLabel(); 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-09-27 08:22:45 UTC (rev 1241) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-09-27 09:49:14 UTC (rev 1242) @@ -975,6 +975,9 @@ tutti.editSpeciesBatch.table.header.toConfirm= tutti.editSpeciesBatch.table.header.weight= tutti.editSpeciesBatch.title.changeSampleCategoryValue= +tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic= +tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.mnemonic= +tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.tip= tutti.editSpeciesFrequencies.action.cancel= tutti.editSpeciesFrequencies.action.cancel.mnemonic= tutti.editSpeciesFrequencies.action.cancel.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-09-27 08:22:45 UTC (rev 1241) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-27 09:49:14 UTC (rev 1242) @@ -976,6 +976,9 @@ tutti.editSpeciesBatch.table.header.toConfirm=A Confirmer tutti.editSpeciesBatch.table.header.weight=Poids sous-échantillonné tutti.editSpeciesBatch.title.changeSampleCategoryValue=Changer la valeur de la catégorie %s +tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic= +tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.mnemonic= +tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.tip= tutti.editSpeciesFrequencies.action.cancel=Annuler tutti.editSpeciesFrequencies.action.cancel.mnemonic=A tutti.editSpeciesFrequencies.action.cancel.tip=Annuler l'édition des mensurations