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

r2949 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org Jan. 27, 2010

Jan. 27, 2010

Author: chatellier Date: 2010-01-27 10:14:03 +0000 (Wed, 27 Jan 2010) New Revision: 2949 Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Result copy is not done anymore. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2010-01-26 21:09:50 UTC (rev 2948) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2010-01-27 10:14:03 UTC (rev 2949) @@ -462,11 +462,9 @@ // if not finished, re-add it at end if (jobIsFinished) { - if (log.isInfoEnabled()) { log.info("Job " + job.getId() + " finished"); } - doPostSimulationOperation(job, launcher); } @@ -538,7 +536,6 @@ else { // cas d'une simulation arretee par exception - File informationFile = SimulationStorage.getSimulationInformationFile(simulationRoot); SimulationInformation information = new SimulationInformation(informationFile); if (StringUtils.isNotEmpty(information.getException())) { @@ -559,8 +556,11 @@ /** * Operation to do after simulation end. * - * - get simulation result - * - do result export + * <ul> + * <li>get simulation result</li> + * <li>do registred post actions</li> + * <li>do sensitivity analisys second pass</li> + * </ul> * * @param job job * @param launcher {@link SimulatorLauncher} that manage simulation @@ -590,8 +590,6 @@ // on ne fait de post traitement que si // la simulation n'a pas été arretée if (!control.isStopSimulationRequest()) { - // post manage this storage - boolean simulationAvailble = true; //exportResult(job, simulation); // do posts actions for (PostAction action : job.getPostActions()) { @@ -607,9 +605,8 @@ // sensitivity calculator analyze result call // can't do analyze second pass if simulation // has been deleted - if (simulationAvailble) { - analyzeSensitivityResult(job, simulation); - } + // simulation can't be deleted anymore + analyzeSensitivityResult(job, simulation); } // notify simulation ended

1 0

r2948 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org Jan. 26, 2010

Jan. 26, 2010

Author: tchemit Date: 2010-01-26 21:09:50 +0000 (Tue, 26 Jan 2010) New Revision: 2948 Modified: isis-fish/trunk/pom.xml Log: Utilisation mavenpom4labs 2.0.4 Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-01-26 15:56:28 UTC (rev 2947) +++ isis-fish/trunk/pom.xml 2010-01-26 21:09:50 UTC (rev 2948) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.0.3</version> + <version>2.0.4</version> </parent> <groupId>ifremer</groupId>

1 0

r2947 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico
by chatellier＠users.labs.libre-entreprise.org Jan. 26, 2010

Jan. 26, 2010

