This is an automated email from the git hooks/post-receive script. New commit to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit bc821a4d37968f8f6c086d3c944ff306d22230af Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Jan 18 15:32:38 2017 +0100 Petites mises au point sur le widget positions(fixes #8964) --- .../src/main/resources/log4j.properties | 3 +- .../src/main/resources/observe-log4j.properties | 1 + ...ivityLonglineDto-ui-create-error-validation.xml | 20 +++--- ...ivityLonglineDto-ui-update-error-validation.xml | 25 ++++--- .../SetLonglineDto-ui-create-error-validation.xml | 80 +++++++++++++--------- .../SetLonglineDto-ui-update-error-validation.xml | 80 +++++++++++++--------- ...ActivitySeineDto-ui-create-error-validation.xml | 21 +++--- ...ActivitySeineDto-ui-update-error-validation.xml | 21 +++--- pom.xml | 4 +- 9 files changed, 153 insertions(+), 102 deletions(-) diff --git a/application-swing-configuration/src/main/resources/log4j.properties b/application-swing-configuration/src/main/resources/log4j.properties index dc232bc..f8b4352 100644 --- a/application-swing-configuration/src/main/resources/log4j.properties +++ b/application-swing-configuration/src/main/resources/log4j.properties @@ -49,5 +49,6 @@ log4j.logger.fr.ird.observe.application.swing.ui.util.decorator=ERROR log4j.logger.org.nuiton.config=INFO log4j.logger.org.nuiton.topia.migration=INFO log4j.logger.org.nuiton.topia.service.sql=INFO +#log4j.logger.org.nuiton.jaxx.widgets.gis=INFO -log4j.logger.jaxx.runtime.validator.swing.SwingValidator=ERROR \ No newline at end of file +log4j.logger.jaxx.runtime.validator.swing.SwingValidator=ERROR diff --git a/application-swing-configuration/src/main/resources/observe-log4j.properties b/application-swing-configuration/src/main/resources/observe-log4j.properties index 5c02e59..8fe6a85 100644 --- a/application-swing-configuration/src/main/resources/observe-log4j.properties +++ b/application-swing-configuration/src/main/resources/observe-log4j.properties @@ -49,5 +49,6 @@ log4j.logger.fr.ird.observe.application.swing.ui.util.decorator=ERROR log4j.logger.org.nuiton.topia.service.sql=INFO log4j.logger.org.nuiton.topia.migration=INFO log4j.logger.org.nuiton.config=INFO +#log4j.logger.org.nuiton.jaxx.widgets.gis=INFO log4j.logger.jaxx.runtime.validator.swing.SwingValidator=ERROR diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-error-validation.xml index 50217d0..2a66278 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-error-validation.xml @@ -114,11 +114,13 @@ </field-validator> <!-- 0 <= latitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> + </param> <message> - validator.ui.activity.bound.latitude##${0.0}##${maxInclusive} + validator.ui.activity.bound.latitude##0.0##${doubles.max} </message> </field-validator> @@ -132,11 +134,13 @@ </field-validator> <!-- 0 <= longitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> + </param> <message> - validator.ui.activity.bound.longitude##${0.0}##${maxInclusive} + validator.ui.activity.bound.longitude##0.0##${doubles.max} </message> </field-validator> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-error-validation.xml index 78878f2..7f3080c 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-error-validation.xml @@ -20,8 +20,8 @@ --> <!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="vesselActivityLongline"> @@ -99,11 +99,14 @@ </field-validator> <!-- 0 <= latitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> + </param> <message> - validator.ui.activity.bound.latitude##${0.0}##${maxInclusive} + validator.ui.activity.bound.latitude##0.0##${doubles.max} </message> </field-validator> @@ -117,11 +120,13 @@ </field-validator> <!-- 0 <= longitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> + </param> <message> - validator.ui.activity.bound.longitude##${0.0}##${maxInclusive} + validator.ui.activity.bound.longitude##0.0##${doubles.max} </message> </field-validator> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-error-validation.xml index 86d4479..29f7e95 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-error-validation.xml @@ -240,11 +240,13 @@ </field-validator> <!-- 0 <= settingStartLatitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.settingStartLatitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.settingStartLatitude##0.0##${doubles.max} </message> </field-validator> @@ -258,11 +260,13 @@ </field-validator> <!-- 0 <= settingStartLongitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.settingStartLongitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.settingStartLongitude##0.0##${doubles.max} </message> </field-validator> @@ -307,11 +311,13 @@ </field-validator> <!-- 0 <= settingEndLatitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.settingEndLatitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.settingEndLatitude##0.0##${doubles.max} </message> </field-validator> @@ -325,11 +331,13 @@ </field-validator> <!-- 0 <= settingEndLongitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.settingEndLongitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.settingEndLongitude##0.0##${doubles.max} </message> </field-validator> @@ -373,11 +381,13 @@ </field-validator> <!-- 0 <= haulingStartLatitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.haulingStartLatitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.haulingStartLatitude##0.0##${doubles.max} </message> </field-validator> @@ -391,11 +401,13 @@ </field-validator> <!-- 0 <= haulingStartLongitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.haulingStartLongitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.haulingStartLongitude##0.0##${doubles.max} </message> </field-validator> @@ -440,11 +452,13 @@ </field-validator> <!-- 0 <= haulingEndLatitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.haulingEndLatitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.haulingEndLatitude##0.0##${doubles.max} </message> </field-validator> @@ -458,11 +472,13 @@ </field-validator> <!-- 0 <= haulingEndLongitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.haulingEndLongitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.haulingEndLongitude##0.0##${doubles.max} </message> </field-validator> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-error-validation.xml index 4d67919..7436636 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-error-validation.xml @@ -224,11 +224,13 @@ </field-validator> <!-- 0 <= settingStartLatitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.settingStartLatitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.settingStartLatitude##0.0##${doubles.max} </message> </field-validator> @@ -242,11 +244,13 @@ </field-validator> <!-- 0 <= settingStartLongitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.settingStartLongitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.settingStartLongitude##0.0##${doubles.max} </message> </field-validator> @@ -275,11 +279,13 @@ </field-validator> <!-- 0 <= settingEndLatitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.settingEndLatitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.settingEndLatitude##0.0##${doubles.max} </message> </field-validator> @@ -293,11 +299,13 @@ </field-validator> <!-- 0 <= settingEndLongitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.settingEndLongitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.settingEndLongitude##0.0##${doubles.max} </message> </field-validator> @@ -326,11 +334,13 @@ </field-validator> <!-- 0 <= haulingStartLatitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.haulingStartLatitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.haulingStartLatitude##0.0##${doubles.max} </message> </field-validator> @@ -344,11 +354,13 @@ </field-validator> <!-- 0 <= haulingStartLongitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.haulingStartLongitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.haulingStartLongitude##0.0##${doubles.max} </message> </field-validator> @@ -378,11 +390,13 @@ </field-validator> <!-- 0 <= haulingEndLatitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.haulingEndLatitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.haulingEndLatitude##0.0##${doubles.max} </message> </field-validator> @@ -396,11 +410,13 @@ </field-validator> <!-- 0 <= haulingEndLongitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.haulingEndLongitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.haulingEndLongitude##0.0##${doubles.max} </message> </field-validator> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-error-validation.xml index 6e25980..2c7b50c 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-error-validation.xml @@ -193,11 +193,13 @@ </field-validator> <!-- 0 <= latitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> + </param> <message> - validator.ui.activity.bound.latitude##${0.0}##${maxInclusive} + validator.ui.activity.bound.latitude##0.0##${doubles.max} </message> </field-validator> @@ -211,14 +213,15 @@ </field-validator> <!-- 0 <= longitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> + </param> <message> - validator.ui.activity.bound.longitude##${0.0}##${maxInclusive} + validator.ui.activity.bound.longitude##0.0##${doubles.max} </message> </field-validator> - </field> <field name="vesselSpeed"> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-error-validation.xml index e0c86cf..4a4b849 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-error-validation.xml @@ -51,11 +51,14 @@ </field-validator> <!-- 0 <= latitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> + </param> <message> - validator.ui.activity.bound.latitude##${0.0}##${maxInclusive} + validator.ui.activity.bound.latitude##0.0##${doubles.max} </message> </field-validator> @@ -69,11 +72,13 @@ </field-validator> <!-- 0 <= longitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> + </param> <message> - validator.ui.activity.bound.longitude##${0.0}##${maxInclusive} + validator.ui.activity.bound.longitude##0.0##${doubles.max} </message> </field-validator> diff --git a/pom.xml b/pom.xml index 95bc7b4..9df0def 100644 --- a/pom.xml +++ b/pom.xml @@ -160,9 +160,9 @@ <processorPluginVersion>1.3</processorPluginVersion> <topiaVersion>3.2</topiaVersion> - <jaxxVersion>2.36</jaxxVersion> + <jaxxVersion>2.39</jaxxVersion> <nuitonI18nVersion>3.6.2</nuitonI18nVersion> - <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion> + <nuitonValidatorVersion>3.1</nuitonValidatorVersion> <nuitonUtilsVersion>3.0-rc-16</nuitonUtilsVersion> <nuitonConfigVersion>3.1</nuitonConfigVersion> <xworkVersion>2.3.31</xworkVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.