diff options
author | Michael Valenta | 2005-11-16 21:22:22 +0000 |
---|---|---|
committer | Michael Valenta | 2005-11-16 21:22:22 +0000 |
commit | 390723eb1d9a33ac8d7f9665ac3063fad4988b18 (patch) | |
tree | aa9faf4b0e71a290e7d74c9cb41bed192ab05a07 | |
parent | 85fe2da42d829a07a7d51eee52359985a7b97e78 (diff) | |
download | eclipse.platform.team-390723eb1d9a33ac8d7f9665ac3063fad4988b18.tar.gz eclipse.platform.team-390723eb1d9a33ac8d7f9665ac3063fad4988b18.tar.xz eclipse.platform.team-390723eb1d9a33ac8d7f9665ac3063fad4988b18.zip |
Ask model for viewers first
-rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelParticipantPageSavablePart.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelParticipantPageSavablePart.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelParticipantPageSavablePart.java index 6b3eff115..77ec632a7 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelParticipantPageSavablePart.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelParticipantPageSavablePart.java @@ -55,19 +55,19 @@ public class ModelParticipantPageSavablePart extends * @see org.eclipse.team.ui.synchronize.ParticipantPageSaveablePart#findStructureViewer(org.eclipse.swt.widgets.Composite, org.eclipse.jface.viewers.Viewer, org.eclipse.compare.structuremergeviewer.ICompareInput) */ protected Viewer findStructureViewer(Composite parent, Viewer oldViewer, ICompareInput input) { - Viewer viewer = super.findStructureViewer(parent, oldViewer, input); + Viewer viewer = ((ModelSynchronizePage)getPageConfiguration().getPage()).findStructureViewer(parent, oldViewer, input); if (viewer != null) return viewer; - return ((ModelSynchronizePage)getPageConfiguration().getPage()).findStructureViewer(parent, oldViewer, input); + return super.findStructureViewer(parent, oldViewer, input); } /* (non-Javadoc) * @see org.eclipse.team.ui.synchronize.ParticipantPageSaveablePart#findContentViewer(org.eclipse.swt.widgets.Composite, org.eclipse.jface.viewers.Viewer, org.eclipse.compare.structuremergeviewer.ICompareInput) */ protected Viewer findContentViewer(Composite parent, Viewer oldViewer, ICompareInput input) { - Viewer viewer = super.findContentViewer(parent, oldViewer, input); + Viewer viewer = ((ModelSynchronizePage)getPageConfiguration().getPage()).findContentViewer(parent, oldViewer, input); if (viewer != null) return viewer; - return ((ModelSynchronizePage)getPageConfiguration().getPage()).findContentViewer(parent, oldViewer, input); + return super.findContentViewer(parent, oldViewer, input); } } |