From eb20fb8b39625034b65d4d538b862dcdc3014f0f Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 15 Feb 2013 21:03:49 +0400 Subject: [PATCH] Removed redundant parameter. --- .../plugin/caches/resolve/IDELightClassGenerationSupport.java | 2 +- .../jetbrains/jet/plugin/caches/resolve/KotlinCacheManager.java | 2 +- .../ktSignature/KotlinSignatureInJavaMarkerProvider.java | 2 +- .../org/jetbrains/jet/plugin/quickfix/FinalSupertypeFix.java | 2 +- .../jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java | 2 +- .../quickfix/RenameParameterToMatchOverriddenMethodFix.java | 2 +- .../jet/plugin/search/KotlinAnnotatedElementsSearcher.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java b/idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java index 3fd6b5b0f65..2bb464a12e5 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java +++ b/idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java @@ -54,7 +54,7 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport @NotNull @Override public LightClassConstructionContext analyzeRelevantCode(@NotNull Collection files) { - KotlinDeclarationsCache cache = KotlinCacheManager.getInstance(project).getDeclarationsFromProject(project); + KotlinDeclarationsCache cache = KotlinCacheManager.getInstance(project).getDeclarationsFromProject(); return new LightClassConstructionContext(cache.getBindingContext(), null); } diff --git a/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheManager.java b/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheManager.java index 93c9b7222fb..8df4b1b92c7 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheManager.java +++ b/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheManager.java @@ -53,7 +53,7 @@ public class KotlinCacheManager { } @NotNull - public KotlinDeclarationsCache getDeclarationsFromProject(@NotNull Project project) { + public KotlinDeclarationsCache getDeclarationsFromProject() { // To prevent dead locks, the lock below must be obtained only inside a read action ApplicationManager.getApplication().assertReadAccessAllowed(); synchronized (declarationAnalysisLock) { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java index c3c6a8c86e5..1a3faa96aaf 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java @@ -87,7 +87,7 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider { return; } - KotlinDeclarationsCache declarationsCache = KotlinCacheManager.getInstance(project).getDeclarationsFromProject(project); + KotlinDeclarationsCache declarationsCache = KotlinCacheManager.getInstance(project).getDeclarationsFromProject(); BindingContext bindingContext = declarationsCache.getBindingContext(); DelegatingBindingTrace bindingTrace = new DelegatingBindingTrace(bindingContext, "wrapped context of declarations cache"); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/FinalSupertypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/FinalSupertypeFix.java index 9ebbbe9122a..967bc2df356 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/FinalSupertypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/FinalSupertypeFix.java @@ -53,7 +53,7 @@ public class FinalSupertypeFix extends JetIntentionAction { return false; } - BindingContext context = KotlinCacheManager.getInstance(project).getDeclarationsFromProject(project).getBindingContext(); + BindingContext context = KotlinCacheManager.getInstance(project).getDeclarationsFromProject().getBindingContext(); ClassDescriptor childClassDescriptor = context.get(BindingContext.CLASS, childClass); if (childClassDescriptor == null) { return false; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java index 3abd59b6752..9c5e74debfe 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java @@ -53,7 +53,7 @@ public class MakeClassAnAnnotationClassFix extends JetIntentionAction