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

r2999 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 23 Feb '10

23 Feb '10

Author: chatellier Date: 2010-02-23 13:06:30 +0000 (Tue, 23 Feb 2010) New Revision: 2999 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java Log: Fix imports Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2010-02-23 11:45:47 UTC (rev 2998) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2010-02-23 13:06:30 UTC (rev 2999) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -21,11 +21,9 @@ import java.io.File; import java.io.IOException; -import junit.framework.Assert; - import org.apache.commons.io.FileUtils; -import org.h2.Driver; import org.h2.engine.Constants; +import org.junit.Assert; import org.junit.Test; /**

1 0

r2998 - in isis-fish/trunk: . src/test/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 23 Feb '10

23 Feb '10

Author: chatellier Date: 2010-02-23 11:45:47 +0000 (Tue, 23 Feb 2010) New Revision: 2998 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java Log: Update h2 (and add a test to block future h2 update) Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-02-23 11:44:54 UTC (rev 2997) +++ isis-fish/trunk/pom.xml 2010-02-23 11:45:47 UTC (rev 2998) @@ -217,7 +217,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.127</version> + <version>1.2.128</version> <scope>compile</scope> </dependency> Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2010-02-23 11:44:54 UTC (rev 2997) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2010-02-23 11:45:47 UTC (rev 2998) @@ -24,6 +24,8 @@ import junit.framework.Assert; import org.apache.commons.io.FileUtils; +import org.h2.Driver; +import org.h2.engine.Constants; import org.junit.Test; /** @@ -57,4 +59,17 @@ Assert.assertTrue("File is not valide for Windows on line " + index, lines[index].endsWith("\r")); } } + + /** + * Test that h2 version is < 1.2.129. + * + * Upgrading from < 1.1.x to 1.2.129 doesn't work + * Since page store has been changed in 1.2.x release, and removed since 1.2.129. + */ + @Test + public void testH2Version() { + Assert.assertEquals(1, Constants.VERSION_MAJOR); + Assert.assertEquals(2, Constants.VERSION_MINOR); + Assert.assertTrue("Using H2 >= 1.2.129 will not work", Constants.BUILD_ID < 129); + } }

1 0

r2997 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 23 Feb '10

23 Feb '10

