Author: tchemit Date: 2013-05-23 12:01:12 +0200 (Thu, 23 May 2013) New Revision: 987 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/987 Log: fixes #2497: [ESPECES] Cr?\195?\169ation des lots : inverser les champs V/HV et Poids du lot Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx 2013-05-23 09:36:17 UTC (rev 986) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx 2013-05-23 10:01:12 UTC (rev 987) @@ -89,29 +89,28 @@ </cell> </row> - <!-- Sorted / Unsorted Category --> + <!-- Species batch weight --> <row> <cell anchor='west'> - <JLabel id='sortedUnsortedCategoryLabel'/> + <JLabel id='batchWeightLabel'/> </cell> <cell weightx='1.0' columns='2'> - <BeanFilterableComboBox id='sortedUnsortedCategoryComboBox' - constructorParams='this' - genericType='CaracteristicQualitativeValue'/> + <NumberEditor id='batchWeightField' constructorParams='this'/> </cell> </row> - <!-- Species batch weight --> + <!-- Sorted / Unsorted Category --> <row> <cell anchor='west'> - <JLabel id='batchWeightLabel'/> + <JLabel id='sortedUnsortedCategoryLabel'/> </cell> <cell weightx='1.0' columns='2'> - <NumberEditor id='batchWeightField' constructorParams='this'/> + <BeanFilterableComboBox id='sortedUnsortedCategoryComboBox' + constructorParams='this' + genericType='CaracteristicQualitativeValue'/> </cell> </row> - - + </Table> <!-- Form Actions --> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx 2013-05-23 09:36:17 UTC (rev 986) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx 2013-05-23 10:01:12 UTC (rev 987) @@ -89,29 +89,28 @@ </cell> </row> - <!-- Sorted / Unsorted Category --> + <!-- Species batch weight --> <row> <cell anchor='west'> - <JLabel id='sortedUnsortedCategoryLabel'/> + <JLabel id='batchWeightLabel'/> </cell> <cell weightx='1.0' columns='2'> - <BeanFilterableComboBox id='sortedUnsortedCategoryComboBox' - constructorParams='this' - genericType='CaracteristicQualitativeValue'/> + <NumberEditor id='batchWeightField' constructorParams='this'/> </cell> </row> - <!-- Species batch weight --> + <!-- Sorted / Unsorted Category --> <row> <cell anchor='west'> - <JLabel id='batchWeightLabel'/> + <JLabel id='sortedUnsortedCategoryLabel'/> </cell> <cell weightx='1.0' columns='2'> - <NumberEditor id='batchWeightField' constructorParams='this'/> + <BeanFilterableComboBox id='sortedUnsortedCategoryComboBox' + constructorParams='this' + genericType='CaracteristicQualitativeValue'/> </cell> </row> - - + </Table> <!-- Form Actions -->