Author: chatellier Date: 2010-01-26 15:56:28 +0000 (Tue, 26 Jan 2010) New Revision: 2947 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java Log: Fix regex to parse entity sematics ids Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2010-01-26 09:16:27 UTC (rev 2946) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2010-01-26 15:56:28 UTC (rev 2947) @@ -344,7 +344,7 @@ if (content != null) { content = content.trim(); - Pattern matrixPattern = Pattern.compile("^(.*)\$(.*\$)$"); + Pattern matrixPattern = Pattern.compile("^(.*)\$(.*)\$$"); Matcher matcher = matrixPattern.matcher(content); if (matcher.find()) {

1 0

r2946 - isis-fish/branches
by chatellier＠users.labs.libre-entreprise.org Jan. 26, 2010

Jan. 26, 2010

Author: chatellier Date: 2010-01-26 09:16:27 +0000 (Tue, 26 Jan 2010) New Revision: 2946 Added: isis-fish/branches/3.3.1/ Log: Init next isis-fish branche

1 0

r2945 - in isis-fish/trunk/src/site: en/rst/v3/user en/rst/v3/user/images rst/v3/user rst/v3/user/images
by chatellier＠users.labs.libre-entreprise.org Jan. 25, 2010

Jan. 25, 2010

Author: chatellier Date: 2010-01-25 17:25:48 +0000 (Mon, 25 Jan 2010) New Revision: 2945 Removed: isis-fish/trunk/src/site/en/rst/v3/user/.cvsignore isis-fish/trunk/src/site/en/rst/v3/user/images/.cvsignore isis-fish/trunk/src/site/rst/v3/user/.cvsignore isis-fish/trunk/src/site/rst/v3/user/images/.cvsignore Log: Remove cvsignore files Deleted: isis-fish/trunk/src/site/en/rst/v3/user/.cvsignore =================================================================== --- isis-fish/trunk/src/site/en/rst/v3/user/.cvsignore 2010-01-25 17:21:13 UTC (rev 2944) +++ isis-fish/trunk/src/site/en/rst/v3/user/.cvsignore 2010-01-25 17:25:48 UTC (rev 2945) @@ -1 +0,0 @@ -IsisUsage.rst Deleted: isis-fish/trunk/src/site/en/rst/v3/user/images/.cvsignore =================================================================== --- isis-fish/trunk/src/site/en/rst/v3/user/images/.cvsignore 2010-01-25 17:21:13 UTC (rev 2944) +++ isis-fish/trunk/src/site/en/rst/v3/user/images/.cvsignore 2010-01-25 17:25:48 UTC (rev 2945) @@ -1,9 +0,0 @@ -input_00.png -main_00.png -script_00.png -simulation_00.png -input_*_*.png -main_*_*.png -script_*_*.png -simulation_*_*.png - Deleted: isis-fish/trunk/src/site/rst/v3/user/.cvsignore =================================================================== --- isis-fish/trunk/src/site/rst/v3/user/.cvsignore 2010-01-25 17:21:13 UTC (rev 2944) +++ isis-fish/trunk/src/site/rst/v3/user/.cvsignore 2010-01-25 17:25:48 UTC (rev 2945) @@ -1 +0,0 @@ -IsisUsage.rst Deleted: isis-fish/trunk/src/site/rst/v3/user/images/.cvsignore =================================================================== --- isis-fish/trunk/src/site/rst/v3/user/images/.cvsignore 2010-01-25 17:21:13 UTC (rev 2944) +++ isis-fish/trunk/src/site/rst/v3/user/images/.cvsignore 2010-01-25 17:25:48 UTC (rev 2945) @@ -1,11 +0,0 @@ -input_00.png -main_00.png -script_00.png -simulation_00.png -input_*_*.png -main_*_*.png -script_*_*.png -simulation_*_*.png -result_*.png -add_ssh_key_**.png -isisFishData_**.png

1 0

r2944 - in isis-fish/trunk: . src/site src/site/fr src/site/rst/v2/user
by chatellier＠users.labs.libre-entreprise.org Jan. 25, 2010

Jan. 25, 2010

Author: chatellier Date: 2010-01-25 17:21:13 +0000 (Mon, 25 Jan 2010) New Revision: 2944 Added: isis-fish/trunk/src/site/rst/ Removed: isis-fish/trunk/.cvsignore isis-fish/trunk/src/site/fr/rst/ Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/site/rst/v2/user/ECMAScriptEdit.rst isis-fish/trunk/src/site/site_en.xml isis-fish/trunk/src/site/site_fr.xml Log: #2004 : Utilisation de mavenpom4labs 2.0.3 Deleted: isis-fish/trunk/.cvsignore =================================================================== --- isis-fish/trunk/.cvsignore 2010-01-25 13:45:47 UTC (rev 2943) +++ isis-fish/trunk/.cvsignore 2010-01-25 17:21:13 UTC (rev 2944) @@ -1,10 +0,0 @@ -maven.log -target -velocity.log -.classpath -.project -isis-fish.ipr -isis-fish.iws -isis-fish.iml -.settings -__poubelle__ Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-01-25 13:45:47 UTC (rev 2943) +++ isis-fish/trunk/pom.xml 2010-01-25 17:21:13 UTC (rev 2944) @@ -3,6 +3,12 @@ <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4labs</artifactId> + <version>2.0.3</version> + </parent> + <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> <version>3.3.0.0-rc1-SNAPSHOT</version> @@ -422,6 +428,16 @@ </roles> <timezone>+2</timezone> </developer> + <developer> + <id>jcouteau</id> + <name>Jean Couteau</name> + <email>couteau at codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>DÃ©veloppeur</role> + </roles> + <timezone>+2</timezone> + </developer> </developers>  @@ -430,14 +446,21 @@ <packaging>jar</packaging> <properties> -  +  + <projectId>isis-fish</projectId> + <labs.id>8</labs.id> + <javadoc.version>2.6.1</javadoc.version> + <siteLocales>fr,en</siteLocales> + <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> + +  <jaxx.version>1.7.1</jaxx.version> <eugene.version>2.0.0-beta-3</eugene.version> <topia.version>2.3.0-beta-5</topia.version> - <nuiton-utils.version>1.1.3</nuiton-utils.version> + <nuiton-utils.version>1.1.4-SNAPSHOT</nuiton-utils.version> <nuiton-i18n.version>1.0.1</nuiton-i18n.version> <nuiton-widgets.version>1.0.1-SNAPSHOT</nuiton-widgets.version> - <jrst.version>1.0.0</jrst.version> + <jrst.version>1.1.0</jrst.version> <aspectwerkz.version>2.0</aspectwerkz.version> <xmlrpc.version>3.1.2</xmlrpc.version> @@ -449,32 +472,25 @@ <jnlpCodebase>${project.url}</jnlpCodebase> <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase> --> - - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputDirectory>UTF-8</project.reporting.outputDirectory> </properties> <build> <pluginManagement> <plugins> - <plugin> +  + <showDeprecation>true</showDeprecation> + <showWarnings>true</showWarnings> </configuration> - </plugin> + </plugin> --> <plugin> <artifactId>maven-jar-plugin</artifactId> - <version>2.3</version> <configuration> <archive> <manifest> <addClasspath>true</addClasspath> - <mainClass>fr.ifremer.isisfish.IsisFish</mainClass> + <mainClass>${maven.jar.main.class}</mainClass> <classpathPrefix>lib/</classpathPrefix> <useUniqueVersions>false</useUniqueVersions> </manifest> @@ -483,7 +499,6 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> <configuration> <systemProperties> <property> @@ -509,15 +524,11 @@ </plugin> <plugin> <artifactId>maven-site-plugin</artifactId> - <version>2.0.1</version> - <configuration> - <locales>fr,en</locales> - </configuration> <dependencies> <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>1.0.0</version> + <version>${jrst.version}</version> </dependency> </dependencies> </plugin> @@ -620,7 +631,6 @@ <plugin> <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> <executions> <execution> <id>copy-dependencies</id> @@ -637,7 +647,6 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> <configuration> <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor> @@ -659,9 +668,7 @@ <reporting> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.6.1</version> <configuration> <links> <link>http://java.sun.com/javase/6/docs/api/</link> @@ -729,7 +736,7 @@ </site> </distributionManagement> - <profiles> +  <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-license-plugin</artifactId> @@ -750,14 +755,14 @@ <execution> <id>attach-licenses</id> <goals> -  + <goal>add-license</goal> <goal>add-third-party</goal> </goals> </execution> </executions> - </plugin> + </plugin> -  + </plugin> - - > </plugins> </build> </profile> - </profiles> + </profiles> --> </project> Modified: isis-fish/trunk/src/site/rst/v2/user/ECMAScriptEdit.rst =================================================================== --- isis-fish/trunk/src/site/fr/rst/v2/user/ECMAScriptEdit.rst 2010-01-22 16:00:18 UTC (rev 2941) +++ isis-fish/trunk/src/site/rst/v2/user/ECMAScriptEdit.rst 2010-01-25 17:21:13 UTC (rev 2944) @@ -10,6 +10,8 @@ .. contents:: +ECMAScriptEdit +-------------- L'editeur d'ECMAScript permet d'influer sur la faÃ§on dont isis-fish simule. Une partie du simulateur est Ã©crit grÃ¢ce Ã cette interface, il suffit de Modified: isis-fish/trunk/src/site/site_en.xml =================================================================== --- isis-fish/trunk/src/site/site_en.xml 2010-01-25 13:45:47 UTC (rev 2943) +++ isis-fish/trunk/src/site/site_en.xml 2010-01-25 17:21:13 UTC (rev 2944) @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <project name="Isis-fish"> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> <bannerLeft> <name>Isis-fish Simulator</name> @@ -45,13 +39,13 @@ <menu name="Version 3"> <item href="http://isis-fish.labs.libre-entreprise.org/devel/IsisFishModel.png" name="UML Model"></item> - <item href="/apidocs/index.html" name="Simulateur API"></item> + <item href="/isis-fish/apidocs/index.html" name="Simulateur API"></item> <item href="http://isis-fish.labs.libre-entreprise.org/download/version3" name="Download"></item> </menu> <menu name="Development documentations"> - <item href="http://isis-fish.labs.libre-entreprise.org/api/codelutin/index.html" name="Library API"></item> - <item href="http://lutinmatrix.labs.libre-entreprise.org/apidocs/index.html" name="Matrix API"></item> +  + <item href="http://maven-site.nuiton.org/nuiton-matrix/apidocs/index.html" name="Matrix API"></item> </menu> <menu name="Trackers"> @@ -62,7 +56,7 @@ </menu> <menu name="Liens"> - <item href="http://java.sun.com/j2se" name="Sun Java site"></item> + <item href="http://java.sun.com/javase" name="Sun Java site"></item> </menu> ${reports} Modified: isis-fish/trunk/src/site/site_fr.xml =================================================================== --- isis-fish/trunk/src/site/site_fr.xml 2010-01-25 13:45:47 UTC (rev 2943) +++ isis-fish/trunk/src/site/site_fr.xml 2010-01-25 17:21:13 UTC (rev 2944) @@ -2,12 +2,6 @@ <project name="Isis-fish"> <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> <bannerLeft> <name>Isis-fish Simulateur de pêcherie complexe</name> @@ -18,12 +12,11 @@ <href>http://www.codelutin.com</href> </bannerRight> - <poweredBy> - <logo href="http://argouml.tigris.org/" img="/images/argouml-logo.png" name="ArgoUML"/> - <logo href="http://docutils.sourceforge.net/rst.html" img="/images/restructuredtext-logo.png" name="reStructuredText"/> - <logo href="http://www.swixat.org" img="/images/swixat-logo.png" name="SwiXAT"/> - <logo href="http://topia.labs.libre-entreprise.org/" img="/images/topia-logo.png" name="ToPIA"/> - </poweredBy> + <poweredBy> + <logo href="http://argouml.tigris.org/" img="/images/argouml-logo.png" name="ArgoUML"/> + <logo href="http://docutils.sourceforge.net/rst.html" img="/images/restructuredtext-logo.png" name="reStructuredText"/> + <logo href="http://topia.labs.libre-entreprise.org/" img="/images/topia-logo.png" name="ToPIA"/> + </poweredBy> <body> <links> @@ -66,9 +59,9 @@ </menu> <menu name="Autres documentations"> - <item href="http://java.sun.com/j2se/api/index.html" name="API Java"></item> - <item href="http://lutinmatrix.labs.libre-entreprise.org/apidocs/index.html" name="API des matrices"></item> - <item href="http://topia.labs.libre-entreprise.org/apidocs/index.html" name="API ToPIA (DB)"></item> + <item href="http://java.sun.com/javase/6/docs/api/index.html" name="API Java" /> + <item href="http://maven-site.nuiton.org/nuiton-matrix/apidocs/index.html" name="API des matrices" /> + <item href="http://maven-site.nuiton.org/topia/topia-persistence/apidocs/index.html" name="API ToPIA (DB)" /> </menu> <menu name="Old version"> @@ -103,7 +96,7 @@ </menu> <menu name="Liens"> - <item href="http://java.sun.com/j2se" name="Le site Java de Sun"></item> + <item href="http://java.sun.com/javase" name="Le site Java de Sun"></item> </menu> ${reports}

1 0

r2943 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org Jan. 25, 2010

Jan. 25, 2010

Author: chatellier Date: 2010-01-25 13:45:47 +0000 (Mon, 25 Jan 2010) New Revision: 2943 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Change method name. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2010-01-22 16:51:03 UTC (rev 2942) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2010-01-25 13:45:47 UTC (rev 2943) @@ -199,7 +199,7 @@ simulAction.launchSimulation(fieldSimulParamsName.getText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem()); } else { - simulAction.launchSimulationWhithSensibility(fieldSimulParamsName.getText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem()); + simulAction.launchSimulationWithSensibility(fieldSimulParamsName.getText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem()); } // dans le cas d'une fenetre independante, il n'y a pas de ParentContainer Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2010-01-22 16:51:03 UTC (rev 2942) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2010-01-25 13:45:47 UTC (rev 2943) @@ -1034,7 +1034,7 @@ } } - public void launchSimulationWhithSensibility(String simulationId, + public void launchSimulationWithSensibility(String simulationId, SimulatorLauncher launcher) { launchSimulation(simulationId, launcher, getSensitivityCalculator(), designPlan);

1 0

r2942 - isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org Jan. 22, 2010

Jan. 22, 2010

Author: chatellier Date: 2010-01-22 16:51:03 +0000 (Fri, 22 Jan 2010) New Revision: 2942 Modified: isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/simulator/launcher/sim_test-gdg-3.2-3.3.zip isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/simulator/launcher/sim_test-ica-3.2-3.3.zip Log: Test was correct, simulations data wasn't :( Add all necessary files into simulations zip. Modified: isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/simulator/launcher/sim_test-gdg-3.2-3.3.zip =================================================================== (Binary files differ) Modified: isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/simulator/launcher/sim_test-ica-3.2-3.3.zip =================================================================== (Binary files differ)

1 0

r2941 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: datastore simulator
by chatellier＠users.labs.libre-entreprise.org Jan. 22, 2010

Jan. 22, 2010

Author: chatellier Date: 2010-01-22 16:00:18 +0000 (Fri, 22 Jan 2010) New Revision: 2941 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java Log: Fix breaking test with isolated storage (add a hack for now). Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2010-01-22 15:46:41 UTC (rev 2940) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2010-01-22 16:00:18 UTC (rev 2941) @@ -24,6 +24,7 @@ import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.entities.FisheryRegionDAO; import fr.ifremer.isisfish.entities.Result; +import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.vcs.VCSException; import org.apache.commons.collections.map.ReferenceMap; import org.apache.commons.lang.time.DateFormatUtils; @@ -210,27 +211,13 @@ /** * Recupere le TopiaContext d'une region. * - * Call {@code getRegion(String, false)} outside simulation context. - * * @param name le nom de la region a recuperer - * @return Le TopiaContext contenant la region, si la region n'existait null - * est retourné - */ - static public RegionStorage getRegion(String name) { - RegionStorage regionStorage = getRegion(name, false); - return regionStorage; - } - - /** - * Recupere le TopiaContext d'une region. - * - * @param name le nom de la region a recuperer * @param inSimulation this is a hack to known if simulation is requested * from a simulation or not * @return Le TopiaContext contenant la region, si la region n'existait null * est retourné */ - static public RegionStorage getRegion(String name, boolean inSimulation) { + static public RegionStorage getRegion(String name) { String cacheName = getContextDatabaseCacheKey(name); RegionStorage result = regions.get(cacheName); if (result == null) { @@ -238,7 +225,8 @@ File directory = null; // in simulation context, region is not located in "regions" directory - if (inSimulation) { + // FIXME remove this, hack, don't known what to used here :( + if (SimulationContext.get().getScriptDirectory() != null) { directory = getContextDatabaseDirectory(); } else { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2010-01-22 15:46:41 UTC (rev 2940) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2010-01-22 16:00:18 UTC (rev 2941) @@ -276,7 +276,7 @@ // bien faire attention ici que la bonne region est ouverte // - isis-database-3 dans le cas d'une region normale // - simulation dans le cas d'une simulation - region = RegionStorage.getRegion(getRegionName(), true); + region = RegionStorage.getRegion(getRegionName()); } else { if (log.isDebugEnabled()) { log.debug(_("Region %s already inited", getRegionName()));

1 0

r2940 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule
by chatellier＠users.labs.libre-entreprise.org Jan. 22, 2010

Jan. 22, 2010

Author: chatellier Date: 2010-01-22 15:46:41 +0000 (Fri, 22 Jan 2010) New Revision: 2940 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/Rule.java Log: Udpate link on javadoc Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/Rule.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/Rule.java 2010-01-22 15:42:22 UTC (rev 2939) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/Rule.java 2010-01-22 15:46:41 UTC (rev 2940) @@ -38,8 +38,8 @@ * <li> un objet Month ({@link fr.ifremer.isisfish.types.Month}) * <li> Le type d'une entité (@see fr.ifremer.isisfish.entities) * - * <p> Pour supporter d'autre type il faut créer des converters commons-beans - * //@link fr.ifremer.isisfish.simulator.SimulationParameter#ruleParametertoProperties(Rule) + * <p> Pour supporter d'autre type il faut créer des converters commons-beanutils + * //{@link fr.ifremer.isisfish.simulator.SimulationParameter#ruleParametertoProperties(int, Rule)} * * Created: 12 janv. 2006 17:02:43 *

1 0