December 2018 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe] Deleted tag v8.0-alpha-4
by Tony CHEMIT 10 Dec '18

10 Dec '18

Tony CHEMIT deleted tag v8.0-alpha-4 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: fix observation method navigation node
by Tony CHEMIT 10 Dec '18

10 Dec '18

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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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/cb4b74a8d9e0b3c4c4cbbf9bfe… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cb4b74a8d9e0b3c4c4cbbf9bfe… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Fix deploy job
by Tony CHEMIT 10 Dec '18

10 Dec '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 43f4e154 by tchemit at 2018-12-08T13:37:43Z Fix deploy job - - - - - 0378b2ec by tchemit at 2018-12-08T16:03:12Z fix second merge release - - - - - cb4b74a8 by tchemit at 2018-12-10T13:52:49Z [V8][DATA MODEL] Retours sur le modèle V8 alpha - See #1166 (move back some referentials to ps_common) - - - - - 30 changed files: - .gitlab-ci.yml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineCommonReferentialAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineObsReferentialAction.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineGlobalCompositionObsUIModel.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/api/ref/ReferenceHomeUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/SpeciesFateUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/SpeciesFateUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/SpeciesFateUI.jcss → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/SpeciesFateUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/SpeciesFateUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/SpeciesFateUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/SpeciesFateUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/SpeciesFateUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyOperationUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyOperationUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyOperationUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyOperationUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyOperationUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyOperationUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyTypeUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyTypeUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyTypeUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUIModel.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/ReferentialsSeineCommonNavigationTreeNode.java - − client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUI.jaxx - − client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUI.jcss - − client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUIHandler.java - − client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUIModel.java - − client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUI.jaxx - − client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUI.jcss - − client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUIHandler.java - − client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUIModel.java - − client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/931cc6488f6ce40e991afa01a7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/931cc6488f6ce40e991afa01a7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] fix release merge
by Tony CHEMIT 04 Dec '18

04 Dec '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 931cc648 by tchemit at 2018-12-04T17:46:15Z fix release merge - - - - - 30 changed files: - − dto/src/main/java/fr/ird/observe/binder/data/longline/ActivityLonglineObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/BaitsCompositionObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/BasketObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/BranchlineObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/BranchlinesCompositionObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/CatchLonglineObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/EncounterObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/FloatlinesCompositionObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/HooksCompositionObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/SectionObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/SensorUsedObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/SetLonglineObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/SizeMeasureObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/TdrObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/WeightMeasureObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/referential/common/CompagniesDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/referential/common/LengthMeasureMethodDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/referential/common/WeightMeasureMethodDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/referential/longline/ConservationDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/referential/longline/DataSourceDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/referential/longline/LogbookTripTypeDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/referential/longline/ObservationTripTypeDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/referential/longline/OnBoardProcessingDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/referential/longline/WeightCategoryLonglineDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/referential/longline/WeightDeterminationMethodDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/referential/seine/WeightCategorySeineDtoReferenceBinder.java - − persistence/src/main/java/fr/ird/observe/binder/data/longline/ActivityLonglineObsEntityReferenceBinder.java - − persistence/src/main/java/fr/ird/observe/binder/data/longline/BaitsCompositionObsEntityReferenceBinder.java - − persistence/src/main/java/fr/ird/observe/binder/data/longline/BasketObsEntityReferenceBinder.java - − persistence/src/main/java/fr/ird/observe/binder/data/longline/BranchlineObsEntityReferenceBinder.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/931cc6488f6ce40e991afa01a75… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/931cc6488f6ce40e991afa01a75… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/8.0-alpha-4
by Tony CHEMIT 04 Dec '18

04 Dec '18

Tony CHEMIT deleted branch release/8.0-alpha-4 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v8.0-alpha-4
by Tony CHEMIT 04 Dec '18

04 Dec '18

