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

r2179 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities
by chatellier＠users.labs.libre-entreprise.org 05 May '09

05 May '09

Author: chatellier Date: 2009-05-05 14:50:19 +0000 (Tue, 05 May 2009) New Revision: 2179 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/package-info.java Log: Correction de la javadoc. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/package-info.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/package-info.java 2009-05-05 13:42:06 UTC (rev 2178) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/package-info.java 2009-05-05 14:50:19 UTC (rev 2179) @@ -1,5 +1,5 @@ /** - * Database storage migration. + * Entité metier d'IsisFish. */ package fr.ifremer.isisfish.entities;

1 0

r2178 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org 05 May '09

05 May '09

Author: chatellier Date: 2009-05-05 13:42:06 +0000 (Tue, 05 May 2009) New Revision: 2178 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: Fix 'SaveSimulation" action on sensitivity 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 2009-05-05 12:50:17 UTC (rev 2177) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-05-05 13:42:06 UTC (rev 2178) @@ -407,6 +407,20 @@ return result; } + /** + * TODO : Common code with {@link SimulUI#saveSimulation()} + */ + protected void saveSimulation() { + JFileChooser fc = new JFileChooser(); + int returnVal = fc.showSaveDialog(null); + + if (returnVal == JFileChooser.APPROVE_OPTION) { + File file = fc.getSelectedFile(); + //This is where a real application would open the file. + getContextValue(SimulAction.class).saveSimulation(file); + } + } + ]]> </script> <row> @@ -630,7 +644,7 @@ <JButton id="buttonSimulParamsSimulate" text="isisfish.common.simulate" onActionPerformed='simul()'/> </cell> <cell fill="horizontal" weightx="0.2"> - <JButton id="saveSimul" text="isisfish.simulation.menu.save" onActionPerformed='getParentContainer(SimulUI.class).saveSimulation()'/> + <JButton id="saveSimul" text="isisfish.simulation.menu.save" onActionPerformed='saveSimulation()'/> </cell> </row> </Table> 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 2009-05-05 12:50:17 UTC (rev 2177) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-05-05 13:42:06 UTC (rev 2178) @@ -188,7 +188,12 @@ } } - protected void saveSimulation(File f) { + /** + * Save current simulation to given file. + * + * @param f file to save smulation to + */ + public void saveSimulation(File f) { FileOutputStream fos = null; try { fos = new FileOutputStream(f);

1 0

r2177 - isis-fish/trunk/src/main/assembly
by chatellier＠users.labs.libre-entreprise.org 05 May '09

05 May '09

Author: chatellier Date: 2009-05-05 12:50:17 +0000 (Tue, 05 May 2009) New Revision: 2177 Modified: isis-fish/trunk/src/main/assembly/bin.xml isis-fish/trunk/src/main/assembly/go.bat isis-fish/trunk/src/main/assembly/go.sh Log: Ajout de la configuration jri dans les scripts Modified: isis-fish/trunk/src/main/assembly/bin.xml =================================================================== --- isis-fish/trunk/src/main/assembly/bin.xml 2009-05-04 19:31:22 UTC (rev 2176) +++ isis-fish/trunk/src/main/assembly/bin.xml 2009-05-05 12:50:17 UTC (rev 2177) @@ -35,7 +35,7 @@ </fileSet> <fileSet> <directory>src/main/assembly</directory> - <outputDirectory></outputDirectory> + <outputDirectory /> <filtered>true</filtered> <fileMode>0755</fileMode> <includes> @@ -51,9 +51,11 @@ </file> <file> <source>src/main/assembly/x86/jri.dll</source> + <outputDirectory>jri</outputDirectory> </file> <file> <source>src/main/assembly/x86/libjri.so</source> + <outputDirectory>jri</outputDirectory> </file> </files> </assembly> \ No newline at end of file Modified: isis-fish/trunk/src/main/assembly/go.bat =================================================================== --- isis-fish/trunk/src/main/assembly/go.bat 2009-05-04 19:31:22 UTC (rev 2176) +++ isis-fish/trunk/src/main/assembly/go.bat 2009-05-05 12:50:17 UTC (rev 2177) @@ -1 +1 @@ -java -Xmx512M -Xms512M -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt \ No newline at end of file +java -Xmx512M -Xms512M -Djava.library.path=jri -DR.type=jni -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt \ No newline at end of file Modified: isis-fish/trunk/src/main/assembly/go.sh =================================================================== --- isis-fish/trunk/src/main/assembly/go.sh 2009-05-04 19:31:22 UTC (rev 2176) +++ isis-fish/trunk/src/main/assembly/go.sh 2009-05-05 12:50:17 UTC (rev 2177) @@ -1,4 +1,6 @@ #!/bin/sh -MX=512M -java -Xmx$MX -Xms$MX -jar ${project.build.finalName}.${project.packaging} "$@" &> debug.txt \ No newline at end of file +MEMORY=-Xms512M -Xmx512M +JRIARGS=-Djava.library.path=jri -DR.type=jni + +java $MEMORY $JRIARGS -jar ${project.build.finalName}.${project.packaging} "$@" &> debug.txt \ No newline at end of file

