r1241 - in trunk/tutti-ui-swing/src/main: filtered-resources java/fr/ifremer/tutti/ui/swing/content/cruise java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency java/fr/ifremer/tutti/ui/swing/content/protocol java/fr/ifremer/tutti/ui/swing/util resources/i18n - Tutti-commits

27 Sep 2013

Author: tchemit
Date: 2013-09-27 10:22:45 +0200 (Fri, 27 Sep 2013)
New Revision: 1241

Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1241

Log:
fixes #3332: [MENSURATION] Pouvoir choisir un PSFM de classe de taille non renseign?\195?\169 au niveau du protocole


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/cruise/EditCruiseUI.css
   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/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/protocol/EditProtocolUI.css
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.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:20:12 UTC (rev 1240)
+++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties	2013-09-27 08:22:45 UTC (rev 1241)
@@ -1,5 +1,5 @@
 #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo
-#Thu Sep 26 18:46:04 CEST 2013
+#Fri Sep 27 08:52:15 CEST 2013
 tutti.config.help=config.html
 tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions
 tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions
@@ -25,7 +25,6 @@
 tutti.createBenthosBatch.help=editFishingOperation.html\#captureBenthos
 tutti.createIndividualObservationBatch.action.addSpecies.help=editFishingOperation.html\#captureObservationsIndividuellesActions
 tutti.createIndividualObservationBatch.action.cancel.help=editFishingOperation.html\#captureObservationsIndividuellesActions
-tutti.createIndividualObservationBatch.action.save.help=editFishingOperation.html\#captureObservationsIndividuellesActions
 tutti.createIndividualObservationBatch.action.saveAndClose.help=editFishingOperation.html\#captureObservationsIndividuellesActions
 tutti.createIndividualObservationBatch.action.saveAndContinue.help=editFishingOperation.html\#captureObservationsIndividuellesActions
 tutti.createIndividualObservationBatch.field.individualObservationLengthStepCaracteristic.help=editFishingOperation.html\#captureObservationsIndividuellesFields
@@ -68,7 +67,7 @@
 tutti.editAccidentalBatch.action.importMultiPost.help=editFishingOperation.html\#captureCapturesAccidentellesActions
 tutti.editAccidentalBatch.action.removeBatch.help=editFishingOperation.html\#captureCapturesAccidentellesActions
 tutti.editAccidentalBatch.help=editFishingOperation.html\#captureCapturesAccidentelles
-tutti.editBenthosBatch.action.addSampleCategory.help=
+tutti.editBenthosBatch.action.addSampleCategory.help=editFishingOperation.html\#captureBenthosActions
 tutti.editBenthosBatch.action.changeSampleCategory.help=editFishingOperation.html\#captureBenthosActions
 tutti.editBenthosBatch.action.createBatch.help=editFishingOperation.html\#captureBenthosActions
 tutti.editBenthosBatch.action.createMelag.help=editFishingOperation.html\#captureBenthosActions
@@ -93,9 +92,9 @@
 tutti.editBenthosBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureBenthosFields
 tutti.editBenthosBatch.filterBatch.help=editFishingOperation.html\#captureBenthosFields
 tutti.editBenthosBatch.help=editFishingOperation.html\#captureBenthos
+tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosActions
 tutti.editBenthosFrequencies.action.cancel.help=editFishingOperation.html\#captureBenthosActions
 tutti.editBenthosFrequencies.action.generate.help=editFishingOperation.html\#captureBenthosActions
-tutti.editBenthosFrequencies.action.save.help=editFishingOperation.html\#captureBenthosActions
 tutti.editBenthosFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions
 tutti.editBenthosFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions
 tutti.editBenthosFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosFields
@@ -132,7 +131,7 @@
 tutti.editCatchBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureResumeFields
 tutti.editCatchBatch.help=editFishingOperation.html\#captureResume
 tutti.editCruise.action.close.help=editCruise.html\#actions
-tutti.editCruise.action.editGearCaracteristics.help=
+tutti.editCruise.action.editGearCaracteristics.help=editCruise.html\#actions
 tutti.editCruise.action.generateName.help=editCruise.html\#actions
 tutti.editCruise.action.save.help=editCruise.html\#actions
 tutti.editCruise.action.viewGearCaracteristics.help=
@@ -219,7 +218,7 @@
 tutti.editProtocol.field.benthos.help=editProtocol.html\#fieldsBenthos
 tutti.editProtocol.field.comment.help=editProtocol.html\#fields
 tutti.editProtocol.field.gearUseFeature.help=editProtocol.html\#fieldsCaracteristics
