diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-21 00:31:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-16 04:55:08 +0000 |
| commit | 9cde0e3c015174898df8b8f3672185941fad4786 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /plugins/ant/src/com/intellij/lang/ant/dom/AntResolveInspection.java | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | d76e3920c56d37c942092b7dca20fcaded81c0a5 (diff) | |
| download | idea-9cde0e3c015174898df8b8f3672185941fad4786.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'plugins/ant/src/com/intellij/lang/ant/dom/AntResolveInspection.java')
| -rw-r--r-- | plugins/ant/src/com/intellij/lang/ant/dom/AntResolveInspection.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntResolveInspection.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntResolveInspection.java index b17f29ae11ac..838d69af8027 100644 --- a/plugins/ant/src/com/intellij/lang/ant/dom/AntResolveInspection.java +++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntResolveInspection.java @@ -25,7 +25,6 @@ import com.intellij.lang.ant.quickfix.AntCreateTargetFix; import com.intellij.lang.ant.validation.AntInspection; import com.intellij.lang.properties.psi.PropertiesFile; import com.intellij.psi.PsiFile; -import com.intellij.psi.PsiFileSystemItem; import com.intellij.psi.PsiPolyVariantReference; import com.intellij.psi.PsiReference; import com.intellij.psi.xml.XmlElement; @@ -175,9 +174,9 @@ public class AntResolveInspection extends AntInspection { } if (child instanceof AntDomProperty) { final AntDomProperty property = (AntDomProperty)child; - final PsiFileSystemItem file = property.getFile().getValue(); - if (file instanceof PropertiesFile) { - files.add((PropertiesFile)file); + final PropertiesFile file = property.getPropertiesFile(); + if (file != null) { + files.add(file); } } } |