Author: chatellier Date: 2011-06-16 16:43:54 +0000 (Thu, 16 Jun 2011) New Revision: 3416 Log: Fix export compilation Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2011-06-16 16:15:36 UTC (rev 3415) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2011-06-16 16:43:54 UTC (rev 3416) @@ -155,8 +155,9 @@ * @return la liste des noms de toutes les régions disponible en local */ public static List<String> getExportNames() { - File dir = getExportDirectory(); - return getStorageNames(dir); + List<String> result = getStorageNames(getExportDirectory()); + result.addAll(getStorageNames(getCommunityExportDirectory())); + return result; } public static void checkout() throws VCSException { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-06-16 16:15:36 UTC (rev 3415) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-06-16 16:43:54 UTC (rev 3416) @@ -1121,28 +1121,28 @@ CommunityAnalysePlan( AnalysePlanStorage.getCommunityAnalysePlanDirectory(), - SimulatorStorage.SIMULATOR_TEMPLATE), + AnalysePlanStorage.ANALYSE_PLAN_TEMPLATE), CommunityExport( ExportStorage.getCommunityExportDirectory(), - SimulatorStorage.SIMULATOR_TEMPLATE), + ExportStorage.EXPORT_TEMPLATE), CommunityRule( RuleStorage.getCommunityRuleDirectory(), - SimulatorStorage.SIMULATOR_TEMPLATE), + RuleStorage.RULE_TEMPLATE), CommunityScript( ScriptStorage.getCommunityScriptDirectory(), - SimulatorStorage.SIMULATOR_TEMPLATE), + ScriptStorage.SCRIPT_TEMPLATE), CommunitySensitivity( SensitivityStorage.getCommunitySensitivityDirectory(), - SimulatorStorage.SIMULATOR_TEMPLATE), + SensitivityStorage.SENSIVITY_TEMPLATE), CommunitySensitivityExport( SensitivityExportStorage.getCommunitySensitivityExportDirectory(), - SimulatorStorage.SIMULATOR_TEMPLATE), + SensitivityExportStorage.SENSITIVITY_EXPORT_TEMPLATE), CommunitySimulator( SimulatorStorage.getCommunitySimulatorDirectory(), SimulatorStorage.SIMULATOR_TEMPLATE), CommunityFormule( FormuleStorage.getCommunityFormuleDirectory(), - SimulatorStorage.SIMULATOR_TEMPLATE); + FormuleStorage.FORMULE_TEMPLATE); protected File module; protected String templatePath;