From e41f66ed49761c6689ee7ba3f2ad055410a2bec8 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 25 Jun 2012 16:21:23 +0400 Subject: [PATCH] Converted method hasAnyAnnotationsRoot() to boolean since it can return only YES and NO. --- .../codeInsight/ExternalAnnotationsManagerImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java b/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java index 593d6be4f11e..bae6e15e502e 100644 --- a/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java +++ b/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java @@ -102,7 +102,7 @@ public class ExternalAnnotationsManagerImpl extends ExternalAnnotationsManager { }); } - private ThreeState hasAnyAnnotationsRoots() { + private boolean hasAnyAnnotationsRoots() { if (myHasAnyAnnotationsRoots == ThreeState.UNSURE) { final Module[] modules = ModuleManager.getInstance(myPsiManager.getProject()).getModules(); for (Module module : modules) { @@ -110,13 +110,13 @@ public class ExternalAnnotationsManagerImpl extends ExternalAnnotationsManager { final String[] urls = AnnotationOrderRootType.getUrls(entry); if (urls.length > 0) { myHasAnyAnnotationsRoots = ThreeState.YES; - return ThreeState.YES; + return true; } } } myHasAnyAnnotationsRoots = ThreeState.NO; } - return myHasAnyAnnotationsRoots; + return myHasAnyAnnotationsRoots == ThreeState.YES; } @Override @@ -135,7 +135,7 @@ public class ExternalAnnotationsManagerImpl extends ExternalAnnotationsManager { private final Map> cache = new ConcurrentWeakHashMap>(); @NotNull private Map collectExternalAnnotations(@NotNull final PsiModifierListOwner listOwner) { - if (hasAnyAnnotationsRoots() == ThreeState.NO) return Collections.emptyMap(); + if (!hasAnyAnnotationsRoots()) return Collections.emptyMap(); Map map = cache.get(listOwner); if (map == null) {