From 0bf158952fe668dd3340df25b00290ea5d5d4e52 Mon Sep 17 00:00:00 2001
From: spingel
Date: Fri, 18 Sep 2009 21:50:54 +0000
Subject: NEW - bug 288892: fix validation in query dialog
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=288892

---
 .../internal/bugzilla/ui/search/BugzillaSearchPage.java | 17 ++++++++++++++---
 .../mylyn/internal/bugzilla/ui/search/Messages.java     |  2 ++
 .../internal/bugzilla/ui/search/messages.properties     |  1 +
 3 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'org.eclipse.mylyn.bugzilla.ui/src')

diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java
index 47dec17ee..f6ee80e29 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java
@@ -30,6 +30,7 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.DialogSettings;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.fieldassist.ComboContentAdapter;
 import org.eclipse.jface.fieldassist.ContentProposalAdapter;
@@ -1131,13 +1132,23 @@ public class BugzillaSearchPage extends AbstractRepositoryQueryPage implements L
 						throw new NumberFormatException();
 					}
 				} catch (NumberFormatException ex) {
-					setErrorMessage(NLS.bind(Messages.BugzillaSearchPage_Number_of_days_must_be_a_positive_integer,
-							days));
+					setMessage(NLS.bind(Messages.BugzillaSearchPage_Number_of_days_must_be_a_positive_integer, days),
+							IMessageProvider.ERROR);
 					return false;
 				}
 			}
 		}
-		return getWizard() == null ? canQuery() : canQuery() && super.isPageComplete();
+		if (getWizard() == null) {
+			return canQuery();
+		} else {
+			if (super.isPageComplete()) {
+				if (canQuery()) {
+					return true;
+				}
+				setMessage(Messages.BugzillaSearchPage_Enter_search_option);
+			}
+			return false;
+		}
 	}
 
 	/**
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/Messages.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/Messages.java
index 12fdada01..df15f26a1 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/Messages.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/Messages.java
@@ -51,6 +51,8 @@ public class Messages extends NLS {
 
 	public static String BugzillaSearchPage_Email_2;
 
+	public static String BugzillaSearchPage_Enter_search_option;
+
 	public static String BugzillaSearchPage_Error_updating_search_options;
 
 	public static String BugzillaSearchPage_Error_was_X;
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/messages.properties b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/messages.properties
index 58b6862f8..d098c75b3 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/messages.properties
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/messages.properties
@@ -21,6 +21,7 @@ BugzillaSearchPage_Component=Compo&nent:
 BugzillaSearchPage_days=\ days.
 BugzillaSearchPage_Email=&Email:
 BugzillaSearchPage_Email_2=Email &2:
+BugzillaSearchPage_Enter_search_option=Enter or select a search option
 BugzillaSearchPage_Error_updating_search_options=Error updating search options
 BugzillaSearchPage_Error_was_X=Error was: {0}
 BugzillaSearchPage_exact=exact
-- 
cgit v1.2.3