234445: [upstream] show descriptions for keywords for the REST Connector

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

3 files changed, 31 insertions, 1 deletions

diff --git a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/src/org/eclipse/mylyn/internal/bugzilla/rest/ui/BugzillaKeywordAttributeEditor.java b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/src/org/eclipse/mylyn/internal/bugzilla/rest/ui/BugzillaKeywordAttributeEditor.java
index fb0d37dfa..7938dc0b2 100644
--- a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/src/org/eclipse/mylyn/internal/bugzilla/rest/ui/BugzillaKeywordAttributeEditor.java
+++ b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/src/org/eclipse/mylyn/internal/bugzilla/rest/ui/BugzillaKeywordAttributeEditor.java
@@ -13,11 +13,16 @@ package org.eclipse.mylyn.internal.bugzilla.rest.ui;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
+import org.eclipse.mylyn.commons.workbench.InPlaceCheckBoxTreeDialog;
+import org.eclipse.mylyn.commons.workbench.WorkbenchUtil;
 import org.eclipse.mylyn.internal.tasks.ui.editors.CheckboxMultiSelectAttributeEditor;
 import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
 import org.eclipse.mylyn.tasks.core.data.TaskDataModel;
+import org.eclipse.osgi.util.NLS;
 
 /**
  * @author Rob Elves
@@ -26,7 +31,6 @@ public class BugzillaKeywordAttributeEditor extends CheckboxMultiSelectAttribute
 
 	public BugzillaKeywordAttributeEditor(TaskDataModel manager, TaskAttribute taskAttribute) {
 		super(manager, taskAttribute);
-
 	}
 
 	@Override
@@ -44,4 +48,27 @@ public class BugzillaKeywordAttributeEditor extends CheckboxMultiSelectAttribute
 		attributeChanged();
 	}
 
+	@Override
+	protected List<String> getValueList() {
+		return getValues();
+	}
+
+	@Override
+	public List<String> getValuesLabels() {
+		List<String> tmp = getTaskAttribute().getValues();
+		List<String> newStrs = new ArrayList<>(tmp);
+		return newStrs;
+	}
+
+	@Override
+	protected InPlaceCheckBoxTreeDialog createInPlaceCheckBoxTreeDialog(List<String> values) {
+		Map<String, String> validDescriptions = getTaskAttribute().getOptions();
+		LinkedHashMap<String, String> validValues = new LinkedHashMap<String, String>(validDescriptions.size());
+		for (String value : validDescriptions.keySet()) {
+			validValues.put(value, value);
+		}
+		return new InPlaceCheckBoxTreeDialog(WorkbenchUtil.getShell(), getButton(), values, validValues,
+				NLS.bind(Messages.BugzillaKeywordAttributeEditor_Select_X, getLabel()), validDescriptions);
+	}
+
 }
\ No newline at end of file
diff --git a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/src/org/eclipse/mylyn/internal/bugzilla/rest/ui/Messages.java b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/src/org/eclipse/mylyn/internal/bugzilla/rest/ui/Messages.java
index 893caaf60..7c390a7de 100644
--- a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/src/org/eclipse/mylyn/internal/bugzilla/rest/ui/Messages.java
+++ b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/src/org/eclipse/mylyn/internal/bugzilla/rest/ui/Messages.java
@@ -16,6 +16,8 @@ import org.eclipse.osgi.util.NLS;
 public class Messages extends NLS {
 	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.bugzilla.rest.ui.messages"; //$NON-NLS-1$
 
+	public static String BugzillaKeywordAttributeEditor_Select_X;
+
 	public static String BugzillaRestRepositorySettingsPage_api_key;
 
 	public static String BugzillaRestRepositorySettingsPage_Please_create_or_copy_the_API_Key_from;
diff --git a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/src/org/eclipse/mylyn/internal/bugzilla/rest/ui/messages.properties b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/src/org/eclipse/mylyn/internal/bugzilla/rest/ui/messages.properties
index 96ec9ad82..fc03f92b4 100644
--- a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/src/org/eclipse/mylyn/internal/bugzilla/rest/ui/messages.properties
+++ b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/src/org/eclipse/mylyn/internal/bugzilla/rest/ui/messages.properties
@@ -1,3 +1,4 @@
+BugzillaKeywordAttributeEditor_Select_X=Select {0}
 BugzillaRestRepositorySettingsPage_api_key=API Key
 BugzillaRestRepositorySettingsPage_Please_create_or_copy_the_API_Key_from=Please create or copy the API Key from\n {0}
 BugzillaRestRepositorySettingsPage_RestRepositorySetting=Bugzilla REST Repository Settings