NEW - bug 230153: [api] decouple tasks.ui API from search

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

3 files changed, 22 insertions, 29 deletions

diff --git a/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF
index fef7151d8..ce1d89d72 100644
--- a/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@ Bundle-Activator: org.eclipse.mylyn.internal.trac.ui.TracUiPlugin
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jface.text,
- org.eclipse.search;bundle-version="3.4.0",
  org.eclipse.ui,
  org.eclipse.ui.forms,
  org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java
index 8eb6ebd53..f2cc74ab0 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java
@@ -15,7 +15,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.text.hyperlink.IHyperlink;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.mylyn.internal.tasks.core.AbstractRepositoryQuery;
 import org.eclipse.mylyn.internal.tasks.core.AbstractTaskContainer;
 import org.eclipse.mylyn.internal.tasks.core.deprecated.TaskSelection;
@@ -33,6 +32,7 @@ import org.eclipse.mylyn.tasks.core.ITask;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
 import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage;
+import org.eclipse.mylyn.tasks.ui.wizards.ITaskSearchPage;
 import org.eclipse.mylyn.tasks.ui.wizards.NewTaskWizard;
 import org.eclipse.mylyn.tasks.ui.wizards.NewWebTaskWizard;
 
@@ -58,7 +58,7 @@ public class TracConnectorUi extends AbstractRepositoryConnectorUi {
 	}
 
 	@Override
