[Observe-commits] [Git][ultreiaio/ird-observe][develop] 2 commits: fix observation method navigation node

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 67bc2de7 by tchemit at 2018-12-10T15:30:02Z fix observation method navigation node - - - - - cd49cf56 by tchemit at 2018-12-10T15:30:29Z [V8][DATA MODEL] Retours sur le modèle V8 alpha - See #1166 (improve referential list nodes and make them works again) - - - - - 25 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeUIModel.java - 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 - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ReferenceHomeCommonUIModel.java - 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 - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ReferenceHomeLonglineCommonUIModel.java - 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 - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/landing/ReferenceHomeLonglineLandingUIModel.java - 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 - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/obs/ReferenceHomeLonglineObsUIModel.java - 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 - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ReferenceHomeSeineCommonUIModel.java - 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 - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/ReferenceHomeSeineObsUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeModel.java - 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 - 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 - 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 - 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 - 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 - 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 - 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 - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialNavigationTreeNode.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties 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; import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.dto.referential.ReferentialDto; -import fr.ird.observe.spi.DtoModelClasses; import javax.swing.Icon; -import java.util.ArrayList; import java.util.List; -import static io.ultreia.java4all.i18n.I18n.t; - /** * Created on 9/28/14. * @@ -49,10 +45,12 @@ public abstract class ReferenceHomeUIModel extends ContentUIModel { private static final long serialVersionUID = 1L; private final String nodeName; private final ImmutableList<Class<? extends ReferentialDto>> types; + private final Package uiPackageName; protected ReferenceHomeUIModel(List<Class<? extends ReferentialDto>> types, String nodeName) { this.types = ImmutableList.copyOf(ObserveI18nDecoratorHelper.sortPluralTypes(types, ObserveSwingApplicationContext.get().getConfig().getLocale())); this.nodeName = nodeName; + this.uiPackageName = getClass().getPackage(); } @Override @@ -78,38 +76,8 @@ public abstract class ReferenceHomeUIModel extends ContentUIModel { return nodeName; } - static class ReferenceHomeCommonUIModel extends ReferenceHomeUIModel { - ReferenceHomeCommonUIModel() { - super(new ArrayList<>(DtoModelClasses.COMMON_REFERENTIAL_TYPES), t("observe.ui.tree.referential.common")); - } + public Package getUiPackageName() { + return uiPackageName; } - static class ReferenceHomeSeineCommonUIModel extends ReferenceHomeUIModel { - ReferenceHomeSeineCommonUIModel() { - super(new ArrayList<>(DtoModelClasses.SEINE_COMMON_REFERENTIAL_TYPES), t("observe.ui.tree.referential.seine.obs")); - } - } - static class ReferenceHomeSeineObsUIModel extends ReferenceHomeUIModel { - ReferenceHomeSeineObsUIModel() { - super(new ArrayList<>(DtoModelClasses.SEINE_OBS_REFERENTIAL_TYPES), t("observe.ui.tree.referential.seine.obs")); - } - } - - static class ReferenceHomeLonglineCommonUIModel extends ReferenceHomeUIModel { - ReferenceHomeLonglineCommonUIModel() { - super(new ArrayList<>(DtoModelClasses.LONGLINE_COMMON_REFERENTIAL_TYPES), t("observe.ui.tree.referential.longline.common")); - } - } - - static class ReferenceHomeLonglineLandingUIModel extends ReferenceHomeUIModel { - ReferenceHomeLonglineLandingUIModel() { - super(new ArrayList<>(DtoModelClasses.LONGLINE_LANDING_REFERENTIAL_TYPES), t("observe.ui.tree.referential.longline.landing")); - } - } - - static class ReferenceHomeLonglineObsUIModel extends ReferenceHomeUIModel { - ReferenceHomeLonglineObsUIModel() { - super(new ArrayList<>(DtoModelClasses.LONGLINE_OBS_REFERENTIAL_TYPES), t("observe.ui.tree.referential.longline.obs")); - } - } } ===================================== 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,4 +1,4 @@ -package fr.ird.observe.client.ui.content.api.ref; +package fr.ird.observe.client.ui.content.ref.common; /*- * #%L @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.ref; * #L% */ +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI; import org.nuiton.jaxx.runtime.JAXXContext; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; @@ -34,6 +35,6 @@ import org.nuiton.jaxx.runtime.context.JAXXInitialContext; public class ReferenceHomeCommonUI extends ReferenceHomeUI { public ReferenceHomeCommonUI(JAXXContext param0) { - super(((JAXXInitialContext) param0).add(new ReferenceHomeUIModel.ReferenceHomeCommonUIModel())); + super(((JAXXInitialContext) param0).add(new ReferenceHomeCommonUIModel())); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ReferenceHomeCommonUIModel.java ===================================== @@ -0,0 +1,19 @@ +package fr.ird.observe.client.ui.content.ref.common; + +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUIModel; +import fr.ird.observe.spi.DtoModelClasses; + +import java.util.ArrayList; + +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * Created by tchemit on 10/12/2018. + * + * @author Tony Chemit - dev@tchemit.fr + */ +public class ReferenceHomeCommonUIModel extends ReferenceHomeUIModel { + public ReferenceHomeCommonUIModel() { + super(new ArrayList<>(DtoModelClasses.COMMON_REFERENTIAL_TYPES), t("observe.ui.tree.referential.common")); + } +} ===================================== 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,4 +1,4 @@ -package fr.ird.observe.client.ui.content.api.ref; +package fr.ird.observe.client.ui.content.ref.longline; /*- * #%L @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.ref; * #L% */ +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI; import org.nuiton.jaxx.runtime.JAXXContext; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; @@ -34,7 +35,7 @@ import org.nuiton.jaxx.runtime.context.JAXXInitialContext; public class ReferenceHomeLonglineCommonUI extends ReferenceHomeUI { public ReferenceHomeLonglineCommonUI(JAXXContext param0) { - super(((JAXXInitialContext) param0).add(new ReferenceHomeUIModel.ReferenceHomeLonglineCommonUIModel())); + super(((JAXXInitialContext) param0).add(new ReferenceHomeLonglineCommonUIModel())); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ReferenceHomeLonglineCommonUIModel.java ===================================== @@ -0,0 +1,19 @@ +package fr.ird.observe.client.ui.content.ref.longline; + +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUIModel; +import fr.ird.observe.spi.DtoModelClasses; + +import java.util.ArrayList; + +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * Created by tchemit on 10/12/2018. + * + * @author Tony Chemit - dev@tchemit.fr + */ +public class ReferenceHomeLonglineCommonUIModel extends ReferenceHomeUIModel { + public ReferenceHomeLonglineCommonUIModel() { + super(new ArrayList<>(DtoModelClasses.LONGLINE_COMMON_REFERENTIAL_TYPES), t("observe.ui.tree.referential.longline.common")); + } +} ===================================== 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,4 +1,4 @@ -package fr.ird.observe.client.ui.content.api.ref; +package fr.ird.observe.client.ui.content.ref.longline.landing; /*- * #%L @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.ref; * #L% */ +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI; import org.nuiton.jaxx.runtime.JAXXContext; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; @@ -34,7 +35,7 @@ import org.nuiton.jaxx.runtime.context.JAXXInitialContext; public class ReferenceHomeLonglineLandingUI extends ReferenceHomeUI { public ReferenceHomeLonglineLandingUI(JAXXContext param0) { - super(((JAXXInitialContext) param0).add(new ReferenceHomeUIModel.ReferenceHomeLonglineLandingUIModel())); + super(((JAXXInitialContext) param0).add(new ReferenceHomeLonglineLandingUIModel())); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/landing/ReferenceHomeLonglineLandingUIModel.java ===================================== @@ -0,0 +1,19 @@ +package fr.ird.observe.client.ui.content.ref.longline.landing; + +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUIModel; +import fr.ird.observe.spi.DtoModelClasses; + +import java.util.ArrayList; + +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * Created by tchemit on 10/12/2018. + * + * @author Tony Chemit - dev@tchemit.fr + */ +public class ReferenceHomeLonglineLandingUIModel extends ReferenceHomeUIModel { + public ReferenceHomeLonglineLandingUIModel() { + super(new ArrayList<>(DtoModelClasses.LONGLINE_LANDING_REFERENTIAL_TYPES), t("observe.ui.tree.referential.longline.landing")); + } +} ===================================== 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,4 +1,4 @@ -package fr.ird.observe.client.ui.content.api.ref; +package fr.ird.observe.client.ui.content.ref.longline.obs; /*- * #%L @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.ref; * #L% */ +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI; import org.nuiton.jaxx.runtime.JAXXContext; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; @@ -34,7 +35,7 @@ import org.nuiton.jaxx.runtime.context.JAXXInitialContext; public class ReferenceHomeLonglineObsUI extends ReferenceHomeUI { public ReferenceHomeLonglineObsUI(JAXXContext param0) { - super(((JAXXInitialContext) param0).add(new ReferenceHomeUIModel.ReferenceHomeLonglineObsUIModel())); + super(((JAXXInitialContext) param0).add(new ReferenceHomeLonglineObsUIModel())); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/obs/ReferenceHomeLonglineObsUIModel.java ===================================== @@ -0,0 +1,19 @@ +package fr.ird.observe.client.ui.content.ref.longline.obs; + +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUIModel; +import fr.ird.observe.spi.DtoModelClasses; + +import java.util.ArrayList; + +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * Created by tchemit on 10/12/2018. + * + * @author Tony Chemit - dev@tchemit.fr + */ +public class ReferenceHomeLonglineObsUIModel extends ReferenceHomeUIModel { + public ReferenceHomeLonglineObsUIModel() { + super(new ArrayList<>(DtoModelClasses.LONGLINE_OBS_REFERENTIAL_TYPES), t("observe.ui.tree.referential.longline.obs")); + } +} ===================================== 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,4 +1,4 @@ -package fr.ird.observe.client.ui.content.api.ref; +package fr.ird.observe.client.ui.content.ref.seine; /*- * #%L @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.ref; * #L% */ +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI; import org.nuiton.jaxx.runtime.JAXXContext; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; @@ -34,6 +35,6 @@ import org.nuiton.jaxx.runtime.context.JAXXInitialContext; public class ReferenceHomeSeineCommonUI extends ReferenceHomeUI { public ReferenceHomeSeineCommonUI(JAXXContext param0) { - super(((JAXXInitialContext) param0).add(new ReferenceHomeUIModel.ReferenceHomeSeineCommonUIModel())); + super(((JAXXInitialContext) param0).add(new ReferenceHomeSeineCommonUIModel())); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ReferenceHomeSeineCommonUIModel.java ===================================== @@ -0,0 +1,19 @@ +package fr.ird.observe.client.ui.content.ref.seine; + +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUIModel; +import fr.ird.observe.spi.DtoModelClasses; + +import java.util.ArrayList; + +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * Created by tchemit on 10/12/2018. + * + * @author Tony Chemit - dev@tchemit.fr + */ +public class ReferenceHomeSeineCommonUIModel extends ReferenceHomeUIModel { + public ReferenceHomeSeineCommonUIModel() { + super(new ArrayList<>(DtoModelClasses.SEINE_COMMON_REFERENTIAL_TYPES), t("observe.ui.tree.referential.seine.common")); + } +} ===================================== 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,4 +1,4 @@ -package fr.ird.observe.client.ui.content.api.ref; +package fr.ird.observe.client.ui.content.ref.seine.obs; /*- * #%L @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.ref; * #L% */ +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI; import org.nuiton.jaxx.runtime.JAXXContext; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; @@ -34,6 +35,6 @@ import org.nuiton.jaxx.runtime.context.JAXXInitialContext; public class ReferenceHomeSeineObsUI extends ReferenceHomeUI { public ReferenceHomeSeineObsUI(JAXXContext param0) { - super(((JAXXInitialContext) param0).add(new ReferenceHomeUIModel.ReferenceHomeSeineObsUIModel())); + super(((JAXXInitialContext) param0).add(new ReferenceHomeSeineObsUIModel())); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/ReferenceHomeSeineObsUIModel.java ===================================== @@ -0,0 +1,19 @@ +package fr.ird.observe.client.ui.content.ref.seine.obs; + +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUIModel; +import fr.ird.observe.spi.DtoModelClasses; + +import java.util.ArrayList; + +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * Created by tchemit on 10/12/2018. + * + * @author Tony Chemit - dev@tchemit.fr + */ +public class ReferenceHomeSeineObsUIModel extends ReferenceHomeUIModel { + public ReferenceHomeSeineObsUIModel() { + super(new ArrayList<>(DtoModelClasses.SEINE_OBS_REFERENTIAL_TYPES), t("observe.ui.tree.referential.seine.obs")); + } +} ===================================== 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; import fr.ird.observe.client.ui.tree.navigation.nodes.RootNavigationTreeNode; import fr.ird.observe.client.ui.tree.navigation.nodes.WithChildsToReload; import fr.ird.observe.client.ui.tree.navigation.nodes.longline.ProgramLonglineNavigationTreeNode; -import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialsCommonNavigationTreeNode; -import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialsLonglineCommonNavigationTreeNode; -import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialsLonglineLandingNavigationTreeNode; -import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialsLonglineObsNavigationTreeNode; -import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialsSeineCommonNavigationTreeNode; -import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialsSeineObsNavigationTreeNode; +import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialListCommonNavigationTreeNode; +import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialListLonglineCommonNavigationTreeNode; +import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialListLonglineLandingNavigationTreeNode; +import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialListLonglineObsNavigationTreeNode; +import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialListSeineCommonNavigationTreeNode; +import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialListSeineObsNavigationTreeNode; import fr.ird.observe.client.ui.tree.navigation.nodes.seine.ProgramSeineNavigationTreeNode; import fr.ird.observe.dto.data.longline.TripLonglineHelper; import fr.ird.observe.dto.data.longline.TripLonglineReference; @@ -139,12 +139,12 @@ public class NavigationTreeModel extends DefaultTreeModel { } if (config.isShowReferential()) { - root.add(new ReferentialsCommonNavigationTreeNode()); - root.add(new ReferentialsLonglineCommonNavigationTreeNode()); - root.add(new ReferentialsLonglineLandingNavigationTreeNode()); - root.add(new ReferentialsLonglineObsNavigationTreeNode()); - root.add(new ReferentialsSeineCommonNavigationTreeNode()); - root.add(new ReferentialsSeineObsNavigationTreeNode()); + root.add(new ReferentialListCommonNavigationTreeNode()); + root.add(new ReferentialListLonglineCommonNavigationTreeNode()); + root.add(new ReferentialListLonglineLandingNavigationTreeNode()); + root.add(new ReferentialListLonglineObsNavigationTreeNode()); + root.add(new ReferentialListSeineCommonNavigationTreeNode()); + root.add(new ReferentialListSeineObsNavigationTreeNode()); } setRoot(root); } ===================================== 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; * #L% */ -import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeCommonUI; -import fr.ird.observe.spi.DtoModelClasses; +import fr.ird.observe.client.ui.content.ref.common.ReferenceHomeCommonUI; +import fr.ird.observe.client.ui.content.ref.common.ReferenceHomeCommonUIModel; import static io.ultreia.java4all.i18n.I18n.t; @@ -33,10 +33,10 @@ import static io.ultreia.java4all.i18n.I18n.t; * @author Tony Chemit - dev@tchemit.fr * @since 6.0 */ -public class ReferentialsCommonNavigationTreeNode extends ReferentialsNavigationTreeNodeSupport { +public class ReferentialListCommonNavigationTreeNode extends ReferentialListNavigationTreeNodeSupport { - public ReferentialsCommonNavigationTreeNode() { - super(t("observe.ui.tree.referential.common"), DtoModelClasses.COMMON_REFERENTIAL_TYPES); + public ReferentialListCommonNavigationTreeNode() { + super(t("observe.ui.tree.referential.common"), new ReferenceHomeCommonUIModel()); } @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; * #L% */ -import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeLonglineCommonUI; -import fr.ird.observe.spi.DtoModelClasses; +import fr.ird.observe.client.ui.content.ref.longline.ReferenceHomeLonglineCommonUI; +import fr.ird.observe.client.ui.content.ref.longline.ReferenceHomeLonglineCommonUIModel; import static io.ultreia.java4all.i18n.I18n.t; @@ -33,10 +33,10 @@ import static io.ultreia.java4all.i18n.I18n.t; * @author Tony Chemit - dev@tchemit.fr * @since 6.0 */ -public class ReferentialsLonglineCommonNavigationTreeNode extends ReferentialsNavigationTreeNodeSupport { +public class ReferentialListLonglineCommonNavigationTreeNode extends ReferentialListNavigationTreeNodeSupport { - public ReferentialsLonglineCommonNavigationTreeNode() { - super(t("observe.ui.tree.referential.longline.common"), DtoModelClasses.LONGLINE_COMMON_REFERENTIAL_TYPES); + public ReferentialListLonglineCommonNavigationTreeNode() { + super(t("observe.ui.tree.referential.longline.common"), new ReferenceHomeLonglineCommonUIModel()); } @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; * #L% */ -import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeLonglineLandingUI; -import fr.ird.observe.spi.DtoModelClasses; +import fr.ird.observe.client.ui.content.ref.longline.landing.ReferenceHomeLonglineLandingUI; +import fr.ird.observe.client.ui.content.ref.longline.landing.ReferenceHomeLonglineLandingUIModel; import static io.ultreia.java4all.i18n.I18n.t; @@ -33,10 +33,10 @@ import static io.ultreia.java4all.i18n.I18n.t; * @author Tony Chemit - dev@tchemit.fr * @since 6.0 */ -public class ReferentialsLonglineLandingNavigationTreeNode extends ReferentialsNavigationTreeNodeSupport { +public class ReferentialListLonglineLandingNavigationTreeNode extends ReferentialListNavigationTreeNodeSupport { - public ReferentialsLonglineLandingNavigationTreeNode() { - super(t("observe.ui.tree.referential.longline.landing"), DtoModelClasses.LONGLINE_LANDING_REFERENTIAL_TYPES); + public ReferentialListLonglineLandingNavigationTreeNode() { + super(t("observe.ui.tree.referential.longline.landing"), new ReferenceHomeLonglineLandingUIModel()); } @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; * #L% */ -import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeLonglineObsUI; -import fr.ird.observe.spi.DtoModelClasses; +import fr.ird.observe.client.ui.content.ref.longline.obs.ReferenceHomeLonglineObsUI; +import fr.ird.observe.client.ui.content.ref.longline.obs.ReferenceHomeLonglineObsUIModel; import static io.ultreia.java4all.i18n.I18n.t; @@ -33,10 +33,10 @@ import static io.ultreia.java4all.i18n.I18n.t; * @author Tony Chemit - dev@tchemit.fr * @since 6.0 */ -public class ReferentialsLonglineObsNavigationTreeNode extends ReferentialsNavigationTreeNodeSupport { +public class ReferentialListLonglineObsNavigationTreeNode extends ReferentialListNavigationTreeNodeSupport { - public ReferentialsLonglineObsNavigationTreeNode() { - super(t("observe.ui.tree.referential.longline.obs"), DtoModelClasses.LONGLINE_OBS_REFERENTIAL_TYPES); + public ReferentialListLonglineObsNavigationTreeNode() { + super(t("observe.ui.tree.referential.longline.obs"), new ReferenceHomeLonglineObsUIModel()); } @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; * #L% */ -import com.google.common.collect.ImmutableSet; -import fr.ird.observe.client.ObserveSwingApplicationContext; +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI; +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUIModel; import fr.ird.observe.client.ui.tree.navigation.nodes.StringNavigationTreeNodeSupport; -import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.dto.referential.ReferentialDto; +import io.ultreia.java4all.lang.Objects2; +import org.apache.commons.lang3.StringUtils; /** * Created on 14/11/16. @@ -34,12 +35,14 @@ import fr.ird.observe.dto.referential.ReferentialDto; * @author Tony Chemit - dev@tchemit.fr * @since 6.0 */ -public abstract class ReferentialsNavigationTreeNodeSupport extends StringNavigationTreeNodeSupport { +public abstract class ReferentialListNavigationTreeNodeSupport extends StringNavigationTreeNodeSupport { - ReferentialsNavigationTreeNodeSupport(String name, ImmutableSet<Class<? extends ReferentialDto>> types) { + ReferentialListNavigationTreeNodeSupport(String name, ReferenceHomeUIModel model) { super(name, true); - for (Class<? extends ReferentialDto> aClass : ObserveI18nDecoratorHelper.sortPluralTypes(types, ObserveSwingApplicationContext.get().getConfig().getLocale())) { - ReferentialNavigationTreeNode child = new ReferentialNavigationTreeNode<>(aClass); + for (Class<? extends ReferentialDto> dtoClass : model.getTypes()) { + String uiClassName = String.format("%s.%sUI", model.getUiPackageName().getName(), StringUtils.removeEnd(dtoClass.getSimpleName(), "Dto")); + Class<? extends ReferenceHomeUI> uiClass = Objects2.forName(uiClassName); + ReferentialNavigationTreeNode child = new ReferentialNavigationTreeNode<>(dtoClass, uiClass); add(child); } } ===================================== 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; * #L% */ -import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeSeineCommonUI; -import fr.ird.observe.spi.DtoModelClasses; +import fr.ird.observe.client.ui.content.ref.seine.ReferenceHomeSeineCommonUI; +import fr.ird.observe.client.ui.content.ref.seine.ReferenceHomeSeineCommonUIModel; import static io.ultreia.java4all.i18n.I18n.t; @@ -33,10 +33,10 @@ import static io.ultreia.java4all.i18n.I18n.t; * @author Tony Chemit - dev@tchemit.fr * @since 6.0 */ -public class ReferentialsSeineCommonNavigationTreeNode extends ReferentialsNavigationTreeNodeSupport { +public class ReferentialListSeineCommonNavigationTreeNode extends ReferentialListNavigationTreeNodeSupport { - public ReferentialsSeineCommonNavigationTreeNode() { - super(t("observe.ui.tree.referential.seine.obs"), DtoModelClasses.SEINE_COMMON_REFERENTIAL_TYPES); + public ReferentialListSeineCommonNavigationTreeNode() { + super(t("observe.ui.tree.referential.seine.common"), new ReferenceHomeSeineCommonUIModel()); } @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; * #L% */ -import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeSeineObsUI; -import fr.ird.observe.spi.DtoModelClasses; +import fr.ird.observe.client.ui.content.ref.seine.obs.ReferenceHomeSeineObsUI; +import fr.ird.observe.client.ui.content.ref.seine.obs.ReferenceHomeSeineObsUIModel; import static io.ultreia.java4all.i18n.I18n.t; @@ -33,10 +33,10 @@ import static io.ultreia.java4all.i18n.I18n.t; * @author Tony Chemit - dev@tchemit.fr * @since 6.0 */ -public class ReferentialsSeineObsNavigationTreeNode extends ReferentialsNavigationTreeNodeSupport { +public class ReferentialListSeineObsNavigationTreeNode extends ReferentialListNavigationTreeNodeSupport { - public ReferentialsSeineObsNavigationTreeNode() { - super(t("observe.ui.tree.referential.seine.obs"), DtoModelClasses.SEINE_OBS_REFERENTIAL_TYPES); + public ReferentialListSeineObsNavigationTreeNode() { + super(t("observe.ui.tree.referential.seine.obs"), new ReferenceHomeSeineObsUIModel()); } @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; * #L% */ -import fr.ird.observe.client.ObserveSwingTechnicalException; import fr.ird.observe.client.ui.content.api.ContentUI; +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI; import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.dto.referential.ReferentialDto; -import org.apache.commons.lang3.StringUtils; import static io.ultreia.java4all.i18n.I18n.t; @@ -39,29 +38,33 @@ import static io.ultreia.java4all.i18n.I18n.t; */ public class ReferentialNavigationTreeNode<D extends ReferentialDto> extends ClassNavigationTreeNode<D> { - ReferentialNavigationTreeNode(Class<D> data) { + private final Class<? extends ReferenceHomeUI> uiClass; + + ReferentialNavigationTreeNode(Class<D> data, Class<? extends ReferenceHomeUI> uiClass) { super(data, true, t(ObserveI18nDecoratorHelper.getTypePluralI18nKey(data))); + this.uiClass = uiClass; } @Override public Class<? extends ContentUI> getContentClass() { - String packageName = getData().getPackage().getName(); - String packagePrefix; - if (packageName.endsWith("longline")) { - packagePrefix = "longline."; - } else if (packageName.endsWith("seine")) { - packagePrefix = "seine."; - - } else { - packagePrefix = "common."; - } - //FIXME Use a ClassMaping - String className = String.format("fr.ird.observe.client.ui.content.ref.%s%sUI", packagePrefix, StringUtils.removeEnd(getData().getSimpleName(), "Dto")); - try { - return (Class) Class.forName(className); - } catch (ClassNotFoundException e) { - throw new ObserveSwingTechnicalException("Can't get ui class for: " + className, e); - } + return uiClass; +// String packageName = getData().getPackage().getName(); +// String packagePrefix; +// if (packageName.endsWith("longline")) { +// packagePrefix = "longline."; +// } else if (packageName.endsWith("seine")) { +// packagePrefix = "seine."; +// +// } else { +// packagePrefix = "common."; +// } +// //FIXME Use a ClassMaping +// String className = String.format("fr.ird.observe.client.ui.content.ref.%s%sUI", packagePrefix, StringUtils.removeEnd(getData().getSimpleName(), "Dto")); +// try { +// return (Class) Class.forName(className); +// } catch (ClassNotFoundException e) { +// throw new ObserveSwingTechnicalException("Can't get ui class for: " + className, e); +// } } @Override ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1606,8 +1606,8 @@ observe.common.ObjectSchoolEstimateDto.title=School estimate observe.common.ObjectSchoolEstimateDto.totalWeight=Total weight observe.common.ObjectSchoolEstimateDto.type=Object school estimate observe.common.ObjectSchoolEstimateDto.types=Object school estimates -observe.common.ObservationMethodDto.type=Trip type -observe.common.ObservationMethodDto.types=Trips type +observe.common.ObservationMethodDto.type=Observation method +observe.common.ObservationMethodDto.types=Observation methods observe.common.ObservedSystemDto.schoolType=School type observe.common.ObservedSystemDto.type=Observed system 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 observe.common.ObjectSchoolEstimateDto.totalWeight=Peso observe.common.ObjectSchoolEstimateDto.type=Estimación banco de objetos observe.common.ObjectSchoolEstimateDto.types=Estimaciones banco de objetos -observe.common.ObservationMethodDto.type=Tipo de marea -observe.common.ObservationMethodDto.types=Tipos de marea +observe.common.ObservationMethodDto.type=Observation method #TODO +observe.common.ObservationMethodDto.types=Observation methods #TODO observe.common.ObservedSystemDto.schoolType=Tipo de banco observe.common.ObservedSystemDto.type=Sistema observado 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 observe.common.ObjectSchoolEstimateDto.totalWeight=Poids observe.common.ObjectSchoolEstimateDto.type=Estimation banc objet observe.common.ObjectSchoolEstimateDto.types=Estimations banc objet -observe.common.ObservationMethodDto.type=Type de marée -observe.common.ObservationMethodDto.types=Types de marée +observe.common.ObservationMethodDto.type=Méthode d'observation +observe.common.ObservationMethodDto.types=Méthode d'observation observe.common.ObservedSystemDto.schoolType=Type de banc observe.common.ObservedSystemDto.type=Système observé observe.common.ObservedSystemDto.types=Systèmes observés View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cb4b74a8d9e0b3c4c4cbbf9bfe0... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cb4b74a8d9e0b3c4c4cbbf9bfe0... You're receiving this email because of your account on gitlab.com.