diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
| commit | d76e3920c56d37c942092b7dca20fcaded81c0a5 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /plugins/properties/src/com/intellij/lang/properties/editor/NewPropertyAction.java | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff) | |
| download | idea-d76e3920c56d37c942092b7dca20fcaded81c0a5.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f
Diffstat (limited to 'plugins/properties/src/com/intellij/lang/properties/editor/NewPropertyAction.java')
| -rw-r--r-- | plugins/properties/src/com/intellij/lang/properties/editor/NewPropertyAction.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/properties/src/com/intellij/lang/properties/editor/NewPropertyAction.java b/plugins/properties/src/com/intellij/lang/properties/editor/NewPropertyAction.java index d25b780bd769..2218b7598884 100644 --- a/plugins/properties/src/com/intellij/lang/properties/editor/NewPropertyAction.java +++ b/plugins/properties/src/com/intellij/lang/properties/editor/NewPropertyAction.java @@ -60,7 +60,7 @@ class NewPropertyAction extends AnAction { prefix = null; separator = null; } else { - final ResourceBundleEditorViewElement selectedElement = resourceBundleEditor.getSelectedElement(); + final ResourceBundleEditorViewElement selectedElement = resourceBundleEditor.getSelectedElementIfOnlyOne(); if (selectedElement == null) { return; } |