-tutti.editProtocol.field.individualObservation.help=
+tutti.editProtocol.field.individualObservation.help=editProtocol.html\#fieldsCaracteristics
 tutti.editProtocol.field.lengthClasses.help=editProtocol.html\#fieldsCaracteristics
 tutti.editProtocol.field.name.help=editProtocol.html\#fields
 tutti.editProtocol.field.species.help=editProtocol.html\#fieldsSpecies
@@ -233,7 +232,7 @@
 tutti.editSampleCategoryModel.action.removeEntry.help=editSampleCategory.html\#actions
 tutti.editSampleCategoryModel.action.save.help=editSampleCategory.html\#actions
 tutti.editSampleCategoryModel.help=editSampleCategory.html
-tutti.editSpeciesBatch.action.addSampleCategory.help=
+tutti.editSpeciesBatch.action.addSampleCategory.help=editFishingOperation.html\#captureEspecesActions
 tutti.editSpeciesBatch.action.changeSampleCategory.help=editFishingOperation.html\#captureEspecesActions
 tutti.editSpeciesBatch.action.createBatch.help=editFishingOperation.html\#captureEspecesActions
 tutti.editSpeciesBatch.action.createMelag.help=editFishingOperation.html\#captureEspecesActions
@@ -256,7 +255,6 @@
 tutti.editSpeciesFrequencies.action.cancel.help=editFishingOperation.html\#captureEspecesMensurationActions
 tutti.editSpeciesFrequencies.action.generate.help=editFishingOperation.html\#captureEspecesMensurationActions
 tutti.editSpeciesFrequencies.action.reset.help=editFishingOperation.html\#captureEspecesMensurationActions
-tutti.editSpeciesFrequencies.action.save.help=editFishingOperation.html\#captureEspecesMensurationActions
 tutti.editSpeciesFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureEspecesMensurationActions
 tutti.editSpeciesFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesMensurationActions
 tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureEspecesMensurationFields

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:20:12 UTC (rev 1240)
+++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties	2013-09-27 08:22:45 UTC (rev 1241)
@@ -1,5 +1,5 @@
 #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo
-#Thu Sep 26 18:46:04 CEST 2013
+#Fri Sep 27 08:52:15 CEST 2013
 tutti.config.help=config.html
 tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions
 tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions
@@ -67,7 +67,7 @@
 tutti.editAccidentalBatch.action.importMultiPost.help=editFishingOperation.html\#captureCapturesAccidentellesActions
 tutti.editAccidentalBatch.action.removeBatch.help=editFishingOperation.html\#captureCapturesAccidentellesActions
 tutti.editAccidentalBatch.help=editFishingOperation.html\#captureCapturesAccidentelles
-tutti.editBenthosBatch.action.addSampleCategory.help=
+tutti.editBenthosBatch.action.addSampleCategory.help=editFishingOperation.html\#captureBenthosActions
 tutti.editBenthosBatch.action.changeSampleCategory.help=editFishingOperation.html\#captureBenthosActions
 tutti.editBenthosBatch.action.createBatch.help=editFishingOperation.html\#captureBenthosActions
 tutti.editBenthosBatch.action.createMelag.help=editFishingOperation.html\#captureBenthosActions
@@ -92,6 +92,7 @@
 tutti.editBenthosBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureBenthosFields
 tutti.editBenthosBatch.filterBatch.help=editFishingOperation.html\#captureBenthosFields
 tutti.editBenthosBatch.help=editFishingOperation.html\#captureBenthos
+tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosActions
 tutti.editBenthosFrequencies.action.cancel.help=editFishingOperation.html\#captureBenthosActions
 tutti.editBenthosFrequencies.action.generate.help=editFishingOperation.html\#captureBenthosActions
 tutti.editBenthosFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions
@@ -130,7 +131,7 @@
 tutti.editCatchBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureResumeFields
 tutti.editCatchBatch.help=editFishingOperation.html\#captureResume
 tutti.editCruise.action.close.help=editCruise.html\#actions
-tutti.editCruise.action.editGearCaracteristics.help=
+tutti.editCruise.action.editGearCaracteristics.help=editCruise.html\#actions
 tutti.editCruise.action.generateName.help=editCruise.html\#actions
 tutti.editCruise.action.save.help=editCruise.html\#actions
 tutti.editCruise.action.viewGearCaracteristics.help=
