r558 - trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map - Coser-commits

24 Jan 2011

Author: chatellier
Date: 2011-01-24 17:11:31 +0000 (Mon, 24 Jan 2011)
New Revision: 558

Log:
Ajout des facades et de la legende de la carte

Modified:
   trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapAction.java
   trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapDataAction.java
   trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SpeciesAction.java
   trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SurveyAction.java

Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapAction.java
===================================================================

--- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapAction.java	2011-01-24 17:11:07 UTC (rev 557)
+++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapAction.java	2011-01-24 17:11:31 UTC (rev 558)
@@ -22,6 +22,10 @@
 
 package fr.ifremer.coser.web.actions.map;
 
+import fr.ifremer.coser.CoserBusinessException;
+import fr.ifremer.coser.services.WebService;
+import fr.ifremer.coser.web.CoserWebException;
+import fr.ifremer.coser.web.ServiceFactory;
 import fr.ifremer.coser.web.actions.common.CoserAction;
 
 /**
@@ -38,10 +42,20 @@
     /** serialVersionUID. */
     private static final long serialVersionUID = 1663244944108703571L;
 
+    protected String facade;
+
     protected String survey;
 
     protected String species;
 
+    public void setFacade(String facade) {
+        this.facade = facade;
+    }
+
+    public String getFacade() {
+        return facade;
+    }
+
     public String getSurvey() {
         return survey;
     }
@@ -57,4 +71,15 @@
     public void setSpecies(String species) {
         this.species = species;
     }
+    
+    public String getSpeciesDisplayName() {
+        WebService webService = ServiceFactory.getWebService();
+        String displayName = null;
+        try {
+            displayName = webService.getSpeciesForSurvey(survey).get(species);
+        } catch (CoserBusinessException ex) {
+            throw new CoserWebException("Can't get species display name", ex);
+        }
+        return displayName;
+    }
 }

Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapDataAction.java
===================================================================
--- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapDataAction.java	2011-01-24 17:11:07 UTC (rev 557)
+++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapDataAction.java	2011-01-24 17:11:31 UTC (rev 558)
@@ -37,7 +37,7 @@
 import fr.ifremer.coser.web.actions.common.CoserAction;
 
 /**
- * Appéle par le navigateur pour recuperer le contenu de l'image.
+ * Appelé par le navigateur pour récuperer le contenu de l'image.
  * 
  * @author chatellier
  * @version $Revision$
@@ -80,6 +80,7 @@
 
         InputStream input = null;
         try {
+            // work with null species (get Repartition-stations map)
             File mapImage = webService.getMapFile(survey, species);
             input = new FileInputStream(mapImage);
         } catch (CoserBusinessException ex) {

Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SpeciesAction.java
===================================================================
--- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SpeciesAction.java	2011-01-24 17:11:07 UTC (rev 557)
+++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SpeciesAction.java	2011-01-24 17:11:31 UTC (rev 558)
@@ -49,10 +49,20 @@
 
     private static final Log log = LogFactory.getLog(SpeciesAction.class);
 
+    protected String facade;
+
     protected String survey;
 
     protected Map<String, String> species;
 
+    public void setFacade(String facade) {
+        this.facade = facade;
+    }
+
+    public String getFacade() {
+        return facade;
+    }
+
     public String getSurvey() {
         return survey;
     }

Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SurveyAction.java
===================================================================
--- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SurveyAction.java	2011-01-24 17:11:07 UTC (rev 557)
+++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SurveyAction.java	2011-01-24 17:11:31 UTC (rev 558)
@@ -46,11 +46,15 @@
 
     protected String facade;
 
+    protected Map<String, String> surveys;
+
     public void setFacade(String facade) {
         this.facade = facade;
     }
 
-    protected Map<String, String> surveys;
+    public String getFacade() {
+        return facade;
+    }
 
     public Map<String, String> getSurveys() {
         return surveys;

    

r558 - trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map

chatellier＠users.labs.libre-entreprise.org

tags

participants (1)