[509791] Avoid use of Iterators.emptyIterator()

This method has been removed from guava 19, using JDK-1.7's
Collections.emptyIterator() prevents the incompatibility.

Bug: 509791
Also-By: Laurent Goubet <laurent.goubet@obeo.fr>
Change-Id: I6751d547dbb5347ec9b6aefb6ca482f2d42b1275

2 files changed, 6 insertions, 7 deletions

diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/IdentifierEObjectMatcherTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/IdentifierEObjectMatcherTest.java
index e62a86e34..59e494ed3 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/IdentifierEObjectMatcherTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/IdentifierEObjectMatcherTest.java
@@ -10,10 +10,10 @@
  *******************************************************************************/
 package org.eclipse.emf.compare.tests.match;
 
+import static java.util.Collections.emptyIterator;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
 
 import java.io.IOException;
@@ -66,7 +66,7 @@ public class IdentifierEObjectMatcherTest {
 
 		Iterator<? extends EObject> leftEObjects = nodes.iterator();
 		Iterator<? extends EObject> rightEObjects = nodes.iterator();
-		Iterator<? extends EObject> originEObjects = Iterators.emptyIterator();
+		Iterator<? extends EObject> originEObjects = emptyIterator();
 		List<EObject> leftEObjectsNoID = Lists.newArrayList();
 		List<EObject> rightEObjectsNoID = Lists.newArrayList();
 		List<EObject> originEObjectsNoID = Lists.newArrayList();
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/monitor/MonitorCancelTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/monitor/MonitorCancelTest.java
index 063433443..c700146a7 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/monitor/MonitorCancelTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/monitor/MonitorCancelTest.java
@@ -10,10 +10,9 @@
  *******************************************************************************/
 package org.eclipse.emf.compare.tests.monitor;
 
+import static java.util.Collections.emptyIterator;
 import static org.junit.Assert.assertEquals;
 
-import com.google.common.collect.Iterators;
-
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -159,15 +158,15 @@ public class MonitorCancelTest {
 		return new AbstractComparisonScope(null, null, null) {
 
 			public Iterator<? extends Resource> getCoveredResources(ResourceSet resourceSet) {
-				return Iterators.emptyIterator();
+				return emptyIterator();
 			}
 
 			public Iterator<? extends EObject> getCoveredEObjects(Resource resource) {
-				return Iterators.emptyIterator();
+				return emptyIterator();
 			}
 
 			public Iterator<? extends EObject> getChildren(EObject eObject) {
-				return Iterators.emptyIterator();
+				return emptyIterator();
 			}
 		};
 	}