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

r3601 - in branches: . 4.1
by echatellier＠users.forge.codelutin.com 13 Feb '12

13 Feb '12

Author: echatellier Date: 2012-02-13 11:37:53 +0100 (Mon, 13 Feb 2012) New Revision: 3601 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3601 Log: Create branch 4.1 from revision 3596 Added: branches/4.1/ Property changes on: branches/4.1 ___________________________________________________________________ Added: svn:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine Added: svn:mergeinfo +

1 0

r3600 - trunk/src/main/java/fr/ifremer/isisfish/ui/input
by echatellier＠users.forge.codelutin.com 24 Jan '12

24 Jan '12

Author: echatellier Date: 2012-01-24 16:23:44 +0100 (Tue, 24 Jan 2012) New Revision: 3600 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3600 Log: #783 : NonUniqueObjectException when saving metier's target factors Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2012-01-24 15:22:48 UTC (rev 3599) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2012-01-24 15:23:44 UTC (rev 3600) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 2009 - 2012 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 @@ -294,6 +294,10 @@ InputUI inputUI = inputContentUI.getParentContainer(InputUI.class); inputUI.getHandler().updateTreeNode(inputUI, topiaEntity.getTopiaId()); + // FIXME echatellier 20111201 small fix because save + // button has to reset internal ui change model state + inputContentUI.resetChangeModel(); + // refresh all registered panel // to discard modification in UI //refreshAll(); @@ -372,6 +376,15 @@ } /** + * Remove monitored entities. + * + * @param key entity key to remove + */ + public void removeCurrentEntity(String key) { + currentEntities.remove(key); + } + + /** * Reset state. */ public void reset() { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2012-01-24 15:22:48 UTC (rev 3599) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2012-01-24 15:23:44 UTC (rev 3600) @@ -156,6 +156,7 @@ if (o != null) { TargetSpecies ts = (TargetSpecies)o; getAction().removeTargetSpecies(getMetierSeasonInfo(), ts); + getSaveVerifier().removeCurrentEntity(ts.getTopiaId()); setTableTargetSpeciesModel(); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2012-01-24 15:22:48 UTC (rev 3599) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2012-01-24 15:23:44 UTC (rev 3600) @@ -125,6 +125,7 @@ GearPopulationSelectivityModel model = (GearPopulationSelectivityModel)selectivityTable.getModel(); Selectivity selectedSelectivity = model.getSelectivities().get(selectivityTable.getSelectedRow()); getAction().removeSelectivity(getBean(), selectedSelectivity); + getSaveVerifier().removeCurrentEntity(selectedSelectivity.getTopiaId()); setSelectivityTableModel(); removeSelectivityButton.setEnabled(false); }

1 0

r3599 - in trunk/src/main/java/fr/ifremer/isisfish: datastore ui/sensitivity
by echatellier＠users.forge.codelutin.com 24 Jan '12

24 Jan '12