1 0

r2176 - in isis-fish/trunk/src/main/assembly: . x86
by chatellier＠users.labs.libre-entreprise.org 04 May '09

04 May '09

Author: chatellier Date: 2009-05-04 19:31:22 +0000 (Mon, 04 May 2009) New Revision: 2176 Added: isis-fish/trunk/src/main/assembly/x86/ isis-fish/trunk/src/main/assembly/x86/jri.dll isis-fish/trunk/src/main/assembly/x86/libjri.so Modified: isis-fish/trunk/src/main/assembly/bin.xml Log: Refactor bin assembly. Add jri (so & dll) in assembly archive. Modified: isis-fish/trunk/src/main/assembly/bin.xml =================================================================== --- isis-fish/trunk/src/main/assembly/bin.xml 2009-05-04 19:29:24 UTC (rev 2175) +++ isis-fish/trunk/src/main/assembly/bin.xml 2009-05-04 19:31:22 UTC (rev 2176) @@ -3,7 +3,6 @@ <formats> <format>zip</format> </formats> - <includeBaseDirectory>false</includeBaseDirectory>  <fileSets> - <fileSet> <directory>target/lib</directory> - <outputDirectory>isis-fish-${project.version}/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <includes> <include>*.jar</include> </includes> </fileSet> - - <fileSet> +  <fileSet> - <outputDirectory>isis-fish-${project.version}</outputDirectory> <includes> <include>README*</include> <include>LICENSE*</include> </includes> </fileSet> - <fileSet> <directory>src/main/assembly</directory> + <outputDirectory></outputDirectory> <filtered>true</filtered> - <outputDirectory>isis-fish-${project.version}</outputDirectory> <fileMode>0755</fileMode> <includes> <include>go.sh</include> <include>go.bat</include> </includes> </fileSet> - </fileSets> + + <files> + <file> + <source>target/${artifact.artifactId}-${artifact.version}.jar</source> + </file> + <file> + <source>src/main/assembly/x86/jri.dll</source> + </file> + <file> + <source>src/main/assembly/x86/libjri.so</source> + </file> + </files> </assembly> \ No newline at end of file Added: isis-fish/trunk/src/main/assembly/x86/jri.dll =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/assembly/x86/jri.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/assembly/x86/libjri.so =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/assembly/x86/libjri.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream

1 0

r2175 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 04 May '09

04 May '09

Author: chatellier Date: 2009-05-04 19:29:24 +0000 (Mon, 04 May 2009) New Revision: 2175 Modified: isis-fish/trunk/pom.xml Log: Licence always changed in release phase Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-05-04 18:02:50 UTC (rev 2174) +++ isis-fish/trunk/pom.xml 2009-05-04 19:29:24 UTC (rev 2175) @@ -585,7 +585,7 @@ <execution> <id>attach-licenses</id> <goals> - <goal>license</goal> +  <goal>third-party</goal> </goals> </execution>

1 0

r2174 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 04 May '09

04 May '09

Author: chatellier Date: 2009-05-04 18:02:50 +0000 (Mon, 04 May 2009) New Revision: 2174 Modified: isis-fish/trunk/pom.xml Log: Update versions Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-05-04 12:44:11 UTC (rev 2173) +++ isis-fish/trunk/pom.xml 2009-05-04 18:02:50 UTC (rev 2174) @@ -8,12 +8,12 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.4</version> + <version>3.5</version> </parent> <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.2.0.4-rc4-SNAPSHOT</version> + <version>3.2.0.4-SNAPSHOT</version>  <dependencies> @@ -342,17 +342,17 @@ <topia.version>2.1.4</topia.version> <topia.service.version>1.0.2</topia.service.version> <lutinmatrix.version>1.3</lutinmatrix.version> - <lutinutil.version>1.0.5-SNAPSHOT</lutinutil.version> + <lutinutil.version>1.0.5</lutinutil.version> <i18n.version>0.9</i18n.version> <lutinwidget.version>0.14</lutinwidget.version> <generator.version>0.64</generator.version> - <lutinj2r.version>0.4-SNAPSHOT</lutinj2r.version> + <lutinj2r.version>0.4</lutinj2r.version> <jrst.version>0.8.4</jrst.version> <license-switcher.version>0.6</license-switcher.version> <openmap.version>4.6.4</openmap.version> <aspectwerkz.version>2.0</aspectwerkz.version> <sshtool.version>0.2.2</sshtool.version> - <xmlrpc.version>3.1</xmlrpc.version> + <xmlrpc.version>3.1.2</xmlrpc.version>  <maven.test.forkMode>once</maven.test.forkMode>

1 0

r2173 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 04 May '09

04 May '09

