Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2004-09-02 11:16:30 -0400
committerJean Michel-Lemieux2004-09-02 11:16:30 -0400
commit9088a67a18768906138ac82258e16c39156d6bb5 (patch)
treed137863c3051b5c2ce94f7c06f456aeab6e19cac
parenta8fc3b8bf4bf2f8f7e6ef046e296277d027f5ce8 (diff)
downloadeclipse.platform.team-9088a67a18768906138ac82258e16c39156d6bb5.tar.gz
eclipse.platform.team-9088a67a18768906138ac82258e16c39156d6bb5.tar.xz
eclipse.platform.team-9088a67a18768906138ac82258e16c39156d6bb5.zip
Bug 73107 PinParticipantAction not removed as an IPropertyChangeListenerM20040902
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PinParticipantAction.java6
2 files changed, 10 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java
index d55385fc2..ae6b4efbc 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java
@@ -199,13 +199,15 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
public void dispose() {
super.dispose();
TeamUI.getSynchronizeManager().removeSynchronizeParticipantListener(this);
+ // Pin action is hooked up to listeners, must call dispose to un-register.
+ fPinAction.dispose();
+ // Remember the last active participant
if(activeParticipantRef != null) {
IDialogSettings section = getDialogSettings();
section.put(KEY_LAST_ACTIVE_PARTICIPANT, activeParticipantRef.getId());
}
fParticipantToPart = null;
- fPartToParticipant = null;
-
+ fPartToParticipant = null;
}
/* (non-Javadoc)
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PinParticipantAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PinParticipantAction.java
index 54926649e..bc77ad46d 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PinParticipantAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PinParticipantAction.java
@@ -76,4 +76,10 @@ public class PinParticipantAction extends Action implements IPropertyChangeListe
updateState();
}
}
+
+ public void dispose() {
+ if (participant != null) {
+ participant.removePropertyChangeListener(this);
+ }
+ }
}

Back to the top