Fixed compile error in ModelMatchEngine due to API change in Google (ce2cd819) · Commits · Eclipse Projects / Sphinx / org.eclipse.sphinx

plugins/org.eclipse.sphinx.emf.compare/src/org/eclipse/sphinx/emf/compare/match/ModelMatchEngine.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		*/
		package org.eclipse.sphinx.emf.compare.match;

		import java.util.Collections;
		import java.util.Iterator;

		import org.eclipse.emf.common.util.Monitor;
		@@ -31,8 +32,6 @@ import org.eclipse.emf.compare.scope.IComparisonScope;
		import org.eclipse.emf.compare.utils.UseIdentifiers;
		import org.eclipse.emf.ecore.EObject;

		import com.google.common.collect.Iterators;

		public class ModelMatchEngine extends DefaultMatchEngine {

		/**
		@@ -88,7 +87,7 @@ public class ModelMatchEngine extends DefaultMatchEngine {
		if (origin != null) {
		originEObjects = scope.getChildren(origin);
		} else {
		originEObjects = Iterators.emptyIterator();
		originEObjects = Collections.emptyIterator();
		}

		getEObjectMatcher().createMatches(comparison, leftEObjects, rightEObjects, originEObjects, monitor);