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

r3963 - branches/4.0.1/src/main/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com 16 Apr '14

16 Apr '14

Author: echatellier Date: 2014-04-16 17:45:15 +0200 (Wed, 16 Apr 2014) New Revision: 3963 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3963 Log: Ajout d'un fixme pour un cas impossible Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2014-04-16 15:44:27 UTC (rev 3962) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2014-04-16 15:45:15 UTC (rev 3963) @@ -80,6 +80,7 @@ protected static String getHashCache(File fileCheckSum) { String result = ""; + // FIXME echatellier c'est pas possible que cela renvoit null SimulationContext context = SimulationContext.get(); if (context == null) { // on est pas dans une simulation

1 0

r3962 - in branches/4.0.1/src/main/java/fr/ifremer/isisfish: . simulator/launcher
by echatellier＠users.forge.codelutin.com 16 Apr '14

16 Apr '14

Author: echatellier Date: 2014-04-16 17:44:27 +0200 (Wed, 16 Apr 2014) New Revision: 3962 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3962 Log: refs #4647: Suppression d'un acc?\195?\168s disque Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-04-16 15:36:40 UTC (rev 3961) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-04-16 15:44:27 UTC (rev 3962) @@ -278,10 +278,6 @@ if (control != null) { result = new File(result, control.getId()); } - - if (!result.exists()) { - result.mkdirs(); - } return result; } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-04-16 15:36:40 UTC (rev 3961) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-04-16 15:44:27 UTC (rev 3962) @@ -327,6 +327,10 @@ context.setSimulationControl(control != null ? control : new SimulationControl(simulation.getName())); + // make compile directory outside getCompileDirectory() to improve performance + File compileDirectory = IsisFish.config.getCompileDirectory(); + compileDirectory.mkdirs(); + // changement de classloader // IMPORTANT : must be set AFTER : // - SimulationContext.get();

1 0

r3961 - branches/4.0.1/src/main/xmi
by echatellier＠users.forge.codelutin.com 16 Apr '14

16 Apr '14

Author: echatellier Date: 2014-04-16 17:36:40 +0200 (Wed, 16 Apr 2014) New Revision: 3961 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3961 Log: refs #4647: Suppression des fire pre et post read Modified: branches/4.0.1/src/main/xmi/isis-fish.properties Modified: branches/4.0.1/src/main/xmi/isis-fish.properties =================================================================== --- branches/4.0.1/src/main/xmi/isis-fish.properties 2014-04-16 08:05:19 UTC (rev 3960) +++ branches/4.0.1/src/main/xmi/isis-fish.properties 2014-04-16 15:36:40 UTC (rev 3961) @@ -33,6 +33,7 @@ model.tagvalue.constantPrefix=PROPERTY_ model.tagvalue.useEnumerationName=true model.tagvalue.doNotGenerateBooleanGetMethods=false +model.tagvalue.notGenerateReadListeners=true fr.ifremer.isisfish.entities.ActiveRule.class.tagvalue.contextable=true fr.ifremer.isisfish.entities.Cell.class.tagvalue.contextable=true fr.ifremer.isisfish.entities.EffortDescription.class.tagvalue.contextable=true

1 0

r3960 - branches/4.0.1/src/main/resources
by echatellier＠users.forge.codelutin.com 16 Apr '14

16 Apr '14

Author: echatellier Date: 2014-04-16 10:05:19 +0200 (Wed, 16 Apr 2014) New Revision: 3960 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3960 Log: Add logger category for new scripts Modified: branches/4.0.1/src/main/resources/log4j.properties Modified: branches/4.0.1/src/main/resources/log4j.properties =================================================================== --- branches/4.0.1/src/main/resources/log4j.properties 2014-04-15 16:08:05 UTC (rev 3959) +++ branches/4.0.1/src/main/resources/log4j.properties 2014-04-16 08:05:19 UTC (rev 3960) @@ -35,6 +35,8 @@ log4j.logger.org.nuiton=WARN log4j.logger.exports=INFO log4j.logger.formules=INFO +log4j.logger.objectives=INFO +log4j.logger.optimizations=INFO log4j.logger.rules=INFO log4j.logger.scripts=INFO log4j.logger.sensitivityanalysis=INFO

1 0

r3959 - in branches/4.0.1/src/main: java/fr/ifremer/isisfish/entities java/fr/ifremer/isisfish/util xmi
by echatellier＠users.forge.codelutin.com 15 Apr '14

15 Apr '14

Author: echatellier Date: 2014-04-15 18:08:05 +0200 (Tue, 15 Apr 2014) New Revision: 3959 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3959 Log: Remove args name management with Map (only use ordered args value as array) Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java branches/4.0.1/src/main/xmi/isis-fish.zargo Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java 2014-04-15 15:08:38 UTC (rev 3958) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java 2014-04-15 16:08:05 UTC (rev 3959) @@ -27,9 +27,6 @@ import static org.nuiton.i18n.I18n.t; -import java.util.HashMap; -import java.util.Map; - import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.FormuleStorage; import fr.ifremer.isisfish.equation.Language; @@ -55,22 +52,29 @@ /** * Evalue l'equation et retourne le résultat. * - * @param param equation args + * @param args equation args (arg name and arg value) * @return equation evaluation */ - public double evaluate(Map<String, Object> param) { + public double evaluate(Object... args) { String eq = getContent(); try { - // add Simulation context in map - param.put("context", SimulationContext.get()); // default is BSH if (Language.JAVA.equals(getLanguage()) || getJavaInterface() != null) { + + // in Java, we don't need args names, only args value ordered + // build a new array with SimulationContext in first position + Object[] params = new Object[args.length / 2 + 1]; + params[0] = SimulationContext.get(); + for (int i = 0; i < args.length / 2; i++) { + params[i + 1] = args[i*2 + 1]; + } + // default Java if there are javaInterface Object val = EvaluatorHelper.evaluate( FormuleStorage.FORMULE_PATH, getTopiaId(), - getJavaInterface(), getContent(), param); + getJavaInterface(), getContent(), params); if (val instanceof Number) { double result = ((Number) val).doubleValue(); return result; @@ -85,21 +89,8 @@ } catch (Exception eee) { throw new IsisFishRuntimeException(t("isisfish.error.evaluate.equation", eq), eee); } - } - public double evaluate(String name, Object value, Object... others) { - Map<String, Object> param = new HashMap<String, Object>(); - param.put(name, value); - for (int i = 0; i < others.length;) { - name = (String) others[i++]; - value = others[i++]; - param.put(name, value); - } - double result = evaluate(param); - return result; - } - /* * @see fr.ifremer.isisfish.entities.EquationAbstract#toString() */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2014-04-15 15:08:38 UTC (rev 3958) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2014-04-15 16:08:05 UTC (rev 3959) @@ -42,10 +42,14 @@ import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishRuntimeException; + import java.util.regex.Matcher; import java.util.regex.Pattern; + import fr.ifremer.isisfish.simulator.SimulationContext; + import java.util.HashMap; + import org.apache.commons.lang3.StringUtils; /** @@ -181,7 +185,7 @@ * @return la valeur retourné par la methode */ public static Object evaluate(String packageName, String className, - Class javaInterface, String script, Map<String, Object> args) { + Class javaInterface, String script, Object... args) { className = normalizeClassName(className); Object result = null; @@ -206,8 +210,8 @@ // if Java file's checkSum is not equals to script's checkSum // generate new Java file if (!checkSumEquals) { + String content = generateContent(packageName, className, interfaceMethod, script); - try { // force writing to UTF-8 // fix compilation issue : unmappable characters @@ -217,18 +221,7 @@ throw new IsisFishRuntimeException(t("isisfish.error.save.script.compilation", fileSrc), zzz); } - try { - List<File> classpath = new ArrayList<File>(); - classpath.add(fileRootSrc.getAbsoluteFile()); - classpath.add(IsisFish.config.getDatabaseDirectory().getAbsoluteFile()); - int compileResult = CompileHelper.compile(classpath, Collections.singletonList(fileSrc), fileRootSrc, null); - - if (compileResult != 0) { - throw new IsisFishRuntimeException(t("isisfish.error.compile.script", compileResult, fileSrc)); - } - } catch (Exception zzz) { - throw new IsisFishRuntimeException(t("isisfish.error.compile.script", fileSrc), zzz); - } + compile(fileRootSrc, fileSrc); } // try to load class @@ -239,16 +232,9 @@ // force to compile it again; may happen if hashcode // is correct, but .class file can't be loaded - try { - List<File> classpath = new ArrayList<File>(); - classpath.add(fileRootSrc.getAbsoluteFile()); - classpath.add(IsisFish.config.getDatabaseDirectory().getAbsoluteFile()); - int compileResult = CompileHelper.compile(classpath, Collections.singletonList(fileSrc), fileRootSrc, null); + compile(fileRootSrc, fileSrc); - if (compileResult != 0) { - throw new IsisFishRuntimeException(t("isisfish.error.compile.script", compileResult, fileSrc)); - } - + try { // second load ClassLoader cl = IsisFish.config.getScriptClassLoader(); clazz = cl.loadClass(classname); @@ -262,6 +248,21 @@ return result; } + protected static void compile(File fileRootSrc, File fileSrc) { + try { + List<File> classpath = new ArrayList<File>(); + classpath.add(fileRootSrc.getAbsoluteFile()); + classpath.add(IsisFish.config.getDatabaseDirectory().getAbsoluteFile()); + int compileResult = CompileHelper.compile(classpath, Collections.singletonList(fileSrc), fileRootSrc, null); + + if (compileResult != 0) { + throw new IsisFishRuntimeException(t("isisfish.error.compile.script", compileResult, fileSrc)); + } + } catch (Exception zzz) { + throw new IsisFishRuntimeException(t("isisfish.error.compile.script", fileSrc), zzz); + } + } + /** * Generate script content. * @@ -351,23 +352,20 @@ others.append(code.substring(pos)); } - protected static Object invoke(Class clazz, Method interfaceMethod, Map<String, Object> args) { + protected static Object invoke(Class clazz, Method interfaceMethod, Object... args) { + + Object result; try { Method method = clazz.getDeclaredMethod(interfaceMethod.getName(), interfaceMethod.getParameterTypes()); - - List<Object> params = new ArrayList<Object>(); - for (String name : interfaceMethod.getAnnotation(Args.class).value()) { - Object arg = args.get(name); - params.add(arg); - } + Object eq = clazz.newInstance(); - Object result; - result = method.invoke(eq, params.toArray()); - return result; + result = method.invoke(eq, args); + } catch (Exception eee) { throw new IsisFishRuntimeException(t("isisfish.error.invoke.method", interfaceMethod, clazz.getName()), eee); } + return result; } } Modified: branches/4.0.1/src/main/xmi/isis-fish.zargo =================================================================== (Binary files differ)

1 0

r3958 - branches/4.0.1/src/main/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com 15 Apr '14

15 Apr '14

Author: echatellier Date: 2014-04-15 17:08:38 +0200 (Tue, 15 Apr 2014) New Revision: 3958 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3958 Log: Fix ejc options Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2014-04-15 14:28:14 UTC (rev 3957) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2014-04-15 15:08:38 UTC (rev 3958) @@ -41,6 +41,7 @@ import javax.tools.JavaCompiler; import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; +import javax.tools.ToolProvider; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; @@ -220,6 +221,8 @@ int result = -1000; try { + List<String> args = new ArrayList<String>(); + // use eclipse ecj compiler JavaCompiler compiler = new EclipseCompiler(); @@ -231,11 +234,14 @@ // Options de compilations String classpathAsString = getClassPathAsString(classpath); - List<String> args = new ArrayList<String>(); - args.add("-1.7"); + args.add("-source"); + args.add("1.7"); + args.add("-target"); + args.add("1.7"); args.add("-g"); // Show a description of each use or override of a deprecated member or class. - args.add("-warn:deprecation"); // non standard option + args.add("-warn:deprecation"); // non standard option for ecj + //args.add("-deprecation"); // standard option args.add("-encoding"); args.add("utf-8"); args.add("-classpath");

1 0

r3957 - branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator
by echatellier＠users.forge.codelutin.com 15 Apr '14

15 Apr '14

Author: echatellier Date: 2014-04-15 16:28:14 +0200 (Tue, 15 Apr 2014) New Revision: 3957 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3957 Log: Fix compilation Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx 2014-04-15 14:20:44 UTC (rev 3956) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx 2014-04-15 14:28:14 UTC (rev 3957) @@ -23,13 +23,6 @@ #L% --> <Table> - <import> - java.awt.CardLayout - javax.swing.ComboBoxModel - javax.swing.table.DefaultTableModel - fr.ifremer.isisfish.ui.models.optimization.ExportObservationTableModel - </import> - <script><![CDATA[ /*protected void $afterCompleteSetup() { handler.init(this); @@ -125,7 +118,7 @@ <JScrollPane> <JTable id="exportObservationTable" model="{handler.getExportObservationTableModel(this)}" rowHeight='24' /> <ListSelectionModel id="exportObservationSelectionModel" initializer="exportObservationTable.getSelectionModel()" - onValueChanged='removeExportsButton.setEnabled(!exportObservationSelectionModel.isSelectionEmpty());clearExportsButton.setEnabled(exportObservationTableModel.getRowCount() > 0);' /> + onValueChanged='removeExportsButton.setEnabled(!exportObservationSelectionModel.isSelectionEmpty());clearExportsButton.setEnabled(exportObservationTable.getModel().getRowCount() > 0);' /> </JScrollPane> </cell> </row>

1 0

r3956 - branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator
by echatellier＠users.forge.codelutin.com 15 Apr '14

15 Apr '14

Author: echatellier Date: 2014-04-15 16:20:44 +0200 (Tue, 15 Apr 2014) New Revision: 3956 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3956 Log: Fix export table model Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java 2014-04-15 14:20:04 UTC (rev 3955) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java 2014-04-15 14:20:44 UTC (rev 3956) @@ -323,7 +323,7 @@ public void addExports(OptimizationUI view) { // get elements SimulationParameter param = getSimulationParameter(view); - ExportObservationTableModel tableModel = view.getExportObservationTableModel(); + ExportObservationTableModel tableModel = (ExportObservationTableModel)view.getExportObservationTable().getModel(); // add all selected exports List<String> selectedExports = view.getFieldExportList().getSelectedValuesList(); @@ -353,7 +353,7 @@ // get element SimulationParameter param = getSimulationParameter(view); Map<Export, Observation> optimizationExports = param.getOptimizationExportsObservations(); - ExportObservationTableModel tableModel = view.getExportObservationTableModel(); + ExportObservationTableModel tableModel = (ExportObservationTableModel)view.getExportObservationTable().getModel(); JTable table = view.getExportObservationTable(); int[] rows = table.getSelectedRows(); @@ -377,7 +377,7 @@ // get elements SimulationParameter param = getSimulationParameter(view); Map<Export, Observation> optimizationExports = param.getOptimizationExportsObservations(); - ExportObservationTableModel tableModel = view.getExportObservationTableModel(); + ExportObservationTableModel tableModel = (ExportObservationTableModel)view.getExportObservationTable().getModel(); // clear optimizationExports.clear(); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx 2014-04-15 14:20:04 UTC (rev 3955) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx 2014-04-15 14:20:44 UTC (rev 3956) @@ -123,8 +123,7 @@ </cell> <cell fill="both" weightx="1.0" weighty="1.0"> <JScrollPane> - <ExportObservationTableModel id="exportObservationTableModel" javaBean="handler.getExportObservationTableModel(this)" /> - <JTable id="exportObservationTable" model="{getExportObservationTableModel()}" rowHeight='24' /> + <JTable id="exportObservationTable" model="{handler.getExportObservationTableModel(this)}" rowHeight='24' /> <ListSelectionModel id="exportObservationSelectionModel" initializer="exportObservationTable.getSelectionModel()" onValueChanged='removeExportsButton.setEnabled(!exportObservationSelectionModel.isSelectionEmpty());clearExportsButton.setEnabled(exportObservationTableModel.getRowCount() > 0);' /> </JScrollPane>

1 0

r3955 - branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities
by echatellier＠users.forge.codelutin.com 15 Apr '14

15 Apr '14

Author: echatellier Date: 2014-04-15 16:20:04 +0200 (Tue, 15 Apr 2014) New Revision: 3955 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3955 Log: Remove transient hack Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2014-04-15 14:19:37 UTC (rev 3954) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2014-04-15 14:20:04 UTC (rev 3955) @@ -51,9 +51,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1L; - /** Equation computing result cache to not compute equation at each call to improve performances. */ - protected transient Double groupLength; - /* * @see fr.ifremer.isisfish.entities.PopulationGroup#getAge() */ @@ -76,17 +73,16 @@ */ @Override public double getLength() { - if (groupLength == null) { - if (getPopulation() != null && getPopulation().getSpecies() != null) { - if (!getPopulation().getSpecies().getAgeGroupType()) { - groupLength = (getMinLength() + getMaxLength()) / 2.0; - } else { - groupLength = getPopulation().getLength( - getAge() * Month.NUMBER_OF_MONTH, this); - } + double result = 0.0; + if (getPopulation() != null && getPopulation().getSpecies() != null) { + if (!getPopulation().getSpecies().getAgeGroupType()) { + result = (getMinLength() + getMaxLength()) / 2.0; + } else { + result = getPopulation().getLength( + getAge() * Month.NUMBER_OF_MONTH, this); } } - return groupLength; + return result; } @Override

1 0

r3954 - in branches/4.0.1: . src/main/java/fr/ifremer/isisfish/simulator/launcher src/main/resources/i18n src/test/java/fr/ifremer/isisfish/entity src/test/java/fr/ifremer/isisfish/types src/test/java/fr/ifremer/isisfish/ui/sensitivity
by echatellier＠users.forge.codelutin.com 15 Apr '14

15 Apr '14

Author: echatellier Date: 2014-04-15 16:19:37 +0200 (Tue, 15 Apr 2014) New Revision: 3954 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3954 Log: Update libs Modified: branches/4.0.1/pom.xml branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationPlanPrepareJob.java branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/types/MonthTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2014-04-15 14:17:48 UTC (rev 3953) +++ branches/4.0.1/pom.xml 2014-04-15 14:19:37 UTC (rev 3954) @@ -20,21 +20,21 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>2.7.1</version> + <version>3.0-rc-2</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.0-alpha-1</version> + <version>3.0-alpha-2</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>3.0-alpha-2</version> + <version>3.0-rc-1</version> <scope>compile</scope> <exclusions> <exclusion> @@ -478,7 +478,7 @@ <signatureVersion>1.0</signatureVersion>  - <jaxxVersion>2.6</jaxxVersion> + <jaxxVersion>2.8.4</jaxxVersion> <eugeneVersion>2.7.4</eugeneVersion> <topiaVersion>2.9-SNAPSHOT</topiaVersion> <hibernateVersion>4.3.5.Final</hibernateVersion> @@ -516,6 +516,14 @@ <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-maven-plugin</artifactId> <version>${jaxxVersion}</version> + <dependencies> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + <scope>compile</scope> + </dependency> + </dependencies> </plugin> <plugin> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java 2014-04-15 14:17:48 UTC (rev 3953) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java 2014-04-15 14:19:37 UTC (rev 3954) @@ -1,5 +1,32 @@ package fr.ifremer.isisfish.simulator.launcher; +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Ifremer, Code Lutin, 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 + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import static org.nuiton.i18n.I18n.t; + import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -9,7 +36,6 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.i18n.I18n; import org.nuiton.math.matrix.MatrixND; import fr.ifremer.isisfish.IsisFishRuntimeException; @@ -21,13 +47,6 @@ import fr.ifremer.isisfish.simulator.OptimizationContext; import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.SimulationParameter; -import java.io.File; -import java.io.IOException; -import java.util.List; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.i18n.I18n; /** * Permet de generer l'enchainement des simulations d'optimisation. @@ -129,9 +148,9 @@ // we are in a thread, IsisFishRuntimeException is displayed // outside a log if (log.isErrorEnabled()) { - log.error(I18n._("isisfish.error.evaluate.optimization.script"), eee); + log.error(t("isisfish.error.evaluate.optimization.script"), eee); } - throw new IsisFishRuntimeException(I18n._("isisfish.error.evaluate.optimization.script"), eee); + throw new IsisFishRuntimeException(t("isisfish.error.evaluate.optimization.script"), eee); } finally { // on enleve le master plan des simulations en cours, vu que // toutes les simu sont terminees (correctement ou echouee) Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationPlanPrepareJob.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationPlanPrepareJob.java 2014-04-15 14:17:48 UTC (rev 3953) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationPlanPrepareJob.java 2014-04-15 14:19:37 UTC (rev 3954) @@ -1,5 +1,31 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Ifremer, Code Lutin, 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 + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + package fr.ifremer.isisfish.simulator.launcher; +import static org.nuiton.i18n.I18n.t; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.SimulationStorage; @@ -61,9 +87,9 @@ // we are in a thread, IsisFishRuntimeException is displayed // outside a log if (log.isErrorEnabled()) { - log.error(I18n._("isisfish.error.evaluate.preplan.script"), eee); + log.error(t("isisfish.error.evaluate.preplan.script"), eee); } - throw new IsisFishRuntimeException(I18n._("isisfish.error.evaluate.preplan.script"), eee); + throw new IsisFishRuntimeException(t("isisfish.error.evaluate.preplan.script"), eee); } } @@ -119,7 +145,7 @@ subJobN = subJobNp1; } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error(I18n._("Can't add simulation: %s", job.getItem().getControl().getId()), eee); + log.error(t("Can't add simulation: %s", job.getItem().getControl().getId()), eee); } } } @@ -148,7 +174,7 @@ // this start a 0 int planNumber = planContext.getNumber(); if (planNumber > SimulationService.MAX_PLAN_SIMULATION) { - log.error(I18n._("Analyse plan error, too many simulation for %s : %s", id, planNumber)); + log.error(t("Analyse plan error, too many simulation for %s : %s", id, planNumber)); doNext = false; result = false; } else { @@ -186,7 +212,7 @@ sim.closeStorage(); // quoi qu'il arrive on supprime le repertoire temporaire if (!FileUtils.deleteQuietly(tmpDirectory)) { - log.warn(I18n._("isisfish.error.remove.directory", tmpDirectory)); + log.warn(t("isisfish.error.remove.directory", tmpDirectory)); } } // increment number for next simulation job @@ -228,7 +254,7 @@ boolean result = plan.afterSimulation(planContext, sim); doNext = doNext && result; } catch (Exception eee) { - log.error(I18n._("Stop simulation plan, because can't call afterSimulation correctly on plan %s", plan.getClass().getName()), eee); + log.error(t("Stop simulation plan, because can't call afterSimulation correctly on plan %s", plan.getClass().getName()), eee); doNext = false; } } Modified: branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2014-04-15 14:17:48 UTC (rev 3953) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2014-04-15 14:19:37 UTC (rev 3954) @@ -298,6 +298,7 @@ isisfish.error.errorpane.htmlmessage=<html><b>IsisFish has handled \:</b><br />%s</b></html> isisfish.error.errorpane.title=Error isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s +isisfish.error.evaluate.optimization.script= isisfish.error.evaluate.preplan.script= isisfish.error.evalute.plan.script=Can't evaluate plan script isisfish.error.file.already.exists=The file %1$s already exist @@ -655,9 +656,13 @@ isisfish.month.november=november isisfish.month.october=october isisfish.month.september=september +isisfish.observation.comment= +isisfish.observation.name= +isisfish.observation.value= isisfish.optimisation.observation= isisfish.optimization.export= isisfish.optimization.exports= +isisfish.optimization.method= isisfish.optimization.methodfactorsupported= isisfish.optimization.objective= isisfish.optimization.objectives= @@ -699,6 +704,7 @@ isisfish.params.toString.strategies=Strategies \: isisfish.params.toString.use.cache=Use simulation cache isisfish.params.toString.use.optimization=Use optimization method +isisfish.params.useOptimization= isisfish.params.usePreSimulationScript=Use pre simulation script isisfish.params.useSimulationPlan=Use simulation plan isisfish.population.capturability=Capturability Modified: branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-04-15 14:17:48 UTC (rev 3953) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-04-15 14:19:37 UTC (rev 3954) @@ -298,6 +298,7 @@ isisfish.error.errorpane.htmlmessage=<html><b>IsisFish a détecté une erreur \:</b><br />%s</b></html> isisfish.error.errorpane.title=Erreur isisfish.error.evaluate.equation=Impossible d'évaluer l'équation\: %1$s +isisfish.error.evaluate.optimization.script= isisfish.error.evaluate.preplan.script= isisfish.error.evalute.plan.script=Can't evaluate plan script isisfish.error.file.already.exists=The file %1$s already exist Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java 2014-04-15 14:17:48 UTC (rev 3953) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java 2014-04-15 14:19:37 UTC (rev 3954) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.entity; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.HeadlessException; import java.util.ArrayList; @@ -108,7 +108,7 @@ public void run() { JOptionPane.showMessageDialog(dialog, panel, - _("Spacialized visualisation"), + t("Spacialized visualisation"), JOptionPane.INFORMATION_MESSAGE); } @@ -189,7 +189,7 @@ public void run() { JOptionPane.showMessageDialog(dialog, box, - _("Spacialized visualisation"), + t("Spacialized visualisation"), JOptionPane.INFORMATION_MESSAGE); } Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/types/MonthTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/types/MonthTest.java 2014-04-15 14:17:48 UTC (rev 3953) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/types/MonthTest.java 2014-04-15 14:19:37 UTC (rev 3954) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.types; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.LinkedList; import java.util.List; @@ -78,12 +78,12 @@ MatrixND tmp = MatrixFactory.getInstance().create( "test", new List[] { monthList }, - new String[] { _("isisfish.populationSeasonInfo.months") }); + new String[] { t("isisfish.populationSeasonInfo.months") }); MatrixND result = MatrixFactory.getInstance().create( "test", new List[] { monthList2 }, - new String[] { _("isisfish.populationSeasonInfo.months") }); + new String[] { t("isisfish.populationSeasonInfo.months") }); tmp.pasteSemantics(result); } Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2014-04-15 14:17:48 UTC (rev 3953) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2014-04-15 14:19:37 UTC (rev 3954) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.sensitivity; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.HeadlessException; import javax.swing.JDialog; @@ -142,7 +142,7 @@ @Override public void run() { JOptionPane.showMessageDialog(dialog, tree, - _("Tree factor model"), + t("Tree factor model"), JOptionPane.INFORMATION_MESSAGE); } });

1 0