Attachment 74313 Details for Bug 174473 – repository wizard

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] repository wizard

174473-repository.txt (text/plain), 11.84 KB, created by Balazs Brinkus

on 2007-07-22 14:22:33 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Balazs Brinkus

Created: 2007-07-22 14:22:33 EDT

Size: 11.84 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.trac.ui
>Index: src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java,v
>retrieving revision 1.5
>diff -u -r1.5 TracConnectorUi.java
>--- src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java	10 Jul 2007 00:30:26 -0000	1.5
>+++ src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java	22 Jul 2007 17:56:55 -0000
>@@ -123,8 +123,13 @@
> 		TracTask task = new TracTask("", Kind.TASK.name(), Kind.TASK.toString());
> 		task.setTaskKind(Kind.TASK.toString());
> 		legendItems.add(task);
>-		
>+
> 		return legendItems;
> 	}
> 
>+	@Override
>+	public WizardPage getRepositoryPage(TaskRepository repository) {
>+		return new TracCustomQueryPage(repository);
>+	}
>+
> }
>#P org.eclipse.mylyn.web.tasks
>Index: src/org/eclipse/mylyn/internal/web/tasks/WebConnectorUi.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.web.tasks/src/org/eclipse/mylyn/internal/web/tasks/WebConnectorUi.java,v
>retrieving revision 1.4
>diff -u -r1.4 WebConnectorUi.java
>--- src/org/eclipse/mylyn/internal/web/tasks/WebConnectorUi.java	10 Jul 2007 00:30:30 -0000	1.4
>+++ src/org/eclipse/mylyn/internal/web/tasks/WebConnectorUi.java	22 Jul 2007 17:56:56 -0000
>@@ -10,6 +10,7 @@
> 
> import org.eclipse.jface.resource.ImageDescriptor;
> import org.eclipse.jface.wizard.IWizard;
>+import org.eclipse.jface.wizard.WizardPage;
> import org.eclipse.mylyn.internal.tasks.core.LocalTask;
> import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
> import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
>@@ -67,4 +68,9 @@
> 	public boolean hasSearchPage() {
> 		return false;
> 	}
>+
>+	@Override
>+	public WizardPage getRepositoryPage(TaskRepository repository) {
>+		return new WebQueryWizardPage(repository);
>+	}
> }
>#P org.eclipse.mylyn.bugzilla.ui
>Index: src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java,v
>retrieving revision 1.8
>diff -u -r1.8 BugzillaConnectorUi.java
>--- src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java	27 Jun 2007 07:34:35 -0000	1.8
>+++ src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java	22 Jul 2007 17:56:57 -0000
>@@ -19,6 +19,7 @@
> 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.bugzilla.core.BugzillaCorePlugin;
> import org.eclipse.mylyn.internal.bugzilla.core.BugzillaReportElement;
> import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryQuery;
>@@ -213,4 +214,9 @@
> 		return super.supportsDueDates(task);
> 	}
> 
>+	@Override
>+	public WizardPage getRepositoryPage(TaskRepository repository) {
>+		return new BugzillaQueryTypeWizardPage(repository);
>+	}
>+
> }
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java,v
>retrieving revision 1.39
>diff -u -r1.39 AbstractRepositoryConnectorUi.java
>--- src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java	10 Jul 2007 00:30:40 -0000	1.39
>+++ src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java	22 Jul 2007 17:56:58 -0000
>@@ -65,6 +65,8 @@
> 	 *            can be null
> 	 */
> 	public abstract IWizard getQueryWizard(TaskRepository repository, AbstractRepositoryQuery queryToEdit);
>+	
>+	public abstract WizardPage getRepositoryPage(TaskRepository repository);
> 
> 	public abstract IWizard getNewTaskWizard(TaskRepository taskRepository);
> 
>Index: src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewRepositoryWizard.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewRepositoryWizard.java,v
>retrieving revision 1.9
>diff -u -r1.9 NewRepositoryWizard.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewRepositoryWizard.java	26 Jun 2007 01:16:40 -0000	1.9
>+++ src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewRepositoryWizard.java	22 Jul 2007 17:56:58 -0000
>@@ -8,12 +8,20 @@
> 
> package org.eclipse.mylyn.internal.tasks.ui.wizards;
> 
>+import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.jface.viewers.IStructuredSelection;
>+import org.eclipse.jface.wizard.IWizardPage;
> import org.eclipse.mylyn.internal.tasks.ui.actions.AddRepositoryAction;
>+import org.eclipse.mylyn.monitor.core.StatusHandler;
>+import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
>+import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
> import org.eclipse.mylyn.tasks.core.TaskRepository;
> import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
>+import org.eclipse.mylyn.tasks.ui.search.AbstractRepositoryQueryPage;
> import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage;
> import org.eclipse.ui.IWorkbench;
>+import org.eclipse.ui.actions.WorkspaceModifyOperation;
> 
> /**
>  * @author Mik Kersten
>@@ -38,6 +46,46 @@
> 			abstractRepositorySettingsPage.updateProperties(repository);
> 			TasksUiPlugin.getRepositoryManager().addRepository(repository,
> 					TasksUiPlugin.getDefault().getRepositoriesFilePath());
>+
>+			try {
>+				IWizardPage wizardPage = abstractRepositorySettingsPage.getRepositoryPage();
>+
>+				String connectorKind = repository.getConnectorKind();
>+				if (connectorKind.equals("bugzilla"))
>+					wizardPage = wizardPage.getNextPage();
>+
>+				if (wizardPage != null && wizardPage instanceof AbstractRepositoryQueryPage) {
>+					AbstractRepositoryQueryPage queryPage = (AbstractRepositoryQueryPage) wizardPage;
>+
>+					final AbstractRepositoryQuery query = queryPage.getQuery();
>+
>+					TasksUiPlugin.getTaskListManager().getTaskList().addQuery(query);
>+
>+					WorkspaceModifyOperation op = new WorkspaceModifyOperation() {
>+						@Override
>+						protected void execute(IProgressMonitor monitor) throws CoreException {
>+							monitor.beginTask("Executing query", 50);
>+							try {
>+								AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager()
>+										.getRepositoryConnector(query.getRepositoryKind());
>+								TasksUiPlugin.getSynchronizationManager().synchronize(connector, query, null, true);
>+							} finally {
>+								monitor.done();
>+							}
>+						}
>+					};
>+
>+					try {
>+						getContainer().run(true, false, op);
>+					} catch (Exception e) {
>+						StatusHandler.log(e, "There was a problem executing the query refresh");
>+					}
>+				}
>+			} catch (Exception e) {
>+				e.printStackTrace();
>+				return true;
>+			}
>+
> 			return true;
> 		}
> 		return false;
>@@ -53,7 +101,16 @@
> 
> 	@Override
> 	public boolean canFinish() {
>-		return super.canFinish() && abstractRepositorySettingsPage != null
>-				&& abstractRepositorySettingsPage.isPageComplete();
>+
>+		try {
>+			IWizardPage wizardPage = abstractRepositorySettingsPage.getRepositoryPage();
>+			if (wizardPage.getNextPage() != null)
>+				return wizardPage.getNextPage().isPageComplete();
>+			else
>+				return wizardPage.isPageComplete();
>+		} catch (Exception e) {
>+			return super.canFinish() && abstractRepositorySettingsPage != null
>+					&& abstractRepositorySettingsPage.isPageComplete();
>+		}
> 	}
> }
>Index: src/org/eclipse/mylyn/internal/tasks/ui/LocalTaskConnectorUi.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/LocalTaskConnectorUi.java,v
>retrieving revision 1.3
>diff -u -r1.3 LocalTaskConnectorUi.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/LocalTaskConnectorUi.java	10 Jul 2007 00:30:39 -0000	1.3
>+++ src/org/eclipse/mylyn/internal/tasks/ui/LocalTaskConnectorUi.java	22 Jul 2007 17:56:58 -0000
>@@ -9,6 +9,7 @@
> package org.eclipse.mylyn.internal.tasks.ui;
> 
> import org.eclipse.jface.wizard.IWizard;
>+import org.eclipse.jface.wizard.WizardPage;
> import org.eclipse.mylyn.internal.tasks.core.LocalRepositoryConnector;
> import org.eclipse.mylyn.internal.tasks.ui.wizards.NewLocalTaskWizard;
> import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
>@@ -46,4 +47,9 @@
> 		return false;
> 	}
> 
>+	@Override
>+	public WizardPage getRepositoryPage(TaskRepository repository) {
>+		return null;
>+	}
>+
> }
>Index: src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java,v
>retrieving revision 1.30
>diff -u -r1.30 AbstractRepositorySettingsPage.java
>--- src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java	13 Jul 2007 17:45:25 -0000	1.30
>+++ src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java	22 Jul 2007 17:57:00 -0000
>@@ -22,6 +22,7 @@
> import org.eclipse.jface.operation.IRunnableWithProgress;
> import org.eclipse.jface.preference.PreferenceDialog;
> import org.eclipse.jface.preference.StringFieldEditor;
>+import org.eclipse.jface.wizard.IWizardPage;
> import org.eclipse.jface.wizard.WizardPage;
> import org.eclipse.mylyn.internal.tasks.core.IRepositoryConstants;
> import org.eclipse.mylyn.monitor.core.StatusHandler;
>@@ -186,6 +187,8 @@
> 
> 	private Hyperlink manageAccountHyperlink;
> 
>+	private IWizardPage repositoryPage;
>+
> 	public AbstractRepositorySettingsPage(String title, String description, AbstractRepositoryConnectorUi repositoryUi) {
> 		super(title);
> 		super.setTitle(title);
>@@ -1299,4 +1302,19 @@
> 
> 	}
> 
>+	@Override
>+	public IWizardPage getNextPage() {
>+		if (isPageComplete()) {
>+			AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getConnectorUi(connector.getConnectorKind());
>+			repositoryPage = connectorUi.getRepositoryPage(createTaskRepository());
>+			repositoryPage.setWizard(getWizard());
>+			return repositoryPage;
>+		}
>+		return super.getNextPage();
>+	}
>+
>+	public IWizardPage getRepositoryPage() {
>+		return repositoryPage;
>+	}
>+
> }
>#P org.eclipse.mylyn.jira.ui
>Index: src/org/eclipse/mylyn/internal/jira/ui/JiraConnectorUi.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.jira.ui/src/org/eclipse/mylyn/internal/jira/ui/JiraConnectorUi.java,v
>retrieving revision 1.5
>diff -u -r1.5 JiraConnectorUi.java
>--- src/org/eclipse/mylyn/internal/jira/ui/JiraConnectorUi.java	17 Jul 2007 22:53:39 -0000	1.5
>+++ src/org/eclipse/mylyn/internal/jira/ui/JiraConnectorUi.java	22 Jul 2007 17:57:01 -0000
>@@ -19,6 +19,7 @@
> import org.eclipse.jface.wizard.WizardPage;
> import org.eclipse.mylyn.internal.jira.ui.wizards.EditJiraQueryWizard;
> import org.eclipse.mylyn.internal.jira.ui.wizards.JiraQueryPage;
>+import org.eclipse.mylyn.internal.jira.ui.wizards.JiraQueryWizardPage;
> import org.eclipse.mylyn.internal.jira.ui.wizards.JiraRepositorySettingsPage;
> import org.eclipse.mylyn.internal.jira.ui.wizards.NewJiraQueryWizard;
> import org.eclipse.mylyn.internal.jira.ui.wizards.NewJiraTaskWizard;
>@@ -156,4 +157,9 @@
> 		return links;
> 	}
> 
>+	@Override
>+	public WizardPage getRepositoryPage(TaskRepository repository) {
>+		return new JiraQueryWizardPage(repository);
>+	}
>+
> }

Actions: View | Diff

Attachments on bug 174473: 74313 | 74314 | 74404 | 74405