From c238524a5ccc9a595c3f70d22a2d334a552aa37c Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Wed, 29 Apr 2020 13:16:07 +0200
Subject: [PATCH] OO-4661: remove controllers listeners from the toolbar
---
.../ui/tool/AssessmentCourseTreeController.java | 4 +++-
.../assessment/ui/tool/AssessmentToolController.java | 4 +++-
.../ui/tool/IdentityListCourseNodeController.java | 3 +++
.../olat/course/nodes/iq/IQConfigurationController.java | 6 +++---
.../java/org/olat/course/run/CourseRuntimeController.java | 8 ++++++++
.../curriculum/ui/CurriculumComposerController.java | 1 +
.../modules/lecture/ui/TeacherOverviewController.java | 8 ++++++++
.../org/olat/modules/portfolio/ui/BinderController.java | 4 +++-
.../org/olat/modules/portfolio/ui/PageRunController.java | 3 +++
.../org/olat/modules/qpool/ui/QuestionListController.java | 8 ++++++++
.../modules/taxonomy/ui/TaxonomyTreeTableController.java | 4 +++-
.../OrganisationsStructureAdminController.java | 4 +++-
12 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/olat/course/assessment/ui/tool/AssessmentCourseTreeController.java b/src/main/java/org/olat/course/assessment/ui/tool/AssessmentCourseTreeController.java
index d6b2a05e2d6..6e6ea7e3e8a 100644
--- a/src/main/java/org/olat/course/assessment/ui/tool/AssessmentCourseTreeController.java
+++ b/src/main/java/org/olat/course/assessment/ui/tool/AssessmentCourseTreeController.java
@@ -110,7 +110,9 @@ public class AssessmentCourseTreeController extends BasicController implements A
@Override
protected void doDispose() {
- //
+ if(stackPanel != null) {
+ stackPanel.removeListener(this);
+ }
}
@Override
diff --git a/src/main/java/org/olat/course/assessment/ui/tool/AssessmentToolController.java b/src/main/java/org/olat/course/assessment/ui/tool/AssessmentToolController.java
index bc4ece695e2..3bb50e5cc3d 100644
--- a/src/main/java/org/olat/course/assessment/ui/tool/AssessmentToolController.java
+++ b/src/main/java/org/olat/course/assessment/ui/tool/AssessmentToolController.java
@@ -224,7 +224,9 @@ public class AssessmentToolController extends MainLayoutBasicController implemen
@Override
protected void doDispose() {
- //
+ if(stackPanel != null) {
+ stackPanel.removeListener(this);
+ }
}
@Override
diff --git a/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java b/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java
index a494cee8167..8726b8259cf 100644
--- a/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java
+++ b/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java
@@ -555,6 +555,9 @@ public class IdentityListCourseNodeController extends FormBasicController
@Override
protected void doDispose() {
+ if(stackPanel != null) {
+ stackPanel.removeListener(this);
+ }
coordinatorManager.getCoordinator().getEventBus()
.deregisterFor(this, courseEntry.getOlatResource());
}
diff --git a/src/main/java/org/olat/course/nodes/iq/IQConfigurationController.java b/src/main/java/org/olat/course/nodes/iq/IQConfigurationController.java
index 640c8eb4ace..4298b02d37a 100644
--- a/src/main/java/org/olat/course/nodes/iq/IQConfigurationController.java
+++ b/src/main/java/org/olat/course/nodes/iq/IQConfigurationController.java
@@ -658,11 +658,11 @@ public class IQConfigurationController extends BasicController {
return repositoryManager.lookupRepositoryEntryBySoftkey(repoSoftkey, false);
}
- /**
- * @see org.olat.core.gui.control.DefaultController#doDispose(boolean)
- */
@Override
protected void doDispose() {
+ if(stackPanel != null) {
+ stackPanel.removeListener(this);
+ }
//child controllers registered with listenTo() get disposed in BasicController
if (previewLayoutCtr != null) {
previewLayoutCtr.dispose();
diff --git a/src/main/java/org/olat/course/run/CourseRuntimeController.java b/src/main/java/org/olat/course/run/CourseRuntimeController.java
index 88e4495e9ee..1029882403d 100644
--- a/src/main/java/org/olat/course/run/CourseRuntimeController.java
+++ b/src/main/java/org/olat/course/run/CourseRuntimeController.java
@@ -1037,20 +1037,28 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
@Override
protected void cleanUp() {
removeAsListenerAndDispose(lifeCycleChangeCtr);
+ removeAsListenerAndDispose(assessmentModeCtrl);
+ removeAsListenerAndDispose(lecturesAdminCtrl);
removeAsListenerAndDispose(assessmentToolCtr);
removeAsListenerAndDispose(courseFolderCtrl);
removeAsListenerAndDispose(statisticsCtrl);
+ removeAsListenerAndDispose(remindersCtrl);
removeAsListenerAndDispose(databasesCtrl);
+ removeAsListenerAndDispose(lecturesCtrl);
removeAsListenerAndDispose(archiverCtrl);
removeAsListenerAndDispose(statsToolCtr);
removeAsListenerAndDispose(membersCtrl);
removeAsListenerAndDispose(areasCtrl);
removeAsListenerAndDispose(leaveDialogBox);
lifeCycleChangeCtr = null;
+ assessmentModeCtrl = null;
+ lecturesAdminCtrl = null;
assessmentToolCtr = null;
courseFolderCtrl = null;
statisticsCtrl = null;
+ remindersCtrl = null;
databasesCtrl = null;
+ lecturesCtrl = null;
archiverCtrl = null;
statsToolCtr = null;
membersCtrl = null;
diff --git a/src/main/java/org/olat/modules/curriculum/ui/CurriculumComposerController.java b/src/main/java/org/olat/modules/curriculum/ui/CurriculumComposerController.java
index ec0801fc92c..57566ba1fad 100644
--- a/src/main/java/org/olat/modules/curriculum/ui/CurriculumComposerController.java
+++ b/src/main/java/org/olat/modules/curriculum/ui/CurriculumComposerController.java
@@ -274,6 +274,7 @@ public class CurriculumComposerController extends FormBasicController implements
@Override
protected void doDispose() {
+ toolbarPanel.removeListener(this);
if(!toolbarPanel.isToolbarEnabled()) {
toolbarPanel.setToolbarEnabled(true);
}
diff --git a/src/main/java/org/olat/modules/lecture/ui/TeacherOverviewController.java b/src/main/java/org/olat/modules/lecture/ui/TeacherOverviewController.java
index 94e4a49c844..c44e6cbe61b 100644
--- a/src/main/java/org/olat/modules/lecture/ui/TeacherOverviewController.java
+++ b/src/main/java/org/olat/modules/lecture/ui/TeacherOverviewController.java
@@ -95,6 +95,14 @@ public class TeacherOverviewController extends AbstractTeacherOverviewController
super.initTables(ureq, withTeachers, withAssessment);
}
+ @Override
+ protected void doDispose() {
+ if(toolbarPanel != null) {
+ toolbarPanel.removeListener(this);
+ }
+ super.doDispose();
+ }
+
@Override
protected List<LectureBlockRow> getRows(LecturesBlockSearchParameters searchParams) {
Identity filterByTeacher = ((Boolean)allTeachersSwitch.getUserObject()).booleanValue() ? null : getIdentity();
diff --git a/src/main/java/org/olat/modules/portfolio/ui/BinderController.java b/src/main/java/org/olat/modules/portfolio/ui/BinderController.java
index 8c11a99351e..2e634f7227d 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/BinderController.java
+++ b/src/main/java/org/olat/modules/portfolio/ui/BinderController.java
@@ -176,7 +176,9 @@ public class BinderController extends BasicController implements TooledControlle
@Override
protected void doDispose() {
- //
+ if(stackPanel != null) {
+ stackPanel.removeListener(this);
+ }
}
@Override
diff --git a/src/main/java/org/olat/modules/portfolio/ui/PageRunController.java b/src/main/java/org/olat/modules/portfolio/ui/PageRunController.java
index 73a4a33d51d..c30186f8d26 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/PageRunController.java
+++ b/src/main/java/org/olat/modules/portfolio/ui/PageRunController.java
@@ -354,6 +354,9 @@ public class PageRunController extends BasicController implements TooledControll
@Override
protected void doDispose() {
+ if(stackPanel != null) {
+ stackPanel.removeListener(this);
+ }
if (lockEntry != null && lockEntry.isSuccess()) {
// release lock
coordinator.getCoordinator().getLocker().releaseLock(lockEntry);
diff --git a/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java b/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java
index 813f607bac5..f48040ca05d 100644
--- a/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java
@@ -259,6 +259,14 @@ public class QuestionListController extends AbstractItemListController implement
bulkChange = uifactory.addFormLink("bulk.change", formLayout, Link.BUTTON);
}
}
+
+ @Override
+ protected void doDispose() {
+ if(stackPanel != null) {
+ stackPanel.removeListener(this);
+ }
+ super.doDispose();
+ }
public QuestionItemCollection getItemCollection() {
return itemCollection;
diff --git a/src/main/java/org/olat/modules/taxonomy/ui/TaxonomyTreeTableController.java b/src/main/java/org/olat/modules/taxonomy/ui/TaxonomyTreeTableController.java
index 2c32b5a2e53..64a31ca32d7 100644
--- a/src/main/java/org/olat/modules/taxonomy/ui/TaxonomyTreeTableController.java
+++ b/src/main/java/org/olat/modules/taxonomy/ui/TaxonomyTreeTableController.java
@@ -210,7 +210,9 @@ public class TaxonomyTreeTableController extends FormBasicController implements
@Override
protected void doDispose() {
- //
+ if(stackPanel != null) {
+ stackPanel.removeListener(this);
+ }
}
@Override
diff --git a/src/main/java/org/olat/user/ui/organisation/OrganisationsStructureAdminController.java b/src/main/java/org/olat/user/ui/organisation/OrganisationsStructureAdminController.java
index 69439e536bb..5561a74df4b 100644
--- a/src/main/java/org/olat/user/ui/organisation/OrganisationsStructureAdminController.java
+++ b/src/main/java/org/olat/user/ui/organisation/OrganisationsStructureAdminController.java
@@ -136,7 +136,9 @@ public class OrganisationsStructureAdminController extends FormBasicController i
@Override
protected void doDispose() {
- //
+ if(stackPanel != null) {
+ stackPanel.removeListener(this);
+ }
}
private void loadModel(boolean reset) {
--
GitLab