Author: echatellier Date: 2015-04-16 16:54:19 +0000 (Thu, 16 Apr 2015) New Revision: 4194 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4194 Log: Fix sensitivity export necessary result not been included in isResultEnabled() Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java 2015-04-07 17:59:01 UTC (rev 4193) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java 2015-04-16 16:54:19 UTC (rev 4194) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2002 - 2015 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -247,8 +247,7 @@ getAvailableResult().add(key); } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#isEnabled(java.lang.String) + /* @deprecated since 4.4.0.0 : this method is duplicated with ResultManager#isEnabled(String) */ @Override public boolean isEnabled(String name) { Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2015-04-07 17:59:01 UTC (rev 4193) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2015-04-16 16:54:19 UTC (rev 4194) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2012 - 2015 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -62,6 +62,7 @@ * * @param name result name * @return {@code true} if result is enabled + * @deprecated since 4.4.0.0 : this method is duplicated with ResultManager#isEnabled(String) */ public boolean isEnabled(String name); Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java 2015-04-07 17:59:01 UTC (rev 4193) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java 2015-04-16 16:54:19 UTC (rev 4194) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2012 - 2015 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -374,6 +374,7 @@ * * @param name result name * @return {@code true} if result is enabled + * @deprecated since 4.4.0.0 : this method is duplicated with ResultManager#isEnabled(String) */ @Override public boolean isEnabled(String name) { Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2015-04-07 17:59:01 UTC (rev 4193) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2015-04-16 16:54:19 UTC (rev 4194) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2007 - 2015 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -43,6 +43,7 @@ import fr.ifremer.isisfish.entities.Observation; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.ExportInfo; +import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.types.TimeStep; @@ -136,6 +137,14 @@ } } } + List<SensitivityExport> sensitivityExports = param.getSensitivityExport(); + if (sensitivityExports != null) { + for (SensitivityExport sensitivityExport : sensitivityExports) { + for (String resultName : sensitivityExport.getNecessaryResult()) { + enabledResult.add(resultName); + } + } + } List<Rule> rules = param.getRules(); if (rules != null) { for (Rule rule : rules) {