diff --git a/java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanPropertyElement.java b/java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanPropertyElement.java index 0412afad2689..ad21eb9b679c 100644 --- a/java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanPropertyElement.java +++ b/java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanPropertyElement.java @@ -27,7 +27,6 @@ import com.intellij.psi.meta.PsiMetaData; import com.intellij.psi.meta.PsiMetaOwner; import com.intellij.psi.meta.PsiPresentableMetaData; import com.intellij.psi.util.PropertyUtilBase; -import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -89,12 +88,6 @@ public class BeanPropertyElement extends FakePsiElement implements PsiMetaOwner, } - @NotNull - @Override - public Object[] getDependencies() { - return ArrayUtil.EMPTY_OBJECT_ARRAY; - } - @Override @Nullable public Icon getIcon(boolean flags) { diff --git a/platform/core-impl/src/com/intellij/psi/impl/RenameableFakePsiElement.java b/platform/core-impl/src/com/intellij/psi/impl/RenameableFakePsiElement.java index ee812ab5c211..9d2ff4b5faf8 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/RenameableFakePsiElement.java +++ b/platform/core-impl/src/com/intellij/psi/impl/RenameableFakePsiElement.java @@ -24,7 +24,6 @@ import com.intellij.psi.PsiManager; import com.intellij.psi.meta.PsiMetaData; import com.intellij.psi.meta.PsiMetaOwner; import com.intellij.psi.meta.PsiPresentableMetaData; -import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -92,12 +91,6 @@ public abstract class RenameableFakePsiElement extends FakePsiElement implements public void init(final PsiElement element) { } - @NotNull - @Override - public Object[] getDependencies() { - return ArrayUtil.EMPTY_OBJECT_ARRAY; - } - @Override @Nullable public final Icon getIcon(final boolean open) { diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxNamespaceDescriptor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxNamespaceDescriptor.java index 0f076ad0077a..3b83d3963607 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxNamespaceDescriptor.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxNamespaceDescriptor.java @@ -11,7 +11,6 @@ import com.intellij.psi.search.searches.ClassInheritorsSearch; import com.intellij.psi.xml.XmlDocument; import com.intellij.psi.xml.XmlFile; import com.intellij.psi.xml.XmlTag; -import com.intellij.util.ArrayUtil; import com.intellij.xml.XmlElementDescriptor; import com.intellij.xml.XmlNSDescriptor; import org.jetbrains.annotations.NotNull; @@ -83,12 +82,6 @@ public class JavaFxNamespaceDescriptor implements XmlNSDescriptor, Validator"; diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncDefineImpl.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncDefineImpl.java index 228aabe474fd..773a959f9934 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncDefineImpl.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncDefineImpl.java @@ -25,7 +25,6 @@ import com.intellij.psi.PsiReferenceBase; import com.intellij.psi.meta.PsiMetaData; import com.intellij.psi.meta.PsiMetaOwner; import com.intellij.psi.meta.PsiPresentableMetaData; -import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import org.intellij.plugins.relaxNG.compact.RncTokenTypes; import org.intellij.plugins.relaxNG.compact.psi.*; @@ -173,11 +172,5 @@ public class RncDefineImpl extends RncElementImpl implements RncDefine, PsiMetaO @Override public void init(PsiElement element) { } - - @NotNull - @Override - public Object[] getDependencies() { - return ArrayUtil.EMPTY_OBJECT_ARRAY; - } } } diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngElementDescriptor.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngElementDescriptor.java index 984bd274ecdb..c4d604790d6b 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngElementDescriptor.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngElementDescriptor.java @@ -359,9 +359,10 @@ public class RngElementDescriptor implements XmlElementDescriptor { @Override public Object[] getDependencies() { if (myDeclaration != null) { - return ArrayUtil.append(this.getDependencies(), myDeclaration.getElement()); - } else { - return this.getDependencies(); + return ArrayUtil.append(myNsDescriptor.getDependencies(), myDeclaration.getElement()); + } + else { + return myNsDescriptor.getDependencies(); } } diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngXmlAttributeDescriptor.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngXmlAttributeDescriptor.java index 76c69f8483f5..5dff9425ab90 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngXmlAttributeDescriptor.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngXmlAttributeDescriptor.java @@ -190,7 +190,7 @@ public class RngXmlAttributeDescriptor extends BasicXmlAttributeDescriptor { @NotNull @Override public Object[] getDependencies() { - return this.getDependencies(); + return myElementDescriptor.getDependencies(); } @Override diff --git a/xml/xml-psi-impl/src/com/intellij/html/impl/DelegatingRelaxedHtmlElementDescriptor.java b/xml/xml-psi-impl/src/com/intellij/html/impl/DelegatingRelaxedHtmlElementDescriptor.java index a98364def482..53aa06c13829 100644 --- a/xml/xml-psi-impl/src/com/intellij/html/impl/DelegatingRelaxedHtmlElementDescriptor.java +++ b/xml/xml-psi-impl/src/com/intellij/html/impl/DelegatingRelaxedHtmlElementDescriptor.java @@ -109,7 +109,7 @@ public class DelegatingRelaxedHtmlElementDescriptor implements XmlElementDescrip @NotNull @Override public Object[] getDependencies() { - return this.getDependencies(); + return myDelegate.getDependencies(); } @Override diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlAttributeDescriptorImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlAttributeDescriptorImpl.java index 5137c588f414..b4fed2fdd29f 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlAttributeDescriptorImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlAttributeDescriptorImpl.java @@ -17,11 +17,9 @@ package com.intellij.psi.impl.source.html.dtd; import com.intellij.psi.PsiElement; import com.intellij.psi.xml.XmlElement; -import com.intellij.util.ArrayUtil; import com.intellij.xml.XmlAttributeDescriptor; import com.intellij.xml.impl.BasicXmlAttributeDescriptor; import com.intellij.xml.impl.XmlEnumerationDescriptor; -import org.jetbrains.annotations.NotNull; /** * @author Maxim.Mossienko @@ -97,12 +95,6 @@ public class HtmlAttributeDescriptorImpl extends BasicXmlAttributeDescriptor { delegate.init(element); } - @NotNull - @Override - public Object[] getDependencies() { - return ArrayUtil.EMPTY_OBJECT_ARRAY; - } - @Override public String toString() { return delegate.toString(); diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlElementDescriptorImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlElementDescriptorImpl.java index bf718468ba52..a124c8500574 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlElementDescriptorImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlElementDescriptorImpl.java @@ -198,7 +198,7 @@ public class HtmlElementDescriptorImpl extends BaseXmlElementDescriptorImpl { @NotNull @Override public Object[] getDependencies() { - return this.getDependencies(); + return myDelegate.getDependencies(); } @Override diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlNSDescriptorImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlNSDescriptorImpl.java index 117ec89b5397..b812891595fd 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlNSDescriptorImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlNSDescriptorImpl.java @@ -169,7 +169,7 @@ public class HtmlNSDescriptorImpl implements XmlNSDescriptor, DumbAware, XmlNSTy @NotNull @Override public Object[] getDependencies() { - return myDelegate == null ? ArrayUtil.EMPTY_OBJECT_ARRAY : this.getDependencies(); + return myDelegate == null ? ArrayUtil.EMPTY_OBJECT_ARRAY : myDelegate.getDependencies(); } @Override diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeValueImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeValueImpl.java index c0af9832e03c..8014d32d828d 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeValueImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeValueImpl.java @@ -32,7 +32,6 @@ import com.intellij.psi.xml.XmlAttribute; import com.intellij.psi.xml.XmlAttributeValue; import com.intellij.psi.xml.XmlElementType; import com.intellij.psi.xml.XmlTokenType; -import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import org.intellij.lang.regexp.DefaultRegExpPropertiesProvider; import org.intellij.lang.regexp.RegExpLanguageHost; @@ -179,12 +178,6 @@ public class XmlAttributeValueImpl extends XmlElementImpl implements XmlAttribut public void init(final PsiElement element) { } - @NotNull - @Override - public Object[] getDependencies() { - return ArrayUtil.EMPTY_OBJECT_ARRAY; - } - @Override public ItemPresentation getPresentation() { return new ItemPresentationWithSeparator() { diff --git a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/AnyXmlAttributeDescriptor.java b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/AnyXmlAttributeDescriptor.java index 65b3a9c293d1..afc5444fcca8 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/AnyXmlAttributeDescriptor.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/AnyXmlAttributeDescriptor.java @@ -20,7 +20,6 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.xml.XmlElement; import com.intellij.util.ArrayUtil; import com.intellij.xml.XmlAttributeDescriptor; -import org.jetbrains.annotations.NotNull; public class AnyXmlAttributeDescriptor implements XmlAttributeDescriptor { private final String myAttributeName; @@ -54,12 +53,6 @@ public class AnyXmlAttributeDescriptor implements XmlAttributeDescriptor { public void init(PsiElement element){ } - @NotNull - @Override - public Object[] getDependencies(){ - return ArrayUtil.EMPTY_OBJECT_ARRAY; - } - public String getQualifiedName() { return myAttributeName; } diff --git a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/AnyXmlElementDescriptor.java b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/AnyXmlElementDescriptor.java index 96e8f8a33268..66ddcd7ef1e8 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/AnyXmlElementDescriptor.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/AnyXmlElementDescriptor.java @@ -19,12 +19,10 @@ package com.intellij.xml.impl.schema; import com.intellij.psi.PsiElement; import com.intellij.psi.xml.XmlAttribute; import com.intellij.psi.xml.XmlTag; -import com.intellij.util.ArrayUtil; import com.intellij.xml.XmlAttributeDescriptor; import com.intellij.xml.XmlElementDescriptor; import com.intellij.xml.XmlElementsGroup; import com.intellij.xml.XmlNSDescriptor; -import org.jetbrains.annotations.NotNull; public class AnyXmlElementDescriptor implements XmlElementDescriptor { private final XmlElementDescriptor myParentDescriptor; @@ -64,12 +62,6 @@ public class AnyXmlElementDescriptor implements XmlElementDescriptor { public void init(PsiElement element){ } - @NotNull - @Override - public Object[] getDependencies(){ - return ArrayUtil.EMPTY_OBJECT_ARRAY; - } - @Override public String getQualifiedName() { return myParentDescriptor.getQualifiedName(); diff --git a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/NullElementDescriptor.java b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/NullElementDescriptor.java index fc74845be17f..5854ff646dd6 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/NullElementDescriptor.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/NullElementDescriptor.java @@ -22,12 +22,10 @@ package com.intellij.xml.impl.schema; import com.intellij.psi.PsiElement; import com.intellij.psi.xml.XmlAttribute; import com.intellij.psi.xml.XmlTag; -import com.intellij.util.ArrayUtil; import com.intellij.xml.XmlAttributeDescriptor; import com.intellij.xml.XmlElementDescriptor; import com.intellij.xml.XmlElementsGroup; import com.intellij.xml.XmlNSDescriptor; -import org.jetbrains.annotations.NotNull; public class NullElementDescriptor implements XmlElementDescriptor { private static final NullElementDescriptor INSTANCE = new NullElementDescriptor(); @@ -113,10 +111,4 @@ public class NullElementDescriptor implements XmlElementDescriptor { @Override public void init(PsiElement element) { } - - @NotNull - @Override - public Object[] getDependencies() { - return ArrayUtil.EMPTY_OBJECT_ARRAY; - } } diff --git a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlAttributeDescriptorImpl.java b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlAttributeDescriptorImpl.java index 9ccfc66a957f..c30de1fe2ada 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlAttributeDescriptorImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlAttributeDescriptorImpl.java @@ -25,7 +25,6 @@ import com.intellij.util.IncorrectOperationException; import com.intellij.xml.XmlAttributeDescriptor; import com.intellij.xml.XmlElementDescriptor; import org.jetbrains.annotations.NonNls; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** @@ -64,12 +63,6 @@ public class XmlAttributeDescriptorImpl extends XsdEnumerationDescriptor impleme myUse = myTag.getAttributeValue("use"); } - @NotNull - @Override - public Object[] getDependencies(){ - return ArrayUtil.EMPTY_OBJECT_ARRAY; - } - @Override public boolean isRequired() { return REQUIRED_ATTR_VALUE.equals(myUse); diff --git a/xml/xml-psi-impl/src/com/intellij/xml/util/XmlNSDescriptorSequence.java b/xml/xml-psi-impl/src/com/intellij/xml/util/XmlNSDescriptorSequence.java index f6ddb0b77d9b..da408e944e00 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/util/XmlNSDescriptorSequence.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/util/XmlNSDescriptorSequence.java @@ -114,9 +114,9 @@ public class XmlNSDescriptorSequence implements XmlNSDescriptor{ @NotNull @Override public Object[] getDependencies(){ - final List ret = new ArrayList<>(); + List ret = new ArrayList<>(); for (XmlNSDescriptor descriptor : sequence) { - ContainerUtil.addAll(ret, this.getDependencies()); + ContainerUtil.addAll(ret, descriptor.getDependencies()); } return ret.toArray(); }