-	public WizardPage getSearchPage(TaskRepository repository, IStructuredSelection selection) {
+	public ITaskSearchPage getSearchPage(TaskRepository repository, IStructuredSelection selection) {
 		return new TracCustomQueryPage(repository);
 	}
 
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java
index 2fcd254df..205250cd1 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java
@@ -114,11 +114,8 @@ public class TracCustomQueryPage extends AbstractRepositoryQueryPage {
 	// private UserSearchField ccField;
 
 	public TracCustomQueryPage(TaskRepository repository, AbstractRepositoryQuery query) {
-		super(TITLE);
-
-		this.repository = repository;
+		super(TITLE, repository);
 		this.query = (TracRepositoryQuery) query;
-
 		setTitle(TITLE);
 		setDescription(DESCRIPTION);
 	}
@@ -127,7 +124,6 @@ public class TracCustomQueryPage extends AbstractRepositoryQueryPage {
 		this(repository, null);
 	}
 
-	@Override
 	public void createControl(Composite parent) {
 		Composite control = new Composite(parent, SWT.NONE);
 		GridData gd = new GridData(GridData.FILL_BOTH);
@@ -309,7 +305,7 @@ public class TracCustomQueryPage extends AbstractRepositoryQueryPage {
 		updateButton.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				if (repository != null) {
+				if (getTaskRepository() != null) {
 					updateAttributesFromRepository(true);
 				} else {
 					MessageDialog.openInformation(Display.getCurrent().getActiveShell(),
@@ -325,8 +321,8 @@ public class TracCustomQueryPage extends AbstractRepositoryQueryPage {
 	public void setVisible(boolean visible) {
 		super.setVisible(visible);
 
-		if (scontainer != null) {
-			scontainer.setPerformActionEnabled(true);
+		if (getSearchContainer() != null) {
+			getSearchContainer().setPerformActionEnabled(true);
 		}
 
 		if (visible && firstTime) {
@@ -364,14 +360,14 @@ public class TracCustomQueryPage extends AbstractRepositoryQueryPage {
 	private boolean hasAttributes() {
 		TracRepositoryConnector connector = (TracRepositoryConnector) TasksUi.getRepositoryManager()
 				.getRepositoryConnector(TracCorePlugin.REPOSITORY_KIND);
-		ITracClient client = connector.getClientManager().getTracClient(repository);
+		ITracClient client = connector.getClientManager().getTracClient(getTaskRepository());
 		return client.hasAttributes();
 	}
 
 	private void updateAttributesFromRepository(final boolean force) {
 		TracRepositoryConnector connector = (TracRepositoryConnector) TasksUi.getRepositoryManager()
 				.getRepositoryConnector(TracCorePlugin.REPOSITORY_KIND);
-		final ITracClient client = connector.getClientManager().getTracClient(repository);
+		final ITracClient client = connector.getClientManager().getTracClient(getTaskRepository());
 
 		if (!client.hasAttributes() || force) {
 			try {
@@ -387,15 +383,15 @@ public class TracCustomQueryPage extends AbstractRepositoryQueryPage {
 
 				if (getContainer() != null) {
 					getContainer().run(true, true, runnable);
-				} else if (scontainer != null) {
-					scontainer.getRunnableContext().run(true, true, runnable);
+				} else if (getSearchContainer() != null) {
+					getSearchContainer().getRunnableContext().run(true, true, runnable);
 				} else {
 					IProgressService service = PlatformUI.getWorkbench().getProgressService();
 					service.busyCursorWhile(runnable);
 				}
 			} catch (InvocationTargetException e) {
 				TasksUiInternal.displayStatus("Error updating attributes", TracCorePlugin.toStatus(e.getCause(),
-						repository));
+						getTaskRepository()));
 				return;
 			} catch (InterruptedException e) {
 				return;
@@ -412,14 +408,6 @@ public class TracCustomQueryPage extends AbstractRepositoryQueryPage {
 		milestoneField.setValues(client.getMilestones());
 	}
 
-	public TaskRepository getRepository() {
-		return repository;
-	}
-
-	public void setRepository(TaskRepository repository) {
-		this.repository = repository;
-	}
-
 	@Override
 	public boolean isPageComplete() {
 		if (titleText != null && titleText.getText().length() > 0) {
@@ -451,7 +439,8 @@ public class TracCustomQueryPage extends AbstractRepositoryQueryPage {
 
 	@Override
 	public TracRepositoryQuery getQuery() {
-		return new TracRepositoryQuery(repository.getRepositoryUrl(), getQueryUrl(repository.getRepositoryUrl()), getTitleText());
+		return new TracRepositoryQuery(getTaskRepository().getRepositoryUrl(),
+				getQueryUrl(getTaskRepository().getRepositoryUrl()), getTitleText());
 	}
 
 	private String getTitleText() {
@@ -470,12 +459,12 @@ public class TracCustomQueryPage extends AbstractRepositoryQueryPage {
 	// }
 
 	@Override
-	public boolean performAction() {
+	public boolean performSearch() {
 		if (inSearchContainer()) {
 			saveState();
 		}
 
-		return super.performAction();
+		return super.performSearch();
 	}
 
 	@Override
@@ -490,7 +479,7 @@ public class TracCustomQueryPage extends AbstractRepositoryQueryPage {
 
 	private boolean restoreWidgetValues() {
 		IDialogSettings settings = getDialogSettings();
-		String repoId = "." + repository.getRepositoryUrl();
+		String repoId = "." + getTaskRepository().getRepositoryUrl();
 
 		String searchUrl = settings.get(SEARCH_URL_ID + repoId);
 		if (searchUrl == null) {
@@ -503,7 +492,7 @@ public class TracCustomQueryPage extends AbstractRepositoryQueryPage {
 
 	@Override
 	public void saveState() {
-		String repoId = "." + repository.getRepositoryUrl();
+		String repoId = "." + getTaskRepository().getRepositoryUrl();
 		IDialogSettings settings = getDialogSettings();
 		settings.put(SEARCH_URL_ID + repoId, getTracSearch().toUrl());
 	}
@@ -768,4 +757,9 @@ public class TracCustomQueryPage extends AbstractRepositoryQueryPage {
 
 	}
 
+	@Override
+	public String getQueryTitle() {
+		return (titleText != null) ? titleText.getText() : null;
+	}
+
 }