MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

historical typo fixed: getDependences: usages

Browse Source
This commit is contained in:
Gregory.Shrago
2018-07-10 04:32:02 +03:00
parent 6050460c31
commit b45a10da72
36 changed files with 55 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanPropertyElement.java
View File

@@ -26,7 +26,6 @@ import com.intellij.psi.impl.FakePsiElement;
import com.intellij.psi.meta.PsiMetaData;
import com.intellij.psi.meta.PsiMetaOwner;
import com.intellij.psi.meta.PsiPresentableMetaData;
import com.intellij.psi.util.PropertyUtil;
import com.intellij.psi.util.PropertyUtilBase;
import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NonNls;
@@ -92,7 +91,7 @@ public class BeanPropertyElement extends FakePsiElement implements PsiMetaOwner,
@NotNull
@Override
public Object[] getDependences() {
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}

2
platform/core-impl/src/com/intellij/psi/impl/RenameableFakePsiElement.java
View File

@@ -94,7 +94,7 @@ public abstract class RenameableFakePsiElement extends FakePsiElement implements
@NotNull
@Override
public Object[] getDependences() {
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}

4
platform/core-impl/src/com/intellij/psi/impl/meta/MetaRegistry.java
View File

@@ -52,7 +52,7 @@ public class MetaRegistry extends MetaDataRegistrar {
CachedValue<PsiMetaData> value =
CachedValuesManager.getManager(element.getProject()).createCachedValue(() -> {
data.init(element);
return new CachedValueProvider.Result<>(data, data.getDependences());
return new CachedValueProvider.Result<>(data, data.getDependencies());
});
element.putUserData(META_DATA_KEY, value);
}
@@ -81,7 +81,7 @@ public class MetaRegistry extends MetaDataRegistrar {
throw new RuntimeException("failed to instantiate " + binding.myDataClass, e);
}
data.init(element);
Object[] dependences = data.getDependences();
Object[] dependences = data.getDependencies();
for (Object dependence : dependences) {
if (dependence == null) {
LOG.error(data + "(" + binding.myDataClass + ") provided null dependency");

3
platform/platform-tests/testSrc/com/intellij/psi/impl/meta/MetaRegistryTest.java
View File

@@ -16,7 +16,6 @@
package com.intellij.psi.impl.meta;
import com.intellij.openapi.application.Result;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.psi.PsiElement;
import com.intellij.psi.filters.ElementFilter;
@@ -76,7 +75,7 @@ public class MetaRegistryTest extends LightPlatformTestCase {
@NotNull
@Override
public Object[] getDependences() {
public Object[] getDependencies() {
return new Object[]{myDeclaration};
}

2
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxNamespaceDescriptor.java
View File

@@ -85,7 +85,7 @@ public class JavaFxNamespaceDescriptor implements XmlNSDescriptor, Validator<Xml
@NotNull
@Override
public Object[] getDependences() {
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}

2
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxBuiltInTagDescriptor.java
View File

@@ -228,7 +228,7 @@ public class JavaFxBuiltInTagDescriptor implements XmlElementDescriptor, Validat
@NotNull
@Override
public Object[] getDependences() {
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}

2
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxClassTagDescriptorBase.java
View File

@@ -302,7 +302,7 @@ public abstract class JavaFxClassTagDescriptorBase implements XmlElementDescript
@NotNull
@Override
public Object[] getDependences() {
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}

2
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxPropertyAttributeDescriptor.java
View File

@@ -294,7 +294,7 @@ public class JavaFxPropertyAttributeDescriptor extends BasicXmlAttributeDescript
@NotNull
@Override
public Object[] getDependences() {
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}

2
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxPropertyTagDescriptor.java
View File

@@ -194,7 +194,7 @@ public class JavaFxPropertyTagDescriptor implements XmlElementDescriptor {
@NotNull
@Override
public Object[] getDependences() {
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}

8
xml/dom-impl/src/com/intellij/xml/impl/dom/AbstractDomChildrenDescriptor.java
View File

@@ -241,8 +241,8 @@ public abstract class AbstractDomChildrenDescriptor implements XmlElementDescrip
@NotNull
@Override
public Object[] getDependences() {
throw new UnsupportedOperationException("Method getDependences not implemented in " + getClass());
public Object[] getDependencies() {
throw new UnsupportedOperationException("Method getDependencies not implemented in " + getClass());
}
};
}
@@ -264,8 +264,8 @@ public abstract class AbstractDomChildrenDescriptor implements XmlElementDescrip
@NotNull
@Override
public Object[] getDependences() {
throw new UnsupportedOperationException("Method getDependences not implemented in " + getClass());
public Object[] getDependencies() {
throw new UnsupportedOperationException("Method getDependencies not implemented in " + getClass());
}
@Override

4
xml/dom-impl/src/com/intellij/xml/impl/dom/DomAttributeXmlDescriptor.java
View File

@@ -146,7 +146,7 @@ public class DomAttributeXmlDescriptor implements NamespaceAwareXmlAttributeDesc
@NotNull
@Override
public Object[] getDependences() {
throw new UnsupportedOperationException("Method getDependences not implemented in " + getClass());
public Object[] getDependencies() {
throw new UnsupportedOperationException("Method getDependencies not implemented in " + getClass());
}
}

2
xml/dom-openapi/src/com/intellij/util/xml/DomMetaData.java
View File

@@ -78,7 +78,7 @@ public class DomMetaData<T extends DomElement> implements PsiWritableMetaData, P
@NotNull
@Override
public Object[] getDependences() {
public Object[] getDependencies() {
final PsiElement declaration = getDeclaration();
if (myElement != null && myElement.isValid()) {
return new Object[]{DomUtil.getRoot(myElement), declaration};

2
xml/dom-tests/tests/com/intellij/util/xml/DomReferencesTest.java
View File

@@ -37,7 +37,7 @@ public class DomReferencesTest extends DomHardCoreTestCase {
final XmlTag tag = element.getXmlTag();
final DomMetaData metaData = assertInstanceOf(tag.getMetaData(), DomMetaData.class);
assertEquals(tag, metaData.getDeclaration());
assertOrderedEquals(metaData.getDependences(), DomUtil.getFileElement(element), tag);
assertOrderedEquals(metaData.getDependencies(), DomUtil.getFileElement(element), tag);
assertEquals("A", metaData.getName());
assertEquals("A", metaData.getName(null));

2
xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncDefineImpl.java
View File

@@ -176,7 +176,7 @@ public class RncDefineImpl extends RncElementImpl implements RncDefine, PsiMetaO
@NotNull
@Override
public Object[] getDependences() {
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}
}

11
xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngElementDescriptor.java
View File

@@ -28,7 +28,6 @@ import com.intellij.psi.util.*;
import com.intellij.psi.xml.XmlAttribute;
import com.intellij.psi.xml.XmlTag;
import com.intellij.util.ArrayUtil;
import java.util.HashMap;
import com.intellij.xml.XmlAttributeDescriptor;
import com.intellij.xml.XmlElementDescriptor;
import com.intellij.xml.XmlElementsGroup;
@@ -111,7 +110,7 @@ public class RngElementDescriptor implements XmlElementDescriptor {
@Override
public CachedValueProvider.Result<XmlElementDescriptor> compute(RngElementDescriptor p) {
final XmlElementDescriptor descriptor = p.findElementDescriptor(childTag);
return CachedValueProvider.Result.create(descriptor, p.getDependences(), childTag);
return CachedValueProvider.Result.create(descriptor, RngElementDescriptor.this.getDependencies(), childTag);
}
});
return value == NULL ? null : value;
@@ -124,7 +123,7 @@ public class RngElementDescriptor implements XmlElementDescriptor {
@Override
public CachedValueProvider.Result<XmlAttributeDescriptor[]> compute(RngElementDescriptor p) {
final XmlAttributeDescriptor[] value = p.collectAttributeDescriptors(context);
return CachedValueProvider.Result.create(value, p.getDependences(), context);
return CachedValueProvider.Result.create(value, RngElementDescriptor.this.getDependencies(), context);
}
});
} else {
@@ -358,11 +357,11 @@ public class RngElementDescriptor implements XmlElementDescriptor {
@NotNull
@Override
public Object[] getDependences() {
public Object[] getDependencies() {
if (myDeclaration != null) {
return ArrayUtil.append(myNsDescriptor.getDependences(), myDeclaration.getElement());
return ArrayUtil.append(this.getDependencies(), myDeclaration.getElement());
} else {
return myNsDescriptor.getDependences();
return this.getDependencies();
}
}

7
xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngNsDescriptor.java
View File

@@ -35,7 +35,6 @@ import com.intellij.psi.xml.XmlFile;
import com.intellij.psi.xml.XmlTag;
import com.intellij.util.ArrayUtil;
import com.intellij.util.containers.ContainerUtil;
import java.util.HashMap;
import com.intellij.xml.XmlElementDescriptor;
import com.intellij.xml.XmlNSDescriptorEx;
import com.intellij.xml.impl.schema.AnyXmlElementDescriptor;
@@ -222,7 +221,7 @@ public class RngNsDescriptor implements XmlNSDescriptorEx, Validator {
@NotNull
@Override
public Object[] getDependences() {
public Object[] getDependencies() {
if (myPattern != null) {
if (DumbService.isDumb(myElement.getProject())) {
return new Object[] { ModificationTracker.EVER_CHANGED, ExternalResourceManager.getInstance()};
@@ -279,8 +278,8 @@ public class RngNsDescriptor implements XmlNSDescriptorEx, Validator {
CachedValuesManager.getManager(myElement.getProject()).createCachedValue(() -> {
final XmlElementDescriptor descriptor = findRootDescriptorInner(qName);
return descriptor != null
? new CachedValueProvider.Result<>(descriptor, descriptor.getDependences())
: new CachedValueProvider.Result<>(null, getDependences());
? new CachedValueProvider.Result<>(descriptor, this.getDependencies())
: new CachedValueProvider.Result<>(null, this.getDependencies());
}, false);
myDescriptorsMap.put(qName, cachedValue);
}

4
xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngXmlAttributeDescriptor.java
View File

@@ -189,8 +189,8 @@ public class RngXmlAttributeDescriptor extends BasicXmlAttributeDescriptor {
@NotNull
@Override
public Object[] getDependences() {
return myElementDescriptor.getDependences();
public Object[] getDependencies() {
return this.getDependencies();
}
@Override

4
xml/xml-psi-impl/src/com/intellij/html/impl/DelegatingRelaxedHtmlElementDescriptor.java
View File

@@ -108,8 +108,8 @@ public class DelegatingRelaxedHtmlElementDescriptor implements XmlElementDescrip
@NotNull
@Override
public Object[] getDependences() {
return myDelegate.getDependences();
public Object[] getDependencies() {
return this.getDependencies();
}
@Override

2
xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlAttributeDescriptorImpl.java
View File

@@ -99,7 +99,7 @@ public class HtmlAttributeDescriptorImpl extends BasicXmlAttributeDescriptor {
@NotNull
@Override
public Object[] getDependences() {
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}

4
xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlElementDescriptorImpl.java
View File

@@ -197,8 +197,8 @@ public class HtmlElementDescriptorImpl extends BaseXmlElementDescriptorImpl {
@NotNull
@Override
public Object[] getDependences() {
return myDelegate.getDependences();
public Object[] getDependencies() {
return this.getDependencies();
}
@Override

4
xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlNSDescriptorImpl.java
View File

@@ -168,8 +168,8 @@ public class HtmlNSDescriptorImpl implements XmlNSDescriptor, DumbAware, XmlNSTy
@NotNull
@Override
public Object[] getDependences() {
return myDelegate == null ? ArrayUtil.EMPTY_OBJECT_ARRAY : myDelegate.getDependences();
public Object[] getDependencies() {
return myDelegate == null ? ArrayUtil.EMPTY_OBJECT_ARRAY : this.getDependencies();
}
@Override

2
xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeValueImpl.java
View File

@@ -181,7 +181,7 @@ public class XmlAttributeValueImpl extends XmlElementImpl implements XmlAttribut
@NotNull
@Override
public Object[] getDependences() {
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}

2
xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlDocumentImpl.java
View File

@@ -194,7 +194,7 @@ public class XmlDocumentImpl extends XmlElementImpl implements XmlDocument {
}
return new CachedValueProvider.Result<>(defaultNSDescriptorInner, defaultNSDescriptorInner != null
? defaultNSDescriptorInner.getDependences()
? defaultNSDescriptorInner.getDependencies()
: ExternalResourceManager.getInstance());
}));
}

2
xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java
View File

@@ -390,7 +390,7 @@ public class XmlTagImpl extends XmlElementImpl implements XmlTag, HintedReferenc
return new Result<>(null, this, file[0] == null ? this : file[0],
ExternalResourceManager.getInstance());
}
return new Result<>(descriptor, descriptor.getDependences(), this);
return new Result<>(descriptor, descriptor.getDependencies(), this);
}, false));
return map;

2
xml/xml-psi-impl/src/com/intellij/xml/impl/dtd/XmlAttributeDescriptorImpl.java
View File

@@ -74,7 +74,7 @@ public class XmlAttributeDescriptorImpl extends BasicXmlAttributeDescriptor impl
@NotNull
@Override
public Object[] getDependences(){
public Object[] getDependencies(){
return new Object[]{myDecl};
}

2
xml/xml-psi-impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java
View File

@@ -95,7 +95,7 @@ public class XmlElementDescriptorImpl extends BaseXmlElementDescriptorImpl imple
@NotNull
@Override
@SuppressWarnings("SpellCheckingInspection")
public Object[] getDependences(){
public Object[] getDependencies(){
return new Object[]{myElementDecl, ExternalResourceManager.getInstance()};
}

2
xml/xml-psi-impl/src/com/intellij/xml/impl/dtd/XmlNSDescriptorImpl.java
View File

@@ -187,7 +187,7 @@ public class XmlNSDescriptorImpl implements XmlNSDescriptorEx,Validator<XmlDocum
@NotNull
@Override
public Object[] getDependences(){
public Object[] getDependencies(){
return new Object[]{myElement, ExternalResourceManager.getInstance()};
}

2
xml/xml-psi-impl/src/com/intellij/xml/impl/schema/AnyXmlAttributeDescriptor.java
View File

@@ -56,7 +56,7 @@ public class AnyXmlAttributeDescriptor implements XmlAttributeDescriptor {
@NotNull
@Override
public Object[] getDependences(){
public Object[] getDependencies(){
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}

2
xml/xml-psi-impl/src/com/intellij/xml/impl/schema/AnyXmlElementDescriptor.java
View File

@@ -66,7 +66,7 @@ public class AnyXmlElementDescriptor implements XmlElementDescriptor {
@NotNull
@Override
public Object[] getDependences(){
public Object[] getDependencies(){
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}

4
xml/xml-psi-impl/src/com/intellij/xml/impl/schema/MultiFileNsDescriptor.java
View File

@@ -79,8 +79,8 @@ public class MultiFileNsDescriptor implements XsdNsDescriptor {
@NotNull
@Override
public Object[] getDependences() {
return myDescriptors.stream().flatMap(descriptor -> Arrays.stream(descriptor.getDependences())).toArray();
public Object[] getDependencies() {
return myDescriptors.stream().flatMap(descriptor -> Arrays.stream(this.getDependencies())).toArray();
}
@Nullable

2
xml/xml-psi-impl/src/com/intellij/xml/impl/schema/NamedObjectDescriptor.java
View File

@@ -71,7 +71,7 @@ public class NamedObjectDescriptor implements PsiWritableMetaData, PsiMetaData {
@NotNull
@Override
public Object[] getDependences() {
public Object[] getDependencies() {
return new Object[] { myDcl };
}

2
xml/xml-psi-impl/src/com/intellij/xml/impl/schema/NullElementDescriptor.java
View File

@@ -116,7 +116,7 @@ public class NullElementDescriptor implements XmlElementDescriptor {
@NotNull
@Override
public Object[] getDependences() {
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}
}

2
xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlAttributeDescriptorImpl.java
View File

@@ -66,7 +66,7 @@ public class XmlAttributeDescriptorImpl extends XsdEnumerationDescriptor impleme
@NotNull
@Override
public Object[] getDependences(){
public Object[] getDependencies(){
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}

2
xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlElementDescriptorImpl.java
View File

@@ -131,7 +131,7 @@ public class XmlElementDescriptorImpl extends XsdEnumerationDescriptor<XmlTag>
@NotNull
@Override
public Object[] getDependences(){
public Object[] getDependencies(){
return new Object[]{myDescriptorTag};
}

6
xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java
View File

@@ -389,7 +389,7 @@ public class XmlNSDescriptorImpl implements XmlNSDescriptorEx,Validator<XmlDocum
return new CachedValueProvider.Result<>(null, PsiModificationTracker.MODIFICATION_COUNT);
}
final XmlElementDescriptor xmlElementDescriptor = createElementDescriptor(tag);
return new CachedValueProvider.Result<>(xmlElementDescriptor, xmlElementDescriptor.getDependences());
return new CachedValueProvider.Result<>(xmlElementDescriptor, this.getDependencies());
}, false);
myDescriptorsMap.put(pair, cachedValue);
return cachedValue.getValue();
@@ -512,7 +512,7 @@ public class XmlNSDescriptorImpl implements XmlNSDescriptorEx,Validator<XmlDocum
if(attributeDescriptor != null){
final CachedValue<XmlAttributeDescriptor> value = CachedValuesManager.getManager(includedDocument.getProject()).createCachedValue(
() -> {
Object[] deps = attributeDescriptor.getDependences();
Object[] deps = this.getDependencies();
if (deps.length == 0) {
LOG.error(attributeDescriptor + " (" + attributeDescriptor.getClass() + ") returned no dependencies");
}
@@ -945,7 +945,7 @@ public class XmlNSDescriptorImpl implements XmlNSDescriptorEx,Validator<XmlDocum
@NotNull
@Override
public Object[] getDependences() {
public Object[] getDependencies() {
if (dependencies == null) dependencies = myFile == null ? ArrayUtil.EMPTY_OBJECT_ARRAY : new Object[] {myFile}; // init was not called
return dependencies;
}

4
xml/xml-psi-impl/src/com/intellij/xml/util/XmlNSDescriptorSequence.java
View File

@@ -113,10 +113,10 @@ public class XmlNSDescriptorSequence implements XmlNSDescriptor{
@NotNull
@Override
public Object[] getDependences(){
public Object[] getDependencies(){
final List<Object> ret = new ArrayList<>();
for (XmlNSDescriptor descriptor : sequence) {
ContainerUtil.addAll(ret, descriptor.getDependences());
ContainerUtil.addAll(ret, this.getDependencies());
}
return ret.toArray();
}