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

r3179 - in isis-fish/branches/3.3.1: . src/main/java/fr/ifremer/isisfish/simulator/launcher src/main/java/fr/ifremer/isisfish/util src/test/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org March 17, 2011

March 17, 2011

Author: chatellier Date: 2011-03-17 16:32:11 +0000 (Thu, 17 Mar 2011) New Revision: 3179 Log: Disable charset converter Modified: isis-fish/branches/3.3.1/changelog.txt isis-fish/branches/3.3.1/pom.xml isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java Modified: isis-fish/branches/3.3.1/changelog.txt =================================================================== --- isis-fish/branches/3.3.1/changelog.txt 2011-03-17 16:25:23 UTC (rev 3178) +++ isis-fish/branches/3.3.1/changelog.txt 2011-03-17 16:32:11 UTC (rev 3179) @@ -1,5 +1,6 @@ isis-fish (3.3.1.0-rc1) stable; urgency=low + * Disable charset converter (need to be retested) * Add a new button to check all script in one action in script UI * Improve UI to enable some fields/tabs only after region loading * Enable to put population effectives into factors Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-03-17 16:25:23 UTC (rev 3178) +++ isis-fish/branches/3.3.1/pom.xml 2011-03-17 16:32:11 UTC (rev 3179) @@ -343,12 +343,12 @@ <scope>compile</scope> </dependency> - <dependency> +  <dependency> <groupId>com.sun</groupId> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-03-17 16:25:23 UTC (rev 3178) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-03-17 16:32:11 UTC (rev 3179) @@ -1128,7 +1128,7 @@ // // Convertion // - CompileHelper.convertToUnicode(fileToConvert); + //CompileHelper.convertToUnicode(fileToConvert); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2011-03-17 16:25:23 UTC (rev 3178) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2011-03-17 16:32:11 UTC (rev 3179) @@ -26,27 +26,12 @@ package fr.ifremer.isisfish.util; import static org.nuiton.i18n.I18n._; -import info.monitorenter.cpdetector.io.ASCIIDetector; -import info.monitorenter.cpdetector.io.ByteOrderMarkDetector; -import info.monitorenter.cpdetector.io.CodepageDetectorProxy; -import info.monitorenter.cpdetector.io.JChardetFacade; -import info.monitorenter.cpdetector.io.ParsingDetector; import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.OutputStreamWriter; import java.io.PrintWriter; -import java.io.Reader; -import java.io.Writer; import java.lang.reflect.Method; -import java.net.MalformedURLException; import java.net.URL; -import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -58,7 +43,6 @@ import javax.tools.StandardJavaFileManager; import javax.tools.ToolProvider; -import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -89,7 +73,7 @@ private static final Log log = LogFactory.getLog(CompileHelper.class); /** CP detector proxy. */ - protected static CodepageDetectorProxy detector; + //protected static CodepageDetectorProxy detector; /** * Recherche tous les fichiers qui un source plus recent que la version compilé. @@ -386,7 +370,7 @@ return result; } - protected static CodepageDetectorProxy getCodepageDetector() { + /*protected static CodepageDetectorProxy getCodepageDetector() { if (detector == null) { detector = CodepageDetectorProxy.getInstance(); // A singleton. @@ -402,15 +386,14 @@ detector.add(ASCIIDetector.getInstance()); // Fallback, see javadoc. } return detector; - } - + }*/ - /** + /* * Convert all files to UTF-8. * * @param files fiels to convert * @return converted file list - */ + * public static List<File> convertToUnicode(List<File> files) { CodepageDetectorProxy myDetector = getCodepageDetector(); @@ -477,5 +460,5 @@ } return files; - } + }*/ } Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2011-03-17 16:25:23 UTC (rev 3178) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2011-03-17 16:32:11 UTC (rev 3179) @@ -182,12 +182,12 @@ FileUtil.deleteRecursively(dest); } - /** + /* * Save a file as non utf-8 encoded. * Convert to uft-8. * Assert that file has been converted. * @throws IOException - */ + * @Test public void convertToUnicodeTest() throws IOException { String content = getFirstClassContent("ConvertToUnicode"); @@ -209,13 +209,13 @@ Assert.assertTrue(newContent.indexOf("cod\u00E9") > 0); nonUnicodeFile.delete(); - } + }*/ - /** + /* * Try to convert file already in UTF-8. * * @throws IOException - */ + * @Test public void convertToUnicodeUselessTest() throws IOException { String content = getFirstClassContent("UselessConvertToUnicode"); @@ -237,5 +237,5 @@ Assert.assertTrue(newContent.indexOf("cod\u00E9") > 0); nonUnicodeFile.delete(); - } + }*/ }

1 0

r3178 - isis-fish/branches/3.3.1
by chatellier＠users.labs.libre-entreprise.org March 17, 2011

March 17, 2011

Author: chatellier Date: 2011-03-17 16:25:23 +0000 (Thu, 17 Mar 2011) New Revision: 3178 Log: Update h2 Modified: isis-fish/branches/3.3.1/pom.xml Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-03-17 15:49:25 UTC (rev 3177) +++ isis-fish/branches/3.3.1/pom.xml 2011-03-17 16:25:23 UTC (rev 3178) @@ -244,10 +244,18 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.128</version> + <version>1.3.153</version> <scope>compile</scope> </dependency> +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2mig_pagestore_addon</artifactId> + <version>1.3.153</version> + <scope>runtime</scope> + </dependency> +  <dependency> <groupId>aspectwerkz</groupId> @@ -673,28 +681,16 @@ <repositories> <repository> - <id>javanet.repository</id> - <url>http://download.java.net/maven/2/</url> + <id>nuiton.public</id> + <url>http://maven.nuiton.org/nexus/content/groups/public</url> </repository> - <repository> - <id>nuiton.release</id> - <url>http://maven.nuiton.org/release</url> - </repository> - <repository> - <id>nuiton.snapshot</id> - <url>http://maven.nuiton.org/snapshot</url> - </repository> </repositories> <pluginRepositories> <pluginRepository> - <id>nuiton.plugin.release</id> - <url>http://maven.nuiton.org/release</url> + <id>nuiton.plugin.public</id> + <url>http://maven.nuiton.org/nexus/content/groups/public</url> </pluginRepository> - <pluginRepository> - <id>nuiton.plugin.snapshot</id> - <url>http://maven.nuiton.org/snapshot</url> - </pluginRepository> </pluginRepositories> <profiles>

1 0

r3177 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui: input sensitivity
by chatellier＠users.labs.libre-entreprise.org March 17, 2011

March 17, 2011

