bug 222124: Use secure storage to save passwords (JSch part)

6 files changed, 9 insertions, 88 deletions

diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/KeyboardInteractiveDialog.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/KeyboardInteractiveDialog.java
index b07b98741..9c0755d8f 100644
--- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/KeyboardInteractiveDialog.java
+++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/KeyboardInteractiveDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -201,25 +201,6 @@ public class KeyboardInteractiveDialog extends TrayDialog {
 					allowCaching = allowCachingButton.getSelection();
 				}
 			});
-			Composite warningComposite = new Composite(main, SWT.NONE);
-			layout = new GridLayout();
-			layout.numColumns = 2;
-			layout.marginHeight = 0;
-			layout.marginHeight = 0;
-			warningComposite.setLayout(layout);
-			data = new GridData(GridData.FILL_HORIZONTAL);
-			data.horizontalSpan = 3;
-			warningComposite.setLayoutData(data);
-			Label warningLabel = new Label(warningComposite, SWT.NONE);
-			warningLabel.setImage(getImage(DLG_IMG_MESSAGE_WARNING));
-			warningLabel.setLayoutData(new GridData(
-					GridData.VERTICAL_ALIGN_BEGINNING
-							| GridData.HORIZONTAL_ALIGN_BEGINNING));
-			Label warningText = new Label(warningComposite, SWT.WRAP);
-			warningText.setText(Messages.KeyboardInteractiveDialog_5);
-			data = new GridData(GridData.FILL_HORIZONTAL);
-			data.widthHint = 300;
-			warningText.setLayoutData(data);
 		}
 
 		Dialog.applyDialogFont(parent);
diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/Messages.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/Messages.java
index 26dd6c1a1..06f6b5e4c 100644
--- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/Messages.java
+++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/Messages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -88,7 +88,6 @@ public class Messages extends NLS{
   public static String KeyboardInteractiveDialog_2;
   public static String KeyboardInteractiveDialog_3;
   public static String KeyboardInteractiveDialog_4;
-  public static String KeyboardInteractiveDialog_5;
   public static String KeyboardInteractiveDialog_6;
   public static String KeyboradInteractiveDialog_message;
   public static String KeyboardInteractiveDialog_labelRepository;
@@ -100,12 +99,9 @@ public class Messages extends NLS{
   public static String UserValidationDialog_0;
   public static String UserValidationDialog_1;
   public static String UserValidationDialog_2;
-  public static String UserValidationDialog_3;
   public static String UserValidationDialog_4;
   public static String UserValidationDialog_5;
-  
   public static String UserValidationDialog_6;
-  public static String UserValidationDialog_7;
 
   public static String UserValidationDialog_required;
   public static String UserValidationDialog_labelUser;
diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/UserValidationDialog.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/UserValidationDialog.java
index 8202d8fb7..d3f161a32 100644
--- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/UserValidationDialog.java
+++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/UserValidationDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -148,23 +148,6 @@ public class UserValidationDialog extends TrayDialog {
 					allowCaching = allowCachingButton.getSelection();
 				}
 			});
-			Composite warningComposite = new Composite(main, SWT.NONE);
-			layout = new GridLayout();
-			layout.numColumns = 2;
-			layout.marginHeight = 0;
-			layout.marginHeight = 0;
-			warningComposite.setLayout(layout);
-			data = new GridData(GridData.FILL_HORIZONTAL);
-			data.horizontalSpan = 3;
-			warningComposite.setLayoutData(data);
-			Label warningLabel = new Label(warningComposite, SWT.NONE);
-			warningLabel.setImage(getImage(DLG_IMG_MESSAGE_WARNING));
-			warningLabel.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_BEGINNING));
-			Label warningText = new Label(warningComposite, SWT.WRAP);
-			warningText.setText(Messages.UserValidationDialog_3); 
-			data = new GridData(GridData.FILL_HORIZONTAL);
-			data.widthHint = 300;
-			warningText.setLayoutData(data);
 		}
 		
         Dialog.applyDialogFont(parent);
diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/KeyboardInteractiveDialog.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/KeyboardInteractiveDialog.java
index a623229dd..19e7f5426 100644
--- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/KeyboardInteractiveDialog.java
+++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/KeyboardInteractiveDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -202,24 +202,6 @@ public class KeyboardInteractiveDialog extends TrayDialog{
         allowCaching=allowCachingButton.getSelection();
       }
     });
