Author: tchemit Date: 2013-02-28 06:36:18 +0100 (Thu, 28 Feb 2013) New Revision: 495 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/495 Log: fixes #2064: [CAMPAGNE] - S?\195?\169rie de Campagne : Rendre obligatoire le commentaire d'une s?\195?\169rie de campagne Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIModel-error-validation.xml trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java 2013-02-27 17:07:15 UTC (rev 494) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java 2013-02-28 05:36:18 UTC (rev 495) @@ -119,6 +119,7 @@ public Program createProgram(Program bean) { Preconditions.checkNotNull(bean); Preconditions.checkNotNull(bean.getName()); + Preconditions.checkNotNull(bean.getComment()); Preconditions.checkArgument(bean.getId() == null); if (log.isDebugEnabled()) { @@ -137,6 +138,7 @@ Preconditions.checkNotNull(bean); Preconditions.checkNotNull(bean.getName()); Preconditions.checkNotNull(bean.getId()); + Preconditions.checkNotNull(bean.getComment()); if (log.isDebugEnabled()) { @@ -157,20 +159,10 @@ // -- Internal methods --// // ------------------------------------------------------------------------// - /** - * Sentinel value when comment is null (but database can't accept tis. - * - * @since 1.0 - */ - public static final String EMPTY_COMMENT = "$$EMPTY_COMMENT$$"; - protected void loadProgram(Program result, Object[] source) { result.setId((String) source[0]); result.setName((String) source[1]); result.setComment((String) source[2]); - if (EMPTY_COMMENT.equals(result.getComment())) { - result.setComment(null); - } if (source[3] != null) { Zone zone = new Zone(); zone.setId(String.valueOf(source[3])); @@ -183,11 +175,6 @@ protected void beanToEntity(Program source, fr.ifremer.adagio.core.dao.administration.programStrategy.Program target, boolean copyIfNull) { - // If target.description is a fake value (see bottom in this method), restore the null value - if (target.getDescription() != null && target.getDescription().equals(target.getName())) { - target.setDescription(null); - } - // Code : compute with : <prefixe><name> if (target.getCode() == null && source.getName() != null) { // Compute a program code (remove spaces, and capitalize the name) @@ -226,13 +213,7 @@ } // Description (mandatory in database) - // If empty, use name (will be replace in the next save() - see upper in this method) - // If empty, use a guard value - if (source.getComment() == null) { - target.setDescription(EMPTY_COMMENT); - } else { - target.setDescription(source.getComment()); - } + target.setDescription(source.getComment()); // Zone if (copyIfNull && source.getZone() == null) { Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIModel-error-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIModel-error-validation.xml 2013-02-27 17:07:15 UTC (rev 494) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIModel-error-validation.xml 2013-02-28 05:36:18 UTC (rev 495) @@ -60,6 +60,9 @@ </field> <field name="comment"> + <field-validator type="requiredstring" short-circuit="true"> + <message>tutti.validator.error.program.comment.required</message> + </field-validator> <field-validator type="stringlength" short-circuit="true"> <param name="maxLength">2000</param> <message>tutti.validator.error.comment.too.long##${maxLength}</message> Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-27 17:07:15 UTC (rev 494) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-28 05:36:18 UTC (rev 495) @@ -545,6 +545,7 @@ tutti.validator.error.fishingOperation.vessel.required=Le navire est obligatoire tutti.validator.error.program.existingKey=Le couple nom/zone existe déjà tutti.validator.error.program.name.required=Le nom de la série est obligatoire +tutti.validator.error.program.comment.required=Le commentaire de la série est obligatoire tutti.validator.error.program.zone.required=La zone de la série est obligatoire tutti.validator.error.protocol.name.alreadyUsed=Le nom du protocol est déjà utilisé tutti.validator.error.protocol.name.required=Le nom du protocol est obligatoire