Author: tchemit Date: 2013-03-23 19:46:00 +0100 (Sat, 23 Mar 2013) New Revision: 667 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/667 Log: fixes #2187: [SERIE] Changer le nom commentaire en *description* Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/Program.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceReadTest.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceWriteTest.java trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 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_en_GB.properties 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/entities/data/Program.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/Program.java 2013-03-23 18:20:58 UTC (rev 666) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/Program.java 2013-03-23 18:46:00 UTC (rev 667) @@ -38,6 +38,8 @@ protected String name; + protected String description; + protected Zone zone; public String getName() { @@ -48,6 +50,14 @@ this.name = name; } + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + public Zone getZone() { return zone; } 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-03-23 18:20:58 UTC (rev 666) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java 2013-03-23 18:46:00 UTC (rev 667) @@ -118,7 +118,7 @@ public Program createProgram(Program bean) { Preconditions.checkNotNull(bean); Preconditions.checkNotNull(bean.getName()); - Preconditions.checkNotNull(bean.getComment()); + Preconditions.checkNotNull(bean.getDescription()); Preconditions.checkArgument(bean.getId() == null); if (log.isDebugEnabled()) { @@ -137,7 +137,7 @@ Preconditions.checkNotNull(bean); Preconditions.checkNotNull(bean.getName()); Preconditions.checkNotNull(bean.getId()); - Preconditions.checkNotNull(bean.getComment()); + Preconditions.checkNotNull(bean.getDescription()); if (log.isDebugEnabled()) { log.debug("Create program with name: " + bean.getName()); @@ -160,7 +160,7 @@ protected void loadProgram(Program result, Object[] source) { result.setId((String) source[0]); result.setName((String) source[1]); - result.setComment((String) source[2]); + result.setDescription((String) source[2]); if (source[3] != null) { Zone zone = new Zone(); zone.setId(String.valueOf(source[3])); @@ -201,7 +201,7 @@ target.setName(source.getName()); // Description (mandatory in database) - target.setDescription(source.getComment()); + target.setDescription(source.getDescription()); // Zone if (source.getZone() == null) { Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ) Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceReadTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceReadTest.java 2013-03-23 18:20:58 UTC (rev 666) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceReadTest.java 2013-03-23 18:46:00 UTC (rev 667) @@ -70,7 +70,7 @@ Assert.assertNotNull(actual); Assert.assertNotNull(actual.getId()); Assert.assertNotNull(actual.getName()); - Assert.assertNotNull(actual.getComment()); + Assert.assertNotNull(actual.getDescription()); //comment, because in test database, "CAM-CGFS" could have a location that is not a zone //Assert.assertNotNull(actual.getZone()); Assert.assertEquals(programCode, actual.getId()); Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceWriteTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceWriteTest.java 2013-03-23 18:20:58 UTC (rev 666) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceWriteTest.java 2013-03-23 18:46:00 UTC (rev 667) @@ -71,7 +71,7 @@ name = name.substring(0, 39); } program.setName(name); - program.setComment("Comment-" + name); + program.setDescription("Comment-" + name); program.setZone(zones.get(0)); @@ -81,21 +81,21 @@ assertNotNull(createdProgram.getId()); assertNotNull(createdProgram.getComment()); assertEquals(program.getName(), createdProgram.getName()); - assertEquals(program.getComment(), createdProgram.getComment()); + assertEquals(program.getDescription(), createdProgram.getDescription()); // Reload program and compare Program reloadedProgram = service.getProgram(createdProgram.getId()); assertNotNull(reloadedProgram); assertEquals(createdProgram.getId(), reloadedProgram.getId()); assertEquals(program.getName(), reloadedProgram.getName()); - assertEquals(program.getComment(), reloadedProgram.getComment()); + assertEquals(program.getDescription(), reloadedProgram.getDescription()); assertNotNull(program.getZone()); assertEquals(program.getZone().getId(), reloadedProgram.getZone().getId()); // Modify program program.setId(createdProgram.getId()); program.setName("NEW_NAME"); - program.setComment("Add some modification"); + program.setDescription("Add some modification"); program.setZone(zones.get(1)); // Save program @@ -108,7 +108,7 @@ assertNotNull(reloadedProgram); assertEquals(program.getId(), reloadedProgram.getId()); assertEquals(program.getName(), reloadedProgram.getName()); - assertEquals(program.getComment(), reloadedProgram.getComment()); + assertEquals(program.getDescription(), reloadedProgram.getDescription()); assertNotNull(program.getZone()); assertEquals(program.getZone().getId(), reloadedProgram.getZone().getId()); } Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-03-23 18:20:58 UTC (rev 666) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-03-23 18:46:00 UTC (rev 667) @@ -117,7 +117,7 @@ tutti.editFishingOperation.help=editFishingOperation.html tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions tutti.editProgram.action.saveProgram.help=editProgram.html\#actions -tutti.editProgram.field.comment.help=editProgram.html\#fields +tutti.editProgram.field.description.help=editProgram.html\#fields tutti.editProgram.field.name.help=editProgram.html\#fields tutti.editProgram.field.zone.help=editProgram.html\#fields tutti.editProgram.help=editProgram.html Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-03-23 18:20:58 UTC (rev 666) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-03-23 18:46:00 UTC (rev 667) @@ -126,7 +126,7 @@ tutti.editFishingOperation.help=editFishingOperation.html tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions tutti.editProgram.action.saveProgram.help=editProgram.html\#actions -tutti.editProgram.field.comment.help=editProgram.html\#fields +tutti.editProgram.field.description.help=editProgram.html\#fields tutti.editProgram.field.name.help=editProgram.html\#fields tutti.editProgram.field.zone.help=editProgram.html\#fields tutti.editProgram.help=editProgram.html Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2013-03-23 18:20:58 UTC (rev 666) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2013-03-23 18:46:00 UTC (rev 667) @@ -37,7 +37,7 @@ } #nameLabel { - text: "tutti.editProgram.field.program.name"; + text: "tutti.editProgram.field.name"; labelFor: {nameField}; toolTipText: "tutti.editProgram.field.name.tip"; _help: {"tutti.editProgram.field.name.help"}; @@ -45,22 +45,22 @@ #nameField { text: {model.getName()}; - _validatorLabel : {_("tutti.editProgram.field.program.name")}; + _validatorLabel : {_("tutti.editProgram.field.name")}; } -#commentPane { - border: {BorderFactory.createTitledBorder(_("tutti.editProgram.field.comment"))}; - toolTipText: "tutti.editProgram.field.comment.tip"; - _help: {"tutti.editProgram.field.comment.help"}; +#descriptionPane { + border: {BorderFactory.createTitledBorder(_("tutti.editProgram.field.description"))}; + toolTipText: "tutti.editProgram.field.description.tip"; + _help: {"tutti.editProgram.field.description.help"}; } -#commentField { - text: {getStringValue(model.getComment())}; - _validatorLabel : {_("tutti.editProgram.field.comment")}; +#descriptionField { + text: {getStringValue(model.getDescription())}; + _validatorLabel : {_("tutti.editProgram.field.description")}; } #zoneLabel { - text: "tutti.editProgram.field.program.zone"; + text: "tutti.editProgram.field.zone"; labelFor: {zoneComboBox}; toolTipText: "tutti.editProgram.field.zone.tip"; _help: {"tutti.editProgram.field.zone.help"}; @@ -69,7 +69,7 @@ #zoneComboBox { property: zone; selectedItem: {model.getZone()}; - _validatorLabel : {_("tutti.editProgram.field.program.zone")}; + _validatorLabel : {_("tutti.editProgram.field.zone")}; } #saveButton { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx 2013-03-23 18:20:58 UTC (rev 666) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx 2013-03-23 18:46:00 UTC (rev 667) @@ -67,7 +67,7 @@ uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> <field name='name' component='nameField'/> <field name='zone' component='zoneComboBox'/> - <field name='comment' component='commentPane'/> + <field name='description' component='descriptionPane'/> </BeanValidator> <Table id='form' fill='both'> @@ -97,10 +97,10 @@ <!-- program comment --> <row weighty='0.8'> <cell columns='2'> - <JScrollPane id='commentPane' - onFocusGained='commentField.requestFocus()'> - <JTextArea id='commentField' - onKeyReleased='handler.setText(event, "comment")'/> + <JScrollPane id='descriptionPane' + onFocusGained='descriptionField.requestFocus()'> + <JTextArea id='descriptionField' + onKeyReleased='handler.setText(event, "description")'/> </JScrollPane> </cell> </row> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIModel.java 2013-03-23 18:20:58 UTC (rev 666) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIModel.java 2013-03-23 18:46:00 UTC (rev 667) @@ -50,7 +50,7 @@ protected String name; - protected String comment; + protected String description; protected Zone zone; @@ -78,14 +78,14 @@ firePropertyChange(PROPERTY_NAME, oldValue, name); } - public String getComment() { - return comment; + public String getDescription() { + return description; } - public void setComment(String comment) { - Object oldValue = getComment(); - this.comment = comment; - firePropertyChange(PROPERTY_COMMENT, oldValue, comment); + public void setDescription(String description) { + Object oldValue = getDescription(); + this.description = description; + firePropertyChange(PROPERTY_COMMENT, oldValue, description); } public Zone getZone() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-03-23 18:20:58 UTC (rev 666) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-03-23 18:46:00 UTC (rev 667) @@ -54,7 +54,7 @@ } #commentPane { - border: {BorderFactory.createTitledBorder(_("tutti.editProgram.field.comment"))}; + border: {BorderFactory.createTitledBorder(_("tutti.editProgram.field.description"))}; toolTipText: "tutti.editProtocol.field.comment.tip"; _help: {"tutti.editProtocol.field.comment.help"}; } 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-03-23 18:20:58 UTC (rev 666) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIModel-error-validation.xml 2013-03-23 18:46:00 UTC (rev 667) @@ -59,13 +59,13 @@ </field> - <field name="comment"> + <field name="description"> <field-validator type="requiredstring" short-circuit="true"> - <message>tutti.validator.error.program.comment.required</message> + <message>tutti.validator.error.program.description.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> + <message>tutti.validator.error.program.description.too.long##${maxLength}</message> </field-validator> </field> Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-03-23 18:20:58 UTC (rev 666) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-03-23 18:46:00 UTC (rev 667) @@ -474,11 +474,11 @@ tutti.editProgram.action.saveProgram.tip= tutti.editProgram.askCancelEditBeforeLeaving.cancelSaveProgram= tutti.editProgram.askSaveBeforeLeaving.saveProgram= -tutti.editProgram.field.comment= -tutti.editProgram.field.comment.tip= +tutti.editProgram.field.description= +tutti.editProgram.field.description.tip= +tutti.editProgram.field.name= tutti.editProgram.field.name.tip= -tutti.editProgram.field.program.name= -tutti.editProgram.field.program.zone= +tutti.editProgram.field.zone= tutti.editProgram.field.zone.tip= tutti.editProgram.title.create.program= tutti.editProgram.title.edit.program= @@ -964,7 +964,8 @@ tutti.validator.error.latitude.start.required= tutti.validator.error.longitude.end.required= tutti.validator.error.longitude.start.required= -tutti.validator.error.program.comment.required= +tutti.validator.error.program.description.required= +tutti.validator.error.program.description.too.long= tutti.validator.error.program.existingKey= tutti.validator.error.program.name.required= tutti.validator.error.program.zone.required= 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-03-23 18:20:58 UTC (rev 666) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-03-23 18:46:00 UTC (rev 667) @@ -487,11 +487,11 @@ tutti.editProgram.action.saveProgram.tip=Enregistrer la série de campagne tutti.editProgram.askCancelEditBeforeLeaving.cancelSaveProgram=La série de campagne n'est pas valide et ne peut pas être enregistrée. tutti.editProgram.askSaveBeforeLeaving.saveProgram=Des modifications sur la série de campagne n'ont pas été enregistrées. -tutti.editProgram.field.comment=Commentaire -tutti.editProgram.field.comment.tip= +tutti.editProgram.field.description=Description +tutti.editProgram.field.description.tip= +tutti.editProgram.field.name=Nom tutti.editProgram.field.name.tip= -tutti.editProgram.field.program.name=Nom -tutti.editProgram.field.program.zone=Zone +tutti.editProgram.field.zone=Zone tutti.editProgram.field.zone.tip= tutti.editProgram.title.create.program=Créer une nouvelle série de campagne tutti.editProgram.title.edit.program=Éditer une série de campagne existante @@ -976,7 +976,8 @@ tutti.validator.error.latitude.start.required=La latitude de début de traîne est obligatoire tutti.validator.error.longitude.end.required=La longitude de fin de traîne est obligatoire tutti.validator.error.longitude.start.required=La longitude de début de traîne est obligatoire -tutti.validator.error.program.comment.required=Le commentaire de la série est obligatoire +tutti.validator.error.program.description.required=La description de la série est obligatoire +tutti.validator.error.program.description.too.long=Taille de la description trop longue (limitée à %s caractères) 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.zone.required=La zone de la série est obligatoire