This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit e66a1c971821fe66960e08c720ed99ebbe30f5b8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 11:52:26 2016 +0100 [LL] Nombre de coupures inconnu : cas problématique (refs-80 #7883) --- .../SetLonglineDto-ui-create-error-validation.xml | 9 -------- ...SetLonglineDto-ui-create-warning-validation.xml | 9 ++++++++ .../SetLonglineDto-ui-update-error-validation.xml | 9 -------- ...SetLonglineDto-ui-update-warning-validation.xml | 9 ++++++++ .../impl/longline/SetLonglineUIHandler.java | 26 ---------------------- 5 files changed, 18 insertions(+), 44 deletions(-) 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..1526cef 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 @@ -207,15 +207,6 @@ </field> - <field name="haulingBreaks"> - - <!-- haulingBreaks non renseigne --> - <field-validator type="required" short-circuit="true"> - <message>validator.ui.setLongline.required.haulingBreaks</message> - </field-validator> - - </field> - <field name="settingStartQuadrant"> <field-validator type="required" short-circuit="true"> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-warning-validation.xml index cc503cb..35c1820 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-warning-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-warning-validation.xml @@ -33,4 +33,13 @@ </field> + <field name="haulingBreaks"> + + <!-- haulingBreaks non renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.ui.setLongline.required.haulingBreaks</message> + </field-validator> + + </field> + </validators> 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..ba0f57d 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 @@ -207,15 +207,6 @@ </field> - <field name="haulingBreaks"> - - <!-- haulingBreaks non renseigne --> - <field-validator type="required" short-circuit="true"> - <message>validator.ui.setLongline.required.haulingBreaks</message> - </field-validator> - - </field> - <field name="settingStartLatitude"> <!-- settingStartLatitude obligatoire --> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-warning-validation.xml index cc503cb..35c1820 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-warning-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-warning-validation.xml @@ -33,4 +33,13 @@ </field> + <field name="haulingBreaks"> + + <!-- haulingBreaks non renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.ui.setLongline.required.haulingBreaks</message> + </field-validator> + + </field> + </validators> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java index be720b5..0e68b83 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java @@ -75,29 +75,12 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { // Change toogle target visible on all TimeEditors protected final PropertyChangeListener onCoordinateFormatChangedListener; -// private final LogPropertyChanges logCoordinatesChanges; - protected boolean toogleTimeEditorSliderIsChanging; protected boolean coordinateFormatChangedIsChanging; -// static ImmutableSet<String> COORDINATES_PROPERTIES = ImmutableSet.of( -// SetLongline.PROPERTY_HAULING_START_LONGITUDE, -// SetLongline.PROPERTY_HAULING_START_LATITUDE, -// SetLongline.PROPERTY_HAULING_START_QUADRANT, -// SetLongline.PROPERTY_SETTING_START_LONGITUDE, -// SetLongline.PROPERTY_SETTING_START_LATITUDE, -// SetLongline.PROPERTY_SETTING_START_QUADRANT, -// SetLongline.PROPERTY_HAULING_END_LONGITUDE, -// SetLongline.PROPERTY_HAULING_END_LATITUDE, -// SetLongline.PROPERTY_HAULING_END_QUADRANT, -// SetLongline.PROPERTY_SETTING_END_LONGITUDE, -// SetLongline.PROPERTY_SETTING_END_LATITUDE, -// SetLongline.PROPERTY_SETTING_END_QUADRANT); - public SetLonglineUIHandler(SetLonglineUI ui) { super(ui, DataContextType.ActivityLongline, DataContextType.SetLongline); -// this.logCoordinatesChanges = new LogPropertyChanges(COORDINATES_PROPERTIES); computeTabValidStateListener = e -> { SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); @@ -168,8 +151,6 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { getUi().getHaulingStartCoordinates().getModel().addPropertyChangeListener(CoordinatesEditorModel.PROPERTY_FORMAT, onCoordinateFormatChangedListener); getUi().getHaulingEndCoordinates().getModel().addPropertyChangeListener(CoordinatesEditorModel.PROPERTY_FORMAT, onCoordinateFormatChangedListener); -// getBean().removePropertyChangeListener(logCoordinatesChanges); -// getBean().addPropertyChangeListener(logCoordinatesChanges); } @@ -181,12 +162,6 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { getUi().getHaulingStartCoordinates().resetModel(); getUi().getHaulingEndCoordinates().resetModel(); - // Reset quandrant -// getUi().getSettingStartCoordinates().resetQuadrant(); -// getUi().getSettingEndCoordinates().resetQuadrant(); -// getUi().getHaulingStartCoordinates().resetQuadrant(); -// getUi().getHaulingEndCoordinates().resetQuadrant(); - if (log.isInfoEnabled()) { log.info("OpenUI: " + getModel()); } @@ -403,7 +378,6 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { } else { // select ancestor node -// treeHelper.refreshNode(node, false); treeHelper.reloadSelectedNode(false, false); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.