From tchemit@users.forge.codelutin.com Thu Aug  2 15:18:27 2012
From: tchemit@users.forge.codelutin.com
To: sammoa-commits@list.forge.codelutin.com
Subject: [Sammoa-commits] r346 -
	trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap
Date: Thu, 02 Aug 2012 15:18:27 +0200
Message-ID: <20120802131827.9553716298@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5706497839866153667=="

--===============5706497839866153667==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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/Ex=
portMapUI.css
   trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/Ex=
portMapUI.jaxx
   trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/Ex=
portMapUIHandler.java
   trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/Ex=
portMapUIModel.java

Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/expor=
tMap/ExportMapUI.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/E=
xportMapUI.css	2012-08-02 13:17:22 UTC (rev 345)
+++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/E=
xportMapUI.css	2012-08-02 13:18:27 UTC (rev 346)
@@ -71,19 +71,14 @@
 #exportObservations {
   text:"sammoa.action.exportObservationsMap";
 }
+#exportGeoPoints {
+  text:"sammoa.action.exportGeoPointsMap";
+}
=20
 #exportDirectoryFileChooseAction {
   actionIcon:"fileChooser";
 }
=20
-#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/expor=
tMap/ExportMapUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/E=
xportMapUI.jaxx	2012-08-02 13:17:22 UTC (rev 345)
+++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/E=
xportMapUI.jaxx	2012-08-02 13:18:27 UTC (rev 346)
@@ -41,21 +41,6 @@
                       initializer=3D'getContextValue(ExportMapUIHandler.clas=
s)'/>
=20
   <Table fill=3D'both' constraints=3D'BorderLayout.CENTER'>
-    <!-- export directory-->
-    <row>
-     <cell anchor=3D'west'>
-       <JLabel id=3D'exportDirectoryLbl'/>
-     </cell>
-     <cell weightx=3D'1' fill=3D"horizontal">
-       <JTextField id=3D'exportDirectory' text=3D'{model.getExportDirectory(=
).getAbsolutePath()}'
-                   onKeyReleased=3D'getModel().setExportDirectory(new File((=
(JTextField)event.getSource()).getText()))'/>
-     </cell>
-     <cell anchor=3D"east">
-       <JButton id=3D"exportDirectoryFileChooseAction"
-                onActionPerformed=3D"getHandler().chooseEffortDirectory()"/>
-     </cell>
-
-    </row>
     <!-- Campaign filter -->
     <row>
      <cell anchor=3D'west'>
@@ -98,22 +83,13 @@
       </cell>
     </row>
=20
-    <!-- export efforts filename-->
+    <!-- export efforts / geoPoints -->
     <row>
-     <cell anchor=3D'west'>
-       <JLabel id=3D'exportEffortsFilenameLbl'/>
-     </cell>
-     <cell fill=3D'horizontal' weightx=3D'1.0'>
-       <JTextField id=3D'exportEffortsFilename' text=3D'{model.getExportEffo=
rtsFilename()}'
-              onKeyReleased=3D'model.setExportEffortsFilename(((JTextField)e=
vent.getSource()).getText())'/>
-     </cell>
-    </row>
-
-    <!-- export efforts -->
-    <row>
       <cell columns=3D'5' fill=3D"both">
-        <JPanel layout=3D'{new BorderLayout()}'>
-          <JButton id=3D'exportEfforts' constraints=3D'BorderLayout.CENTER'
+        <JPanel layout=3D'{new GridLayout(1,2,0,0)}'>
+          <JButton id=3D'exportGeoPoints' constraints=3D'BorderLayout.CENTER'
+                   onActionPerformed=3D'getHandler().exportGeoPoints()'/>
+          <JButton id=3D'exportEfforts'
                    onActionPerformed=3D'getHandler().exportEfforts()'/>
         </JPanel>
       </cell>
@@ -140,15 +116,29 @@
       </cell>
     </row>
     <!-- export observations filename-->
-    <row>
+    <!-- export directory-->
+    <!--row>
      <cell anchor=3D'west'>
+       <JLabel id=3D'exportDirectoryLbl'/>
+     </cell>
+     <cell weightx=3D'1' fill=3D"horizontal">
+       <JTextField id=3D'exportDirectory' text=3D'{model.getExportDirectory(=
).getAbsolutePath()}'
+                   onKeyReleased=3D'getModel().setExportDirectory(new File((=
(JTextField)event.getSource()).getText()))'/>
+     </cell>
+     <cell anchor=3D"east">
+       <JButton id=3D"exportDirectoryFileChooseAction"
+                onActionPerformed=3D"getHandler().chooseEffortDirectory()"/>
+     </cell>
+    </row-->
+    <!--row>
+     <cell anchor=3D'west'>
        <JLabel id=3D'exportObservationsFilenameLbl'/>
      </cell>
      <cell fill=3D'horizontal' weightx=3D'1.0'>
        <JTextField id=3D'exportObservationsFilename' text=3D'{model.getExpor=
