This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 697deee579cddce8bbf5e245253f7c0db1dfb6e1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 15 19:17:21 2015 +0200 refs #6972 FIX NPE + ajout trads --- .../src/main/java/fr/ird/observe/entities/longline/TripLonglines.java | 2 +- observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties | 4 ++-- observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties | 4 ++-- observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java index 6737a55..6bc39bf 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java @@ -41,7 +41,7 @@ public class TripLonglines { SetLongline setLongline = activityLongline.getSetLongline(); - if (!setLongline.isTdrEmpty()) { + if (setLongline!=null && !setLongline.isTdrEmpty()) { String setLonglineTopiaId = setLongline.getTopiaId(); setIds.add(setLonglineTopiaId); diff --git a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties index 6a19837..fe6def8 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties @@ -12,8 +12,6 @@ observe.action.add.setLongline.tip=Add the fishing operation associated with thi observe.action.admin.cancel=Cancel wizard observe.action.admin.close=Close wizard observe.action.apply=Apply -observe.common.latitude=Latitude -observe.common.longitude=Longitude observe.action.auto.copy.to.clipboard=Automatic copy in clipboard observe.action.auto.copy.to.clipboard.tip=Copy automaticly in clipboard with report result observe.action.back.to.list=Back to list @@ -781,6 +779,7 @@ observe.common.label7= observe.common.label8= observe.common.landingHarbour=Landing harbour observe.common.lastName= +observe.common.latitude=Latitude observe.common.length= observe.common.length.computed.tip= observe.common.length.inf= @@ -788,6 +787,7 @@ observe.common.length.observed.tip= observe.common.lengthMeasureType= observe.common.lengthWeightFormula= observe.common.libelles= +observe.common.longitude=Longitude observe.common.lowerValueUpperValue= observe.common.mammalsObservation= observe.common.meanLength= diff --git a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties index ac5e806..dcf55c3 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties @@ -12,8 +12,6 @@ observe.action.add.setLongline.tip=Añadir la operación de pesca asociada a est observe.action.admin.cancel=Anular el asintente observe.action.admin.close=Cerrar el asistente observe.action.apply=Aplicar -observe.common.latitude=Latitude -observe.common.longitude=Longitude observe.action.auto.copy.to.clipboard=Copia automatica al portapapeles observe.action.auto.copy.to.clipboard.tip=Puesta a punto automáticamente el contenido del portapapeles con los resultados observe.action.back.to.list=Volver a la lista @@ -781,6 +779,7 @@ observe.common.label7=Texto 7 observe.common.label8=Texto 8 observe.common.landingHarbour= observe.common.lastName=Nombre +observe.common.latitude=Latitude observe.common.length=Longitud eslora total observe.common.length.computed.tip=Longitud calculada observe.common.length.inf=Longitud (cm inf.) @@ -788,6 +787,7 @@ observe.common.length.observed.tip=Longitud observada observe.common.lengthMeasureType=Tipo de medida observe.common.lengthWeightFormula=Relación de peso observe.common.libelles=Textos +observe.common.longitude=Longitude observe.common.lowerValueUpperValue= observe.common.mammalsObservation=Mamiferos observe.common.meanLength=Talla media (en cm) diff --git a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties index 34eac48..7939c4d 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties @@ -779,6 +779,7 @@ observe.common.label7=Libellé 7 observe.common.label8=Libellé 8 observe.common.landingHarbour=Port d'arrivée observe.common.lastName=Nom +observe.common.latitude=Latitude observe.common.length=Longueur hors tout observe.common.length.computed.tip=La longueur a été calculée observe.common.length.inf=Longueur (cm inf.) @@ -786,6 +787,7 @@ observe.common.length.observed.tip=La longueur a été observée observe.common.lengthMeasureType=Type de mensuration observe.common.lengthWeightFormula=Relation Poids observe.common.libelles=Libellés +observe.common.longitude=Longitude observe.common.lowerValueUpperValue=Borne min-max observe.common.mammalsObservation=Mammifères observe.common.meanLength=Taille moyenne (en cm) @@ -1040,8 +1042,6 @@ observe.gear.selectedGearCaracteristic=Caractéristiques utilisées observe.gear.tab.gearCaracteristic=Caractéristiques de l'équipement observe.gear.tab.general=Caractéristiques générales observe.gear.unit=Unité -observe.common.latitude=Latitude -observe.common.longitude=Longitude observe.gearUseFeaturesSeine.comment=Commentaire observe.gearUseFeaturesSeine.gear=Équipement observe.gearUseFeaturesSeine.number=Nombre -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.