From 033b8289d7ea1ab4a718347a8ef3849a05c28b71 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 21 Feb 2014 22:09:44 +0400 Subject: [PATCH] Get JavaFileManager as service. Fix tests after update to IDEA 134.1160 EAP. --- .../lang/resolve/java/JavaPsiFacadeKotlinHacks.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPsiFacadeKotlinHacks.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPsiFacadeKotlinHacks.java index 78cb3cca134..b4f814525b9 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPsiFacadeKotlinHacks.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPsiFacadeKotlinHacks.java @@ -18,20 +18,17 @@ package org.jetbrains.jet.lang.resolve.java; import com.google.common.collect.Lists; import com.intellij.core.CoreJavaFileManager; +import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.progress.ProgressIndicatorProvider; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.impl.JavaPsiFacadeImpl; import com.intellij.psi.impl.file.impl.JavaFileManager; import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.util.containers.ContainerUtil; -import com.intellij.util.containers.HashMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; /** * TODO Temporary class until {@link JavaPsiFacadeImpl} hacked. @@ -55,12 +52,12 @@ public class JavaPsiFacadeKotlinHacks { } @NotNull - private JavaFileManager findJavaFileManager(@NotNull Project project) { - JavaFileManager javaFileManager = project.getComponent(JavaFileManager.class); + private static JavaFileManager findJavaFileManager(@NotNull Project project) { + JavaFileManager javaFileManager = ServiceManager.getService(project, JavaFileManager.class); if (javaFileManager != null) { return javaFileManager; } - javaFileManager = project.getComponent(CoreJavaFileManager.class); + javaFileManager = ServiceManager.getService(project, CoreJavaFileManager.class); if (javaFileManager != null) { // TODO: why it is not found by JavaFileManager? return javaFileManager; @@ -81,7 +78,7 @@ public class JavaPsiFacadeKotlinHacks { return psiPackage; } } - return psiPackage; + return null; } public PsiClass findClass(@NotNull String qualifiedName, @NotNull GlobalSearchScope scope) {