Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

28 changed files:

Changes:

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ClassNavigationTreeNode.java
    ... ... @@ -22,12 +22,8 @@ package fr.ird.observe.client.ui.tree.navigation.nodes;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    -import fr.ird.observe.services.decoration.ObserveI18nDecoratorHelper;
    26 25 
     import fr.ird.observe.services.dto.IdDto;
    27 26
    28 
    -
    29 
    -import static org.nuiton.i18n.I18n.t;
    30 
    -
    31 27 
     /**
    32 28 
      * Created on 14/11/16.
    33 29 
      *
    ... ... @@ -36,12 +32,15 @@ import static org.nuiton.i18n.I18n.t;
    36 32 
      */
    37 33 
     public abstract class ClassNavigationTreeNode<D extends IdDto> extends NavigationTreeNodeSupport<Class<D>> {
    38 34
    39 
    -    protected ClassNavigationTreeNode(Class<D> data) {
    40 
    -        this(data, false);
    35 
    +    private final String text;
    36 
    +
    37 
    +    protected ClassNavigationTreeNode(Class<D> data, String text) {
    38 
    +        this(data, false, text);
    41 39 
         }
    42 40
    43 
    -    protected ClassNavigationTreeNode(Class<D> data, boolean allowChildren) {
    41 
    +    protected ClassNavigationTreeNode(Class<D> data, boolean allowChildren, String text) {
    44 42 
             super(data, allowChildren);
    43 
    +        this.text = text;
    45 44 
         }
    46 45
    47 46 
         @Override
    ... ... @@ -59,8 +58,9 @@ public abstract class ClassNavigationTreeNode<D extends IdDto> extends Navigatio
    59 58 
         }
    60 59
    61 60 
         @Override
    62 
    -    public String getText() {
    63 
    -        return t(ObserveI18nDecoratorHelper.getTypeI18nKey(getDataType()));
    61 
    +    public final String getText() {
    62 
    +//        return t(ObserveI18nDecoratorHelper.getTypeI18nKey(getDataType()));
    63 
    +        return text;
    64 64 
         }
    65 65
    66 66 
         @Override

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/ActivitiesLonglineNavigationTreeNode.java
    ... ... @@ -25,7 +25,6 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.longline;
    25 25 
     import fr.ird.observe.client.ui.content.list.impl.longline.ActivityLonglinesUI;
    26 26 
     import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.client.ui.tree.navigation.nodes.WithChildsToReload;
    28 
    -import fr.ird.observe.services.decoration.ObserveI18nDecoratorHelper;
    29 28 
     import fr.ird.observe.services.dto.longline.ActivityLonglineDto;
    30 29 
     import fr.ird.observe.services.dto.reference.DataReference;
    31 30 
     import fr.ird.observe.services.dto.reference.DataReferenceSet;
    ... ... @@ -41,8 +40,8 @@ import static org.nuiton.i18n.I18n.t;
    41 40 
      */
    42 41 
     public class ActivitiesLonglineNavigationTreeNode extends ClassNavigationTreeNode<ActivityLonglineDto> implements WithChildsToReload {
    43 42
    44 
    -    public ActivitiesLonglineNavigationTreeNode() {
    45 
    -        super(ActivityLonglineDto.class, true);
    43 
    +    ActivitiesLonglineNavigationTreeNode() {
    44 
    +        super(ActivityLonglineDto.class, true, t("observe.ui.tree.activities"));
    46 45 
         }
    47 46
    48 47 
         @Override
    ... ... @@ -61,11 +60,6 @@ public class ActivitiesLonglineNavigationTreeNode extends ClassNavigationTreeNod
    61 60 
         }
    62 61
    63 62 
         @Override
    64 
    -    public String getText() {
    65 
    -        return t(ObserveI18nDecoratorHelper.getTypePluralI18nKey(getData()));
    66 
    -    }
    67 
    -
    68 
    -    @Override
    69 63 
         public void reloadChilds() {
    70 64 
             DataReferenceSet<ActivityLonglineDto> referenceSet = getServicesProvider().getActivityLonglineService().getActivityLonglineByTripLongline(getId());
    71 65 
             for (DataReference<ActivityLonglineDto> reference : referenceSet.getReferences()) {

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/CatchLonglineNavigationTreeNode.java
    ... ... @@ -26,6 +26,9 @@ import fr.ird.observe.client.ui.content.table.impl.longline.CatchLonglineUI;
    26 26 
     import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.services.dto.longline.CatchLonglineDto;
    28 28
    29 
    +
    30 
    +import static org.nuiton.i18n.I18n.t;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 14/11/16.
    31 34 
      *
    ... ... @@ -34,8 +37,8 @@ import fr.ird.observe.services.dto.longline.CatchLonglineDto;
    34 37 
      */
    35 38 
     public class CatchLonglineNavigationTreeNode extends ClassNavigationTreeNode<CatchLonglineDto> {
    36 39
    37 
    -    public CatchLonglineNavigationTreeNode() {
    38 
    -        super(CatchLonglineDto.class);
    40 
    +    CatchLonglineNavigationTreeNode() {
    41 
    +        super(CatchLonglineDto.class,t("observe.ui.tree.longline.catch"));
    39 42 
         }
    40 43
    41 44 
         @Override

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/EncounterLonglineNavigationTreeNode.java
    ... ... @@ -26,6 +26,9 @@ import fr.ird.observe.client.ui.content.table.impl.longline.EncounterUI;
    26 26 
     import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.services.dto.longline.EncounterDto;
    28 28
    29 
    +
    30 
    +import static org.nuiton.i18n.I18n.t;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 14/11/16.
    31 34 
      *
    ... ... @@ -34,8 +37,8 @@ import fr.ird.observe.services.dto.longline.EncounterDto;
    34 37 
      */
    35 38 
     public class EncounterLonglineNavigationTreeNode extends ClassNavigationTreeNode<EncounterDto> {
    36 39
    37 
    -    public EncounterLonglineNavigationTreeNode() {
    38 
    -        super(EncounterDto.class);
    40 
    +    EncounterLonglineNavigationTreeNode() {
    41 
    +        super(EncounterDto.class, t("observe.ui.tree.longline.encounter"));
    39 42 
         }
    40 43
    41 44 
         @Override

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/GearUseFeaturesLonglineNavigationTreeNode.java
    ... ... @@ -27,6 +27,9 @@ import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.services.dto.longline.ActivityLonglineDto;
    28 28 
     import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto;
    29 29
    30 
    +
    31 
    +import static org.nuiton.i18n.I18n.t;
    32 
    +
    30 33 
     /**
    31 34 
      * Created on 14/11/16.
    32 35 
      *
    ... ... @@ -35,8 +38,8 @@ import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto;
    35 38 
      */
    36 39 
     public class GearUseFeaturesLonglineNavigationTreeNode extends ClassNavigationTreeNode<GearUseFeaturesLonglineDto> {
    37 40
    38 
    -    public GearUseFeaturesLonglineNavigationTreeNode() {
    39 
    -        super(GearUseFeaturesLonglineDto.class);
    41 
    +    GearUseFeaturesLonglineNavigationTreeNode() {
    42 
    +        super(GearUseFeaturesLonglineDto.class, t("observe.ui.tree.gearUseFeatures"));
    40 43 
         }
    41 44
    42 45 
         @Override

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/SensorUsedLonglineNavigationTreeNode.java
    ... ... @@ -26,6 +26,9 @@ import fr.ird.observe.client.ui.content.table.impl.longline.SensorUsedUI;
    26 26 
     import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.services.dto.longline.SensorUsedDto;
    28 28
    29 
    +
    30 
    +import static org.nuiton.i18n.I18n.t;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 14/11/16.
    31 34 
      *
    ... ... @@ -34,8 +37,8 @@ import fr.ird.observe.services.dto.longline.SensorUsedDto;
    34 37 
      */
    35 38 
     public class SensorUsedLonglineNavigationTreeNode extends ClassNavigationTreeNode<SensorUsedDto> {
    36 39
    37 
    -    public SensorUsedLonglineNavigationTreeNode() {
    38 
    -        super(SensorUsedDto.class);
    40 
    +    SensorUsedLonglineNavigationTreeNode() {
    41 
    +        super(SensorUsedDto.class, t("observe.ui.tree.longline.sensorUsed"));
    39 42 
         }
    40 43
    41 44 
         @Override

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/SetDetailCompositionLonglineNavigationTreeNode.java
    ... ... @@ -26,6 +26,9 @@ import fr.ird.observe.client.ui.content.impl.longline.LonglineDetailCompositionU
    26 26 
     import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto;
    28 28
    29 
    +
    30 
    +import static org.nuiton.i18n.I18n.t;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 14/11/16.
    31 34 
      *
    ... ... @@ -34,8 +37,8 @@ import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto;
    34 37 
      */
    35 38 
     public class SetDetailCompositionLonglineNavigationTreeNode extends ClassNavigationTreeNode<SetLonglineDetailCompositionDto> {
    36 39
    37 
    -    public SetDetailCompositionLonglineNavigationTreeNode() {
    38 
    -        super(SetLonglineDetailCompositionDto.class);
    40 
    +    SetDetailCompositionLonglineNavigationTreeNode() {
    41 
    +        super(SetLonglineDetailCompositionDto.class, t("observe.ui.tree.longline.setDetailComposition"));
    39 42 
         }
    40 43
    41 44 
         @Override

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/SetGlobalCompositionLonglineNavigationTreeNode.java
    ... ... @@ -26,6 +26,9 @@ import fr.ird.observe.client.ui.content.impl.longline.LonglineGlobalCompositionU
    26 26 
     import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto;
    28 28
    29 
    +
    30 
    +import static org.nuiton.i18n.I18n.t;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 14/11/16.
    31 34 
      *
    ... ... @@ -34,8 +37,8 @@ import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto;
    34 37 
      */
    35 38 
     public class SetGlobalCompositionLonglineNavigationTreeNode extends ClassNavigationTreeNode<SetLonglineGlobalCompositionDto> {
    36 39
    37 
    -    public SetGlobalCompositionLonglineNavigationTreeNode() {
    38 
    -        super(SetLonglineGlobalCompositionDto.class);
    40 
    +    SetGlobalCompositionLonglineNavigationTreeNode() {
    41 
    +        super(SetLonglineGlobalCompositionDto.class,t("observe.ui.tree.longline.setGlobalComposition"));
    39 42 
         }
    40 43
    41 44 
         @Override

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/TdrLonglineNavigationTreeNode.java
    ... ... @@ -26,6 +26,9 @@ import fr.ird.observe.client.ui.content.table.impl.longline.TdrUI;
    26 26 
     import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.services.dto.longline.TdrDto;
    28 28
    29 
    +
    30 
    +import static org.nuiton.i18n.I18n.t;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 14/11/16.
    31 34 
      *
    ... ... @@ -34,8 +37,8 @@ import fr.ird.observe.services.dto.longline.TdrDto;
    34 37 
      */
    35 38 
     public class TdrLonglineNavigationTreeNode extends ClassNavigationTreeNode<TdrDto> {
    36 39
    37 
    -    public TdrLonglineNavigationTreeNode() {
    38 
    -        super(TdrDto.class);
    40 
    +    TdrLonglineNavigationTreeNode() {
    41 
    +        super(TdrDto.class, t("observe.ui.tree.longline.tdr"));
    39 42 
         }
    40 43
    41 44 
         @Override

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialNavigationTreeNode.java
    ... ... @@ -40,8 +40,8 @@ import static org.nuiton.i18n.I18n.t;
    40 40 
      */
    41 41 
     public class ReferentialNavigationTreeNode<D extends ReferentialDto> extends ClassNavigationTreeNode<D> {
    42 42
    43 
    -    public ReferentialNavigationTreeNode(Class<D> data) {
    44 
    -        super(data, true);
    43 
    +    ReferentialNavigationTreeNode(Class<D> data) {
    44 
    +        super(data, true, t(ObserveI18nDecoratorHelper.getTypePluralI18nKey(data)));
    45 45 
         }
    46 46
    47 47 
         @Override
    ... ... @@ -66,11 +66,6 @@ public class ReferentialNavigationTreeNode<D extends ReferentialDto> extends Cla
    66 66 
         }
    67 67
    68 68 
         @Override
    69 
    -    public String getText() {
    70 
    -        return t(ObserveI18nDecoratorHelper.getTypePluralI18nKey(getDataType()));
    71 
    -    }
    72 
    -
    73 
    -    @Override
    74 69 
         public String getIconPath() {
    75 70 
             return "navigation.sub.referentiel";
    76 71 
         }

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ActivitiesSeineNavigationTreeNode.java
    ... ... @@ -25,7 +25,6 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.seine;
    25 25 
     import fr.ird.observe.client.ui.content.list.impl.seine.ActivitySeinesUI;
    26 26 
     import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.client.ui.tree.navigation.nodes.WithChildsToReload;
    28 
    -import fr.ird.observe.services.decoration.ObserveI18nDecoratorHelper;
    29 28 
     import fr.ird.observe.services.dto.reference.DataReference;
    30 29 
     import fr.ird.observe.services.dto.reference.DataReferenceSet;
    31 30 
     import fr.ird.observe.services.dto.seine.ActivitySeineDto;
    ... ... @@ -41,8 +40,8 @@ import static org.nuiton.i18n.I18n.t;
    41 40 
      */
    42 41 
     public class ActivitiesSeineNavigationTreeNode extends ClassNavigationTreeNode<ActivitySeineDto> implements WithChildsToReload {
    43 42
    44 
    -    public ActivitiesSeineNavigationTreeNode() {
    45 
    -        super(ActivitySeineDto.class, true);
    43 
    +    ActivitiesSeineNavigationTreeNode() {
    44 
    +        super(ActivitySeineDto.class, true,t("observe.ui.tree.activities"));
    46 45 
         }
    47 46
    48 47 
         @Override
    ... ... @@ -61,11 +60,6 @@ public class ActivitiesSeineNavigationTreeNode extends ClassNavigationTreeNode<A
    61 60 
         }
    62 61
    63 62 
         @Override
    64 
    -    public String getText() {
    65 
    -        return t(ObserveI18nDecoratorHelper.getTypePluralI18nKey(getData()));
    66 
    -    }
    67 
    -
    68 
    -    @Override
    69 63 
         public void reloadChilds() {
    70 64 
             DataReferenceSet<ActivitySeineDto> referenceSet = getServicesProvider().getActivitySeineService().getActivitySeineByRoute(getId());
    71 65 
             for (DataReference<ActivitySeineDto> reference : referenceSet.getReferences()) {

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/DiscardedTargetCatchesSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/DiscardedTargetCatchSeineNavigationTreeNode.java
    ... ... @@ -26,16 +26,19 @@ import fr.ird.observe.client.ui.content.table.impl.seine.TargetDiscardCatchUI;
    26 26 
     import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.services.dto.seine.DiscardedTargetCatchDto;
    28 28
    29 
    +
    30 
    +import static org.nuiton.i18n.I18n.t;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 14/11/16.
    31 34 
      *
    32 35 
      * @author Tony Chemit - dev@tchemit.fr
    33 36 
      * @since 6.0
    34 37 
      */
    35 
    -public class DiscardedTargetCatchesSeineNavigationTreeNode extends ClassNavigationTreeNode<DiscardedTargetCatchDto> {
    38 
    +public class DiscardedTargetCatchSeineNavigationTreeNode extends ClassNavigationTreeNode<DiscardedTargetCatchDto> {
    36 39
    37 
    -    public DiscardedTargetCatchesSeineNavigationTreeNode() {
    38 
    -        super(DiscardedTargetCatchDto.class);
    40 
    +    DiscardedTargetCatchSeineNavigationTreeNode() {
    41 
    +        super(DiscardedTargetCatchDto.class,t("observe.ui.tree.seine.discardedTargetCatch"));
    39 42 
         }
    40 43
    41 44 
         @Override

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/DiscardedTargetSamplesSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/DiscardedTargetSampleSeineNavigationTreeNode.java
    ... ... @@ -26,16 +26,19 @@ import fr.ird.observe.client.ui.content.table.impl.seine.TargetSampleRejeteUI;
    26 26 
     import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.services.dto.seine.DiscardedTargetSampleDto;
    28 28
    29 
    +
    30 
    +import static org.nuiton.i18n.I18n.t;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 14/11/16.
    31 34 
      *
    32 35 
      * @author Tony Chemit - dev@tchemit.fr
    33 36 
      * @since 6.0
    34 37 
      */
    35 
    -public class DiscardedTargetSamplesSeineNavigationTreeNode extends ClassNavigationTreeNode<DiscardedTargetSampleDto> {
    38 
    +public class DiscardedTargetSampleSeineNavigationTreeNode extends ClassNavigationTreeNode<DiscardedTargetSampleDto> {
    36 39
    37 
    -    public DiscardedTargetSamplesSeineNavigationTreeNode() {
    38 
    -        super(DiscardedTargetSampleDto.class);
    40 
    +    DiscardedTargetSampleSeineNavigationTreeNode() {
    41 
    +        super(DiscardedTargetSampleDto.class, t("observe.ui.tree.seine.discardedTargetSample"));
    39 42 
         }
    40 43
    41 44 
         @Override

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/FloatingObjectTransmittingBuoyNavigationTreeNode.java
    ... ... @@ -26,6 +26,9 @@ import fr.ird.observe.client.ui.content.impl.seine.FloatingObjectTransmittingBuo
    26 26 
     import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto;
    28 28
    29 
    +
    30 
    +import static org.nuiton.i18n.I18n.t;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 04/12/16.
    31 34 
      *
    ... ... @@ -34,8 +37,8 @@ import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto;
    34 37 
      */
    35 38 
     public class FloatingObjectTransmittingBuoyNavigationTreeNode extends ClassNavigationTreeNode<ObjectOperationDto> {
    36 39
    37 
    -    public FloatingObjectTransmittingBuoyNavigationTreeNode() {
    38 
    -        super(ObjectOperationDto.class);
    40 
    +    FloatingObjectTransmittingBuoyNavigationTreeNode() {
    41 
    +        super(ObjectOperationDto.class, t("observe.ui.tree.seine.objectOperation"));
    39 42 
         }
    40 43
    41 44 
         @Override

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/GearUseFeaturesSeineNavigationTreeNode.java
    ... ... @@ -27,6 +27,9 @@ import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.services.dto.seine.ActivitySeineDto;
    28 28 
     import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto;
    29 29
    30 
    +
    31 
    +import static org.nuiton.i18n.I18n.t;
    32 
    +
    30 33 
     /**
    31 34 
      * Created on 14/11/16.
    32 35 
      *
    ... ... @@ -35,8 +38,8 @@ import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto;
    35 38 
      */
    36 39 
     public class GearUseFeaturesSeineNavigationTreeNode extends ClassNavigationTreeNode<GearUseFeaturesSeineDto> {
    37 40
    38 
    -    public GearUseFeaturesSeineNavigationTreeNode() {
    39 
    -        super(GearUseFeaturesSeineDto.class);
    41 
    +    GearUseFeaturesSeineNavigationTreeNode() {
    42 
    +        super(GearUseFeaturesSeineDto.class,t("observe.ui.tree.gearUseFeatures"));
    40 43 
         }
    41 44
    42 45 
         @Override

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/KeptTargetCatchesSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/KeptTargetCatchSeineNavigationTreeNode.java
    ... ... @@ -26,16 +26,19 @@ import fr.ird.observe.client.ui.content.table.impl.seine.TargetCatchUI;
    26 26 
     import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.services.dto.seine.KeptTargetCatchDto;
    28 28
    29 
    +
    30 
    +import static org.nuiton.i18n.I18n.t;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 14/11/16.
    31 34 
      *
    32 35 
      * @author Tony Chemit - dev@tchemit.fr
    33 36 
      * @since 6.0
    34 37 
      */
    35 
    -public class KeptTargetCatchesSeineNavigationTreeNode extends ClassNavigationTreeNode<KeptTargetCatchDto> {
    38 
    +public class KeptTargetCatchSeineNavigationTreeNode extends ClassNavigationTreeNode<KeptTargetCatchDto> {
    36 39
    37 
    -    public KeptTargetCatchesSeineNavigationTreeNode() {
    38 
    -        super(KeptTargetCatchDto.class);
    40 
    +    KeptTargetCatchSeineNavigationTreeNode() {
    41 
    +        super(KeptTargetCatchDto.class, t("observe.ui.tree.seine.keptTargetCatch"));
    39 42 
         }
    40 43
    41 44 
         @Override

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/KeptTargetSamplesSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/KeptTargetSampleSeineNavigationTreeNode.java
    ... ... @@ -26,16 +26,19 @@ import fr.ird.observe.client.ui.content.table.impl.seine.TargetSampleCaptureUI;
    26 26 
     import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.services.dto.seine.KeptTargetSampleDto;
    28 28
    29 
    +
    30 
    +import static org.nuiton.i18n.I18n.t;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 14/11/16.
    31 34 
      *
    32 35 
      * @author Tony Chemit - dev@tchemit.fr
    33 36 
      * @since 6.0
    34 37 
      */
    35 
    -public class KeptTargetSamplesSeineNavigationTreeNode extends ClassNavigationTreeNode<KeptTargetSampleDto> {
    38 
    +public class KeptTargetSampleSeineNavigationTreeNode extends ClassNavigationTreeNode<KeptTargetSampleDto> {
    36 39
    37 
    -    public KeptTargetSamplesSeineNavigationTreeNode() {
    38 
    -        super(KeptTargetSampleDto.class);
    40 
    +    KeptTargetSampleSeineNavigationTreeNode() {
    41 
    +        super(KeptTargetSampleDto.class, t("observe.ui.tree.seine.keptTargetSample"));
    39 42 
         }
    40 43
    41 44 
         @Override

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NonTargetCatchesReleasedSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NonTargetCatchReleasedSeineNavigationTreeNode.java
    ... ... @@ -26,16 +26,19 @@ import fr.ird.observe.client.ui.content.table.impl.seine.NonTargetCatchReleaseUI
    26 26 
     import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.services.dto.seine.NonTargetCatchReleaseDto;
    28 28
    29 
    +
    30 
    +import static org.nuiton.i18n.I18n.t;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 14/11/16.
    31 34 
      *
    32 35 
      * @author Tony Chemit - dev@tchemit.fr
    33 36 
      * @since 7.0
    34 37 
      */
    35 
    -public class NonTargetCatchesReleasedSeineNavigationTreeNode extends ClassNavigationTreeNode<NonTargetCatchReleaseDto> {
    38 
    +public class NonTargetCatchReleasedSeineNavigationTreeNode extends ClassNavigationTreeNode<NonTargetCatchReleaseDto> {
    36 39
    37 
    -    public NonTargetCatchesReleasedSeineNavigationTreeNode() {
    38 
    -        super(NonTargetCatchReleaseDto.class);
    40 
    +    NonTargetCatchReleasedSeineNavigationTreeNode() {
    41 
    +        super(NonTargetCatchReleaseDto.class, t("observe.ui.tree.seine.nonTargetCatchRelease"));
    39 42 
         }
    40 43
    41 44 
         @Override

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NonTargetCatchesSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NonTargetCatchSeineNavigationTreeNode.java
    ... ... @@ -26,16 +26,19 @@ import fr.ird.observe.client.ui.content.table.impl.seine.NonTargetCatchUI;
    26 26 
     import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.services.dto.seine.NonTargetCatchDto;
    28 28
    29 
    +
    30 
    +import static org.nuiton.i18n.I18n.t;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 14/11/16.
    31 34 
      *
    32 35 
      * @author Tony Chemit - dev@tchemit.fr
    33 36 
      * @since 6.0
    34 37 
      */
    35 
    -public class NonTargetCatchesSeineNavigationTreeNode extends ClassNavigationTreeNode<NonTargetCatchDto> {
    38 
    +public class NonTargetCatchSeineNavigationTreeNode extends ClassNavigationTreeNode<NonTargetCatchDto> {
    36 39
    37 
    -    public NonTargetCatchesSeineNavigationTreeNode() {
    38 
    -        super(NonTargetCatchDto.class);
    40 
    +    NonTargetCatchSeineNavigationTreeNode() {
    41 
    +        super(NonTargetCatchDto.class, t("observe.ui.tree.seine.nonTargetCatch"));
    39 42 
         }
    40 43
    41 44 
         @Override

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NoneTargetSamplesSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NonTargetSampleSeineNavigationTreeNode.java
    ... ... @@ -26,16 +26,19 @@ import fr.ird.observe.client.ui.content.table.impl.seine.NonTargetSampleUI;
    26 26 
     import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.services.dto.seine.NonTargetSampleDto;
    28 28
    29 
    +
    30 
    +import static org.nuiton.i18n.I18n.t;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 14/11/16.
    31 34 
      *
    32 35 
      * @author Tony Chemit - dev@tchemit.fr
    33 36 
      * @since 6.0
    34 37 
      */
    35 
    -public class NoneTargetSamplesSeineNavigationTreeNode extends ClassNavigationTreeNode<NonTargetSampleDto> {
    38 
    +public class NonTargetSampleSeineNavigationTreeNode extends ClassNavigationTreeNode<NonTargetSampleDto> {
    36 39
    37 
    -    public NoneTargetSamplesSeineNavigationTreeNode() {
    38 
    -        super(NonTargetSampleDto.class);
    40 
    +    NonTargetSampleSeineNavigationTreeNode() {
    41 
    +        super(NonTargetSampleDto.class, t("observe.ui.tree.seine.nonTargetSample"));
    39 42 
         }
    40 43
    41 44 
         @Override

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ObjectObservedSpeciesNavigationTreeNode.java
    ... ... @@ -26,6 +26,9 @@ import fr.ird.observe.client.ui.content.table.impl.seine.ObjectObservedSpeciesUI
    26 26 
     import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto;
    28 28
    29 
    +
    30 
    +import static org.nuiton.i18n.I18n.t;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 04/12/16.
    31 34 
      *
    ... ... @@ -34,8 +37,8 @@ import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto;
    34 37 
      */
    35 38 
     public class ObjectObservedSpeciesNavigationTreeNode extends ClassNavigationTreeNode<ObjectObservedSpeciesDto> {
    36 39
    37 
    -    public ObjectObservedSpeciesNavigationTreeNode() {
    38 
    -        super(ObjectObservedSpeciesDto.class);
    40 
    +    ObjectObservedSpeciesNavigationTreeNode() {
    41 
    +        super(ObjectObservedSpeciesDto.class, t("observe.ui.tree.seine.objectObservedSpecies"));
    39 42 
         }
    40 43
    41 44 
         @Override

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ObjectSchoolEstimateNavigationTreeNode.java
    ... ... @@ -26,6 +26,9 @@ import fr.ird.observe.client.ui.content.table.impl.seine.ObjectSchoolEstimateUI;
    26 26 
     import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto;
    28 28
    29 
    +
    30 
    +import static org.nuiton.i18n.I18n.t;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 04/12/16.
    31 34 
      *
    ... ... @@ -34,8 +37,8 @@ import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto;
    34 37 
      */
    35 38 
     public class ObjectSchoolEstimateNavigationTreeNode extends ClassNavigationTreeNode<ObjectSchoolEstimateDto> {
    36 39
    37 
    -    public ObjectSchoolEstimateNavigationTreeNode() {
    38 
    -        super(ObjectSchoolEstimateDto.class);
    40 
    +    ObjectSchoolEstimateNavigationTreeNode() {
    41 
    +        super(ObjectSchoolEstimateDto.class, t("observe.ui.tree.seine.objectSchoolEstimate"));
    39 42 
         }
    40 43
    41 44 
         @Override

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/RoutesSeineNavigationTreeNode.java
    ... ... @@ -25,7 +25,6 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.seine;
    25 25 
     import fr.ird.observe.client.ui.content.list.impl.seine.RoutesUI;
    26 26 
     import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.client.ui.tree.navigation.nodes.WithChildsToReload;
    28 
    -import fr.ird.observe.services.decoration.ObserveI18nDecoratorHelper;
    29 28 
     import fr.ird.observe.services.dto.reference.DataReference;
    30 29 
     import fr.ird.observe.services.dto.reference.DataReferenceSet;
    31 30 
     import fr.ird.observe.services.dto.seine.RouteDto;
    ... ... @@ -41,8 +40,8 @@ import static org.nuiton.i18n.I18n.t;
    41 40 
      */
    42 41 
     public class RoutesSeineNavigationTreeNode extends ClassNavigationTreeNode<RouteDto> implements WithChildsToReload {
    43 42
    44 
    -    public RoutesSeineNavigationTreeNode() {
    45 
    -        super(RouteDto.class, true);
    43 
    +    RoutesSeineNavigationTreeNode() {
    44 
    +        super(RouteDto.class, true, t("observe.ui.tree.seine.routes"));
    46 45 
         }
    47 46
    48 47 
         @Override
    ... ... @@ -61,11 +60,6 @@ public class RoutesSeineNavigationTreeNode extends ClassNavigationTreeNode<Route
    61 60 
         }
    62 61
    63 62 
         @Override
    64 
    -    public String getText() {
    65 
    -        return t(ObserveI18nDecoratorHelper.getTypePluralI18nKey(getData()));
    66 
    -    }
    67 
    -
    68 
    -    @Override
    69 63 
         public void reloadChilds() {
    70 64 
             DataReferenceSet<RouteDto> referenceSet = getServicesProvider().getRouteService().getRouteByTripSeine(getId());
    71 65 
             for (DataReference<RouteDto> reference : referenceSet.getReferences()) {

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/SchoolEstimatesSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/SchoolEstimateSeineNavigationTreeNode.java
    ... ... @@ -26,16 +26,19 @@ import fr.ird.observe.client.ui.content.table.impl.seine.SchoolEstimateUI;
    26 26 
     import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    27 27 
     import fr.ird.observe.services.dto.seine.SchoolEstimateDto;
    28 28
    29 
    +
    30 
    +import static org.nuiton.i18n.I18n.t;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 14/11/16.
    31 34 
      *
    32 35 
      * @author Tony Chemit - dev@tchemit.fr
    33 36 
      * @since 6.0
    34 37 
      */
    35 
    -public class SchoolEstimatesSeineNavigationTreeNode extends ClassNavigationTreeNode<SchoolEstimateDto> {
    38 
    +public class SchoolEstimateSeineNavigationTreeNode extends ClassNavigationTreeNode<SchoolEstimateDto> {
    36 39
    37 
    -    public SchoolEstimatesSeineNavigationTreeNode() {
    38 
    -        super(SchoolEstimateDto.class);
    40 
    +    SchoolEstimateSeineNavigationTreeNode() {
    41 
    +        super(SchoolEstimateDto.class, t("observe.ui.tree.seine.schoolEstimate"));
    39 42 
         }
    40 43
    41 44 
         @Override

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java
    ... ... @@ -41,14 +41,14 @@ public class SetSeineNavigationTreeNode extends ReferenceNavigationTreeNodeSuppo
    41 41 
         public SetSeineNavigationTreeNode(DataReference<SetSeineDto> data) {
    42 42 
             super(data, true);
    43 43 
             if (isPersisted()) {
    44 
    -            add(new SchoolEstimatesSeineNavigationTreeNode());
    45 
    -            add(new KeptTargetCatchesSeineNavigationTreeNode());
    46 
    -            add(new DiscardedTargetCatchesSeineNavigationTreeNode());
    47 
    -            add(new KeptTargetSamplesSeineNavigationTreeNode());
    48 
    -            add(new DiscardedTargetSamplesSeineNavigationTreeNode());
    49 
    -            add(new NonTargetCatchesSeineNavigationTreeNode());
    50 
    -            add(new NonTargetCatchesReleasedSeineNavigationTreeNode());
    51 
    -            add(new NoneTargetSamplesSeineNavigationTreeNode());
    44 
    +            add(new SchoolEstimateSeineNavigationTreeNode());
    45 
    +            add(new KeptTargetCatchSeineNavigationTreeNode());
    46 
    +            add(new DiscardedTargetCatchSeineNavigationTreeNode());
    47 
    +            add(new KeptTargetSampleSeineNavigationTreeNode());
    48 
    +            add(new DiscardedTargetSampleSeineNavigationTreeNode());
    49 
    +            add(new NonTargetCatchSeineNavigationTreeNode());
    50 
    +            add(new NonTargetCatchReleasedSeineNavigationTreeNode());
    51 
    +            add(new NonTargetSampleSeineNavigationTreeNode());
    52 52 
             }
    53 53 
         }
    54 54

  • client/src/main/resources/i18n/client_en_GB.properties
    ... ... @@ -1664,6 +1664,26 @@ observe.type.setSeine.unsaved=New set
    1664 1664 
     observe.type.tripLongline.unsaved=New trip
    1665 1665 
     observe.type.tripSeine.unsaved=New trip
    1666 1666 
     observe.ui.objectMaterial.legacyCodeStandardCode=Legacy code / Standard code
    1667 
    +observe.ui.tree.activities=Activities
    1668 
    +observe.ui.tree.gearUseFeatures=Gear uses features
    1669 
    +observe.ui.tree.longline.catch=Catches
    1670 
    +observe.ui.tree.longline.encounter=Encouters
    1671 
    +observe.ui.tree.longline.sensorUsed=Sensors used
    1672 
    +observe.ui.tree.longline.setDetailComposition=Detailed compositions
    1673 
    +observe.ui.tree.longline.setGlobalComposition=Global compositions
    1674 
    +observe.ui.tree.longline.tdr=Tdrs
    1675 
    +observe.ui.tree.seine.discardedTargetCatch=Target discarded
    1676 
    +observe.ui.tree.seine.discardedTargetSample=Target sample
    1677 
    +observe.ui.tree.seine.keptTargetCatch=Target catch
    1678 
    +observe.ui.tree.seine.keptTargetSample=Target sample catch
    1679 
    +observe.ui.tree.seine.nonTargetCatch=Non target catch
    1680 
    +observe.ui.tree.seine.nonTargetCatchRelease=Non target released catches
    1681 
    +observe.ui.tree.seine.nonTargetSample=Non target samples
    1682 
    +observe.ui.tree.seine.objectObservedSpecies=Object observed species
    1683 
    +observe.ui.tree.seine.objectOperation=Object operations
    1684 
    +observe.ui.tree.seine.objectSchoolEstimate=Object school estimates
    1685 
    +observe.ui.tree.seine.routes=Routes
    1686 
    +observe.ui.tree.seine.schoolEstimate=School estimates
    1667 1687 
     observe.usage.action.shouldReplace=Remplace desactivated referential ?
    1668 1688 
     observe.usage.replaceTitle=Replacement object
    1669 1689 
     observe.usage.usageTitle=Founded references

  • client/src/main/resources/i18n/client_es_ES.properties
    ... ... @@ -1664,6 +1664,26 @@ observe.type.setSeine.unsaved=Nuevo lance
    1664 1664 
     observe.type.tripLongline.unsaved=Nueva marea
    1665 1665 
     observe.type.tripSeine.unsaved=Nueva marea
    1666 1666 
     observe.ui.objectMaterial.legacyCodeStandardCode=Ancien code / Code standard \#TODO
    1667 
    +observe.ui.tree.activities=Actividades
    1668 
    +observe.ui.tree.gearUseFeatures=Equipamientos
    1669 
    +observe.ui.tree.longline.catch=Capturas
    1670 
    +observe.ui.tree.longline.encounter=Encuentros
    1671 
    +observe.ui.tree.longline.sensorUsed=Sensores utilizados
    1672 
    +observe.ui.tree.longline.setDetailComposition=Composiciones detalladas
    1673 
    +observe.ui.tree.longline.setGlobalComposition=Composiciones globales
    1674 
    +observe.ui.tree.longline.tdr=Registradores de profundidad
    1675 
    +observe.ui.tree.seine.discardedTargetCatch=Descarte de atún
    1676 
    +observe.ui.tree.seine.discardedTargetSample=Muestreo atún descartado
    1677 
    +observe.ui.tree.seine.keptTargetCatch=Captura de atún
    1678 
    +observe.ui.tree.seine.keptTargetSample=Muestreo atún capturado
    1679 
    +observe.ui.tree.seine.nonTargetCatch=Fauna accesoria conservada o descartada
    1680 
    +observe.ui.tree.seine.nonTargetCatchRelease=Faunes accessoires libérées \#TODO
    1681 
    +observe.ui.tree.seine.nonTargetSample=Muestreos de fauna accesoria
    1682 
    +observe.ui.tree.seine.objectObservedSpecies=Fauna observada
    1683 
    +observe.ui.tree.seine.objectOperation=Operaciones sobre el objeto
    1684 
    +observe.ui.tree.seine.objectSchoolEstimate=Estimaciones banco de objetos
    1685 
    +observe.ui.tree.seine.routes=Rutas
    1686 
    +observe.ui.tree.seine.schoolEstimate=Estimaciones banco
    1667 1687 
     observe.usage.action.shouldReplace=Reemplaza referencial desactivado?
    1668 1688 
     observe.usage.replaceTitle=Objeto de sustitución
    1669 1689 
     observe.usage.usageTitle=Referencias encontradas

  • client/src/main/resources/i18n/client_fr_FR.properties
    ... ... @@ -1664,6 +1664,26 @@ observe.type.setSeine.unsaved=Nouvelle calée
    1664 1664 
     observe.type.tripLongline.unsaved=Nouvelle marée
    1665 1665 
     observe.type.tripSeine.unsaved=Nouvelle marée
    1666 1666 
     observe.ui.objectMaterial.legacyCodeStandardCode=Ancien code / Code standard
    1667 
    +observe.ui.tree.activities=Activités
    1668 
    +observe.ui.tree.gearUseFeatures=Équipements
    1669 
    +observe.ui.tree.longline.catch=Captures
    1670 
    +observe.ui.tree.longline.encounter=Rencontres
    1671 
    +observe.ui.tree.longline.sensorUsed=Capteurs utilisés
    1672 
    +observe.ui.tree.longline.setDetailComposition=Compositions détaillées
    1673 
    +observe.ui.tree.longline.setGlobalComposition=Compositions globales
    1674 
    +observe.ui.tree.longline.tdr=Enregistreurs de profondeur
    1675 
    +observe.ui.tree.seine.discardedTargetCatch=Rejet de thon
    1676 
    +observe.ui.tree.seine.discardedTargetSample=Echantillon thon rejeté
    1677 
    +observe.ui.tree.seine.keptTargetCatch=Capture cible
    1678 
    +observe.ui.tree.seine.keptTargetSample=Echantillon thon capturé
    1679 
    +observe.ui.tree.seine.nonTargetCatch=Faunes accessoire conservée ou rejetée
    1680 
    +observe.ui.tree.seine.nonTargetCatchRelease=Faunes accessoires libérées
    1681 
    +observe.ui.tree.seine.nonTargetSample=Echantillons faune accessoire
    1682 
    +observe.ui.tree.seine.objectObservedSpecies=Faune observée
    1683 
    +observe.ui.tree.seine.objectOperation=Opérations sur l'objet
    1684 
    +observe.ui.tree.seine.objectSchoolEstimate=Estimations banc objet
    1685 
    +observe.ui.tree.seine.routes=Routes
    1686 
    +observe.ui.tree.seine.schoolEstimate=Estimations banc
    1667 1687 
     observe.usage.action.shouldReplace=Remplacer le référentiel désactivé ?
    1668 1688 
     observe.usage.replaceTitle=Objet de remplacement
    1669 1689 
     observe.usage.usageTitle=Références trouvées

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.