Author: chatellier Date: 2010-02-23 11:44:54 +0000 (Tue, 23 Feb 2010) New Revision: 2997 Modified: isis-fish/trunk/changelog.txt Log: Update changelog Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-02-23 11:28:44 UTC (rev 2996) +++ isis-fish/trunk/changelog.txt 2010-02-23 11:44:54 UTC (rev 2997) @@ -1,7 +1,9 @@ isis-fish (3.3.0.0) stable; urgency=low + * Replace zone selection event from mouse click to correct valueChanged + * Fix a NullPointerException during region check * Disable all list filtering functionalities (don't work anymore with a lot of simulations) - + -- jeu. janv. 28 18:51:17 CET 2010 isis-fish (3.3.0.0-rc1) stable; urgency=low

1 0

r2996 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 23 Feb '10

23 Feb '10

Author: chatellier Date: 2010-02-23 11:28:44 +0000 (Tue, 23 Feb 2010) New Revision: 2996 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Log: Fix list selection (replace mouse cli by value change) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2010-02-23 11:27:15 UTC (rev 2995) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2010-02-23 11:28:44 UTC (rev 2996) @@ -23,6 +23,7 @@ <fr.ifremer.isisfish.entities.ZoneImpl id='bean' javaBean='null'/> <script><![CDATA[ +import javax.swing.event.ListSelectionEvent; import fr.ifremer.isisfish.entities.Cell; import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.entities.ZoneImpl; @@ -114,12 +115,23 @@ return mapListener; } -protected void zoneCellsChange() { - java.util.List<Cell> cells = new ArrayList<Cell>(); - for (Object o : zoneCells.getSelectedValues()) { - cells.add((Cell) o); +protected void zoneCellsChange(ListSelectionEvent event) { + // sans ca, ca boucle (modification depuis la carte) + if (event.getValueIsAdjusting()) { + // pas a faie dans le cas d'une AS + if (isActif()) { + java.util.List<Cell> cells = new ArrayList<Cell>(); + for (Object o : zoneCells.getSelectedValues()) { + cells.add((Cell) o); + } + getBean().setCell(cells); + } } - getBean().setCell(cells); + else { + if (log.isDebugEnabled()) { + log.debug("Duplicated event skipped"); + } + } } ]]> </script> @@ -150,9 +162,9 @@ <row> <cell columns='2' fill='both' weighty='0.7' weightx='1.0'> <JScrollPane> +  <JList id="zoneCells" enabled='{isActif()}' selectedValues='{getBean().getCell() == null ? null : getBean().getCell().toArray()}' - onMouseClicked='if ( isActif() ) { zoneCellsChange(); }' - decorator='boxed'/> + onValueChanged='zoneCellsChange(event)' decorator='boxed'/> </JScrollPane> </cell> </row>

1 0

r2995 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check
by chatellier＠users.labs.libre-entreprise.org 23 Feb '10

23 Feb '10

Author: chatellier Date: 2010-02-23 11:27:15 +0000 (Tue, 23 Feb 2010) New Revision: 2995 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java Log: Fix NPE Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2010-02-22 16:35:24 UTC (rev 2994) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2010-02-23 11:27:15 UTC (rev 2995) @@ -89,7 +89,7 @@ if (eq == null) { result.addError(parent, _("isisfish.error.invalid.nullequation", name)); } - if (0 != EvaluatorHelper.check(eq.getJavaInterface(), eq.getContent(), null)) { + else if (0 != EvaluatorHelper.check(eq.getJavaInterface(), eq.getContent(), null)) { result.addError(eq, _("isisfish.error.invalid.equation")); } }

1 0

r2994 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 22 Feb '10

22 Feb '10

Author: chatellier Date: 2010-02-22 16:35:24 +0000 (Mon, 22 Feb 2010) New Revision: 2994 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/pom.xml Log: Prepare next release Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-02-22 15:44:36 UTC (rev 2993) +++ isis-fish/trunk/changelog.txt 2010-02-22 16:35:24 UTC (rev 2994) @@ -1,4 +1,4 @@ -isis-fish (3.3.0.0-rc2) stable; urgency=low +isis-fish (3.3.0.0) stable; urgency=low * Disable all list filtering functionalities (don't work anymore with a lot of simulations) Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-02-22 15:44:36 UTC (rev 2993) +++ isis-fish/trunk/pom.xml 2010-02-22 16:35:24 UTC (rev 2994) @@ -10,7 +10,7 @@ <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.0-rc2-SNAPSHOT</version> + <version>3.3.0.0-SNAPSHOT</version>  <dependencies>

1 0

r2993 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org 22 Feb '10

22 Feb '10

Author: chatellier Date: 2010-02-22 15:44:36 +0000 (Mon, 22 Feb 2010) New Revision: 2993 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java Log: Charge les parametres des exports de sensibilit?\195?\169 ?\195?\160 partir de la base resultat (au lieu de IM) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2010-02-22 15:40:33 UTC (rev 2992) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2010-02-22 15:44:36 UTC (rev 2993) @@ -1044,7 +1044,7 @@ // si on y es, on utilise le context static non null du thread local // Resoud les lazy exceptions des parametres des regles boolean mustClose = false; - TopiaContext tx = SimulationContext.get().getDB(); + TopiaContext tx = SimulationContext.get().getDbResult(); if (tx == null) { // not in simulation, create transaction

1 0

r2992 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org 22 Feb '10

22 Feb '10

Author: chatellier Date: 2010-02-22 15:40:33 +0000 (Mon, 22 Feb 2010) New Revision: 2992 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx Log: Add two fixme for data change Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2010-02-22 10:15:43 UTC (rev 2991) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2010-02-22 15:40:33 UTC (rev 2992) @@ -30,6 +30,9 @@ } public void refresh() { + + // FIXME listen for export modification here + // fill export setListSimulExportChooseModel(); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2010-02-22 10:15:43 UTC (rev 2991) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2010-02-22 15:40:33 UTC (rev 2992) @@ -26,6 +26,9 @@ refresh(); public void refresh() { + + // FIXME listen for result name modification + setListSimulResultChooseModel(); }

1 0

r2991 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org 22 Feb '10

22 Feb '10

Author: chatellier Date: 2010-02-22 10:15:43 +0000 (Mon, 22 Feb 2010) New Revision: 2991 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java Log: Add log to get all h2 url options Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2010-02-05 16:35:09 UTC (rev 2990) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2010-02-22 10:15:43 UTC (rev 2991) @@ -19,6 +19,8 @@ import java.io.File; import java.util.Properties; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; import org.hibernate.dialect.H2Dialect; import org.nuiton.topia.migration.TopiaMigrationServiceImpl; @@ -41,6 +43,9 @@ */ public class IsisH2Config { + /** Class logger. */ + 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; @@ -139,6 +144,9 @@ // pour h2 on remet STORAGE_DATA car il ne cree pas de repertoire String url = String.format(H2_URL, getStorageDataDirectory(databasePath).getPath(), IsisFish.config.getDatabaseLockMode()); config.setProperty(Environment.URL, url); + if (log.isDebugEnabled()) { + log.debug(Environment.URL + " = " + url); + } // migration configuration, seulement pour les fichiers, pas pour les bases memoires config.put(TopiaMigrationServiceImpl.MIGRATION_APPLICATION_VERSION, IsisConfig.getDatabaseVersion().toString());

1 0

r2990 - in isis-fish/branches/3.3.1/src/main: java/fr/ifremer/isisfish/ui/script resources/i18n
by chatellier＠users.labs.libre-entreprise.org 05 Feb '10

05 Feb '10

Author: chatellier Date: 2010-02-05 16:35:09 +0000 (Fri, 05 Feb 2010) New Revision: 2990 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/resources/i18n/isis-fish-en_GB.properties isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Enable progress bar for check all action 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 2010-02-05 14:00:21 UTC (rev 2989) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2010-02-05 16:35:09 UTC (rev 2990) @@ -724,6 +724,8 @@ */ public void checkAllScripts() { + setStatusMessage(_("isisfish.message.check.inprogress"), true); + boolean allSuccess = true; // reste previous state Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties 2010-02-05 14:00:21 UTC (rev 2989) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties 2010-02-05 16:35:09 UTC (rev 2990) @@ -557,6 +557,7 @@ isisfish.message.backup.database.progress=backup database in progress isisfish.message.cancel.finished=Cancel finished isisfish.message.check.finished=Check finished +isisfish.message.check.inprogress=Checking in process... isisfish.message.checking.cell= isisfish.message.choose.archive=choose archive file or directory isisfish.message.commit.cancelled=commit cancelled Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-02-05 14:00:21 UTC (rev 2989) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-02-05 16:35:09 UTC (rev 2990) @@ -557,6 +557,7 @@ isisfish.message.backup.database.progress=backup database en cours isisfish.message.cancel.finished=Annulation termin\u00E9e isisfish.message.check.finished=V\u00E9rification termin\u00E9e +isisfish.message.check.inprogress=V\u00E9rification en cours... isisfish.message.checking.cell= isisfish.message.choose.archive=choose archive file or directory isisfish.message.commit.cancelled=commit annul\u00E9

1 0