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

Commits:

25 changed files:

Changes:

  • client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeUIModel.java
    ... ... @@ -30,14 +30,10 @@ import fr.ird.observe.client.ui.content.api.ContentUIModel;
    30 30 
     import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport;
    31 31 
     import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper;
    32 32 
     import fr.ird.observe.dto.referential.ReferentialDto;
    33 
    -import fr.ird.observe.spi.DtoModelClasses;
    34 33
    35 34 
     import javax.swing.Icon;
    36 
    -import java.util.ArrayList;
    37 35 
     import java.util.List;
    38 36
    39 
    -import static io.ultreia.java4all.i18n.I18n.t;
    40 
    -
    41 37 
     /**
    42 38 
      * Created on 9/28/14.
    43 39 
      *
    ... ... @@ -49,10 +45,12 @@ public abstract class ReferenceHomeUIModel extends ContentUIModel {
    49 45 
         private static final long serialVersionUID = 1L;
    50 46 
         private final String nodeName;
    51 47 
         private final ImmutableList<Class<? extends ReferentialDto>> types;
    48 
    +    private final Package uiPackageName;
    52 49
    53 50 
         protected ReferenceHomeUIModel(List<Class<? extends ReferentialDto>> types, String nodeName) {
    54 51 
             this.types = ImmutableList.copyOf(ObserveI18nDecoratorHelper.sortPluralTypes(types, ObserveSwingApplicationContext.get().getConfig().getLocale()));
    55 52 
             this.nodeName = nodeName;
    53 
    +        this.uiPackageName = getClass().getPackage();
    56 54 
         }
    57 55
    58 56 
         @Override
    ... ... @@ -78,38 +76,8 @@ public abstract class ReferenceHomeUIModel extends ContentUIModel {
    78 76 
             return nodeName;
    79 77 
         }
    80 78
    81 
    -    static class ReferenceHomeCommonUIModel extends ReferenceHomeUIModel {
    82 
    -        ReferenceHomeCommonUIModel() {
    83 
    -            super(new ArrayList<>(DtoModelClasses.COMMON_REFERENTIAL_TYPES), t("observe.ui.tree.referential.common"));
    84 
    -        }
    79 
    +    public Package getUiPackageName() {
    80 
    +        return uiPackageName;
    85 81 
         }
    86 82
    87 
    -    static class ReferenceHomeSeineCommonUIModel extends ReferenceHomeUIModel {
    88 
    -        ReferenceHomeSeineCommonUIModel() {
    89 
    -            super(new ArrayList<>(DtoModelClasses.SEINE_COMMON_REFERENTIAL_TYPES), t("observe.ui.tree.referential.seine.obs"));
    90 
    -        }
    91 
    -    }
    92 
    -    static class ReferenceHomeSeineObsUIModel extends ReferenceHomeUIModel {
    93 
    -        ReferenceHomeSeineObsUIModel() {
    94 
    -            super(new ArrayList<>(DtoModelClasses.SEINE_OBS_REFERENTIAL_TYPES), t("observe.ui.tree.referential.seine.obs"));
    95 
    -        }
    96 
    -    }
    97 
    -
    98 
    -    static class ReferenceHomeLonglineCommonUIModel extends ReferenceHomeUIModel {
    99 
    -        ReferenceHomeLonglineCommonUIModel() {
    100 
    -            super(new ArrayList<>(DtoModelClasses.LONGLINE_COMMON_REFERENTIAL_TYPES), t("observe.ui.tree.referential.longline.common"));
    101 
    -        }
    102 
    -    }
    103 
    -
    104 
    -    static class ReferenceHomeLonglineLandingUIModel extends ReferenceHomeUIModel {
    105 
    -        ReferenceHomeLonglineLandingUIModel() {
    106 
    -            super(new ArrayList<>(DtoModelClasses.LONGLINE_LANDING_REFERENTIAL_TYPES), t("observe.ui.tree.referential.longline.landing"));
    107 
    -        }
    108 
    -    }
    109 
    -
    110 
    -    static class ReferenceHomeLonglineObsUIModel extends ReferenceHomeUIModel {
    111 
    -        ReferenceHomeLonglineObsUIModel() {
    112 
    -            super(new ArrayList<>(DtoModelClasses.LONGLINE_OBS_REFERENTIAL_TYPES), t("observe.ui.tree.referential.longline.obs"));
    113 
    -        }
    114 
    -    }
    115 83 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeCommonUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ReferenceHomeCommonUI.java
    1 
    -package fr.ird.observe.client.ui.content.api.ref;
    1 
    +package fr.ird.observe.client.ui.content.ref.common;
    2 2
    3 3 
     /*-
    4 4 
      * #%L
    ... ... @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.ref;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI;
    25 26 
     import org.nuiton.jaxx.runtime.JAXXContext;
    26 27 
     import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
    27 28
    ... ... @@ -34,6 +35,6 @@ import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
    34 35 
     public class ReferenceHomeCommonUI extends ReferenceHomeUI {
    35 36
    36 37 
         public ReferenceHomeCommonUI(JAXXContext param0) {
    37 
    -        super(((JAXXInitialContext) param0).add(new ReferenceHomeUIModel.ReferenceHomeCommonUIModel()));
    38 
    +        super(((JAXXInitialContext) param0).add(new ReferenceHomeCommonUIModel()));
    38 39 
         }
    39 40 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ReferenceHomeCommonUIModel.java
    1 
    +package fr.ird.observe.client.ui.content.ref.common;
    2 
    +
    3 
    +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUIModel;
    4 
    +import fr.ird.observe.spi.DtoModelClasses;
    5 
    +
    6 
    +import java.util.ArrayList;
    7 
    +
    8 
    +import static io.ultreia.java4all.i18n.I18n.t;
    9 
    +
    10 
    +/**
    11 
    + * Created by tchemit on 10/12/2018.
    12 
    + *
    13 
    + * @author Tony Chemit - dev@tchemit.fr
    14 
    + */
    15 
    +public class ReferenceHomeCommonUIModel extends ReferenceHomeUIModel {
    16 
    +    public ReferenceHomeCommonUIModel() {
    17 
    +        super(new ArrayList<>(DtoModelClasses.COMMON_REFERENTIAL_TYPES), t("observe.ui.tree.referential.common"));
    18 
    +    }
    19 
    +}

  • client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeLonglineCommonUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ReferenceHomeLonglineCommonUI.java
    1 
    -package fr.ird.observe.client.ui.content.api.ref;
    1 
    +package fr.ird.observe.client.ui.content.ref.longline;
    2 2
    3 3 
     /*-
    4 4 
      * #%L
    ... ... @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.ref;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI;
    25 26 
     import org.nuiton.jaxx.runtime.JAXXContext;
    26 27 
     import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
    27 28
    ... ... @@ -34,7 +35,7 @@ import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
    34 35 
     public class ReferenceHomeLonglineCommonUI extends ReferenceHomeUI {
    35 36
    36 37 
         public ReferenceHomeLonglineCommonUI(JAXXContext param0) {
    37 
    -        super(((JAXXInitialContext) param0).add(new ReferenceHomeUIModel.ReferenceHomeLonglineCommonUIModel()));
    38 
    +        super(((JAXXInitialContext) param0).add(new ReferenceHomeLonglineCommonUIModel()));
    38 39 
         }
    39 40
    40 41 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ReferenceHomeLonglineCommonUIModel.java
    1 
    +package fr.ird.observe.client.ui.content.ref.longline;
    2 
    +
    3 
    +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUIModel;
    4 
    +import fr.ird.observe.spi.DtoModelClasses;
    5 
    +
    6 
    +import java.util.ArrayList;
    7 
    +
    8 
    +import static io.ultreia.java4all.i18n.I18n.t;
    9 
    +
    10 
    +/**
    11 
    + * Created by tchemit on 10/12/2018.
    12 
    + *
    13 
    + * @author Tony Chemit - dev@tchemit.fr
    14 
    + */
    15 
    +public class ReferenceHomeLonglineCommonUIModel extends ReferenceHomeUIModel {
    16 
    +    public ReferenceHomeLonglineCommonUIModel() {
    17 
    +        super(new ArrayList<>(DtoModelClasses.LONGLINE_COMMON_REFERENTIAL_TYPES), t("observe.ui.tree.referential.longline.common"));
    18 
    +    }
    19 
    +}

  • client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeLonglineLandingUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/landing/ReferenceHomeLonglineLandingUI.java
    1 
    -package fr.ird.observe.client.ui.content.api.ref;
    1 
    +package fr.ird.observe.client.ui.content.ref.longline.landing;
    2 2
    3 3 
     /*-
    4 4 
      * #%L
    ... ... @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.ref;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI;
    25 26 
     import org.nuiton.jaxx.runtime.JAXXContext;
    26 27 
     import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
    27 28
    ... ... @@ -34,7 +35,7 @@ import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
    34 35 
     public class ReferenceHomeLonglineLandingUI extends ReferenceHomeUI {
    35 36
    36 37 
         public ReferenceHomeLonglineLandingUI(JAXXContext param0) {
    37 
    -        super(((JAXXInitialContext) param0).add(new ReferenceHomeUIModel.ReferenceHomeLonglineLandingUIModel()));
    38 
    +        super(((JAXXInitialContext) param0).add(new ReferenceHomeLonglineLandingUIModel()));
    38 39 
         }
    39 40
    40 41 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/landing/ReferenceHomeLonglineLandingUIModel.java
    1 
    +package fr.ird.observe.client.ui.content.ref.longline.landing;
    2 
    +
    3 
    +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUIModel;
    4 
    +import fr.ird.observe.spi.DtoModelClasses;
    5 
    +
    6 
    +import java.util.ArrayList;
    7 
    +
    8 
    +import static io.ultreia.java4all.i18n.I18n.t;
    9 
    +
    10 
    +/**
    11 
    + * Created by tchemit on 10/12/2018.
    12 
    + *
    13 
    + * @author Tony Chemit - dev@tchemit.fr
    14 
    + */
    15 
    +public class ReferenceHomeLonglineLandingUIModel extends ReferenceHomeUIModel {
    16 
    +    public ReferenceHomeLonglineLandingUIModel() {
    17 
    +        super(new ArrayList<>(DtoModelClasses.LONGLINE_LANDING_REFERENTIAL_TYPES), t("observe.ui.tree.referential.longline.landing"));
    18 
    +    }
    19 
    +}

  • client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeLonglineObsUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/obs/ReferenceHomeLonglineObsUI.java
    1 
    -package fr.ird.observe.client.ui.content.api.ref;
    1 
    +package fr.ird.observe.client.ui.content.ref.longline.obs;
    2 2
    3 3 
     /*-
    4 4 
      * #%L
    ... ... @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.ref;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI;
    25 26 
     import org.nuiton.jaxx.runtime.JAXXContext;
    26 27 
     import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
    27 28
    ... ... @@ -34,7 +35,7 @@ import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
    34 35 
     public class ReferenceHomeLonglineObsUI extends ReferenceHomeUI {
    35 36
    36 37 
         public ReferenceHomeLonglineObsUI(JAXXContext param0) {
    37 
    -        super(((JAXXInitialContext) param0).add(new ReferenceHomeUIModel.ReferenceHomeLonglineObsUIModel()));
    38 
    +        super(((JAXXInitialContext) param0).add(new ReferenceHomeLonglineObsUIModel()));
    38 39 
         }
    39 40
    40 41 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/obs/ReferenceHomeLonglineObsUIModel.java
    1 
    +package fr.ird.observe.client.ui.content.ref.longline.obs;
    2 
    +
    3 
    +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUIModel;
    4 
    +import fr.ird.observe.spi.DtoModelClasses;
    5 
    +
    6 
    +import java.util.ArrayList;
    7 
    +
    8 
    +import static io.ultreia.java4all.i18n.I18n.t;
    9 
    +
    10 
    +/**
    11 
    + * Created by tchemit on 10/12/2018.
    12 
    + *
    13 
    + * @author Tony Chemit - dev@tchemit.fr
    14 
    + */
    15 
    +public class ReferenceHomeLonglineObsUIModel extends ReferenceHomeUIModel {
    16 
    +    public ReferenceHomeLonglineObsUIModel() {
    17 
    +        super(new ArrayList<>(DtoModelClasses.LONGLINE_OBS_REFERENTIAL_TYPES), t("observe.ui.tree.referential.longline.obs"));
    18 
    +    }
    19 
    +}

  • client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeSeineCommonUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ReferenceHomeSeineCommonUI.java
    1 
    -package fr.ird.observe.client.ui.content.api.ref;
    1 
    +package fr.ird.observe.client.ui.content.ref.seine;
    2 2
    3 3 
     /*-
    4 4 
      * #%L
    ... ... @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.ref;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI;
    25 26 
     import org.nuiton.jaxx.runtime.JAXXContext;
    26 27 
     import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
    27 28
    ... ... @@ -34,6 +35,6 @@ import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
    34 35 
     public class ReferenceHomeSeineCommonUI extends ReferenceHomeUI {
    35 36
    36 37 
         public ReferenceHomeSeineCommonUI(JAXXContext param0) {
    37 
    -        super(((JAXXInitialContext) param0).add(new ReferenceHomeUIModel.ReferenceHomeSeineCommonUIModel()));
    38 
    +        super(((JAXXInitialContext) param0).add(new ReferenceHomeSeineCommonUIModel()));
    38 39 
         }
    39 40 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ReferenceHomeSeineCommonUIModel.java
    1 
    +package fr.ird.observe.client.ui.content.ref.seine;
    2 
    +
    3 
    +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUIModel;
    4 
    +import fr.ird.observe.spi.DtoModelClasses;
    5 
    +
    6 
    +import java.util.ArrayList;
    7 
    +
    8 
    +import static io.ultreia.java4all.i18n.I18n.t;
    9 
    +
    10 
    +/**
    11 
    + * Created by tchemit on 10/12/2018.
    12 
    + *
    13 
    + * @author Tony Chemit - dev@tchemit.fr
    14 
    + */
    15 
    +public class ReferenceHomeSeineCommonUIModel extends ReferenceHomeUIModel {
    16 
    +    public ReferenceHomeSeineCommonUIModel() {
    17 
    +        super(new ArrayList<>(DtoModelClasses.SEINE_COMMON_REFERENTIAL_TYPES), t("observe.ui.tree.referential.seine.common"));
    18 
    +    }
    19 
    +}

  • client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeSeineObsUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/ReferenceHomeSeineObsUI.java
    1 
    -package fr.ird.observe.client.ui.content.api.ref;
    1 
    +package fr.ird.observe.client.ui.content.ref.seine.obs;
    2 2
    3 3 
     /*-
    4 4 
      * #%L
    ... ... @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.ref;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI;
    25 26 
     import org.nuiton.jaxx.runtime.JAXXContext;
    26 27 
     import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
    27 28
    ... ... @@ -34,6 +35,6 @@ import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
    34 35 
     public class ReferenceHomeSeineObsUI extends ReferenceHomeUI {
    35 36
    36 37 
         public ReferenceHomeSeineObsUI(JAXXContext param0) {
    37 
    -        super(((JAXXInitialContext) param0).add(new ReferenceHomeUIModel.ReferenceHomeSeineObsUIModel()));
    38 
    +        super(((JAXXInitialContext) param0).add(new ReferenceHomeSeineObsUIModel()));
    38 39 
         }
    39 40 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/ReferenceHomeSeineObsUIModel.java
    1 
    +package fr.ird.observe.client.ui.content.ref.seine.obs;
    2 
    +
    3 
    +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUIModel;
    4 
    +import fr.ird.observe.spi.DtoModelClasses;
    5 
    +
    6 
    +import java.util.ArrayList;
    7 
    +
    8 
    +import static io.ultreia.java4all.i18n.I18n.t;
    9 
    +
    10 
    +/**
    11 
    + * Created by tchemit on 10/12/2018.
    12 
    + *
    13 
    + * @author Tony Chemit - dev@tchemit.fr
    14 
    + */
    15 
    +public class ReferenceHomeSeineObsUIModel extends ReferenceHomeUIModel {
    16 
    +    public ReferenceHomeSeineObsUIModel() {
    17 
    +        super(new ArrayList<>(DtoModelClasses.SEINE_OBS_REFERENTIAL_TYPES), t("observe.ui.tree.referential.seine.obs"));
    18 
    +    }
    19 
    +}

  • client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeModel.java
    ... ... @@ -29,12 +29,12 @@ import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport;
    29 29 
     import fr.ird.observe.client.ui.tree.navigation.nodes.RootNavigationTreeNode;
    30 30 
     import fr.ird.observe.client.ui.tree.navigation.nodes.WithChildsToReload;
    31 31 
     import fr.ird.observe.client.ui.tree.navigation.nodes.longline.ProgramLonglineNavigationTreeNode;
    32 
    -import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialsCommonNavigationTreeNode;
    33 
    -import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialsLonglineCommonNavigationTreeNode;
    34 
    -import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialsLonglineLandingNavigationTreeNode;
    35 
    -import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialsLonglineObsNavigationTreeNode;
    36 
    -import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialsSeineCommonNavigationTreeNode;
    37 
    -import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialsSeineObsNavigationTreeNode;
    32 
    +import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialListCommonNavigationTreeNode;
    33 
    +import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialListLonglineCommonNavigationTreeNode;
    34 
    +import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialListLonglineLandingNavigationTreeNode;
    35 
    +import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialListLonglineObsNavigationTreeNode;
    36 
    +import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialListSeineCommonNavigationTreeNode;
    37 
    +import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialListSeineObsNavigationTreeNode;
    38 38 
     import fr.ird.observe.client.ui.tree.navigation.nodes.seine.ProgramSeineNavigationTreeNode;
    39 39 
     import fr.ird.observe.dto.data.longline.TripLonglineHelper;
    40 40 
     import fr.ird.observe.dto.data.longline.TripLonglineReference;
    ... ... @@ -139,12 +139,12 @@ public class NavigationTreeModel extends DefaultTreeModel {
    139 139 
             }
    140 140
    141 141 
             if (config.isShowReferential()) {
    142 
    -            root.add(new ReferentialsCommonNavigationTreeNode());
    143 
    -            root.add(new ReferentialsLonglineCommonNavigationTreeNode());
    144 
    -            root.add(new ReferentialsLonglineLandingNavigationTreeNode());
    145 
    -            root.add(new ReferentialsLonglineObsNavigationTreeNode());
    146 
    -            root.add(new ReferentialsSeineCommonNavigationTreeNode());
    147 
    -            root.add(new ReferentialsSeineObsNavigationTreeNode());
    142 
    +            root.add(new ReferentialListCommonNavigationTreeNode());
    143 
    +            root.add(new ReferentialListLonglineCommonNavigationTreeNode());
    144 
    +            root.add(new ReferentialListLonglineLandingNavigationTreeNode());
    145 
    +            root.add(new ReferentialListLonglineObsNavigationTreeNode());
    146 
    +            root.add(new ReferentialListSeineCommonNavigationTreeNode());
    147 
    +            root.add(new ReferentialListSeineObsNavigationTreeNode());
    148 148 
             }
    149 149 
             setRoot(root);
    150 150 
         }

  • client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsCommonNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListCommonNavigationTreeNode.java
    ... ... @@ -22,8 +22,8 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.referential;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    -import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeCommonUI;
    26 
    -import fr.ird.observe.spi.DtoModelClasses;
    25 
    +import fr.ird.observe.client.ui.content.ref.common.ReferenceHomeCommonUI;
    26 
    +import fr.ird.observe.client.ui.content.ref.common.ReferenceHomeCommonUIModel;
    27 27
    28 28 
     import static io.ultreia.java4all.i18n.I18n.t;
    29 29
    ... ... @@ -33,10 +33,10 @@ import static io.ultreia.java4all.i18n.I18n.t;
    33 33 
      * @author Tony Chemit - dev@tchemit.fr
    34 34 
      * @since 6.0
    35 35 
      */
    36 
    -public class ReferentialsCommonNavigationTreeNode extends ReferentialsNavigationTreeNodeSupport {
    36 
    +public class ReferentialListCommonNavigationTreeNode extends ReferentialListNavigationTreeNodeSupport {
    37 37
    38 
    -    public ReferentialsCommonNavigationTreeNode() {
    39 
    -        super(t("observe.ui.tree.referential.common"), DtoModelClasses.COMMON_REFERENTIAL_TYPES);
    38 
    +    public ReferentialListCommonNavigationTreeNode() {
    39 
    +        super(t("observe.ui.tree.referential.common"), new ReferenceHomeCommonUIModel());
    40 40 
         }
    41 41
    42 42 
         @Override

  • client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsLonglineCommonNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListLonglineCommonNavigationTreeNode.java
    ... ... @@ -22,8 +22,8 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.referential;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    -import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeLonglineCommonUI;
    26 
    -import fr.ird.observe.spi.DtoModelClasses;
    25 
    +import fr.ird.observe.client.ui.content.ref.longline.ReferenceHomeLonglineCommonUI;
    26 
    +import fr.ird.observe.client.ui.content.ref.longline.ReferenceHomeLonglineCommonUIModel;
    27 27
    28 28 
     import static io.ultreia.java4all.i18n.I18n.t;
    29 29
    ... ... @@ -33,10 +33,10 @@ import static io.ultreia.java4all.i18n.I18n.t;
    33 33 
      * @author Tony Chemit - dev@tchemit.fr
    34 34 
      * @since 6.0
    35 35 
      */
    36 
    -public class ReferentialsLonglineCommonNavigationTreeNode extends ReferentialsNavigationTreeNodeSupport {
    36 
    +public class ReferentialListLonglineCommonNavigationTreeNode extends ReferentialListNavigationTreeNodeSupport {
    37 37
    38 
    -    public ReferentialsLonglineCommonNavigationTreeNode() {
    39 
    -        super(t("observe.ui.tree.referential.longline.common"), DtoModelClasses.LONGLINE_COMMON_REFERENTIAL_TYPES);
    38 
    +    public ReferentialListLonglineCommonNavigationTreeNode() {
    39 
    +        super(t("observe.ui.tree.referential.longline.common"), new ReferenceHomeLonglineCommonUIModel());
    40 40 
         }
    41 41
    42 42 
         @Override

  • client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsLonglineLandingNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListLonglineLandingNavigationTreeNode.java
    ... ... @@ -22,8 +22,8 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.referential;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    -import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeLonglineLandingUI;
    26 
    -import fr.ird.observe.spi.DtoModelClasses;
    25 
    +import fr.ird.observe.client.ui.content.ref.longline.landing.ReferenceHomeLonglineLandingUI;
    26 
    +import fr.ird.observe.client.ui.content.ref.longline.landing.ReferenceHomeLonglineLandingUIModel;
    27 27
    28 28 
     import static io.ultreia.java4all.i18n.I18n.t;
    29 29
    ... ... @@ -33,10 +33,10 @@ import static io.ultreia.java4all.i18n.I18n.t;
    33 33 
      * @author Tony Chemit - dev@tchemit.fr
    34 34 
      * @since 6.0
    35 35 
      */
    36 
    -public class ReferentialsLonglineLandingNavigationTreeNode extends ReferentialsNavigationTreeNodeSupport {
    36 
    +public class ReferentialListLonglineLandingNavigationTreeNode extends ReferentialListNavigationTreeNodeSupport {
    37 37
    38 
    -    public ReferentialsLonglineLandingNavigationTreeNode() {
    39 
    -        super(t("observe.ui.tree.referential.longline.landing"), DtoModelClasses.LONGLINE_LANDING_REFERENTIAL_TYPES);
    38 
    +    public ReferentialListLonglineLandingNavigationTreeNode() {
    39 
    +        super(t("observe.ui.tree.referential.longline.landing"), new ReferenceHomeLonglineLandingUIModel());
    40 40 
         }
    41 41
    42 42 
         @Override

  • client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsLonglineObsNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListLonglineObsNavigationTreeNode.java
    ... ... @@ -22,8 +22,8 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.referential;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    -import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeLonglineObsUI;
    26 
    -import fr.ird.observe.spi.DtoModelClasses;
    25 
    +import fr.ird.observe.client.ui.content.ref.longline.obs.ReferenceHomeLonglineObsUI;
    26 
    +import fr.ird.observe.client.ui.content.ref.longline.obs.ReferenceHomeLonglineObsUIModel;
    27 27
    28 28 
     import static io.ultreia.java4all.i18n.I18n.t;
    29 29
    ... ... @@ -33,10 +33,10 @@ import static io.ultreia.java4all.i18n.I18n.t;
    33 33 
      * @author Tony Chemit - dev@tchemit.fr
    34 34 
      * @since 6.0
    35 35 
      */
    36 
    -public class ReferentialsLonglineObsNavigationTreeNode extends ReferentialsNavigationTreeNodeSupport {
    36 
    +public class ReferentialListLonglineObsNavigationTreeNode extends ReferentialListNavigationTreeNodeSupport {
    37 37
    38 
    -    public ReferentialsLonglineObsNavigationTreeNode() {
    39 
    -        super(t("observe.ui.tree.referential.longline.obs"), DtoModelClasses.LONGLINE_OBS_REFERENTIAL_TYPES);
    38 
    +    public ReferentialListLonglineObsNavigationTreeNode() {
    39 
    +        super(t("observe.ui.tree.referential.longline.obs"), new ReferenceHomeLonglineObsUIModel());
    40 40 
         }
    41 41
    42 42 
         @Override

  • client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsNavigationTreeNodeSupport.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListNavigationTreeNodeSupport.java
    ... ... @@ -22,11 +22,12 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.referential;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    -import com.google.common.collect.ImmutableSet;
    26 
    -import fr.ird.observe.client.ObserveSwingApplicationContext;
    25 
    +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI;
    26 
    +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUIModel;
    27 27 
     import fr.ird.observe.client.ui.tree.navigation.nodes.StringNavigationTreeNodeSupport;
    28 
    -import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper;
    29 28 
     import fr.ird.observe.dto.referential.ReferentialDto;
    29 
    +import io.ultreia.java4all.lang.Objects2;
    30 
    +import org.apache.commons.lang3.StringUtils;
    30 31
    31 32 
     /**
    32 33 
      * Created on 14/11/16.
    ... ... @@ -34,12 +35,14 @@ import fr.ird.observe.dto.referential.ReferentialDto;
    34 35 
      * @author Tony Chemit - dev@tchemit.fr
    35 36 
      * @since 6.0
    36 37 
      */
    37 
    -public abstract class ReferentialsNavigationTreeNodeSupport extends StringNavigationTreeNodeSupport {
    38 
    +public abstract class ReferentialListNavigationTreeNodeSupport extends StringNavigationTreeNodeSupport {
    38 39
    39 
    -    ReferentialsNavigationTreeNodeSupport(String name, ImmutableSet<Class<? extends ReferentialDto>> types) {
    40 
    +    ReferentialListNavigationTreeNodeSupport(String name, ReferenceHomeUIModel model) {
    40 41 
             super(name, true);
    41 
    -        for (Class<? extends ReferentialDto> aClass : ObserveI18nDecoratorHelper.sortPluralTypes(types, ObserveSwingApplicationContext.get().getConfig().getLocale())) {
    42 
    -            ReferentialNavigationTreeNode child = new ReferentialNavigationTreeNode<>(aClass);
    42 
    +        for (Class<? extends ReferentialDto> dtoClass : model.getTypes()) {
    43 
    +            String uiClassName = String.format("%s.%sUI", model.getUiPackageName().getName(), StringUtils.removeEnd(dtoClass.getSimpleName(), "Dto"));
    44 
    +            Class<? extends ReferenceHomeUI> uiClass = Objects2.forName(uiClassName);
    45 
    +            ReferentialNavigationTreeNode child = new ReferentialNavigationTreeNode<>(dtoClass, uiClass);
    43 46 
                 add(child);
    44 47 
             }
    45 48 
         }

  • client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsSeineCommonNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListSeineCommonNavigationTreeNode.java
    ... ... @@ -22,8 +22,8 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.referential;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    -import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeSeineCommonUI;
    26 
    -import fr.ird.observe.spi.DtoModelClasses;
    25 
    +import fr.ird.observe.client.ui.content.ref.seine.ReferenceHomeSeineCommonUI;
    26 
    +import fr.ird.observe.client.ui.content.ref.seine.ReferenceHomeSeineCommonUIModel;
    27 27
    28 28 
     import static io.ultreia.java4all.i18n.I18n.t;
    29 29
    ... ... @@ -33,10 +33,10 @@ import static io.ultreia.java4all.i18n.I18n.t;
    33 33 
      * @author Tony Chemit - dev@tchemit.fr
    34 34 
      * @since 6.0
    35 35 
      */
    36 
    -public class ReferentialsSeineCommonNavigationTreeNode extends ReferentialsNavigationTreeNodeSupport {
    36 
    +public class ReferentialListSeineCommonNavigationTreeNode extends ReferentialListNavigationTreeNodeSupport {
    37 37
    38 
    -    public ReferentialsSeineCommonNavigationTreeNode() {
    39 
    -        super(t("observe.ui.tree.referential.seine.obs"), DtoModelClasses.SEINE_COMMON_REFERENTIAL_TYPES);
    38 
    +    public ReferentialListSeineCommonNavigationTreeNode() {
    39 
    +        super(t("observe.ui.tree.referential.seine.common"), new ReferenceHomeSeineCommonUIModel());
    40 40 
         }
    41 41
    42 42 
         @Override

  • client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsSeineObsNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListSeineObsNavigationTreeNode.java
    ... ... @@ -22,8 +22,8 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.referential;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    -import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeSeineObsUI;
    26 
    -import fr.ird.observe.spi.DtoModelClasses;
    25 
    +import fr.ird.observe.client.ui.content.ref.seine.obs.ReferenceHomeSeineObsUI;
    26 
    +import fr.ird.observe.client.ui.content.ref.seine.obs.ReferenceHomeSeineObsUIModel;
    27 27
    28 28 
     import static io.ultreia.java4all.i18n.I18n.t;
    29 29
    ... ... @@ -33,10 +33,10 @@ import static io.ultreia.java4all.i18n.I18n.t;
    33 33 
      * @author Tony Chemit - dev@tchemit.fr
    34 34 
      * @since 6.0
    35 35 
      */
    36 
    -public class ReferentialsSeineObsNavigationTreeNode extends ReferentialsNavigationTreeNodeSupport {
    36 
    +public class ReferentialListSeineObsNavigationTreeNode extends ReferentialListNavigationTreeNodeSupport {
    37 37
    38 
    -    public ReferentialsSeineObsNavigationTreeNode() {
    39 
    -        super(t("observe.ui.tree.referential.seine.obs"), DtoModelClasses.SEINE_OBS_REFERENTIAL_TYPES);
    38 
    +    public ReferentialListSeineObsNavigationTreeNode() {
    39 
    +        super(t("observe.ui.tree.referential.seine.obs"), new ReferenceHomeSeineObsUIModel());
    40 40 
         }
    41 41
    42 42 
         @Override

  • client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialNavigationTreeNode.java
    ... ... @@ -22,12 +22,11 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.referential;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    -import fr.ird.observe.client.ObserveSwingTechnicalException;
    26 25 
     import fr.ird.observe.client.ui.content.api.ContentUI;
    26 
    +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI;
    27 27 
     import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode;
    28 28 
     import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper;
    29 29 
     import fr.ird.observe.dto.referential.ReferentialDto;
    30 
    -import org.apache.commons.lang3.StringUtils;
    31 30
    32 31 
     import static io.ultreia.java4all.i18n.I18n.t;
    33 32
    ... ... @@ -39,29 +38,33 @@ import static io.ultreia.java4all.i18n.I18n.t;
    39 38 
      */
    40 39 
     public class ReferentialNavigationTreeNode<D extends ReferentialDto> extends ClassNavigationTreeNode<D> {
    41 40
    42 
    -    ReferentialNavigationTreeNode(Class<D> data) {
    41 
    +    private final Class<? extends ReferenceHomeUI> uiClass;
    42 
    +
    43 
    +    ReferentialNavigationTreeNode(Class<D> data, Class<? extends ReferenceHomeUI> uiClass) {
    43 44 
             super(data, true, t(ObserveI18nDecoratorHelper.getTypePluralI18nKey(data)));
    45 
    +        this.uiClass = uiClass;
    44 46 
         }
    45 47
    46 48 
         @Override
    47 49 
         public Class<? extends ContentUI> getContentClass() {
    48 
    -        String packageName = getData().getPackage().getName();
    49 
    -        String packagePrefix;
    50 
    -        if (packageName.endsWith("longline")) {
    51 
    -            packagePrefix = "longline.";
    52 
    -        } else if (packageName.endsWith("seine")) {
    53 
    -            packagePrefix = "seine.";
    54 
    -
    55 
    -        } else {
    56 
    -            packagePrefix = "common.";
    57 
    -        }
    58 
    -        //FIXME Use a ClassMaping
    59 
    -        String className = String.format("fr.ird.observe.client.ui.content.ref.%s%sUI", packagePrefix, StringUtils.removeEnd(getData().getSimpleName(), "Dto"));
    60 
    -        try {
    61 
    -            return (Class) Class.forName(className);
    62 
    -        } catch (ClassNotFoundException e) {
    63 
    -            throw new ObserveSwingTechnicalException("Can't get ui class for: " + className, e);
    64 
    -        }
    50 
    +        return uiClass;
    51 
    +//        String packageName = getData().getPackage().getName();
    52 
    +//        String packagePrefix;
    53 
    +//        if (packageName.endsWith("longline")) {
    54 
    +//            packagePrefix = "longline.";
    55 
    +//        } else if (packageName.endsWith("seine")) {
    56 
    +//            packagePrefix = "seine.";
    57 
    +//
    58 
    +//        } else {
    59 
    +//            packagePrefix = "common.";
    60 
    +//        }
    61 
    +//        //FIXME Use a ClassMaping
    62 
    +//        String className = String.format("fr.ird.observe.client.ui.content.ref.%s%sUI", packagePrefix, StringUtils.removeEnd(getData().getSimpleName(), "Dto"));
    63 
    +//        try {
    64 
    +//            return (Class) Class.forName(className);
    65 
    +//        } catch (ClassNotFoundException e) {
    66 
    +//            throw new ObserveSwingTechnicalException("Can't get ui class for: " + className, e);
    67 
    +//        }
    65 68 
         }
    66 69
    67 70 
         @Override

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -1606,8 +1606,8 @@ observe.common.ObjectSchoolEstimateDto.title=School estimate
    1606 1606 
     observe.common.ObjectSchoolEstimateDto.totalWeight=Total weight
    1607 1607 
     observe.common.ObjectSchoolEstimateDto.type=Object school estimate
    1608 1608 
     observe.common.ObjectSchoolEstimateDto.types=Object school estimates
    1609 
    -observe.common.ObservationMethodDto.type=Trip type
    1610 
    -observe.common.ObservationMethodDto.types=Trips type
    1609 
    +observe.common.ObservationMethodDto.type=Observation method
    1610 
    +observe.common.ObservationMethodDto.types=Observation methods
    1611 1611 
     observe.common.ObservedSystemDto.schoolType=School type
    1612 1612 
     observe.common.ObservedSystemDto.type=Observed system
    1613 1613 
     observe.common.ObservedSystemDto.types=Observed systems

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -1606,8 +1606,8 @@ observe.common.ObjectSchoolEstimateDto.title=Estimación del banco
    1606 1606 
     observe.common.ObjectSchoolEstimateDto.totalWeight=Peso
    1607 1607 
     observe.common.ObjectSchoolEstimateDto.type=Estimación banco de objetos
    1608 1608 
     observe.common.ObjectSchoolEstimateDto.types=Estimaciones banco de objetos
    1609 
    -observe.common.ObservationMethodDto.type=Tipo de marea
    1610 
    -observe.common.ObservationMethodDto.types=Tipos de marea
    1609 
    +observe.common.ObservationMethodDto.type=Observation method #TODO
    1610 
    +observe.common.ObservationMethodDto.types=Observation methods #TODO
    1611 1611 
     observe.common.ObservedSystemDto.schoolType=Tipo de banco
    1612 1612 
     observe.common.ObservedSystemDto.type=Sistema observado
    1613 1613 
     observe.common.ObservedSystemDto.types=Sistemas observados

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -1606,8 +1606,8 @@ observe.common.ObjectSchoolEstimateDto.title=Estimation banc
    1606 1606 
     observe.common.ObjectSchoolEstimateDto.totalWeight=Poids
    1607 1607 
     observe.common.ObjectSchoolEstimateDto.type=Estimation banc objet
    1608 1608 
     observe.common.ObjectSchoolEstimateDto.types=Estimations banc objet
    1609 
    -observe.common.ObservationMethodDto.type=Type de marée
    1610 
    -observe.common.ObservationMethodDto.types=Types de marée
    1609 
    +observe.common.ObservationMethodDto.type=Méthode d'observation
    1610 
    +observe.common.ObservationMethodDto.types=Méthode d'observation
    1611 1611 
     observe.common.ObservedSystemDto.schoolType=Type de banc
    1612 1612 
     observe.common.ObservedSystemDto.type=Système observé
    1613 1613 
     observe.common.ObservedSystemDto.types=Systèmes observés

    • —
    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.