Attachment 74404 Details for Bug 174473 – repository wizard v1

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

[patch] repository wizard v1

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

on 2007-07-23 19:54:58 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Balazs Brinkus

Created: 2007-07-23 19:54:58 EDT

Size: 6.82 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.tasks.ui
>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	23 Jul 2007 23:47:50 -0000
>@@ -10,7 +10,6 @@
> 
> import org.eclipse.jface.viewers.IStructuredSelection;
> import org.eclipse.mylyn.internal.tasks.ui.actions.AddRepositoryAction;
>-import org.eclipse.mylyn.tasks.core.TaskRepository;
> import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
> import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage;
> import org.eclipse.ui.IWorkbench;
>@@ -34,7 +33,7 @@
> 	@Override
> 	public boolean performFinish() {
> 		if (canFinish()) {
>-			TaskRepository repository = abstractRepositorySettingsPage.createTaskRepository();
>+			repository = abstractRepositorySettingsPage.createTaskRepository();
> 			abstractRepositorySettingsPage.updateProperties(repository);
> 			TasksUiPlugin.getRepositoryManager().addRepository(repository,
> 					TasksUiPlugin.getDefault().getRepositoriesFilePath());
>Index: src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositoryClientWizard.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositoryClientWizard.java,v
>retrieving revision 1.14
>diff -u -r1.14 AbstractRepositoryClientWizard.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositoryClientWizard.java	26 Jun 2007 01:16:40 -0000	1.14
>+++ src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositoryClientWizard.java	23 Jul 2007 23:47:50 -0000
>@@ -13,6 +13,7 @@
> import org.eclipse.jface.wizard.Wizard;
> import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
> import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
>+import org.eclipse.mylyn.tasks.core.TaskRepository;
> import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
> import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
> import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage;
>@@ -28,6 +29,8 @@
> 	 */
> 	private String repositoryType;
> 
>+	protected TaskRepository repository;
>+
> 	private SelectRepositoryClientPage selectRepositoryClientPage = new SelectRepositoryClientPage(this);
> 
> 	protected AbstractRepositorySettingsPage abstractRepositorySettingsPage;
>@@ -51,6 +54,10 @@
> 		return repositoryConnector;
> 	}
> 
>+	public TaskRepository getRepository() {
>+		return repository;
>+	}
>+
> 	@Override
> 	public void addPages() {
> 		Collection<AbstractRepositoryConnector> connectors = TasksUiPlugin.getRepositoryManager()
>Index: src/org/eclipse/mylyn/internal/tasks/ui/commands/AddTaskRepositoryHandler.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/AddTaskRepositoryHandler.java,v
>retrieving revision 1.5
>diff -u -r1.5 AddTaskRepositoryHandler.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/commands/AddTaskRepositoryHandler.java	10 Jul 2007 00:30:39 -0000	1.5
>+++ src/org/eclipse/mylyn/internal/tasks/ui/commands/AddTaskRepositoryHandler.java	23 Jul 2007 23:47:50 -0000
>@@ -11,8 +11,16 @@
> import org.eclipse.core.commands.AbstractHandler;
> import org.eclipse.core.commands.ExecutionEvent;
> import org.eclipse.core.commands.ExecutionException;
>+import org.eclipse.jface.dialogs.MessageDialogWithToggle;
>+import org.eclipse.jface.preference.IPreferenceStore;
>+import org.eclipse.jface.window.Window;
>+import org.eclipse.jface.wizard.IWizard;
>+import org.eclipse.jface.wizard.Wizard;
> import org.eclipse.jface.wizard.WizardDialog;
> import org.eclipse.mylyn.internal.tasks.ui.wizards.NewRepositoryWizard;
>+import org.eclipse.mylyn.tasks.core.TaskRepository;
>+import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
>+import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
> import org.eclipse.swt.widgets.Shell;
> import org.eclipse.ui.PlatformUI;
> 
>@@ -20,22 +28,54 @@
>  * Handles the "add task repository" command
>  * 
>  * @author Willian Mitsuda
>+ * @author Balazs Brinkus (bug 174473)
>  */
> public class AddTaskRepositoryHandler extends AbstractHandler {
> 
>+	private static final String PREF_ADD_QUERY = "org.eclipse.mylyn.internal.tasks.add.query";
>+
> 	@Override
> 	public Object execute(ExecutionEvent event) throws ExecutionException {
> 		String param = event.getParameter("org.eclipse.mylyn.tasks.command.taskRepositoryId");
>-		NewRepositoryWizard wizard = new NewRepositoryWizard(param);
>+
>+		NewRepositoryWizard repositoryWizard = new NewRepositoryWizard(param);
> 		Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
> 		if (shell != null && !shell.isDisposed()) {
>-			WizardDialog dialog = new WizardDialog(shell, wizard);
>-			dialog.create();
>-			dialog.getShell().setText("Add Task Repository");
>-			dialog.setBlockOnOpen(true);
>-			dialog.open();
>+			WizardDialog repositoryDialog = new WizardDialog(shell, repositoryWizard);
>+			repositoryDialog.create();
>+			repositoryDialog.getShell().setText("Add Task Repository");
>+			repositoryDialog.setBlockOnOpen(true);
>+			repositoryDialog.open();
>+
>+			if (repositoryDialog.getReturnCode() == Window.OK) {
>+
>+				IPreferenceStore preferenceStore = TasksUiPlugin.getDefault().getPreferenceStore();
>+
>+				if (!preferenceStore.getBoolean(PREF_ADD_QUERY)) {
>+					MessageDialogWithToggle messageDialog = MessageDialogWithToggle.openYesNoQuestion(
>+							PlatformUI.getWorkbench().getDisplay().getActiveShell(), "Add new query",
>+							"Would you like to add query for this repository?", "Do not show again", false,
>+							preferenceStore, PREF_ADD_QUERY);
>+					preferenceStore.setValue(PREF_ADD_QUERY, messageDialog.getToggleState());
>+
>+					if (messageDialog.getReturnCode() == 2) {
>+						TaskRepository taskRepository = repositoryWizard.getRepository();
>+
>+						AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getConnectorUi(taskRepository.getConnectorKind());
>+						IWizard queryWizard = connectorUi.getQueryWizard(taskRepository, null);
>+						((Wizard) queryWizard).setForcePreviousAndNextButtons(true);
>+
>+						WizardDialog queryDialog = new WizardDialog(shell, queryWizard);
>+						queryDialog.create();
>+						queryDialog.setTitle("Add Repository Query");
>+						queryDialog.setBlockOnOpen(true);
>+						queryDialog.open();
>+					}
>+				}
>+			}
>+
> 		}
>+
> 		return null;
> 	}
>-
> }

Actions: View | Diff

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