Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Delaigue2017-01-20 11:06:35 -0500
committerLaurent Delaigue2017-02-01 02:09:54 -0500
commita55783195ce2bb283dd8cdc332f995d3ae846a2b (patch)
tree34577a6fb8aca03d8bac35b4546203f46c1e1d7f /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/monitor
parent3ac8e983bd1c153dc847690d71a244a2af163445 (diff)
downloadorg.eclipse.emf.compare-a55783195ce2bb283dd8cdc332f995d3ae846a2b.tar.gz
org.eclipse.emf.compare-a55783195ce2bb283dd8cdc332f995d3ae846a2b.tar.xz
org.eclipse.emf.compare-a55783195ce2bb283dd8cdc332f995d3ae846a2b.zip
[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
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/monitor')
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/monitor/MonitorCancelTest.java9
1 files changed, 4 insertions, 5 deletions
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();
}
};
}

Back to the top