From 043f21193d5f2443ddbd10163e80e229b832f993 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 17 Oct 2016 19:11:10 +0200
Subject: [PATCH] Cleanup (warning)

---
 .../configurations/JavaParameters.java          | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/java/execution/openapi/src/com/intellij/execution/configurations/JavaParameters.java b/java/execution/openapi/src/com/intellij/execution/configurations/JavaParameters.java
index 6cf8a6e40c9b..f1dcd32a378a 100644
--- a/java/execution/openapi/src/com/intellij/execution/configurations/JavaParameters.java
+++ b/java/execution/openapi/src/com/intellij/execution/configurations/JavaParameters.java
@@ -25,7 +25,6 @@ import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.roots.*;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.encoding.EncodingProjectManager;
-import com.intellij.util.NotNullFunction;
 import com.intellij.util.PathsList;
 import com.intellij.util.text.VersionComparatorUtil;
 import org.intellij.lang.annotations.MagicConstant;
@@ -94,16 +93,6 @@ public class JavaParameters extends SimpleJavaParameters {
     }
   }
 
-  @Nullable
-  private static NotNullFunction<OrderEntry, VirtualFile[]> computeRootProvider(@MagicConstant(valuesFromClass = JavaParameters.class) int classPathType, final Sdk jdk) {
-    return (classPathType & JDK_ONLY) == 0 ? null : (NotNullFunction<OrderEntry, VirtualFile[]>)orderEntry -> {
-        if (orderEntry instanceof JdkOrderEntry) {
-          return jdk.getRootProvider().getFiles(OrderRootType.CLASSES);
-        }
-        return orderEntry.getFiles(OrderRootType.CLASSES);
-      };
-  }
-
   public void setDefaultCharset(final Project project) {
     Charset encoding = EncodingProjectManager.getInstance(project).getDefaultCharset();
     setCharset(encoding);
@@ -189,9 +178,9 @@ public class JavaParameters extends SimpleJavaParameters {
       enumerator = enumerator.productionOnly();
     }
     OrderRootsEnumerator rootsEnumerator = enumerator.classes();
-    final NotNullFunction<OrderEntry, VirtualFile[]> provider = computeRootProvider(classPathType, jdk);
-    if (provider != null) {
-      rootsEnumerator = rootsEnumerator.usingCustomRootProvider(provider);
+    if ((classPathType & JDK_ONLY) != 0) {
+      rootsEnumerator = rootsEnumerator.usingCustomRootProvider(
+        e -> e instanceof JdkOrderEntry ? jdk.getRootProvider().getFiles(OrderRootType.CLASSES) : e.getFiles(OrderRootType.CLASSES));
     }
     return rootsEnumerator;
   }