Attachment 107624 Details for Bug 236472 – Fix v01

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix v01

clipboard.txt (text/plain), 2.28 KB, created by Tomasz Zarna

on 2008-07-16 10:58:16 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2008-07-16 10:58:16 EDT

Size: 2.28 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.ui
>Index: src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java,v
>retrieving revision 1.15
>diff -u -r1.15 SaveableCompareEditorInput.java
>--- src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java	15 May 2008 16:08:21 -0000	1.15
>+++ src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java	16 Jul 2008 14:51:08 -0000
>@@ -221,7 +221,6 @@
> 			LocalResourceSaveableComparison rsc = (LocalResourceSaveableComparison) saveable;
> 			rsc.dispose();
> 		}
>-		saveable = null;
> 		if (getCompareResult() instanceof IDisposable) {
> 			((IDisposable) getCompareResult()).dispose();
> 		}
>Index: src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java,v
>retrieving revision 1.39
>diff -u -r1.39 ModelCompareEditorInput.java
>--- src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java	15 May 2008 16:08:21 -0000	1.39
>+++ src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java	16 Jul 2008 14:51:07 -0000
>@@ -40,7 +40,7 @@
> 	
> 	private final ModelSynchronizeParticipant participant;
> 	private final ICompareInput input;
>-	private ICacheListener contextListener;
>+	private final ICacheListener contextListener;
> 	private final ISynchronizePageConfiguration synchronizeConfiguration;
> 
> 	public ModelCompareEditorInput(ModelSynchronizeParticipant participant, ICompareInput input, IWorkbenchPage page, ISynchronizePageConfiguration synchronizeConfiguration) {
>@@ -82,7 +82,6 @@
> 	protected void handleDispose() {
> 		super.handleDispose();
> 		participant.getContext().getCache().removeCacheListener(contextListener);
>-		contextListener = null;
> 		getCompareConfiguration().removePropertyChangeListener(this);
>     	ICompareNavigator navigator = (ICompareNavigator)synchronizeConfiguration.getProperty(SynchronizePageConfiguration.P_INPUT_NAVIGATOR);
>     	if (navigator != null && navigator == super.getNavigator()) {

Actions: View | Diff

Attachments on bug 236472: 104353 | 107624 | 107625