This is an automated email from the git hooks/post-receive script. New commit to branch feature/7586 in repository observe. See http://git.codelutin.com/observe.git commit d4e5353cb86a56c20df54000b557914f2f3fdf52 Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 6 12:48:17 2015 +0200 affichage de l'écran d'édition de marée quand on clique sur nouvelle marée (refs #7586) --- .../java/fr/ird/observe/ui/content/ContentUIManager.java | 16 ++++++++-------- .../i18n/observe-application-swing_en_GB.properties | 8 ++++++++ .../i18n/observe-application-swing_es_ES.properties | 8 ++++++++ .../i18n/observe-application-swing_fr_FR.properties | 16 ++++++++-------- .../main/resources/i18n/observe-swing_fr_FR.properties | 16 ++++++++-------- 5 files changed, 40 insertions(+), 24 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java index 3e2a2e1..39ad3ae 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java @@ -112,23 +112,23 @@ public class ContentUIManager { addMapping(DATA, ProgramDto.class, GearType.seine.name(), TripSeinesUI.class); addMapping(DATA, TripSeineDto.class, TripSeineUI.class); - addMapping(DATA, TripSeineDto.class, n("observe.tree.tripSeine.unsaved"), TripSeineUI.class); + addMapping(DATA, TripSeineDto.class, n("observe.tree.tripSeineDto.unsaved"), TripSeineUI.class); //FIXME // addMapping(DATA, TripSeineDto.class, TripSeineDto.PROPERTY_GEAR_USE_FEATURES_SEINE, GearUseFeaturesSeineUI.class); // addMapping(DATA, TripSeineDto.class, TripSeineDto.PROPERTY_ROUTE, RoutesUI.class); addMapping(DATA, RouteDto.class, RouteUI.class); - addMapping(DATA, RouteDto.class, n("observe.tree.route.unsaved"), RouteUI.class); + addMapping(DATA, RouteDto.class, n("observe.tree.routeDto.unsaved"), RouteUI.class); //FIXME // addMapping(DATA, RouteDto.class, RouteDto.PROPERTY_ACTIVITY_SEINE, ActivitySeinesUI.class); addMapping(DATA, ActivitySeineDto.class, ActivitySeineUI.class); - addMapping(DATA, ActivitySeineDto.class, n("observe.tree.activitySeine.unsaved"), ActivitySeineUI.class); + addMapping(DATA, ActivitySeineDto.class, n("observe.tree.activitySeineDto.unsaved"), ActivitySeineUI.class); //FIXME addMapping(DATA, ActivitySeineDto.class, ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM, ActivitySeineObservedSystemUI.class); addMapping(DATA, SetSeineDto.class, SetSeineUI.class); - addMapping(DATA, SetSeineDto.class, n("observe.tree.setSeine.unsaved"), SetSeineUI.class); + addMapping(DATA, SetSeineDto.class, n("observe.tree.setSeineDto.unsaved"), SetSeineUI.class); addMapping(DATA, SetSeineDto.class, SetSeineSchoolEstimateDto.PROPERTY_SCHOOL_ESTIMATE, SchoolEstimateUI.class); addMapping(DATA, SetSeineDto.class, SetSeineTargetCatchDto.PROPERTY_TARGET_CATCH, TargetCatchUI.class); addMapping(DATA, SetSeineDto.class, SetSeineDto.PROPERTY_TARGET_DISCARDED, TargetDiscardCatchUI.class); @@ -139,7 +139,7 @@ public class ContentUIManager { // addMapping(DATA, SetSeineDto.class, SetSeineDto.PROPERTY_NON_TARGET_SAMPLE, NonTargetSampleUI.class); addMapping(DATA, FloatingObjectDto.class, FloatingObjectUI.class); - addMapping(DATA, FloatingObjectDto.class, n("observe.tree.floatingObject.unsaved"), FloatingObjectUI.class); + addMapping(DATA, FloatingObjectDto.class, n("observe.tree.floatingObjectDto.unsaved"), FloatingObjectUI.class); addMapping(DATA, FloatingObjectDto.class, FloatingObjectDto.PROPERTY_OBJECT_OPERATION, FloatingObjectTransmittingBuoyOperationUI.class); addMapping(DATA, FloatingObjectDto.class, FloatingObjectObservedSpeciesDto.PROPERTY_OBJECT_OBSERVED_SPECIES, ObjectObservedSpeciesUI.class); addMapping(DATA, FloatingObjectDto.class, FloatingObjectSchoolEstimateDto.PROPERTY_OBJECT_SCHOOL_ESTIMATE, ObjectSchoolEstimateUI.class); @@ -149,18 +149,18 @@ public class ContentUIManager { addMapping(DATA, ProgramDto.class, GearType.longline.name(), TripLonglinesUI.class); addMapping(DATA, TripLonglineDto.class, TripLonglineUI.class); - addMapping(DATA, TripLonglineDto.class, n("observe.tree.tripLongline.unsaved"), TripLonglineUI.class); + addMapping(DATA, TripLonglineDto.class, n("observe.tree.tripLonglineDto.unsaved"), TripLonglineUI.class); //FIXME // addMapping(DATA, TripLonglineDto.class, TripLonglineDto.PROPERTY_GEAR_USE_FEATURES_LONGLINE, GearUseFeaturesLonglineUI.class); // addMapping(DATA, TripLonglineDto.class, TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE, ActivityLonglinesUI.class); addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineUI.class); - addMapping(DATA, ActivityLonglineDto.class, n("observe.tree.activityLongline.unsaved"), ActivityLonglineUI.class); + addMapping(DATA, ActivityLonglineDto.class, n("observe.tree.activityLonglineDto.unsaved"), ActivityLonglineUI.class); addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineEncouterDto.PROPERTY_ENCOUNTER, EncounterUI.class); addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED, SensorUsedUI.class); addMapping(DATA, SetLonglineDto.class, SetLonglineUI.class); - addMapping(DATA, SetLonglineDto.class, n("observe.tree.setLongline.unsaved"), SetLonglineUI.class); + addMapping(DATA, SetLonglineDto.class, n("observe.tree.setLonglineDto.unsaved"), SetLonglineUI.class); addMapping(DATA, SetLonglineDto.class, "longlineGlobalComposition", LonglineGlobalCompositionUI.class); addMapping(DATA, SetLonglineDto.class, "longlineDetailComposition", LonglineDetailCompositionUI.class); diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 04b9ede..659cd71 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -2244,8 +2244,10 @@ observe.title.validate.tip=Validate datas of a storage observe.title.welcome.admin=Observe Admin observe.tree.activityLongline=Activity observe.tree.activityLongline.unsaved=New activity +observe.tree.activityLonglineDto.unsaved= observe.tree.activitySeine=Activity observe.tree.activitySeine.unsaved=New activity +observe.tree.activitySeineDto.unsaved= observe.tree.baitHaulingStatus=Bait hauling status observe.tree.baitSettingStatus=Bait setting status observe.tree.baitType=Bait type @@ -2256,6 +2258,7 @@ observe.tree.detectionMode=Detection mode observe.tree.encounter=Encounter observe.tree.encounterType= observe.tree.floatingObject.unsaved=New DCP +observe.tree.floatingObjectDto.unsaved= observe.tree.fpaZone=Fpa zone observe.tree.gear=Gear observe.tree.gearCaracteristic=Gear caracteristic @@ -2297,6 +2300,7 @@ observe.tree.reference.longline=Longline Referential observe.tree.reference.seine=Seine Referential observe.tree.route=Road observe.tree.route.unsaved=New route +observe.tree.routeDto.unsaved= observe.tree.schoolEstimate=School estimate observe.tree.sensorBrand=Sensor brand observe.tree.sensorDataFormat=Sensor data format @@ -2304,8 +2308,10 @@ observe.tree.sensorType=Sensor type observe.tree.sensorUsed=Sensor used observe.tree.setLongline= observe.tree.setLongline.unsaved=New fishing operation +observe.tree.setLonglineDto.unsaved= observe.tree.setSeine= observe.tree.setSeine.unsaved=New set +observe.tree.setSeineDto.unsaved= observe.tree.settingShape=Setting shape observe.tree.sex=Sex observe.tree.sizeMeasureType=Size measure type @@ -2324,7 +2330,9 @@ observe.tree.tdr=TDR observe.tree.transmittingBuoyOperation=Transmitting buoy operation observe.tree.transmittingBuoyType=Transmitting buoy type observe.tree.tripLongline.unsaved=New trip +observe.tree.tripLonglineDto.unsaved= observe.tree.tripSeine.unsaved=New trip +observe.tree.tripSeineDto.unsaved= observe.tree.tripType=Trip type observe.tree.vessel=Boat observe.tree.vesselActivityLongline=Boat activity diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index a7a9db4..e2f9403 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -2246,8 +2246,10 @@ observe.title.validate.tip= observe.title.welcome.admin= observe.tree.activityLongline=Actividad observe.tree.activityLongline.unsaved= +observe.tree.activityLonglineDto.unsaved= observe.tree.activitySeine=Actividad observe.tree.activitySeine.unsaved= +observe.tree.activitySeineDto.unsaved= observe.tree.baitHaulingStatus= observe.tree.baitSettingStatus= observe.tree.baitType= @@ -2258,6 +2260,7 @@ observe.tree.detectionMode=Modo de detección observe.tree.encounter= observe.tree.encounterType= observe.tree.floatingObject.unsaved=Nuevo DCP +observe.tree.floatingObjectDto.unsaved= observe.tree.fpaZone= observe.tree.gear= observe.tree.gearCaracteristic= @@ -2299,6 +2302,7 @@ observe.tree.reference.longline= observe.tree.reference.seine= observe.tree.route=Ruta observe.tree.route.unsaved=Nueva ruta +observe.tree.routeDto.unsaved= observe.tree.schoolEstimate=Estimación del banco observe.tree.sensorBrand= observe.tree.sensorDataFormat= @@ -2306,8 +2310,10 @@ observe.tree.sensorType= observe.tree.sensorUsed= observe.tree.setLongline= observe.tree.setLongline.unsaved=Nuevo Lance +observe.tree.setLonglineDto.unsaved= observe.tree.setSeine= observe.tree.setSeine.unsaved=Nuevo Lance +observe.tree.setSeineDto.unsaved= observe.tree.settingShape= observe.tree.sex=Sexo observe.tree.sizeMeasureType= @@ -2326,7 +2332,9 @@ observe.tree.tdr= observe.tree.transmittingBuoyOperation= observe.tree.transmittingBuoyType= observe.tree.tripLongline.unsaved=Nueva marea +observe.tree.tripLonglineDto.unsaved= observe.tree.tripSeine.unsaved=Nueva marea +observe.tree.tripSeineDto.unsaved= observe.tree.tripType= observe.tree.vessel=Barco observe.tree.vesselActivityLongline= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 37890d7..40aa3da 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -2243,9 +2243,9 @@ observe.title.validate=Validation des données observe.title.validate.tip=Valider les données d'une source de données observe.title.welcome.admin=Observe Administrateur observe.tree.activityLongline=Activités -observe.tree.activityLongline.unsaved=Nouvelle activité +observe.tree.activityLonglineDto.unsaved=Nouvelle activité observe.tree.activitySeine=Activités -observe.tree.activitySeine.unsaved=Nouvelle activité +observe.tree.activitySeineDto.unsaved=Nouvelle activité observe.tree.baitHaulingStatus=Status de l'appât au virage observe.tree.baitSettingStatus=Status de l'appât au filage observe.tree.baitType=Type d'appât @@ -2255,7 +2255,7 @@ observe.tree.country=Pays observe.tree.detectionMode=Mode détection observe.tree.encounter=Rencontres observe.tree.encounterType=Type de rencontre -observe.tree.floatingObject.unsaved=Nouveau DCP +observe.tree.floatingObjectDto.unsaved=Nouveau DCP observe.tree.fpaZone=Zone FPA observe.tree.gear=Équipement observe.tree.gearCaracteristic=Caractéristique d'un équipement @@ -2296,16 +2296,16 @@ observe.tree.reference.common=Référentiel commun observe.tree.reference.longline=Référentiel Palangre observe.tree.reference.seine=Référentiel Senne observe.tree.route=Routes -observe.tree.route.unsaved=Nouvelle route +observe.tree.routeDto.unsaved=Nouvelle route observe.tree.schoolEstimate=Estimation banc observe.tree.sensorBrand=Marque de capteur observe.tree.sensorDataFormat=Format de données de capteur observe.tree.sensorType=Type de capteur observe.tree.sensorUsed=Capteurs utilisés observe.tree.setLongline=Détails de l'opération -observe.tree.setLongline.unsaved=Nouvelle opération de pêche +observe.tree.setLonglineDto.unsaved=Nouvelle opération de pêche observe.tree.setSeine=Calée -observe.tree.setSeine.unsaved=Nouvelle calée +observe.tree.setSeineDto.unsaved=Nouvelle calée observe.tree.settingShape=Forme au filage observe.tree.sex=Sexe observe.tree.sizeMeasureType=Type de mesure de taille @@ -2323,8 +2323,8 @@ observe.tree.targetSampleCapture=Echantillon thon capturé observe.tree.tdr=Enregistreurs de profondeur observe.tree.transmittingBuoyOperation=Opération balise observe.tree.transmittingBuoyType=Type de balise -observe.tree.tripLongline.unsaved=Nouvelle marée -observe.tree.tripSeine.unsaved=Nouvelle marée +observe.tree.tripLonglineDto.unsaved=Nouvelle marée +observe.tree.tripSeineDto.unsaved=Nouvelle marée observe.tree.tripType=Type de marée observe.tree.vessel=Bateau observe.tree.vesselActivityLongline=Activité bateau diff --git a/observe-application-swing/src/main/resources/i18n/observe-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-swing_fr_FR.properties index 6c7d853..64534f3 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-swing_fr_FR.properties @@ -2024,9 +2024,9 @@ observe.title.validate=Validation des données observe.title.validate.tip=Valider les données d'une source de données observe.title.welcome.admin=Observe Administrateur observe.tree.activityLongline=Activités -observe.tree.activityLongline.unsaved=Nouvelle activité +observe.tree.activityLonglineDto.unsaved=Nouvelle activité observe.tree.activitySeine=Activités -observe.tree.activitySeine.unsaved=Nouvelle activité +observe.tree.activitySeineDto.unsaved=Nouvelle activité observe.tree.baitHaulingStatus=Status de l'appât au virage observe.tree.baitSettingStatus=Status de l'appât au filage observe.tree.baitType=Type d'appât @@ -2036,7 +2036,7 @@ observe.tree.country=Pays observe.tree.detectionMode=Mode détection observe.tree.encounter=Rencontres observe.tree.encounterType=Type de rencontre -observe.tree.floatingObject.unsaved=Nouveau DCP +observe.tree.floatingObjectDto.unsaved=Nouveau DCP observe.tree.fpaZone=Zone FPA observe.tree.gear=Équipement observe.tree.gearCaracteristic=Caractéristique d'un équipement @@ -2077,16 +2077,16 @@ observe.tree.reference.common=Référentiel commun observe.tree.reference.longline=Référentiel Palangre observe.tree.reference.seine=Référentiel Senne observe.tree.route=Routes -observe.tree.route.unsaved=Nouvelle route +observe.tree.routeDto.unsaved=Nouvelle route observe.tree.schoolEstimate=Estimation banc observe.tree.sensorBrand=Marque de capteur observe.tree.sensorDataFormat=Format de données de capteur observe.tree.sensorType=Type de capteur observe.tree.sensorUsed=Capteurs utilisés observe.tree.setLongline=Détails de l'opération -observe.tree.setLongline.unsaved=Nouvelle opération de pêche +observe.tree.setLonglineDto.unsaved=Nouvelle opération de pêche observe.tree.setSeine=Calée -observe.tree.setSeine.unsaved=Nouvelle calée +observe.tree.setSeineDto.unsaved=Nouvelle calée observe.tree.settingShape=Forme au filage observe.tree.sex=Sexe observe.tree.sizeMeasureType=Type de mesure de taille @@ -2104,8 +2104,8 @@ observe.tree.targetSampleCapture=Echantillon thon capturé observe.tree.tdr=Enregistreurs de profondeur observe.tree.transmittingBuoyOperation=Opération balise observe.tree.transmittingBuoyType=Type de balise -observe.tree.tripLongline.unsaved=Nouvelle marée -observe.tree.tripSeine.unsaved=Nouvelle marée +observe.tree.tripLonglineDto.unsaved=Nouvelle marée +observe.tree.tripSeineDto.unsaved=Nouvelle marée observe.tree.tripType=Type de marée observe.tree.vessel=Bateau observe.tree.vesselActivityLongline=Activité bateau -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.