From 929d06dddb6fd725df0f65e0d2802a970638bc1c Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 4 Jul 2017 17:36:50 +0200 Subject: [PATCH] Cleanup (API) --- .../intellij/psi/impl/file/impl/JavaFileManager.java | 10 +++------- .../psi/impl/source/PsiJavaModuleReference.java | 2 +- .../java/codeInsight/daemon/ModuleRenameTest.kt | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/file/impl/JavaFileManager.java b/java/java-psi-impl/src/com/intellij/psi/impl/file/impl/JavaFileManager.java index 9af3207fe0f1..c7dc0e707d4c 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/file/impl/JavaFileManager.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/file/impl/JavaFileManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,12 +30,8 @@ import java.util.Collection; * @author max */ public interface JavaFileManager { - class SERVICE { - private SERVICE() { } - - public static JavaFileManager getInstance(@NotNull Project project) { - return ServiceManager.getService(project, JavaFileManager.class); - } + static JavaFileManager getInstance(@NotNull Project project) { + return ServiceManager.getService(project, JavaFileManager.class); } @Nullable diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaModuleReference.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaModuleReference.java index 6a9d9648f83e..3d8ea7580851 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaModuleReference.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaModuleReference.java @@ -98,7 +98,7 @@ public class PsiJavaModuleReference extends PsiReferenceBase.Poly findModules(PsiFile file, String moduleName, boolean incompleteCode) { Project project = file.getProject(); GlobalSearchScope scope = incompleteCode ? GlobalSearchScope.allScope(project) : file.getResolveScope(); - return JavaFileManager.SERVICE.getInstance(project).findModules(moduleName, scope); + return JavaFileManager.getInstance(project).findModules(moduleName, scope); } } diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/ModuleRenameTest.kt b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/ModuleRenameTest.kt index 8f1d0ad7bfb3..f3166f8489ad 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/ModuleRenameTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/ModuleRenameTest.kt @@ -29,7 +29,7 @@ class ModuleRenameTest : LightJava9ModulesCodeInsightFixtureTestCase() { fun testRename() { myFixture.configureByText("module-info.java", "module M { requires M2; }") - val module = JavaFileManager.SERVICE.getInstance(project).findModules("M2", GlobalSearchScope.allScope(project)).first() + val module = JavaFileManager.getInstance(project).findModules("M2", GlobalSearchScope.allScope(project)).first() RenameProcessor(project, module, "M2.bis", false, false).run() myFixture.checkResult("module M { requires M2.bis; }") }