Author: echatellier Date: 2012-01-24 16:22:48 +0100 (Tue, 24 Jan 2012) New Revision: 3599 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3599 Log: Update event system to refresh AS uis Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2012-01-24 10:58:18 UTC (rev 3598) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2012-01-24 15:22:48 UTC (rev 3599) @@ -182,6 +182,9 @@ lastContentUpdate = System.nanoTime(); lastContentLength = getFile().length(); } + + // add storage modification event + fireDataChanged(new StorageChangeEvent(this)); } /** Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2012-01-24 10:58:18 UTC (rev 3598) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2012-01-24 15:22:48 UTC (rev 3599) @@ -59,7 +59,12 @@ /** Logger for this class */ private static final Log log = LogFactory.getLog(VersionStorage.class); - /** Listener set. Manage single reference and weak reference. */ + /** + * Listener set. Manage single reference and weak reference. + * + * TODO echatellier 20120224 la collection est static donc un listener sur les scripts + * recevra trop d'evenement car il recevra aussi les evenements des regions... + */ protected static ListenerSet<StorageChangeListener> changeListeners = new ListenerSet<StorageChangeListener>(); /** VCS root directory. */ @@ -341,6 +346,9 @@ } else { getFile().delete(); } + + // fire events + fireDataChanged(new StorageChangeEvent(this)); } /** Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2012-01-24 10:58:18 UTC (rev 3598) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2012-01-24 15:22:48 UTC (rev 3599) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2012 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,6 +28,10 @@ javax.swing.ComboBoxModel javax.swing.table.DefaultTableModel fr.ifremer.isisfish.datastore.RegionStorage + fr.ifremer.isisfish.datastore.SensitivityAnalysisStorage + fr.ifremer.isisfish.datastore.SensitivityExportStorage + fr.ifremer.isisfish.datastore.StorageChangeEvent + fr.ifremer.isisfish.datastore.StorageChangeListener fr.ifremer.isisfish.export.SensitivityExport fr.ifremer.isisfish.simulator.sensitivity.Domain fr.ifremer.isisfish.simulator.sensitivity.Factor @@ -49,12 +53,34 @@ </import> <script><![CDATA[ + + // listener to listen for modification on sensitivity analysis + StorageChangeListener sensitivityAnalysisListener; + sensitivityAnalysisListener = new StorageChangeListener() { + @Override + public void versionDataChanged(StorageChangeEvent e) { + fieldSensitivityAnalysisSelect.setModel(getSensitivityAnalysisModel()); + } + }; + SensitivityAnalysisStorage.addStorageChangeListener(sensitivityAnalysisListener); + + // listener to listen for modification on sensitivity exports + StorageChangeListener sensitivityExportListener; + sensitivityExportListener = new StorageChangeListener() { + @Override + public void versionDataChanged(StorageChangeEvent e) { + availableSensitivityExports.setModel(getAvailableExportListModel()); + } + }; + SensitivityExportStorage.addStorageChangeListener(sensitivityExportListener); + + protected SimulAction getSimulAction() { return getContextValue(SimulAction.class); } public ComboBoxModel getSensitivityAnalysisModel() { - java.util.List<String> sensitivityNames = getSimulAction().getSensitivityAnalysisNames(); + List<String> sensitivityNames = getSimulAction().getSensitivityAnalysisNames(); SensitivityAnalysisComboModel model = new SensitivityAnalysisComboModel(sensitivityNames); return model; } @@ -126,7 +152,7 @@ } protected StringListModel getAvailableExportListModel() { - java.util.List<String> exportNames = getSimulAction().getSensitivityExportNames(); + List<String> exportNames = getSimulAction().getSensitivityExportNames(); StringListModel model = new StringListModel(exportNames); return model; }

1 0

r3598 - trunk/src/main/resources/templates/script
by echatellier＠users.forge.codelutin.com 24 Jan '12

24 Jan '12

Author: echatellier Date: 2012-01-24 11:58:18 +0100 (Tue, 24 Jan 2012) New Revision: 3598 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3598 Log: Bah alors, les package sont pas bons et ca fait m?\195?\170me pas d'erreur de compile :( Modified: trunk/src/main/resources/templates/script/sensitivityanalysis.ftl trunk/src/main/resources/templates/script/sensitivityexport.ftl Modified: trunk/src/main/resources/templates/script/sensitivityanalysis.ftl =================================================================== --- trunk/src/main/resources/templates/script/sensitivityanalysis.ftl 2012-01-24 10:32:57 UTC (rev 3597) +++ trunk/src/main/resources/templates/script/sensitivityanalysis.ftl 2012-01-24 10:58:18 UTC (rev 3598) @@ -40,7 +40,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -package sensitivity; +package sensitivityanalysis; import static org.nuiton.i18n.I18n._; Modified: trunk/src/main/resources/templates/script/sensitivityexport.ftl =================================================================== --- trunk/src/main/resources/templates/script/sensitivityexport.ftl 2012-01-24 10:32:57 UTC (rev 3597) +++ trunk/src/main/resources/templates/script/sensitivityexport.ftl 2012-01-24 10:58:18 UTC (rev 3598) @@ -40,7 +40,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -package exports; +package sensitivityexports; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;

