Author: chatellier Date: 2011-01-07 09:09:33 +0000 (Fri, 07 Jan 2011) New Revision: 484 Log: Ajout du nom de la campagne dans la liste des zones Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/SelectionAddResultDialog.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ZoneComboBoxRenderer.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/SelectionAddResultDialog.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/SelectionAddResultDialog.jaxx 2011-01-07 09:01:34 UTC (rev 483) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/SelectionAddResultDialog.jaxx 2011-01-07 09:09:33 UTC (rev 484) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -67,7 +67,7 @@ </cell> <cell fill="horizontal" columns="2"> <JComboBox id="resultZoneCombo" model="{new ZoneComboBoxModel(this)}" - renderer="{new ZoneComboBoxRenderer()}" + renderer="{new ZoneComboBoxRenderer(this)}" onActionPerformed='getRsufiResult().setZone((String)resultZoneCombo.getSelectedItem())'/> </cell> </row> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ZoneComboBoxRenderer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ZoneComboBoxRenderer.java 2011-01-07 09:01:34 UTC (rev 483) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ZoneComboBoxRenderer.java 2011-01-07 09:09:33 UTC (rev 484) @@ -30,6 +30,9 @@ import javax.swing.DefaultListCellRenderer; import javax.swing.JList; +import fr.ifremer.coser.bean.Selection; +import fr.ifremer.coser.services.ProjectService; + /** * Zone list combo renderer (display zone name for zone id). * @@ -44,6 +47,14 @@ /** serialVersionUID. */ private static final long serialVersionUID = -8231189755539976714L; + protected String surveyName; + + public ZoneComboBoxRenderer(SelectionAddResultDialog view) { + ProjectService projectService = view.getContextValue(ProjectService.class); + Selection selection = view.getContextValue(Selection.class); + surveyName = projectService.getProjectSurveyName(selection); + } + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { @@ -53,7 +64,10 @@ String[] zoneInfo = model.getZone(zoneId); String zoneName = null; if (zoneInfo != null) { - zoneName = zoneInfo[0] + " - " + zoneInfo[1]; + // le surveyName ne sert à rien + // mais est la a titre d'information par rapport + // à l'affichage cote web + zoneName = zoneInfo[0] + " - " + zoneInfo[1] + " - " + surveyName; } else { zoneName = zoneId;