tObservationsFilename()}'
               onKeyReleased=3D'model.setExportObservationsFilename(((JTextFi=
eld)event.getSource()).getText())'/>
      </cell>
-    </row>
+    </row-->
     <!--export observations -->
     <row>
       <cell columns=3D'5' fill=3D"both">

Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/expor=
tMap/ExportMapUIHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/E=
xportMapUIHandler.java	2012-08-02 13:17:22 UTC (rev 345)
+++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/E=
xportMapUIHandler.java	2012-08-02 13:18:27 UTC (rev 346)
@@ -188,23 +188,63 @@
=20
         ExportMapUIModel model =3D ui.getModel();
=20
-        ExportMapModel dataModel =3D
-                model.toModel(model.getExportEffortsFilename());
+        boolean canContinue =3D askExportFile(
+                _("sammoa.title.export.exportEfforts"),
+                ExportMapUIModel.PROPERTY_EXPORT_EFFORTS_FILENAME,
+                model);
=20
-        getExportMapService().exportEffortsMap(dataModel);
+        if (canContinue) {
+            ExportMapModel dataModel =3D
+                    model.toModel(model.getExportEffortsFilename());
+
+            getExportMapService().exportEffortsMap(dataModel);
+        }
     }
=20
     public void exportObservations() {
=20
         ExportMapUIModel model =3D ui.getModel();
=20
-        ExportMapModel dataModel =3D
-                model.toModel(model.getExportObservationsFilename());
+        boolean canContinue =3D askExportFile(
+                _("sammoa.title.export.exportObservations"),
+                ExportMapUIModel.PROPERTY_EXPORT_OBSERVATIONS_FILENAME,
+                model);
=20
-        getExportMapService().exportObservationsMap(dataModel);
+        if (canContinue) {
+            ExportMapModel dataModel =3D
+                    model.toModel(model.getExportObservationsFilename());
+
+            getExportMapService().exportObservationsMap(dataModel);
+        }
     }
=20
+    public void exportGeoPoints() {
=20
+        ExportMapUIModel model =3D ui.getModel();
+
+        boolean canContinue =3D askExportFile(
+                _("sammoa.title.export.exportGeoPoints"),
+                ExportMapUIModel.PROPERTY_EXPORT_GEO_POINTS_FILENAME,
+                model);
+
+        if (canContinue) {
+            ExportMapModel dataModel =3D
+                    model.toModel(model.getExportGeoPointsFilename());
+
+            getExportMapService().exportGeoPointsMap(dataModel);
+        }
+    }
+
+    protected boolean askExportFile(String effortTitle,
+                                    String exportType,
+                                    ExportMapUIModel model) {
+        boolean canContinue =3D false;
+
+        //TODO
+        return canContinue;
+    }
+
+
     /**
      * Remplit le mod=C3=A8le d'une liste graphique avec la liste des entit=
=C3=A9s d'un
      * type donn=C3=A9 sur un service de persistance donn=C3=A9.
@@ -213,7 +253,7 @@
      * @param incomingData les donn=C3=A9es =C3=A0 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> incomingD=
ata) {
=20
         Class<E> beanType =3D list.getBeanType();
=20

Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/expor=
tMap/ExportMapUIModel.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/E=
xportMapUIModel.java	2012-08-02 13:17:22 UTC (rev 345)
+++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/exportMap/E=
xportMapUIModel.java	2012-08-02 13:18:27 UTC (rev 346)
@@ -53,6 +53,8 @@
=20
     public static final String PROPERTY_EXPORT_OBSERVATIONS_FILENAME =3D "ex=
portObservationsFilename";
=20
+    public static final String PROPERTY_EXPORT_GEO_POINTS_FILENAME =3D "expo=
rtGeoPointsFilename";
+
     protected List<Campaign> campaigns;
=20
     protected Campaign selectedCampaign;
@@ -82,6 +84,7 @@
     protected String exportEffortsFilename;
=20
     protected String exportObservationsFilename;
+    protected String exportGeoPointsFilename;
=20
     public File getExportDirectory() {
         return exportDirectory;
@@ -113,6 +116,16 @@
         firePropertyChange(PROPERTY_EXPORT_OBSERVATIONS_FILENAME, oldValue, =
exportObservationsFilename);
     }
=20
+    public String getExportGeoPointsFilename() {
+        return exportGeoPointsFilename;
+    }
+
+    public void setExportGeoPointsFilename(String exportGeoPointsFilename) {
+        String oldValue =3D this.exportGeoPointsFilename;
+        this.exportGeoPointsFilename =3D exportGeoPointsFilename;
+        firePropertyChange(PROPERTY_EXPORT_GEO_POINTS_FILENAME, oldValue, ex=
portGeoPointsFilename);
+    }
+
     public List<Campaign> getCampaigns() {
         if (campaigns =3D=3D null) {
             campaigns =3D Lists.newArrayList();


--===============5706497839866153667==--