Author: chatellier Date: 2011-01-12 09:23:01 +0000 (Wed, 12 Jan 2011) New Revision: 498 Log: Refactoring zone>facade, subzone > zone Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/ServiceFactory.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphDataAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/SubzoneAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/ZoneAction.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/SubzoneAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/ZoneAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphDataAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/SubzoneAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/ZoneAction.java trunk/coser-web/src/main/webapp/WEB-INF/content/com/zone.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/map/zone.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/pop/zone.jsp Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2011-01-12 09:21:35 UTC (rev 497) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2011-01-12 09:23:01 UTC (rev 498) @@ -460,20 +460,4 @@ MatrixND matrix = projectService.getLengthStructure(project, selection); Assert.assertNotNull(matrix); } - - /** - * Test la recuperation du nom de la campagne. - * - * @throws CoserBusinessException - */ - @Test - public void getProjectSurveyName() throws CoserBusinessException { - Project project = createTestProject(projectService, true); - String survey = projectService.getProjectSurveyName(project.getControl()); - Assert.assertEquals("COSER_TEST", survey); - - Selection selection = projectService.initProjectSelection(project); - survey = projectService.getProjectSurveyName(selection); - Assert.assertEquals("COSER_TEST", survey); - } } Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2011-01-12 09:21:35 UTC (rev 497) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2011-01-12 09:23:01 UTC (rev 498) @@ -27,7 +27,6 @@ import java.io.File; import java.net.URL; -import java.util.Map; import org.apache.commons.collections.map.MultiKeyMap; import org.junit.Assert; @@ -35,6 +34,7 @@ import org.junit.Test; import fr.ifremer.coser.CoserBusinessException; +import fr.ifremer.coser.storage.DataStorage; /** * Test du service de l'interface web. @@ -82,7 +82,7 @@ */ @Test public void testGetZones() throws CoserBusinessException { - Map<String, String[]> zones = webService.getZonesMap(); + DataStorage zones = webService.getZonesMap(); Assert.assertEquals(16, zones.size()); } Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/ServiceFactory.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/ServiceFactory.java 2011-01-12 09:21:35 UTC (rev 497) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/ServiceFactory.java 2011-01-12 09:23:01 UTC (rev 498) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -25,7 +25,6 @@ import org.nuiton.i18n.I18n; import org.nuiton.util.ArgumentsParserException; -import fr.ifremer.coser.services.PublicationService; import fr.ifremer.coser.services.WebService; /** Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphAction.java 2011-01-12 09:21:35 UTC (rev 497) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphAction.java 2011-01-12 09:23:01 UTC (rev 498) @@ -28,22 +28,6 @@ * Affiche le graphique demandé. * * Parametre : zone, species, indicator. - * - * Based on eastwoood, same doc as google chart api : - * http://code.google.com/apis/chart/docs/making_charts.html - * - * chart?cht=<chart_type>&chd=<chart_data>&chs=<chart_size>&...additional_parameters... - * - * Dans ce cas, on va faire un graphe avec des points pour les valeurs - * et des traits (en dessous/au dessus) pour les ecarts types. - * chd=t: - * 12,16,16,24,26,28,41,51,66,68,13,45,81| - * 16,14,22,34,22,31,31,48,71,64,15,38,84| - * 8,6,4,5,2,13,9,8,7,6,1,8,8 - * chm= - * o,0000FF,0,-1,0| - * h,FF0000,0,0:9:,5| - * h,FF0000,0,0:9:,5 * * @author chatellier * @version $Revision$ @@ -60,8 +44,6 @@ protected String indicator; - protected String chartUrl; - public String getZone() { return zone; } @@ -80,7 +62,6 @@ @Override public String execute() { - return SUCCESS; } } Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphDataAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphDataAction.java 2011-01-12 09:21:35 UTC (rev 497) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphDataAction.java 2011-01-12 09:23:01 UTC (rev 498) @@ -42,22 +42,6 @@ * Affiche le graphique demandé. * * Parametre : zone, species, indicator. - * - * Based on eastwoood, same doc as google chart api : - * http://code.google.com/apis/chart/docs/making_charts.html - * - * chart?cht=<chart_type>&chd=<chart_data>&chs=<chart_size>&...additional_parameters... - * - * Dans ce cas, on va faire un graphe avec des points pour les valeurs - * et des traits (en dessous/au dessus) pour les ecarts types. - * chd=t: - * 12,16,16,24,26,28,41,51,66,68,13,45,81| - * 16,14,22,34,22,31,31,48,71,64,15,38,84| - * 8,6,4,5,2,13,9,8,7,6,1,8,8 - * chm= - * o,0000FF,0,-1,0| - * h,FF0000,0,0:9:,5| - * h,FF0000,0,0:9:,5 * * @author chatellier * @version $Revision$ @@ -71,7 +55,7 @@ private static final long serialVersionUID = 3385467755357775199L; protected String zone; - + protected String indicator; protected String chartUrl; @@ -91,12 +75,12 @@ public void setIndicator(String indicator) { this.indicator = indicator; } - + @Action(results= {@Result(type="stream", params={"contentType", "image/png", "inputName", "inputStream"})}) public String execute() { return SUCCESS; } - + public InputStream getInputStream() { WebService webService = ServiceFactory.getWebService(); @@ -112,7 +96,7 @@ } catch (FileNotFoundException ex) { throw new CoserWebException("Can't get map file", ex); } - + return input; } } Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/SubzoneAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/SubzoneAction.java 2011-01-12 09:21:35 UTC (rev 497) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/SubzoneAction.java 2011-01-12 09:23:01 UTC (rev 498) @@ -45,10 +45,10 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; - protected String mainZone; + protected String facade; - public void setMainZone(String mainZone) { - this.mainZone = mainZone; + public void setFacade(String facade) { + this.facade = facade; } protected Map<String, String> zones; @@ -65,7 +65,7 @@ // renvoi la liste des id subzone-survey et leurs label // associé - zones = webService.getSurveysForZone(mainZone); + zones = webService.getZoneForFacade(facade); } catch (CoserBusinessException ex) { throw new CoserWebException("Can't get zone map", ex); Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/ZoneAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/ZoneAction.java 2011-01-12 09:21:35 UTC (rev 497) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/ZoneAction.java 2011-01-12 09:23:01 UTC (rev 498) @@ -22,7 +22,6 @@ package fr.ifremer.coser.web.actions.com; -import java.util.HashMap; import java.util.Map; import com.opensymphony.xwork2.ActionSupport; @@ -33,7 +32,7 @@ import fr.ifremer.coser.web.ServiceFactory; /** - * Action index, affiche la liste des zones majeures (main zone). + * Action index, affiche la liste des facades majeures. * * @author chatellier * @version $Revision$ @@ -46,25 +45,21 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; - protected Map<String, String> mainZones; + protected Map<String, String> facades; - public Map<String, String> getMainZones() { - return mainZones; + public Map<String, String> getFacades() { + return facades; } @Override public String execute() { - mainZones = new HashMap<String, String>(); - WebService webService = ServiceFactory.getWebService(); try { - Map<String, String[]> zonesMap = webService.getZonesMap(); + + // renvoi la liste des facadeid et leur label associé + facades = webService.getFacades(); - for (Map.Entry<String, String[]> zoneMapEntry : zonesMap.entrySet()) { - mainZones.put(zoneMapEntry.getValue()[0], zoneMapEntry.getValue()[0]); - } - } catch (CoserBusinessException ex) { throw new CoserWebException("Can't get zone map", ex); } 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-12 09:21:35 UTC (rev 497) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapDataAction.java 2011-01-12 09:23:01 UTC (rev 498) @@ -26,9 +26,7 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream; -import java.io.OutputStream; -import org.apache.commons.io.IOUtils; import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Result; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SubzoneAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SubzoneAction.java 2011-01-12 09:21:35 UTC (rev 497) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SubzoneAction.java 2011-01-12 09:23:01 UTC (rev 498) @@ -45,10 +45,10 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; - protected String mainZone; + protected String facade; - public void setMainZone(String mainZone) { - this.mainZone = mainZone; + public void setFacade(String facade) { + this.facade = facade; } protected Map<String, String> zones; @@ -65,7 +65,7 @@ // renvoi la liste des id subzone-survey et leurs label // associé - zones = webService.getSurveysForZone(mainZone); + zones = webService.getZoneForFacade(facade); } catch (CoserBusinessException ex) { throw new CoserWebException("Can't get zone map", ex); Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/ZoneAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/ZoneAction.java 2011-01-12 09:21:35 UTC (rev 497) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/ZoneAction.java 2011-01-12 09:23:01 UTC (rev 498) @@ -22,7 +22,6 @@ package fr.ifremer.coser.web.actions.map; -import java.util.HashMap; import java.util.Map; import com.opensymphony.xwork2.ActionSupport; @@ -33,7 +32,7 @@ import fr.ifremer.coser.web.ServiceFactory; /** - * Action index, affiche la liste des zones majeures (main zone). + * Action index, affiche la liste des facades majeures. * * @author chatellier * @version $Revision$ @@ -46,25 +45,20 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; - protected Map<String, String> mainZones; + protected Map<String, String> facades; - public Map<String, String> getMainZones() { - return mainZones; + public Map<String, String> getFacades() { + return facades; } @Override public String execute() { - mainZones = new HashMap<String, String>(); - WebService webService = ServiceFactory.getWebService(); try { - Map<String, String[]> zonesMap = webService.getZonesMap(); + // renvoi la liste des facadeid et leur label associé + facades = webService.getFacades(); - for (Map.Entry<String, String[]> zoneMapEntry : zonesMap.entrySet()) { - mainZones.put(zoneMapEntry.getValue()[0], zoneMapEntry.getValue()[0]); - } - } catch (CoserBusinessException ex) { throw new CoserWebException("Can't get zone map", ex); } Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphAction.java 2011-01-12 09:21:35 UTC (rev 497) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphAction.java 2011-01-12 09:23:01 UTC (rev 498) @@ -24,29 +24,10 @@ import com.opensymphony.xwork2.ActionSupport; -import fr.ifremer.coser.web.CoserWebConfig; -import fr.ifremer.coser.web.ServiceFactory; - /** * Affiche le graphique demandé. * * Parametre : zone, species, indicator. - * - * Based on eastwoood, same doc as google chart api : - * http://code.google.com/apis/chart/docs/making_charts.html - * - * chart?cht=<chart_type>&chd=<chart_data>&chs=<chart_size>&...additional_parameters... - * - * Dans ce cas, on va faire un graphe avec des points pour les valeurs - * et des traits (en dessous/au dessus) pour les ecarts types. - * chd=t: - * 12,16,16,24,26,28,41,51,66,68,13,45,81| - * 16,14,22,34,22,31,31,48,71,64,15,38,84| - * 8,6,4,5,2,13,9,8,7,6,1,8,8 - * chm= - * o,0000FF,0,-1,0| - * h,FF0000,0,0:9:,5| - * h,FF0000,0,0:9:,5 * * @author chatellier * @version $Revision$ @@ -65,8 +46,6 @@ protected String indicator; - protected String chartUrl; - public String getZone() { return zone; } @@ -93,30 +72,6 @@ @Override public String execute() { - - /*CoserWebConfig config = ServiceFactory.getCoserConfig(); - - chartUrl = config.getEastWoodUrl() + "/chart?"; - - // chart type - chartUrl += "&cht=lxy"; - // data - chartUrl += "&chd=t:10,20,40,80,90,95,99|20,30,40,50,60,70,80"; - // legend - chartUrl += "&chdl=Species"; - // legend position - chartUrl += "&chdlp=b"; - // markers (plot) - chartUrl += "&chm=o,FF0000,0,-1,5"; - // display x y axis - chartUrl += "&chxt=x,y"; - // taille - chartUrl += "&chs=600x300"; - // taille de la courbe - chartUrl += "&chls=2"; - // titre du graphique - chartUrl += "&chtt=" + zone + ";" + species + ";" + indicator;*/ - return SUCCESS; } } Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphDataAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphDataAction.java 2011-01-12 09:21:35 UTC (rev 497) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphDataAction.java 2011-01-12 09:23:01 UTC (rev 498) @@ -34,9 +34,7 @@ import com.opensymphony.xwork2.ActionSupport; import fr.ifremer.coser.CoserBusinessException; -import fr.ifremer.coser.services.PublicationService; import fr.ifremer.coser.services.WebService; -import fr.ifremer.coser.web.CoserWebConfig; import fr.ifremer.coser.web.CoserWebException; import fr.ifremer.coser.web.ServiceFactory; @@ -44,22 +42,6 @@ * Affiche le graphique demandé. * * Parametre : zone, species, indicator. - * - * Based on eastwoood, same doc as google chart api : - * http://code.google.com/apis/chart/docs/making_charts.html - * - * chart?cht=<chart_type>&chd=<chart_data>&chs=<chart_size>&...additional_parameters... - * - * Dans ce cas, on va faire un graphe avec des points pour les valeurs - * et des traits (en dessous/au dessus) pour les ecarts types. - * chd=t: - * 12,16,16,24,26,28,41,51,66,68,13,45,81| - * 16,14,22,34,22,31,31,48,71,64,15,38,84| - * 8,6,4,5,2,13,9,8,7,6,1,8,8 - * chm= - * o,0000FF,0,-1,0| - * h,FF0000,0,0:9:,5| - * h,FF0000,0,0:9:,5 * * @author chatellier * @version $Revision$ Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/SubzoneAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/SubzoneAction.java 2011-01-12 09:21:35 UTC (rev 497) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/SubzoneAction.java 2011-01-12 09:23:01 UTC (rev 498) @@ -45,10 +45,10 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; - protected String mainZone; + protected String facade; - public void setMainZone(String mainZone) { - this.mainZone = mainZone; + public void setFacade(String facade) { + this.facade = facade; } protected Map<String, String> zones; @@ -65,7 +65,7 @@ // renvoi la liste des id subzone-survey et leurs label // associé - zones = webService.getSurveysForZone(mainZone); + zones = webService.getZoneForFacade(facade); } catch (CoserBusinessException ex) { throw new CoserWebException("Can't get zone map", ex); Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/ZoneAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/ZoneAction.java 2011-01-12 09:21:35 UTC (rev 497) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/ZoneAction.java 2011-01-12 09:23:01 UTC (rev 498) @@ -22,7 +22,6 @@ package fr.ifremer.coser.web.actions.pop; -import java.util.HashMap; import java.util.Map; import com.opensymphony.xwork2.ActionSupport; @@ -33,7 +32,7 @@ import fr.ifremer.coser.web.ServiceFactory; /** - * Action index, affiche la liste des zones majeures (main zone). + * Action index, affiche la liste des facades majeures. * * @author chatellier * @version $Revision$ @@ -46,25 +45,20 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; - protected Map<String, String> mainZones; + protected Map<String, String> facades; - public Map<String, String> getMainZones() { - return mainZones; + public Map<String, String> getFacades() { + return facades; } @Override public String execute() { - mainZones = new HashMap<String, String>(); - WebService webService = ServiceFactory.getWebService(); try { - Map<String, String[]> zonesMap = webService.getZonesMap(); + // renvoi la liste des facadeid et leur label associé + facades = webService.getFacades(); - for (Map.Entry<String, String[]> zoneMapEntry : zonesMap.entrySet()) { - mainZones.put(zoneMapEntry.getValue()[0], zoneMapEntry.getValue()[0]); - } - } catch (CoserBusinessException ex) { throw new CoserWebException("Can't get zone map", ex); } Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/com/zone.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/com/zone.jsp 2011-01-12 09:21:35 UTC (rev 497) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/com/zone.jsp 2011-01-12 09:23:01 UTC (rev 498) @@ -35,7 +35,7 @@ <br /> <s:form action="subzone" method="get"> - <s:select name="mainZone" list="mainZones" label="Select a zone" /> + <s:select name="facade" list="facades" label="Select a facade" /> <s:submit label="Suite"/> </s:form> </body> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/map/zone.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/map/zone.jsp 2011-01-12 09:21:35 UTC (rev 497) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/zone.jsp 2011-01-12 09:23:01 UTC (rev 498) @@ -35,7 +35,7 @@ <br /> <s:form action="subzone" method="get"> - <s:select name="mainZone" list="mainZones" label="Select a zone" /> + <s:select name="facade" list="facades" label="Select a facade" /> <s:submit label="Suite"/> </s:form> </body> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/pop/zone.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/pop/zone.jsp 2011-01-12 09:21:35 UTC (rev 497) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/zone.jsp 2011-01-12 09:23:01 UTC (rev 498) @@ -35,7 +35,7 @@ <br /> <s:form action="subzone" method="get"> - <s:select name="mainZone" list="mainZones" label="Select a zone" /> + <s:select name="facade" list="facades" label="Select a facade" /> <s:submit label="Suite"/> </s:form> </body>