Bug 231227 [sec] Password recovery question dialog text layout might be improved

2 files changed, 11 insertions, 9 deletions

diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/nls/messages.properties b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/nls/messages.properties
index a3aabfd71..8508ef8a4 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/nls/messages.properties
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/nls/messages.properties
@@ -146,9 +146,9 @@ passwordChangeDone = The \'master\' password has been successfully changed for t
 pswdRecoveryOptionTitle = Secure Storage
 pswdRecoveryOptionMsg = A new master password has been created. Password recovery can be enabled by providing additional information. Would you like to do so now?
 passwordRecoveryTitle = Password Recovery
-passwordRecoveryTitleMsg = Please enter Question/Answer pairs
-passwordMsg = Lost passwords can be recovered using \'Recover\' option on the Secure Storage preference page. 
-passwordRecoveryLabel = To be able to recover lost password in future, enter questions and answers above.\nAnswers are case-sensitive; treat answers as secondary passwords.\n
+passwordRecoveryTitleMsg = Password Recovery Setup
+passwordMsg = Specify the questions and answers required for future password recovery. 
+passwordRecoveryLabel = To be able to recover a lost \'master\' password for the secure storage, enter questions and their expected answers. The questions will be asked when \'Recover Password\' is pressed on the 'Secure Storage' preference page.\n\nThe answers are case sensitive. Treat answers as secondary passwords.
 passwordErrMsg = Questions and answers can not be empty.
 passwordGroup = Question {0}
 passwordQuestion = &Question:
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChallengeResponseDialog.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChallengeResponseDialog.java
index ef6ad19e8..023568cbe 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChallengeResponseDialog.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChallengeResponseDialog.java
@@ -65,7 +65,13 @@ public class ChallengeResponseDialog extends TitleAreaDialog {
 
 		Composite composite = new Composite(compositeTop, SWT.NONE);
 
-		setMessage(SecUIMessages.passwordMsg, IMessageProvider.INFORMATION);
+		setMessage(SecUIMessages.passwordMsg, IMessageProvider.NONE);
+
+		Label storyLabel = new Label(composite, SWT.WRAP);
+		GridData labelData = new GridData(SWT.FILL, SWT.BEGINNING, true, false);
+		labelData.widthHint = 500;
+		storyLabel.setLayoutData(labelData);
+		storyLabel.setText(SecUIMessages.passwordRecoveryLabel);
 
 		for (int i = 0; i < size; i++) {
 			Group group = new Group(composite, SWT.NONE);
@@ -92,10 +98,6 @@ public class ChallengeResponseDialog extends TitleAreaDialog {
 			});
 		}
 
-		Label storyLabel = new Label(composite, SWT.LEFT);
-		storyLabel.setText(SecUIMessages.passwordRecoveryLabel);
-		storyLabel.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false));
-
 		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		GridLayoutFactory.swtDefaults().generateLayout(composite);
 
@@ -121,7 +123,7 @@ public class ChallengeResponseDialog extends TitleAreaDialog {
 			}
 		}
 		if (valid)
-			setMessage(SecUIMessages.passwordMsg, IMessageProvider.INFORMATION);
+			setMessage(SecUIMessages.passwordMsg, IMessageProvider.NONE);
 		else
 			setMessage(SecUIMessages.passwordErrMsg, IMessageProvider.WARNING);
 		okButton.setEnabled(valid);