branch develop updated (85c8361 -> 41f0245)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 85c8361 Suppresion du champs TripSeine#datearriveeport (termine #7697). new 41f0245 A la fermeture d'une base bien desenregistrer les listeners dessus The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 41f0245c4af80b24ec887b13ae393ecc60427837 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 5 23:00:44 2015 +0100 A la fermeture d'une base bien desenregistrer les listeners dessus Summary of changes: .../main/java/fr/ird/observe/ObserveSwingApplicationContext.java | 5 ++++- .../src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 41f0245c4af80b24ec887b13ae393ecc60427837 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 5 23:00:44 2015 +0100 A la fermeture d'une base bien desenregistrer les listeners dessus --- .../main/java/fr/ird/observe/ObserveSwingApplicationContext.java | 5 ++++- .../src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index addd830..5857f6f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -763,7 +763,7 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im // references vers le service ObserveSwingDataSource source = event.getSource(); - // on ferme la maréé, la route ou l'activité ouvertes + // on ferme la marée, la route ou l'activité ouvertes getOpenDataManager().close(); ObserveMainUI mainUI = getObserveMainUI(); @@ -782,6 +782,9 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im t("observe.message.db.closed", source.getLabel())); } + + source.removeObserveSwingDataSourceListeners(); + } protected void openOnUI(ObserveSwingDataSource source) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java index 11b50ce..ab73cf8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java @@ -340,15 +340,15 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements } public void removeObserveSwingDataSourceListener(ObserveSwingDataSourceListener listener) { + if (log.isInfoEnabled()) { + log.info("removing listener " + listener); + } listenerList.remove(ObserveSwingDataSourceListener.class, listener); } - protected void removeObserveSwingDataSourceListeners() { + public void removeObserveSwingDataSourceListeners() { // remove all listeners for (ObserveSwingDataSourceListener listener : getObserveSwingDataSourceListener()) { - if (log.isInfoEnabled()) { - log.info("removing listener " + listener); - } removeObserveSwingDataSourceListener(listener); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm