diff options
| author | Mikaël Barbero | 2013-04-25 14:45:02 +0000 |
|---|---|---|
| committer | Mikaël Barbero | 2013-04-25 14:52:48 +0000 |
| commit | 24c6099a128f2123828c217081af075e9263c76f (patch) | |
| tree | c04cefdc24aaf4b5ccaee1eb36451e9c0376de36 | |
| parent | 241cde1e1f2b9f9685c12c198fa26682f8d5998a (diff) | |
| download | org.eclipse.emf.compare-24c6099a128f2123828c217081af075e9263c76f.tar.gz org.eclipse.emf.compare-24c6099a128f2123828c217081af075e9263c76f.tar.xz org.eclipse.emf.compare-24c6099a128f2123828c217081af075e9263c76f.zip | |
Remove comparison cache field
It's dangerous if it changes
2 files changed, 3 insertions, 11 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.java index 33f9838f0..7eed8eedf 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.java @@ -117,7 +117,7 @@ public class TreeContentMergeViewer extends EMFCompareContentMergeViewer { fSyncExpandedState = new AtomicBoolean(); buildControl(parent); - setContentProvider(new TreeContentMergeViewerContentProvider(config, getComparison())); + setContentProvider(new TreeContentMergeViewerContentProvider(config)); } /** diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewerContentProvider.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewerContentProvider.java index 34b89f681..6b27a9740 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewerContentProvider.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewerContentProvider.java @@ -45,9 +45,6 @@ public class TreeContentMergeViewerContentProvider implements IMergeViewerConten */ private final CompareConfiguration fCompareConfiguration; - /** The comparison currently being displayed. */ - private final Comparison fComparison; - /** * Creates a new {@link TreeContentMergeViewerContentProvider} and stored the given * {@link CompareConfiguration}. @@ -58,9 +55,8 @@ public class TreeContentMergeViewerContentProvider implements IMergeViewerConten * @param comparison * the comparison that is to be displayed by this viewer. */ - public TreeContentMergeViewerContentProvider(CompareConfiguration cc, Comparison comparison) { + public TreeContentMergeViewerContentProvider(CompareConfiguration cc) { this.fCompareConfiguration = cc; - this.fComparison = comparison; } /** @@ -253,10 +249,6 @@ public class TreeContentMergeViewerContentProvider implements IMergeViewerConten * @return the comparison. */ public Comparison getComparison() { - if (fComparison != null) { - return fComparison; - } else { - return (Comparison)fCompareConfiguration.getProperty(EMFCompareConstants.COMPARE_RESULT); - } + return (Comparison)fCompareConfiguration.getProperty(EMFCompareConstants.COMPARE_RESULT); } } |