Author: chatellier Date: 2011-03-17 15:49:25 +0000 (Thu, 17 Mar 2011) New Revision: 3177 Log: Fix add factor Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainerUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -258,6 +258,7 @@ FactorWizardUI wizard = new FactorWizardUI(this); wizard.initNew(editor, bean, EditorHelper.canBeContinue(editor, bean)); wizard.pack(); + wizard.setLocationRelativeTo(this); wizard.setVisible(true); } else if (log.isWarnEnabled()) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainerUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainerUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainerUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -28,6 +28,6 @@ <Boolean id='continueSelected' javaBean='false'/> - <JPanel id='content' constraints='BorderLayout.CENTER'/> + <JPanel id='content' layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'/> </JPanel> \ No newline at end of file Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -24,26 +24,30 @@ --> <ContinuousPanelContainerUI> <script><![CDATA[ +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; protected JTextField continueMax = null; protected JTextField continueMin = null; -addPropertyChangeListener("continuePossible", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - continueMax.setVisible((Boolean)evt.getNewValue()); - continueMin.setVisible((Boolean)evt.getNewValue()); - } -}); +protected void $afterCompleteSetup() { + addPropertyChangeListener("continuePossible", new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + continueMax.setVisible((Boolean)evt.getNewValue()); + continueMin.setVisible((Boolean)evt.getNewValue()); + } + }); + + addPropertyChangeListener("continueSelected", new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + continueMax.setEnabled((Boolean)evt.getNewValue()); + continueMin.setEnabled((Boolean)evt.getNewValue()); + } + }); +} -addPropertyChangeListener("continueSelected", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - continueMax.setEnabled((Boolean)evt.getNewValue()); - continueMin.setEnabled((Boolean)evt.getNewValue()); - } -}); - public void init(JTextField cMin, JTextField cMax) { continueMax = cMax; continueMin = cMin; @@ -63,22 +67,23 @@ public String getMax() { return continueMax.getText(); } - ]]> - </script> - <Table id='content' constraints='BorderLayout.CENTER'> - <row> - <cell fill='horizontal'> - <JLabel text='isisfish.sensitivity.firstValue' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='horizontal' weightx='0.5'> - <JPanel id='continueMinPanel' layout='{new BorderLayout()}'/> - </cell> - <cell fill='horizontal'> - <JLabel text='isisfish.sensitivity.lastValue' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='horizontal' weightx='0.5'> - <JPanel id='continueMaxPanel' layout='{new BorderLayout()}'/> - </cell> - </row> - </Table> + ]]></script> + <JPanel id="content"> + <Table constraints='BorderLayout.CENTER'> + <row> + <cell fill='horizontal'> + <JLabel text='isisfish.sensitivity.firstValue' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JPanel id='continueMinPanel' layout='{new BorderLayout()}'/> + </cell> + <cell fill='horizontal'> + <JLabel text='isisfish.sensitivity.lastValue' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JPanel id='continueMaxPanel' layout='{new BorderLayout()}'/> + </cell> + </row> + </Table> + </JPanel> </ContinuousPanelContainerUI> \ No newline at end of file Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2011-03-17 15:49:25 UTC (rev 3177) @@ -39,7 +39,8 @@ import javax.swing.JTextField; import javax.swing.text.JTextComponent; -import jaxx.runtime.JAXXInitialContext; +import jaxx.runtime.JAXXContext; +import jaxx.runtime.context.JAXXInitialContext; import jaxx.runtime.swing.editor.NumberEditor; import org.apache.commons.lang.StringUtils; @@ -51,6 +52,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntityContextable; import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.entities.Formule; @@ -96,7 +98,7 @@ * @return property value */ public static String getMethod(JComponent component) { - String method = (String)component.getClientProperty("method"); + String method = (String)component.getClientProperty("sensitivityMethod"); return method; } @@ -107,7 +109,7 @@ * @param entity entity * @return component copy */ - public static JComponent getEditor(JComponent component, TopiaEntity entity) { + public static JComponent getEditor(JComponent component, TopiaEntityContextable entity) { JComponent result = null; try { String fieldName = getMethod(component); @@ -175,7 +177,7 @@ //ui.setMethodSet(origine.getMethodSet()); ui.setBeanProperty(origine.getBeanProperty()); ui.setBean(entity); - ui.setActif(true); + ui.setActive(true); ui.refresh(); result = ui; } else if (result instanceof IntervalPanel) { @@ -193,9 +195,9 @@ origine.getRegion()).add( new InputSaveVerifier())); ui.setBean(origine.getBean()); - ui.setActif(true); + ui.setActive(true); ui.refresh(); - ui.setActif(true); + ui.setActive(true); result = ui; } else if (result instanceof MetierSeasonInfoSpeciesEditorUI) { MetierSeasonInfoSpeciesEditorUI origine = (MetierSeasonInfoSpeciesEditorUI) component; @@ -207,7 +209,7 @@ if (origine.getMetierSeasonInfo() != null) { ui.setMetierSeasonInfo(origine.getMetierSeasonInfo()); ui.setMetierSeasonSelected(true); - ui.setActif(true); + ui.setActive(true); } ui.refresh(); result = ui; @@ -215,7 +217,7 @@ PopulationZonesEditorUI origine = (PopulationZonesEditorUI) component; PopulationZonesEditorUI ui = new PopulationZonesEditorUI(new JAXXInitialContext().add(new InputAction()).add(origine.getRegion())); ui.setBean(origine.getBean()); - ui.setActif(true); + ui.setActive(true); ui.refresh(); result = ui; } else if (result instanceof PopulationMigrationMigrationUI) { @@ -224,7 +226,7 @@ new JAXXInitialContext().add(new InputAction())); ui.setBean(origine.getBean()); ui.setPopInfo(origine.getPopInfo()); - ui.setActif(true); + ui.setActive(true); ui.refreshPanel(); result = ui; } else if (result instanceof PopulationMigrationEmigrationUI) { @@ -232,7 +234,7 @@ PopulationMigrationEmigrationUI ui = new PopulationMigrationEmigrationUI(new JAXXInitialContext().add(new InputAction())); ui.setBean(origine.getBean()); ui.setPopInfo(origine.getPopInfo()); - ui.setActif(true); + ui.setActive(true); ui.refreshPanel(); result = ui; } else if (result instanceof PopulationMigrationImmigrationUI) { @@ -240,7 +242,7 @@ PopulationMigrationImmigrationUI ui = new PopulationMigrationImmigrationUI(new JAXXInitialContext().add(new InputAction())); ui.setBean(origine.getBean()); ui.setPopInfo(origine.getPopInfo()); - ui.setActif(true); + ui.setActive(true); ui.refreshPanel(); result = ui; } @@ -263,7 +265,7 @@ * @param entity entity * @return component copy */ - public static ContinuousPanelContainerUI getContinuousPanel(JComponent component, TopiaEntity entity) { + public static ContinuousPanelContainerUI getContinuousPanel(JComponent component, TopiaEntityContextable entity) { ContinuousPanelContainerUI result = null; String fieldName = getMethod(component); DefaultContinuousPanelUI continuousPanel = null; @@ -453,7 +455,7 @@ /// ??? was not set before ui.setBeanProperty(origine.getBeanProperty()); ui.setFormule((Formule) value); - ui.setActif(true); + ui.setActive(true); ui.refresh(); result = ui; } else if (result instanceof IntervalPanel) { @@ -469,9 +471,9 @@ origine.getRegion()).add(new InputSaveVerifier())); ui.setBean(origine.getBean()); ui.getBean().setPopulationSelectivity((Collection<Selectivity>) value); - ui.setActif(true); + ui.setActive(true); ui.refresh(); - ui.setActif(true); + ui.setActive(true); result = ui; } else if (result instanceof MetierSeasonInfoSpeciesEditorUI) { MetierSeasonInfoSpeciesEditorUI origine = (MetierSeasonInfoSpeciesEditorUI) component; @@ -484,7 +486,7 @@ ui.setMetierSeasonInfo(origine.getMetierSeasonInfo()); ui.getMetierSeasonInfo().setSpeciesTargetSpecies((Collection<TargetSpecies>) value); ui.setMetierSeasonSelected(true); - ui.setActif(true); + ui.setActive(true); } ui.refresh(); result = ui; @@ -495,7 +497,7 @@ ui.setBean(origine.getBean()); MatrixND m = (MatrixND) value; ui.getFieldPopulationMappingZoneReproZoneRecru().setMatrix(m == null ? null : m.clone()); - ui.setActif(true); + ui.setActive(true); ui.refresh(); result = ui; } else if (result instanceof PopulationMigrationMigrationUI) { @@ -506,7 +508,7 @@ ui.setPopInfo(origine.getPopInfo()); MatrixND m = (MatrixND) value; ui.getPopInfo().setMigrationMatrix(m == null ? null : m.clone()); - ui.setActif(true); + ui.setActive(true); ui.refreshPanel(); result = ui; } else if (result instanceof PopulationMigrationEmigrationUI) { @@ -517,7 +519,7 @@ ui.setPopInfo(origine.getPopInfo()); MatrixND m = (MatrixND) value; ui.getPopInfo().setEmigrationMatrix(m == null ? null : m.clone()); - ui.setActif(true); + ui.setActive(true); ui.refreshPanel(); result = ui; } else if (result instanceof PopulationMigrationImmigrationUI) { @@ -528,7 +530,7 @@ ui.setPopInfo(origine.getPopInfo()); MatrixND m = (MatrixND) value; ui.getPopInfo().setImmigrationMatrix(m == null ? null : m.clone()); - ui.setActif(true); + ui.setActive(true); ui.refreshPanel(); result = ui; } @@ -650,7 +652,7 @@ */ public static boolean canBeContinue(JComponent component, TopiaEntity entity) { - String fieldName = (String) component.getClientProperty("method"); + String fieldName = (String) component.getClientProperty("sensitivityMethod"); if (component instanceof JTextComponent) { Object o = getMethodValue(entity, fieldName); return canBeContinue(component, o); @@ -887,9 +889,9 @@ InputOneEquationUI equationComponent = new InputOneEquationUI( new JAXXInitialContext().add(new InputAction())); equationComponent.setFormuleCategory(basicEquation.getCategory()); - equationComponent.setBean((TopiaEntity)bean); + equationComponent.setBean((TopiaEntityContextable)bean); equationComponent.setBeanProperty(beanProperty); - equationComponent.putClientProperty("method", beanProperty); + equationComponent.putClientProperty("sensitivityMethod", beanProperty); component = equationComponent; } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -25,7 +25,7 @@ <ContinuousPanelContainerUI> <String id='text' javaBean='null'/> - <org.nuiton.topia.persistence.TopiaEntity id='bean' javaBean='null'/> + <org.nuiton.topia.persistence.TopiaEntityContextable id='bean' javaBean='null'/> <String id='beanProperty' javaBean='null'/>  <Class id='clazz' javaBean='null'/> @@ -243,30 +243,32 @@ } } ]]></script> - <Table id='content' constraints='BorderLayout.CENTER'> - <row> - <cell fill='both' columns='2' weightx='1' weighty='0.5'> - <JScrollPane preferredSize="{new Dimension(200, 150)}"> - <JTable id='params' visible='{isContinuePossible()}' model='{getTableModel()}' + <JPanel id='content'> + <Table constraints='BorderLayout.CENTER'> + <row> + <cell fill='both' columns='2' weightx='1' weighty='1'> + <JScrollPane preferredSize="{new Dimension(200, 150)}"> + <JTable id='params' visible='{isContinuePossible()}' model='{getTableModel()}' enabled='{isContinueSelected()}' /> - </JScrollPane> - </cell> - </row> - <row> - <cell fill='horizontal' weightx='0.5'> - <JButton id='add' text='isisfish.common.add' visible='{isContinuePossible()}' enabled='{isContinueSelected()}' onActionPerformed='add()'/> - </cell> - <cell fill='horizontal' weightx='0.5'> - <JButton id='remove' text='isisfish.common.remove' visible='{isContinuePossible()}' enabled='{isContinueSelected()}' onActionPerformed='remove()'/> - </cell> - </row> - <row> - <cell fill='both' columns='2' weightx='1' weighty='0.5'> - <fr.ifremer.isisfish.ui.input.InputOneEquationUI id='editor' formule='{getFormule()}' text='{getText()}' - constructorParams='this' bean='{getBean()}' clazz='{getClazz()}' beanProperty='{getBeanProperty()}' actif='{isContinueSelected()}' - formuleCategory='{getFormuleCategory()}' selectedEquation='{getSelectedEquation()}' - visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - </row> - </Table> -</ContinuousPanelContainerUI> \ No newline at end of file + </JScrollPane> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='1'> + <JButton id='add' text='isisfish.common.add' visible='{isContinuePossible()}' enabled='{isContinueSelected()}' onActionPerformed='add()'/> + </cell> + <cell fill='horizontal' weightx='1'> + <JButton id='remove' text='isisfish.common.remove' visible='{isContinuePossible()}' enabled='{isContinueSelected()}' onActionPerformed='remove()'/> + </cell> + </row> + <row> + <cell fill='both' columns='2' weightx='1' weighty='1'> + <fr.ifremer.isisfish.ui.input.InputOneEquationUI id='editor' formule='{getFormule()}' text='{getText()}' + constructorParams='this' bean='{getBean()}' clazz='{getClazz()}' beanProperty='{getBeanProperty()}' active='{isContinueSelected()}' + formuleCategory='{getFormuleCategory()}' selectedEquation='{getSelectedEquation()}' + visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + </row> + </Table> + </JPanel> +</ContinuousPanelContainerUI> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2010 Ifremer, CodeLutin + Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -28,13 +28,11 @@ <Boolean id='continueSelected' javaBean='false'/> - <Boolean id='saveEnabled' javaBean='false'/> - <Boolean id='existingValue' javaBean='false'/> <script><![CDATA[ import org.apache.commons.lang.StringUtils; -import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntityContextable; import fr.ifremer.isisfish.ui.simulator.SimulAction; import fr.ifremer.isisfish.ui.input.InputSaveVerifier; import fr.ifremer.isisfish.simulator.sensitivity.Factor; @@ -42,33 +40,38 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; +import jaxx.runtime.JAXXUtil; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; protected JComponent cOrigine = null; -protected TopiaEntity bean = null; +protected TopiaEntityContextable bean = null; protected java.util.List<JComponent> discretComponents = new ArrayList<JComponent>(); protected String path = null; protected ContinuousPanelContainerUI continuousPanel = null; protected Factor factor = null; -addPropertyChangeListener("continuePossible", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (continuousPanel != null) { - continuousPanel.setContinuePossible((Boolean)evt.getNewValue()); +protected void $afterCompleteSetup() { + addPropertyChangeListener(PROPERTY_CONTINUE_POSSIBLE, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (continuousPanel != null) { + continuousPanel.setContinuePossible((Boolean)evt.getNewValue()); + } } - } -}); - -addPropertyChangeListener("continueSelected", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (continuousPanel != null) { - continuousPanel.setContinueSelected((Boolean)evt.getNewValue()); + }); + + addPropertyChangeListener(PROPERTY_CONTINUE_SELECTED, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (continuousPanel != null) { + continuousPanel.setContinueSelected((Boolean)evt.getNewValue()); + } } - } -}); + }); +} -public void initNew(JComponent c, TopiaEntity be, Boolean b) { +public void initNew(JComponent c, TopiaEntityContextable be, Boolean b) { this.bean = be; this.cOrigine = c; @@ -106,7 +109,6 @@ continuousPanel.setContinueSelected(selected); } setContinueSelected(EditorHelper.isContinue(cOrigine)); - setSaveEnabled(!factorName.getText().equals("")); } public void initExisting(JComponent cOrigine, Factor f) { @@ -173,7 +175,6 @@ this.pack(); } - setSaveEnabled(!factorName.getText().equals("")); } protected void init() { continuousPanelContainer.add(continuousPanel, BorderLayout.CENTER); @@ -206,12 +207,12 @@ } else { getSensitivityAction().saveDiscret(cOrigine, factorName.getText(), comment.getText(), path, discretComponents, getSimulAction(), isExistingValue()); } - getContextValue(InputSaveVerifier.class).getSensPanel().setFactorModel(); + getContextValue(SensitivityTabUI.class, JAXXUtil.PARENT).setFactorModel(); exit(); } protected void remove() { getSimulAction().removeFactor(factor); - getContextValue(InputSaveVerifier.class).getSensPanel().setFactorModel(); + getContextValue(SensitivityTabUI.class, JAXXUtil.PARENT).setFactorModel(); exit(); } protected void exit() { @@ -224,38 +225,41 @@ <cell columns='1' fill='horizontal'> <JLabel text='isisfish.sensitivity.name'/> </cell> - <cell columns='3' fill='horizontal' weightx='1'> - <JTextField id='factorName' onKeyReleased='setSaveEnabled(!factorName.getText().equals(""))'/> + <cell columns='3' fill='horizontal'> + <JTextField id='factorName'/> </cell> </row> <row> - <cell columns='4' fill='horizontal' weightx='1'> - <JRadioButton id='continueRadio' text='isisfish.sensitivity.continue' buttonGroup='factorType' visible='{isContinuePossible()}' selected='{false}' onActionPerformed='setContinueSelected(continueRadio.isSelected())'/> + <cell columns='4' fill='horizontal'> + <JRadioButton id='continueRadio' text='isisfish.sensitivity.continue' + buttonGroup='factorType' visible='{isContinuePossible()}' selected='{false}' onActionPerformed='setContinueSelected(continueRadio.isSelected())'/> </cell> </row> <row> - <cell columns='4' fill='both' weightx='1' weighty='0.5'> + <cell columns='4' fill='both' weightx='1' weighty='2'> <JPanel id='continuousPanelContainer' layout='{new BorderLayout()}'/> </cell> </row> <row> - <cell columns='4' fill='horizontal' weightx='1'> - <JRadioButton id='discret' text='isisfish.sensitivity.discret' selected='{true}' buttonGroup='factorType' onActionPerformed='setContinueSelected(continueRadio.isSelected())'/> + <cell columns='4' fill='horizontal'> + <JRadioButton id='discret' text='isisfish.sensitivity.discret' + selected='{true}' buttonGroup='factorType' + onActionPerformed='setContinueSelected(continueRadio.isSelected())'/> </cell> </row> <row> <cell fill='horizontal'> <JLabel text='isisfish.sensitivity.selectDiscretNumber' enabled='{!isContinueSelected()}'/> </cell> - <cell fill='horizontal' weightx='0.5'> + <cell fill='horizontal'> <JTextField id='discretNumber' enabled='{!isContinueSelected()}'/> </cell> - <cell columns='2' fill='horizontal' weightx='0.5'> + <cell columns='2' fill='horizontal'> <JButton text='isisfish.sensitivity.validDiscretNumber' enabled='{!isContinueSelected()}' onActionPerformed='addTabs(discretNumber.getText())'/> </cell> </row> <row> - <cell columns='4' fill='both' weightx='1' weighty='0.3'> + <cell columns='4' fill='both' weightx='1' weighty='2'> <JTabbedPane id='tabPane' visible='{!isContinueSelected()}' enabled='{!isContinueSelected()}'/> </cell> </row> @@ -265,21 +269,21 @@ </cell> </row> <row> - <cell columns='4' fill='both' weightx='1' weighty='0.3'> + <cell columns='4' fill='both' weighty='1'> <JScrollPane> <JTextArea id='comment'/> </JScrollPane> </cell> </row> <row> - <cell fill='horizontal' weightx='0.25'> + <cell fill='horizontal'> <JButton id='cancel' text='isisfish.common.cancel' onActionPerformed='exit()'/> </cell> - <cell fill='horizontal' weightx='0.25'> + <cell fill='horizontal'> <JButton id='remove' text='isisfish.common.remove' visible='{isExistingValue()}' onActionPerformed='remove()'/> </cell> - <cell columns='2' fill='horizontal' weightx='0.5'> - <JButton id='save' text='isisfish.common.save' enabled='{isSaveEnabled()}' onActionPerformed='save()'/> + <cell columns='2' fill='horizontal'> + <JButton id='save' text='isisfish.common.save' enabled='{!getFactorName().getText().isEmpty()}' onActionPerformed='save()'/> </cell> </row> </Table> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -26,37 +26,39 @@ <org.nuiton.math.matrix.MatrixND id='matrix' javaBean='null'/> - <Table id='content' constraints='BorderLayout.CENTER'> - <row> - <cell fill='horizontal'> - <JLabel text='isisfish.sensitivity.value' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='both' weightx='1' weighty='1'> - <org.nuiton.math.matrix.gui.MatrixPanelEditor id='componentPanel' dimensionEdit='{false}' - matrix='{getMatrix() == null ? null : getMatrix().clone()}' visible='{isContinuePossible()}' - enabled='{isContinueSelected()}'/> - </cell> - </row> - <row> - <cell fill='horizontal'> - <JLabel text='isisfish.sensitivity.coefficient' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='both' columns='2' weightx='1' weighty='1'> - <JTextField id='coef' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - </row> - <row> - <cell fill='horizontal'> - <JLabel text='isisfish.sensitivity.operator' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='horizontal' weightx='1' columns='3'> - <JComboBox id='operator' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'> - <item id='plus' value="+"/> - <item id='moins' value="-"/> - <item id='mult' value="*"/> - <item id='div' value="/"/> - </JComboBox> - </cell> - </row> - </Table> + <JPanel id='content'> + <Table constraints='BorderLayout.CENTER'> + <row> + <cell fill='horizontal'> + <JLabel text='isisfish.sensitivity.value' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='both' weightx='1' weighty='1'> + <org.nuiton.math.matrix.gui.MatrixPanelEditor id='componentPanel' dimensionEdit='{false}' + matrix='{getMatrix() == null ? null : getMatrix().clone()}' visible='{isContinuePossible()}' + enabled='{isContinueSelected()}'/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JLabel text='isisfish.sensitivity.coefficient' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='both' columns='2' weightx='1' weighty='1'> + <JTextField id='coef' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JLabel text='isisfish.sensitivity.operator' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='horizontal' weightx='1' columns='3'> + <JAXXComboBox id='operator' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'> + <item id='plus' value="+"/> + <item id='moins' value="-"/> + <item id='mult' value="*"/> + <item id='div' value="/"/> + </JAXXComboBox> + </cell> + </row> + </Table> + </JPanel> </ContinuousPanelContainerUI> \ No newline at end of file Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -37,26 +37,28 @@ // declaration sépérée de la variable d'instance (jaxx) SimulationServiceListener simulationListener; - // permet de rafaichir la liste les simulations - // des qu'une simulation se termine - simulationListener = new SimulationServiceListener() { - @Override - public void simulationStart(SimulationService simService, SimulationJob job) { - } - - @Override - public void simulationStop(SimulationService simService, SimulationJob job) { - if (log.isDebugEnabled()) { - log.debug("Refresh second pass UI simulations list"); + protected void $afterCompleteSetup() { + // permet de rafaichir la liste les simulations + // des qu'une simulation se termine + simulationListener = new SimulationServiceListener() { + @Override + public void simulationStart(SimulationService simService, SimulationJob job) { } - fieldSensitivitySimulationSelect.setModel(getSensitivitySimulationModel()); - } - - @Override - public void clearJobDone(SimulationService simService) { - } + + @Override + public void simulationStop(SimulationService simService, SimulationJob job) { + if (log.isDebugEnabled()) { + log.debug("Refresh second pass UI simulations list"); + } + fieldSensitivitySimulationSelect.setModel(getSensitivitySimulationModel()); + } + + @Override + public void clearJobDone(SimulationService simService) { + } + }; + SimulationService.getService().addSimulationServiceListener(simulationListener); } - SimulationService.getService().addSimulationServiceListener(simulationListener); /** * Model de contenu de la liste des nom de simulations @@ -129,7 +131,7 @@ <row> <cell columns="3" fill="both" weightx="1.0" weighty="1.0"> <JScrollPane> - <JTextArea id='textAreaSensitivitySecondpassResult' text='' editable="false" /> + <JTextArea id='textAreaSensitivitySecondpassResult' editable="false" /> </JScrollPane> </cell> </row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -47,7 +47,7 @@ protected void $afterCompleteSetup() { // end code constructor - getVerifier().setSensPanel(this); + //getVerifier().setSensPanel(this); } protected InputAction getInputAction() {