@@ -217,7 +218,7 @@
 tutti.editProtocol.field.benthos.help=editProtocol.html\#fieldsBenthos
 tutti.editProtocol.field.comment.help=editProtocol.html\#fields
 tutti.editProtocol.field.gearUseFeature.help=editProtocol.html\#fieldsCaracteristics
-tutti.editProtocol.field.individualObservation.help=
+tutti.editProtocol.field.individualObservation.help=editProtocol.html\#fieldsCaracteristics
 tutti.editProtocol.field.lengthClasses.help=editProtocol.html\#fieldsCaracteristics
 tutti.editProtocol.field.name.help=editProtocol.html\#fields
 tutti.editProtocol.field.species.help=editProtocol.html\#fieldsSpecies
@@ -231,7 +232,7 @@
 tutti.editSampleCategoryModel.action.removeEntry.help=editSampleCategory.html\#actions
 tutti.editSampleCategoryModel.action.save.help=editSampleCategory.html\#actions
 tutti.editSampleCategoryModel.help=editSampleCategory.html
-tutti.editSpeciesBatch.action.addSampleCategory.help=
+tutti.editSpeciesBatch.action.addSampleCategory.help=editFishingOperation.html\#captureEspecesActions
 tutti.editSpeciesBatch.action.changeSampleCategory.help=editFishingOperation.html\#captureEspecesActions
 tutti.editSpeciesBatch.action.createBatch.help=editFishingOperation.html\#captureEspecesActions
 tutti.editSpeciesBatch.action.createMelag.help=editFishingOperation.html\#captureEspecesActions

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css	2013-09-27 08:20:12 UTC (rev 1240)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css	2013-09-27 08:22:45 UTC (rev 1241)
@@ -30,6 +30,7 @@
 
 BeanDoubleList {
   showReset: true;
+  showSelectPopupEnabled: true;
   i18nPrefix: "tutti.property.";
   bean: {model};
 }

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-09-27 08:20:12 UTC (rev 1240)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css	2013-09-27 08:22:45 UTC (rev 1241)
@@ -24,7 +24,6 @@
 
 BeanFilterableComboBox {
   showReset: true;
-  i18nPrefix: "tutti.property.";
   bean: {model};
 }
 
@@ -270,6 +269,13 @@
   _help: {"tutti.editBenthosFrequencies.action.generate.help"};
 }
 
+#addLengthStepCaracteristicButton {
+  text: "tutti.editBenthosFrequencies.action.addLengthStepCaracteristic";
+  toolTipText: "tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.tip";
+  i18nMnemonic: "tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.mnemonic";
+  _help: {"tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.help"};
+}
+
 #cancelButton {
   actionIcon: cancel;
   text: "tutti.editBenthosFrequencies.action.cancel";

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-09-27 08:20:12 UTC (rev 1240)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx	2013-09-27 08:22:45 UTC (rev 1241)
@@ -175,9 +175,15 @@
           <JLabel id='lengthStepCaracteristicLabel'/>
         </cell>
         <cell weightx='1.0' columns='5'>
-          <BeanFilterableComboBox id='lengthStepCaracteristicComboBox'
-                                  constructorParams='this'
-                                  genericType='Caracteristic'/>
+          <JPanel layout='{new BorderLayout()}'>
+            <BeanFilterableComboBox id='lengthStepCaracteristicComboBox'
+                                    constructorParams='this'
+                                    genericType='Caracteristic'
+                                    constraints='BorderLayout.CENTER'/>
+            <JButton id='addLengthStepCaracteristicButton'
+                     onActionPerformed='handler.addLengthStepCaracteristic()'
+                     constraints='BorderLayout.EAST'/>
+          </JPanel>
         </cell>
       </row>
       <!-- Step -->

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-09-27 08:20:12 UTC (rev 1240)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java	2013-09-27 08:22:45 UTC (rev 1241)
@@ -46,6 +46,7 @@
 import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction;
 import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler;
 import jaxx.runtime.SwingUtil;
+import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox;
 import jaxx.runtime.validator.swing.SwingValidator;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.logging.Log;
@@ -56,6 +57,7 @@
 import org.jdesktop.swingx.table.DefaultTableColumnModelExt;
 
 import javax.swing.JComponent;
+import javax.swing.JOptionPane;
 import javax.swing.JTextField;
 import javax.swing.UIManager;
 import java.awt.event.KeyAdapter;
@@ -398,6 +400,42 @@
     //-- Public methods                                                     --//
     //------------------------------------------------------------------------//
 
