diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
| commit | e5266e2343c8d275d79fa0be725180d0fe3a993c (patch) | |
| tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/structureView/PropertiesFileStructureViewElement.java | |
| parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
| parent | 2e5965e996aad62ab1338b09d54caaf99ff3dd6a (diff) | |
| download | idea-e5266e2343c8d275d79fa0be725180d0fe3a993c.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143
Diffstat (limited to 'plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/structureView/PropertiesFileStructureViewElement.java')
| -rw-r--r-- | plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/structureView/PropertiesFileStructureViewElement.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/structureView/PropertiesFileStructureViewElement.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/structureView/PropertiesFileStructureViewElement.java index 432739c9df96..2e6c87b9d7a3 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/structureView/PropertiesFileStructureViewElement.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/structureView/PropertiesFileStructureViewElement.java @@ -22,7 +22,6 @@ import com.intellij.lang.properties.editor.ResourceBundleEditorViewElement; import com.intellij.lang.properties.psi.Property; import com.intellij.lang.properties.psi.impl.PropertiesFileImpl; import com.intellij.navigation.ItemPresentation; -import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; @@ -52,7 +51,7 @@ public class PropertiesFileStructureViewElement extends PsiTreeElementBase<Prope } @Override - public PsiElement[] getPsiElements(@NotNull Project project) { + public PsiElement[] getPsiElements() { return new PsiElement[] {getValue()}; } |