diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:25:33 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:25:33 -0700 |
| commit | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (patch) | |
| tree | bca7d49005d81d10c70bc3f547df041c636b4300 /plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundlePropertyStructureViewElement.java | |
| parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
| parent | c3d3a90f6b4ead083d63e28e6b9fcea93d675678 (diff) | |
| download | idea-d245f58efbfc26b13b9b9d5e52e6a83a0d76216c.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Diffstat (limited to 'plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundlePropertyStructureViewElement.java')
| -rw-r--r-- | plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundlePropertyStructureViewElement.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundlePropertyStructureViewElement.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundlePropertyStructureViewElement.java index 724a794ca3bb..14cb1cb940c4 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundlePropertyStructureViewElement.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundlePropertyStructureViewElement.java @@ -20,11 +20,8 @@ package com.intellij.lang.properties.editor; import com.intellij.ide.structureView.StructureViewTreeElement; -import com.intellij.lang.properties.IProperty; -import com.intellij.lang.properties.PropertiesHighlighter; -import com.intellij.lang.properties.PropertiesUtil; +import com.intellij.lang.properties.*; import com.intellij.lang.properties.ResourceBundle; -import com.intellij.lang.properties.psi.Property; import com.intellij.navigation.ColoredItemPresentation; import com.intellij.navigation.ItemPresentation; import com.intellij.openapi.editor.colors.EditorColorsManager; @@ -62,7 +59,7 @@ public class ResourceBundlePropertyStructureViewElement implements StructureView @Override public PsiElement[] getPsiElements() { - return new PsiElement[] {getProperty().getPsiElement()}; + return new PsiElement[] {getValue()}; } public void setPresentableName(final String presentableName) { @@ -70,8 +67,8 @@ public class ResourceBundlePropertyStructureViewElement implements StructureView } @Override - public Property getValue() { - return (Property)myProperty.getPsiElement(); + public PsiElement getValue() { + return myProperty.getPsiElement(); } @Override |