From ebd44816d08e4ecec79e1d387ca295c224b1baf6 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Tue, 8 Apr 2014 18:24:24 +0400
Subject: [PATCH] Function object replaced by a normal function

---
 .../lang/resolve/java/JetFilesProvider.java   | 24 +++++--------------
 .../plugin/debugger/JetPositionManager.java   |  2 +-
 .../jet/plugin/util/DebuggerUtils.java        |  2 +-
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetFilesProvider.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetFilesProvider.java
index 3df8bda668e..5e5e1a68853 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetFilesProvider.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetFilesProvider.java
@@ -34,30 +34,18 @@ public abstract class JetFilesProvider {
         return ServiceManager.getService(project, JetFilesProvider.class);
     }
 
-    public final Function<JetFile, Collection<JetFile>> allPackageFiles() {
-        return new Function<JetFile, Collection<JetFile>>() {
+    public final Collection<JetFile> allPackageFiles(@NotNull JetFile file) {
+        final FqName name = file.getPackageFqName();
+        return Collections2.filter(sampleToAllFilesInModule().fun(file), new Predicate<PsiFile>() {
             @Override
-            public Collection<JetFile> fun(JetFile file) {
-                return Collections2.filter(sampleToAllFilesInModule().fun(file), new SameJetFilePredicate(file));
+            public boolean apply(PsiFile psiFile) {
+                return ((JetFile) psiFile).getPackageFqName().equals(name);
             }
-        };
+        });
     }
 
     public abstract Function<JetFile, Collection<JetFile>> sampleToAllFilesInModule();
     @NotNull
     public abstract Collection<JetFile> allInScope(@NotNull GlobalSearchScope scope);
     public abstract boolean isFileInScope(@NotNull JetFile file, @NotNull GlobalSearchScope scope);
-
-    public static class SameJetFilePredicate implements Predicate<PsiFile> {
-        private final FqName name;
-
-        public SameJetFilePredicate(JetFile file) {
-            this.name = file.getPackageFqName();
-        }
-
-        @Override
-        public boolean apply(PsiFile psiFile) {
-            return ((JetFile) psiFile).getPackageFqName().equals(name);
-        }
-    }
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java
index 398e33f3e8c..c63fcf735df 100644
--- a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java
+++ b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java
@@ -199,7 +199,7 @@ public class JetPositionManager implements PositionManager {
                     AnalyzeExhaust analyzeExhaust = AnalyzerFacadeWithCache.analyzeFileWithCache(file);
                     analyzeExhaust.throwIfError();
 
-                    Collection<JetFile> packageFiles = JetFilesProvider.getInstance(file.getProject()).allPackageFiles().fun(file);
+                    Collection<JetFile> packageFiles = JetFilesProvider.getInstance(file.getProject()).allPackageFiles(file);
 
                     DelegatingBindingTrace bindingTrace = new DelegatingBindingTrace(analyzeExhaust.getBindingContext(), "trace created in JetPositionManager");
                     JetTypeMapper typeMapper = new JetTypeMapper(bindingTrace, ClassBuilderMode.FULL);
diff --git a/idea/src/org/jetbrains/jet/plugin/util/DebuggerUtils.java b/idea/src/org/jetbrains/jet/plugin/util/DebuggerUtils.java
index aa1a783e7ea..e324d33f7fc 100644
--- a/idea/src/org/jetbrains/jet/plugin/util/DebuggerUtils.java
+++ b/idea/src/org/jetbrains/jet/plugin/util/DebuggerUtils.java
@@ -63,7 +63,7 @@ public class DebuggerUtils {
             return anyFile;
         }
 
-        Collection<JetFile> allPackageFiles = filesProvider.allPackageFiles().fun(anyFile);
+        Collection<JetFile> allPackageFiles = filesProvider.allPackageFiles(anyFile);
         JetFile file = PsiCodegenPredictor.getFileForPackagePartName(allPackageFiles, className);
         if (file != null) {
             return file;