Simplify code in ResourceDependencyLocalResolver

Change-Id: I54352a2fc74bdd06383fa124b1fd963b813b3f7e
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>

1 files changed, 6 insertions, 10 deletions

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceDependencyLocalResolver.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceDependencyLocalResolver.java
index 3e456caf0..f5aff013d 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceDependencyLocalResolver.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceDependencyLocalResolver.java
@@ -21,7 +21,6 @@ import com.google.common.collect.Sets;
 import com.google.common.eventbus.EventBus;
 
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -150,16 +149,13 @@ public class ResourceDependencyLocalResolver implements IResourceDependencyLocal
 		demandResolveAll(recompute, diagnostic, resourceSet, tspm);
 
 		// Re-connect changed resources parents' with their parents
-		demandResolveAll(Iterables.concat(Iterables.transform(Iterables.filter(parentToGrandParents.keySet(),
-				new Predicate<URI>() {
-					public boolean apply(URI uri) {
-						return dependencyGraph.contains(uri);
-					}
-				}), new Function<URI, Collection<URI>>() {
-			public Collection<URI> apply(URI input) {
-				return parentToGrandParents.get(input);
+		Set<URI> toResolve = new LinkedHashSet<URI>();
+		for (URI parentURI : parentToGrandParents.keySet()) {
+			if (dependencyGraph.contains(parentURI)) {
+				toResolve.addAll(parentToGrandParents.get(parentURI));
 			}
-		})), diagnostic, resourceSet, tspm);
+		}
+		demandResolveAll(toResolve, diagnostic, resourceSet, tspm);
 	}
 
 	public void demandResolve(final SynchronizedResourceSet resourceSet, final URI uri,