Author: kmorin Date: 2013-07-09 10:06:39 +0200 (Tue, 09 Jul 2013) New Revision: 1119 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1119 Log: fixes #2854 on a r?\195?\169ussi ?\195?\160 cr?\195?\169er 2 traits avec m?\195?\170me station trait date et heure Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-fatal-validation.xml trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-fatal-validation.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2013-07-06 13:04:53 UTC (rev 1118) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2013-07-09 08:06:39 UTC (rev 1119) @@ -71,7 +71,7 @@ public static final String PROPERTY_PROTOCOL_ID = "protocolId"; - public static final String PROPERTY_FISHING_OPERATION_ID = "fihsingOperationID"; + public static final String PROPERTY_FISHING_OPERATION_ID = "fishingOperationId"; public static final String PROPERTY_PROGRAM_FILLED = "programFilled"; @@ -172,6 +172,7 @@ @Override public void propertyChange(PropertyChangeEvent evt) { fishingOperation = null; + getValidationContext().existingFishingOperations = null; } }); } Modified: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-fatal-validation.xml =================================================================== --- trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-fatal-validation.xml 2013-07-06 13:04:53 UTC (rev 1118) +++ trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-fatal-validation.xml 2013-07-09 08:06:39 UTC (rev 1119) @@ -45,7 +45,7 @@ </field-validator> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">existingOperations</param> + <param name="collectionFieldName">existingFishingOperations</param> <param name="keys">stationNumber, fishingOperationNumber, gearShootingStartDate</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -63,7 +63,7 @@ </field-validator> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">existingOperations</param> + <param name="collectionFieldName">existingFishingOperations</param> <param name="keys">stationNumber, fishingOperationNumber, gearShootingStartDate</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -89,7 +89,7 @@ </field-validator> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">existingOperations</param> + <param name="collectionFieldName">existingFishingOperations</param> <param name="keys">stationNumber, fishingOperationNumber, gearShootingStartDate</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> Modified: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-fatal-validation.xml =================================================================== --- trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-fatal-validation.xml 2013-07-06 13:04:53 UTC (rev 1118) +++ trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-fatal-validation.xml 2013-07-09 08:06:39 UTC (rev 1119) @@ -44,7 +44,7 @@ </field-validator> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">existingOperations</param> + <param name="collectionFieldName">existingFishingOperations</param> <param name="keys">stationNumber, fishingOperationNumber, gearShootingStartDate</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -62,7 +62,7 @@ </field-validator> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">existingOperations</param> + <param name="collectionFieldName">existingFishingOperations</param> <param name="keys">stationNumber, fishingOperationNumber, gearShootingStartDate</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -88,7 +88,7 @@ </field-validator> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">existingOperations</param> + <param name="collectionFieldName">existingFishingOperations</param> <param name="keys">stationNumber, fishingOperationNumber, gearShootingStartDate</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-07-06 13:04:53 UTC (rev 1118) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-07-09 08:06:39 UTC (rev 1119) @@ -156,6 +156,7 @@ public void setFishingOperation(FishingOperation fishingOperation) { this.fishingOperation = fishingOperation; + getDataContext().setFishingOperationId(fishingOperation.getId()); } public void setCheckPreviousEdit(boolean checkPreviousEdit) {