Author: echatellier Date: 2011-10-28 14:31:01 +0200 (Fri, 28 Oct 2011) New Revision: 3503 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3503 Log: Create new scripts in community repository Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-10-28 12:30:42 UTC (rev 3502) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-10-28 12:31:01 UTC (rev 3503) @@ -286,31 +286,31 @@ //TODO do test on category CodeSourceStorage script = null; switch (scriptType) { - case Formule: + case CommunityFormule: script = FormuleStorage.createFormule(category, realFilename, Language.JAVA); break; - case SimulationPlan: + case CommunitySimulationPlan: script = SimulationPlanStorage.getSimulationPlan(fileName); break; - case Export: - script = ExportStorage.getExport(fileName); + case CommunityExport: + script = ExportStorage.getCommunityExport(fileName); break; - case Rule: - script = RuleStorage.getRule(fileName); + case CommunityRule: + script = RuleStorage.getCommunityRule(fileName); break; - case Script: - script = ScriptStorage.getScript(fileName); + case CommunityScript: + script = ScriptStorage.getCommunityScript(fileName); break; - case Simulator: - script = SimulatorStorage.getSimulator(fileName); + case CommunitySimulator: + script = SimulatorStorage.getCommunitySimulator(fileName); break; - case Sensitivity: - script = SensitivityAnalysisStorage.getSensitivityAnalysis(fileName); + case CommunitySensitivity: + script = SensitivityAnalysisStorage.getCommunitySensitivityAnalysis(fileName); break; - case SensitivityExport: + case CommunitySensitivityExport: script = SensitivityExportStorage - .getSensitivityExport(fileName); + .getCommunitySensitivityExport(fileName); break; default: if (log.isErrorEnabled()) { @@ -320,8 +320,7 @@ if (script.exists()) { // Message d'erreur si le fichier existe en local. - String message = _("isisfish.error.file.already.exists", - fileName); + String message = _("isisfish.error.file.already.exists", fileName); Exception e = new RuntimeException(message); returnError(_("isisfish.error.script.create", fileName, e .getMessage()), e); @@ -459,7 +458,7 @@ case CommunityRule: script = RuleStorage.getCommunityRule(file.getName()); break; - case CommunityAnalysePlan: + case CommunitySimulationPlan: script = SimulationPlanStorage.getCommunitySimulationPlan(file.getName()); break; case CommunityExport: @@ -1127,7 +1126,7 @@ CommunitySensitivityExport( SensitivityExportStorage.getCommunitySensitivityExportDirectory(), SensitivityExportStorage.SENSITIVITY_EXPORT_TEMPLATE), - CommunityAnalysePlan( + CommunitySimulationPlan( SimulationPlanStorage.getCommunitySimulationPlanDirectory(), SimulationPlanStorage.SIMULATION_PLAN_TEMPLATE), CommunitySimulator( Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java 2011-10-28 12:30:42 UTC (rev 3502) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java 2011-10-28 12:31:01 UTC (rev 3503) @@ -56,7 +56,7 @@ ScriptMapping[] values = ScriptMapping.values(); mappings = new ArrayList<ScriptMapping>(values.length); for (ScriptMapping mapping : values) { - if (mapping.isOfficialVCS()) { + if (!mapping.isOfficialVCS()) { mappings.add(mapping); } }