RESOLVED - bug 316832: search repository for key link is displayed even if o.e.m.tasks.search is not available

https://bugs.eclipse.org/bugs/show_bug.cgi?id=316832

1 files changed, 32 insertions, 29 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java
index 86209d4d5..4bd91ac84 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java
@@ -134,9 +134,8 @@ public class TaskListFilteredTree extends AbstractFilteredTree {
 					TasksUi.getTaskActivityManager().removeActivityListener(taskProgressBarActivityListener);
 				}
 				if (taskProgressBarWorkingSetListener != null) {
-					PlatformUI.getWorkbench()
-							.getWorkingSetManager()
-							.removePropertyChangeListener(taskProgressBarWorkingSetListener);
+					PlatformUI.getWorkbench().getWorkingSetManager().removePropertyChangeListener(
+							taskProgressBarWorkingSetListener);
 				}
 				actionGroup.setSelectionProvider(null);
 				activeTaskMenuManager.dispose();
@@ -226,35 +225,39 @@ public class TaskListFilteredTree extends AbstractFilteredTree {
 
 	@Override
 	protected Composite createSearchComposite(Composite container) {
-		Composite searchComposite = new Composite(container, SWT.NONE);
-		GridLayout searchLayout = new GridLayout(1, false);
-		searchLayout.marginWidth = 8;
-		searchLayout.marginHeight = 0;
-		searchLayout.marginBottom = 0;
-		searchLayout.horizontalSpacing = 0;
-		searchLayout.verticalSpacing = 0;
-		searchComposite.setLayout(searchLayout);
-		searchComposite.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false, 4, 1));
-
-		final TaskScalingHyperlink searchLink = new TaskScalingHyperlink(searchComposite, SWT.LEFT);
-		searchLink.setText(LABEL_SEARCH);
-
-		searchLink.addHyperlinkListener(new IHyperlinkListener() {
-
-			public void linkActivated(org.eclipse.ui.forms.events.HyperlinkEvent e) {
-				SearchUtil.openSearchDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow());
-			}
+		if (SearchUtil.supportsTaskSearch()) {
+			Composite searchComposite = new Composite(container, SWT.NONE);
+			GridLayout searchLayout = new GridLayout(1, false);
+			searchLayout.marginWidth = 8;
+			searchLayout.marginHeight = 0;
+			searchLayout.marginBottom = 0;
+			searchLayout.horizontalSpacing = 0;
+			searchLayout.verticalSpacing = 0;
+			searchComposite.setLayout(searchLayout);
+			searchComposite.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false, 4, 1));
+
+			final TaskScalingHyperlink searchLink = new TaskScalingHyperlink(searchComposite, SWT.LEFT);
+			searchLink.setText(LABEL_SEARCH);
+
+			searchLink.addHyperlinkListener(new IHyperlinkListener() {
+
+				public void linkActivated(org.eclipse.ui.forms.events.HyperlinkEvent e) {
+					SearchUtil.openSearchDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow());
+				}
 
-			public void linkEntered(org.eclipse.ui.forms.events.HyperlinkEvent e) {
-				searchLink.setUnderlined(true);
-			}
+				public void linkEntered(org.eclipse.ui.forms.events.HyperlinkEvent e) {
+					searchLink.setUnderlined(true);
+				}
 
-			public void linkExited(org.eclipse.ui.forms.events.HyperlinkEvent e) {
-				searchLink.setUnderlined(false);
-			}
-		});
+				public void linkExited(org.eclipse.ui.forms.events.HyperlinkEvent e) {
+					searchLink.setUnderlined(false);
+				}
+			});
 
-		return searchComposite;
+			return searchComposite;
+		} else {
+			return super.createSearchComposite(container);
+		}
 	}
 
 	private void updateTaskProgressBar() {