Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspingel2009-08-13 22:42:03 +0000
committerspingel2009-08-13 22:42:03 +0000
commit75feec8335e88f3fbaa77a4408c8c1f1217c4611 (patch)
treede532b2f95499b73a8fd55dd2351c83f885cee7f
parente03a24689893bce448e240ae7dbaf4b6d7fa0e2f (diff)
downloadorg.eclipse.mylyn.tasks-75feec8335e88f3fbaa77a4408c8c1f1217c4611.tar.gz
org.eclipse.mylyn.tasks-75feec8335e88f3fbaa77a4408c8c1f1217c4611.tar.xz
org.eclipse.mylyn.tasks-75feec8335e88f3fbaa77a4408c8c1f1217c4611.zip
ASSIGNED - bug 281685: [patch]improve error messages and documentation
https://bugs.eclipse.org/bugs/show_bug.cgi?id=281685
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/provisional/tasks/ui/wizards/AbstractRepositoryQueryPage2.java1
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/Messages.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/messages.properties3
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java13
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/TaskRepositoryWizardDialog.java1
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);
}
/**

Back to the top