MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

rename from loadDescriptors to loadDescriptorsFromDir to avoid the same named method and make clear that method loads descriptors only from specified dir and nothing more

Browse Source 
Aligned with our existing loadDescriptorsFromClassPath
This commit is contained in:
Vladimir Krivosheev
2018-12-20 12:42:55 +01:00
parent bcb694f812
commit dffe646f5a
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+9 -9
View File
@@ -913,12 +913,12 @@ public class PluginManagerCore {
}
}
private static void loadDescriptors(@NotNull File pluginsHome,
@NotNull List<IdeaPluginDescriptorImpl> result,
@Nullable PluginLoadProgressManager pluginLoadProgressManager,
boolean bundled,
@Nullable ExecutorService executorService) throws ExecutionException, InterruptedException {
File[] files = pluginsHome.listFiles();
private static void loadDescriptorsFromDir(@NotNull File dir,
@NotNull List<IdeaPluginDescriptorImpl> result,
@Nullable PluginLoadProgressManager pluginLoadProgressManager,
boolean bundled,
@Nullable ExecutorService executorService) throws ExecutionException, InterruptedException {
File[] files = dir.listFiles();
if (files == null || files.length == 0) {
return;
}
@@ -1202,10 +1202,10 @@ public class PluginManagerCore {
Map<URL, String> urlsFromClassPath = computePluginUrlsFromClassPath(PluginManagerCore.class.getClassLoader());
PluginLoadProgressManager pluginLoadProgressManager = progress == null ? null : new PluginLoadProgressManager(progress, urlsFromClassPath.size());
try {
loadDescriptors(new File(PathManager.getPluginsPath()), result, pluginLoadProgressManager, false, executorService);
loadDescriptorsFromDir(new File(PathManager.getPluginsPath()), result, pluginLoadProgressManager, false, executorService);
Application application = ApplicationManager.getApplication();
if (application == null || !application.isUnitTestMode()) {
loadDescriptors(new File(PathManager.getPreInstalledPluginsPath()), result, pluginLoadProgressManager, true, executorService);
loadDescriptorsFromDir(new File(PathManager.getPreInstalledPluginsPath()), result, pluginLoadProgressManager, true, executorService);
}
loadDescriptorsFromProperty(result);
@@ -1214,7 +1214,7 @@ public class PluginManagerCore {
if (application != null && application.isUnitTestMode() && result.size() <= 1) {
// We're running in unit test mode but the classpath doesn't contain any plugins; try to load bundled plugins anyway
ourUnitTestWithBundledPlugins = true;
loadDescriptors(new File(PathManager.getPreInstalledPluginsPath()), result, pluginLoadProgressManager, true, executorService);
loadDescriptorsFromDir(new File(PathManager.getPreInstalledPluginsPath()), result, pluginLoadProgressManager, true, executorService);
}
}
catch (InterruptedException | ExecutionException e) {