Author: tchemit Date: 2013-09-23 17:56:04 +0200 (Mon, 23 Sep 2013) New Revision: 1213 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1213 Log: fixes #3321: [donn?\195?\169es individuelles] erreur ?\195?\160 l'enregistrement pour la cration d'une nouvelle ligne Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2013-09-23 15:55:03 UTC (rev 1212) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2013-09-23 15:56:04 UTC (rev 1213) @@ -93,6 +93,9 @@ public IndividualObservationBatchRowModel(WeightUnit weightUnit) { super(IndividualObservationBatch.class, fromBeanBinder, toBeanBinder); this.weightUnit = weightUnit; + if (getCaracteristics() == null) { + setCaracteristics(new CaracteristicMap()); + } } public IndividualObservationBatchRowModel(WeightUnit weightUnit, @@ -102,10 +105,6 @@ fromEntity(entity); - if (getCaracteristics() == null) { - setCaracteristics(new CaracteristicMap()); - } - // move default caracteristics from caracteristic map CaracteristicMap caracteristics = getCaracteristics(); for (Caracteristic caracteristic : defaultCaracteristicsSet) { @@ -139,6 +138,10 @@ // convert weight setWeight(weightUnit.fromEntity(getWeight())); + + if (getCaracteristics() == null) { + setCaracteristics(new CaracteristicMap()); + } } @Override