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

review feedback

Browse Source 
- use getChildTextTrim instead of getChild / getTextTrim
- use "name" tag value if "id" tag is missing

GitOrigin-RevId: 9f84eba563450dd1a0ef44f8481d164c362ae10e
This commit is contained in:
Maxim.Mossienko
2019-06-03 13:10:58 +03:00
committed by intellij-monorepo-bot
parent 63293950cd
commit 6b6794585a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java
+4 -3
View File
@@ -139,11 +139,12 @@ public class IdeaPluginDescriptorImpl implements IdeaPluginDescriptor {
return;
}
Element id = element.getChild("id");
if (id == null || !PluginManagerCore.disabledPlugins().contains(id.getTextTrim())) {
String pluginId = element.getChildTextTrim("id");
if (pluginId == null) pluginId = element.getChildTextTrim("name");
if (pluginId == null || !PluginManagerCore.disabledPlugins().contains(pluginId)) {
JDOMXIncluder.resolveNonXIncludeElement(element, url, ignoreMissingInclude, pathResolver);
} else {
if (LOG.isDebugEnabled()) LOG.debug("Skipping resolving of " + id.getTextTrim() + " from " + url);
if (LOG.isDebugEnabled()) LOG.debug("Skipping resolving of " + pluginId + " from " + url);
}
readExternal(element, stringInterner);
}