Cleanup page listener removal on dispose()

Follow up on 1ac91ea.

Replaced indirect access from the page to the model on dispose() with
direct access to it during page creation / attaching to model, so the
listeners are always removed independently when dispose() is called.

Author: iloveeclipse

ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSPropertiesSection.java

@@ -157,19 +157,12 @@ protected void createClient(Section section, FormToolkit toolkit) {
 		if (model != null) {
 			fPropertiesTable.setInput(model);
 			model.addModelChangedListener(this);
+			section.addDisposeListener(e -> model.removeModelChangedListener(DSPropertiesSection.this));
 		}
 		toolkit.paintBordersFor(container);
 		section.setClient(container);
 	}
 
-	@Override
-	public void dispose() {
-		IDSModel model = getDSModel();
-		if (model != null) {
-			model.removeModelChangedListener(this);
-		}
-	}
-
 	@Override
 	public void refresh() {
 		fPropertiesTable.refresh();

ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSProvideSection.java

@@ -127,20 +127,13 @@ protected void createClient(Section section, FormToolkit toolkit) {
 		if (model != null) {
 			fProvidesTable.setInput(model);
 			model.addModelChangedListener(this);
+			section.addDisposeListener(e -> model.removeModelChangedListener(DSProvideSection.this));
 		}
 		toolkit.paintBordersFor(container);
 		section.setClient(container);
 		updateTitle();
 	}
 
-	@Override
-	public void dispose() {
-		IDSModel model = getDSModel();
-		if (model != null) {
-			model.removeModelChangedListener(this);
-		}
-	}
-
 	@Override
 	public void refresh() {
 		fProvidesTable.refresh();

ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSReferenceSection.java

@@ -172,20 +172,13 @@ protected void createClient(Section section, FormToolkit toolkit) {
 		if (model != null) {
 			fReferencesTable.setInput(model);
 			model.addModelChangedListener(this);
+			section.addDisposeListener(e -> model.removeModelChangedListener(DSReferenceSection.this));
 		}
 		toolkit.paintBordersFor(container);
 		section.setClient(container);
 		updateTitle();
 	}
 
-	@Override
-	public void dispose() {
-		IDSModel model = getDSModel();
-		if (model != null) {
-			model.removeModelChangedListener(this);
-		}
-	}
-
 	@Override
 	public void refresh() {
 		fReferencesTable.refresh();

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildClasspathSection.java

@@ -171,7 +171,9 @@ private IBuildModel getBuildModel() {
 	}
 
 	public void initialize() {
-		getBuildModel().addModelChangedListener(this);
+		IBuildModel model = getBuildModel();
+		model.addModelChangedListener(this);
+		getSection().addDisposeListener(e -> model.removeModelChangedListener(BuildClasspathSection.this));
 		getSection().setExpanded(true);
 	}
 
@@ -226,15 +228,6 @@ public void run() {
 		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(manager, false);
 	}
 
-	@Override
-	public void dispose() {
-		IBuildModel model = getBuildModel();
-		if (model != null) {
-			model.removeModelChangedListener(this);
-		}
-		super.dispose();
-	}
-
 	@Override
 	public void refresh() {
 		fTableViewer.refresh();

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildContentsSection.java

@@ -440,11 +440,11 @@ public void initialize() {
 			fTreeViewer.setInput(fBundleRoot);
 		}
 		fBuildModel.addModelChangedListener(this);
+		getSection().addDisposeListener(e -> fBuildModel.removeModelChangedListener(BuildContentsSection.this));
 	}
 
 	@Override
 	public void dispose() {
-		fBuildModel.removeModelChangedListener(this);
 		PDEPlugin.getWorkspace().removeResourceChangeListener(this);
 		super.dispose();
 	}

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/RuntimeInfoSection.java

@@ -225,7 +225,9 @@ public RuntimeInfoSection(PDEFormPage page, Composite parent) {
 		super(page, parent, Section.DESCRIPTION);
 		getSection().setText(PDEUIMessages.BuildEditor_RuntimeInfoSection_title);
 		getSection().setDescription(PDEUIMessages.BuildEditor_RuntimeInfoSection_desc);
-		getBuildModel().addModelChangedListener(this);
+		IBuildModel model = getBuildModel();
+		model.addModelChangedListener(this);
+		getSection().addDisposeListener(e -> model.removeModelChangedListener(RuntimeInfoSection.this));
 		createClient(getSection(), page.getManagedForm().getToolkit());
 	}
 
@@ -575,15 +577,6 @@ private void doRename() {
 		}
 	}
 
-	@Override
-	public void dispose() {
-		IBuildModel buildModel = getBuildModel();
-		if (buildModel != null) {
-			buildModel.removeModelChangedListener(this);
-		}
-		super.dispose();
-	}
-
 	private void refreshOutputKeys() {
 		if (!isJavaProject()) {
 			return;

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/DependencyManagementSection.java

@@ -306,6 +306,8 @@ private void initialize() {
 			IBuildModel build = getBuildModel(false);
 			if (build != null) {
 				build.addModelChangedListener(this);
+				getSection()
+						.addDisposeListener(e -> build.removeModelChangedListener(DependencyManagementSection.this));
 			}
 
 			IResource resource = model.getUnderlyingResource();
@@ -641,10 +643,6 @@ protected void doAddDependencies() {
 
 	@Override
 	public void dispose() {
-		IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-		if (model != null) {
-			model.removeModelChangedListener(this);
-		}
 		PDECore.getDefault().getModelManager().removePluginModelListener(this);
 		super.dispose();
 	}

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExecutionEnvironmentSection.java

@@ -184,6 +184,7 @@ protected void createClient(Section section, FormToolkit toolkit) {
 		if (model != null) {
 			fEETable.setInput(model);
 			model.addModelChangedListener(this);
+			section.addDisposeListener(e -> model.removeModelChangedListener(ExecutionEnvironmentSection.this));
 		}
 		toolkit.paintBordersFor(container);
 		section.setClient(container);
@@ -202,13 +203,6 @@ private void updateClasspathSettings(IProject project) {
 		} catch (CoreException e1) {
 		}
 	}
-	@Override
-	public void dispose() {
-		IBundleModel model = getBundleModel();
-		if (model != null) {
-			model.removeModelChangedListener(this);
-		}
-	}
 
 	@Override
 	public void refresh() {

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageSection.java

@@ -164,6 +164,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 		IBundleModel model = getBundleModel();
 		fPackageViewer.setInput(model);
 		model.addModelChangedListener(this);
+		section.addDisposeListener(e -> model.removeModelChangedListener(ExportPackageSection.this));
 		updateButtons();
 	}
 
@@ -191,15 +192,6 @@ public boolean doGlobalAction(String actionId) {
 		return super.doGlobalAction(actionId);
 	}
 
-	@Override
-	public void dispose() {
-		IBundleModel model = getBundleModel();
-		if (model != null) {
-			model.removeModelChangedListener(this);
-		}
-		super.dispose();
-	}
-
 	@Override
 	protected boolean canPaste(Object targetObject, Object[] sourceObjects) {
 		Map<String, IPackageFragment> currentPackageFragments = null;

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageVisibilitySection.java

@@ -145,6 +145,8 @@ public void createClient(Section section, FormToolkit toolkit) {
 		fImage = PDEPluginImages.DESC_PLUGIN_OBJ.createImage();
 		update(null);
 		getBundleModel().addModelChangedListener(this);
+		section.addDisposeListener(
+				e -> getBundleModel().removeModelChangedListener(ExportPackageVisibilitySection.this));
 
 		section.setLayout(FormLayoutFactory.createClearGridLayout(false, 1));
 		section.setLayoutData(new GridData(GridData.FILL_BOTH));
@@ -257,10 +259,6 @@ protected void doPaste(Object targetObject, Object[] sourceObjects) {
 
 	@Override
 	public void dispose() {
-		IBundleModel model = getBundleModel();
-		if (model != null) {
-			model.removeModelChangedListener(this);
-		}
 		if (fImage != null) {
 			fImage.dispose();
 		}