Author: kmorin Date: 2013-03-29 17:53:13 +0100 (Fri, 29 Mar 2013) New Revision: 714 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/714 Log: - debug npe - fix isEmpty method of the editfishingoperation handler Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-03-29 16:30:41 UTC (rev 713) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-03-29 16:53:13 UTC (rev 714) @@ -97,7 +97,7 @@ //check if the user changed the date and not only the time) Date oldDate = (Date) evt.getOldValue(); Date newDate = (Date) evt.getNewValue(); - if (getModel().getGearShootingEndDate() == null && + if (newDate != null && getModel().getGearShootingEndDate() == null && (oldDate == null || !DateUtils.isSameDay(oldDate, newDate))) { getModel().setGearShootingEndDate(newDate); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-03-29 16:30:41 UTC (rev 713) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-03-29 16:53:13 UTC (rev 714) @@ -237,12 +237,14 @@ && gearShootingEndLatitudeAsSexagecimal.isNull() && gearShootingEndLongitudeAsSexagecimal.isNull() && gearShootingEndDate == null - && recorderPerson == null + && !fishingOperationRectiligne + && trawlDistance == null + && fishingOperationValid == null + && CollectionUtils.isEmpty(recorderPerson) && gear == null && StringUtils.isEmpty(comment) && CollectionUtils.isEmpty(getAttachment()); - // TODO add the otehr ones } public FishingOperation getFishingOperation() {