Author: kmorin Date: 2013-03-28 15:49:13 +0100 (Thu, 28 Mar 2013) New Revision: 703 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/703 Log: use computedOrNot editor in resum?\195?\169 of the catch Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-03-28 14:13:00 UTC (rev 702) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-03-28 14:49:13 UTC (rev 703) @@ -178,17 +178,14 @@ } #speciesTotalSortedWeightField { - text: {model.getSpeciesTotalSortedWeight() != null ? - getStringValue(model.getSpeciesTotalSortedWeight()) : - getWeightStringValue(model.getSpeciesTotalSortedComputedWeight())}; - _computed: true; + bean: {model.getSpeciesTotalSortedComputedOrNotWeight()}; + model: {model.getSpeciesTotalSortedWeight()}; } #speciesTotalSampleSortedWeightLabel { text: "tutti.editCatchBatch.field.speciesTotalSampleSortedWeight"; toolTipText: {"tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.tip"}; labelFor: {speciesTotalSampleSortedWeightField}; - _italicStyle: true; _help: {"tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.help"}; } @@ -238,17 +235,14 @@ } #benthosTotalSortedWeightField { - text: {model.getBenthosTotalSortedWeight() != null ? - getStringValue(model.getBenthosTotalSortedWeight()) : - getWeightStringValue(model.getBenthosTotalSortedComputedWeight())}; - _computed: true; + bean: {model.getBenthosTotalSortedComputedOrNotWeight()}; + model: {model.getBenthosTotalSortedWeight()}; } #benthosTotalSampleSortedWeightLabel { text: "tutti.editCatchBatch.field.benthosTotalSampleSortedWeight"; toolTipText: {"tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.tip"}; labelFor: {benthosTotalSampleSortedWeightField}; - _italicStyle: true; _help: {"tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-03-28 14:13:00 UTC (rev 702) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-03-28 14:49:13 UTC (rev 703) @@ -205,7 +205,9 @@ <JLabel id='speciesTotalSortedWeightLabel'/> </cell> <cell weightx='1.0'> - <JTextField id='speciesTotalSortedWeightField'/> + <TuttiComputedOrNotDataEditor + id='speciesTotalSortedWeightField' + constructorParams='this'/> </cell> </row> @@ -249,7 +251,9 @@ <JLabel id='benthosTotalSortedWeightLabel'/> </cell> <cell weightx='1.0'> - <JTextField id='benthosTotalSortedWeightField'/> + <TuttiComputedOrNotDataEditor + id='benthosTotalSortedWeightField' + constructorParams='this'/> </cell> </row>