Author: chatellier Date: 2010-11-09 15:35:01 +0000 (Tue, 09 Nov 2010) New Revision: 196 Log: Ajout du commentaire de la fusion Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesFusionDialog.jaxx Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-11-09 15:01:20 UTC (rev 195) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-11-09 15:35:01 UTC (rev 196) @@ -199,8 +199,8 @@ speciesFusionDialog.setHandler(SelectionHandler.this); // pre fill new speci name with first selected specy name - Specy firstSelected = (Specy)view.getSpecyList().getSelectedValue(); - speciesFusionDialog.getNewSpeciesNameField().setText(firstSelected.getName()); + String firstSelected = (String)view.getSpecyList().getSelectedValue(); + speciesFusionDialog.getNewSpeciesNameField().setText(firstSelected); speciesFusionDialog.setLocationRelativeTo(view); speciesFusionDialog.setVisible(true); @@ -284,9 +284,10 @@ public void performMergeSpecies(SpeciesFusionDialog view) { // TODO echatellier 20101021 attention a ce que la selection - // ne change pas (la fenetre est modales pour l'instant) + // ne change pas (la fenetre est modale pour l'instant) String newSpecyName = view.getNewSpeciesNameField().getText(); + String comment = view.getCommentField().getText(); Project project = view.getContextValue(Project.class); Selection seletion = view.getContextValue(Selection.class); ProjectService projectService = view.getContextValue(ProjectService.class); @@ -307,7 +308,7 @@ } try { - projectService.mergeSpecies(project, seletion, newSpecyName, specyNames); + projectService.mergeSpecies(project, seletion, newSpecyName, comment, specyNames); } catch (CoserBusinessException ex) { throw new CoserException("Can't merge species", ex); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesFusionDialog.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesFusionDialog.jaxx 2010-11-09 15:01:20 UTC (rev 195) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesFusionDialog.jaxx 2010-11-09 15:35:01 UTC (rev 196) @@ -44,7 +44,7 @@ </cell> <cell weightx="2" weighty="1" fill="both" columns="3"> <JScrollPane> - <JXTextArea constructorParams='_("coser.ui.common.comment")' rows="3" /> + <JXTextArea id="commentField" constructorParams='_("coser.ui.common.comment")' rows="3" /> </JScrollPane> </cell> </row>