From 793fd6b9fbbf7e5faf06f06d91192f8ffd309e34 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 30 Jun 2016 14:47:28 +0300 Subject: [PATCH] cleanup --- .../visibility/AccessCanBeTightenedInspection.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/AccessCanBeTightenedInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/AccessCanBeTightenedInspection.java index 86a8548b59a0..4a5ea2406f70 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/AccessCanBeTightenedInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/AccessCanBeTightenedInspection.java @@ -87,7 +87,6 @@ class AccessCanBeTightenedInspection extends BaseJavaBatchLocalInspectionTool { UnusedDeclarationInspectionBase tool = (UnusedDeclarationInspectionBase)profile.getUnwrappedTool(UnusedDeclarationInspectionBase.SHORT_NAME, holder.getFile()); myDeadCodeInspection = tool == null ? new UnusedDeclarationInspectionBase() : tool; } - //private final Set childMembersAreUsedOutsideMyPackage = ContainerUtil.newConcurrentSet(); private final TObjectIntHashMap maxSuggestedLevelForChildMembers = new TObjectIntHashMap<>(); @Override @@ -121,10 +120,6 @@ class AccessCanBeTightenedInspection extends BaseJavaBatchLocalInspectionTool { log(member.getName() + ": effective level is '" + PsiUtil.getAccessModifier(suggestedLevel) + "'"); if (suggestedLevel < currentLevel) { - //if (suggestedLevel == PsiUtil.ACCESS_LEVEL_PACKAGE_LOCAL && member instanceof PsiClass && childMembersAreUsedOutsideMyPackage.contains(member)) { - // log(member.getName() + " children used outside my package; ignore"); - // return; // e.g. some public method is used outside my package (without importing class) - //} if (member instanceof PsiClass) { int memberMaxLevel; synchronized (maxSuggestedLevelForChildMembers) { @@ -228,20 +223,12 @@ class AccessCanBeTightenedInspection extends BaseJavaBatchLocalInspectionTool { if (!(psiFile instanceof PsiJavaFile)) { log(" refd from " + psiFile.getName() + "; set to public"); maxLevel.set(PsiUtil.ACCESS_LEVEL_PUBLIC); - //if (memberClass != null) { - // childMembersAreUsedOutsideMyPackage.add(memberClass); - //} return false; // referenced from XML, has to be public } - //int offset = info.getNavigationOffset(); - //if (offset == -1) return true; @PsiUtil.AccessLevel int level = getEffectiveLevel(element, psiFile, member, memberFile, memberClass, memberPackage); log(" ref in file " + psiFile.getName() + "; level = " + PsiUtil.getAccessModifier(level) + "; (" + element + ")"); maxLevel.getAndAccumulate(level, Math::max); - //if (level == PsiUtil.ACCESS_LEVEL_PUBLIC && memberClass != null) { - // childMembersAreUsedOutsideMyPackage.add(memberClass); - //} return level != PsiUtil.ACCESS_LEVEL_PUBLIC; }