Tony CHEMIT pushed new tag v8.0-alpha-4 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/v8.0-alpha-4 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/8.0-alpha-4] [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-4' with…
by Tony CHEMIT 04 Dec '18

04 Dec '18

Tony CHEMIT pushed to branch release/8.0-alpha-4 at ultreiaio / ird-observe Commits: fa7aa184 by tchemit at 2018-12-04T16:38:34Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-4' with non-snapshot versions[skip ci] - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fa7aa184d4d2fc0c4a2ac883153… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fa7aa184d4d2fc0c4a2ac883153… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 119 commits: update project version
by Tony CHEMIT 04 Dec '18

04 Dec '18

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: b4457e86 by Tony CHEMIT at 2018-10-03T03:49:44Z update project version - - - - - 2ee943c1 by Tony CHEMIT at 2018-10-03T13:06:02Z [V8] L'enregistrement d'une activité logbook LL échoue lorsque l'on tente des créer des activités logbook dans une marée issue d'une marée d'observation saisie en V5 - See #1108 Add some logs - - - - - 7c802fc7 by Tony CHEMIT at 2018-10-03T13:06:20Z optimize dependencies - - - - - 22eeaf27 by Tony CHEMIT at 2018-10-03T15:35:05Z Some data (in table forms) order is not deterministic - Closes #1112 - - - - - 757bd9cd by Tony CHEMIT at 2018-10-04T07:17:50Z Fix some coordinates validation - Closes #1113 - - - - - 9edba5b3 by Tony CHEMIT at 2018-10-04T07:25:22Z Improve ui handlers. - - - - - 4c51af42 by Tony CHEMIT at 2018-10-05T10:32:04Z [LL] Correction de libellés - See #1117 - - - - - 4e973c5c by Tony CHEMIT at 2018-10-06T14:12:43Z end of ui handler refactor (may need a hole test of ui...) - - - - - fdfbb6b3 by Tony CHEMIT at 2018-10-06T14:12:45Z [LL] Attribution de codes aux états de conservation - Closes #1123 - - - - - d051d38a by Tony CHEMIT at 2018-10-06T14:12:45Z [LL] Débarquements : petits ajustements - See #1121 (add harbour entry) - - - - - c75c91f7 by Tony CHEMIT at 2018-10-06T16:15:23Z add test database form model 8.3 - - - - - 97b5b714 by Tony CHEMIT at 2018-10-06T16:15:24Z [LL][PS] Améliorer le widget position - Closes #1133 - - - - - 332de6b9 by Tony CHEMIT at 2018-10-06T16:15:25Z [LL] Débarquements : petits ajustements - See #1121 (correction libelle) - - - - - 7097ff78 by Tony CHEMIT at 2018-10-06T16:15:25Z [LL] Débarquements : petits ajustements - See #1121 (catégories de poids non obligatoires) - - - - - 12cee0d3 by Tony CHEMIT at 2018-10-06T16:15:25Z [LL] Débarquements : petits ajustements - See #1121 (ajout configuration pour la méthode de mesure de poids par défaut pour la création d'un nouveau débarquement) - - - - - 3e814944 by Tony CHEMIT at 2018-10-06T16:15:25Z [LL] Débarquements : petits ajustements - See #1121 (ajout filtre sur les navires (cargo ou inconnu)) - - - - - 2fa7ea4a by Tony CHEMIT at 2018-10-06T16:15:25Z [LL] Débarquements : petits ajustements - See #1121 (utilisation méthode de mensuration de poids lors de la création d'un nouveau débarquement) - - - - - 511c3b13 by Tony CHEMIT at 2018-10-06T16:15:25Z [LL] Débarquements : petits ajustements - See #1121 (correction des messages pour le déplacement) - - - - - 5ecad347 by Tony CHEMIT at 2018-10-06T16:15:25Z Ajout d'un raccourci clavier pour déplacer des éléments - - - - - bd5625ac by Tony CHEMIT at 2018-10-06T16:15:25Z open api - - - - - 7cb93827 by Tony CHEMIT at 2018-10-06T16:34:10Z [LL][PS] Dans le widget liste déroulante d'espèces, après le code FAO et le non scientifique, ajouter le nom commun (vernaculaire) dans la langue courante - Closes #1131 - - - - - 4ed9f518 by Tony CHEMIT at 2018-10-07T10:16:38Z [LL] Créer une liste d'affichage d'espèces propre aux captures, débarquements et échantillons LL Logbooks - See #1130 - - - - - f680c163 by Tony CHEMIT at 2018-10-07T10:52:45Z [LL] Capture : petits ajustements - Closes #1129 - - - - - 4f62c2f4 by Tony CHEMIT at 2018-10-07T15:12:10Z [LL] Composition globale de la palangre : petits ajustements - Closes #1128 (plus alignement de l'écran observation) - - - - - 39e3eb2c by Tony CHEMIT at 2018-10-07T15:12:13Z [LL] Les positions géographiques de fin de filage, début et fin de virage ne doivent pas être obligatoires - Closes #1115 - - - - - a370d2af by Tony CHEMIT at 2018-10-07T15:12:13Z fix coordinates validation message (and remove a lots of them \o/) - - - - - 60ebe3c4 by Tony CHEMIT at 2018-10-07T15:59:12Z [LL] Opération de pêche : petits ajustements - Closes #1126 - - - - - fb37a010 by Tony CHEMIT at 2018-10-07T16:57:36Z [LL] Activité : Petits ajustements - Closes #1118 - - - - - e8122185 by Tony CHEMIT at 2018-10-07T17:31:24Z [LL] Echantillons consignés au niveau marée : Petits ajustements - Closes #1134 - - - - - 2e14f03d by Tony CHEMIT at 2018-10-07T17:51:55Z update toolkit - - - - - 6cce186b by Tony CHEMIT at 2018-10-12T11:30:12Z [LL] Rendre fonctionnels les bouton "Déplacer échantillon" - Closes #1120 - - - - - e068dbf5 by Tony CHEMIT at 2018-10-13T13:21:28Z Internationaliser le référentiel port - Closes #1138 - - - - - 704da5e7 by Tony CHEMIT at 2018-10-13T13:21:32Z fix typo - - - - - 75ed4e6b by Tony CHEMIT at 2018-10-13T13:21:32Z add missing license header - - - - - 9b7e19a4 by Tony CHEMIT at 2018-10-13T13:21:32Z fix referential ui. - - - - - a640b3f6 by Tony CHEMIT at 2018-10-14T13:49:34Z update changelog - - - - - 10ac78bf by Tony CHEMIT at 2018-10-14T14:59:39Z [PS] Calée / Captures accessoires : le numéro de cuve n'est plus éditable après le premier enregistrement - Closes #1143 - - - - - 514ffc6b by Tony CHEMIT at 2018-10-14T15:00:09Z Problème d'affichage dans l'UI référentiel relations taille-poids - Closes #1142 - - - - - f0eba373 by Tony CHEMIT at 2018-10-14T15:03:27Z Création de profils de connexions : cosmétique - Closes #1140 - - - - - 6851f554 by Tony CHEMIT at 2018-10-14T15:03:56Z Création de profils de connexions : cosmétique - Closes #1642 - - - - - 22362a2c by Tony CHEMIT at 2018-10-14T15:17:54Z Amélioration du composant de cartographie - Closes #901 - - - - - ca86c8c1 by Tony CHEMIT at 2018-10-16T07:16:29Z [PS][FOB] Plusieurs mappings anciens types FAD / Nouveaux matériaux sont erronés - Closes #1136 - - - - - 0f18b109 by Tony CHEMIT at 2018-10-16T07:17:00Z Revoir le rapport utilisation des dcp - Closes #1082 - - - - - 97eb754c by Tony CHEMIT at 2018-10-16T07:17:01Z Realign database model version to 7.0 - - - - - 12d38e37 by Tony CHEMIT at 2018-10-16T07:17:08Z Realign database model version to 7.0 - - - - - 89bfc365 by Tony CHEMIT at 2018-10-16T07:17:10Z [LL] Débarquements : petits ajustements - Closes #1121 (validation poids et pas du nombre) - - - - - e0275c53 by Tony CHEMIT at 2018-10-16T07:17:11Z [LL] Débarquements : petits ajustements 2 - Closes #1137 - - - - - f0c48157 by Tony CHEMIT at 2018-10-16T07:17:13Z [LL] Marée : redondance des listes Type de marée - Closes #1135 - - - - - e55025e1 by Tony CHEMIT at 2018-10-16T07:17:14Z [LL] Opération de pêche : recopie de propriétés - Closes #1125 - - - - - 487255a7 by Tony CHEMIT at 2018-10-16T07:17:14Z Finish referential forms refactor - - - - - eecf77a9 by Tony CHEMIT at 2018-10-16T07:17:14Z Calcul de l'activité d'observation sur l'écran de l'activité logbook - See #1150 - Amélioration de l'api sur les activités LL et ajout de l'api pour faire le calcul de l'appairement - - - - - 52094e2f by Tony CHEMIT at 2018-10-16T07:17:15Z Calcul de l'activité d'observation sur l'écran de l'activité logbook - See #1150 - Début d'ajout dans l'écran d'une activité Logbook + quelques correctoins sur cet écran. - - - - - a22eefaa by Tony CHEMIT at 2018-10-16T07:17:15Z Lacune de migration sur liste des systèmes observés - Closes #1151 - - - - - 5ed56004 by Tony CHEMIT at 2018-10-16T11:25:23Z [PS][FOB] Plusieurs mappings anciens types FAD / Nouveaux matériaux sont erronés - Closes #1136 (la der des ders...) - - - - - c2abb164 by Tony CHEMIT at 2018-10-16T14:37:04Z Correction sur l'API d'ouverture et fermeture (l'id est supprimé trop tôt... plus bien repaindre l'abre de navigation) - - - - - f2f85a78 by Tony CHEMIT at 2018-10-16T16:36:40Z Calcul de l'activité d'observation sur l'écran de l'activité logbook - closes #1150 - - - - - 4db231fe by Tony CHEMIT at 2018-10-16T21:27:02Z [PS] Place du formulaire libération dans l'arbre - Closes #1154 - - - - - 28ed23ea by Tony CHEMIT at 2018-10-16T21:59:29Z Script update-obstuna.* pourrait être renommé...- Closes #1146 - - - - - 4770b8b4 by Tony CHEMIT at 2018-10-16T22:20:10Z Nom du script de lancement .exe - Closes #1147 - - - - - c0d6bcca by Tony CHEMIT at 2018-10-21T15:48:13Z update changelog - - - - - b7634e0b by Tony CHEMIT at 2018-10-21T17:14:19Z [PS] Place du formulaire libération dans l'arbre - Closes #1154 - - - - - dc822699 by Tony CHEMIT at 2018-10-22T08:47:21Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (mise en place de nouveaux validateurs générés \o/) - - - - - 93d5bf85 by Tony CHEMIT at 2018-10-22T08:53:56Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (nettoyage des validateurs) - - - - - 653b74ff by Tony CHEMIT at 2018-10-22T10:50:10Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (utilisation new jaxx api + move some package validation and gson) - - - - - 36097946 by Tony CHEMIT at 2018-10-22T10:53:28Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (utilisation du nouveau validateru généré pour le champs commentaire) - - - - - a0faf0bc by Tony CHEMIT at 2018-10-22T14:24:18Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (utilisation nouvelle api i18n dans jaxx) - - - - - ba35ce54 by Tony CHEMIT at 2018-10-22T16:50:24Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (gros nettoyage des validateurs) - - - - - a16a9120 by Tony CHEMIT at 2018-10-22T16:52:38Z [PS] Lorsque l'on enregistre le formulaire FOB depuis le 2d onglet, le focus revient sur le 1er onglet - Closes #1158 - - - - - 104b2dd8 by Tony CHEMIT at 2018-10-22T16:57:38Z update pom + fix a focus problem - - - - - b3eda4b8 by Tony CHEMIT at 2018-10-22T16:58:04Z optimize dependencies - - - - - 65b40384 by Tony CHEMIT at 2018-10-22T21:36:02Z fix some commits after report of 7.0-RC-23 (but i18n is not optimized) - - - - - e627297e by Tony CHEMIT at 2018-11-10T10:47:17Z Use new I18n API - - - - - e389c018 by Tony CHEMIT at 2018-11-10T10:58:40Z Replace deprecated I18n API - - - - - 53b7ace4 by Tony CHEMIT at 2018-11-10T10:59:23Z Use last toolkit - - - - - e26b3665 by Tony CHEMIT at 2018-11-10T17:10:56Z Review i18n templates - - - - - a46b9370 by Tony CHEMIT at 2018-11-11T16:01:39Z update licenses + use last toolkit - - - - - fffeaa2e by Tony CHEMIT at 2018-11-11T19:17:04Z Petite défaut dans le référentiel objectmaterial (legacy codes) - Closes #1167 - - - - - b552fdd4 by Tony CHEMIT at 2018-11-11T19:17:22Z Infobulles sur l'assistant changement de source - Closes #1164 - - - - - 87a9321f by Tony CHEMIT at 2018-11-11T19:52:52Z Traductions espagnoles - Closes #1165 - - - - - 25802a95 by Tony CHEMIT at 2018-11-11T19:54:41Z [FOB] Les valeurs des caractéristiques/matériaux désactivés ne sont pas affichées - Closes #1168 - - - - - ed98198f by Tony CHEMIT at 2018-11-11T20:09:06Z update changelog - - - - - f5e5805d by tchemit at 2018-11-11T23:30:25Z remove config plugin from report, it does not works very well - - - - - 25fc0f69 by tchemit at 2018-11-13T17:36:26Z clean some code + sue last pom - - - - - 9e86d544 by tchemit at 2018-11-13T23:51:34Z Traductions espagnoles - update i18n editor (See #1165) - - - - - c4dd8462 by tchemit at 2018-11-14T00:00:25Z Traductions espagnoles - add first IEO es translations :) editor (See #1165) - - - - - 5144d007 by tchemit at 2018-11-14T10:20:50Z [FOB] Affichage bizarre - Closes #1169 - - - - - 5bf26d97 by tchemit at 2018-11-14T13:09:06Z Mise à jour des objectmaterial - Closes #1170 - - - - - 7df49f73 by tchemit at 2018-11-14T13:28:05Z Après insertion de #1170 - Closes #1171 - - - - - 90e8ff3a by tchemit at 2018-11-19T10:55:00Z Mise à jour des objectmaterial - Closes #1170 (update tests) - - - - - 35405cb0 by tchemit at 2018-11-19T10:56:05Z [LL] Marée : Petits ajustements - See #1124 - - - - - 5106ba84 by tchemit at 2018-11-19T10:56:09Z Traductions espagnoles - Closes #1165 - - - - - 54678e6c by tchemit at 2018-11-19T10:56:23Z update some libs - - - - - 708aa1a3 by tchemit at 2018-11-19T10:56:25Z use las toolkit - - - - - 421f7333 by tchemit at 2018-11-19T10:56:25Z [LL] Echantillons : Petits ajustements - Closes #1132 - - - - - 5fe8bfcc by tchemit at 2018-11-19T12:10:36Z [LL] Echantillons : Petits ajustements (ne plus ajouter automatiquement un echantillon sur la creation d'une activité) - Closes #1132 - - - - - 360a4e41 by tchemit at 2018-11-19T12:10:38Z Fix some validators - - - - - 38e2d6e6 by tchemit at 2018-11-23T14:50:15Z Nouvelle action « Apparier les activités logbook/observations » - See #908 - - - - - 068dcddc by tchemit at 2018-11-23T14:56:05Z [PS][FOB] Permettre NULL sur les propriétés biodegradable et nonentangling, ainsi que sur les déductions - Closes #1175 - - - - - 4cf0d0ed by tchemit at 2018-11-23T15:09:13Z [PS][FOB] Permettre NULL sur les propriétés biodegradable et nonentangling, ainsi que sur les déductions - Closes #1175 (test) - - - - - c9dcbb03 by tchemit at 2018-11-23T15:14:33Z Propriétés biodegradable et nonEntangling non présentes sur l'éditeur de ObjectMaterial - Closes #1176 - - - - - 7eac880c by tchemit at 2018-11-23T15:15:20Z optimize i18n - - - - - 5c684f5e by Pascal Cauquil at 2018-11-23T15:15:26Z Matériau objet 2-2-4-2 'Net', passage de biodegradable de NULL à FALSE (c'était un oubli) - - - - - c5c6423d by tchemit at 2018-11-23T15:15:35Z Question calculs biodégradable, nonentangling et type simplifié à l'arrivée et au départ - Closes #1177 - - - - - 43b37bf4 by tchemit at 2018-11-23T15:25:16Z [PS] Libération faune accessoire -> Exception - Closes #1174 - - - - - f96d4e7d by tchemit at 2018-11-23T15:27:03Z [PS] Libération faune accessoire -> Exception - Closes #1174 (bis) - - - - - 73960aff by tchemit at 2018-11-26T12:14:18Z update changelog - - - - - 98c8443b by tchemit at 2018-11-26T12:50:17Z update changelog - - - - - 18cdb589 by tchemit at 2018-11-27T11:50:30Z En mode de compatibilité "référentiels obsolètes", les rendre utilisable en saisie - Closes #1162 - - - - - edce5be0 by tchemit at 2018-11-28T12:33:34Z fix a missing field in test databases. - - - - - 9fbd2c4b by tchemit at 2018-11-28T16:07:38Z [V8][DATA MODEL] Retours sur le modèle V8 alpha - See #1166 - - - - - d8dc0c59 by tchemit at 2018-12-04T12:31:01Z update pom - - - - - 4831d6e4 by tchemit at 2018-12-04T13:07:53Z Ajouter un champ vessel.lloydid - Closes #1181 - - - - - e999d806 by tchemit at 2018-12-04T13:40:19Z [V8][DATA MODEL] Transformer Vessel.fleetcountry (int4) en topiaid - Closes #1183 - - - - - fc02e81b by tchemit at 2018-12-04T13:41:00Z update tests - - - - - bdf4898a by tchemit at 2018-12-04T15:45:11Z [V8][DATA MODEL] Retours sur le modèle V8 alpha - Closes #1166 - - - - - 59b4d4ca by tchemit at 2018-12-04T15:46:39Z update changelog - - - - - 90b2c784 by Tony CHEMIT at 2018-12-04T16:09:47Z [jgitflow-maven-plugin]updating poms for 8.0-alpha-4 branch with snapshot versions[skip ci] - - - - - fa7aa184 by tchemit at 2018-12-04T16:38:34Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-4' with non-snapshot versions[skip ci] - - - - - 17da4d9c by tchemit at 2018-12-04T16:40:39Z fix release - - - - - 21 changed files: - .mvn/gitlab-cache/milestones/532657-issues.json - .mvn/gitlab-cache/milestones/532657.json - + .mvn/gitlab-cache/milestones/655988-artifacts.json - .mvn/gitlab-cache/milestones/655988-issues.json - .mvn/gitlab-cache/milestones/655988.json - + .mvn/gitlab-cache/milestones/674086-issues.json - + .mvn/gitlab-cache/milestones/674086.json - + .mvn/gitlab-cache/milestones/677551-issues.json - + .mvn/gitlab-cache/milestones/677551.json - + .mvn/gitlab-cache/milestones/681916-artifacts.json - + .mvn/gitlab-cache/milestones/681916-issues.json - + .mvn/gitlab-cache/milestones/681916.json - CHANGELOG.md - client-configuration/.mvn/generate-application-config → client-configuration/.mvn/i18n/parse-java-enumerations - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - + client-configuration/src/main/i18n/getters/config.getter - + client-configuration/src/main/i18n/getters/java-enumeration.getter - + client-configuration/src/main/i18n/getters/java.getter - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/aeeefaa468263da5f36e250f54… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/aeeefaa468263da5f36e250f54… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 40 commits: Ajout de nouvelles entrées dans le référentiel observe_common.VesselType - Closes #889
by Tony CHEMIT 04 Dec '18

