Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 236472
Collapse All | Expand All

(-)src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java (-1 lines)
Lines 221-227 Link Here
221
			LocalResourceSaveableComparison rsc = (LocalResourceSaveableComparison) saveable;
221
			LocalResourceSaveableComparison rsc = (LocalResourceSaveableComparison) saveable;
222
			rsc.dispose();
222
			rsc.dispose();
223
		}
223
		}
224
		saveable = null;
225
		if (getCompareResult() instanceof IDisposable) {
224
		if (getCompareResult() instanceof IDisposable) {
226
			((IDisposable) getCompareResult()).dispose();
225
			((IDisposable) getCompareResult()).dispose();
227
		}
226
		}
(-)src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java (-2 / +1 lines)
Lines 40-46 Link Here
40
	
40
	
41
	private final ModelSynchronizeParticipant participant;
41
	private final ModelSynchronizeParticipant participant;
42
	private final ICompareInput input;
42
	private final ICompareInput input;
43
	private ICacheListener contextListener;
43
	private final ICacheListener contextListener;
44
	private final ISynchronizePageConfiguration synchronizeConfiguration;
44
	private final ISynchronizePageConfiguration synchronizeConfiguration;
45
45
46
	public ModelCompareEditorInput(ModelSynchronizeParticipant participant, ICompareInput input, IWorkbenchPage page, ISynchronizePageConfiguration synchronizeConfiguration) {
46
	public ModelCompareEditorInput(ModelSynchronizeParticipant participant, ICompareInput input, IWorkbenchPage page, ISynchronizePageConfiguration synchronizeConfiguration) {
Lines 82-88 Link Here
82
	protected void handleDispose() {
82
	protected void handleDispose() {
83
		super.handleDispose();
83
		super.handleDispose();
84
		participant.getContext().getCache().removeCacheListener(contextListener);
84
		participant.getContext().getCache().removeCacheListener(contextListener);
85
		contextListener = null;
86
		getCompareConfiguration().removePropertyChangeListener(this);
85
		getCompareConfiguration().removePropertyChangeListener(this);
87
    	ICompareNavigator navigator = (ICompareNavigator)synchronizeConfiguration.getProperty(SynchronizePageConfiguration.P_INPUT_NAVIGATOR);
86
    	ICompareNavigator navigator = (ICompareNavigator)synchronizeConfiguration.getProperty(SynchronizePageConfiguration.P_INPUT_NAVIGATOR);
88
    	if (navigator != null && navigator == super.getNavigator()) {
87
    	if (navigator != null && navigator == super.getNavigator()) {

Return to bug 236472