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).
This commit is contained in:
nik
2018-10-10 16:29:50 +03:00
parent eac522defc
commit bb036eefe0
6 changed files with 8 additions and 8 deletions
@@ -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<? extends Module> modules) {
protected static AnalysisScope collectScopes(@NotNull final Project defaultProject, @NotNull final Set<? extends Module> modules) {
if (modules.isEmpty()) {
return new AnalysisScope(defaultProject);
}
@@ -633,7 +633,7 @@ public class AnalysisScope {
}
@NotNull
static HashSet<Module> getAllInterestingModules(@NotNull final ProjectFileIndex fileIndex, @NotNull final VirtualFile vFile) {
protected static HashSet<Module> getAllInterestingModules(@NotNull final ProjectFileIndex fileIndex, @NotNull final VirtualFile vFile) {
final HashSet<Module> modules = new HashSet<>();
if (fileIndex.isInLibrarySource(vFile) || fileIndex.isInLibraryClasses(vFile)) {
for (OrderEntry orderEntry : fileIndex.getOrderEntriesForFile(vFile)) {
@@ -108,7 +108,7 @@ public abstract class AbstractElementSignatureProvider implements ElementSignatu
}
@Nullable
static <T extends PsiNamedElement> T restoreElementInternal(@NotNull PsiElement parent,
protected static <T extends PsiNamedElement> T restoreElementInternal(@NotNull PsiElement parent,
String name,
int index,
@NotNull Class<T> hisClass)
@@ -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);
}
@@ -40,7 +40,7 @@ public abstract class AbstractProjectNode extends ProjectViewNode<Project> {
}
@NotNull
Collection<AbstractTreeNode> modulesAndGroups(@NotNull Collection<? extends ModuleDescription> modules) {
protected Collection<AbstractTreeNode> modulesAndGroups(@NotNull Collection<? extends ModuleDescription> modules) {
if (getSettings().isFlattenModules()) {
return ContainerUtil.mapNotNull(modules, moduleDescription -> {
try {
@@ -414,7 +414,7 @@ public abstract class AbstractTreeClassChooserDialog<T extends PsiNamedElement>
return myProject;
}
GlobalSearchScope getScope() {
protected GlobalSearchScope getScope() {
return myScope;
}
@@ -126,7 +126,7 @@ public abstract class ArchivedProjectTemplate implements ProjectTemplate {
});
}
static <T> T consumeZipStream(@NotNull StreamProcessor<T> consumer, @NotNull ZipInputStream stream) throws IOException {
protected static <T> T consumeZipStream(@NotNull StreamProcessor<T> consumer, @NotNull ZipInputStream stream) throws IOException {
try {
return consumer.consume(stream);
}