Author: tchemit Date: 2012-08-11 10:56:03 +0200 (Sat, 11 Aug 2012) New Revision: 411 Url: http://forge.codelutin.com/repositories/revision/sammoa/411 Log: clean code Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/ExportMapUIHandler.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-11 08:54:13 UTC (rev 410) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/ExportMapUIHandler.java 2012-08-11 08:56:03 UTC (rev 411) @@ -148,7 +148,7 @@ @Override public void afterInitUI() { - ExportMapUIModel model = ui.getModel(); + ExportMapUIModel model = getModel(); model.setExportEffortsFilename("Efforts"); model.setExportObservationsFilename("Observations"); @@ -205,7 +205,7 @@ logger.info("New selected campain: {}", decorator.toString(newCampaign)); } - ExportMapUIModel model = ui.getModel(); + ExportMapUIModel model = getModel(); model.setSelectedStrates(Collections.<Strate>emptyList()); model.setSelectedSpecies(Collections.<Species>emptyList()); @@ -257,8 +257,6 @@ public void exportEfforts() { - ExportMapUIModel model = ui.getModel(); - Action startAction = new AbstractAction( _("sammoa.action.startExport"), SwingUtil.createActionIcon("accept")) { @@ -293,6 +291,7 @@ } }; + ExportMapUIModel model = getModel(); displayExportLauncher(_("sammoa.title.export.exportEfforts"), model.getExportEffortsFilename(), model, @@ -301,8 +300,6 @@ public void exportObservations() { - ExportMapUIModel model = ui.getModel(); - Action startAction = new AbstractAction( _("sammoa.action.startExport"), SwingUtil.createActionIcon("accept")) { @@ -337,6 +334,8 @@ } } }; + + ExportMapUIModel model = getModel(); displayExportLauncher(_("sammoa.title.export.exportObservations"), model.getExportObservationsFilename(), model, @@ -345,8 +344,8 @@ public void exportGeoPoints() { - ExportMapUIModel model = ui.getModel(); + Action startAction = new AbstractAction( _("sammoa.action.startExport"), SwingUtil.createActionIcon("accept")) { @@ -363,7 +362,7 @@ SammoaUtil.updateBusyState(fileChooserUI, true); try { - ExportMapUIModel model = ui.getModel(); + ExportMapUIModel model = getModel(); // persist the file name model.setExportGeoPointsFilename(model.getExportFilename()); @@ -382,6 +381,8 @@ } } }; + + ExportMapUIModel model = getModel(); displayExportLauncher(_("sammoa.title.export.exportGeoPoints"), model.getExportGeoPointsFilename(), model,