Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikaël Barbero2013-10-13 14:17:51 -0400
committerMikaël Barbero2013-10-18 15:29:43 -0400
commitc4757059ed4ff555de23c980bdb1e31f597f2c78 (patch)
treed90f73da0034e019ee9b283e1753411cb94e3762 /plugins/org.eclipse.emf.compare.ide.ui/src
parent3294d317fda1947da7d39a118617544d04227d31 (diff)
downloadorg.eclipse.emf.compare-c4757059ed4ff555de23c980bdb1e31f597f2c78.tar.gz
org.eclipse.emf.compare-c4757059ed4ff555de23c980bdb1e31f597f2c78.tar.xz
org.eclipse.emf.compare-c4757059ed4ff555de23c980bdb1e31f597f2c78.zip
Fix bug about merge all. Replace an OR by an AND
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/structuremergeviewer/actions/MergeAllNonConflictingAction.java4
1 files changed, 2 insertions, 2 deletions
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<Diff> getDifferencesToMerge() {
- Iterable<Diff> differences = filter(comparison.getDifferences(), or(WITHOUT_CONFLICT,
+ Iterable<Diff> differences = filter(comparison.getDifferences(), and(WITHOUT_CONFLICT,
hasState(DifferenceState.UNRESOLVED)));
return newArrayList(differences);
}

Back to the top