This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit bee747698d8a1fd8bd9f906ca926ffa0a5b3bc4f Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 21 18:03:47 2015 +0100 pas de calcul de zone au depart --- .../echobase/ui/actions/exportCoser/Configure.java | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java index a9d37c0..d599329 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java @@ -21,7 +21,6 @@ package fr.ifremer.echobase.ui.actions.exportCoser; * #L% */ -import com.google.common.collect.Maps; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.references.Mission; import fr.ifremer.echobase.persistence.JdbcConfiguration; @@ -30,7 +29,6 @@ import fr.ifremer.echobase.services.service.exportCoser.ExportCoserConfiguration import fr.ifremer.echobase.ui.EchoBaseSession; import fr.ifremer.echobase.ui.actions.AbstractConfigureAction; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; @@ -68,12 +66,6 @@ public class Configure extends AbstractConfigureAction<ExportCoserConfiguration> protected Map<String, String> facades; /** - * Universe of zones (coming from Coser) - * for a given facade. - */ - protected Map<String, String> zones; - - /** * If coser services are not reachable. */ protected boolean coserUnreachable; @@ -91,7 +83,7 @@ public class Configure extends AbstractConfigureAction<ExportCoserConfiguration> } public Map<String, String> getZones() { - return zones; + return Collections.emptyMap(); } public Map<String, String> getPopulationIndicators() { @@ -156,17 +148,6 @@ public class Configure extends AbstractConfigureAction<ExportCoserConfiguration> log.error(e); } coserUnreachable = true; - return; - } - - // Get Zones from Coser - if (StringUtils.isNotEmpty(getModel().getFacade())) { - - zones = coserApiService.getZonesForFacade(getModel().getFacade()); - } else { - - // No zone to display - zones = Maps.newHashMap(); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.