Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlgoubet2019-02-11 09:03:29 -0500
committerlgoubet2019-02-11 09:03:29 -0500
commit8efb029b92e783cc925db3e41e4e6a68b1e8557c (patch)
tree4fd4e091105b74e43ef0889e7dfa5a9f7f305549
parentfc4183efc0c3b397ea9c7952587eca890123b874 (diff)
downloadorg.eclipse.emf.compare-8efb029b92e783cc925db3e41e4e6a68b1e8557c.tar.gz
org.eclipse.emf.compare-8efb029b92e783cc925db3e41e4e6a68b1e8557c.tar.xz
org.eclipse.emf.compare-8efb029b92e783cc925db3e41e4e6a68b1e8557c.zip
Remove accidental use of Guava
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeAction.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeAction.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeAction.java
index 8ef978db9..9bf5b7b36 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeAction.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeAction.java
@@ -33,7 +33,6 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
-import com.google.common.collect.Streams;
import java.util.Collection;
import java.util.Collections;
@@ -485,7 +484,7 @@ public class MergeAction extends BaseSelectionListenerAction {
if (mode == ACCEPT || mode == REJECT) {
redoDiffs(diffsToMerge, diffsToDiscard, ACCEPT, REJECT);
} else {
- List<Diff> diffsToBeCopiedLTR = Streams
+ List<Diff> diffsToBeCopiedLTR = Stream
.concat(diffsToMerge.stream().filter(fromSource(LEFT)),
diffsToDiscard.stream().filter(fromSource(RIGHT)))
.collect(Collectors.toList());

Back to the top