+    public void addLengthStepCaracteristic() {
+
+        // compute list of possible caracteristics (all but the one in the select box)
+        List<Caracteristic> allNumericCaracteristic = persistenceService.getAllNumericCaracteristic();
+        List<Caracteristic> toSelect = Lists.newArrayList(allNumericCaracteristic);
+        List<Caracteristic> knownCaracteristics = getUI().getLengthStepCaracteristicComboBox().getData();
+        toSelect.removeAll(knownCaracteristics);
+
+        // open a dialog to select it
+
+        BeanFilterableComboBox<Caracteristic> editor =
+                new BeanFilterableComboBox<Caracteristic>();
+        editor.setBeanType(Caracteristic.class);
+
+        initBeanFilterableComboBox(editor, toSelect, null);
+
+        int response = JOptionPane.showConfirmDialog(
+                getTopestUI(),
+                editor,
+                _("tutti.editBenthosFrequencies.title.addLengthStepCaracteristic"),
+                JOptionPane.OK_CANCEL_OPTION);
+
+        Caracteristic selectedItem;
+        if (response == JOptionPane.OK_OPTION) {
+            selectedItem = (Caracteristic) editor.getSelectedItem();
+
+//            // FIXME ? Should we add it to the combo box universe?
+//            ui.getLengthStepCaracteristicComboBox().getData().add(selectedItem);
+        } else {
+            // user cancel selection
+            selectedItem = null;
+        }
+        // set to model
+        getModel().setLengthStepCaracteristic(selectedItem);
+    }
+
     public void generateLengthSteps() {
 
         BenthosFrequencyUIModel model = getModel();

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-09-27 08:20:12 UTC (rev 1240)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css	2013-09-27 08:22:45 UTC (rev 1241)
@@ -24,7 +24,6 @@
 
 BeanFilterableComboBox {
   showReset: true;
-  i18nPrefix: "tutti.property.";
   bean: {model};
 }
 
@@ -270,6 +269,13 @@
   _help: {"tutti.editSpeciesFrequencies.action.generate.help"};
 }
 
+#addLengthStepCaracteristicButton {
+  text: "tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic";
+  toolTipText: "tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.tip";
+  i18nMnemonic: "tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.mnemonic";
+  _help: {"tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.help"};
+}
+
 #cancelButton {
   actionIcon: cancel;
   text: "tutti.editSpeciesFrequencies.action.cancel";

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-09-27 08:20:12 UTC (rev 1240)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx	2013-09-27 08:22:45 UTC (rev 1241)
@@ -175,9 +175,15 @@
           <JLabel id='lengthStepCaracteristicLabel'/>
         </cell>
         <cell weightx='1.0' columns='5'>
-          <BeanFilterableComboBox id='lengthStepCaracteristicComboBox'
-                                  constructorParams='this'
-                                  genericType='Caracteristic'/>
+          <JPanel layout='{new BorderLayout()}'>
+            <BeanFilterableComboBox id='lengthStepCaracteristicComboBox'
+                                    constructorParams='this'
+                                    genericType='Caracteristic'
+                                    constraints='BorderLayout.CENTER'/>
+            <JButton id='addLengthStepCaracteristicButton'
+                     onActionPerformed='handler.addLengthStepCaracteristic()'
+                     constraints='BorderLayout.EAST'/>
+          </JPanel>
         </cell>
       </row>
       <!-- Step -->

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-09-27 08:20:12 UTC (rev 1240)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java	2013-09-27 08:22:45 UTC (rev 1241)
@@ -47,6 +47,7 @@
 import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction;
 import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler;
 import jaxx.runtime.SwingUtil;
+import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox;
 import jaxx.runtime.validator.swing.SwingValidator;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.logging.Log;
@@ -57,6 +58,7 @@
 import org.jdesktop.swingx.table.DefaultTableColumnModelExt;
 
 import javax.swing.JComponent;
+import javax.swing.JOptionPane;
 import javax.swing.JTextField;
 import javax.swing.UIManager;
 import java.awt.event.KeyAdapter;
@@ -396,6 +398,42 @@
     //-- Public methods                                                     --//
     //------------------------------------------------------------------------//
 
