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

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

r2989 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 05 Feb '10

05 Feb '10

Author: chatellier Date: 2010-02-05 14:00:21 +0000 (Fri, 05 Feb 2010) New Revision: 2989 Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java Log: Fix next version 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 2010-02-05 11:08:42 UTC (rev 2988) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-02-05 14:00:21 UTC (rev 2989) @@ -113,7 +113,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(3, 3, 0, 0); + protected final static Version version = new Version(3, 3, 1, 0); protected final static Version databaseVersion = new Version( version.getNumber(0), version.getNumber(1)); protected final static Version apiVersion = new Version(

1 0

r2988 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org 05 Feb '10

05 Feb '10

Author: chatellier Date: 2010-02-05 11:08:42 +0000 (Fri, 05 Feb 2010) New Revision: 2988 Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Deprecate factor component storage map Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2010-02-05 09:18:31 UTC (rev 2987) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2010-02-05 11:08:42 UTC (rev 2988) @@ -103,7 +103,13 @@ protected String simulName = null; protected SensitivityStorage sensitivityStorage = null; protected SortedMap<String, Factor> factors; + + /** + * @deprecated this is not a good idea to store factor source component in + * case, and found a new component instance that can edit a factor (simulation reloading) + */ protected Map<String, JComponent> factorComponent = new HashMap<String, JComponent>(); + protected DesignPlan designPlan = new DesignPlan(); /*

1 0

r2987 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 05 Feb '10

05 Feb '10

Author: chatellier Date: 2010-02-05 09:18:31 +0000 (Fri, 05 Feb 2010) New Revision: 2987 Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx Log: Add comment about setLayer() method 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 2010-02-04 16:11:09 UTC (rev 2986) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2010-02-05 09:18:31 UTC (rev 2987) @@ -117,6 +117,13 @@ } } +/** + * Method appelée par l'arbre de navigation et le gestionnaire + * de changement d'onglet pour ajouter les layers sur une interface + * 'input' seulement dans le cas de la sensibilité. + * + * @param active if {@code true} set layer, otherwize do nothing + */ public void setLayer(boolean active) { if (this.get$objectMap() != null && active) { for (JComponent boxed : SwingUtil.getLayeredComponents(this)) {

1 0