From 1854a24555bebb3142bc137a7f49366aa7ae9bca Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Wed, 14 Jan 2015 12:42:16 +0100
Subject: [PATCH] Platform: help topic for 'Non-project file edit' dialog
 (IDEA-121829) + clarified options' test IDEA-133451 Default action for return
 key unlocks framework headers

---
 .../fileEditor/impl/NonProjectFileWritingAccessDialog.form  | 4 ++--
 .../fileEditor/impl/NonProjectFileWritingAccessDialog.java  | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/NonProjectFileWritingAccessDialog.form b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/NonProjectFileWritingAccessDialog.form
index 33a20bc8b164..01173794cbeb 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/NonProjectFileWritingAccessDialog.form
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/NonProjectFileWritingAccessDialog.form
@@ -22,7 +22,7 @@
             </constraints>
             <properties>
               <selected value="true"/>
-              <text value="Unlock files"/>
+              <text value="I want to edit these files anyway"/>
             </properties>
           </component>
           <component id="592c9" class="javax.swing.JRadioButton" binding="myUnlockAllButton" default-binding="true">
@@ -30,7 +30,7 @@
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Unlock all non-project files in current session"/>
+              <text value="I want to edit any non-project file in the current session"/>
             </properties>
           </component>
         </children>
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/NonProjectFileWritingAccessDialog.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/NonProjectFileWritingAccessDialog.java
index f85a0bf52ab1..397ff73da184 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/NonProjectFileWritingAccessDialog.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/NonProjectFileWritingAccessDialog.java
@@ -38,9 +38,13 @@ public class NonProjectFileWritingAccessDialog extends DialogWrapper {
     myFileList.setCellRenderer(new FileListRenderer());
     myFileList.setModel(new CollectionListModel<VirtualFile>(nonProjectFiles));
     
+    getOKAction().putValue(DEFAULT_ACTION, null);
+    getCancelAction().putValue(DEFAULT_ACTION, true);
+    
     init();
   }
 
+
   @Nullable
   @Override
   protected JComponent createCenterPanel() {
@@ -54,6 +58,6 @@ public class NonProjectFileWritingAccessDialog extends DialogWrapper {
   }
 
   protected String getHelpId() {
-    return "readOnlyHandler.nonProjectFilesDialog";
+    return "Non-Project_Files_Access_Dialog";
   }
 }