diff options
| author | Michael Valenta | 2006-01-21 22:17:01 +0000 |
|---|---|---|
| committer | Michael Valenta | 2006-01-21 22:17:01 +0000 |
| commit | d3bf56c14dce6cdf7541bb87fbb3e914a15902bc (patch) | |
| tree | 7b9123fdd865e7e79791ca7230a18971f5943641 /bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java | |
| parent | de9ff14d7c417e89d2d654f3fa1ea1403b2cc222 (diff) | |
| download | eclipse.platform.team-d3bf56c14dce6cdf7541bb87fbb3e914a15902bc.tar.gz eclipse.platform.team-d3bf56c14dce6cdf7541bb87fbb3e914a15902bc.tar.xz eclipse.platform.team-d3bf56c14dce6cdf7541bb87fbb3e914a15902bc.zip | |
Bug 119621 Edit session during merge (save lifecycle)
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java')
| -rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java | 7 |
1 files changed, 3 insertions, 4 deletions
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 a13d5921e..b1053379d 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 @@ -25,7 +25,6 @@ import org.eclipse.team.core.mapping.IResourceMappingScope; import org.eclipse.team.core.mapping.ISynchronizationContext; import org.eclipse.team.core.synchronize.SyncInfo; import org.eclipse.team.internal.ui.Utils; -import org.eclipse.team.ui.TeamUI; import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration; import org.eclipse.ui.IMemento; import org.eclipse.ui.navigator.ICommonContentProvider; @@ -167,8 +166,8 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr public void init(IExtensionStateModel aStateModel, IMemento aMemento) { stateModel = aStateModel; stateModel.addPropertyChangeListener(this); - scope = (IResourceMappingScope)aStateModel.getProperty(TeamUI.RESOURCE_MAPPING_SCOPE); - context = (ISynchronizationContext)aStateModel.getProperty(TeamUI.SYNCHRONIZATION_CONTEXT); + scope = (IResourceMappingScope)aStateModel.getProperty(ISynchronizationConstants.P_RESOURCE_MAPPING_SCOPE); + context = (ISynchronizationContext)aStateModel.getProperty(ISynchronizationConstants.P_SYNCHRONIZATION_CONTEXT); ITreeContentProvider provider = getDelegateContentProvider(); if (provider instanceof ICommonContentProvider) { ((ICommonContentProvider) provider).init(aStateModel, aMemento); @@ -245,7 +244,7 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr * @return the synchronization page configuration or <code>null</code> */ protected ISynchronizePageConfiguration getConfiguration() { - return (ISynchronizePageConfiguration)stateModel.getProperty(TeamUI.SYNCHRONIZATION_PAGE_CONFIGURATION); + return (ISynchronizePageConfiguration)stateModel.getProperty(ISynchronizationConstants.P_SYNCHRONIZATION_PAGE_CONFIGURATION); } /* (non-Javadoc) |