Author: fdesbois Date: 2012-09-10 13:10:41 +0200 (Mon, 10 Sep 2012) New Revision: 564 Url: http://forge.codelutin.com/repositories/revision/sammoa/564 Log: fixes #1481: missing update model selection for export map filters Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java 2012-09-10 10:05:28 UTC (rev 563) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java 2012-09-10 11:10:41 UTC (rev 564) @@ -215,6 +215,7 @@ ExportMapUIModel model = getModel(); model.setSelectedStrates(Collections.<Strate>emptyList()); + model.setSelectedRouteTypes(Collections.<RouteType>emptyList()); model.setSelectedSpecies(Collections.<Species>emptyList()); model.setSelectedSpeciesTypes(Collections.<StringRef>emptyList()); @@ -294,6 +295,11 @@ }; ExportMapUIModel model = getModel(); + model.setSelectedStrates( + getFilterValues(Strate.class, ui.getStrateFilter())); + model.setSelectedRouteTypes( + getFilterValues(RouteType.class, ui.getRouteTypeFilter())); + displayExportLauncher(_("sammoa.title.export.exportEfforts"), model.getExportEffortsFilename(), model, @@ -333,6 +339,16 @@ }; ExportMapUIModel model = getModel(); + model.setSelectedStrates( + getFilterValues(Strate.class, ui.getStrateFilter())); + model.setSelectedRouteTypes( + getFilterValues(RouteType.class, ui.getRouteTypeFilter())); + + model.setSelectedSpecies( + getFilterValues(Species.class, ui.getSpeciesFilter())); + model.setSelectedSpeciesTypes( + getFilterValues(StringRef.class, ui.getSpeciesTypeFilter())); + displayExportLauncher(_("sammoa.title.export.exportObservations"), model.getExportObservationsFilename(), model, @@ -381,6 +397,14 @@ return ui.getModel(); } + protected <E> List<E> getFilterValues(Class<E> clazz, JList list) { + List<E> result = Lists.newArrayList(); + for (Object object : list.getSelectedValues()) { + result.add(clazz.cast(object)); + } + return result; + } + protected void displayExportLauncher(String effortTitle, String defaultFilename, ExportMapUIModel model,