482633: Gerrit connector suggests query titles

Change-Id: If33fef67bfd498f9f422ff683b8b1d9b02e7f3ac
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=482633

3 files changed, 28 insertions, 5 deletions

diff --git a/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/GerritCustomQueryPage.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/GerritCustomQueryPage.java
index 7c328a708..c6d2f84fb 100644
--- a/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/GerritCustomQueryPage.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/GerritCustomQueryPage.java
@@ -26,6 +26,7 @@ import org.eclipse.mylyn.internal.gerrit.core.client.GerritClient;
 import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage2;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
@@ -121,6 +122,9 @@ public class GerritCustomQueryPage extends AbstractRepositoryQueryPage2 {
 				updateButtons();
 			}
 		};
+		myChangesButton.addSelectionListener(buttonSelectionListener);
+		watchedChangesButton.addSelectionListener(buttonSelectionListener);
+		allOpenChangesButton.addSelectionListener(buttonSelectionListener);
 		byProjectButton.addSelectionListener(buttonSelectionListener);
 		customQueryButton.addSelectionListener(buttonSelectionListener);
 	}
@@ -227,4 +231,20 @@ public class GerritCustomQueryPage extends AbstractRepositoryQueryPage2 {
 		return true;
 	}
 
+	@Override
+	protected String suggestQueryTitle() {
+		if (myChangesButton.isDisposed()) {
+			return ""; //$NON-NLS-1$
+		} else if (myChangesButton.getSelection()) {
+			return Messages.GerritCustomQueryPage_My_changes;
+		} else if (watchedChangesButton.getSelection()) {
+			return Messages.GerritCustomQueryPage_My_watched_changes;
+		} else if (allOpenChangesButton.getSelection()) {
+			return Messages.GerritCustomQueryPage_All_open_changes;
+		} else if (byProjectButton.getSelection()) {
+			return NLS.bind(Messages.GerritCustomQueryPage_Open_Changes_in_X, projectText.getText());
+		}
+		return ""; //$NON-NLS-1$
+	}
+
 }
diff --git a/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/Messages.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/Messages.java
index 95a1527d9..a537c7a0f 100644
--- a/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/Messages.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/Messages.java
@@ -28,6 +28,8 @@ public class Messages extends NLS {
 
 	public static String GerritCustomQueryPage_Open_changes_by_project;
 
+	public static String GerritCustomQueryPage_Open_Changes_in_X;
+
 	public static String GerritCustomQueryPage_Query_type;
 
 	public static String ProjectNameContentProposalProvider_Repository_configuration_needs_to_be_refreshed;
diff --git a/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/messages.properties b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/messages.properties
index 1d317c205..53bba97d4 100644
--- a/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/messages.properties
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/messages.properties
@@ -8,11 +8,12 @@
 # Contributors:
 # Tasktop Technologies - initial API and implementation
 ###############################################################################
-GerritCustomQueryPage_All_open_changes=All open changes
-GerritCustomQueryPage_Custom_query=Custom query:
+GerritCustomQueryPage_All_open_changes=All Open Changes
+GerritCustomQueryPage_Custom_query=Custom Query:
 GerritCustomQueryPage_Enter_title_and_select_query_type=Enter title and select a query type.
-GerritCustomQueryPage_My_changes=My changes
-GerritCustomQueryPage_My_watched_changes=My watched changes
-GerritCustomQueryPage_Open_changes_by_project=Open changes by project:
+GerritCustomQueryPage_My_changes=My Changes
+GerritCustomQueryPage_My_watched_changes=My Watched Changes
+GerritCustomQueryPage_Open_changes_by_project=Open Changes by Project:
+GerritCustomQueryPage_Open_Changes_in_X=Open Changes in {0}
 GerritCustomQueryPage_Query_type=Query type
 ProjectNameContentProposalProvider_Repository_configuration_needs_to_be_refreshed=(Repository configuration needs to be refreshed)