From dabab68b0b282254d68e69da82a472b6a998b3fe Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Sat, 19 Dec 2009 20:16:20 +0300
Subject: [PATCH] CVS: path to private key to be displayed in password dialog
 (since there can be entries for the same root but with different credentials)
 for IDEA-26870 (CVS access with private key always asks for key password)

---
 .../com/intellij/cvsSupport2/CvsBundle.properties  |  1 +
 .../connections/ssh/SshConnectionUtil.java         |  1 +
 .../connections/ssh/ui/SshPasswordDialog.form      | 31 +++++++++++-----------
 .../connections/ssh/ui/SshPasswordDialog.java      |  7 +++++
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/CvsBundle.properties b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/CvsBundle.properties
index e050891863..affc7b593f 100644
--- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/CvsBundle.properties
+++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/CvsBundle.properties
@@ -440,6 +440,7 @@ import.wizard.include.to.import.action.name=Include to Import
 message.choose.stored.file.version.title=Choose stored version
 error.message.wrong.remote.repository=wrong remote repository: {0}
 propmt.text.enter.private.key.password.for=Enter private key password for {0}
+prompt.path.to.private.key=Private key path: ''{0}''
 close.tab.action.name=Close
 cvs.unknown.revision.presentation=<unknown>
 browse.changes.user.field.label=&User
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionUtil.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionUtil.java
index 15e978fa70..fe705a0eb8 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionUtil.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionUtil.java
@@ -43,6 +43,7 @@ public class SshConnectionUtil {
 
       if (password == null) {
         SshPasswordDialog sshPasswordDialog = new SshPasswordDialog(CvsBundle.message("propmt.text.enter.private.key.password.for", cvsRoot));
+        sshPasswordDialog.setAdditionalText(CvsBundle.message("prompt.path.to.private.key", settings.PATH_TO_PPK));
         sshPasswordDialog.show();
         if (!sshPasswordDialog.isOK()) return false;
         password = sshPasswordDialog.getPassword();
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/ui/SshPasswordDialog.form b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/ui/SshPasswordDialog.form
index 1021c30c78..6ede8d5f71 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/ui/SshPasswordDialog.form
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/ui/SshPasswordDialog.form
@@ -1,39 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.cvsSupport2.connections.ssh.ui.SshPasswordDialog">
-  <grid id="bafd0" binding="myPanel" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="bafd0" binding="myPanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="46" y="24" width="411" height="144"/>
-      <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3"/>
     </constraints>
     <properties/>
     <border type="none"/>
     <children>
       <vspacer id="69c29">
         <constraints>
-          <xy x="190" y="72" width="11" height="72"/>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2"/>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
       <hspacer id="1d2b3">
         <constraints>
-          <xy x="391" y="30" width="20" height="11"/>
-          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1"/>
+          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
       </hspacer>
-      <grid id="e591e" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="e591e" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <xy x="0" y="0" width="391" height="72"/>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3"/>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
         <children>
           <component id="6f40d" class="javax.swing.JLabel" binding="myLabel">
             <constraints>
-              <xy x="0" y="3" width="22" height="14"/>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0"/>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text resource-bundle="com/intellij/cvsSupport2/CvsBundle" key="dummy.label.xxx"/>
@@ -41,8 +36,7 @@
           </component>
           <component id="e442a" class="javax.swing.JPasswordField" binding="myPasswordField">
             <constraints>
-              <xy x="0" y="25" width="391" height="20"/>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
@@ -50,13 +44,20 @@
           </component>
           <component id="7e781" class="javax.swing.JCheckBox" binding="myStoreCheckbox">
             <constraints>
-              <xy x="0" y="50" width="391" height="22"/>
-              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
+              <grid row="3" 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 resource-bundle="com/intellij/cvsSupport2/CvsBundle" key="checkbox.store.scrambled.password.to.the.config"/>
             </properties>
           </component>
+          <component id="afad7" class="javax.swing.JLabel" binding="myAdditionalLbl">
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Label"/>
+            </properties>
+          </component>
         </children>
       </grid>
     </children>
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/ui/SshPasswordDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/ui/SshPasswordDialog.java
index 9a494903af..7241f42016 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/ui/SshPasswordDialog.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/ui/SshPasswordDialog.java
@@ -16,6 +16,7 @@
 package com.intellij.cvsSupport2.connections.ssh.ui;
 
 import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.util.ui.UIUtil;
 
 import javax.swing.*;
 
@@ -28,6 +29,7 @@ public class SshPasswordDialog extends DialogWrapper{
   private JCheckBox myStoreCheckbox;
   private JPanel myPanel;
   private JLabel myLabel;
+  private JLabel myAdditionalLbl;
 
 
   public SshPasswordDialog(String propmtText) {
@@ -35,6 +37,7 @@ public class SshPasswordDialog extends DialogWrapper{
     myLabel.setText(propmtText);
     setTitle(com.intellij.CvsBundle.message("dialog.title.ssh.password"));
     init();
+    myAdditionalLbl.setForeground(UIUtil.getInactiveTextColor());
   }
 
   protected JComponent createCenterPanel() {
@@ -52,4 +55,8 @@ public class SshPasswordDialog extends DialogWrapper{
   public JComponent getPreferredFocusedComponent() {
     return myPasswordField;
   }
+
+  public void setAdditionalText(final String text) {
+    myAdditionalLbl.setText(text);
+  }
 }
-- 
2.11.4.GIT