From b594afe181d0551488a9eed17d9778d70ebbe6de Mon Sep 17 00:00:00 2001 From: Arthur Daussy Date: Tue, 27 May 2014 15:19:13 +0200 Subject: [PATCH] [432033] Do not reset Group and filter after saving. Prevents reseting the active group and the selected filters after saving. Bug: 432033 Change-Id: I88f50ed373d7e232ab3a2ce575dc3a03ad49edf3 Signed-off-by: Arthur Daussy --- .../ide/ui/internal/configuration/EMFCompareConfiguration.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 ec03c4de4..18ed414ba 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 @@ -189,8 +189,10 @@ public class EMFCompareConfiguration extends ForwardingCompareConfiguration impl setProperty(COMPARE_RESULT, newComparison); setProperty(COMPARISON_SCOPE, newComparisonScope); - initStructureMergeViewerGroupProvider(newComparison, newComparisonScope); - initStructureMergeViewerFilter(newComparison, newComparisonScope); + if (oldComparison == null && oldComparisonScope == null) { + initStructureMergeViewerGroupProvider(newComparison, newComparisonScope); + initStructureMergeViewerFilter(newComparison, newComparisonScope); + } getEventBus().post( new ComparisonAndScopeChange(oldComparison, newComparison, oldComparisonScope, -- 2.11.4.GIT