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

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 19 Jul '17

19 Jul '17

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: fc518fa3 by 166231 at 2017-07-19T00:09:15+00:00 Site checkin for project ObServe :: Pom - - - - - 10 changed files: - administration-web.html - + aggregate-third-party-report.html - architecture-logicielle.html - changelog.html - changes-report.html - config-report.html - dependency-convergence.html - dependency-info.html - dependency-management.html - dependency-updates-report.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fc518fa3acd8ffd2443d26b8ede… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fc518fa3acd8ffd2443d26b8ede… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] improve site build [skip ci]
by Tony CHEMIT 19 Jul '17

19 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5d88185a by Tony Chemit at 2017-07-19T02:00:24+02:00 improve site build [skip ci] - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,7 @@ stages: .deploy_site: &deploy_site script: - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/clean install/' | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/clean install -DskipTests/' | bash - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/site -DperformRelease scm-publish:publish-scm/' | bash .deploy_demo_latest: &deploy_demo_latest View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5d88185a18baece5f79fd8874ec… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5d88185a18baece5f79fd8874ec… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: optimize dependencies
by Tony CHEMIT 18 Jul '17

18 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 34740916 by Tony Chemit at 2017-07-19T01:40:13+02:00 optimize dependencies - - - - - 9ec91009 by Tony Chemit at 2017-07-19T01:41:56+02:00 Optimize license headers - - - - - 16 changed files: - application-web/pom.xml - application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java - application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java - application-web/src/test/resources/log4j.properties - services-rest/pom.xml - services-runner/pom.xml - services-runner/src/main/resources/validators.xml - services-topia/pom.xml - services/src/main/java/fr/ird/observe/services/FormRequestDefinitionProvider.java - services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java - services/src/main/java/fr/ird/observe/services/ReferenceSetDefinitionProvider.java - services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConfigurationAdapter.java - services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConnectionAdapter.java - services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java - services/src/test/java/fr/ird/observe/services/ObserveDtoInitializerTest.java - services/src/test/java/fr/ird/observe/services/ReferenceSetDefinitionProviderTest.java Changes: ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -103,6 +103,11 @@ <artifactId>nuiton-converter</artifactId> </dependency> + <dependency> + <groupId>io.ultreia.java4all.http</groupId> + <artifactId>http-api</artifactId> + </dependency> +  <dependency> <groupId>org.debux.webmotion</groupId> ===================================== application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java ===================================== --- a/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java @@ -43,7 +43,7 @@ import org.debux.webmotion.server.call.ServerContext; import org.debux.webmotion.server.mapping.Mapping; /** - * @author Tony Chemit - tchemit(a)codelutin.com + * @author Tony Chemit - dev(a)tchemit.fr */ public class ObserveWebApplicationListener implements WebMotionServerListener { ===================================== application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java ===================================== --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java @@ -29,7 +29,7 @@ import fr.ird.observe.application.web.security.ObserveWebSecurityApplicationCont import org.debux.webmotion.server.WebMotionController; /** - * @author Tony Chemit - tchemit(a)codelutin.com + * @author Tony Chemit - dev(a)tchemit.fr */ public abstract class ObserveWebMotionController extends WebMotionController { ===================================== application-web/src/test/resources/log4j.properties ===================================== --- a/application-web/src/test/resources/log4j.properties +++ b/application-web/src/test/resources/log4j.properties @@ -1,6 +1,6 @@ ### # #%L -# ObServe :: Services REST Implementation +# ObServe :: Application Web # %% # Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io # %% ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -62,10 +62,6 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> @@ -74,6 +70,11 @@ <artifactId>gson</artifactId> </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </dependency> +  <dependency> <groupId>org.nuiton</groupId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -81,6 +81,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> <dependency> <groupId>org.reflections</groupId> ===================================== services-runner/src/main/resources/validators.xml ===================================== --- a/services-runner/src/main/resources/validators.xml +++ b/services-runner/src/main/resources/validators.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>  + </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>topia-extension</artifactId> ===================================== services/src/main/java/fr/ird/observe/services/FormRequestDefinitionProvider.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/FormRequestDefinitionProvider.java +++ b/services/src/main/java/fr/ird/observe/services/FormRequestDefinitionProvider.java @@ -1,5 +1,27 @@ package fr.ird.observe.services; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 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 com.google.common.collect.ImmutableMap; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.form.FormRequestDefinition; ===================================== services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java +++ b/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java @@ -1,5 +1,27 @@ package fr.ird.observe.services; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 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 com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import fr.ird.observe.common.constants.GearType; ===================================== services/src/main/java/fr/ird/observe/services/ReferenceSetDefinitionProvider.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/ReferenceSetDefinitionProvider.java +++ b/services/src/main/java/fr/ird/observe/services/ReferenceSetDefinitionProvider.java @@ -1,5 +1,27 @@ package fr.ird.observe.services; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 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 com.google.common.collect.ImmutableMap; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; ===================================== services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConfigurationAdapter.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConfigurationAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConfigurationAdapter.java @@ -2,7 +2,7 @@ package fr.ird.observe.services.gson; /* * #%L - * ObServe :: Services REST Implementation + * ObServe :: Services * %% * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io * %% ===================================== services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConnectionAdapter.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConnectionAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConnectionAdapter.java @@ -2,7 +2,7 @@ package fr.ird.observe.services.gson; /* * #%L - * ObServe :: Services REST Implementation + * ObServe :: Services * %% * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io * %% ===================================== services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java ===================================== --- a/services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java +++ b/services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java @@ -1,5 +1,27 @@ package fr.ird.observe.services; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 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 fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import org.junit.Assert; @@ -31,4 +53,4 @@ public class FormRequestDefinitionProviderTest { } -} \ No newline at end of file +} ===================================== services/src/test/java/fr/ird/observe/services/ObserveDtoInitializerTest.java ===================================== --- a/services/src/test/java/fr/ird/observe/services/ObserveDtoInitializerTest.java +++ b/services/src/test/java/fr/ird/observe/services/ObserveDtoInitializerTest.java @@ -1,5 +1,27 @@ package fr.ird.observe.services; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 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 fr.ird.observe.services.dto.referential.ReferentialHelper; import org.junit.Assert; import org.junit.Test; @@ -20,4 +42,4 @@ public class ObserveDtoInitializerTest { public void testReferentialTypes() { Assert.assertEquals(ReferentialHelper.REFERENCE_DTOS.size(), ObserveDtoInitializer.INSTANCE.getReferentialTypes().size()); } -} \ No newline at end of file +} ===================================== services/src/test/java/fr/ird/observe/services/ReferenceSetDefinitionProviderTest.java ===================================== --- a/services/src/test/java/fr/ird/observe/services/ReferenceSetDefinitionProviderTest.java +++ b/services/src/test/java/fr/ird/observe/services/ReferenceSetDefinitionProviderTest.java @@ -1,5 +1,27 @@ package fr.ird.observe.services; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 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 fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import org.junit.Assert; @@ -40,4 +62,4 @@ public class ReferenceSetDefinitionProviderTest { } -} \ No newline at end of file +} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/69b0281e783f4784df49d922c3… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/69b0281e783f4784df49d922c3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Review design of ReferenceSetDefinition and FormRequestDefinition (adapt for ui) (Closes #793)
by Tony CHEMIT 18 Jul '17

18 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 69b0281e by Tony Chemit at 2017-07-19T01:32:03+02:00 Review design of ReferenceSetDefinition and FormRequestDefinition (adapt for ui) (Closes #793) - - - - - 8 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java - services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java - services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java @@ -21,14 +21,10 @@ */ package fr.ird.observe.application.swing; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.util.Arrays; import java.util.Date; - - -import static org.nuiton.i18n.I18n.n; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * Pour lancer le client swing {@code ObServe} en mode administrateur. @@ -57,10 +53,4 @@ public class RunObserve extends ObserveRunner { new RunObserve(args).launch(); } - static { - //TODO Apply this modification in jaxx project - n("jaxx.common.latitude"); - } - - } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java @@ -445,7 +445,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> log.debug("init list for " + beanList.getBeanType()); Class dtoClass = getDtoClass(beanList); - + beanList.setBeanType(dtoClass); if (ReferentialDto.class.isAssignableFrom(dtoClass)) { prepareReferentialFilterableDoubleList(dtoClass, beanList); } else { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java @@ -317,9 +317,9 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab } private <R extends ReferentialDto> ReferentialReferenceSet<R> getReferentialReferenceSet(String propertyName) { - ImmutableMap<String, ReferentialReferenceSet<?>> referenceSet = this.referentialReferenceSetsByPropertyName; + ReferentialReferenceSet<?> referenceSet = this.referentialReferenceSetsByPropertyName.get(propertyName); Objects.requireNonNull(referenceSet, "Could not find referantialRefenceSet named " + propertyName); - return (ReferentialReferenceSet<R>) referenceSet.get(propertyName); + return (ReferentialReferenceSet<R>) referenceSet; } public <R extends DataDto> DataReferenceSet<R> getDataReferenceSet(String propertyName) { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx @@ -182,7 +182,7 @@ <JLabel id='currentDirectionLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='currentDirection' constructorParams='this' styleClass="float3"/> + <NumberEditor id='currentDirection' constructorParams='this' styleClass="int6"/> </cell> </row> <row> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx @@ -161,7 +161,7 @@ <JLabel id='meanLengthLabel'/> </cell> <cell weightx='1'> - <NumberEditor id='meanLength' constructorParams='this' styleClass="int6"/> + <NumberEditor id='meanLength' constructorParams='this' styleClass="float2"/> </cell> <cell anchor='east'> <JToolBar id='meanLengthComputedAction'> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java @@ -28,14 +28,17 @@ import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIModel; import fr.ird.observe.application.swing.ui.content.table.ObserveContentTableUI; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.seine.NonTargetLengthDto; import fr.ird.observe.services.dto.seine.NonTargetLengthHelper; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; - import java.util.Arrays; import java.util.Collection; import java.util.List; +import java.util.Optional; +import java.util.Set; /** * Created on 9/26/14. @@ -121,4 +124,14 @@ public class NonTargetSampleUIModel extends ContentTableUIModel<NonTargetSampleD this.defaultSizeMeasureType = defaultSizeMeasureType; firePropertyChange(PROPERTY_DEFAULT_SIZE_MEASURE_TYPE, oldValue, defaultSizeMeasureType); } + + @Override + public <R extends ReferentialDto> Optional<Set<ReferentialReference<R>>> tryToGetReferentialReferenceSet(String propertyName) { + ReferentialReferenceSet<R> referenceSet = (ReferentialReferenceSet) this.referentialReferenceSetsByPropertyName.get(propertyName); + Set<ReferentialReference<R>> references = null; + if (referenceSet != null) { + references = referenceSet.getReferences(); + } + return Optional.ofNullable(references); + } } ===================================== services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java +++ b/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java @@ -1584,19 +1584,19 @@ class ObserveDtoInitializer { @Override public void initActivityLonglineEncounterDto() { - FormRequestDefinition<EncounterDto> definition = flushData(formBuilder(EncounterDto.class) - .addKey(EncounterDto.PROPERTY_ENCOUNTER_TYPE, referenceSetDefinition(EncounterTypeDto.class)) - .addKey(EncounterDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class))); - formDefinitionBuilder.put(ActivityLonglineEncounterDto.class.getName(), definition); + flushData(formBuilder(EncounterDto.class) + .addKey(EncounterDto.PROPERTY_ENCOUNTER_TYPE, referenceSetDefinition(EncounterTypeDto.class)) + .addKey(EncounterDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)), + ActivityLonglineEncounterDto.class); } @Override public void initActivityLonglineSensorUsedDto() { - FormRequestDefinition<SensorUsedDto> definition = flushData(formBuilder(SensorUsedDto.class) - .addKey(SensorUsedDto.PROPERTY_SENSOR_TYPE, referenceSetDefinition(SensorTypeDto.class)) - .addKey(SensorUsedDto.PROPERTY_SENSOR_BRAND, referenceSetDefinition(SensorBrandDto.class)) - .addKey(SensorUsedDto.PROPERTY_SENSOR_DATA_FORMAT, referenceSetDefinition(SensorDataFormatDto.class))); - formDefinitionBuilder.put(ActivityLonglineSensorUsedDto.class.getName(), definition); + flushData(formBuilder(SensorUsedDto.class) + .addKey(SensorUsedDto.PROPERTY_SENSOR_TYPE, referenceSetDefinition(SensorTypeDto.class)) + .addKey(SensorUsedDto.PROPERTY_SENSOR_BRAND, referenceSetDefinition(SensorBrandDto.class)) + .addKey(SensorUsedDto.PROPERTY_SENSOR_DATA_FORMAT, referenceSetDefinition(SensorDataFormatDto.class)), + ActivityLonglineSensorUsedDto.class); } @Override @@ -1642,7 +1642,8 @@ class ObserveDtoInitializer { .addKey(CatchLonglineDto.PROPERTY_MATURITY_STATUS, referenceSetDefinition(MaturityStatusDto.class)) .addKey(SizeMeasureDto.PROPERTY_SIZE_MEASURE_TYPE, referenceSetDefinition(SizeMeasureTypeDto.class)) .addKey(WeightMeasureDto.PROPERTY_WEIGHT_MEASURE_TYPE, referenceSetDefinition(WeightMeasureTypeDto.class)) - .addKey(BranchlineDto.PROPERTY_BAIT_HAULING_STATUS, referenceSetDefinition(BaitHaulingStatusDto.class))); + .addKey(BranchlineDto.PROPERTY_BAIT_HAULING_STATUS, referenceSetDefinition(BaitHaulingStatusDto.class)), + SetLonglineCatchDto.class); } @Override @@ -1657,7 +1658,8 @@ class ObserveDtoInitializer { public void initGearUseFeaturesLonglineDto() { flushData(formBuilder(GearUseFeaturesLonglineDto.class) .addKey(GearUseFeaturesLonglineDto.PROPERTY_GEAR, referenceSetDefinition(GearDto.class)) - .addKey(GearUseFeaturesMeasurementLonglineDto.PROPERTY_GEAR_CARACTERISTIC, referenceSetDefinition(GearCaracteristicDto.class))); + .addKey(GearUseFeaturesMeasurementLonglineDto.PROPERTY_GEAR_CARACTERISTIC, referenceSetDefinition(GearCaracteristicDto.class)), + TripLonglineGearUseDto.class); } @Override @@ -1732,7 +1734,8 @@ class ObserveDtoInitializer { .addKey(TdrDto.PROPERTY_SENSOR_BRAND, referenceSetDefinition(SensorBrandDto.class)) .addKey(TdrDto.PROPERTY_ITEM_HORIZONTAL_POSITION, referenceSetDefinition(ItemHorizontalPositionDto.class)) .addKey(TdrDto.PROPERTY_ITEM_VERTICAL_POSITION, referenceSetDefinition(ItemVerticalPositionDto.class)) - .addKey(TdrDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class))); + .addKey(TdrDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)), + SetLonglineTdrDto.class); } @Override @@ -1827,7 +1830,8 @@ class ObserveDtoInitializer { public void initGearUseFeaturesSeineDto() { flushData(formBuilder(GearUseFeaturesSeineDto.class) .addKey(GearUseFeaturesSeineDto.PROPERTY_GEAR, referenceSetDefinition(GearDto.class)) - .addKey(GearUseFeaturesMeasurementSeineDto.PROPERTY_GEAR_CARACTERISTIC, referenceSetDefinition(GearCaracteristicDto.class))); + .addKey(GearUseFeaturesMeasurementSeineDto.PROPERTY_GEAR_CARACTERISTIC, referenceSetDefinition(GearCaracteristicDto.class)), + TripSeineGearUseDto.class); } @Override @@ -1835,7 +1839,8 @@ class ObserveDtoInitializer { flushData(formBuilder(NonTargetCatchDto.class) .addKey(NonTargetCatchDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)) .addKey(NonTargetCatchDto.PROPERTY_SPECIES_FATE, referenceSetDefinition(SpeciesFateDto.class)) - .addKey(NonTargetCatchDto.PROPERTY_REASON_FOR_DISCARD, referenceSetDefinition(ReasonForDiscardDto.class))); + .addKey(NonTargetCatchDto.PROPERTY_REASON_FOR_DISCARD, referenceSetDefinition(ReasonForDiscardDto.class)), + SetSeineNonTargetCatchDto.class); } @Override @@ -1843,7 +1848,8 @@ class ObserveDtoInitializer { flushData(formBuilder(NonTargetCatchReleaseDto.class) .addKey(NonTargetCatchReleaseDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)) .addKey(NonTargetCatchReleaseDto.PROPERTY_SEX, referenceSetDefinition(SexDto.class)) - .addKey(NonTargetCatchReleaseDto.PROPERTY_SPECIES_GROUP_RELEASE_MODE, referenceSetDefinition(SpeciesGroupReleaseModeDto.class))); + .addKey(NonTargetCatchReleaseDto.PROPERTY_SPECIES_GROUP_RELEASE_MODE, referenceSetDefinition(SpeciesGroupReleaseModeDto.class)), + SetSeineNonTargetCatchReleaseDto.class); } @Override @@ -1856,7 +1862,8 @@ class ObserveDtoInitializer { .addKey(NonTargetLengthDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)) .addKey(NonTargetLengthDto.PROPERTY_SPECIES_FATE, referenceSetDefinition(SpeciesFateDto.class)) .addKey(NonTargetLengthDto.PROPERTY_SEX, referenceSetDefinition(SexDto.class)) - .addKey(TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, referenceSetDefinition(SizeMeasureTypeDto.class))); + .addKey(TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, referenceSetDefinition(SizeMeasureTypeDto.class)), + NonTargetSampleDto.class); } @Override @@ -1867,13 +1874,15 @@ class ObserveDtoInitializer { public void initObjectObservedSpeciesDto() { flushData(formBuilder(ObjectObservedSpeciesDto.class) .addKey(ObjectObservedSpeciesDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)) - .addKey(ObjectObservedSpeciesDto.PROPERTY_SPECIES_STATUS, referenceSetDefinition(SpeciesStatusDto.class))); + .addKey(ObjectObservedSpeciesDto.PROPERTY_SPECIES_STATUS, referenceSetDefinition(SpeciesStatusDto.class)), + FloatingObjectObservedSpeciesDto.class); } @Override public void initObjectSchoolEstimateDto() { flushData(formBuilder(ObjectSchoolEstimateDto.class) - .addKey(ObjectObservedSpeciesDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class))); + .addKey(ObjectObservedSpeciesDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)), + FloatingObjectSchoolEstimateDto.class); } @Override @@ -1887,7 +1896,8 @@ class ObserveDtoInitializer { @Override public void initSchoolEstimateDto() { flushData(formBuilder(SchoolEstimateDto.class) - .addKey(SchoolEstimateDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class))); + .addKey(SchoolEstimateDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)), + SetSeineSchoolEstimateDto.class); } @Override @@ -1917,7 +1927,8 @@ class ObserveDtoInitializer { flushData(formBuilder(TargetCatchDto.class) .addKey(TargetCatchDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)) .addKey(TargetCatchDto.PROPERTY_REASON_FOR_DISCARD, referenceSetDefinition(ReasonForDiscardDto.class)) - .addKey(TargetCatchDto.PROPERTY_WEIGHT_CATEGORY, referenceSetDefinition(WeightCategoryDto.class))); + .addKey(TargetCatchDto.PROPERTY_WEIGHT_CATEGORY, referenceSetDefinition(WeightCategoryDto.class)), + SetSeineTargetCatchDto.class); } @Override @@ -1925,7 +1936,8 @@ class ObserveDtoInitializer { flushData(formBuilder(TargetLengthDto.class) .addKey(TargetLengthDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)) .addKey(TargetLengthDto.PROPERTY_SEX, referenceSetDefinition(SexDto.class)) - .addKey(TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, referenceSetDefinition(SizeMeasureTypeDto.class))); + .addKey(TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, referenceSetDefinition(SizeMeasureTypeDto.class)), + TargetSampleDto.class); } @Override @@ -1938,7 +1950,8 @@ class ObserveDtoInitializer { flushData(formBuilder(TransmittingBuoyDto.class) .addKey(TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION, referenceSetDefinition(TransmittingBuoyOperationDto.class)) .addKey(TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_TYPE, referenceSetDefinition(TransmittingBuoyTypeDto.class)) - .addKey(TransmittingBuoyDto.PROPERTY_COUNTRY, referenceSetDefinition(CountryDto.class))); + .addKey(TransmittingBuoyDto.PROPERTY_COUNTRY, referenceSetDefinition(CountryDto.class)), + FloatingObjectTransmittingBuoyDto.class); } @Override @@ -1977,10 +1990,12 @@ class ObserveDtoInitializer { } - private <D extends DataDto> FormRequestDefinition<D> flushData(FormRequestDefinition.Builder<D> form) { + private <D extends DataDto> void flushData(FormRequestDefinition.Builder<D> form, Class<?>... extraMapping) { FormRequestDefinition<D> build = form.build(); formDefinitionBuilder.put(build.getType().getName(), build); - return build; + for (Class<?> aClass : extraMapping) { + formDefinitionBuilder.put(aClass.getName(), build); + } } private <D extends ReferentialDto> void flushReferential(FormRequestDefinition.Builder<D> form) { ===================================== services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java ===================================== --- a/services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java +++ b/services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java @@ -22,7 +22,7 @@ public class FormRequestDefinitionProviderTest { provider.getDefinition(referentialType.getName()); } - Assert.assertEquals(92, provider.keys().size()); + Assert.assertEquals(105, provider.keys().size()); for (String referentialType : provider.keys()) { provider.getDefinition(referentialType); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/69b0281e783f4784df49d922c30… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/69b0281e783f4784df49d922c30… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Fix pom version
by Tony CHEMIT 18 Jul '17

18 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f3212497 by Tony Chemit at 2017-07-19T00:04:41+02:00 Fix pom version - - - - - 4 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java - pom.xml Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java @@ -103,15 +103,11 @@ public class ObserveMainUIInitializer { if (source == null || !source.isOpen()) { // no open data source - if (log.isDebugEnabled()) { - log.debug("No open Data source."); - } + log.debug("No open Data source."); return; } if (ui.getNavigation().isSelectionEmpty()) { - if (log.isDebugEnabled()) { - log.debug("No selection, show empty panel..."); - } + log.debug("No selection, show empty panel..."); boolean foundEmptySelection = false; for (Component component : ui.getContent().getComponents()) { @@ -225,9 +221,7 @@ public class ObserveMainUIInitializer { } } if (focusOnNavigation) { - if (log.isInfoEnabled()) { - log.info("Focus on navigation: " + focusOwner); - } + log.debug("Focus on navigation: " + focusOwner); } ContentUI<?, ?> previousSelectedContent = manager.getSelectedContentUI(); ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java @@ -126,9 +126,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U public void beforeInit(U ui) { this.ui = ui; prefix = "[" + ui.getClass().getSimpleName() + "] "; - if (log.isDebugEnabled()) { - log.debug("[" + this + "] for ui " + prefix); - } + log.debug("[" + this + "] Before init " + prefix); } public void afterInit(U ui) { @@ -198,9 +196,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } } - if (log.isDebugEnabled()) { - log.debug("previousUI is in edit mode"); - } + log.debug("previousUI is in edit mode"); boolean wasClosed = true; @@ -247,9 +243,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U t("observe.choice.continue"), t("observe.choice.cancel")}, 0); - if (log.isDebugEnabled()) { - log.debug("response : " + reponse); - } + log.debug("response : " + reponse); switch (reponse) { case JOptionPane.CLOSED_OPTION: case 1: @@ -340,9 +334,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U ValidationContext context = applicationContext.getValidationContext(); context.cleanCache(); - if (log.isDebugEnabled()) { - log.debug("ui " + ui.getClass()); - } + log.debug("Open ui " + ui.getClass()); // suppression des messages de validation removeAllMessages(ui); NavigationTree tree = getNavigationTree(); @@ -373,9 +365,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U treeHelper.reloadSelectedNode(false, true); NavigationTreeNodeSupport parentNode = treeHelper.getSelectedNode().getParent(); - if (log.isDebugEnabled()) { - log.debug("PARENT NODE = " + parentNode); - } + log.debug("PARENT NODE = " + parentNode); treeHelper.addUnsavedNode(parentNode, getBeanType()); } @@ -390,10 +380,8 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U SwingUtilities.invokeLater(() -> { mainUI.getNavigation().requestFocusInWindow(); - if (log.isInfoEnabled()) { - log.info("Focus old owner: " + focusOwner); - log.info("Focus new owner: " + mainUI.getFocusOwner()); - } + log.debug("Focus old owner: " + focusOwner); + log.debug("Focus new owner: " + mainUI.getFocusOwner()); }); } }); @@ -401,9 +389,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U FocusTraversalPolicy focusTraversalPolicy = ui.getFocusTraversalPolicy(); if (focusTraversalPolicy != null) { JComponent firstComponent = (JComponent) focusTraversalPolicy.getFirstComponent(ui); - if (log.isInfoEnabled()) { - log.info("Grab focus on first component: " + firstComponent); - } + log.debug("Grab focus on first component: " + firstComponent); UIHelper.askFocus(firstComponent); } } @@ -492,9 +478,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U // on quite de suite return; } - if (log.isInfoEnabled()) { - log.info(prefix + "Will restart edit " + getUi().getClass().getName()); - } + log.debug(prefix + "Will restart edit " + getUi().getClass().getName()); // on ne peut redemarrer une edition que si la donnee // est exactement une entites (pas possible sur une liste) @@ -531,9 +515,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U final boolean closeUI() { boolean b = checkEdit(ui); - if (log.isDebugEnabled()) { - log.debug("Can close " + ui.getClass() + " : " + b); - } + log.debug("Can close " + ui.getClass() + " : " + b); if (b) { closeSafeUI(); } @@ -609,9 +591,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U ImmutableMap.Builder<String, ReferentialReferenceSet<?>> modelReferentialReferenceSets = ImmutableMap.builder(); - if (log.isInfoEnabled()) { - log.info("Update referential reference sets for: " + requestName); - } + log.info("Update referential reference sets for: " + requestName); // mettre à jour le cache de référentiel ImmutableMap<Class<?>, ReferentialReferenceSet<?>> referentialReferenceSetsByType = getDataSource().updateReferentialReferenceSetsCache(requestName); @@ -640,14 +620,10 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U protected <D extends ReferentialDto> Collection<ReferentialReference<D>> filterReferentialReferences(Class<D> dtoType, String propertyName, LinkedList<ReferentialReference<D>> incomingReferences) { - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), original size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } + log.debug(String.format("Filter referential references (type %s - property %s), original size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); // by default always remove obsolete references List<ReferentialReference<D>> referentialReferences = ReferentialReferences.filterEnabled(incomingReferences); - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), without diabled size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } + log.debug(String.format("Filter referential references (type %s - property %s), without diabled size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); return referentialReferences; } @@ -811,9 +787,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } AbstractUIAction action = (AbstractUIAction) actionMap.get(actionId); - if (log.isDebugEnabled()) { - log.debug("update common action " + actionId); - } + log.debug("update common action " + actionId); action.updateAction(ui, button); } @@ -968,9 +942,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U if (!"referentialListHeader".equals(propertyName) && (BooleanUtils.isTrue(noLoad) || getModel().getForm() == null)) { - if (log.isInfoEnabled()) { - log.info(String.format("Skip loading of BeanListHeader [%s-%s] (listNoLoad property found or form is null)", dtoClass.getSimpleName(), propertyName)); - } + log.debug(String.format("Skip loading of BeanListHeader [%s-%s] (listNoLoad property found or form is null)", dtoClass.getSimpleName(), propertyName)); data = Collections.emptyList(); } else { @@ -1000,9 +972,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U if (BooleanUtils.isTrue(noLoad) || getModel().getForm() == null) { - if (log.isInfoEnabled()) { - log.info(String.format("Skip loading of BeanListHeader [%s-%s] (listNoLoad property found or form is null)", dtoClass.getSimpleName(), propertyName)); - } + log.debug(String.format("Skip loading of BeanListHeader [%s-%s] (listNoLoad property found or form is null)", dtoClass.getSimpleName(), propertyName)); data = Collections.emptyList(); } else { @@ -1031,9 +1001,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U if (BooleanUtils.isNotTrue(forceLoadComboBox) && (BooleanUtils.isTrue(noLoad) || getModel().getForm() == null)) { - if (log.isInfoEnabled()) { - log.info(String.format("Skip loading of comboBox [%s-%s] (listNoLoad property found or form is null)", dtoClass.getSimpleName(), propertyName)); - } + log.debug(String.format("Skip loading of comboBox [%s-%s] (listNoLoad property found or form is null)", dtoClass.getSimpleName(), propertyName)); data = Collections.emptyList(); } else { @@ -1053,9 +1021,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } - if (log.isInfoEnabled()) { - log.info(String.format("comboBox [%s-%s] : %d", dtoClass.getSimpleName(), propertyName, data.size())); - } + log.debug(String.format("comboBox [%s-%s] : %d", dtoClass.getSimpleName(), propertyName, data.size())); comboBox.setData(data); @@ -1070,9 +1036,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U if (BooleanUtils.isTrue(noLoad) || getModel().getForm() == null) { - if (log.isInfoEnabled()) { - log.info(String.format("Skip loading of comboBox [%s-%s] (listNoLoad property found or form is null)", dtoClass.getSimpleName(), propertyName)); - } + log.debug(String.format("Skip loading of comboBox [%s-%s] (listNoLoad property found or form is null)", dtoClass.getSimpleName(), propertyName)); data = Collections.emptyList(); } else { @@ -1090,9 +1054,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } - if (log.isInfoEnabled()) { - log.info(String.format("entity comboBox [%s-%s] : %d", dtoClass.getSimpleName(), propertyName, data.size())); - } + log.debug(String.format("entity comboBox [%s-%s] : %d", dtoClass.getSimpleName(), propertyName, data.size())); comboBox.setData(data); } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java @@ -119,7 +119,7 @@ import static org.nuiton.i18n.I18n.t; /** * To initialize ui. - * + * <p> * Created on 9/26/14. * * @author Tony Chemit - dev(a)tchemit.fr @@ -207,10 +207,6 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> public void initUI() { - if (log.isDebugEnabled()) { - log.debug("ui " + getClass()); - } - ObserveActionMap actionMap = ObserveSwingApplicationContext.get().getActionMap(); InputMap inputMap = ObserveSwingApplicationContext.get().getMainUI().getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); // initialisation des éditeurs @@ -428,9 +424,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> beanList.setI18nPrefix("observe.common."); - if (log.isInfoEnabled()) { - log.info("init list for " + beanList.getBeanType()); - } + log.debug("init list for " + beanList.getBeanType()); Class dtoClass = getDtoClass(beanList); @@ -448,9 +442,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> beanList.getAddButton().setFocusable(false); beanList.getRemoveButton().setFocusable(false); - if (log.isInfoEnabled()) { - log.info("init list for " + beanList.getBeanType()); - } + log.debug("init list for " + beanList.getBeanType()); Class dtoClass = getDtoClass(beanList); @@ -463,9 +455,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> } protected void init(TimeEditor editor) { - if (log.isDebugEnabled()) { - log.debug("init time editor " + editor.getName()); - } + log.debug("init time editor " + editor.getName()); editor.init(); if (isAutoSelectOnFocus(editor)) { @@ -476,9 +466,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> } protected void init(DateTimeEditor editor) { - if (log.isDebugEnabled()) { - log.debug("init date time editor " + editor.getName()); - } + log.debug("init date time editor " + editor.getName()); editor.init(); editor.getSliderHidor().setFocusable(false); if (isAutoSelectOnFocus(editor)) { @@ -500,9 +488,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> Object oldValue = UIHelper.getProperty(editor.getModel().getBean(), editor.getModel().getPropertyDayDate()); if (!Objects.equals(oldValue, newDate)) { editor.getDayDateEditor().commitEdit(); - if (log.isInfoEnabled()) { - log.info("quit date editor, commit value: " + source.getValue()); - } + log.debug("quit date editor, commit value: " + source.getValue()); } } catch (ParseException e1) { // l'édition est valide donc pas de problème ici @@ -520,9 +506,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> } protected void init(CoordinatesEditor editor) { - if (log.isDebugEnabled()) { - log.debug("init coordinates editor " + editor.getName()); - } + log.debug("init coordinates editor " + editor.getName()); editor.setFormat(ObserveSwingApplicationContext.get().getConfig().getCoordinateFormat()); editor.init(); editor.getDmdFormat().setFocusable(false); @@ -614,9 +598,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> } protected void init(BooleanEditor editor) { - if (log.isDebugEnabled()) { - log.debug("init boolean editor " + editor.getName()); - } + log.debug("init boolean editor " + editor.getName()); final String propertyName = (String) editor.getClientProperty(CLIENT_PROPERTY_PROPERTY_NAME); if (propertyName != null) { editor.addItemListener(event -> { @@ -647,9 +629,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> } protected void init(JCheckBox editor) { - if (log.isDebugEnabled()) { - log.debug("init simple boolean editor " + editor.getName()); - } + log.debug("init simple boolean editor " + editor.getName()); final String propertyName = (String) editor.getClientProperty(CLIENT_PROPERTY_PROPERTY_NAME); if (propertyName != null) { editor.addItemListener(event -> { @@ -661,9 +641,8 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> protected void init(JXDatePicker picker) { - if (log.isDebugEnabled()) { - log.debug("init JXDatePicker editor" + picker.getName()); - }picker.setLocale(ObserveSwingApplicationContext.get().getConfig().getLocale()); + log.debug("init JXDatePicker editor" + picker.getName()); + picker.setLocale(ObserveSwingApplicationContext.get().getConfig().getLocale()); JFormattedTextField editor = picker.getEditor(); editor.setEditable(true); JXMonthView monthView = new JXMonthView(); @@ -695,9 +674,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> if (source.isEditValid()) { try { picker.commitEdit(); - if (log.isInfoEnabled()) { - log.info("quit date editor, commit value: " + source.getValue()); - } + log.debug("quit date editor, commit value: " + source.getValue()); } catch (ParseException e1) { // l'édition est valide donc pas de problème ici } @@ -708,9 +685,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> } protected <B extends Enum<B>> void init(EnumEditor<B> editor) { - if (log.isDebugEnabled()) { - log.debug("init enumEditor editor " + editor.getName()); - } + log.debug("init enumEditor editor " + editor.getName()); ImmutableMap.Builder<B, String> labelsBuilder = ImmutableMap.builder(); for (B e : EnumSet.allOf(editor.getType())) { String label = I18nEnumHelper.getLabel(e); @@ -748,9 +723,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> protected <D extends DataDto> void prepareDataFilterableDoubleList(Class<D> dtoClass, FilterableDoubleList<DataReference<D>> list) { DataReferenceDecorator<D> decorator = decoratorService.getDataReferenceDecorator(dtoClass); - if (log.isDebugEnabled()) { - log.debug("Will use decorator " + decorator); - } + log.debug("Will use decorator " + decorator); String entityLabel = t(ObserveI18nDecoratorHelper.getTypeI18nKey(dtoClass)); list.getPopupSortLabel().setText(t("observe.content.type.data", entityLabel)); @@ -777,9 +750,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> protected <D extends ReferentialDto> void prepareReferentialFilterableDoubleList(Class<D> dtoClass, FilterableDoubleList<ReferentialReference<D>> list) { ReferentialReferenceDecorator<D> decorator = decoratorService.getReferentialReferenceDecorator(dtoClass); - if (log.isDebugEnabled()) { - log.debug("Will use decorator " + decorator); - } + log.debug("Will use decorator " + decorator); String entityLabel = t(ObserveI18nDecoratorHelper.getTypeI18nKey(dtoClass)); list.getPopupSortLabel().setText(t("observe.content.type.referential", entityLabel)); @@ -806,9 +777,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> protected <D extends DataDto> void prepareDataEntityList(Class<D> dtoClass, BeanListHeader<DataReference<D>> list) { DataReferenceDecorator<D> decorator = decoratorService.getDataReferenceDecorator(dtoClass); - if (log.isDebugEnabled()) { - log.debug("Will use decorator " + decorator); - } + log.debug("Will use decorator " + decorator); String entityLabel = t(ObserveI18nDecoratorHelper.getTypeI18nKey(dtoClass)); list.setPopupTitleText(t("observe.content.type.data", entityLabel)); @@ -833,9 +802,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> protected <D extends ReferentialDto> void prepareReferentialEntityList(Class<D> dtoClass, BeanListHeader<ReferentialReference<D>> list) { ReferentialReferenceDecorator<D> decorator = decoratorService.getReferentialReferenceDecorator(dtoClass); - if (log.isDebugEnabled()) { - log.debug("Will use decorator " + decorator); - } + log.debug("Will use decorator " + decorator); String entityLabel = t(ObserveI18nDecoratorHelper.getTypeI18nKey(dtoClass)); list.setPopupTitleText(t("observe.content.type.referential", entityLabel)); @@ -869,9 +836,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> ListCellRenderer<DataReference<D>> toolTipRenderer = new ComboBoxListCellRenderer<>(combobox.getRenderer()); combobox.setRenderer(toolTipRenderer); - if (log.isDebugEnabled()) { - log.debug("combo list [" + dtoClass.getName() + "] : " + comboBox.getData().size()); - } + log.debug("combo list [" + dtoClass.getName() + "] : " + comboBox.getData().size()); } @@ -894,9 +859,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> ListCellRenderer<ReferentialReference<D>> toolTipRenderer = new ComboBoxListCellRenderer<>(combobox.getRenderer()); combobox.setRenderer(toolTipRenderer); - if (log.isDebugEnabled()) { - log.debug("combo list [" + dtoClass.getName() + "] : " + comboBox.getData().size()); - } + log.debug("combo list [" + dtoClass.getName() + "] : " + comboBox.getData().size()); } ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>15-SNAPSHOT</version> + <version>15</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f3212497b06c7b4b9ab8c922f8d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f3212497b06c7b4b9ab8c922f8d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Update some libraries
by Tony CHEMIT 18 Jul '17

18 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 80fcfee9 by Tony Chemit at 2017-07-18T16:04:14+02:00 Update some libraries - - - - - caf7b294 by Tony Chemit at 2017-07-18T23:53:38+02:00 Review design of ReferenceSetDefinition and FormRequestDefinition (Closes #793) - - - - - 30 changed files: - CONTRIBUTING.md - application-swing/pom.xml - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java - application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java - application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceRestApi.java - application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceRestApi.java - application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDtoInjector.java - application-web/src/test/java/fr/ird/observe/application/web/controller/v1/ClassMappingRestApiTest.java - pom.xml - services-binder/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java - services-binder/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java - services-binder/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java - services-rest/pom.xml - services-rest/src/main/java/fr/ird/observe/services/rest/DataSourceServiceRestClient.java - + services-rest/src/main/java/fr/ird/observe/services/rest/ObserveRequestBuilder.java - + services-rest/src/main/java/fr/ird/observe/services/rest/ObserveRequestBuilderFactory.java - services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceFactoryRest.java - services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestClientContext.java - services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestClientSupport.java - services-rest/src/test/java/fr/ird/observe/services/rest/ClassMappingRestClientTest.java - services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferenceValuesSetServiceRestTest.java - services-topia/src/main/java/fr/ird/observe/services/topia/ObserveJdbcHelper.java - services-topia/src/main/java/fr/ird/observe/services/topia/ObserveSecurityHelper.java - services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaApplicationContextFactory.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/da4d7785bb46b080f35ea2956e… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/da4d7785bb46b080f35ea2956e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Add maven best config
by Tony CHEMIT 18 Jul '17

18 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: da4d7785 by Tony Chemit at 2017-07-18T16:00:24+02:00 Add maven best config - - - - - 2 changed files: - + .mvn/jvm.config - + .mvn/maven.config Changes: ===================================== .mvn/jvm.config ===================================== --- /dev/null +++ b/.mvn/jvm.config @@ -0,0 +1 @@ +-Xmx4096m \ No newline at end of file ===================================== .mvn/maven.config ===================================== --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1 @@ +-Dmaven.artifact.threads=10 -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.http.ssl.ignore.validity.dates=true \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/da4d7785bb46b080f35ea2956eb… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/da4d7785bb46b080f35ea2956eb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Correction validation sur WeightCategory (le code n'est pas unique)
by Tony CHEMIT 16 Jul '17

16 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a604a5de by Tony CHEMIT at 2017-07-16T22:34:27+02:00 Correction validation sur WeightCategory (le code n'est pas unique) - - - - - 6414b4df by Tony CHEMIT at 2017-07-16T22:34:51+02:00 Correction du validateur de code (on s'arrête à la première erreur rencontrée) - - - - - c56a2716 by Tony CHEMIT at 2017-07-16T23:13:48+02:00 Remplacer le client REST proxy par des services générés (See #776) - - - - - 30 changed files: - − application-swing-configuration/src/main/resources/validators.xml - application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/ReferentialCodeValidator.java - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-update-error-validation.xml - application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java - application-web/pom.xml - application-web/src/main/filtered-resources/mapping - application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java - application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java - application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java - application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java - application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java → application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceRestApi.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/LastUpdateDateServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveAuthenticatedServiceControllerSupport.java - application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveServiceControllerSupport.java → application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveServiceRestApiSupport.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java - + application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceRestApi.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/consolidate/ConsolidateDataServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/report/ReportServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/ng/ReferentialSynchronizeServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/validate/ValidateServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/NavigationServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/TripManagementServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLongLineEncounterServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLongLineSensorUsedServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLonglineServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/BranchlineServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineCatchServiceController.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f91e98c962ba5982fafe7e0248… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f91e98c962ba5982fafe7e0248… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] create ftl if not exists (for tets purpose only)
by Tony CHEMIT 12 Jul '17

12 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f91e98c9 by Tony CHEMIT at 2017-07-12T21:58:31+02:00 create ftl if not exists (for tets purpose only) - - - - - 1 changed file: - application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java Changes: ===================================== application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java ===================================== --- a/application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java +++ b/application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java @@ -72,6 +72,8 @@ public class LonglineDetailCompositionValidatorServiceTest { config.initConfig(new ObserveResourceManager().getResource(ObserveResourceManager.Resource.application)); + config.getTemplatesDirectory().mkdirs(); + ObserveSwingApplicationContext applicationContext = new ObserveSwingApplicationContext(config); SwingValidator<SectionDto> sectionValidator = new SwingValidator<>(SectionDto.class, "ui-update-table", NuitonValidatorScope.values()); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f91e98c962ba5982fafe7e02483… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f91e98c962ba5982fafe7e02483… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajout d'un traducteur dans l'application (See #788) (consolidation intégrité…
by Tony CHEMIT 12 Jul '17

12 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8bc23333 by Tony CHEMIT at 2017-07-12T14:04:51+02:00 Ajout d'un traducteur dans l'application (See #788) (consolidation intégrité bundles + intégration des modifications dans l'application) - - - - - 6 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/TranslateAction.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - pom.xml Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java @@ -380,7 +380,7 @@ public abstract class ObserveRunner extends ApplicationRunner { return config; } - private void initUserDirectories(ObserveSwingApplicationConfig config) throws IOException { + private void initUserDirectories(ObserveSwingApplicationConfig config) throws IOException { // 1 - user data directory @@ -491,6 +491,9 @@ public abstract class ObserveRunner extends ApplicationRunner { @Override protected void createUserI18nLayout(File directory) throws Exception { + if (config.getI18nDefinitionFile().exists()) { + return; + } super.createUserI18nLayout(directory); // add also a archive with all i18n stuff (says i18n bundle + templates) ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/TranslateAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/TranslateAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/TranslateAction.java @@ -26,8 +26,12 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ObserveSwingTechnicalException; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.ObserveUICallback; +import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import java.awt.event.ActionEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; import java.io.File; import java.io.IOException; import java.net.URL; @@ -66,12 +70,29 @@ public class TranslateAction extends AbstractUIAction { ObserveSwingApplicationConfig config = ObserveSwingApplicationContext.get().getConfig(); File i18nDefinitionFile = config.getI18nDefinitionFile(); -// URL bundles = Project.class.getClassLoader().getResource("META-INF/observe-i18n-definition.properties"); try { URL bundles = i18nDefinitionFile.toURI().toURL(); Objects.requireNonNull(bundles); - ProjectUI projectUI = new ProjectUI(getMainUI(), new Project(bundles)); + Project model = new Project(bundles); + ProjectUI projectUI = new ProjectUI(getMainUI(), model); projectUI.toggleFilter(); + + projectUI.addWindowListener(new WindowAdapter() { + @Override + public void windowClosed(WindowEvent e) { + if (model.getLastExport() != null) { + File i18nDefinitionFileParentFile = i18nDefinitionFile.getParentFile(); + log.info(String.format("Found existing i18n export, will merge it to user i18n data (%s).", i18nDefinitionFileParentFile)); + try { + model.mergeExport(i18nDefinitionFileParentFile); + } catch (IOException e1) { + throw new ObserveSwingTechnicalException("Can't merge i18n export", e1); + } + UIHelper.displayInfo(t("observe.title.reload.i18n"), t("observe.message.reload.i18n")); + ObserveUICallback.application.run(); + } + } + }); } catch (IOException e) { throw new ObserveSwingTechnicalException("can't open i18n editor", e); } ===================================== application-swing/src/main/resources/i18n/application-swing_en_GB.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -417,6 +417,7 @@ observe.common.length.computed.tip=Length was computed observe.common.length.inf=Length (cm inf.) observe.common.length.observed.tip=Length was observed observe.common.length2=Length (cm) +observe.common.lengthMeasureType=Length measure type observe.common.libelles=Labels observe.common.lowerValueUpperValue=Bounds min-max observe.common.mammalsObservation=Mammals observations @@ -1487,6 +1488,7 @@ observe.message.quit.valid.edit=Data are modified and valid\! observe.message.referentiel.editable=Referential is editable. observe.message.referentiel.home=< Referential > observe.message.referentiel.no.editable=You are not allowed to edit referential. +observe.message.reload.i18n=You have modified i18n, application must be restart. observe.message.select.report=Select a report observe.message.server.info=Local database %1$s is ready in server mode. observe.message.show.usage.for.delete=Referential %1$s "%2$s" can be deleted if you choose a replacement. @@ -1703,6 +1705,7 @@ observe.title.load.remote.db=Load remote database observe.title.need.confirm=Need a confirmation... observe.title.need.confirm.to.desactivate.referentiel=Need a confirmation to disable a referentiel data... observe.title.no.local.db.found=No local database found. +observe.title.reload.i18n=Application need to restart... observe.title.save.localDB=Save local storage to a file observe.title.save.remoteDB=Save remote database to a file observe.title.show.usage=Show usages ===================================== application-swing/src/main/resources/i18n/application-swing_es_ES.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -417,6 +417,7 @@ observe.common.length.computed.tip=Longitud calculada observe.common.length.inf=Longitud (cm inf.) observe.common.length.observed.tip=Longitud observada observe.common.length2=Longitud eslora total (cm) \#TODO +observe.common.lengthMeasureType=Type de mensuration \#TODO observe.common.libelles=Textos observe.common.lowerValueUpperValue=Bornes min-max observe.common.mammalsObservation=Mamiferos @@ -498,8 +499,6 @@ observe.config.category.technical=Técnico observe.config.category.technical.description=Información técnica observe.config.category.ui=GUI observe.config.category.ui.description=Configuración GUI -observe.content.action.activity=Crear una nueva actividad -observe.content.action.activity.tip=Crear una nueva actividad para la ruta actual observe.content.action.closeAndCreate=Cerrar y crear observe.content.action.closeAndCreate.activity=Actividad siguiente observe.content.action.closeAndCreate.activity.tip=Cierre de la actividad actual y creación de una nueva @@ -1489,6 +1488,7 @@ observe.message.quit.valid.edit=¡Los datos han sido modificados y son válidos\ observe.message.referentiel.editable=El referencial es editable. observe.message.referentiel.home=< Referencial > observe.message.referentiel.no.editable=No tiene permisos para editar el referencial. +observe.message.reload.i18n=Vous avez modifié des traductions, le redémarrage de l'application est nécessaire pour les prendre en compte. \#TODO observe.message.select.report=Seleccione informe observe.message.server.info=Información modo servidor observe.message.show.usage.for.delete=El referencial %1$s "%2$s" no se puede eliminar sin hacer una sustitución antes. @@ -1705,6 +1705,7 @@ observe.title.load.remote.db=Cargando una base remota observe.title.need.confirm=Una confirmación se necesita... observe.title.need.confirm.to.desactivate.referentiel=Una confirmación se necesita para désactivar un referencial... observe.title.no.local.db.found=Ninguna base local fue encontrada +observe.title.reload.i18n=Rechargement de l'application nécessaire... \#TODO observe.title.save.localDB=Guardar la base local en un archivo observe.title.save.remoteDB=Guardar la base remota en un archivo observe.title.show.usage=Listas de las utilizaciones de un referencial... ===================================== application-swing/src/main/resources/i18n/application-swing_fr_FR.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -17,7 +17,6 @@ observe.action.auto.copy.to.clipboard.tip=Mettre Ã jour automatiquement le cont observe.action.back.to.list=Retour Ã la liste observe.action.back.to.list.tip=Retour Ã la liste des donnÃ©es observe.action.cancel=Annuler -observe.action.cancel.create.tip=Annuler la crÃ©ation de l'objet observe.action.change.storage=Changer la source de donnÃ©es observe.action.change.storage.tip=Pour changer la source de donnÃ©es de l'application observe.action.choose.db.dump=Choisir la sauvegarde @@ -68,9 +67,6 @@ observe.action.copyFloatingObjectPartToLeft.tip=Recopier les valeurs du dÃ©part observe.action.copyFloatingObjectPartToRight=Recopier les valeurs de l'arrivÃ©e vers de dÃ©part observe.action.copyFloatingObjectPartToRight.tip=Recopier les valeurs de l'arrivÃ©e vers de dÃ©part observe.action.create=CrÃ©er -observe.action.db.locale.es.tip=Changer la langue du rÃ©fÃ©rentiel en espagnol -observe.action.db.locale.fr.tip=Changer la langue du rÃ©fÃ©rentiel en franÃ§ais -observe.action.db.locale.uk.tip=Changer la langue du rÃ©fÃ©rentiel en anglais observe.action.delete=Supprimer observe.action.delete.activity.tip=Supprimer l'activitÃ© observe.action.delete.entry.tip=Supprimer l'entrÃ©e en cours d'Ã©dition @@ -117,7 +113,6 @@ observe.action.new.entry.tip=CrÃ©er une nouvelle entrÃ©e observe.action.open.screen=Ouverture de l'Ã©cran <%1$s> observe.action.quit=Quitter observe.action.quit.tip=Quitter le gestionnaire -observe.action.quitHelp.tip=Quitter l'Ã©cran d'aide observe.action.reload.application=RedÃ©marrer l'application observe.action.reload.storage=Recharger la source de donnÃ©es observe.action.reload.storage.tip=Ferme et rouvre la source de donnÃ©es @@ -433,7 +428,6 @@ observe.common.meanLengthComputed.observed.tip=La taille moyenne a Ã©tÃ© observÃ observe.common.meanValues=Valeurs moyennes observe.common.meanWeightComputed.computed.tip=Le poids moyen a Ã©tÃ© calculÃ© (%s) observe.common.meanWeightComputed.observed.tip=Le poids moyen a Ã©tÃ© observÃ© -observe.common.measureType=Type de mensuration observe.common.minLength=Taille minimum (en cm) observe.common.minLengthMax=Taille min-max (en cm) observe.common.minWeight=Poids minimum (en Kg) @@ -1494,6 +1488,7 @@ observe.message.quit.valid.edit=Les donnÃ©es ont Ã©tÃ© modifiÃ©es et sont valide observe.message.referentiel.editable=Le rÃ©fÃ©rentiel est Ã©ditable. observe.message.referentiel.home=< RÃ©fÃ©rentiel > observe.message.referentiel.no.editable=Vous n'Ãªtes pas autorisÃ© Ã Ã©diter le rÃ©fÃ©rentiel. +observe.message.reload.i18n=Vous avez modifiÃ© des traductions, le redÃ©marrage de l'application est nÃ©cessaire pour les prendre en compte. observe.message.select.report=Choisissez une requÃªteÂ observe.message.server.info=La base locale %1$s est dÃ©marrÃ©e en mode serveur. observe.message.show.usage.for.delete=Le rÃ©fÃ©rentiel %1$s "%2$s" ne peut pas Ãªtre supprimÃ© sans effectuer au prÃ©alable un remplacement. @@ -1710,6 +1705,7 @@ observe.title.load.remote.db=Chargement d'une base distante observe.title.need.confirm=Une confirmation de votre part est requise... observe.title.need.confirm.to.desactivate.referentiel=Une confirmation de votre part est requise pour dÃ©sactiver un rÃ©fÃ©rentiel... observe.title.no.local.db.found=Aucune base locale trouvÃ©e +observe.title.reload.i18n=Rechargement de l'application nÃ©cessaire... observe.title.save.localDB=Sauver la base locale vers une fichier observe.title.save.remoteDB=Sauver la base distante vers un fichier observe.title.show.usage=Listes des utilisations d'un rÃ©fÃ©rentiel... ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ <processorPluginVersion>1.3</processorPluginVersion> <jaxxVersion>3.0-alpha-8-SNAPSHOT</jaxxVersion> - <nuitonI18nVersion>4.0-alpha-2</nuitonI18nVersion> + <nuitonI18nVersion>4.0-alpha-3-SNAPSHOT</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8bc23333a1d7e6f368f2bd88ff8… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8bc23333a1d7e6f368f2bd88ff8… You're receiving this email because of your account on gitlab.com.

1 0