Tony CHEMIT pushed to branch release/8.0-RC-2 at ultreiaio / ird-observe Commits: df10d7e3 by tchemit at 2019-06-09T16:01:10Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-RC-2' with non-snapshot versions[skip ci] - - - - - e9debdba by tchemit at 2019-06-09T16:41:56Z fix ##1266 - - - - - 28 changed files: - client-configuration/pom.xml - − client-core/.mvn/i18n/parse-validation-messages - client-core/pom.xml - − client-core/src/main/i18n/getters/validation-fields.getter - − client-core/src/main/i18n/getters/validation-messages.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUIModel.java - client-runner/pom.xml - dto/pom.xml - + dto/src/main/java/fr/ird/observe/dto/data/ll/observation/SetLonglineObsDetailCompositionUIDto.java - observe-i18n/pom.xml - 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 - 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-validation/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml - validation/src/main/i18n/getters/validation-fields.getter - validation/src/main/i18n/getters/validation-messages.getter - client-core/src/main/resources/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUIModel-update-error-validation.xml → validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetLonglineObsDetailCompositionUIDto-update-error-validation.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-2-SNAPSHOT</version> + <version>8.0-RC-2</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/.mvn/i18n/parse-validation-messages deleted ===================================== ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-2-SNAPSHOT</version> + <version>8.0-RC-2</version> </parent> <artifactId>client-core</artifactId> @@ -770,53 +770,6 @@ </dependencies> </plugin> - <plugin> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>toolbox-maven-plugin</artifactId> - <version>${observeToolkitVersion}</version> - <executions> - <execution> - <id>generate-i18n-validator-fields</id> - <goals> - <goal>generate-i18n-validator-fields</goal> - </goals> - </execution> - <execution> - <id>generate-validators-descriptor</id> - <goals> - <goal>generate-validators-descriptor</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>client-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>common-validation</artifactId> - <version>${observeToolkitVersion}</version> - </dependency> - <dependency> - <groupId>io.ultreia.java4all.jaxx</groupId> - <artifactId>jaxx-widgets-gis</artifactId> - <version>${lib.version.java4all.jaxx}</version> - </dependency> - <dependency> - <groupId>io.ultreia.java4all.jaxx</groupId> - <artifactId>jaxx-widgets-temperature</artifactId> - <version>${lib.version.java4all.jaxx}</version> - </dependency> - <dependency> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - <version>${lib.version.javassist}</version> - </dependency> - </dependencies> - </plugin> - </plugins> </build> ===================================== client-core/src/main/i18n/getters/validation-fields.getter deleted ===================================== @@ -1 +0,0 @@ -observe.common.LonglineDetailCompositionObsUIModelDto.generateTabValid ===================================== client-core/src/main/i18n/getters/validation-messages.getter deleted ===================================== @@ -1 +0,0 @@ -observe.validation.setLonglineObsDetailComposition.invalid.templates ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUIModel.java ===================================== @@ -24,6 +24,7 @@ package fr.ird.observe.client.ui.content.data.ll.observation; import fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUIModel; import fr.ird.observe.dto.data.ll.observation.SetLonglineObsDetailCompositionDto; +import fr.ird.observe.dto.data.ll.observation.SetLonglineObsDetailCompositionUIDto; import io.ultreia.java4all.bean.JavaBean; import io.ultreia.java4all.bean.definition.JavaBeanDefinition; import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; @@ -36,7 +37,7 @@ import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; */ @SuppressWarnings("WeakerAccess") @GenerateJavaBeanDefinition -public class LonglineDetailCompositionObsUIModel extends ContentSimpleUIModel<SetLonglineObsDetailCompositionDto> implements JavaBean { +public class LonglineDetailCompositionObsUIModel extends ContentSimpleUIModel<SetLonglineObsDetailCompositionDto> implements JavaBean, SetLonglineObsDetailCompositionUIDto { public static final String PROPERTY_CAN_GENERATE = "canGenerate"; @@ -125,10 +126,12 @@ public class LonglineDetailCompositionObsUIModel extends ContentSimpleUIModel<Se firePropertyChange(PROPERTY_COMPOSITION_TAB_VALID, null, compositionTabValid); } + @Override public boolean isGenerateTabValid() { return generateTabValid; } + @Override public void setGenerateTabValid(boolean generateTabValid) { this.generateTabValid = generateTabValid; firePropertyChange(PROPERTY_GENERATE_TAB_VALID, null, generateTabValid); ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-2-SNAPSHOT</version> + <version>8.0-RC-2</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-RC-2-SNAPSHOT</version> + <version>8.0-RC-2</version> </parent> <artifactId>dto</artifactId> ===================================== dto/src/main/java/fr/ird/observe/dto/data/ll/observation/SetLonglineObsDetailCompositionUIDto.java ===================================== @@ -0,0 +1,38 @@ +package fr.ird.observe.dto.data.ll.observation; + +/*- + * #%L + * ObServe :: Dto + * %% + * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import io.ultreia.java4all.bean.JavaBean; + +/** + * Created on 09/06/19. + * + * @author Tony Chemit - dev@tchemit.fr + * @since ? + */ +public interface SetLonglineObsDetailCompositionUIDto extends JavaBean { + + boolean isGenerateTabValid(); + + void setGenerateTabValid(boolean generateTabValid); +} ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-2-SNAPSHOT</version> + <version>8.0-RC-2</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1446,7 +1446,6 @@ observe.common.LonglineDetailCompositionObsDto.sectionsTable.template=Template observe.common.LonglineDetailCompositionObsDto.sectionsTable.template.tip=Template used to generate baskets floatline lengths observe.common.LonglineDetailCompositionObsDto.title=Detailed composition observe.common.LonglineDetailCompositionObsDto.title.section.cant.use.firstTemplate=Can't use the first template while generating -observe.common.LonglineDetailCompositionObsUIModelDto.generateTabValid=Templates observe.common.LonglineGlobalCompositionDto.message.updating=Updating global composition observe.common.LonglineGlobalCompositionLogbookDto.message.updating=Updating global composition observe.common.LonglineGlobalCompositionObsDto.message.updating=Updating global composition @@ -1958,6 +1957,7 @@ observe.common.SetLonglineObsDetailCompositionDto.branchlineDetailTab=Branchline observe.common.SetLonglineObsDetailCompositionDto.canGenerate=Can generate observe.common.SetLonglineObsDetailCompositionDto.compositionTab=Composition observe.common.SetLonglineObsDetailCompositionDto.generateTab=generation +observe.common.SetLonglineObsDetailCompositionUIDto.generateTabValid=Templates observe.common.SetLonglineObsDto.action.reset.homeId.tip=Reset home id observe.common.SetLonglineObsDto.basketsPerSectionCount=Baskets per section count observe.common.SetLonglineObsDto.branchlinesPerBasketCount=Hooks per basket count ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1446,7 +1446,6 @@ observe.common.LonglineDetailCompositionObsDto.sectionsTable.template=Template observe.common.LonglineDetailCompositionObsDto.sectionsTable.template.tip=Template observe.common.LonglineDetailCompositionObsDto.title=Esquema del palangre observe.common.LonglineDetailCompositionObsDto.title.section.cant.use.firstTemplate=Impossible de utilizar el primer modelo durante la generación -observe.common.LonglineDetailCompositionObsUIModelDto.generateTabValid=Templates \#TODO observe.common.LonglineGlobalCompositionDto.message.updating=Composición global del palangre en proceso de modificación observe.common.LonglineGlobalCompositionLogbookDto.message.updating=Composición global del palangre en proceso de modificación observe.common.LonglineGlobalCompositionObsDto.message.updating=Composición global del palangre en proceso de modificación @@ -1958,6 +1957,7 @@ observe.common.SetLonglineObsDetailCompositionDto.branchlineDetailTab=Detalle de observe.common.SetLonglineObsDetailCompositionDto.canGenerate=Autorizar la generación observe.common.SetLonglineObsDetailCompositionDto.compositionTab=Composición observe.common.SetLonglineObsDetailCompositionDto.generateTab=Definición de los modelos +observe.common.SetLonglineObsDetailCompositionUIDto.generateTabValid=Templates \#TODO observe.common.SetLonglineObsDto.action.reset.homeId.tip=Reiniciar el id de negocio observe.common.SetLonglineObsDto.basketsPerSectionCount=Número de cestas por sección observe.common.SetLonglineObsDto.branchlinesPerBasketCount=Número de anzuelos por cesta ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1446,7 +1446,6 @@ observe.common.LonglineDetailCompositionObsDto.sectionsTable.template=Patron observe.common.LonglineDetailCompositionObsDto.sectionsTable.template.tip=Patron observe.common.LonglineDetailCompositionObsDto.title=Schéma de palangre observe.common.LonglineDetailCompositionObsDto.title.section.cant.use.firstTemplate=Impossible d'utiliser le premier modèle lors de la génération -observe.common.LonglineDetailCompositionObsUIModelDto.generateTabValid=Templates observe.common.LonglineGlobalCompositionDto.message.updating=Composition globale de la palangre en cours de modification observe.common.LonglineGlobalCompositionLogbookDto.message.updating=Composition globale de la palangre en cours de modification observe.common.LonglineGlobalCompositionObsDto.message.updating=Composition globale de la palangre en cours de modification @@ -1958,6 +1957,7 @@ observe.common.SetLonglineObsDetailCompositionDto.branchlineDetailTab=Détail av observe.common.SetLonglineObsDetailCompositionDto.canGenerate=Autoriser la génération observe.common.SetLonglineObsDetailCompositionDto.compositionTab=Composition observe.common.SetLonglineObsDetailCompositionDto.generateTab=Définition des modèles +observe.common.SetLonglineObsDetailCompositionUIDto.generateTabValid=Templates observe.common.SetLonglineObsDto.action.reset.homeId.tip=Réinitialiser l'id métier observe.common.SetLonglineObsDto.basketsPerSectionCount=Nombre de paniers par section observe.common.SetLonglineObsDto.branchlinesPerBasketCount=Nombre d'hameçons par panier ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-2-SNAPSHOT</version> + <version>8.0-RC-2</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-RC-2-SNAPSHOT</version> + <version>8.0-RC-2</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-2-SNAPSHOT</version> + <version>8.0-RC-2</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-RC-2-SNAPSHOT</version> + <version>8.0-RC-2</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-RC-2-SNAPSHOT</version> + <version>8.0-RC-2</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-RC-2-SNAPSHOT</version> + <version>8.0-RC-2</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-RC-2-SNAPSHOT</version> + <version>8.0-RC-2</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-RC-2-SNAPSHOT</version> + <version>8.0-RC-2</version> </parent> <artifactId>services-local</artifactId> ===================================== services-validation/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-2-SNAPSHOT</version> + <version>8.0-RC-2</version> </parent> <artifactId>services-validation</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-2-SNAPSHOT</version> + <version>8.0-RC-2</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-RC-2-SNAPSHOT</version> + <version>8.0-RC-2</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-RC-2-SNAPSHOT</version> + <version>8.0-RC-2</version> </parent> <artifactId>validation</artifactId> ===================================== validation/src/main/i18n/getters/validation-fields.getter ===================================== @@ -241,6 +241,7 @@ observe.common.SetLonglineLogbookGlobalCompositionDto.floatlinesComposition observe.common.SetLonglineLogbookGlobalCompositionDto.floatlinesCompositionProportionSum observe.common.SetLonglineLogbookGlobalCompositionDto.hooksComposition observe.common.SetLonglineLogbookGlobalCompositionDto.hooksCompositionProportionSum +observe.common.SetLonglineObsDetailCompositionUIDto.generateTabValid observe.common.SetLonglineObsDto.basketsPerSectionCount observe.common.SetLonglineObsDto.branchlinesPerBasketCount observe.common.SetLonglineObsDto.haulingBreaks ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -77,6 +77,7 @@ observe.validation.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp observe.validation.setLongline.hooksComposition.uniqueKey observe.validation.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp observe.validation.setLongline.settingStartTimeStamp.before.settingEndTimeStamp +observe.validation.setLonglineObsDetailComposition.invalid.templates observe.validation.species.length.bound observe.validation.species.weight.bound observe.validation.targetCatch.uniqueKey ===================================== client-core/src/main/resources/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUIModel-update-error-validation.xml → validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetLonglineObsDetailCompositionUIDto-update-error-validation.xml ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - ObServe :: Client core + ObServe :: Validation %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/772a3b817db3f6e8ab1e1695f26... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/772a3b817db3f6e8ab1e1695f26... You're receiving this email because of your account on gitlab.com.