From 54061f27dbc8b875f97bd065028540b36cd385ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Mon, 3 Jul 2017 18:03:50 +0200 Subject: [PATCH] [devkit] remove superfluous @Stubbed after adding IdeaPluginRegistrationIndex we don't need them (a7e69bec738a931a3265d73a0ece3596832264d0)) --- plugins/devkit/src/dom/Action.java | 1 - plugins/devkit/src/dom/ApplicationComponents.java | 3 --- plugins/devkit/src/dom/Component.java | 2 -- plugins/devkit/src/dom/Group.java | 1 - plugins/devkit/src/dom/ModuleComponents.java | 3 --- plugins/devkit/src/dom/ProjectComponents.java | 3 --- .../src/dom/impl/PluginXmlDomFileDescription.java | 2 +- .../codeInsight/PluginXmlDomStubsTest.java | 15 +-------------- 8 files changed, 2 insertions(+), 28 deletions(-) diff --git a/plugins/devkit/src/dom/Action.java b/plugins/devkit/src/dom/Action.java index da8658875e02..4d56154c37f4 100644 --- a/plugins/devkit/src/dom/Action.java +++ b/plugins/devkit/src/dom/Action.java @@ -67,7 +67,6 @@ public interface Action extends ActionOrGroup { @ExtendClass(value = "com.intellij.openapi.actionSystem.AnAction", allowNonPublic = true, allowAbstract = false, allowInterface = false) @Convert(PluginPsiClassConverter.class) - @Stubbed GenericAttributeValue getClazz(); diff --git a/plugins/devkit/src/dom/ApplicationComponents.java b/plugins/devkit/src/dom/ApplicationComponents.java index 2f908ef20509..b6a29d45b930 100644 --- a/plugins/devkit/src/dom/ApplicationComponents.java +++ b/plugins/devkit/src/dom/ApplicationComponents.java @@ -20,7 +20,6 @@ package org.jetbrains.idea.devkit.dom; import com.intellij.util.xml.DomElement; -import com.intellij.util.xml.Stubbed; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -28,7 +27,6 @@ import java.util.List; /** * plugin.dtd:application-components interface. */ -@Stubbed public interface ApplicationComponents extends DomElement { /** @@ -36,7 +34,6 @@ public interface ApplicationComponents extends DomElement { * @return the list of component children. */ @NotNull - @Stubbed List getComponents(); /** * Adds new child to the list of component children. diff --git a/plugins/devkit/src/dom/Component.java b/plugins/devkit/src/dom/Component.java index b917fd0a955a..a91854aa65e5 100644 --- a/plugins/devkit/src/dom/Component.java +++ b/plugins/devkit/src/dom/Component.java @@ -26,13 +26,11 @@ import java.util.List; /** * plugin.dtd:component interface. */ -@Stubbed public interface Component extends DomElement { @NotNull @Required @Convert(PluginPsiClassConverter.class) - @Stubbed GenericDomValue getImplementationClass(); diff --git a/plugins/devkit/src/dom/Group.java b/plugins/devkit/src/dom/Group.java index 895b56eae890..ed29168e853c 100644 --- a/plugins/devkit/src/dom/Group.java +++ b/plugins/devkit/src/dom/Group.java @@ -76,7 +76,6 @@ public interface Group extends Actions, ActionOrGroup { @ExtendClass(value = "com.intellij.openapi.actionSystem.ActionGroup", allowAbstract = false, allowInterface = false) @Convert(PluginPsiClassConverter.class) - @Stubbed GenericAttributeValue getClazz(); diff --git a/plugins/devkit/src/dom/ModuleComponents.java b/plugins/devkit/src/dom/ModuleComponents.java index d4b8fbadb6b3..ff1ad0c96219 100644 --- a/plugins/devkit/src/dom/ModuleComponents.java +++ b/plugins/devkit/src/dom/ModuleComponents.java @@ -17,7 +17,6 @@ package org.jetbrains.idea.devkit.dom; import com.intellij.util.xml.DomElement; -import com.intellij.util.xml.Stubbed; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -25,7 +24,6 @@ import java.util.List; /** * plugin.dtd:module-components interface. */ -@Stubbed public interface ModuleComponents extends DomElement { /** @@ -33,7 +31,6 @@ public interface ModuleComponents extends DomElement { * @return the list of component children. */ @NotNull - @Stubbed List getComponents(); /** * Adds new child to the list of component children. diff --git a/plugins/devkit/src/dom/ProjectComponents.java b/plugins/devkit/src/dom/ProjectComponents.java index 881f8614fac0..1a8ab1da8542 100644 --- a/plugins/devkit/src/dom/ProjectComponents.java +++ b/plugins/devkit/src/dom/ProjectComponents.java @@ -17,7 +17,6 @@ package org.jetbrains.idea.devkit.dom; import com.intellij.util.xml.DomElement; -import com.intellij.util.xml.Stubbed; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -25,11 +24,9 @@ import java.util.List; /** * plugin.dtd:project-components interface. */ -@Stubbed public interface ProjectComponents extends DomElement { @NotNull - @Stubbed List getComponents(); Component.Project addComponent(); diff --git a/plugins/devkit/src/dom/impl/PluginXmlDomFileDescription.java b/plugins/devkit/src/dom/impl/PluginXmlDomFileDescription.java index d8916c7c8b4f..2cf51b4a0fb6 100644 --- a/plugins/devkit/src/dom/impl/PluginXmlDomFileDescription.java +++ b/plugins/devkit/src/dom/impl/PluginXmlDomFileDescription.java @@ -43,6 +43,6 @@ public class PluginXmlDomFileDescription extends DomFileDescription @Override public int getStubVersion() { - return 7; + return 8; } } diff --git a/plugins/devkit/testSources/codeInsight/PluginXmlDomStubsTest.java b/plugins/devkit/testSources/codeInsight/PluginXmlDomStubsTest.java index 81a8404212cf..4ee75e10965f 100644 --- a/plugins/devkit/testSources/codeInsight/PluginXmlDomStubsTest.java +++ b/plugins/devkit/testSources/codeInsight/PluginXmlDomStubsTest.java @@ -49,29 +49,16 @@ public class PluginXmlDomStubsTest extends DomStubTest { " Element:action\n" + " Attribute:id:actionId\n" + " Attribute:text:actionText\n" + - " Attribute:class:actionClass\n" + " Element:group\n" + " Attribute:id:groupId\n" + - " Attribute:class:groupClass\n" + " Element:action\n" + " Attribute:id:groupAction\n" + " Attribute:text:groupActionText\n" + - " Attribute:class:actionClass\n" + " Element:group\n" + " Attribute:id:nestedGroup\n" + " Element:action\n" + " Attribute:id:nestedGroupActionId\n" + - " Attribute:text:nestedGroupActionText\n" + - " Attribute:class:actionClass\n" + - " Element:application-components\n" + - " Element:component\n" + - " Element:implementation-class:applicationComponentClass\n" + - " Element:project-components\n" + - " Element:component\n" + - " Element:implementation-class:projectComponentClass\n" + - " Element:module-components\n" + - " Element:component\n" + - " Element:implementation-class:moduleComponentClass\n"); + " Attribute:text:nestedGroupActionText\n"); } public void testXInclude() {