+    public void addLengthStepCaracteristic() {
+
+        // compute list of possible caracteristics (all but the one in the select box)
+        List<Caracteristic> allNumericCaracteristic = persistenceService.getAllNumericCaracteristic();
+        List<Caracteristic> toSelect = Lists.newArrayList(allNumericCaracteristic);
+        List<Caracteristic> knownCaracteristics = getUI().getLengthStepCaracteristicComboBox().getData();
+        toSelect.removeAll(knownCaracteristics);
+
+        // open a dialog to select it
+
+        BeanFilterableComboBox<Caracteristic> editor =
+                new BeanFilterableComboBox<Caracteristic>();
+        editor.setBeanType(Caracteristic.class);
+
+        initBeanFilterableComboBox(editor, toSelect, null);
+
+        int response = JOptionPane.showConfirmDialog(
+                getTopestUI(),
+                editor,
+                _("tutti.editBenthosFrequencies.title.addLengthStepCaracteristic"),
+                JOptionPane.OK_CANCEL_OPTION);
+
+        Caracteristic selectedItem;
+        if (response == JOptionPane.OK_OPTION) {
+            selectedItem = (Caracteristic) editor.getSelectedItem();
+
+//            // FIXME ? Should we add it to the combo box universe?
+//            ui.getLengthStepCaracteristicComboBox().getData().add(selectedItem);
+        } else {
+            // user cancel selection
+            selectedItem = null;
+        }
+        // set to model
+        getModel().setLengthStepCaracteristic(selectedItem);
+    }
+
     public void generateLengthSteps() {
 
         SpeciesFrequencyUIModel model = getModel();

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css	2013-09-27 08:20:12 UTC (rev 1240)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css	2013-09-27 08:22:45 UTC (rev 1241)
@@ -29,6 +29,7 @@
 
 BeanDoubleList {
   showReset: true;
+  showSelectPopupEnabled: true;
   i18nPrefix: "tutti.property.";
   bean: {model};
 }

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java	2013-09-27 08:20:12 UTC (rev 1240)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java	2013-09-27 08:22:45 UTC (rev 1241)
@@ -514,6 +514,8 @@
                       (data == null ? 0 : data.size()));
         }
 
+        comboBox.setI18nPrefix("tutti.property.");
+
         // add data list to combo box
         comboBox.init((JXPathDecorator<E>) decorator, data);
 
@@ -552,6 +554,8 @@
                       (data == null ? 0 : data.size()));
         }
 
+        list.setI18nPrefix("tutti.property.");
+
         // add data list to combo box
         list.init((JXPathDecorator<E>) decorator, data, selectedData);
 

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:20:12 UTC (rev 1240)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties	2013-09-27 08:22:45 UTC (rev 1241)
@@ -444,6 +444,9 @@
 tutti.editBenthosBatch.table.header.weight=
 tutti.editBenthosBatch.table.header.weight.tip=
 tutti.editBenthosBatch.title.changeSampleCategoryValue=
+tutti.editBenthosFrequencies.action.addLengthStepCaracteristic=
+tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.mnemonic=
+tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.tip=
 tutti.editBenthosFrequencies.action.cancel=
 tutti.editBenthosFrequencies.action.cancel.mnemonic=
 tutti.editBenthosFrequencies.action.cancel.tip=
@@ -485,6 +488,7 @@
 tutti.editBenthosFrequencies.label.no.configuration=
 tutti.editBenthosFrequencies.simpleCountingAndFrequencies=
 tutti.editBenthosFrequencies.title=
+tutti.editBenthosFrequencies.title.addLengthStepCaracteristic=
 tutti.editCaracteristics.title=
 tutti.editCatchBatch.action.cancelEditCatchBatch=
 tutti.editCatchBatch.action.cancelEditCatchBatch.mnemonic=

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:20:12 UTC (rev 1240)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties	2013-09-27 08:22:45 UTC (rev 1241)
@@ -443,6 +443,9 @@
 tutti.editBenthosBatch.table.header.weight=Poids sous-échantillonné
 tutti.editBenthosBatch.table.header.weight.tip=Poids du lot mesuré ou dénombré
 tutti.editBenthosBatch.title.changeSampleCategoryValue=Changer la valeur de la catégorie %s
+tutti.editBenthosFrequencies.action.addLengthStepCaracteristic=...
+tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.mnemonic=.
+tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.tip=Sélectionner une autre caractéristique
 tutti.editBenthosFrequencies.action.cancel=Annuler
 tutti.editBenthosFrequencies.action.cancel.mnemonic=A
 tutti.editBenthosFrequencies.action.cancel.tip=Annuler l'édition des mensurations
@@ -486,6 +489,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.editBenthosFrequencies.title.addLengthStepCaracteristic=Choisir une autre caractéristique
 tutti.editCaracteristics.title=%s - Autres caractéristiques
 tutti.editCatchBatch.action.cancelEditCatchBatch=Réinitialiser
 tutti.editCatchBatch.action.cancelEditCatchBatch.mnemonic=R

    

tchemit＠users.forge.codelutin.com

tags

participants (1)