This is an automated email from the git hooks/post-receive script. New commit to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git commit 9753766c2daa88bfe4af98d92695ff5e1f1e1b05 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 17 11:40:45 2015 +0200 refs #6475 revue de la décoration des calées --- .../src/main/java/fr/ird/observe/DecoratorService.java | 2 ++ .../ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java | 10 ++++++++++ .../ui/tree/loadors/ActivityLonglineNodeChildLoador.java | 1 + .../observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java | 1 + .../src/main/resources/i18n/observe-swing_en_GB.properties | 2 ++ .../src/main/resources/i18n/observe-swing_es_ES.properties | 2 ++ .../src/main/resources/i18n/observe-swing_fr_FR.properties | 8 +++++--- 7 files changed, 23 insertions(+), 3 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/DecoratorService.java b/observe-business/src/main/java/fr/ird/observe/DecoratorService.java index 3d67720..851106b 100644 --- a/observe-business/src/main/java/fr/ird/observe/DecoratorService.java +++ b/observe-business/src/main/java/fr/ird/observe/DecoratorService.java @@ -423,7 +423,9 @@ public class DecoratorService extends DecoratorProvider { registerMultiJXPathDecorator( FloatingObject.class, "DCP ${objectType/" + libelle + "}$s", "##", " - "); + //FIXME Remove this registerJXPathDecorator(SetSeine.class, t("observe.common.setSeine")); + //FIXME Remove this registerJXPathDecorator(SetLongline.class, t("observe.common.setLongline")); registerDefaultReferenceEntityDecorator(ObjectFate.class, libelle); registerDefaultReferenceEntityDecorator(Organism.class, libelle); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java index d7e16d7..0886000 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java @@ -278,6 +278,16 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel return text; } + if (node instanceof SetLonglineNode) { + String text = t("observe.tree.setLongline"); + return text; + } + + if (node instanceof SetSeineNode) { + String text = t("observe.tree.setSeine"); + return text; + } + if (node instanceof EntityNodeSupport) { EntityNodeSupport entityNodeSupport = (EntityNodeSupport) node; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java index c29fd4f..205c074 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java @@ -50,6 +50,7 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Str static { n("observe.tree.encounter"); n("observe.tree.sensorUsed"); + n("observe.tree.setLongline"); } public ActivityLonglineNodeChildLoador() { diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java index 6b69659..2144200 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java @@ -50,6 +50,7 @@ public class ActivitySeineNodeChildLoador extends AbstractNodeChildLoador<Floati static { n("observe.common.observedSystem"); + n("observe.tree.setSeine"); } public ActivitySeineNodeChildLoador() { 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 be9bfb3..8d9da57 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 @@ -2035,7 +2035,9 @@ observe.tree.sensorBrand=Sensor brand observe.tree.sensorDataFormat=Sensor data format observe.tree.sensorType=Sensor type observe.tree.sensorUsed=Sensor used +observe.tree.setLongline= observe.tree.setLongline.unsaved=New fishing operation +observe.tree.setSeine= observe.tree.setSeine.unsaved=New set observe.tree.settingShape=Setting shape observe.tree.sex=Sex 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 8a8a625..8650cf9 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 @@ -2035,7 +2035,9 @@ observe.tree.sensorBrand= observe.tree.sensorDataFormat= observe.tree.sensorType= observe.tree.sensorUsed= +observe.tree.setLongline= observe.tree.setLongline.unsaved=Nuevo Lance +observe.tree.setSeine= observe.tree.setSeine.unsaved=Nuevo Lance observe.tree.settingShape= observe.tree.sex=Sexo 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 80767a6..f91c6b9 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 @@ -1101,7 +1101,7 @@ observe.init.local.db.detected=%1$s détectée. observe.init.no.initial.dump.detected=Base embarquée %1$s non détectée. observe.init.no.local.db.detected=Base locale %1$s non détectée. observe.init.storage.done=Initialisation du service de persistance terminé. -observe.label.coefficients.info=Les coefficients des relations sont de la forme nom=valeur et sont séparé par des : (exemple : a=1:b=2:c=3) +observe.label.coefficients.info=Les coefficients des relations sont de la forme nom\=valeur et sont séparé par des \: (exemple \: a\=1\:b\=2\:c\=3) observe.label.lengthWeightFormula.info=La relation poids permet de calculer le poids à partir de la taille, elle doit contenir la variable L observe.label.usage.data.title=Donnée '%1$s' (%2$d occurrences) observe.label.usage.referentiel.title=Référentiel '%1$s' (%2$d occurrences) @@ -2004,7 +2004,7 @@ observe.tree.lengthWeightParameter=Relation Taille-Poids observe.tree.lightsticksColor=Couleur de baton lumineux observe.tree.lightsticksType=Type de baton lumineux observe.tree.lineType=Type de ligne -observe.tree.longlineDetailComposition=Schmé de palangre +observe.tree.longlineDetailComposition=Schéma de palangre observe.tree.longlineGlobalComposition=Composition observe.tree.maturityStatus=Maturité observe.tree.mitigationType=Type de mesure d'atténuation @@ -2033,7 +2033,9 @@ 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.setSeine=Calée observe.tree.setSeine.unsaved=Nouvelle calée observe.tree.settingShape=Forme au filage observe.tree.sex=Sexe @@ -2049,7 +2051,7 @@ observe.tree.targetCatch=Capture cible observe.tree.targetDiscarded=Rejet de thon observe.tree.targetSample=Echantillon thon rejeté observe.tree.targetSampleCapture=Echantillon thon capturé -observe.tree.tdr=Enregistreur de profondeur +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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.