Author: tchemit Date: 2012-08-02 15:18:27 +0200 (Thu, 02 Aug 2012) New Revision: 346 Url: http://forge.codelutin.com/repositories/revision/sammoa/346 Log: add GeoPoints method + remove file field from main export ui Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/ExportMapUI.css trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/ExportMapUI.jaxx 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/ExportMapUI.css =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/ExportMapUI.css 2012-08-02 13:17:22 UTC (rev 345) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/ExportMapUI.css 2012-08-02 13:18:27 UTC (rev 346) @@ -71,19 +71,14 @@ #exportObservations { text:"sammoa.action.exportObservationsMap"; } +#exportGeoPoints { + text:"sammoa.action.exportGeoPointsMap"; +} #exportDirectoryFileChooseAction { actionIcon:"fileChooser"; } -#exportEffortsFilenameLbl { - text:"sammoa.label.exportEffortsFilename"; -} - #exportDirectoryLbl { text:"sammoa.label.exportDirectory"; } - -#exportObservationsFilenameLbl { - text:"sammoa.label.exportObservationsFilename"; -} \ No newline at end of file Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/ExportMapUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/ExportMapUI.jaxx 2012-08-02 13:17:22 UTC (rev 345) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/ExportMapUI.jaxx 2012-08-02 13:18:27 UTC (rev 346) @@ -41,21 +41,6 @@ initializer='getContextValue(ExportMapUIHandler.class)'/> <Table fill='both' constraints='BorderLayout.CENTER'> - <!-- export directory--> - <row> - <cell anchor='west'> - <JLabel id='exportDirectoryLbl'/> - </cell> - <cell weightx='1' fill="horizontal"> - <JTextField id='exportDirectory' text='{model.getExportDirectory().getAbsolutePath()}' - onKeyReleased='getModel().setExportDirectory(new File(((JTextField)event.getSource()).getText()))'/> - </cell> - <cell anchor="east"> - <JButton id="exportDirectoryFileChooseAction" - onActionPerformed="getHandler().chooseEffortDirectory()"/> - </cell> - - </row> <!-- Campaign filter --> <row> <cell anchor='west'> @@ -98,22 +83,13 @@ </cell> </row> - <!-- export efforts filename--> + <!-- export efforts / geoPoints --> <row> - <cell anchor='west'> - <JLabel id='exportEffortsFilenameLbl'/> - </cell> - <cell fill='horizontal' weightx='1.0'> - <JTextField id='exportEffortsFilename' text='{model.getExportEffortsFilename()}' - onKeyReleased='model.setExportEffortsFilename(((JTextField)event.getSource()).getText())'/> - </cell> - </row> - - <!-- export efforts --> - <row> <cell columns='5' fill="both"> - <JPanel layout='{new BorderLayout()}'> - <JButton id='exportEfforts' constraints='BorderLayout.CENTER' + <JPanel layout='{new GridLayout(1,2,0,0)}'> + <JButton id='exportGeoPoints' constraints='BorderLayout.CENTER' + onActionPerformed='getHandler().exportGeoPoints()'/> + <JButton id='exportEfforts' onActionPerformed='getHandler().exportEfforts()'/> </JPanel> </cell> @@ -140,15 +116,29 @@ </cell> </row> <!-- export observations filename--> - <row> + <!-- export directory--> + <!--row> <cell anchor='west'> + <JLabel id='exportDirectoryLbl'/> + </cell> + <cell weightx='1' fill="horizontal"> + <JTextField id='exportDirectory' text='{model.getExportDirectory().getAbsolutePath()}' + onKeyReleased='getModel().setExportDirectory(new File(((JTextField)event.getSource()).getText()))'/> + </cell> + <cell anchor="east"> + <JButton id="exportDirectoryFileChooseAction" + onActionPerformed="getHandler().chooseEffortDirectory()"/> + </cell> + </row--> + <!--row> + <cell anchor='west'> <JLabel id='exportObservationsFilenameLbl'/> </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id='exportObservationsFilename' text='{model.getExportObservationsFilename()}' onKeyReleased='model.setExportObservationsFilename(((JTextField)event.getSource()).getText())'/> </cell> - </row> + </row--> <!--export observations --> <row> <cell columns='5' fill="both"> 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-02 13:17:22 UTC (rev 345) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/ExportMapUIHandler.java 2012-08-02 13:18:27 UTC (rev 346) @@ -188,23 +188,63 @@ ExportMapUIModel model = ui.getModel(); - ExportMapModel dataModel = - model.toModel(model.getExportEffortsFilename()); + boolean canContinue = askExportFile( + _("sammoa.title.export.exportEfforts"), + ExportMapUIModel.PROPERTY_EXPORT_EFFORTS_FILENAME, + model); - getExportMapService().exportEffortsMap(dataModel); + if (canContinue) { + ExportMapModel dataModel = + model.toModel(model.getExportEffortsFilename()); + + getExportMapService().exportEffortsMap(dataModel); + } } public void exportObservations() { ExportMapUIModel model = ui.getModel(); - ExportMapModel dataModel = - model.toModel(model.getExportObservationsFilename()); + boolean canContinue = askExportFile( + _("sammoa.title.export.exportObservations"), + ExportMapUIModel.PROPERTY_EXPORT_OBSERVATIONS_FILENAME, + model); - getExportMapService().exportObservationsMap(dataModel); + if (canContinue) { + ExportMapModel dataModel = + model.toModel(model.getExportObservationsFilename()); + + getExportMapService().exportObservationsMap(dataModel); + } } + public void exportGeoPoints() { + ExportMapUIModel model = ui.getModel(); + + boolean canContinue = askExportFile( + _("sammoa.title.export.exportGeoPoints"), + ExportMapUIModel.PROPERTY_EXPORT_GEO_POINTS_FILENAME, + model); + + if (canContinue) { + ExportMapModel dataModel = + model.toModel(model.getExportGeoPointsFilename()); + + getExportMapService().exportGeoPointsMap(dataModel); + } + } + + protected boolean askExportFile(String effortTitle, + String exportType, + ExportMapUIModel model) { + boolean canContinue = false; + + //TODO + return canContinue; + } + + /** * Remplit le modèle d'une liste graphique avec la liste des entités d'un * type donné sur un service de persistance donné. @@ -213,7 +253,7 @@ * @param incomingData les données à mettre dans la liste * @since 0.5 */ - public <E> void prepareList(BeanListHeader<E> list, List<E> incomingData) { + protected <E> void prepareList(BeanListHeader<E> list, List<E> incomingData) { Class<E> beanType = list.getBeanType(); 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-02 13:17:22 UTC (rev 345) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/ExportMapUIModel.java 2012-08-02 13:18:27 UTC (rev 346) @@ -53,6 +53,8 @@ public static final String PROPERTY_EXPORT_OBSERVATIONS_FILENAME = "exportObservationsFilename"; + public static final String PROPERTY_EXPORT_GEO_POINTS_FILENAME = "exportGeoPointsFilename"; + protected List<Campaign> campaigns; protected Campaign selectedCampaign; @@ -82,6 +84,7 @@ protected String exportEffortsFilename; protected String exportObservationsFilename; + protected String exportGeoPointsFilename; public File getExportDirectory() { return exportDirectory; @@ -113,6 +116,16 @@ firePropertyChange(PROPERTY_EXPORT_OBSERVATIONS_FILENAME, oldValue, exportObservationsFilename); } + public String getExportGeoPointsFilename() { + return exportGeoPointsFilename; + } + + public void setExportGeoPointsFilename(String exportGeoPointsFilename) { + String oldValue = this.exportGeoPointsFilename; + this.exportGeoPointsFilename = exportGeoPointsFilename; + firePropertyChange(PROPERTY_EXPORT_GEO_POINTS_FILENAME, oldValue, exportGeoPointsFilename); + } + public List<Campaign> getCampaigns() { if (campaigns == null) { campaigns = Lists.newArrayList();