04 Dec '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0d38cd09 by Tony CHEMIT at 2018-05-19T10:26:58Z Ajout de nouvelles entrées dans le référentiel observe_common.VesselType - Closes #889 - - - - - d9ad9a27 by Tony CHEMIT at 2018-05-19T19:21:34Z Modification du référentiel Person - Closes #890 - - - - - 740fe94c by Tony CHEMIT at 2018-05-19T22:35:02Z Renommage du référentiel observe_longline.TripType - Closes #919 - - - - - b227a2b3 by Tony CHEMIT at 2018-05-19T22:55:55Z Ajout de nouvelles entrées au référentiel observe_longline.VesselActivity - Closes #891 - - - - - 3486d482 by Tony CHEMIT at 2018-05-19T23:36:38Z Ajout du référentiel observe_longline.WeightDeterminationMethod - Closes #921 - - - - - 57c6f2d5 by Tony CHEMIT at 2018-05-20T00:03:02Z Ajout du référentiel observe_longline.WeightCategory - Closes #920 - - - - - 158824b7 by Tony CHEMIT at 2018-05-20T00:27:19Z Ajout du référentiel observe_common.Compagnies - Closes #896 - - - - - b77ac495 by Tony CHEMIT at 2018-05-20T01:19:02Z Ajout du référentiel observe_common.WeightMeasureMethod - Clses #899 Ajout du référentiel observe_common.LengthMeasureMethod - Closes #900 - - - - - c86f3973 by Tony CHEMIT at 2018-05-20T02:09:46Z Ajout du référentiel observe_longline.Conservation - Close #898 Ajout du référentiel observe_longline.OnBoardProcessing - Closes #897 Ajout du référentiel observe_longline.DataSource - Closes #894 Ajout du référentiel observe_longline.LogbookTripType - Clses #893 - - - - - e766283c by Tony CHEMIT at 2018-05-20T09:36:43Z use last stable of toolkit - - - - - 9955ef48 by Tony CHEMIT at 2018-05-20T09:53:52Z add missing license headers - - - - - 628fd0cb by Tony CHEMIT at 2018-05-20T11:49:28Z Renommage de la classe seine.WeightCategory en seine.WeightCategorySeine - Closes #950 - - - - - 51631b0b by Tony CHEMIT at 2018-05-20T12:23:02Z [jgitflow-maven-plugin]updating poms for 8.0-alpha-2-SNAPSHOT development[skip ci] - - - - - 8710c2d8 by Tony CHEMIT at 2018-05-20T12:26:32Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-1' with non-snapshot versions[skip ci] - - - - - ea686463 by Tony CHEMIT at 2018-05-20T12:33:48Z [jgitflow-maven-plugin]merging 'release/8.0-alpha-1' into 'master' - - - - - 6841047c by Tony CHEMIT at 2018-05-20T12:33:50Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 6a408a9f by Tony CHEMIT at 2018-05-20T12:33:50Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - aba95f60 by Tony CHEMIT at 2018-05-20T12:33:51Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 412af2fd by Tony CHEMIT at 2018-05-20T12:38:59Z let build on develop branches [skip ci] - - - - - 4cc816ba by Tony CHEMIT at 2018-05-20T12:41:53Z update changelog after release 8.0-alpha-1 [skip ci] - - - - - 84faf638 by Tony CHEMIT at 2018-05-22T19:11:57Z Renommage des « données observateurs » du modèle Palangre - Closes #903 - - - - - 09e4c050 by Tony CHEMIT at 2018-05-22T22:43:05Z Ajout du référentiel observe_longline.TripType - Closes #951 - - - - - cbb0aab3 by Tony CHEMIT at 2018-05-22T22:43:09Z Réusinage de la donnée observe_longline.Trip - Closes #904 - - - - - 18c3e9ae by Tony CHEMIT at 2018-05-22T22:43:09Z use topia extension - - - - - f229b8ea by Tony CHEMIT at 2018-05-23T13:08:08Z Tableaux de synthèse - Closes #916 - - - - - 35611d4c by Tony CHEMIT at 2018-05-23T13:08:10Z Correction des variables dans les rapports - - - - - ad043ab9 by Tony CHEMIT at 2018-05-24T08:04:33Z Gestion des méthodes de mesure sur les formulaires existants - Closes #917 - - - - - c546e43b by Tony CHEMIT at 2018-05-24T08:35:00Z Update toolkit and topia-extension - - - - - 302bcb13 by Tony CHEMIT at 2018-05-24T08:37:48Z update gitlab cache and changelog of release 8.0-alpha-2 - - - - - 3b3c0ef9 by Tony CHEMIT at 2018-05-24T08:51:04Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-2' with non-snapshot versions[skip ci] - - - - - d7d154bf by Tony CHEMIT at 2018-05-24T09:01:37Z [jgitflow-maven-plugin]merging 'release/8.0-alpha-2' into 'master' - - - - - 13ccf475 by Tony CHEMIT at 2018-10-03T03:01:23Z [jgitflow-maven-plugin]updating poms for 8.0-alpha-3 branch with snapshot versions[skip ci] - - - - - 51ac8f05 by Tony CHEMIT at 2018-10-03T03:20:14Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-3' with non-snapshot versions[skip ci] - - - - - aeeefaa4 by Tony CHEMIT at 2018-10-03T03:22:49Z fix release - - - - - 90b2c784 by Tony CHEMIT at 2018-12-04T16:09:47Z [jgitflow-maven-plugin]updating poms for 8.0-alpha-4 branch with snapshot versions[skip ci] - - - - - fa7aa184 by tchemit at 2018-12-04T16:38:34Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-4' with non-snapshot versions[skip ci] - - - - - 17da4d9c by tchemit at 2018-12-04T16:40:39Z fix release - - - - - a19606e9 by tchemit at 2018-12-04T16:41:30Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - f7bf32f5 by tchemit at 2018-12-04T16:41:30Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 7f2a5960 by tchemit at 2018-12-04T16:41:31Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 26 changed files: - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BasketObsTableModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineObsTableModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineObsUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineObsUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineObsUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineObsUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionObsUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionObsUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionObsUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionObsUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineObsContentTableUIInitializer.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineObsTableModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineObsUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineObsUI.jcss The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b4af779f4c989f97fb87161904… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b4af779f4c989f97fb87161904… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 8.0-alpha-5-SNAPSHOT development[skip ci]
by Tony CHEMIT 04 Dec '18

