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

[Git][ultreiaio/ird-observe][develop] Meilleure packaging des refs commons + début de correction de #763 (pour l'écran espèce)
by Tony CHEMIT 30 Mar '17

30 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4371d8ee by Tony CHEMIT at 2017-03-30T13:58:51+02:00 Meilleure packaging des refs commons + début de correction de #763 (pour l'écran espèce) - - - - - 30 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveFocusManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/CountryUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jcss → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/CountryUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/CountryUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/CountryUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/FpaZoneUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jcss → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/FpaZoneUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/FpaZoneUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/FpaZoneUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearCaracteristicTypeUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearCaracteristicTypeUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearCaracteristicTypeUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearCaracteristicUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jcss → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearCaracteristicUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearCaracteristicUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearCaracteristicUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jcss → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/HarbourUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jcss → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/HarbourUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/HarbourUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/HarbourUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/LengthLengthParameterUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jcss → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/LengthLengthParameterUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/LengthLengthParameterUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/LengthLengthParameterUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/LengthWeightParameterUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/LengthWeightParameterUI.jcss The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4371d8ee46b240e3a270c65ba91…

1 0

[Git][ultreiaio/ird-observe][develop] Sur les doubles listes les boutons du mileu n'ont plus d'icones (See #761)
by Tony CHEMIT 30 Mar '17

30 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fa0332bd by Tony CHEMIT at 2017-03-30T13:34:06+02:00 Sur les doubles listes les boutons du mileu n'ont plus d'icones (See #761) - - - - - 1 changed file: - application-swing/src/main/resources/observe-ui.properties Changes: ===================================== application-swing/src/main/resources/observe-ui.properties ===================================== --- a/application-swing/src/main/resources/observe-ui.properties +++ b/application-swing/src/main/resources/observe-ui.properties @@ -81,6 +81,13 @@ icon.action.add=action-add.png icon.action.bean-sort=action-bean-sort.png icon.action.bean-sort-up=action-bean-sort-up.png icon.action.bean-sort-down=action-bean-sort-down.png +icon.action.doublelist-sort=action-doublelist-sort.png +icon.action.doublelist-up=action-doublelist-up.png +icon.action.doublelist-down=action-doublelist-down.png +icon.action.doublelist-sort-up=action-doublelist-sort-up.png +icon.action.doublelist-sort-down=action-doublelist-sort-down.png +icon.action.doublelist-unselect=action-doublelist-unselect.png +icon.action.doublelist-select=action-doublelist-select.png icon.action.config-quit=action-config-quit.png icon.action.config-save=action-config-save.png icon.action.config-reset=action-config-reset.png View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fa0332bd156979a9f15ffa5be7c…

1 0

[Git][ultreiaio/ird-observe][develop] Revue des raccourcis claviers (on supprime les raccourcis qui font doublon avec…
by Tony CHEMIT 30 Mar '17

30 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d85bab86 by Tony CHEMIT at 2017-03-30T13:13:51+02:00 Revue des raccourcis claviers (on supprime les raccourcis qui font doublon avec les globaux) (See #760) - - - - - 30 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/AbstractObserveAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/AbstractUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AbstractContentUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivityLonglineSetUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineSetUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/BackToReferentialListUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseAndCreateUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateNewReferentialUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteDataUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteReferenceUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteTableEntryUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialFromListUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoDownUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTabUIActionSupport.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoUpUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivitySeinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveRoutesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripLonglinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripSeinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ReOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetEditUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveEditUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d85bab860de249cc68cd02dc942…

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Squash services-configuration modules
by Tony CHEMIT 30 Mar '17

30 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f0d6ecb3 by Tony CHEMIT at 2017-03-30T11:14:28+02:00 Squash services-configuration modules - - - - - 91d9cc3b by Tony CHEMIT at 2017-03-30T11:15:46+02:00 update license headers - - - - - 30 changed files: - application-swing-configuration/src/main/resources/log4j.properties - application-swing-validation/src/main/java/validators/AbstractSpeciesFieldDtoValidator.java - application-swing-validation/src/main/java/validators/ActivityFinDeVeilleExistsDtoValidator.java - application-swing-validation/src/main/java/validators/ActivitySimpleSpeedDtoValidator.java - application-swing-validation/src/main/java/validators/ActivitySpeedDtoValidator.java - application-swing-validation/src/main/java/validators/CollectionUniqueKeyDtoValidator.java - application-swing-validation/src/main/java/validators/CoordinateLatitudeDtoFieldValidator.java - application-swing-validation/src/main/java/validators/CoordinateLongitudeDtoFieldValidator.java - application-swing-validation/src/main/java/validators/ObserveCollectionUniqueKeyDtoValidator.java - application-swing-validation/src/main/java/validators/OpenableDtoFieldValidator.java - application-swing-validation/src/main/java/validators/QuadrantFieldDtoValidator.java - application-swing-validation/src/main/java/validators/SetLonglineUniqueHomeIdDtoValidator.java - application-swing-validation/src/main/java/validators/SetLonglineUniqueNumberDtoValidator.java - application-swing-validation/src/main/java/validators/SpeciesLengthFieldDtoValidator.java - application-swing-validation/src/main/java/validators/SpeciesWeightFieldDtoValidator.java - application-swing/pom.xml - application-swing/src/main/resources/ftl/initStorage_en.ftl - application-swing/src/main/resources/ftl/initStorage_es.ftl - application-swing/src/main/resources/ftl/initStorage_fr.ftl - application-web/pom.xml - pom.xml - services-binder/src/test/resources/log4j.properties - − services-configuration-rest/LICENSE.txt - − services-configuration-rest/README.md - − services-configuration-rest/pom.xml - − services-configuration-topia/LICENSE.txt - − services-configuration-topia/README.md - − services-configuration-topia/pom.xml - − services-configuration/LICENSE.txt - − services-configuration/README.md The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/fdd698f79b9a0108c59f2c2fd1…

1 0

[Git][ultreiaio/ird-observe][develop] Squash validators and validation modules
by Tony CHEMIT 30 Mar '17

30 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fdd698f7 by Tony CHEMIT at 2017-03-30T10:55:51+02:00 Squash validators and validation modules - - - - - 8 changed files: - application-swing-configuration/pom.xml - application-swing-validation/pom.xml - application-web-configuration/pom.xml - services-runner/pom.xml - services-validation/pom.xml - toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java - toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorMojoSupport.java - toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorsDescriptorMojo.java Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -48,13 +48,13 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-validators</artifactId> + <artifactId>services-validation</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>application-swing-validators</artifactId> + <artifactId>application-swing-validation</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -126,6 +126,24 @@ <plugins> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <executions> + <execution> + <id>compile-generated-sources</id> + <goals> + <goal>compile</goal> + </goals> + <phase>process-classes</phase> + <configuration> + <includes> + <include>**/I18nValidatorHelper.java</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <groupId>${project.groupId}</groupId> <artifactId>toolbox-maven-plugin</artifactId> <version>${project.version}</version> @@ -144,7 +162,6 @@ </execution> <execution> <id>generate-validators-descriptor</id> - <phase>generate-sources</phase> <goals> <goal>generate-validators-descriptor</goal> </goals> @@ -156,11 +173,6 @@ <artifactId>services</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>application-swing-validators</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> </plugin> @@ -173,6 +185,7 @@ <goals> <goal>parserJava</goal> </goals> + <phase>process-classes</phase> <configuration> <entries> <entry> @@ -187,6 +200,7 @@ <goals> <goal>parserValidation</goal> </goals> + <phase>process-classes</phase> <configuration> <entries> <entry> @@ -203,6 +217,7 @@ <goals> <goal>gen</goal> </goals> + <phase>process-classes</phase> </execution> </executions> </plugin> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -44,13 +44,13 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-validators</artifactId> + <artifactId>services-validation</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>application-swing-validators</artifactId> + <artifactId>application-swing-validation</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -78,22 +78,10 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-validators</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>application-swing-validation</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>application-swing-validators</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency>  ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -132,7 +132,6 @@ <executions> <execution> <id>generate-i18n-validator-fields</id> - <phase>generate-sources</phase> <goals> <goal>generate-i18n-validator-fields</goal> </goals> @@ -142,7 +141,6 @@ </execution> <execution> <id>generate-validators-descriptor</id> - <phase>generate-sources</phase> <goals> <goal>generate-validators-descriptor</goal> </goals> @@ -154,20 +152,33 @@ <artifactId>persistence</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>services-validators</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> </plugin> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <executions> + <execution> + <id>compile-generated-sources</id> + <goals> + <goal>compile</goal> + </goals> + <phase>process-classes</phase> + <configuration> + <includes> + <include>**/I18nValidatorHelper.java</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <id>parse-java</id> + <phase>process-classes</phase> <goals> <goal>parserJava</goal> </goals> @@ -182,6 +193,7 @@ </execution> <execution> <id>parse-validation</id> + <phase>process-classes</phase> <goals> <goal>parserValidation</goal> </goals> @@ -198,6 +210,7 @@ </execution> <execution> <id>gen</id> + <phase>process-classes</phase> <goals> <goal>gen</goal> </goals> ===================================== toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java ===================================== --- a/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java +++ b/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java @@ -44,7 +44,7 @@ import java.util.TreeSet; * @author Tony Chemit - dev(a)tchemit.fr * @since 5.0 */ -@Mojo(name = "generate-i18n-validator-fields", defaultPhase = LifecyclePhase.GENERATE_RESOURCES, requiresDependencyResolution = ResolutionScope.COMPILE) +@Mojo(name = "generate-i18n-validator-fields", defaultPhase = LifecyclePhase.PROCESS_CLASSES, requiresDependencyResolution = ResolutionScope.COMPILE) class GenerateI18nValidatorFieldsMojo extends GenerateValidatorMojoSupport { /** ===================================== toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorMojoSupport.java ===================================== --- a/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorMojoSupport.java +++ b/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorMojoSupport.java @@ -84,7 +84,7 @@ public abstract class GenerateValidatorMojoSupport extends ToolboxMojoSupport im @Override public URLClassLoader getUrlClassLoader() throws MalformedURLException { - return initClassLoader(getProject(), validatorsFile.getParentFile(), true, false, true, true, false); + return initClassLoader(getProject(), validatorsFile.getParentFile(), false, true, true, true, true); } } ===================================== toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorsDescriptorMojo.java ===================================== --- a/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorsDescriptorMojo.java +++ b/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorsDescriptorMojo.java @@ -48,7 +48,7 @@ import java.util.TreeSet; * @author Tony Chemit - dev(a)tchemit.fr * @since 5.0 */ -@Mojo(name = "generate-validators-descriptor", defaultPhase = LifecyclePhase.GENERATE_RESOURCES, requiresDependencyResolution = ResolutionScope.COMPILE) +@Mojo(name = "generate-validators-descriptor", defaultPhase = LifecyclePhase.PROCESS_CLASSES, requiresDependencyResolution = ResolutionScope.COMPILE) class GenerateValidatorsDescriptorMojo extends GenerateValidatorMojoSupport { /** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fdd698f79b9a0108c59f2c2fd1f…

1 0

[Git][ultreiaio/ird-observe][develop] try to make builds work again
by Tony CHEMIT 30 Mar '17

30 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8237b901 by Tony CHEMIT at 2017-03-30T09:21:22+02:00 try to make builds work again - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,9 +12,6 @@ stages: - Production .before_script_default: &before_script_default - tags: - - gitlab-org - - shared before_script: - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - eval $(ssh-agent -s) @@ -27,9 +24,6 @@ stages: - . ~/env/bin/prepare-env.sh .before_script_clone: &before_script_clone - tags: - - gitlab-org - - shared before_script: - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - eval $(ssh-agent -s) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8237b9019df07af5d9901034371…

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Remettre en place la validation sur le formulaire suite à l'abandon d'une suppression (See #759)
by Tony CHEMIT 30 Mar '17

30 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fa4fdc2d by Tony CHEMIT at 2017-03-30T09:16:27+02:00 Remettre en place la validation sur le formulaire suite à l'abandon d'une suppression (See #759) - - - - - fbe132a3 by Tony CHEMIT at 2017-03-30T09:20:15+02:00 Ne pas modifier le formulaire si on resélectionne dans l'abre le nœud courant (See #759) - - - - - 2 changed files: - 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/tree/navigation/NavigationTree.java Changes: ===================================== 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 @@ -547,7 +547,9 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U try { ok = doDelete(getBean()); - + if (!ok) { + ui.restartEdit(); + } } catch (Exception e) { UIHelper.handlingError(e); } finally { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java @@ -91,7 +91,7 @@ public class NavigationTree extends JXTree { setSelectionModel(new DefaultTreeSelectionModel() { @Override public void setSelectionPath(TreePath path) { - boolean canChange = ObserveSwingApplicationContext.get().getContentUIManager().closeSelectedContentUI(); + boolean canChange = !Objects.equals(path, getSelectionPath()) && ObserveSwingApplicationContext.get().getContentUIManager().closeSelectedContentUI(); if (!canChange) { // cancel the change of node return; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4d8a433a254e20d1a290d1fd8c…

1 0

[Git][ultreiaio/ird-observe][develop] Ajout message d'info sur les commentaires (pour le focus) (See #755)
by Tony CHEMIT 30 Mar '17

30 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4d8a433a by Tony CHEMIT at 2017-03-30T08:57:21+02:00 Ajout message d'info sur les commentaires (pour le focus) (See #755) - - - - - 5 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jcss - 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 Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jaxx @@ -34,7 +34,10 @@ <JTextArea id='comment2' onKeyReleased='if (!comment2.getText().isEmpty() || model.getComment() != null) { model.setComment(comment2.getText().isEmpty() ? null : comment2.getText()); }'/> <JPanel id="columnHeader" layout="{new BorderLayout()}"> - <JLabel constraints='BorderLayout.WEST' text="{getTitle()}"/> + <JPanel layout="{new BorderLayout(3, 3)}" constraints='BorderLayout.WEST'> + <JLabel id='titleLabel' constraints='BorderLayout.WEST'/> + <JLabel id='infoLabel' constraints='BorderLayout.CENTER'/> + </JPanel> <JToolBar constraints='BorderLayout.EAST'> <JButton id="resetComment" styleClass='resetButton' onActionPerformed="model.setComment(null)"/> </JToolBar> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jcss @@ -12,3 +12,13 @@ #resetComment { toolTipText:"observe.action.resetComment.tip"; } + + +#titleLabel { + text: {getTitle()}; +} + +#infoLabel { + actionIcon:information; + toolTipText:"observe.action.comment.tip"; +} \ No newline at end of file ===================================== 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 @@ -44,6 +44,7 @@ observe.action.close.route.tip=Close road observe.action.close.storage=Close storage observe.action.close.storage.tip=Close current storage observe.action.close.synchro.tip=close window +observe.action.comment.tip=<html><body><ul><li>To focus on next widget, use accelerator Ctrl + Tab</li><li>To focus on previous widget, use accelerator Ctrl + Shift + Tab</body></html> observe.action.config.export.required.read.referentiel=Read permission is required on referential for this operation observe.action.config.export.required.write.data=Write permission is required on data for this operation observe.action.configuration=Preferences ===================================== 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 @@ -44,6 +44,7 @@ observe.action.close.route.tip=Cierre de la ruta abierta observe.action.close.storage=Cerrar la fuente de datos observe.action.close.storage.tip=Cerrar la fuente de datos usado actualmente observe.action.close.synchro.tip=Cerrar la ventana +observe.action.comment.tip=<html><body><ul><li>To focus on next widget, use accelerator Ctrl + Tab</li><li>To focus on previous widget, use accelerator Ctrl + Shift + Tab</body></html> \#TODO observe.action.config.export.required.read.referentiel=Debe tener derechos de lectura sobre el referencial de datos para esta operación observe.action.config.export.required.write.data=Debe tener derechos de escritura sobre los datos para esta operación observe.action.configuration=Configuración ===================================== 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 @@ -45,6 +45,7 @@ observe.action.close.route.tip=Clôturer la route ouverte observe.action.close.storage=Fermer la source de données observe.action.close.storage.tip=Fermer la source de données actuellement utilisée observe.action.close.synchro.tip=Fermer la fenêtre +observe.action.comment.tip=<html><body><ul><li>Pour accéder au composant suivant, utilisez les raccourci clavier Ctrl + Tab</li><li>Pour accéder au composant précédent, utilisez les raccourci clavier Ctrl + Shift + Tab</body></html> observe.action.config.export.required.read.referentiel=Lecture sur le référentiel requis pour cette opération observe.action.config.export.required.write.data=Écriture sur les données requis pour cette opération observe.action.configuration=Configuration View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4d8a433a254e20d1a290d1fd8ca…

1 0

[Git][ultreiaio/ird-observe][develop] Faire fonctionner le raccourci F6 + revue aussi du F2 et F3 qui fonctionnent bie…
by Tony CHEMIT 29 Mar '17

29 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9d260751 by Tony CHEMIT at 2017-03-29T23:33:28+02:00 Faire fonctionner le raccourci F6 + revue aussi du F2 et F3 qui fonctionnent bien désormais (See #754) - - - - - 30 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/BackToReferentialListUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseAndCreateUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateNewReferentialUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteDataUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteReferenceUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteTableEntryUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoDownUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoUpUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivitySeinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveRoutesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripLonglinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripSeinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ReOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetEditUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetTableEntryUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveEditUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveTableEntryUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectNodeUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectOpenNodeUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/ChangeFocusGlobalUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/CloseDataGlobalUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/DeleteDataGlobalUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9d260751885549e2f9b8e229660…

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: remove obsolete files
by Tony CHEMIT 29 Mar '17

29 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b2e2c85e by Tony CHEMIT at 2017-03-29T18:46:22+02:00 remove obsolete files - - - - - 8d2b41f5 by Tony CHEMIT at 2017-03-29T19:32:27+02:00 Ne pas faire de sauvegarde lorsqu'aucune modification n'a été effectuée sur la base (see #757) - - - - - 30 changed files: - − application-swing-decoration/changelog.txt - − application-swing-validation/changelog.txt - − application-swing/changelog.txt - application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java - application-swing/src/main/java/fr/ird/observe/application/swing/backup/AutomaticLocalDatabaseBackupTask.java - application-swing/src/main/java/fr/ird/observe/application/swing/backup/LocalDatabaseBackupTaskSupport.java - application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AbstractContentUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivityLonglineSetUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineSetUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivitySeinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveRoutesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectNodeUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectOpenNodeUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/ApplyAction.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/impl/longline/SetLonglineUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e70a4e9e59cd0e19f335813b61…

1 0