Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Richard2013-11-05 11:11:24 -0500
committerAxel Richard2013-11-12 05:42:01 -0500
commitc999d66096b7d4915452365fef6cff349da8ba77 (patch)
tree011e74707f41c60412f89208286b24e9a5e953c7 /plugins/org.eclipse.emf.compare.ide.ui/src
parent556a751410c03d42b8f8b9ed17d80fe85e012d0d (diff)
downloadorg.eclipse.emf.compare-c999d66096b7d4915452365fef6cff349da8ba77.tar.gz
org.eclipse.emf.compare-c999d66096b7d4915452365fef6cff349da8ba77.tar.xz
org.eclipse.emf.compare-c999d66096b7d4915452365fef6cff349da8ba77.zip
[421083] Fix Difference Group providers are shared between comparisons.
The DifferenceGroupProviderRegistry now registers IDifferenceGroupProvider.Descriptors instead of IDifferenceGroupProviders Bug: 421083 Change-Id: Ica04105c76de14d7e2b47c2d586c057fb1431059
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui/src')
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/configuration/EMFCompareConfiguration.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/configuration/EMFCompareConfiguration.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/configuration/EMFCompareConfiguration.java
index 57a350931..b65ed3350 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/configuration/EMFCompareConfiguration.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/configuration/EMFCompareConfiguration.java
@@ -198,7 +198,8 @@ public class EMFCompareConfiguration extends ForwardingCompareConfiguration impl
protected void initStructureMergeViewerGroupProvider(Comparison comparison,
IComparisonScope comparisonScope) {
EMFCompareRCPUIPlugin plugin = EMFCompareRCPUIPlugin.getDefault();
- IDifferenceGroupProvider.Registry groupProviderRegistry = plugin.getDifferenceGroupProviderRegistry();
+ IDifferenceGroupProvider.Descriptor.Registry groupProviderRegistry = plugin
+ .getDifferenceGroupProviderRegistry();
getStructureMergeViewerGrouper().setProvider(
groupProviderRegistry.getDefaultGroupProviders(comparisonScope, comparison));
}

Back to the top