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; }