diff options
Diffstat (limited to 'org.eclipse.mylyn.tasks.ui')
5 files changed, 9 insertions, 11 deletions
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/provisional/tasks/ui/wizards/AbstractRepositoryQueryPage2.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/provisional/tasks/ui/wizards/AbstractRepositoryQueryPage2.java index f490c23f3..96a250f62 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/provisional/tasks/ui/wizards/AbstractRepositoryQueryPage2.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/provisional/tasks/ui/wizards/AbstractRepositoryQueryPage2.java @@ -61,7 +61,6 @@ public abstract class AbstractRepositoryQueryPage2 extends AbstractRepositoryQue super(pageName, repository, query); this.connector = TasksUi.getRepositoryConnector(getTaskRepository().getConnectorKind()); setTitle(Messages.AbstractRepositoryQueryPage2_Enter_query_parameters); - setDescription(Messages.AbstractRepositoryQueryPage2_If_attributes_are_blank_or_stale_press_the_Update_button); } public void setNeedsRepositoryConfiguration(boolean needsRepositoryConfiguration) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/Messages.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/Messages.java index 497b77d9a..c36f4d6ac 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/Messages.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/Messages.java @@ -189,6 +189,8 @@ public class Messages extends NLS { public static String AbstractRepositorySettingsPage_Enable_proxy_authentication; + public static String AbstractRepositorySettingsPage_Enter_a_user_id_Message0; + public static String AbstractRepositorySettingsPage_Enter_a_valid_server_url; public static String AbstractRepositorySettingsPage_Http_Authentication; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/messages.properties b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/messages.properties index 1744f9d7d..4bbde8134 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/messages.properties +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/messages.properties @@ -105,7 +105,8 @@ AbstractRepositorySettingsPage_Default__=Default ( AbstractRepositorySettingsPage_Disconnected=Disconnected AbstractRepositorySettingsPage_Enable_http_authentication=Enable Http Authentication AbstractRepositorySettingsPage_Enable_proxy_authentication=Enable Proxy Authentication -AbstractRepositorySettingsPage_Enter_a_valid_server_url=Enter a valid server url +AbstractRepositorySettingsPage_Enter_a_user_id_Message0=Enter a user id and password. +AbstractRepositorySettingsPage_Enter_a_valid_server_url=Enter a valid server url. AbstractRepositorySettingsPage_Http_Authentication=Http Authentication AbstractRepositorySettingsPage_Internal_error_validating_repository=Internal error validating repository AbstractRepositorySettingsPage_Label_=Label\:\ 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$ diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/TaskRepositoryWizardDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/TaskRepositoryWizardDialog.java index ed7ddc274..326347439 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/TaskRepositoryWizardDialog.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/TaskRepositoryWizardDialog.java @@ -50,6 +50,7 @@ public class TaskRepositoryWizardDialog extends WizardDialog { */ public TaskRepositoryWizardDialog(Shell parentShell, IWizard newWizard) { super(parentShell, newWizard); + setHelpAvailable(false); } /** |