diff options
author | Michael Valenta | 2006-01-21 02:12:48 +0000 |
---|---|---|
committer | Michael Valenta | 2006-01-21 02:12:48 +0000 |
commit | 69d0650e33d39387042b3cff53e957999a1a11b4 (patch) | |
tree | da92cdbcfe02f57fa3aa5b688f37cc31309a4fd1 /bundles/org.eclipse.team.ui | |
parent | 0705fed9ed1577694387bc39d8f6fb9df74dc9cc (diff) | |
download | eclipse.platform.team-69d0650e33d39387042b3cff53e957999a1a11b4.tar.gz eclipse.platform.team-69d0650e33d39387042b3cff53e957999a1a11b4.tar.xz eclipse.platform.team-69d0650e33d39387042b3cff53e957999a1a11b4.zip |
Tidied up content provider API
Diffstat (limited to 'bundles/org.eclipse.team.ui')
2 files changed, 4 insertions, 16 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceTeamAwareContentProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceTeamAwareContentProvider.java index 62e2d978e..454784690 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceTeamAwareContentProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceTeamAwareContentProvider.java @@ -22,9 +22,7 @@ import org.eclipse.team.core.diff.IDiffTree; import org.eclipse.team.core.mapping.IResourceMappingScope; import org.eclipse.team.core.mapping.ISynchronizationContext; import org.eclipse.team.ui.mapping.SynchronizationContentProvider; -import org.eclipse.ui.IMemento; import org.eclipse.ui.model.WorkbenchContentProvider; -import org.eclipse.ui.navigator.IExtensionStateModel; /** * This content provider displays the mappings as a flat list @@ -92,24 +90,10 @@ public class ResourceTeamAwareContentProvider extends SynchronizationContentProv } /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.mapping.AbstractTeamAwareContentProvider#init(org.eclipse.ui.navigator.IExtensionStateModel, org.eclipse.ui.IMemento) - */ - public void init(IExtensionStateModel aStateModel, IMemento aMemento) { - super.init(aStateModel, aMemento); - // TODO: must explicilty register for sync change events (perhaps this should be a flag of some sort) - org.eclipse.team.core.mapping.ISynchronizationContext context = getContext(); - if (context != null) - context.getDiffTree().addDiffChangeListener(this); - } - - /* (non-Javadoc) * @see org.eclipse.team.internal.ui.mapping.AbstractTeamAwareContentProvider#dispose() */ public void dispose() { provider.dispose(); - ISynchronizationContext context = getContext(); - if (context != null) - context.getDiffTree().removeDiffChangeListener(this); super.dispose(); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java index e6ba101f8..a13d5921e 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java @@ -149,6 +149,8 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr */ public void dispose() { stateModel.removePropertyChangeListener(this); + if (context != null) + context.getDiffTree().removeDiffChangeListener(this); } /* (non-Javadoc) @@ -171,6 +173,8 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr if (provider instanceof ICommonContentProvider) { ((ICommonContentProvider) provider).init(aStateModel, aMemento); } + if (context != null) + context.getDiffTree().addDiffChangeListener(this); } /* (non-Javadoc) |