-    Composite warningComposite=new Composite(main, SWT.NONE);
-    layout=new GridLayout();
-    layout.numColumns=2;
-    layout.marginHeight=0;
-    layout.marginHeight=0;
-    warningComposite.setLayout(layout);
-    data=new GridData(GridData.FILL_HORIZONTAL);
-    data.horizontalSpan=3;
-    warningComposite.setLayoutData(data);
-    Label warningLabel=new Label(warningComposite, SWT.NONE);
-    warningLabel.setImage(getImage(DLG_IMG_MESSAGE_WARNING));
-    warningLabel.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING
-        |GridData.HORIZONTAL_ALIGN_BEGINNING));
-    Label warningText=new Label(warningComposite, SWT.WRAP);
-    warningText.setText(Messages.UserValidationDialog_7);
-    data=new GridData(GridData.FILL_HORIZONTAL);
-    data.widthHint=300;
-    warningText.setLayoutData(data);
     }
     
     Dialog.applyDialogFont(parent);
diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/UserValidationDialog.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/UserValidationDialog.java
index 134c388bf..aedc2d6b2 100644
--- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/UserValidationDialog.java
+++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/UserValidationDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -171,24 +171,6 @@ public class UserValidationDialog extends TrayDialog{
         allowCaching=allowCachingButton.getSelection();
       }
     });
-    Composite warningComposite=new Composite(main, SWT.NONE);
-    layout=new GridLayout();
-    layout.numColumns=2;
-    layout.marginHeight=0;
-    layout.marginHeight=0;
-    warningComposite.setLayout(layout);
-    data=new GridData(GridData.FILL_HORIZONTAL);
-    data.horizontalSpan=3;
-    warningComposite.setLayoutData(data);
-    Label warningLabel=new Label(warningComposite, SWT.NONE);
-    warningLabel.setImage(getImage(DLG_IMG_MESSAGE_WARNING));
-    warningLabel.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING
-        |GridData.HORIZONTAL_ALIGN_BEGINNING));
-    Label warningText=new Label(warningComposite, SWT.WRAP);
-    warningText.setText(Messages.UserValidationDialog_7);
-    data=new GridData(GridData.FILL_HORIZONTAL);
-    data.widthHint=300;
-    warningText.setLayoutData(data);
     }
 
     Dialog.applyDialogFont(parent);
diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/messages.properties b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/messages.properties
index 2606f65c2..26a212ac9 100644
--- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/messages.properties
+++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/messages.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
+# Copyright (c) 2000, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -79,20 +79,17 @@ KeyboardInteractiveDialog_0=Keyboard Interactive authentication for {0}: {1}
 KeyboardInteractiveDialog_1=Keyboard Interactive authentication for {0}
 KeyboardInteractiveDialog_2=Password Required
 KeyboardInteractiveDialog_3=Domain:
-KeyboardInteractiveDialog_4=&Save password
-KeyboardInteractiveDialog_5=Saved passwords are stored on your computer in a file that is difficult, but not impossible, for an intruder to read.
+KeyboardInteractiveDialog_4=&Save password (could trigger secure storage login)
 KeyboardInteractiveDialog_6=&User name:
 UserValidationDialog_0=Password Required
 UserValidationDialog_1=Domain:
-UserValidationDialog_2=&Save password
-UserValidationDialog_3=Saved passwords are stored on your computer in a file that is difficult, but not impossible, for an intruder to read.
+UserValidationDialog_2=&Save password (could trigger secure storage login)
 UserValidationDialog_4=&Password:
 UserValidationDialog_5=&User name:
 PreferencePage_0=SSH2 Service not available
 PreferencePage_1=The SSH2 service is not available.
 
-UserValidationDialog_6=&Save password
-UserValidationDialog_7=Saved passwords are stored on your computer in a file that is difficult, but not impossible, for an intruder to read.
+UserValidationDialog_6=&Save password (could trigger secure storage login)
 UserValidationDialog_required=Password Required
 UserValidationDialog_labelUser={0}
 UserValidationDialog_labelPassword={1}