Author: chatellier Date: 2009-05-04 12:44:11 +0000 (Mon, 04 May 2009) New Revision: 2173 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Log: Remove introspection code to set topia id to null (was a bad idea) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-05-04 12:39:36 UTC (rev 2172) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-05-04 12:44:11 UTC (rev 2173) @@ -22,8 +22,6 @@ import static org.codelutin.i18n.I18n._; import java.io.File; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; import java.net.MalformedURLException; import java.net.URL; import java.rmi.RemoteException; @@ -316,28 +314,6 @@ // forceReload, save all modification in parameter and reread it parameters = simulation.getForceReloadParameter(); - /* Temp disabled - // Rule modification - List<Rule> rules = parameters.getRules(); - for (Rule rule : rules) { - // FIXME fix hibernate bug - // org.hibernate.HibernateException: Found shared references to a collection - // to not have same loaded entity into different context ! - Field[] fields = rule.getClass().getFields(); - for (Field field : fields) { - if (Modifier.isPublic(field.getModifiers())) { - log.debug("change field is " + field.getName() - + "(set topiaId = null)"); - Object fieldValue = field.get(rule); - if (fieldValue instanceof TopiaEntity) { - TopiaEntity valueEntity = (TopiaEntity) fieldValue; - valueEntity.setTopiaId(null); - field.set(rule, valueEntity); - } - } - } - }*/ - // // Activation de l'OAP demandée //

1 0

r2172 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org 04 May '09

04 May '09

Author: chatellier Date: 2009-05-04 12:39:36 +0000 (Mon, 04 May 2009) New Revision: 2172 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java Log: Fix table component size => pack result to huge window Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2009-05-04 10:28:26 UTC (rev 2171) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2009-05-04 12:39:36 UTC (rev 2172) @@ -229,8 +229,9 @@ <Table id='content' constraints='BorderLayout.CENTER'> <row> <cell fill='both' columns='2' weightx='1' weighty='0.5'> - <JScrollPane> - <JTable id='params' visible='{isContinuePossible()}' model='{getTableModel()}' enabled='{isContinueSelected()}'/> + <JScrollPane preferredSize="{new Dimension(200, 150)}"> + <JTable id='params' visible='{isContinuePossible()}' model='{getTableModel()}' + enabled='{isContinueSelected()}' /> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-05-04 10:28:26 UTC (rev 2171) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-05-04 12:39:36 UTC (rev 2172) @@ -22,13 +22,11 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.ui.simulator.SimulAction; -import fr.ifremer.isisfish.ui.widget.ErrorDialogUI; import java.io.Serializable; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; import javax.swing.JComponent; -import javax.swing.JDialog; import javax.swing.JOptionPane; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;

1 0

r2171 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 04 May '09

04 May '09

Author: chatellier Date: 2009-05-04 10:28:26 +0000 (Mon, 04 May 2009) New Revision: 2171 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Francisage de "Stopping simulation" Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-05-04 10:07:25 UTC (rev 2170) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-05-04 10:28:26 UTC (rev 2171) @@ -525,7 +525,7 @@ isisfish.launch.server.ssh.publicKeyFile=clef publique ssh isisfish.launch.ssh=lecture-\u00E9criture (ssh) isisfish.launch.start=Lancement Isis-fish... %1$s -isisfish.launch.stop=Stopping simulation... +isisfish.launch.stop=Arr\u00EAt de la simulation... isisfish.launching=after init done in %1$s. isisfish.log.addAppender=ajoute un appender [%1$s] isisfish.log.body=Message \u00E0 joindre

1 0

r2170 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 04 May '09

04 May '09

Author: chatellier Date: 2009-05-04 10:07:25 +0000 (Mon, 04 May 2009) New Revision: 2170 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Fix NPE Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-04 08:26:48 UTC (rev 2169) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-04 10:07:25 UTC (rev 2170) @@ -672,16 +672,18 @@ if (log.isDebugEnabled()) { log.debug("Call analyzeResult on sensitivity script " + sensitivityCalculator.getClass().getSimpleName()); } - try { - // build master sensitivity export directory - File masterExportDirectory = new File(IsisFish.config.getDefaultExportDirectory(), simulationCommonPrefix); - // directory must already exists !!! - sensitivityCalculator.analyzeResult(simulationStorageForAnalyze, masterExportDirectory); - } - catch(SensitivityException e) { - if (log.isErrorEnabled()) { - log.error("Can't call analyse result", e); + if (sensitivityCalculator != null) { + try { + // build master sensitivity export directory + File masterExportDirectory = new File(IsisFish.config.getDefaultExportDirectory(), simulationCommonPrefix); + // directory must already exists !!! + sensitivityCalculator.analyzeResult(simulationStorageForAnalyze, masterExportDirectory); } + catch(SensitivityException e) { + if (log.isErrorEnabled()) { + log.error("Can't call analyse result", e); + } + } } } }

1 0