1 0

r3176 - in isis-fish/branches/3.3.1/src: main/java/fr/ifremer/isisfish/datastore test/java/fr/ifremer/isisfish/entity test/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org March 17, 2011

March 17, 2011

Author: chatellier Date: 2011-03-17 14:31:00 +0000 (Thu, 17 Mar 2011) New Revision: 3176 Log: Back to standalone topia migration service configuration Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2011-03-17 10:35:55 UTC (rev 3175) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2011-03-17 14:31:00 UTC (rev 3176) @@ -202,28 +202,15 @@ /** * Returns the storage. * - * Storage is auto configured to perform shema migration. - * * @return Returns the storage. */ public TopiaContext getStorage() { - TopiaContext topiaContext = getStorage(true); - return topiaContext; - } - - /** - * Returns the storage. - * - * @param performMigration if {@code true} perform migration - * @return Returns the storage. - */ - public TopiaContext getStorage(boolean performMigration) { if (storage == null || storage.isClosed()) { log.info("Create new storage for " + getName()); try { // creation des proprietes pour creer le TopiaContext Properties config = new Properties(); - IsisH2Config.addDatabaseConfig(config, getDirectory(), performMigration); + IsisH2Config.addDatabaseConfig(config, getDirectory()); IsisH2Config.addHibernateMapping(config); // instanciation du TopiaContext @@ -301,7 +288,7 @@ // creation des proprietes pour creer le TopiaContext Properties config = new Properties(); // false = don't perform, schema is empty - IsisH2Config.addDatabaseConfig(config, rootDirDest, false); + IsisH2Config.addDatabaseConfig(config, rootDirDest); IsisH2Config.addHibernateMapping(config); // instanciation du TopiaContext Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2011-03-17 10:35:55 UTC (rev 3175) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2011-03-17 14:31:00 UTC (rev 3176) @@ -140,10 +140,9 @@ * * @param config l'objet properties dans lequel il faut ajouter les informations * @param directory le repertoire dans lequel la base de données doit se trouver - * @param performMigration if {@code true} perform migration * @return l'objet config passe en parametre */ - public static Properties addDatabaseConfig(Properties config, File directory, boolean performMigration) { + public static Properties addDatabaseConfig(Properties config, File directory) { File databasePath = getStorageDataDirectory(directory); databasePath.mkdirs(); @@ -160,9 +159,9 @@ // migration configuration, seulement pour les fichiers, pas pour les bases memoires config.put(TopiaMigrationService.TOPIA_SERVICE_NAME, TopiaMigrationEngine.class.getName()); config.put(TopiaMigrationService.MIGRATION_CALLBACK, databaseMigrationClass.getName()); - if (!performMigration) { + /*if (!performMigration) { config.put(TopiaMigrationService.MIGRATION_MIGRATE_ON_INIT, databaseMigrationClass.getName()); - } + }*/ return config; } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2011-03-17 10:35:55 UTC (rev 3175) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2011-03-17 14:31:00 UTC (rev 3176) @@ -202,7 +202,7 @@ if (region != null) { File file = region.getDataBackupFile(); if (file.exists()) { - TopiaContext tx = region.getStorage(false).beginTransaction(); + TopiaContext tx = region.getStorage().beginTransaction(); tx.restore(file); tx.commitTransaction(); tx.closeContext(); @@ -280,7 +280,7 @@ RegionStorage result = new RegionStorage(directory, name); try { - TopiaContext context = result.getStorage(false).beginTransaction(); + TopiaContext context = result.getStorage().beginTransaction(); context.createSchema(); FisheryRegionDAO regionDAO = IsisFishDAOHelper .getFisheryRegionDAO(context); @@ -436,7 +436,7 @@ if (result != null) { File data = result.getDataBackupFile(); if (file.exists()) { - TopiaContext tx = result.getStorage(false).beginTransaction(); + TopiaContext tx = result.getStorage().beginTransaction(); tx.restore(data); if (newName != null) { FisheryRegion region = getFisheryRegion(tx); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2011-03-17 10:35:55 UTC (rev 3175) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2011-03-17 14:31:00 UTC (rev 3176) @@ -597,7 +597,7 @@ checkout(IsisFish.config.getDatabaseDirectory(), SIMULATION_PATH + "/" + name); SimulationStorage sim = getSimulation(name); File file = sim.getDataBackupFile(); - TopiaContext tx = sim.getStorage(false).beginTransaction(); + TopiaContext tx = sim.getStorage().beginTransaction(); tx.restore(file); tx.commitTransaction(); tx.closeContext(); @@ -686,7 +686,7 @@ File data = result.getDataBackupFile(); // FIXME was file.exists() ? if (data.exists()) { - TopiaContext tx = result.getStorage(false).beginTransaction(); + TopiaContext tx = result.getStorage().beginTransaction(); tx.restore(data); tx.commitTransaction(); tx.closeContext(); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java 2011-03-17 10:35:55 UTC (rev 3175) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java 2011-03-17 14:31:00 UTC (rev 3176) @@ -66,7 +66,7 @@ SimulationParameter parameters = new SimulationParameterImpl(); SimulationStorage simulation = SimulationStorage.create("testdao", parameters); - TopiaContext rootContext = simulation.getStorage(false); + TopiaContext rootContext = simulation.getStorage(); TopiaContext context = rootContext.beginTransaction(); context.createSchema(); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2011-03-17 10:35:55 UTC (rev 3175) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2011-03-17 14:31:00 UTC (rev 3176) @@ -125,7 +125,7 @@ SimulationContext context = SimulationContext.get(); SimulationParameter params = new SimulationParameterImpl(); SimulationStorage simulation = SimulationStorage.create("test_1_int", params); - TopiaContext storageContext = simulation.getStorage(false); + TopiaContext storageContext = simulation.getStorage(); storageContext.createSchema(); TopiaContext childStorageContext = storageContext.beginTransaction(); VesselTypeDAO vesselTypeDAO = IsisFishDAOHelper.getVesselTypeDAO(childStorageContext); @@ -225,7 +225,7 @@ SimulationContext context = SimulationContext.get(); SimulationParameter params = new SimulationParameterImpl(); SimulationStorage simulation = SimulationStorage.create("test_2_matrix", params); - TopiaContext storageContext = simulation.getStorage(false); + TopiaContext storageContext = simulation.getStorage(); storageContext.createSchema(); TopiaContext childStorageContext = storageContext.beginTransaction(); PopulationSeasonInfoDAO populationSeasonInfoDAO = IsisFishDAOHelper.getPopulationSeasonInfoDAO(childStorageContext);

1 0

r3175 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish: . datastore entities logging mexico ui/script ui/script/action
by chatellier＠users.labs.libre-entreprise.org March 17, 2011

March 17, 2011

Author: chatellier Date: 2011-03-17 10:35:55 +0000 (Thu, 17 Mar 2011) New Revision: 3175 Log: Fix isis exception constructors. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishException.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2005 - 2010 Ifremer, CodeLutin + * Copyright (C) 2005 - 2011 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -53,13 +53,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.math.matrix.DoubleBigVector; import org.nuiton.math.matrix.MatrixFactory; import org.nuiton.topia.TopiaException; import org.nuiton.util.FileUtil; -import org.nuiton.util.LocaleConverter; import org.nuiton.util.Version; -import org.nuiton.widget.SwingUtil; +import org.nuiton.util.converter.LocaleConverter; import fr.ifremer.isisfish.cron.CronService; import fr.ifremer.isisfish.datastore.AnalysePlanStorage; @@ -119,69 +119,71 @@ System.exit(0); } - public static void main(String... args) { + public static void main(String... args) throws Exception { - try { - // permet de faire fonctionner la compilation en webstart - System.setSecurityManager(null); + // catch wall application exception + Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() { + public void uncaughtException(Thread t, Throwable cause) { + if (cause instanceof LinkageError) { + if (log.isFatalEnabled()) { + log.fatal("Linkage error detected", cause); + } - // initialisation de l'application - IsisFish.init(args); + // a real java.lang.Error sometimes happen when + // using non recompiled script due to dependency changes + // this is the better solution found : + // remove isis build directory + FileUtil.deleteRecursively(IsisFish.config.getCompileDirectory()); - if (log.isDebugEnabled()) { - log.debug(_("isisfish.launch.init.done", config.getElapsedTimeAsString())); + ErrorHelper.showErrorDialog(null, _("isisfish.error.linkageerror.title"), cause); + } + else { + if (log.isErrorEnabled()) { + log.error("Global application exception", cause); + } + ErrorHelper.showErrorDialog(null, cause.getMessage(), cause); + } } + }); - // action after init - config.doAction(IsisConfig.STEP_AFTER_INIT); + // permet de faire fonctionner la compilation en webstart + System.setSecurityManager(null); - // initVCS ask for passphrase, ui must be set before - initLookAndFeel(); - - // static vcs init (needed for some actions) - try { - initVCS(); - } catch (Exception eee) { - log.warn(_("Error during vcs initialisation"), eee); - } + // initialisation de l'application + init(args); - if (log.isInfoEnabled()) { - log.info(_("isisfish.launching", config.getElapsedTimeAsString())); - } - - // after init vcs and local data - config.doAction(IsisConfig.STEP_AFTER_INIT_VCS); - - doNuitonMigration(); + if (log.isDebugEnabled()) { + log.debug(_("isisfish.launch.init.done", config.getElapsedTimeAsString())); + } - launchUI(); + // action after init + config.doAction(IsisConfig.STEP_AFTER_INIT); - // action after ui launched - config.doAction(IsisConfig.STEP_AFTER_UI); - - startCronService(); - } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("Global IsisFish exception", e); - } - quit(); - } catch (LinkageError e) { - - if (log.isFatalEnabled()) { - log.fatal("Linkage error detected", e); - } - - // a real java.lang.Error sometimes happen when - // using non recompiled script due to dependency changes - // this is the better solution found : - // remove isis build directory - FileUtil.deleteRecursively(IsisFish.config.getCompileDirectory()); - // display message - JOptionPane.showMessageDialog(null, _("isisfish.error.linkageerror.message"), - _("isisfish.error.linkageerror.title"), JOptionPane.ERROR_MESSAGE); - // restart isis - quit(); + // initVCS ask for passphrase, ui must be set before + initLookAndFeel(); + + // static vcs init (needed for some actions) + try { + initVCS(); + } catch (Exception eee) { + log.warn(_("Error during vcs initialisation"), eee); } + + if (log.isInfoEnabled()) { + log.info(_("isisfish.launching", config.getElapsedTimeAsString())); + } + + // after init vcs and local data + config.doAction(IsisConfig.STEP_AFTER_INIT_VCS); + + doNuitonMigration(); + + launchUI(); + + // action after ui launched + config.doAction(IsisConfig.STEP_AFTER_UI); + + startCronService(); } /** @@ -329,17 +331,17 @@ } // first load converter and matrixFactory - initConvertersAndMatrixFactory(); - - // after init shutdown hook - Runtime.getRuntime().addShutdownHook(new IsisQuitHook()); + //initConvertersAndMatrixFactory(); // parsing des options à partir des arguments passés config = new IsisConfig(); config.parse(args); // init i18n - I18n.init(config.getLocale()); + I18n.init(new ClassPathI18nInitializer(), config.getLocale()); + + // after init shutdown hook + Runtime.getRuntime().addShutdownHook(new IsisQuitHook()); } /** @@ -620,7 +622,8 @@ welcome.addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent e) { - ((WelcomeUI)e.getSource()).close(); + WelcomeUI ui = (WelcomeUI)e.getSource(); + ui.getHandler().close(ui); } }); @@ -634,7 +637,7 @@ log.error("Can't set frame icon", ex); } } - SwingUtil.center(welcome); + welcome.setLocationRelativeTo(null); welcome.setVisible(true); } else { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishException.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishException.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishException.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2005 - 2010 Ifremer, CodeLutin + * Copyright (C) 2005 - 2011 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -25,24 +25,32 @@ package fr.ifremer.isisfish; +/** + * Isis non runtime exception. + * + * @author poussin + */ public class IsisFishException extends Exception { /** serialVersionUID. */ private static final long serialVersionUID = -9012018415761616627L; - public IsisFishException() { - super(); - } - + /** + * Constructor with message. + * + * @param message message + */ public IsisFishException(String message) { super(message); } + /** + * Constructor with message and cause. + * + * @param message message + * @param cause cause + */ public IsisFishException(String message, Throwable cause) { super(message, cause); } - - public IsisFishException(Throwable cause) { - super(cause); - } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,8 +26,9 @@ package fr.ifremer.isisfish; /** + * Isis runtime exception. + * * @author poussin - * */ public class IsisFishRuntimeException extends RuntimeException { @@ -35,32 +36,21 @@ private static final long serialVersionUID = 3388901195563202616L; /** + * Constructor with message. * + * @param message message */ - public IsisFishRuntimeException() { - super(); - } - - /** - * @param message - */ public IsisFishRuntimeException(String message) { super(message); } /** - * @param message - * @param cause + * Constructor with message and cause. + * + * @param message message + * @param cause cause */ public IsisFishRuntimeException(String message, Throwable cause) { super(message, cause); } - - /** - * @param cause - */ - public IsisFishRuntimeException(Throwable cause) { - super(cause); - } - } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -152,7 +152,7 @@ lastContentUpdate = System.nanoTime(); lastContentLength = getFile().length(); } catch (IOException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get content", eee); } } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 Ifremer, CodeLutin + * Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -27,24 +27,36 @@ import fr.ifremer.isisfish.IsisFishException; +/** + * Storage exception. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ public class StorageException extends IsisFishException { /** serialVersionUID. */ private static final long serialVersionUID = -8193638893951824873L; - public StorageException() { - super(); - } - + /** + * Constructor with message. + * + * @param message message + */ public StorageException(String message) { super(message); } + /** + * Constructor with message and cause. + * + * @param message message + * @param cause cause + */ public StorageException(String message, Throwable cause) { super(message, cause); } - - public StorageException(Throwable cause) { - super(cause); - } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -51,7 +51,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -106,7 +106,7 @@ List<Port> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get port", eee); } } @@ -119,7 +119,7 @@ List<Cell> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get cell", eee); } } @@ -133,7 +133,7 @@ List<VesselType> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get vessel type", eee); } } @@ -146,7 +146,7 @@ List<Gear> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get gear", eee); } } @@ -159,7 +159,7 @@ List<Metier> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get metier", eee); } } @@ -173,7 +173,7 @@ List<SetOfVessels> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get setOfVessels", eee); } } @@ -186,7 +186,7 @@ List<Species> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get species", eee); } } @@ -200,7 +200,7 @@ List<Strategy> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get strategy", eee); } } @@ -214,7 +214,7 @@ List<TripType> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get tripType", eee); } } @@ -227,7 +227,7 @@ List<Zone> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get zone", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -52,7 +52,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -55,7 +55,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -70,10 +70,10 @@ /** serialVersionUID */ private static final long serialVersionUID = 1L; - /** + /* * Overwrite delete. * @throws TopiaException - */ + * @Override public void delete() throws TopiaException { // chatellier 20090317 fix hibernate exception @@ -82,7 +82,7 @@ this.getSpecies().getPopulation().remove(this); super.delete(); - } + }*/ /* * @see fr.ifremer.isisfish.entities.PopulationAbstract#toString() Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -51,7 +51,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -64,7 +64,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -51,7 +51,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -67,7 +67,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } @@ -130,8 +130,7 @@ if (!month.equals(result.getMonth())) { // normalement les StrategyMonthInfo sont dans l'ordre mais // pour etre sur que ca fonctionne on fait un petit test - log - .warn("StrategyMonthInfo not in month order, i take time to find good StrategyMonthInfo"); + log.warn("StrategyMonthInfo not in month order, i take time to find good StrategyMonthInfo"); result = null; for (StrategyMonthInfo smi : smis) { if (month.equals(smi.getMonth())) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -65,7 +65,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } @@ -90,8 +90,7 @@ mat.setValue(metier, value); setProportionMetier(mat); } else { - log - .warn("Can't set proportion of metier, not enough information available"); + log.warn("Can't set proportion of metier, not enough information available"); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -48,11 +48,7 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1L; - /* (non-Javadoc) - * @see org.nuiton.topia.persistence.TopiaEntityAbstract#postCreate() - */ - @Override - public void postCreate() throws TopiaException { + public TripTypeImpl() { setMinTimeBetweenTrip(new TimeUnit(0)); setTripDuration(new TimeUnit(0)); } @@ -63,7 +59,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -48,11 +48,7 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1L; - /* (non-Javadoc) - * @see org.nuiton.topia.persistence.TopiaEntityAbstract#postCreate() - */ - @Override - public void postCreate() throws TopiaException { + public VesselTypeImpl() { setMaxTripDuration(new TimeUnit(0)); } @@ -62,7 +58,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -51,7 +51,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -140,9 +140,9 @@ if (log.isDebugEnabled()) { log.debug(_("isisfish.log.addAppender", appenderId)); } - } catch (IOException e) { - log.error(_("isisfish.error.log.createAppender", appenderId, e.getMessage())); - throw new IsisFishException(e); + } catch (IOException ex) { + log.error(_("isisfish.error.log.createAppender", appenderId, ex.getMessage())); + throw new IsisFishException("Can't add appender", ex); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -196,11 +196,11 @@ return out.toString(); } catch (IOException e) { - throw new IsisFishRuntimeException(e); + throw new IsisFishRuntimeException("Can't format xml", e); } catch (ParserConfigurationException e) { - throw new IllegalArgumentException(e); + throw new IllegalArgumentException("Can't format xml", e); } catch (SAXException e) { - throw new IllegalArgumentException(e); + throw new IllegalArgumentException("Can't format xml", e); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -973,8 +973,8 @@ FileUtil.copy(sourceFile, dst); } } - } catch (Exception ee) { - throw new IsisFishRuntimeException(ee); + } catch (Exception ex) { + throw new IsisFishRuntimeException("Can't backup scripts", ex); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -97,8 +97,8 @@ for (String path : paths) { backup(new File(src, path), path, suffix); } - } catch (Exception ee) { - throw new IsisFishRuntimeException(ee); + } catch (Exception ex) { + throw new IsisFishRuntimeException("Can't backup scripts", ex); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -153,8 +153,8 @@ + " files] (size " + dst.length() + ")"); } - } catch (IOException e1) { - throw new IsisFishRuntimeException(e1); + } catch (IOException ex) { + throw new IsisFishRuntimeException("Can't export script", ex); } } } \ No newline at end of file

1 0

r3174 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish: . actions
by chatellier＠users.labs.libre-entreprise.org March 17, 2011

March 17, 2011

Author: chatellier Date: 2011-03-17 10:35:24 +0000 (Thu, 17 Mar 2011) New Revision: 3174 Log: Fix i18n init Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-03-17 10:34:38 UTC (rev 3173) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-03-17 10:35:24 UTC (rev 3174) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Benjamin Poussin, CHatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,6 +26,7 @@ package fr.ifremer.isisfish; import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; import java.io.File; import java.net.MalformedURLException; @@ -868,7 +869,7 @@ * @throws org.nuiton.util.ArgumentsParserException */ @Override - public void parse(String[] args) throws ArgumentsParserException { + public void parse(String... args) throws ArgumentsParserException { super.parse(args); // dans la version precedente (3.1) seul le fichier user existe, il est // donc le seul a devoir etre modifie @@ -954,89 +955,89 @@ */ public static enum Option implements OptionDef { - COMPILATION_DIRECTORY("compilation.directory", _("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-build"), - MONITORING_DIRECTORY("monitoring.directory", _("isisfish.config.main.monitoringDirectory.description"), getUserHome() + File.separator + "isis-monitoring"), - JAVADOC_DIRECTORY("javadoc.directory", _("isisfish.config.main.javadocDirectory.description"), getUserHome() + File.separator + "isis-docs"), - CONFIG_FILE(CONFIG_FILE_NAME, _("isisfish.config.main.configFileName.description"), CONFIG_FILENAME), - BACKUP_DIRECTORY("backup.directory", _("isisfish.config.main.defaultBackupDirectory.description"), getUserHome() + File.separator + "isis-backup"), + COMPILATION_DIRECTORY("compilation.directory", n_("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-build"), + MONITORING_DIRECTORY("monitoring.directory", n_("isisfish.config.main.monitoringDirectory.description"), getUserHome() + File.separator + "isis-monitoring"), + JAVADOC_DIRECTORY("javadoc.directory", n_("isisfish.config.main.javadocDirectory.description"), getUserHome() + File.separator + "isis-docs"), + CONFIG_FILE(CONFIG_FILE_NAME, n_("isisfish.config.main.configFileName.description"), CONFIG_FILENAME), + BACKUP_DIRECTORY("backup.directory", n_("isisfish.config.main.defaultBackupDirectory.description"), getUserHome() + File.separator + "isis-backup"), - DEFAULT_EXPORT_NAMES("default.export.names", _("isisfish.config.main.defaultExportNames.description"), ""), - DEFAULT_RESULT_NAMES("default.result.names", _("isisfish.config.main.defaultResultNames.description"), ""), - DEFAULT_MAP_FILENAME("default.map.filename", _("isisfish.config.main.defaultMapFile.description"), "maps/vmap_area_thin.shp"), - DEFAULT_TAG_VALUE("default.tagvalue", _("isisfish.config.main.defaultTagValue.description"), ""), - ENCODING("encoding", _("isisfish.config.main.encoding.description"), "UTF-8"), - JAVADOC_URL("javadoc.url", _("isisfish.config.main.javadocURL.description"), "http://isis-fish.labs.libre-entreprise.org/isis-fish/apidocs/"), + DEFAULT_EXPORT_NAMES("default.export.names", n_("isisfish.config.main.defaultExportNames.description"), ""), + DEFAULT_RESULT_NAMES("default.result.names", n_("isisfish.config.main.defaultResultNames.description"), ""), + DEFAULT_MAP_FILENAME("default.map.filename", n_("isisfish.config.main.defaultMapFile.description"), "maps/vmap_area_thin.shp"), + DEFAULT_TAG_VALUE("default.tagvalue", n_("isisfish.config.main.defaultTagValue.description"), ""), + ENCODING("encoding", n_("isisfish.config.main.encoding.description"), "UTF-8"), + JAVADOC_URL("javadoc.url", n_("isisfish.config.main.javadocURL.description"), "http://isis-fish.labs.libre-entreprise.org/isis-fish/apidocs/"), - SIMULATOR_CLASSFILE("simulator.classfile", _("isisfish.config.main.defaultSimulator.description"), "DefaultSimulator.java"), + SIMULATOR_CLASSFILE("simulator.classfile", n_("isisfish.config.main.defaultSimulator.description"), "DefaultSimulator.java"), /** prevu pour l'architecture de lancement en plugin: local, isis-server, caparmor, ... */ - SIMULATOR_LAUNCHER(SimulationService.SIMULATION_LAUNCHER + ".3", _("isisfish.config.main.localSimulator.description"), InProcessSimulatorLauncher.class.getName()), - SIMULATOR_LAUNCHER2(SimulationService.SIMULATION_LAUNCHER + ".1", _("isisfish.config.main.subSimulator.description"), SubProcessSimulationLauncher.class.getName()), - SIMULATOR_LAUNCHER_REMOTE(SimulationService.SIMULATION_LAUNCHER + ".2", _("isisfish.config.main.remoteCaparmor.description"), SSHSimulatorLauncher.class.getName()), + SIMULATOR_LAUNCHER(SimulationService.SIMULATION_LAUNCHER + ".3", n_("isisfish.config.main.localSimulator.description"), InProcessSimulatorLauncher.class.getName()), + SIMULATOR_LAUNCHER2(SimulationService.SIMULATION_LAUNCHER + ".1", n_("isisfish.config.main.subSimulator.description"), SubProcessSimulationLauncher.class.getName()), + SIMULATOR_LAUNCHER_REMOTE(SimulationService.SIMULATION_LAUNCHER + ".2", n_("isisfish.config.main.remoteCaparmor.description"), SSHSimulatorLauncher.class.getName()), /** Serveur accessible par ssh : address */ - SIMULATOR_SSH_SERVER("simulation.ssh.server", _("isisfish.config.main.simulation.ssh.server.description"), "caparmor"), + SIMULATOR_SSH_SERVER("simulation.ssh.server", n_("isisfish.config.main.simulation.ssh.server.description"), "caparmor"), /** Serveur accessible par ssh : login */ - SIMULATOR_SSH_USER_NAME("simulation.ssh.username", _("isisfish.config.main.simulation.ssh.username.description"), ""), + SIMULATOR_SSH_USER_NAME("simulation.ssh.username", n_("isisfish.config.main.simulation.ssh.username.description"), ""), /** Serveur accessible par ssh : user home directory */ - SIMULATOR_SSH_USER_HOME("simulation.ssh.userhome", _("isisfish.config.main.simulation.ssh.userhome.description"), ""), + SIMULATOR_SSH_USER_HOME("simulation.ssh.userhome", n_("isisfish.config.main.simulation.ssh.userhome.description"), ""), /** Serveur accessible par ssh : remote data path */ - SIMULATOR_SSH_DATAPATH("simulation.ssh.datapath", _("isisfish.config.main.simulation.ssh.datapath.description"), "isis-database-3"), + SIMULATOR_SSH_DATAPATH("simulation.ssh.datapath", n_("isisfish.config.main.simulation.ssh.datapath.description"), "isis-database-3"), /** Serveur accessible par ssh : remote isis home install */ - SIMULATOR_SSH_ISIS_HOME("simulation.ssh.isis.home", _("isisfish.config.main.simulation.ssh.isis.home.description"), "/home3/caparmor/poussin/isis-fish-" + IsisConfig.getApiVersion()), + SIMULATOR_SSH_ISIS_HOME("simulation.ssh.isis.home", n_("isisfish.config.main.simulation.ssh.isis.home.description"), "/home3/caparmor/poussin/isis-fish-" + IsisConfig.getApiVersion()), /** Serveur accessible par ssh : remote tmp path */ - SIMULATOR_SSH_TMPPATH("simulation.ssh.tmppath", _("isisfish.config.main.simulation.ssh.tmppath.description"), "isis-tmp"), + SIMULATOR_SSH_TMPPATH("simulation.ssh.tmppath", n_("isisfish.config.main.simulation.ssh.tmppath.description"), "isis-tmp"), /** Serveur accessible par SSH : emplacement de Java (full path) */ - SIMULATOR_SSH_JAVAPATH("simulation.ssh.javapath", _("isisfish.config.main.simulation.ssh.javapath.description"), "/home3/caparmor/poussin/jdk/bin/java"), + SIMULATOR_SSH_JAVAPATH("simulation.ssh.javapath", n_("isisfish.config.main.simulation.ssh.javapath.description"), "/home3/caparmor/poussin/jdk/bin/java"), /** Serveur accessible par SSH : emplacement des executables pbs */ - SIMULATOR_SSH_PBSBINPATH("simulation.ssh.pbsbinpath", _("isisfish.config.main.simulation.ssh.pbsbinpath.description"), "/usr/pbs/bin"), + SIMULATOR_SSH_PBSBINPATH("simulation.ssh.pbsbinpath", n_("isisfish.config.main.simulation.ssh.pbsbinpath.description"), "/usr/pbs/bin"), /** Serveur accessible par SSH : option de l'executable qsub (defaut to -m n = no mail) */ - SIMULATOR_SSH_PBSQSUBOPTIONS("simulation.ssh.pbsqsuboptions", _("isisfish.config.main.simulation.ssh.pbsqsuboptions.description"), "-m n"), + SIMULATOR_SSH_PBSQSUBOPTIONS("simulation.ssh.pbsqsuboptions", n_("isisfish.config.main.simulation.ssh.pbsqsuboptions.description"), "-m n"), /** Serveur accessible par SSH : interval de check du fichier de control */ - SIMULATOR_SSH_CONTROLCHECKINTERVAL("simulation.ssh.control.check.interval", _("isisfish.config.main.simulation.ssh.control.check.interval.description"), "120"), + SIMULATOR_SSH_CONTROLCHECKINTERVAL("simulation.ssh.control.check.interval", n_("isisfish.config.main.simulation.ssh.control.check.interval.description"), "120"), /** Serveur accessible par SSH : nombre de thread au maximum a utilise simultanement */ - SIMULATOR_SSH_MAXTHREADS("simulation.ssh.max.threads", _("isisfish.config.main.simulation.ssh.max.threads.description"), "1"), + SIMULATOR_SSH_MAXTHREADS("simulation.ssh.max.threads", n_("isisfish.config.main.simulation.ssh.max.threads.description"), "1"), /** Application locale (for i18n init). */ - LOCALE("locale", _("isisfish.config.main.locale.description"), "fr_FR"), - SIMULATION_SHOW_ONLY_ERROR("simulationShowOnlyError", _("isisfish.config.main.simulationShowOnlyError.description"), "false"), + LOCALE("locale", n_("isisfish.config.main.locale.description"), "fr_FR"), + SIMULATION_SHOW_ONLY_ERROR("simulationShowOnlyError", n_("isisfish.config.main.simulationShowOnlyError.description"), "false"), /** Perform ui launch option. */ - LAUNCH_UI("launch.ui", _("isisfish.config.main.launchUI.description"), "true"), + LAUNCH_UI("launch.ui", n_("isisfish.config.main.launchUI.description"), "true"), /** Perform data migration option. */ - PERFORM_MIGRATION("perform.migration", _("isisfish.config.main.performmigration.description"), "true"), + PERFORM_MIGRATION("perform.migration", n_("isisfish.config.main.performmigration.description"), "true"), /** Perform vcs update option. */ - PERFORM_VCS_UPDATE("perform.vcsupdate", _("isisfish.config.main.performvcsupdate.description"), "true"), + PERFORM_VCS_UPDATE("perform.vcsupdate", n_("isisfish.config.main.performvcsupdate.description"), "true"), /** Perform cron option. */ - PERFORM_CRON("perform.cron", _("isisfish.config.main.performcron.description"), "true"), + PERFORM_CRON("perform.cron", n_("isisfish.config.main.performcron.description"), "true"), /** Database directory. */ - DATABASE_DIRECTORY("database.directory", _("isisfish.config.vcs.localDatabasePath.description"), getUserHome() + File.separator + "isis-database-3"), + DATABASE_DIRECTORY("database.directory", n_("isisfish.config.vcs.localDatabasePath.description"), getUserHome() + File.separator + "isis-database-3"), /** Database lock mode (h2).*/ - DATABASE_LOCK_MODE("database.lockmode", _("isisfish.config.database.lockmode.description"), "file"), + DATABASE_LOCK_MODE("database.lockmode", n_("isisfish.config.database.lockmode.description"), "file"), // SSH (global, for both VCS and caparmor) - SSH_KEY_FILE("ssh.key.file", _("isisfish.config.ssh.key.file.description"), getUserHome() + File.separator + ".ssh" + File.separator + "isis_rsa"), + SSH_KEY_FILE("ssh.key.file", n_("isisfish.config.ssh.key.file.description"), getUserHome() + File.separator + ".ssh" + File.separator + "isis_rsa"), //SSH_PASSPHRASE_ENABLED("ssh.passphrase.enabled", _("isisfish.config.vcs.noPassPhrase.description"), "false"), //SSH_PASSPHRASE("ssh.passphrase", _("isisfish.config.vcs.passphrase.description"), ""), // can be None, CVS or SVN. only None or SVN work - VCS_TYPE(VCS.VCS_TYPE, _("isisfish.config.vcs.type.description"), VCS.TYPE_SVN), + VCS_TYPE(VCS.VCS_TYPE, n_("isisfish.config.vcs.type.description"), VCS.TYPE_SVN), // depend of VCS_TYPE, for SVN can be svn, svn+ssh, http or file - VCS_PROTOCOL(VCS.VCS_PROTOCOL, _("isisfish.config.vcs.useSshConnexion.description"), "svn"), + VCS_PROTOCOL(VCS.VCS_PROTOCOL, n_("isisfish.config.vcs.useSshConnexion.description"), "svn"), // user login to access vcs - VCS_USER_NAME(VCS.VCS_USER_NAME, _("isisfish.config.vcs.userName.description"), ""), - VCS_USER_PASSWORD(VCS.VCS_USER_PASSWORD, _("isisfish.config.vcs.userPassword.description"), ""), - VCS_HOST_NAME(VCS.VCS_HOST_NAME, _("isisfish.config.vcs.hostName.description"), "labs.libre-entreprise.org"), - VCS_PATH(VCS.VCS_PATH, _("isisfish.config.vcs.remotePath.description"), "/svnroot/isis-fish-data/"), + VCS_USER_NAME(VCS.VCS_USER_NAME, n_("isisfish.config.vcs.userName.description"), ""), + VCS_USER_PASSWORD(VCS.VCS_USER_PASSWORD, n_("isisfish.config.vcs.userPassword.description"), ""), + VCS_HOST_NAME(VCS.VCS_HOST_NAME, n_("isisfish.config.vcs.hostName.description"), "labs.libre-entreprise.org"), + VCS_PATH(VCS.VCS_PATH, n_("isisfish.config.vcs.remotePath.description"), "/svnroot/isis-fish-data/"), - USER_NAME("user.name", _("isisfish.config.main.userName.description"), System.getProperty("user.name")), - SMTP_SERVER("smtpServer", _("isisfish.config.main.smtpServer.description"), "smtp"), - USER_MAIL("userMail", _("isisfish.config.main.userMail.description"), USER_NAME.key + "@" + VCS_HOST_NAME.key); + USER_NAME("user.name", n_("isisfish.config.main.userName.description"), System.getProperty("user.name")), + SMTP_SERVER("smtpServer", n_("isisfish.config.main.smtpServer.description"), "smtp"), + USER_MAIL("userMail", n_("isisfish.config.main.userMail.description"), USER_NAME.key + "@" + VCS_HOST_NAME.key); - public final String key; - public final String description; - public final String defaultValue; + public String key; + public String description; + public String defaultValue; private Option(String key, String description, String defaultValue) { this.key = key; @@ -1057,7 +1058,7 @@ */ @Override public String getDescription() { - return description; + return _(description); } /* @@ -1091,6 +1092,30 @@ public boolean isTransient() { return false; } + + /* + * @see org.nuiton.util.ApplicationConfig.OptionDef#setDefaultValue(java.lang.String) + */ + @Override + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; + } + + /* + * @see org.nuiton.util.ApplicationConfig.OptionDef#setTransient(boolean) + */ + @Override + public void setTransient(boolean isTransient) { + + } + + /* + * @see org.nuiton.util.ApplicationConfig.OptionDef#setFinal(boolean) + */ + @Override + public void setFinal(boolean isFinal) { + + } } ////////////////////////////////////////////////// @@ -1098,58 +1123,70 @@ ////////////////////////////////////////////////// public static enum Action { - HELP(_("Show help"), OtherAction.class.getName() + "#help", "-h", "--help"), - VERSION(_("Show version"), OtherAction.class.getName() + "#version", "-v", "--version"), + HELP(n_("Show help"), OtherAction.class.getName() + "#help", "-h", "--help"), + VERSION(n_("Show version"), OtherAction.class.getName() + "#version", "-v", "--version"), - IMPORT_ANALYSE_PLAN(_(""), ImportAction.class.getName() + "#importAnalysePlan", "--importAnalysePlan"), - IMPORT_EXPORT(_(""), ImportAction.class.getName() + "#importExport", "--importExport"), - IMPORT_RULE(_(""), ImportAction.class.getName() + "#importRule", "--importRule"), - IMPORT_SCRIPT(_("Import one java file script source"), ImportAction.class.getName() + "#importScript", "--importScript"), - IMPORT_SIMULATOR(_(""), ImportAction.class.getName() + "#importSimulator", "--importSimulator"), - IMPORT_FORMULA(_(""), ImportAction.class.getName() + "#importFormula", "--importFormula"), - IMPORT_REGION(_(""), ImportAction.class.getName() + "#importRegion", "--importRegion"), - IMPORT_REGION_AND_RENAME(_(""), ImportAction.class.getName() + "#importRegionAndRename", "--importRegionAndRename"), - IMPORT_SIMULATION(_(""), ImportAction.class.getName() + "#importSimulation", "--importSimulation"), - IMPORT_SCRIPT_MODULE(_("Import zipped file containing all scripts directory structure"), ImportAction.class.getName() + "#importScriptModule", "--importScriptModule"), + IMPORT_ANALYSE_PLAN(n_(""), ImportAction.class.getName() + "#importAnalysePlan", "--importAnalysePlan"), + IMPORT_EXPORT(n_(""), ImportAction.class.getName() + "#importExport", "--importExport"), + IMPORT_RULE(n_(""), ImportAction.class.getName() + "#importRule", "--importRule"), + IMPORT_SCRIPT(n_("Import one java file script source"), ImportAction.class.getName() + "#importScript", "--importScript"), + IMPORT_SIMULATOR(n_(""), ImportAction.class.getName() + "#importSimulator", "--importSimulator"), + IMPORT_FORMULA(n_(""), ImportAction.class.getName() + "#importFormula", "--importFormula"), + IMPORT_REGION(n_(""), ImportAction.class.getName() + "#importRegion", "--importRegion"), + IMPORT_REGION_AND_RENAME(n_(""), ImportAction.class.getName() + "#importRegionAndRename", "--importRegionAndRename"), + IMPORT_SIMULATION(n_(""), ImportAction.class.getName() + "#importSimulation", "--importSimulation"), + IMPORT_SCRIPT_MODULE(n_("Import zipped file containing all scripts directory structure"), ImportAction.class.getName() + "#importScriptModule", "--importScriptModule"), - LIST_ANALYSE_PLAN(_(""), ExportAction.class.getName() + "#listAnalysePlan", "--listAnalysePlan"), - LIST_EXPORT(_(""), ExportAction.class.getName() + "#listExport", "--listExport"), - LIST_RULE(_(""), ExportAction.class.getName() + "#listRule", "--listRule"), - LIST_SCRIPT(_(""), ExportAction.class.getName() + "#listScript", "--listScript"), - LIST_SIMULATOR(_(""), ExportAction.class.getName() + "#listSimulator", "--listSimulator"), - LIST_FORMULA(_(""), ExportAction.class.getName() + "#listFormula", "--listFormula"), - LIST_REGION(_(""), ExportAction.class.getName() + "#listRegion", "--listRegion"), - LIST_SIMULATION(_(""), ExportAction.class.getName() + "#listSimulation", "--listSimulation"), + LIST_ANALYSE_PLAN(n_(""), ExportAction.class.getName() + "#listAnalysePlan", "--listAnalysePlan"), + LIST_EXPORT(n_(""), ExportAction.class.getName() + "#listExport", "--listExport"), + LIST_RULE(n_(""), ExportAction.class.getName() + "#listRule", "--listRule"), + LIST_SCRIPT(n_(""), ExportAction.class.getName() + "#listScript", "--listScript"), + LIST_SIMULATOR(n_(""), ExportAction.class.getName() + "#listSimulator", "--listSimulator"), + LIST_FORMULA(n_(""), ExportAction.class.getName() + "#listFormula", "--listFormula"), + LIST_REGION(n_(""), ExportAction.class.getName() + "#listRegion", "--listRegion"), + LIST_SIMULATION(n_(""), ExportAction.class.getName() + "#listSimulation", "--listSimulation"), - EXPORT_ANALYSE_PLAN(_(""), ExportAction.class.getName() + "#exportAnalysePlan", "--exportAnalysePlan"), - EXPORT_EXPORT(_(""), ExportAction.class.getName() + "#exportExport", "--exportExport"), - EXPORT_RULE(_(""), ExportAction.class.getName() + "#exportRule", "--exportRule"), - EXPORT_SCRIPT(_(""), ExportAction.class.getName() + "#exportScript", "--exportScript"), - EXPORT_SIMULATOR(_(""), ExportAction.class.getName() + "#exportSimulator", "--exportSimulator"), - EXPORT_FORMULA(_(""), ExportAction.class.getName() + "#exportFormula", "--exportFormula"), - EXPORT_REGION(_(""), ExportAction.class.getName() + "#exportRegion", "--exportRegion"), - EXPORT_SIMULATION(_(""), ExportAction.class.getName() + "#exportSimulation", "--exportSimulation"), + EXPORT_ANALYSE_PLAN(n_(""), ExportAction.class.getName() + "#exportAnalysePlan", "--exportAnalysePlan"), + EXPORT_EXPORT(n_(""), ExportAction.class.getName() + "#exportExport", "--exportExport"), + EXPORT_RULE(n_(""), ExportAction.class.getName() + "#exportRule", "--exportRule"), + EXPORT_SCRIPT(n_(""), ExportAction.class.getName() + "#exportScript", "--exportScript"), + EXPORT_SIMULATOR(n_(""), ExportAction.class.getName() + "#exportSimulator", "--exportSimulator"), + EXPORT_FORMULA(n_(""), ExportAction.class.getName() + "#exportFormula", "--exportFormula"), + EXPORT_REGION(n_(""), ExportAction.class.getName() + "#exportRegion", "--exportRegion"), + EXPORT_SIMULATION(n_(""), ExportAction.class.getName() + "#exportSimulation", "--exportSimulation"), - VCS_SSH_CREATE_KEY(_(""), VCSAction.class.getName() + "#sshCreateKey", "--sshCreateKey"), - VCS_UPDATE(_(""), VCSAction.class.getName() + "#vcsUpdate", "--vcsUpdate"), - VCS_ADD(_(""), VCSAction.class.getName() + "#vcsAdd", "--vcsAdd"), - VCS_REMOVE(_(""), VCSAction.class.getName() + "#vcsRemove", "--vcsRemove"), - VCS_COMMIT(_(""), VCSAction.class.getName() + "#vcsCommit", "--vcsCommit"), + VCS_SSH_CREATE_KEY(n_(""), VCSAction.class.getName() + "#sshCreateKey", "--sshCreateKey"), + VCS_UPDATE(n_(""), VCSAction.class.getName() + "#vcsUpdate", "--vcsUpdate"), + VCS_ADD(n_(""), VCSAction.class.getName() + "#vcsAdd", "--vcsAdd"), + VCS_REMOVE(n_(""), VCSAction.class.getName() + "#vcsRemove", "--vcsRemove"), + VCS_COMMIT(n_(""), VCSAction.class.getName() + "#vcsCommit", "--vcsCommit"), - SIMULATE_WITH_REGION(_(""), SimulationAction.class.getName() + "#simulateWithRegion", "--simulateWithRegion"), - SIMULATE_WITH_SIMULATION(_(""), SimulationAction.class.getName() + "#simulateWithSimulation", "--simulateWithSimulation"), - SIMULATE_WITH_SIMULATION_AND_SCRIPT(_(""), SimulationAction.class.getName() + "#simulateWithSimulationAndScript", "--simulateWithSimulationAndScript"), - SIMULATE_REMOTELLY(_(""), SimulationAction.class.getName() + "#simulateRemotelly", "--simulateRemotelly"), - SIMULATE_REMOTELLY_WITH_PRESCRIPT(_(""), SimulationAction.class.getName() + "#simulateRemotellyWithPreScript", "--simulateRemotellyWithPreScript"); + SIMULATE_WITH_REGION(n_(""), SimulationAction.class.getName() + "#simulateWithRegion", "--simulateWithRegion"), + SIMULATE_WITH_SIMULATION(n_(""), SimulationAction.class.getName() + "#simulateWithSimulation", "--simulateWithSimulation"), + SIMULATE_WITH_SIMULATION_AND_SCRIPT(n_(""), SimulationAction.class.getName() + "#simulateWithSimulationAndScript", "--simulateWithSimulationAndScript"), + SIMULATE_REMOTELLY(n_(""), SimulationAction.class.getName() + "#simulateRemotelly", "--simulateRemotelly"), + SIMULATE_REMOTELLY_WITH_PRESCRIPT(n_(""), SimulationAction.class.getName() + "#simulateRemotellyWithPreScript", "--simulateRemotellyWithPreScript"); - public String description; - public String action; - public String[] aliases; + protected String description; + protected String action; + protected String[] aliases; private Action(String description, String action, String ... aliases) { this.description = description; this.action = action; this.aliases = aliases; - } + } + + public String getDescription() { + return _(description); + } + + public String getAction() { + return action; + } + + public String[] getAliases() { + return aliases; + } } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java 2011-03-17 10:34:38 UTC (rev 3173) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java 2011-03-17 10:35:24 UTC (rev 3174) @@ -58,7 +58,7 @@ System.out.println("Actions:"); for (IsisConfig.Action a : IsisConfig.Action.values()) { - System.out.println("\t" + Arrays.toString(a.aliases) + "(" + a.action + ") : " + a.description); + System.out.println("\t" + Arrays.toString(a.getAliases()) + "(" + a.getAction() + ") : " + a.getDescription()); } System.exit(0); }

1 0

r3173 - isis-fish/branches/3.3.1/src/main/resources/icons
by chatellier＠users.labs.libre-entreprise.org March 17, 2011

March 17, 2011

Author: chatellier Date: 2011-03-17 10:34:38 +0000 (Thu, 17 Mar 2011) New Revision: 3173 Log: Add new icons for group screening and rule as factor Added: isis-fish/branches/3.3.1/src/main/resources/icons/table.png isis-fish/branches/3.3.1/src/main/resources/icons/table_multiple.png Added: isis-fish/branches/3.3.1/src/main/resources/icons/table.png =================================================================== (Binary files differ) Property changes on: isis-fish/branches/3.3.1/src/main/resources/icons/table.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/branches/3.3.1/src/main/resources/icons/table_multiple.png =================================================================== (Binary files differ) Property changes on: isis-fish/branches/3.3.1/src/main/resources/icons/table_multiple.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r3172 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish: simulator/sensitivity ui/result ui/simulator/filter ui/vcs ui/widget/filter
by chatellier＠users.labs.libre-entreprise.org March 17, 2011

March 17, 2011

Author: chatellier Date: 2011-03-17 10:34:09 +0000 (Thu, 17 Mar 2011) New Revision: 3172 Log: Fix code style, import... Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoPanelable.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-03-17 10:33:07 UTC (rev 3171) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-03-17 10:34:09 UTC (rev 3172) @@ -30,25 +30,29 @@ import java.util.Collection; import java.util.List; -import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.export.SensitivityExport; +import javax.swing.Box; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JScrollPane; +import javax.swing.JTextPane; + import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.j2r.REngine; import org.nuiton.j2r.RException; import org.nuiton.j2r.RProxy; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.FileUtil; +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.FileUtil; -import javax.swing.*; - public abstract class AbstractSensitivityCalculator implements SensitivityCalculator { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoPanelable.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoPanelable.java 2011-03-17 10:33:07 UTC (rev 3171) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoPanelable.java 2011-03-17 10:34:09 UTC (rev 3172) @@ -24,7 +24,8 @@ */ package fr.ifremer.isisfish.ui.result; -import javax.swing.*; +import javax.swing.JLabel; +import javax.swing.JList; /** * InfoPanelable. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2011-03-17 10:33:07 UTC (rev 3171) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2011-03-17 10:34:09 UTC (rev 3172) @@ -26,6 +26,19 @@ import static org.nuiton.i18n.I18n._; +import java.awt.Dimension; +import java.awt.event.ItemEvent; +import java.beans.PropertyVetoException; +import java.io.IOException; +import java.text.ParseException; +import java.util.List; + +import javax.swing.DefaultComboBoxModel; +import javax.swing.JInternalFrame; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.logging.SimulationLoggerUtil; import fr.ifremer.isisfish.simulator.SimulationProperties; @@ -35,17 +48,7 @@ import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; import fr.ifremer.isisfish.ui.util.ErrorHelper; import fr.ifremer.isisfish.ui.widget.filter.FilterModel; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import javax.swing.*; -import java.awt.*; -import java.awt.event.ItemEvent; -import java.beans.PropertyVetoException; -import java.io.IOException; -import java.text.ParseException; -import java.util.List; - /** * ResultView.java * Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java 2011-03-17 10:33:07 UTC (rev 3171) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java 2011-03-17 10:34:09 UTC (rev 3172) @@ -27,8 +27,12 @@ import static org.nuiton.i18n.I18n._; -import javax.swing.*; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; @@ -38,6 +42,19 @@ import java.util.HashMap; import java.util.Vector; +import javax.swing.AbstractButton; +import javax.swing.Box; +import javax.swing.ButtonGroup; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JPanel; + public abstract class ResultViewUI extends JPanel implements ResultViewUICallback{ public ResultViewUI(){ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java 2011-03-17 10:33:07 UTC (rev 3171) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java 2011-03-17 10:34:09 UTC (rev 3172) @@ -71,7 +71,7 @@ if ($binding.equals("reset.enabled")) { if (comboResult != null) { $bindingSources.put("comboResult", comboResult); - this.comboResult.addItemListener((java.awt.event.ItemListener) jaxx.runtime.Util.getEventListener(java.awt.event.ItemListener.class, this, "$pr$u10")); + this.comboResult.addItemListener((java.awt.event.ItemListener) jaxx.runtime.JAXXUtil.getEventListener(java.awt.event.ItemListener.class, this, "$pr$u10")); } processDataBinding($binding); } else super.applyDataBinding($binding); @@ -80,7 +80,7 @@ public void removeDataBinding(String $binding) { if ($binding.equals("reset.enabled")) { if (comboResult != null) { - ((jaxx.runtime.swing.JAXXComboBox) $bindingSources.remove("comboResult")).removeItemListener((java.awt.event.ItemListener) jaxx.runtime.Util.getEventListener(java.awt.event.ItemListener.class, this, "$pr$u10")); + ((jaxx.runtime.swing.JAXXComboBox) $bindingSources.remove("comboResult")).removeItemListener((java.awt.event.ItemListener) jaxx.runtime.JAXXUtil.getEventListener(java.awt.event.ItemListener.class, this, "$pr$u10")); } } else super.removeDataBinding($binding); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx 2011-03-17 10:33:07 UTC (rev 3171) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx 2011-03-17 10:34:09 UTC (rev 3172) @@ -23,11 +23,15 @@ #L% --> <fr.ifremer.isisfish.ui.widget.filter.FilterPanelUI> - <script> - import fr.ifremer.isisfish.simulator.SimulationMeta; - - protected static java.text.SimpleDateFormat simpleDateFormat = - new java.text.SimpleDateFormat("dd/MM/yyyy"); +<import> + fr.ifremer.isisfish.simulator.SimulationMeta + fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI + org.jdesktop.swingx.JXDatePicker + + java.text.SimpleDateFormat +</import> +<script> + protected static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy"); public SimulationFilterPanelUI(fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI dialog) { super(dialog); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx 2011-03-17 10:33:07 UTC (rev 3171) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx 2011-03-17 10:34:09 UTC (rev 3172) @@ -26,7 +26,6 @@ <script><![CDATA[ // FIXME a refaire -// import static org.nuiton.vcs.VCSState.*; // import org.nuiton.vcs.VCSState; // protected org.nuiton.vcs.VCSRepositoryState model; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2011-03-17 10:33:07 UTC (rev 3171) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2011-03-17 10:34:09 UTC (rev 3172) @@ -23,19 +23,22 @@ #L% --> <JDialog> - <script> - import jaxx.runtime.JAXXObject; - import javax.swing.text.html.HTMLEditorKit; - import javax.swing.text.html.HTMLDocument; - import javax.swing.event.HyperlinkListener; - import javax.swing.text.html.HTMLFrameHyperlinkEvent; - import javax.swing.event.HyperlinkEvent; - import java.io.PrintWriter; - import java.io.StringWriter; + <import> + jaxx.runtime.JAXXObject + javax.swing.text.html.HTMLEditorKit + javax.swing.text.html.HTMLDocument + javax.swing.event.HyperlinkListener + javax.swing.text.html.HTMLFrameHyperlinkEvent + javax.swing.event.HyperlinkEvent + java.io.PrintWriter + java.io.StringWriter - import org.nuiton.widget.DatePicker; - import org.nuiton.widget.InvalidDateException; - + fr.ifremer.isisfish.ui.widget.filter.FilterModel + fr.ifremer.isisfish.ui.widget.filter.FilterParamModel + fr.ifremer.isisfish.ui.widget.filter.FilterPanelUI + java.util.List + </import> + <script> /** filter model */ protected fr.ifremer.isisfish.ui.widget.filter.FilterModel model; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx 2011-03-17 10:33:07 UTC (rev 3171) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx 2011-03-17 10:34:09 UTC (rev 3172) @@ -23,18 +23,20 @@ #L% --> <JPanel> - <script> - import org.nuiton.widget.DatePicker; - import org.nuiton.widget.InvalidDateException; - - protected fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI dialog; +<import> + org.jdesktop.swingx.JXDatePicker + fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI + java.text.SimpleDateFormat + fr.ifremer.isisfish.ui.widget.filter.FilterParamModel + fr.ifremer.isisfish.ui.util.JaxxUtil +</import> +<script> + protected FilterDialogUI dialog; - protected static java.text.SimpleDateFormat simpleDateFormat = - new java.text.SimpleDateFormat("dd/MM/yyyy"); + protected static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy"); protected FilterPanelUI(fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI dialog) { - this.dialog = dialog; - + this.dialog = dialog; } /** @@ -50,39 +52,29 @@ } @SuppressWarnings({"unchecked"}) public void doReset() { - fr.ifremer.isisfish.ui.util.JaxxUtil.doReset(get$objectMap()); + JaxxUtil.doReset(get$objectMap()); } protected void extractTextFieldParam(String paramKey) { JTextField field = (JTextField) getObjectById(paramKey); - fr.ifremer.isisfish.ui.widget.filter.FilterParamModel paramModel = dialog.getParamModel(paramKey); + FilterParamModel paramModel = dialog.getParamModel(paramKey); if (paramModel.canUse(field.getText())) paramModel.extractParam(field.getText()); } protected void extractCheckBoxParam(String paramKey) { JCheckBox field = (JCheckBox) getObjectById(paramKey); - fr.ifremer.isisfish.ui.widget.filter.FilterParamModel paramModel = dialog.getParamModel(paramKey); + FilterParamModel paramModel = dialog.getParamModel(paramKey); if (field.isSelected()) paramModel.extractParam("true"); } protected void extractDateInterval(String name, String paramKey, String paramKey2) { - DatePicker field = (DatePicker) getObjectById(paramKey); - DatePicker field2 = (DatePicker) getObjectById(paramKey2); - fr.ifremer.isisfish.ui.widget.filter.FilterParamModel paramModel = dialog.getParamModel(name); - if (paramModel.canUse(field.getText(), field2.getText())) { - java.util.Date d0,d1; - try { - d0 = field.getDate(); - } catch (InvalidDateException e) { - d0=null; - } - try { - d1 = field2.getDate(); - } catch (InvalidDateException e) { - d1=null; - } - paramModel.extractParam(d0==null?null:d0.getTime()+"",d1==null?null:d1.getTime()+""); - } + JXDatePicker field = (JXDatePicker) getObjectById(paramKey); + JXDatePicker field2 = (JXDatePicker) getObjectById(paramKey2); + FilterParamModel paramModel = dialog.getParamModel(name); + java.util.Date d0,d1; + d0 = field.getDate(); + d1 = field2.getDate(); + paramModel.extractParam(d0==null?null:d0.getTime()+"",d1==null?null:d1.getTime()+""); } </script> </JPanel>

1 0

r3171 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org March 17, 2011

March 17, 2011

Author: chatellier Date: 2011-03-17 10:33:07 +0000 (Thu, 17 Mar 2011) New Revision: 3171 Log: Disable migration when schema is created or restored Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2011-03-17 10:32:16 UTC (rev 3170) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2011-03-17 10:33:07 UTC (rev 3171) @@ -202,17 +202,28 @@ /** * Returns the storage. * - * Update shema if necessary. + * Storage is auto configured to perform shema migration. * * @return Returns the storage. */ public TopiaContext getStorage() { + TopiaContext topiaContext = getStorage(true); + return topiaContext; + } + + /** + * Returns the storage. + * + * @param performMigration if {@code true} perform migration + * @return Returns the storage. + */ + public TopiaContext getStorage(boolean performMigration) { if (storage == null || storage.isClosed()) { log.info("Create new storage for " + getName()); try { // creation des proprietes pour creer le TopiaContext Properties config = new Properties(); - IsisH2Config.addDatabaseConfig(config, getDirectory()); + IsisH2Config.addDatabaseConfig(config, getDirectory(), performMigration); IsisH2Config.addHibernateMapping(config); // instanciation du TopiaContext @@ -289,7 +300,8 @@ // load data // creation des proprietes pour creer le TopiaContext Properties config = new Properties(); - IsisH2Config.addDatabaseConfig(config, rootDirDest); + // false = don't perform, schema is empty + IsisH2Config.addDatabaseConfig(config, rootDirDest, false); IsisH2Config.addHibernateMapping(config); // instanciation du TopiaContext

1 0

r3170 - in isis-fish/branches/3.3.1/src: main/java/fr/ifremer/isisfish/datastore test/java/fr/ifremer/isisfish test/java/fr/ifremer/isisfish/entity test/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org March 17, 2011

March 17, 2011

Author: chatellier Date: 2011-03-17 10:32:16 +0000 (Thu, 17 Mar 2011) New Revision: 3170 Log: Disable migration when schema is created or restored Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2011-03-17 10:30:25 UTC (rev 3169) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2011-03-17 10:32:16 UTC (rev 3170) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Tony Chemit + * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Tony Chemit, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -32,14 +32,13 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; import org.hibernate.dialect.H2Dialect; -import org.nuiton.topia.migration.TopiaMigrationServiceImpl; +import org.nuiton.topia.migration.TopiaMigrationEngine; +import org.nuiton.topia.migration.TopiaMigrationService; -import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishDAOHelper; -import fr.ifremer.isisfish.datastore.migration.SwingMigrationCallbackHandler; +import fr.ifremer.isisfish.datastore.migration.DatabaseMigrationClass; - /** * Isis H2 concrete Config implementation. * @@ -56,7 +55,7 @@ private static Log log = LogFactory.getLog(IsisH2Config.class); /** Set in static field to be overridden by tests. Default to swing callback. */ - protected static Class<?> databaseMigrationClass = SwingMigrationCallbackHandler.class; + protected static Class<?> databaseMigrationClass = DatabaseMigrationClass.class; protected static final String COMMON_URL = // on peut aussi utiliser mysql ou postgresql @@ -141,9 +140,10 @@ * * @param config l'objet properties dans lequel il faut ajouter les informations * @param directory le repertoire dans lequel la base de données doit se trouver + * @param performMigration if {@code true} perform migration * @return l'objet config passe en parametre */ - public static Properties addDatabaseConfig(Properties config, File directory) { + public static Properties addDatabaseConfig(Properties config, File directory, boolean performMigration) { File databasePath = getStorageDataDirectory(directory); databasePath.mkdirs(); @@ -158,11 +158,11 @@ } // migration configuration, seulement pour les fichiers, pas pour les bases memoires - config.put(TopiaMigrationServiceImpl.MIGRATION_APPLICATION_VERSION, IsisConfig.getDatabaseVersion().toString()); - config.put(TopiaMigrationServiceImpl.MIGRATION_PREVIOUS_MAPPING_DIRECTORY, "oldmappings"); - config.put(TopiaMigrationServiceImpl.MIGRATION_MODEL_NAMES, "IsisFish"); - config.put(TopiaMigrationServiceImpl.MIGRATION_CALLBACKHANDLERS, databaseMigrationClass.getName()); - config.put("topia.service.migration", TopiaMigrationServiceImpl.class.getName()); + config.put(TopiaMigrationService.TOPIA_SERVICE_NAME, TopiaMigrationEngine.class.getName()); + config.put(TopiaMigrationService.MIGRATION_CALLBACK, databaseMigrationClass.getName()); + if (!performMigration) { + config.put(TopiaMigrationService.MIGRATION_MIGRATE_ON_INIT, databaseMigrationClass.getName()); + } return config; } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2011-03-17 10:30:25 UTC (rev 3169) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2011-03-17 10:32:16 UTC (rev 3170) @@ -202,7 +202,7 @@ if (region != null) { File file = region.getDataBackupFile(); if (file.exists()) { - TopiaContext tx = region.getStorage().beginTransaction(); + TopiaContext tx = region.getStorage(false).beginTransaction(); tx.restore(file); tx.commitTransaction(); tx.closeContext(); @@ -280,7 +280,7 @@ RegionStorage result = new RegionStorage(directory, name); try { - TopiaContext context = result.getStorage().beginTransaction(); + TopiaContext context = result.getStorage(false).beginTransaction(); context.createSchema(); FisheryRegionDAO regionDAO = IsisFishDAOHelper .getFisheryRegionDAO(context); @@ -436,7 +436,7 @@ if (result != null) { File data = result.getDataBackupFile(); if (file.exists()) { - TopiaContext tx = result.getStorage().beginTransaction(); + TopiaContext tx = result.getStorage(false).beginTransaction(); tx.restore(data); if (newName != null) { FisheryRegion region = getFisheryRegion(tx); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2011-03-17 10:30:25 UTC (rev 3169) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2011-03-17 10:32:16 UTC (rev 3170) @@ -597,7 +597,7 @@ checkout(IsisFish.config.getDatabaseDirectory(), SIMULATION_PATH + "/" + name); SimulationStorage sim = getSimulation(name); File file = sim.getDataBackupFile(); - TopiaContext tx = sim.getStorage().beginTransaction(); + TopiaContext tx = sim.getStorage(false).beginTransaction(); tx.restore(file); tx.commitTransaction(); tx.closeContext(); @@ -686,7 +686,7 @@ File data = result.getDataBackupFile(); // FIXME was file.exists() ? if (data.exists()) { - TopiaContext tx = result.getStorage().beginTransaction(); + TopiaContext tx = result.getStorage(false).beginTransaction(); tx.restore(data); tx.commitTransaction(); tx.closeContext(); @@ -732,10 +732,10 @@ tx.commitTransaction(); tx.closeContext(); - } catch (IOException e) { - throw new StorageException(e); - } catch (TopiaException e) { - throw new StorageException(e); + } catch (IOException ex) { + throw new StorageException("Can't extract region", ex); + } catch (TopiaException ex) { + throw new StorageException("Can't extract region", ex); } finally { if (tmpDir != null && !FileUtil.deleteRecursively(tmpDir)) { log.warn(_("isisfish.error.delete.file", tmpDir)); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2011-03-17 10:30:25 UTC (rev 3169) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2011-03-17 10:32:16 UTC (rev 3170) @@ -33,7 +33,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; -import fr.ifremer.isisfish.datastore.TestIsisH2Config; +import fr.ifremer.isisfish.datastore.AutoMigrationIsisH2Config; import fr.ifremer.isisfish.util.ClasspathTemplateLoader; import freemarker.cache.TemplateLoader; import freemarker.ext.beans.BeansWrapper; @@ -98,7 +98,7 @@ // install a new topia migration service callback // to not ask for user for migration during test - TestIsisH2Config.setTestMigrationCallBack(); + AutoMigrationIsisH2Config.setTestMigrationCallBack(); FileUtils.copyDirectory(new File("src/test/resources/test-database"), dirDatabase, new FileFilter() { Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java 2011-03-17 10:30:25 UTC (rev 3169) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java 2011-03-17 10:32:16 UTC (rev 3170) @@ -65,8 +65,8 @@ SimulationParameter parameters = new SimulationParameterImpl(); SimulationStorage simulation = SimulationStorage.create("testdao", parameters); - TopiaContext rootContext = simulation.getStorage(); + TopiaContext rootContext = simulation.getStorage(false); TopiaContext context = rootContext.beginTransaction(); context.createSchema(); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2011-03-17 10:30:25 UTC (rev 3169) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2011-03-17 10:32:16 UTC (rev 3170) @@ -125,7 +125,7 @@ SimulationContext context = SimulationContext.get(); SimulationParameter params = new SimulationParameterImpl(); SimulationStorage simulation = SimulationStorage.create("test_1_int", params); - TopiaContext storageContext = simulation.getStorage(); + TopiaContext storageContext = simulation.getStorage(false); storageContext.createSchema(); TopiaContext childStorageContext = storageContext.beginTransaction(); VesselTypeDAO vesselTypeDAO = IsisFishDAOHelper.getVesselTypeDAO(childStorageContext); @@ -225,7 +225,7 @@ SimulationContext context = SimulationContext.get(); SimulationParameter params = new SimulationParameterImpl(); SimulationStorage simulation = SimulationStorage.create("test_2_matrix", params); - TopiaContext storageContext = simulation.getStorage(); + TopiaContext storageContext = simulation.getStorage(false); storageContext.createSchema(); TopiaContext childStorageContext = storageContext.beginTransaction(); PopulationSeasonInfoDAO populationSeasonInfoDAO = IsisFishDAOHelper.getPopulationSeasonInfoDAO(childStorageContext);

1 0