04 Dec '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b4af779f by Tony CHEMIT at 2018-12-04T16:09:50Z [jgitflow-maven-plugin]updating poms for 8.0-alpha-5-SNAPSHOT development[skip ci] - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -20,14 +20,13 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -20,14 +20,13 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> @@ -203,7 +202,7 @@ <phase>generate-resources</phase> <configuration> <target> - <copy failonerror="true" overwrite="true" file="../CHANGELOG.md" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md"/> + <copy failonerror="true" overwrite="true" file="../CHANGELOG.md" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" /> </target> </configuration> <goals> @@ -244,8 +243,8 @@ <phase>integration-test</phase> <configuration> <target> - <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/${applicationJarName}.jar"/> - <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.exe" tofile="${project.build.directory}/${applicationJarName}.exe"/> + <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/${applicationJarName}.jar" /> + <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.exe" tofile="${project.build.directory}/${applicationJarName}.exe" /> </target> </configuration> <goals> ===================================== dto/pom.xml ===================================== @@ -21,14 +21,13 @@ #L% --> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> @@ -254,10 +253,10 @@ <target> <copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.directory}/models"> <filterset> - <filter value="${observe.model.version}" token="observe.model.version"/> + <filter value="${observe.model.version}" token="observe.model.version" /> </filterset> <fileset dir="${basedir}/src/main/models"> - <include name="*.model"/> + <include name="*.model" /> </fileset> </copy> </target> ===================================== observe-i18n/pom.xml ===================================== @@ -20,14 +20,13 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -20,14 +20,13 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> @@ -267,10 +266,10 @@ <target> <copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.directory}/models"> <filterset> - <filter value="${observe.model.version}" token="observe.model.version"/> + <filter value="${observe.model.version}" token="observe.model.version" /> </filterset> <fileset dir="${basedir}/src/main/models"> - <include name="*.model"/> + <include name="*.model" /> </fileset> </copy> </target> ===================================== pom.xml ===================================== @@ -20,8 +20,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -32,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -21,14 +21,13 @@ #L% --> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -20,14 +20,13 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b4af779f4c989f97fb871619043… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b4af779f4c989f97fb871619043… You're receiving this email because of your account on gitlab.com.

1 0