From bb036eefe09a31cd59f43a8554bdc66d5f77bae2 Mon Sep 17 00:00:00 2001 From: nik Date: Wed, 10 Oct 2018 16:26:04 +0300 Subject: [PATCH] platform: use protected access instead of package-private for methods used in subclasses Otherwise such usages will fail when classes will be loaded by different classloaders (IDEA-200277). --- .../src/com/intellij/analysis/AnalysisScope.java | 6 +++--- .../folding/impl/AbstractElementSignatureProvider.java | 2 +- platform/lang-impl/src/com/intellij/ide/macro/Macro.java | 2 +- .../ide/projectView/impl/nodes/AbstractProjectNode.java | 2 +- .../intellij/ide/util/AbstractTreeClassChooserDialog.java | 2 +- .../platform/templates/ArchivedProjectTemplate.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/platform/analysis-api/src/com/intellij/analysis/AnalysisScope.java b/platform/analysis-api/src/com/intellij/analysis/AnalysisScope.java index 0ebe7c88ef49..52896714043e 100644 --- a/platform/analysis-api/src/com/intellij/analysis/AnalysisScope.java +++ b/platform/analysis-api/src/com/intellij/analysis/AnalysisScope.java @@ -155,7 +155,7 @@ public class AnalysisScope { } @NotNull - PsiElementVisitor createFileSearcher() { + protected PsiElementVisitor createFileSearcher() { final ProgressIndicator indicator = ProgressManager.getInstance().getProgressIndicator(); if (indicator != null) { indicator.setText(AnalysisScopeBundle.message("scanning.scope.progress.title")); @@ -591,7 +591,7 @@ public class AnalysisScope { } @NotNull - static AnalysisScope collectScopes(@NotNull final Project defaultProject, @NotNull final Set modules) { + protected static AnalysisScope collectScopes(@NotNull final Project defaultProject, @NotNull final Set modules) { if (modules.isEmpty()) { return new AnalysisScope(defaultProject); } @@ -633,7 +633,7 @@ public class AnalysisScope { } @NotNull - static HashSet getAllInterestingModules(@NotNull final ProjectFileIndex fileIndex, @NotNull final VirtualFile vFile) { + protected static HashSet getAllInterestingModules(@NotNull final ProjectFileIndex fileIndex, @NotNull final VirtualFile vFile) { final HashSet modules = new HashSet<>(); if (fileIndex.isInLibrarySource(vFile) || fileIndex.isInLibraryClasses(vFile)) { for (OrderEntry orderEntry : fileIndex.getOrderEntriesForFile(vFile)) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/AbstractElementSignatureProvider.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/AbstractElementSignatureProvider.java index 134bc047530f..d5bea226b893 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/AbstractElementSignatureProvider.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/AbstractElementSignatureProvider.java @@ -108,7 +108,7 @@ public abstract class AbstractElementSignatureProvider implements ElementSignatu } @Nullable - static T restoreElementInternal(@NotNull PsiElement parent, + protected static T restoreElementInternal(@NotNull PsiElement parent, String name, int index, @NotNull Class hisClass) diff --git a/platform/lang-impl/src/com/intellij/ide/macro/Macro.java b/platform/lang-impl/src/com/intellij/ide/macro/Macro.java index be8ea6eccc67..902ea9c9fa81 100644 --- a/platform/lang-impl/src/com/intellij/ide/macro/Macro.java +++ b/platform/lang-impl/src/com/intellij/ide/macro/Macro.java @@ -58,7 +58,7 @@ public abstract class Macro { } @NotNull - static String getPath(VirtualFile file) { + protected static String getPath(VirtualFile file) { return file.getPath().replace('/', File.separatorChar); } diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractProjectNode.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractProjectNode.java index 05258d88bf70..4012291ed3dc 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractProjectNode.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractProjectNode.java @@ -40,7 +40,7 @@ public abstract class AbstractProjectNode extends ProjectViewNode { } @NotNull - Collection modulesAndGroups(@NotNull Collection modules) { + protected Collection modulesAndGroups(@NotNull Collection modules) { if (getSettings().isFlattenModules()) { return ContainerUtil.mapNotNull(modules, moduleDescription -> { try { diff --git a/platform/lang-impl/src/com/intellij/ide/util/AbstractTreeClassChooserDialog.java b/platform/lang-impl/src/com/intellij/ide/util/AbstractTreeClassChooserDialog.java index 1123be1cad13..86d9c0e060cc 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/AbstractTreeClassChooserDialog.java +++ b/platform/lang-impl/src/com/intellij/ide/util/AbstractTreeClassChooserDialog.java @@ -414,7 +414,7 @@ public abstract class AbstractTreeClassChooserDialog return myProject; } - GlobalSearchScope getScope() { + protected GlobalSearchScope getScope() { return myScope; } diff --git a/platform/lang-impl/src/com/intellij/platform/templates/ArchivedProjectTemplate.java b/platform/lang-impl/src/com/intellij/platform/templates/ArchivedProjectTemplate.java index bb92eeb71571..8da8173f402a 100644 --- a/platform/lang-impl/src/com/intellij/platform/templates/ArchivedProjectTemplate.java +++ b/platform/lang-impl/src/com/intellij/platform/templates/ArchivedProjectTemplate.java @@ -126,7 +126,7 @@ public abstract class ArchivedProjectTemplate implements ProjectTemplate { }); } - static T consumeZipStream(@NotNull StreamProcessor consumer, @NotNull ZipInputStream stream) throws IOException { + protected static T consumeZipStream(@NotNull StreamProcessor consumer, @NotNull ZipInputStream stream) throws IOException { try { return consumer.consume(stream); }