- Isis-fish-commits - mailman.cloud.codelutin.com

r3419 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 17 Jun '11

17 Jun '11

Author: chatellier Date: 2011-06-17 12:13:36 +0000 (Fri, 17 Jun 2011) New Revision: 3419 Log: Fix preparation zip creation (including community scripts) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-06-17 09:41:30 UTC (rev 3418) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-06-17 12:13:36 UTC (rev 3419) @@ -74,6 +74,7 @@ import fr.ifremer.isisfish.datastore.RuleStorage; import fr.ifremer.isisfish.datastore.ScriptStorage; import fr.ifremer.isisfish.datastore.SensitivityExportStorage; +import fr.ifremer.isisfish.datastore.SensitivityStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.SimulatorStorage; import fr.ifremer.isisfish.export.SensitivityExport; @@ -1115,16 +1116,21 @@ List<Rule> rules = param.getRules(); for (Rule rule : rules) { String name = RuleStorage.getName(rule); - FileUtil.copy(new File(RuleStorage.getRuleDirectory(), name - + ".java"), - new File(tmpDirectory, RuleStorage.RULE_PATH + File ruleFile = new File(RuleStorage.getRuleDirectory(), name + ".java"); + if (!ruleFile.isFile()) { + ruleFile = new File(RuleStorage.getCommunityRuleDirectory(), name + ".java"); + } + FileUtil.copy(ruleFile, new File(tmpDirectory, RuleStorage.RULE_PATH + File.separator + name + ".java")); } + // copie des regles reclamées par les plans d'analyse for (String name : param.getExtraRules()) { - FileUtil.copy(new File(RuleStorage.getRuleDirectory(), name - + ".java"), - new File(tmpDirectory, RuleStorage.RULE_PATH + File ruleFile = new File(RuleStorage.getRuleDirectory(), name + ".java"); + if (!ruleFile.isFile()) { + ruleFile = new File(RuleStorage.getCommunityRuleDirectory(), name + ".java"); + } + FileUtil.copy(ruleFile, new File(tmpDirectory, RuleStorage.RULE_PATH + File.separator + name + ".java")); } @@ -1132,17 +1138,22 @@ List<AnalysePlan> plans = param.getAnalysePlans(); for (AnalysePlan plan : plans) { String name = AnalysePlanStorage.getName(plan); - FileUtil.copy(new File(AnalysePlanStorage - .getAnalysePlanDirectory(), name + ".java"), new File( - tmpDirectory, AnalysePlanStorage.ANALYSE_PLAN_PATH + File planFile = new File(AnalysePlanStorage.getAnalysePlanDirectory(), name + ".java"); + if (!planFile.isFile()) { + planFile = new File(AnalysePlanStorage.getCommunityAnalysePlanDirectory(), name + ".java"); + } + FileUtil.copy(planFile, new File(tmpDirectory, AnalysePlanStorage.ANALYSE_PLAN_PATH + File.separator + name + ".java")); } // copie de tous les exports a utiliser for (String name : param.getExportNames()) { name = name.endsWith(".java") ? name : name + ".java"; - FileUtil.copy( - new File(ExportStorage.getExportDirectory(), name), + File exportFile = new File(ExportStorage.getExportDirectory(), name); + if (!exportFile.isFile()) { + exportFile = new File(ExportStorage.getCommunityExportDirectory(), name); + } + FileUtil.copy(exportFile, new File(tmpDirectory, ExportStorage.EXPORT_PATH + File.separator + name)); } @@ -1151,24 +1162,33 @@ for (SensitivityExport sensitivity : param.getSensitivityExport()) { String name = SensitivityExportStorage.getName(sensitivity); name = name.endsWith(".java") ? name : name + ".java"; - FileUtil.copy( - new File(SensitivityExportStorage.getSensitivityExportDirectory(), name), + File sensitivityFile = new File(SensitivityExportStorage.getSensitivityExportDirectory(), name); + if (!sensitivityFile.isFile()) { + sensitivityFile = new File(SensitivityExportStorage.getCommunitySensitivityExportDirectory(), name); + } + FileUtil.copy(sensitivityFile, new File(tmpDirectory, SensitivityExportStorage.SENSITIVITY_EXPORT_PATH + File.separator + name)); } // copie de tous les scripts a utiliser + // les script officiel prevalent sur les scripts communautés + FileUtil.copyRecursively(ScriptStorage.getCommunityScriptDirectory(), + tmpDirectory, ".*\\.java$"); FileUtil.copyRecursively(ScriptStorage.getScriptDirectory(), tmpDirectory, ".*\\.java$"); // copie de tous les simulateurs a utiliser - FileUtil.copy(new File(SimulatorStorage.getSimulatorDirectory(), - param.getSimulatorName()), new File(tmpDirectory, + File simulatorFile = new File(SimulatorStorage.getSimulatorDirectory(), param.getSimulatorName()); + if (!simulatorFile.isFile()) { + simulatorFile = new File(SimulatorStorage.getCommunitySimulatorDirectory(), param.getSimulatorName()); + } + FileUtil.copy(simulatorFile, new File(tmpDirectory, SimulatorStorage.SIMULATOR_PATH + File.separator + param.getSimulatorName())); // convert all file to UTF-8 - convertAllFile(control, tmpDirectory); + //convertAllFile(control, tmpDirectory); if (compile) { compileAllFile(control, tmpDirectory); @@ -1201,14 +1221,14 @@ } - /** + /* * Convertit tous les fichiers du répertoire directory en UTF-8, * pour eviter les erreurs d'encodage du la compilation * sur un autre systeme ne supportant pas l'encodage courant. * * @param control le controleur * @param directory le répertoire a convertir - */ + * protected void convertAllFile(SimulationControl control, File directory) { control.setText("Converting file to unicode"); @@ -1240,9 +1260,8 @@ // Convertion // //CompileHelper.convertToUnicode(fileToConvert); + }*/ - } - /** * Compile les fichiers présent dans le répertoire passé en * parametre, ce répertoire est hiérarchisé en: rules, exports, simulators @@ -1268,27 +1287,21 @@ List<File> fileToCompile = new ArrayList<File>(); - List<File> tmp = FileUtil.find(new File(directory, - ExportStorage.EXPORT_PATH), ".*\\.java$", true); - fileToCompile.addAll(tmp); - - tmp = FileUtil.find(new File(directory, - SensitivityExportStorage.SENSITIVITY_EXPORT_PATH), ".*\\.java$", true); - fileToCompile.addAll(tmp); + String[] modules = { + AnalysePlanStorage.ANALYSE_PLAN_PATH, + ExportStorage.EXPORT_PATH, + RuleStorage.RULE_PATH, + SensitivityExportStorage.SENSITIVITY_EXPORT_PATH, + SensitivityStorage.SENSITIVITY_PATH, + ScriptStorage.SCRIPT_PATH, + SimulatorStorage.SIMULATOR_PATH + }; - tmp = FileUtil.find(new File(directory, RuleStorage.RULE_PATH), - ".*\\.java$", true); - fileToCompile.addAll(tmp); + for (String module : modules) { + List<File> tmp = FileUtil.find(new File(directory, module), ".*\\.java$", true); + fileToCompile.addAll(tmp); + } - tmp = FileUtil.find(new File(directory, - AnalysePlanStorage.ANALYSE_PLAN_PATH), ".*\\.java$", true); - fileToCompile.addAll(tmp); - - tmp = FileUtil.find( - new File(directory, SimulatorStorage.SIMULATOR_PATH), - ".*\\.java$", true); - fileToCompile.addAll(tmp); - // // Compilation //

1 0

r3418 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org 17 Jun '11

17 Jun '11

Author: chatellier Date: 2011-06-17 09:41:30 +0000 (Fri, 17 Jun 2011) New Revision: 3418 Log: Fix vcs delete diff Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2011-06-17 08:39:59 UTC (rev 3417) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2011-06-17 09:41:30 UTC (rev 3418) @@ -191,15 +191,4 @@ public void reload() { content = null; } - - /** - * Return diff between current file content and VCS file content. - * - * @return diff as string - * @throws VCSException - * @throws IOException - */ - public String diff() throws VCSException, IOException { - return getVCS().getDiff(getFile()); - } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2011-06-17 08:39:59 UTC (rev 3417) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2011-06-17 09:41:30 UTC (rev 3418) @@ -136,11 +136,11 @@ * @return Le storage pour la regle */ static public ScriptStorage getCommunityScript(String name) { - String cacheName = getContextDatabaseCacheKey(name); + String cacheName = getCommunityDatabaseCacheKey(name); ScriptStorage result = scriptsCache.get(cacheName); if (result == null) { - result = new ScriptStorage(getContextDatabaseDirectory(), - getScriptDirectory(), name); + result = new ScriptStorage(getCommunityDatabaseDirectory(), + getCommunityScriptDirectory(), name); scriptsCache.put(cacheName, result); } return result; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2011-06-17 08:39:59 UTC (rev 3417) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2011-06-17 09:41:30 UTC (rev 3418) @@ -28,6 +28,7 @@ import static org.nuiton.i18n.I18n._; import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -327,7 +328,7 @@ } try { - getVCS().delete(files, _("isisfish.versionStorage.removed")); + getCurrentVCS().delete(files, _("isisfish.versionStorage.removed")); } catch (VCSException eee) { throw new StorageException( _("isisfish.error.delete.vcs.files"), eee); @@ -362,15 +363,26 @@ */ public void update() throws VCSException { prepare(); - getVCS().update(getFile(), true); + getCurrentVCS().update(getFile(), true); } public boolean isUpToDate() throws VCSException { prepare(); - return getVCS().isUpToDate(getFile()); + return getCurrentVCS().isUpToDate(getFile()); } /** + * Return diff between current file content and VCS file content. + * + * @return diff as string + * @throws VCSException + * @throws IOException + */ + public String diff() throws VCSException, IOException { + return getCurrentVCS().getDiff(getFile()); + } + + /** * Permet de ramener tout un répertoire du VCS. Utile seulement pour le * premier lancement pour scipts et exports. *

1 0

r3417 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: datastore ui/script util
by chatellier＠users.labs.libre-entreprise.org 17 Jun '11

17 Jun '11

Author: chatellier Date: 2011-06-17 08:39:59 +0000 (Fri, 17 Jun 2011) New Revision: 3417 Log: Fix la compilation des sources community qui dependent de sources officiel. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2011-06-16 16:43:54 UTC (rev 3416) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2011-06-17 08:39:59 UTC (rev 3417) @@ -166,11 +166,23 @@ * @throws IOException */ public void setContent(String content) throws IOException { + setContent(content, true); + } + + /** + * Set file content. + * + * @param content new content + * @param saveToFile if {@code true} also save content to file + * @throws IOException + */ + public void setContent(String content, boolean saveToFile) throws IOException { this.content = content; - // FIXME hard coded encoding ? - FileUtil.writeString(getFile(), content, "utf-8"); - lastContentUpdate = System.nanoTime(); - lastContentLength = getFile().length(); + if (saveToFile) { + FileUtil.writeString(getFile(), content, "utf-8"); + lastContentUpdate = System.nanoTime(); + lastContentLength = getFile().length(); + } } /** Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2011-06-16 16:43:54 UTC (rev 3416) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2011-06-17 08:39:59 UTC (rev 3417) @@ -119,7 +119,7 @@ * @return context cache key */ protected static String getCommunityDatabaseCacheKey(String key) { - String result = getContextDatabaseDirectory().getAbsolutePath() + key; + String result = getCommunityDatabaseDirectory().getAbsolutePath() + key; return result; } 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:43:54 UTC (rev 3416) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-06-17 08:39:59 UTC (rev 3417) @@ -509,12 +509,12 @@ } try { - //String content = scriptUI.getEditor().getText(); - //codeStorage.setContent(content); // setContent() or scriptUI.getEditor().save() // if setContent() only editor ask for t saving scriptUI.getEditor().save(); - + String content = scriptUI.getEditor().getText(); + codeStorage.setContent(content, false); + // notify tree to refresh ScriptTreeModel model = scriptUI.getScriptTreeModel(); model.fileModified(codeStorage.getFile()); @@ -686,49 +686,43 @@ public boolean checkScript() { boolean check = false; - String content = scriptUI.getEditor().getText(); // can't compile formule if (codeStorage instanceof FormuleStorage) { return false; } + if (log.isDebugEnabled()) { + log.debug("checkScript called"); + } + // save script before compile + saveScript(); + + JavaSourceStorage javaCode = (JavaSourceStorage) codeStorage; + StringWriter result = new StringWriter(); + PrintWriter out = new PrintWriter(result); try { - if (log.isDebugEnabled()) { - log.debug("checkScript called"); - } - // save script before commit - codeStorage.setContent(content); - JavaSourceStorage javaCode = (JavaSourceStorage) codeStorage; - StringWriter result = new StringWriter(); - PrintWriter out = new PrintWriter(result); - try { - int compileResult = javaCode.compile(false, out); + int compileResult = javaCode.compile(false, out); - if (compileResult == 0) { - check = true; - } - } catch (Exception eee) { - eee.printStackTrace(out); + if (compileResult == 0) { + check = true; } - out.flush(); + } catch (Exception eee) { + eee.printStackTrace(out); + } + out.flush(); - if (check) { - scriptUI.getActionLogArea().setText( - _("isisfish.script.compilation.ok", result.toString())); - scriptUI.getActionLogArea().setBackground(COLOR_SUCCESS); - } else { - scriptUI.getActionLogArea().setText( - _("isisfish.script.compilation.failed", result - .toString())); - scriptUI.getActionLogArea().setBackground(COLOR_FAILURE); - } - - } catch (IOException ex) { - if (log.isErrorEnabled()) { - log.error("Error on script check", ex); - } + if (check) { + scriptUI.getActionLogArea().setText( + _("isisfish.script.compilation.ok", result.toString())); + scriptUI.getActionLogArea().setBackground(COLOR_SUCCESS); + } else { + scriptUI.getActionLogArea().setText( + _("isisfish.script.compilation.failed", result + .toString())); + scriptUI.getActionLogArea().setBackground(COLOR_FAILURE); } + setStatusMessage(_("isisfish.message.check.finished")); return check; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2011-06-16 16:43:54 UTC (rev 3416) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2011-06-17 08:39:59 UTC (rev 3417) @@ -139,8 +139,7 @@ boolean force, PrintWriter out) { File src = source.getFile(); File dst = new File(destDir, source.getFQN().replace('.', - File.separatorChar) - + ".class"); + File.separatorChar) + ".class"); if (force || FileUtil.isNewer(src, dst)) { return compile(source.getRoot(), src, destDir, out); } @@ -187,7 +186,14 @@ int result = -10000; try { List<File> classpath = new ArrayList<File>(); + classpath.add(rootSrc.getAbsoluteFile()); + // FIXME echatellier 20110617 : hack depuis qu'il y a un + // nouveau dossier de sources de script "communauté", mais + // qui peu dépendre de sources du dossier "officiel" + if (rootSrc.equals(IsisFish.config.getCommunityDatabaseDirectory())) { + classpath.add(IsisFish.config.getDatabaseDirectory()); + } result = compile(classpath, src, dest, out); } catch (Exception eee) {

1 0

r3416 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: datastore ui/script
by chatellier＠users.labs.libre-entreprise.org 16 Jun '11

16 Jun '11

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;

1 0

r3415 - isis-fish/trunk/src/main/resources
by chatellier＠users.labs.libre-entreprise.org 16 Jun '11

16 Jun '11

Author: chatellier Date: 2011-06-16 16:15:36 +0000 (Thu, 16 Jun 2011) New Revision: 3415 Log: Wrong commit Modified: isis-fish/trunk/src/main/resources/log4j.properties Modified: isis-fish/trunk/src/main/resources/log4j.properties =================================================================== --- isis-fish/trunk/src/main/resources/log4j.properties 2011-06-16 16:15:05 UTC (rev 3414) +++ isis-fish/trunk/src/main/resources/log4j.properties 2011-06-16 16:15:36 UTC (rev 3415) @@ -41,6 +41,3 @@ log4j.logger.sensitivity=INFO log4j.logger.sensitivityexports=INFO log4j.logger.simulators=INFO - -log4j.logger.fr.ifremer.isisfish.datastore=DEBUG -log4j.logger.fr.ifremer.isisfish.vcs=DEBUG

1 0

r3414 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/datastore java/fr/ifremer/isisfish/ui/script resources
by chatellier＠users.labs.libre-entreprise.org 16 Jun '11

16 Jun '11

Author: chatellier Date: 2011-06-16 16:15:05 +0000 (Thu, 16 Jun 2011) New Revision: 3414 Log: Oubli?\195?\169 les exports 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 isis-fish/trunk/src/main/resources/log4j.properties 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:01:05 UTC (rev 3413) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2011-06-16 16:15:05 UTC (rev 3414) @@ -116,21 +116,38 @@ } /** - * Retourne le storage pour la regle demandée + * Retourne le storage pour l'export demandée * - * @param name le nom de la regle souhaitée - * @return Le storage pour la regle + * @param name le nom de l'export souhaitée + * @return Le storage pour l'export */ public static ExportStorage getExport(String name) { String cacheName = getContextDatabaseCacheKey(name); ExportStorage result = scriptsCache.get(cacheName); if (result == null) { - result = new ExportStorage(IsisFish.config.getContextDatabaseDirectory(), + result = new ExportStorage(getContextDatabaseDirectory(), getExportDirectory(), name); scriptsCache.put(cacheName, result); } return result; } + + /** + * Retourne le storage pour l'export demandée + * + * @param name le nom de l'export souhaitée + * @return Le storage pour l'export + */ + public static ExportStorage getCommunityExport(String name) { + String cacheName = getCommunityDatabaseCacheKey(name); + ExportStorage result = scriptsCache.get(cacheName); + if (result == null) { + result = new ExportStorage(getCommunityDatabaseDirectory(), + getCommunityExportDirectory(), name); + scriptsCache.put(cacheName, result); + } + return result; + } /** * Retourne la liste des noms de toutes les régions disponible en local 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:01:05 UTC (rev 3413) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-06-16 16:15:05 UTC (rev 3414) @@ -464,7 +464,7 @@ script = AnalysePlanStorage.getCommunityAnalysePlan(file.getName()); break; case CommunityExport: - script = RuleStorage.getCommunityRule(file.getName()); + script = ExportStorage.getCommunityExport(file.getName()); break; case CommunityScript: script = ScriptStorage.getCommunityScript(file.getName()); Modified: isis-fish/trunk/src/main/resources/log4j.properties =================================================================== --- isis-fish/trunk/src/main/resources/log4j.properties 2011-06-16 16:01:05 UTC (rev 3413) +++ isis-fish/trunk/src/main/resources/log4j.properties 2011-06-16 16:15:05 UTC (rev 3414) @@ -41,3 +41,6 @@ log4j.logger.sensitivity=INFO log4j.logger.sensitivityexports=INFO log4j.logger.simulators=INFO + +log4j.logger.fr.ifremer.isisfish.datastore=DEBUG +log4j.logger.fr.ifremer.isisfish.vcs=DEBUG

1 0

r3413 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: datastore ui/script
by chatellier＠users.labs.libre-entreprise.org 16 Jun '11

16 Jun '11

Author: chatellier Date: 2011-06-16 16:01:05 +0000 (Thu, 16 Jun 2011) New Revision: 3413 Log: Fixage du cache des storages. Ajout des sensitivity oubli?\195?\169s. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/AnalysePlanStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.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/AnalysePlanStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/AnalysePlanStorage.java 2011-06-16 15:19:52 UTC (rev 3412) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/AnalysePlanStorage.java 2011-06-16 16:01:05 UTC (rev 3413) @@ -142,7 +142,7 @@ * @return Le storage pour le plan */ static public AnalysePlanStorage getCommunityAnalysePlan(String name) { - String cacheName = getContextDatabaseCacheKey(name); + String cacheName = getCommunityDatabaseCacheKey(name); AnalysePlanStorage result = plansCache.get(cacheName); if (result == null) { result = new AnalysePlanStorage(getCommunityDatabaseDirectory(), Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java 2011-06-16 15:19:52 UTC (rev 3412) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java 2011-06-16 16:01:05 UTC (rev 3413) @@ -269,7 +269,7 @@ * @return Le storage pour la regle */ static public FormuleStorage getCommunityFormule(String category, String name) { - String key = category + File.separator + name; + String key = "community" + category + File.separator + name; FormuleStorage result = formulesCache.get(key); if (result == null) { String extension = FileUtil.extension(new File(name), "."); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2011-06-16 15:19:52 UTC (rev 3412) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2011-06-16 16:01:05 UTC (rev 3413) @@ -145,7 +145,7 @@ * @return Le storage pour la regle */ static public RuleStorage getCommunityRule(String name) { - String cacheName = getContextDatabaseCacheKey(name); + String cacheName = getCommunityDatabaseCacheKey(name); RuleStorage result = rulesCache.get(cacheName); if (result == null) { result = new RuleStorage(getCommunityDatabaseDirectory(), Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2011-06-16 15:19:52 UTC (rev 3412) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2011-06-16 16:01:05 UTC (rev 3413) @@ -132,7 +132,7 @@ * @return Le storage pour l'export */ public static SensitivityExportStorage getCommunitySensitivityExport(String name) { - String cacheName = getContextDatabaseCacheKey(name); + String cacheName = getCommunityDatabaseCacheKey(name); SensitivityExportStorage result = sensitivityExportsCache.get(cacheName); if (result == null) { result = new SensitivityExportStorage(getCommunityDatabaseDirectory(), Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityStorage.java 2011-06-16 15:19:52 UTC (rev 3412) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityStorage.java 2011-06-16 16:01:05 UTC (rev 3413) @@ -112,8 +112,9 @@ * @return le nom de tous les calculateurs de sensibilité existans en local */ public static List<String> getSensitivityNames() { - File dir = getSensitivityDirectory(); - return getStorageNames(dir); + List<String> result = getStorageNames(getSensitivityDirectory()); + result.addAll(getStorageNames(getCommunitySensitivityDirectory())); + return result; } /** @@ -131,6 +132,22 @@ } return result; } + + /** + * Retourne le storage pour le calculateur demandé. + * + * @param name le nom du calculateur souhaité + * @return Le {@link SensitivityStorage} pour le calculateur + */ + public static SensitivityStorage getCommunitySensitivity(String name) { + String cacheName = getCommunityDatabaseCacheKey(name); + SensitivityStorage result = sensitivityCache.get(cacheName); + if (result == null) { + result = new SensitivityStorage(getCommunityDatabaseDirectory(), getCommunitySensitivityDirectory(), name); + sensitivityCache.put(cacheName, result); + } + return result; + } /** * Retourne une nouvelle instance du calculateur. Compile le fichier si besoin Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2011-06-16 15:19:52 UTC (rev 3412) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2011-06-16 16:01:05 UTC (rev 3413) @@ -40,7 +40,6 @@ import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFish; -import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.vcs.VCS; import fr.ifremer.isisfish.vcs.VCSException; import fr.ifremer.isisfish.vcs.VCSNone; @@ -106,13 +105,23 @@ * Two simulation must have their own cache. * * @return context cache key - * - * TODO better place in other storage, but needed for region and java scripts */ protected static String getContextDatabaseCacheKey(String key) { String result = getContextDatabaseDirectory().getAbsolutePath() + key; return result; } + + /** + * Get cache storage key to use depending on context storage used. + * + * Two simulation must have their own cache and community scripts too. + * + * @return context cache key + */ + protected static String getCommunityDatabaseCacheKey(String key) { + String result = getContextDatabaseDirectory().getAbsolutePath() + key; + return result; + } /** * Get VCS instance for storage file. 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 15:19:52 UTC (rev 3412) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-06-16 16:01:05 UTC (rev 3413) @@ -472,6 +472,12 @@ case CommunitySimulator: script = SimulatorStorage.getCommunitySimulator(file.getName()); break; + case CommunitySensitivity: + script = SensitivityStorage.getCommunitySensitivity(file.getName()); + break; + case CommunitySensitivityExport: + script = SensitivityExportStorage.getCommunitySensitivityExport(file.getName()); + break; default: log.fatal("ScriptType unknown: " + file.getName()); } @@ -682,6 +688,11 @@ boolean check = false; String content = scriptUI.getEditor().getText(); + // can't compile formule + if (codeStorage instanceof FormuleStorage) { + return false; + } + try { if (log.isDebugEnabled()) { log.debug("checkScript called");

1 0

r3412 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 16 Jun '11

16 Jun '11

Author: chatellier Date: 2011-06-16 15:19:52 +0000 (Thu, 16 Jun 2011) New Revision: 3412 Log: modify default config Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-06-16 15:02:46 UTC (rev 3411) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-06-16 15:19:52 UTC (rev 3412) @@ -1055,7 +1055,7 @@ VCS_COMMUNITY_PROTOCOL("vcs.community.protocole", n_("isisfish.config.vcs.community.protocol.description"), "http"), VCS_COMMUNITY_USER_NAME("vcs.community.username", n_("isisfish.config.vcs.community.username.description"), ""), VCS_COMMUNITY_PASSWORD("vcs.community.password", n_("isisfish.config.vcs.community.password.description"), ""), - VCS_COMMUNITY_HOST_NAME("vcs.community.hostname", n_("isisfish.config.vcs.community.hostname.description"), "www.isis-fish.org"), + VCS_COMMUNITY_HOST_NAME("vcs.community.hostname", n_("isisfish.config.vcs.community.hostname.description"), "svn.isis-fish.org"), VCS_COMMUNITY_PATH("vcs.community.path", n_("isisfish.config.vcs.community.remotepath.description"), "/svn/isis-fish-community/"), // misc options

1 0

r3411 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: datastore ui/script util
by chatellier＠users.labs.libre-entreprise.org 16 Jun '11

16 Jun '11

Author: chatellier Date: 2011-06-16 15:02:46 +0000 (Thu, 16 Jun 2011) New Revision: 3411 Log: Multi VCS may now works Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/AnalysePlanStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/AnalysePlanStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/AnalysePlanStorage.java 2011-06-16 12:30:48 UTC (rev 3410) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/AnalysePlanStorage.java 2011-06-16 15:02:46 UTC (rev 3411) @@ -113,8 +113,9 @@ * @return les noms de tous les plans existant en local */ static public List<String> getAnalysePlanNames() { - File dir = getAnalysePlanDirectory(); - return AnalysePlanStorage.getStorageNames(dir); + List<String> result = getStorageNames(getAnalysePlanDirectory()); + result.addAll(getStorageNames(getCommunityAnalysePlanDirectory())); + return result; } /** @@ -133,6 +134,23 @@ } return result; } + + /** + * Retourne le storage pour le plan demandé. + * + * @param name le nom du plan souhaité + * @return Le storage pour le plan + */ + static public AnalysePlanStorage getCommunityAnalysePlan(String name) { + String cacheName = getContextDatabaseCacheKey(name); + AnalysePlanStorage result = plansCache.get(cacheName); + if (result == null) { + result = new AnalysePlanStorage(getCommunityDatabaseDirectory(), + getCommunityAnalysePlanDirectory(), name); + plansCache.put(cacheName, result); + } + return result; + } /** * Retourne une nouvelle instance du plan. Compile le fichier si besoin Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java 2011-06-16 12:30:48 UTC (rev 3410) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java 2011-06-16 15:02:46 UTC (rev 3411) @@ -260,6 +260,28 @@ } return result; } + + /** + * Retourne le storage pour la regle demandée + * + * @param name le nom de la regle souhaitée + * @param category la categorie de la regle + * @return Le storage pour la regle + */ + static public FormuleStorage getCommunityFormule(String category, String name) { + String key = category + File.separator + name; + FormuleStorage result = formulesCache.get(key); + if (result == null) { + String extension = FileUtil.extension(new File(name), "."); + if (!"".equals(extension)) { + name = name.substring(0, name.length() - (extension.length() + 1)); + } + result = new FormuleStorage(IsisFish.config.getCommunityDatabaseDirectory(), + getCommunityFormuleDirectory(), category, name, extension); + formulesCache.put(key, result); + } + return result; + } /** * creer une nouvelle formule, si la formule existait deja, elle est ecrasé Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2011-06-16 12:30:48 UTC (rev 3410) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2011-06-16 15:02:46 UTC (rev 3411) @@ -116,8 +116,9 @@ * @return all rule names found in local user database */ static public List<String> getRuleNames() { - File dir = getRuleDirectory(); - return RuleStorage.getStorageNames(dir); + List<String> rules = getStorageNames(getRuleDirectory()); + rules.addAll(getStorageNames(getCommunityRuleDirectory())); + return rules; } /** @@ -137,6 +138,22 @@ return result; } + /** + * Retourne le storage pour la regle demandée + * + * @param name le nom de la regle souhaitée + * @return Le storage pour la regle + */ + static public RuleStorage getCommunityRule(String name) { + String cacheName = getContextDatabaseCacheKey(name); + RuleStorage result = rulesCache.get(cacheName); + if (result == null) { + result = new RuleStorage(getCommunityDatabaseDirectory(), + getCommunityRuleDirectory(), name); + rulesCache.put(cacheName, result); + } + return result; + } /** * Retourne une nouvelle instance de la regle. Compile le fichier si besoin @@ -300,7 +317,6 @@ static public List<String> getRemoteRuleNames() { File dir = getRuleDirectory(); return getRemoteStorageNames(dir); - } /** Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2011-06-16 12:30:48 UTC (rev 3410) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2011-06-16 15:02:46 UTC (rev 3411) @@ -111,8 +111,8 @@ /** * Retourne le storage pour l'export demandé. * - * @param name le nom de la regle souhaitée - * @return Le storage pour la regle + * @param name le nom de la export souhaitée + * @return Le storage pour l'export */ public static SensitivityExportStorage getSensitivityExport(String name) { String cacheName = getContextDatabaseCacheKey(name); @@ -126,13 +126,31 @@ } /** + * Retourne le storage pour l'export demandé. + * + * @param name le nom de l'export souhaitée + * @return Le storage pour l'export + */ + public static SensitivityExportStorage getCommunitySensitivityExport(String name) { + String cacheName = getContextDatabaseCacheKey(name); + SensitivityExportStorage result = sensitivityExportsCache.get(cacheName); + if (result == null) { + result = new SensitivityExportStorage(getCommunityDatabaseDirectory(), + getCommunitySensitivityExportDirectory(), name); + sensitivityExportsCache.put(cacheName, result); + } + return result; + } + + /** * Retourne la liste des noms de toutes les régions disponible en local. * * @return la liste des noms de toutes les régions disponible en local */ public static List<String> getSensitivityExportNames() { - File dir = getSensitivityExportDirectory(); - return getStorageNames(dir); + List<String> result = getStorageNames(getSensitivityExportDirectory()); + result.addAll(getStorageNames(getCommunitySensitivityExportDirectory())); + return result; } public static void checkout() throws VCSException { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2011-06-16 12:30:48 UTC (rev 3410) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2011-06-16 15:02:46 UTC (rev 3411) @@ -131,7 +131,7 @@ SimulatorStorage result = simulatorsCache.get(cacheName); if (result == null) { result = new SimulatorStorage(getCommunityDatabaseDirectory(), - getSimulatorDirectory(), name); + getCommunitySimulatorDirectory(), name); simulatorsCache.put(cacheName, result); } return result; @@ -147,8 +147,8 @@ * @return la liste des noms de toutes les régions disponible en local */ static public List<String> getSimulatorNames() { - File dir = getSimulatorDirectory(); - List<String> result = getStorageNames(dir); + List<String> result = getStorageNames(getSimulatorDirectory()); + result.addAll(getStorageNames(getCommunitySimulatorDirectory())); return result; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2011-06-16 12:30:48 UTC (rev 3410) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2011-06-16 15:02:46 UTC (rev 3411) @@ -40,8 +40,10 @@ import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFish; +import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.vcs.VCS; import fr.ifremer.isisfish.vcs.VCSException; +import fr.ifremer.isisfish.vcs.VCSNone; /** * Classe permettant de géré l'interaction avec le VCS. @@ -105,7 +107,7 @@ * * @return context cache key * - * TODO better place in other storage, but needed for region anad java scrits + * TODO better place in other storage, but needed for region and java scripts */ protected static String getContextDatabaseCacheKey(String key) { String result = getContextDatabaseDirectory().getAbsolutePath() + key; @@ -113,6 +115,38 @@ } /** + * Get VCS instance for storage file. + * + * @return vcs instance + */ + protected VCS getCurrentVCS() { + return getCurrentVCS(getFile()); + } + + /** + * Get VCS instance for given file. + * + * @param file file to get VCS + * @return + */ + protected VCS getCurrentVCS(File file) { + VCS result; + String absolutePath = file.getAbsolutePath(); + if (absolutePath.startsWith(IsisFish.config.getDatabaseDirectory() + File.separator)) { + result = IsisFish.vcs; + } else if (absolutePath.startsWith(IsisFish.config.getCommunityDatabaseDirectory() + File.separator)) { + result = IsisFish.communityVcs; + } else { + result = new VCSNone(file.getParentFile(), "", "", "", null, "", ""); + } + + if (log.isDebugEnabled()) { + log.debug("VCS for file " + getFile() + " is " + result); + } + return result; + } + + /** * Get {@link VCS}. * * @return VCS @@ -263,7 +297,7 @@ if (log.isDebugEnabled()) { log.debug("files to add: " + files); } - getVCS().add(files, msg); + getCurrentVCS().add(files, msg); } /** 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 12:30:48 UTC (rev 3410) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-06-16 15:02:46 UTC (rev 3411) @@ -423,13 +423,18 @@ try { switch (mapping) { case Formule: + case CommunityFormule: String fullPath = file.getAbsolutePath(); int lastIndexOf = fullPath.lastIndexOf('/'); // in string .../aaa/bbb/ccc/ddd.java // get ccc String category = fullPath.substring(fullPath.lastIndexOf('/', lastIndexOf - 1) + 1, lastIndexOf); - script = FormuleStorage.getFormule(category, file.getName()); + if (mapping.equals(ScriptMapping.Formule)) { + script = FormuleStorage.getFormule(category, file.getName()); + } else { + script = FormuleStorage.getCommunityFormule(category, file.getName()); + } break; case Rule: script = RuleStorage.getRule(file.getName()); @@ -452,13 +457,14 @@ case SensitivityExport: script = SensitivityExportStorage.getSensitivityExport(file.getName()); break; - case CommunityFormule: - break; case CommunityRule: + script = RuleStorage.getCommunityRule(file.getName()); break; case CommunityAnalysePlan: + script = AnalysePlanStorage.getCommunityAnalysePlan(file.getName()); break; case CommunityExport: + script = RuleStorage.getCommunityRule(file.getName()); break; case CommunityScript: script = ScriptStorage.getCommunityScript(file.getName()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2011-06-16 12:30:48 UTC (rev 3410) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2011-06-16 15:02:46 UTC (rev 3411) @@ -28,7 +28,6 @@ import static org.nuiton.i18n.I18n._; import java.io.File; -import java.io.IOException; import java.io.PrintWriter; import java.lang.reflect.Method; import java.net.URL; @@ -94,7 +93,8 @@ } /** - * Load la class demandé + * Load la class demandé. + * * @param fqn le nom complet de la classe a charger * @return la classe souhaité ou null si la class n'est pas trouvée */

1 0

r3410 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 16 Jun '11

16 Jun '11

Author: chatellier Date: 2011-06-16 12:30:48 +0000 (Thu, 16 Jun 2011) New Revision: 3410 Log: Update xwork Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2011-06-15 15:16:46 UTC (rev 3409) +++ isis-fish/trunk/pom.xml 2011-06-16 12:30:48 UTC (rev 3410) @@ -35,7 +35,7 @@ <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> - <version>2.2.1.1</version> + <version>2.2.3</version> <scope>compile</scope> </dependency>

1 0