From c4757059ed4ff555de23c980bdb1e31f597f2c78 Mon Sep 17 00:00:00 2001 From: Mikaël Barbero Date: Sun, 13 Oct 2013 20:17:51 +0200 Subject: Fix bug about merge all. Replace an OR by an AND Change-Id: I10316aaf3d1d247bf1365b5070fee650e8b0300e --- .../structuremergeviewer/actions/MergeAllNonConflictingAction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/org.eclipse.emf.compare.ide.ui/src') diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeAllNonConflictingAction.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeAllNonConflictingAction.java index ff6c2eaba..cc347340b 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeAllNonConflictingAction.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeAllNonConflictingAction.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions; -import static com.google.common.base.Predicates.or; +import static com.google.common.base.Predicates.and; import static com.google.common.collect.Iterables.filter; import static com.google.common.collect.Lists.newArrayList; import static org.eclipse.emf.compare.utils.EMFComparePredicates.WITHOUT_CONFLICT; @@ -94,7 +94,7 @@ public class MergeAllNonConflictingAction extends MergeAction { */ @Override protected List getDifferencesToMerge() { - Iterable differences = filter(comparison.getDifferences(), or(WITHOUT_CONFLICT, + Iterable differences = filter(comparison.getDifferences(), and(WITHOUT_CONFLICT, hasState(DifferenceState.UNRESOLVED))); return newArrayList(differences); } -- cgit v1.2.3