1 0

r3597 - trunk
by echatellier＠users.forge.codelutin.com 24 Jan '12

24 Jan '12

Author: echatellier Date: 2012-01-24 11:32:57 +0100 (Tue, 24 Jan 2012) New Revision: 3597 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3597 Log: Back to latest Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-19 10:27:13 UTC (rev 3596) +++ trunk/pom.xml 2012-01-24 10:32:57 UTC (rev 3597) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.6</version> + <version>3.0.7</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r3596 - trunk/src/main/java/fr/ifremer/isisfish
by echatellier＠users.forge.codelutin.com 19 Jan '12

19 Jan '12

Author: echatellier Date: 2012-01-19 11:27:13 +0100 (Thu, 19 Jan 2012) New Revision: 3596 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3596 Log: Update next version Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2012-01-19 10:24:08 UTC (rev 3595) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2012-01-19 10:27:13 UTC (rev 3596) @@ -119,7 +119,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(4, 0, 0, 2); + protected final static Version version = new Version(4, 0, 0, 3); protected final static Version majorVersion = new Version(version.getNumber(0)); protected final static Version databaseVersion = new Version(

1 0

r3595 - trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by echatellier＠users.forge.codelutin.com 19 Jan '12

19 Jan '12

Author: echatellier Date: 2012-01-19 11:24:08 +0100 (Thu, 19 Jan 2012) New Revision: 3595 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3595 Log: #591 : AS - Pas possible d'avoir plusieurs facteurs TargetFactor Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2012-01-12 15:26:11 UTC (rev 3594) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2012-01-19 10:24:08 UTC (rev 3595) @@ -181,6 +181,7 @@ inputContentUI.setBean((TopiaEntityContextable)topiaEntity); inputContentUI.setActive(topiaEntity != null); inputContentUI.setLayer(true); + inputContentUI.setSensitivity(true); // add initialized ui to panel sensitivityTabUI.getCardlayoutPrincipal().show(sensitivityTabUI.getInputPanePrincipal(), "normale");

1 0

r3594 - trunk
by maven-release＠users.forge.codelutin.com 12 Jan '12

12 Jan '12

Author: maven-release Date: 2012-01-12 16:26:11 +0100 (Thu, 12 Jan 2012) New Revision: 3594 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3594 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-12 15:26:10 UTC (rev 3593) +++ trunk/pom.xml 2012-01-12 15:26:11 UTC (rev 3594) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.0.0.2</version> + <version>4.0.0.3-SNAPSHOT</version>  <dependencies> @@ -717,9 +717,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.2</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.2</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.2</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> </scm> <repositories>

1 0

r3593 - in tags: . isis-fish-4.0.0.2
by maven-release＠users.forge.codelutin.com 12 Jan '12

12 Jan '12

Author: maven-release Date: 2012-01-12 16:26:10 +0100 (Thu, 12 Jan 2012) New Revision: 3593 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3593 Log: [maven-release-plugin] copy for tag isis-fish-4.0.0.2 Added: tags/isis-fish-4.0.0.2/ Property changes on: tags/isis-fish-4.0.0.2 ___________________________________________________________________ Added: svn:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine Added: svn:mergeinfo +

1 0

r3592 - trunk
by maven-release＠users.forge.codelutin.com 12 Jan '12

12 Jan '12

Author: maven-release Date: 2012-01-12 16:26:09 +0100 (Thu, 12 Jan 2012) New Revision: 3592 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3592 Log: [maven-release-plugin] prepare release isis-fish-4.0.0.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-12 15:02:42 UTC (rev 3591) +++ trunk/pom.xml 2012-01-12 15:26:09 UTC (rev 3592) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.0.0.2-SNAPSHOT</version> + <version>4.0.0.2</version>  <dependencies> @@ -717,9 +717,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.2</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.2</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.2</url> </scm> <repositories>

1 0