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

IDEA-92949: xml mapping for dynamic child.

Browse Source 
nested children supported
This commit is contained in:
Dmitry Avdeev
2012-10-16 17:52:23 +04:00
parent 8c47800630
commit 3ec3f15f92
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java
+7
View File
@@ -68,6 +68,13 @@ public class ConfigurableEP<T extends UnnamedConfigurable> extends AbstractExten
@Attribute("childrenEPName")
public String childrenEPName;
/**
* Indicates that configurable has dynamically calculated children.
* {@link com.intellij.openapi.options.Configurable.Composite#getConfigurables()} will be called for such configurables.
*/
@Attribute("dynamic")
public boolean dynamic;
@Attribute("parentId")
public String parentId;
platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableWrapper.java
+5 -5
View File
@@ -46,7 +46,7 @@ public class ConfigurableWrapper implements SearchableConfigurable {
@Nullable
public static <T extends UnnamedConfigurable> T wrapConfigurable(ConfigurableEP<T> ep) {
if (ep.displayName != null || ep.key != null) {
return (T)(ep.children != null || ep.childrenEPName != null ? new CompositeWrapper(ep) : new ConfigurableWrapper(ep));
return (T)(ep.children != null || ep.childrenEPName != null || ep.dynamic ? new CompositeWrapper(ep) : new ConfigurableWrapper(ep));
}
else {
return ep.createConfigurable();
@@ -162,15 +162,15 @@ public class ConfigurableWrapper implements SearchableConfigurable {
public CompositeWrapper(ConfigurableEP ep, Configurable... kids) {
super(ep);
if (ep.children == null) {
kids = EMPTY_ARRAY;
if (ep.dynamic) {
kids = ((Composite)getConfigurable()).getConfigurables();
}
else {
else if (ep.children != null) {
kids = ContainerUtil.mapNotNull(ep.getChildren(),
new NullableFunction<ConfigurableEP, ConfigurableWrapper>() {
@Override
public ConfigurableWrapper fun(ConfigurableEP ep) {
return ep.isAvailable() ? new ConfigurableWrapper(ep) : null;
return ep.isAvailable() ? (ConfigurableWrapper)wrapConfigurable(ep) : null;
}
}, EMPTY_ARRAY);
}
plugins/copyright/src/META-INF/plugin.xml
+6 -1
View File
@@ -11,7 +11,12 @@
<depends optional="true" config-file="java.xml">com.intellij.modules.java</depends>
<extensions defaultExtensionNs="com.intellij">
<projectConfigurable instance="com.maddyhome.idea.copyright.ui.CopyrightProjectConfigurable"/>
<projectConfigurable instance="com.maddyhome.idea.copyright.ui.CopyrightProjectConfigurable" id="copyright" displayName="Copyright">
<configurable instance="com.maddyhome.idea.copyright.ui.CopyrightProfilesPanel" id="copyright.profiles"
displayName="Copyright Profiles"/>
<configurable instance="com.maddyhome.idea.copyright.ui.CopyrightFormattingConfigurable" id="template.copyright.formatting"
displayName="Formatting" dynamic="true"/>
</projectConfigurable>
<errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
<checkinHandlerFactory implementation="com.maddyhome.idea.copyright.actions.UpdateCopyrightCheckinHandlerFactory"/>
<applicationService serviceInterface="com.maddyhome.idea.copyright.util.FileTypeUtil"