Compatibility with guava 21

- Objects.ToStringHelper has been moved to MoreObjects. We now
reimplement the functionality in order to be compatible with both guava
15 and guava 21
- com.google.common.base.Predicate now extends
java.util.Function.Predicate. As a result static imports of "and" and
"or" from Predicates are shadowed by java.util.function.Predicate
variants, preventing the statics from being called unless explicitely
qualified.

Change-Id: Ie33d5eedd9e1a6dbea8f4af2db9aa36ec8567cf5

2 files changed, 6 insertions, 6 deletions

diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/MergeViewerItem.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/MergeViewerItem.java
index a65f13076..485e75940 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/MergeViewerItem.java
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/MergeViewerItem.java
@@ -23,7 +23,6 @@ import static org.eclipse.emf.compare.utils.EMFComparePredicates.fromSide;
 import static org.eclipse.emf.compare.utils.EMFComparePredicates.onFeature;
 
 import com.google.common.base.Function;
-import com.google.common.base.Objects;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableList;
@@ -60,6 +59,7 @@ import org.eclipse.emf.compare.rcp.ui.internal.util.ResourceUIUtil;
 import org.eclipse.emf.compare.rcp.ui.mergeviewer.IMergeViewer.MergeViewerSide;
 import org.eclipse.emf.compare.rcp.ui.mergeviewer.item.IMergeViewerItem;
 import org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGroupProvider;
+import org.eclipse.emf.compare.utils.Objects;
 import org.eclipse.emf.compare.utils.ReferenceUtil;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/CascadingDifferencesFilter.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/CascadingDifferencesFilter.java
index ce211081a..ea7140d79 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/CascadingDifferencesFilter.java
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/CascadingDifferencesFilter.java
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.filters.impl;
 
-import static com.google.common.base.Predicates.and;
-import static com.google.common.base.Predicates.or;
 import static org.eclipse.emf.compare.ConflictKind.REAL;
 import static org.eclipse.emf.compare.DifferenceKind.ADD;
 import static org.eclipse.emf.compare.DifferenceKind.DELETE;
@@ -22,6 +20,7 @@ import static org.eclipse.emf.compare.utils.EMFComparePredicates.hasNoDirectOrIn
 import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind;
 
 import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.UnmodifiableIterator;
@@ -73,9 +72,10 @@ public class CascadingDifferencesFilter extends AbstractDifferenceFilter {
 							Match parentMatch = (Match)parent.getData();
 							ret = isInsideAddOrDeleteTreeNode(diff, parent);
 							if (!ret && isAddOrDeleteMatch(parentMatch, diff.getSource())) {
-								ret = !and(
-										or(CONTAINMENT_REFERENCE_CHANGE, REFINED_BY_CONTAINMENT_REF_CHANGE),
-										ofKind(ADD, DELETE)).apply(diff);
+								ret = !Predicates
+										.and(Predicates.or(CONTAINMENT_REFERENCE_CHANGE,
+												REFINED_BY_CONTAINMENT_REF_CHANGE), ofKind(ADD, DELETE))
+										.apply(diff);
 							}
 						}
 					}