Author: tchemit Date: 2012-08-08 14:39:52 +0200 (Wed, 08 Aug 2012) New Revision: 368 Url: http://forge.codelutin.com/repositories/revision/sammoa/368 Log: create ExportMapModel Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/ExportMapUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/ExportMapUIModel.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/ExportMapUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/ExportMapUIHandler.java 2012-08-08 12:38:50 UTC (rev 367) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/ExportMapUIHandler.java 2012-08-08 12:39:52 UTC (rev 368) @@ -106,15 +106,9 @@ ExportMapUIModel model = new ExportMapUIModel(); List<Campaign> campaigns = getReferentialService().getCampaigns(); + //TODO-tchemit-2012-08-03 add an null campaign (for test purpose, should be removed...) campaigns.add(0, null); model.setCampaigns(campaigns); - -// List<String> speciesTypes = getReferentialService().getAllSpeciesTypes(); -// model.setSpeciesTypes(StringRefs.toRefs(speciesTypes)); -// -// List<Species> species = getReferentialService().getAllSpecies(); -// model.setSpecies(species); - model.setRouteTypes(Lists.newArrayList(RouteType.values())); String campaignId = context.getCampaignId(); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/ExportMapUIModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/ExportMapUIModel.java 2012-08-08 12:38:50 UTC (rev 367) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/ExportMapUIModel.java 2012-08-08 12:39:52 UTC (rev 368) @@ -28,6 +28,7 @@ import fr.ulr.sammoa.persistence.Campaign; import fr.ulr.sammoa.persistence.RouteType; import fr.ulr.sammoa.persistence.Species; +import fr.ulr.sammoa.persistence.Species2; import fr.ulr.sammoa.persistence.Strate; import fr.ulr.sammoa.persistence.StringRef; import org.jdesktop.beans.AbstractSerializableBean; @@ -312,6 +313,10 @@ } public ExportMapModel toModel(String filename) { + + List<Species> speciesToUse = Species2.getSelectedSpecies( + getSpecies(), getSelectedSpecies(), getSelectedSpeciesTypes()); + ExportMapModel result = ExportMapModel.newModel( getExportDirectory(), filename, @@ -320,8 +325,7 @@ getEndDate(), getSelectedStrates(), getSelectedRouteTypes(), - getSelectedSpecies(), - getSelectedSpeciesTypes() + speciesToUse ); return result; }