From bbfcc4bee048e41fe62e9ede98d406f14bfd8bac Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Fri, 9 Sep 2016 16:46:50 +0300
Subject: [PATCH] simple use of StreamEx

---
 .../com/intellij/debugger/impl/SourceCodeChecker.java  | 10 +++++-----
 .../com/intellij/debugger/ui/HotSwapProgressImpl.java  |  4 ++--
 .../debugger/ui/breakpoints/ClassFiltersField.java     |  8 +++-----
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/SourceCodeChecker.java b/java/debugger/impl/src/com/intellij/debugger/impl/SourceCodeChecker.java
index c9eac3298232..17bc80fd50bf 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/SourceCodeChecker.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/SourceCodeChecker.java
@@ -48,11 +48,11 @@ import com.intellij.util.ThreeState;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.xdebugger.impl.XDebugSessionImpl;
 import com.sun.jdi.*;
+import one.util.streamex.IntStreamEx;
+import one.util.streamex.StreamEx;
 import org.jetbrains.annotations.TestOnly;
 
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 
 /**
  * @author egor
@@ -137,7 +137,7 @@ public class SourceCodeChecker {
           res = getLinesStream(locations, psiFile).allMatch(line -> startLine <= line && line <= endLine);
           if (!res) {
             LOG.debug("Source check failed: Method " + method.name() + ", source: " + ((NavigationItem)psiMethod).getName() +
-                      "\nLines: " + getLinesStream(locations, psiFile).mapToObj(Integer::toString).collect(Collectors.joining(", ")) +
+                      "\nLines: " + getLinesStream(locations, psiFile).joining(", ") +
                       "\nExpected range: " + startLine + "-" + endLine
             );
           }
@@ -164,8 +164,8 @@ public class SourceCodeChecker {
     return ThreeState.YES;
   }
 
-  private static IntStream getLinesStream(List<Location> locations, PsiFile psiFile) {
-    IntStream stream = locations.stream().mapToInt(Location::lineNumber);
+  private static IntStreamEx getLinesStream(List<Location> locations, PsiFile psiFile) {
+    IntStreamEx stream = StreamEx.of(locations).mapToInt(Location::lineNumber);
     if (psiFile instanceof PsiCompiledFile) {
       stream = stream.map(line -> DebuggerUtilsEx.bytecodeToSourceLine(psiFile, line));
     }
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/HotSwapProgressImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/HotSwapProgressImpl.java
index e412e64b6e39..44d22be63b77 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/HotSwapProgressImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/HotSwapProgressImpl.java
@@ -41,12 +41,12 @@ import com.intellij.util.ui.update.Update;
 import com.intellij.xdebugger.XDebugSession;
 import com.intellij.xdebugger.impl.XDebugSessionImpl;
 import gnu.trove.TIntObjectHashMap;
+import one.util.streamex.StreamEx;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.event.HyperlinkEvent;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class HotSwapProgressImpl extends HotSwapProgress{
   static final NotificationGroup NOTIFICATION_GROUP = NotificationGroup.toolWindowGroup("HotSwap", ToolWindowId.DEBUG);
@@ -131,7 +131,7 @@ public class HotSwapProgressImpl extends HotSwapProgress{
   }
 
   private String buildMessage(List<String> messages, boolean withRestart) {
-    StringBuilder res = new StringBuilder(messages.stream().map(m -> StringUtil.trimEnd(m, ';')).collect(Collectors.joining("\n")));
+    StringBuilder res = new StringBuilder(StreamEx.of(messages).map(m -> StringUtil.trimEnd(m, ';')).joining("\n"));
     if (mySession != null) {
       res.append("\n").append(DebuggerBundle.message("status.hot.swap.completed.stop"));
       if (withRestart) {
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ClassFiltersField.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ClassFiltersField.java
index 1075ac075341..b646bb2584f3 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ClassFiltersField.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ClassFiltersField.java
@@ -19,10 +19,10 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.ui.classFilter.ClassFilter;
+import one.util.streamex.StreamEx;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.stream.Collectors;
 
 /**
  * @author egor
@@ -94,10 +94,8 @@ public class ClassFiltersField extends TextFieldWithBrowseButton {
   }
 
   private void updateEditor() {
-    String enabledStr =
-      Arrays.stream(myClassFilters).filter(ClassFilter::isEnabled).map(ClassFilter::getPattern).collect(Collectors.joining(" "));
-    String disabledStr =
-      Arrays.stream(myClassExclusionFilters).filter(ClassFilter::isEnabled).map(f -> "-" + f.getPattern()).collect(Collectors.joining(" "));
+    String enabledStr = StreamEx.of(myClassFilters).filter(ClassFilter::isEnabled).map(ClassFilter::getPattern).joining(" ");
+    String disabledStr = StreamEx.of(myClassExclusionFilters).filter(ClassFilter::isEnabled).map(f -> "-" + f.getPattern()).joining(" ");
     if (!enabledStr.isEmpty() && !disabledStr.isEmpty()) {
       enabledStr += " ";
     }