ASSIGNED - bug 281685: [patch]improve error messages and documentation

https://bugs.eclipse.org/bugs/show_bug.cgi?id=281685

1 files changed, 4 insertions, 9 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java
index a4dd80f64..5a5471906 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java
@@ -1264,20 +1264,15 @@ public abstract class AbstractRepositorySettingsPage extends AbstractTaskReposit
 			errorMessage = Messages.AbstractRepositorySettingsPage_Enter_a_valid_server_url;
 		}
 		if (errorMessage == null) {
-			errorMessage = credentialsComplete();
+			if ((!needsAnonymousLogin() || !anonymousButton.getSelection()) && isMissingCredentials()) {
+				errorMessage = Messages.AbstractRepositorySettingsPage_Enter_a_user_id_Message0;
+			}
 		}
 
-		setErrorMessage(errorMessage);
+		setMessage(errorMessage, repository == null ? IMessageProvider.NONE : IMessageProvider.ERROR);
 		return errorMessage == null && super.isPageComplete();
 	}
 
-	private String credentialsComplete() {
-		if ((!needsAnonymousLogin() || !anonymousButton.getSelection()) && isMissingCredentials()) {
-			return Messages.AbstractRepositorySettingsPage_Repository_user_name_and_password_must_not_be_blank;
-		}
-		return null;
-	}
-
 	private boolean isMissingCredentials() {
 		return repositoryUserNameEditor.getStringValue().trim().equals("") //$NON-NLS-1$
 				|| repositoryPasswordEditor.getStringValue().trim().equals(""); //$NON-NLS-1$