Attachment 83586 Details for Bug 206840 – patch

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

[patch] patch

patch206840.txt (text/plain), 13.40 KB, created by Frank Becker

on 2007-11-22 16:49:12 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2007-11-22 16:49:12 EST

Size: 13.40 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.bugzilla.ui
>Index: src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/NewBugzillaTaskWizard.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/NewBugzillaTaskWizard.java,v
>retrieving revision 1.22
>diff -u -r1.22 NewBugzillaTaskWizard.java
>--- src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/NewBugzillaTaskWizard.java	16 Nov 2007 19:22:54 -0000	1.22
>+++ src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/NewBugzillaTaskWizard.java	22 Nov 2007 21:45:03 -0000
>@@ -98,18 +98,23 @@
> 	@Override
> 	public boolean performFinish() {
> 		try {
>+			String copyContextHandleIdentifier = null;
>+			
> 			productPage.saveDataToModel();
> 
> 			if (taskSelection != null) {
>-				AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
>-						repository.getConnectorKind());
>-				AbstractTaskDataHandler taskDataHandler = connector.getTaskDataHandler();
>-				if (taskDataHandler != null) {
>-					taskDataHandler.cloneTaskData(taskSelection.getTaskData(), taskData);
>+				if (taskSelection.getTaskData() != null) {
>+					AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager()
>+							.getRepositoryConnector(repository.getConnectorKind());
>+					AbstractTaskDataHandler taskDataHandler = connector.getTaskDataHandler();
>+					if (taskDataHandler != null) {
>+						taskDataHandler.cloneTaskData(taskSelection.getTaskData(), taskData);
>+					}
> 				}
>+				copyContextHandleIdentifier = taskSelection.getCopyContextHandleIdentifier();
> 			}
> 
>-			NewTaskEditorInput editorInput = new NewTaskEditorInput(repository, taskData);
>+			NewTaskEditorInput editorInput = new NewTaskEditorInput(repository, taskData, copyContextHandleIdentifier);
> 			IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
> 			TasksUiUtil.openEditor(editorInput, TaskEditor.ID_EDITOR, page);
> 			return true;
>#P org.eclipse.mylyn.tasks.core
>Index: src/org/eclipse/mylyn/tasks/core/TaskSelection.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskSelection.java,v
>retrieving revision 1.2
>diff -u -r1.2 TaskSelection.java
>--- src/org/eclipse/mylyn/tasks/core/TaskSelection.java	16 Nov 2007 19:22:56 -0000	1.2
>+++ src/org/eclipse/mylyn/tasks/core/TaskSelection.java	22 Nov 2007 21:45:04 -0000
>@@ -21,6 +21,8 @@
> public class TaskSelection {
> 
> 	private final RepositoryTaskData taskData;
>+	
>+	private String copyContextHandleIdentifier;
> 
> 	public TaskSelection(RepositoryTaskData taskData) {
> 		if (taskData == null) {
>@@ -30,6 +32,7 @@
> 		try {
> 			this.taskData = (RepositoryTaskData) TaskDataManager.ObjectCloner.deepCopy(taskData);
> 			this.taskData.setAttributeFactory(taskData.getAttributeFactory());
>+			this.copyContextHandleIdentifier = null;
> 		} catch (Exception e) {
> 			StatusHandler.fail(e, "Error creating a task data copy", false);
> 			throw new RuntimeException(e);
>@@ -42,6 +45,7 @@
> 		taskData.setSummary(task.getSummary());
> 		taskData.setAttributeValue(RepositoryTaskAttribute.PRIORITY, task.getPriority());
> 		this.taskData = taskData;
>+		this.copyContextHandleIdentifier = null;
> 	}
> 
> 	public TaskSelection(String summary, String description) {
>@@ -50,12 +54,22 @@
> 		taskData.setSummary(summary);
> 		taskData.setDescription(description);
> 		this.taskData = taskData;
>+		this.copyContextHandleIdentifier = null;
>+	}
>+
>+	public TaskSelection(String copyContextHandleIdentifier) {
>+		this.taskData = null;
>+		this.copyContextHandleIdentifier = copyContextHandleIdentifier;
> 	}
> 
> 	public RepositoryTaskData getTaskData() {
> 		return taskData;
> 	}
> 
>+	public String getCopyContextHandleIdentifier() {
>+		return copyContextHandleIdentifier;
>+	}
>+
> 	private class IdentityAttributeFactory extends AbstractAttributeFactory {
> 
> 		private static final long serialVersionUID = 1L;
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/tasks/ui/editors/NewTaskEditorInput.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/NewTaskEditorInput.java,v
>retrieving revision 1.10
>diff -u -r1.10 NewTaskEditorInput.java
>--- src/org/eclipse/mylyn/tasks/ui/editors/NewTaskEditorInput.java	22 Oct 2007 05:01:40 -0000	1.10
>+++ src/org/eclipse/mylyn/tasks/ui/editors/NewTaskEditorInput.java	22 Nov 2007 21:45:09 -0000
>@@ -22,13 +22,20 @@
>  * @since 2.0
>  */
> public class NewTaskEditorInput extends RepositoryTaskEditorInput {
>+	
>+	private String copyContextHandleIdentifier;
> 
> 	public NewTaskEditorInput(TaskRepository repository, RepositoryTaskData taskData) {
>+		this(repository, taskData, null);
>+	}
>+
>+	public NewTaskEditorInput(TaskRepository repository, RepositoryTaskData taskData, String copyContextHandleIdentifier) {
> 		super(repository, taskData.getId(), "");
> 		setOldTaskData(taskData);
> 		Set<RepositoryTaskAttribute> edits = Collections.emptySet();
> 		setOldEdits(edits);
> 		setEditableTaskData(taskData);
>+		this.copyContextHandleIdentifier = copyContextHandleIdentifier;
> 	}
> 
> 	@Override
>@@ -49,5 +56,9 @@
> 	public void refreshInput() {
> 		// does nothing
> 	}
>+
>+	public String getCopyContextHandleIdentifier() {
>+		return copyContextHandleIdentifier;
>+	}
> 	
> }
>Index: src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java,v
>retrieving revision 1.247
>diff -u -r1.247 AbstractRepositoryTaskEditor.java
>--- src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java	22 Nov 2007 02:35:59 -0000	1.247
>+++ src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java	22 Nov 2007 21:45:09 -0000
>@@ -68,6 +68,7 @@
> import org.eclipse.jface.viewers.Viewer;
> import org.eclipse.jface.viewers.ViewerSorter;
> import org.eclipse.jface.window.ToolTip;
>+import org.eclipse.mylyn.context.core.ContextCorePlugin;
> import org.eclipse.mylyn.internal.tasks.core.CommentQuoter;
> import org.eclipse.mylyn.internal.tasks.ui.PersonProposalLabelProvider;
> import org.eclipse.mylyn.internal.tasks.ui.PersonProposalProvider;
>@@ -3256,6 +3257,12 @@
> 						modifiedTask = TasksUiPlugin.getTaskListManager().getTaskList().getTask(repository.getUrl(),
> 								taskData.getId());
> 					}
>+					if (editorInput instanceof NewTaskEditorInput) {
>+						ContextCorePlugin.getContextManager().cloneContext(((NewTaskEditorInput)editorInput).getCopyContextHandleIdentifier(),modifiedTask.getHandleIdentifier());
>+					}
>+//					 ContextCorePlugin.getContextManager().cloneContext(
>+//						     sourceTask.getHandleIdentifier(), 
>+//						     modifiedTask.getHandleIdentifier());
> 
> 					// Synchronization accounting...
> 					if (modifiedTask != null) {
>Index: src/org/eclipse/mylyn/tasks/ui/wizards/NewTaskWizard.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/NewTaskWizard.java,v
>retrieving revision 1.19
>diff -u -r1.19 NewTaskWizard.java
>--- src/org/eclipse/mylyn/tasks/ui/wizards/NewTaskWizard.java	15 Nov 2007 22:04:37 -0000	1.19
>+++ src/org/eclipse/mylyn/tasks/ui/wizards/NewTaskWizard.java	22 Nov 2007 21:45:09 -0000
>@@ -69,6 +69,8 @@
> 
> 	@Override
> 	public boolean performFinish() {
>+		String copyContextHandleIdentifier = null;
>+
> 		AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
> 				taskRepository.getConnectorKind());
> 
>@@ -114,11 +116,12 @@
> 			return false;
> 		}
> 
>-		if (taskSelection != null) {
>+		if (taskSelection.getTaskData() != null) {
> 			taskDataHandler.cloneTaskData(taskSelection.getTaskData(), taskData);
> 		}
>+		copyContextHandleIdentifier = taskSelection.getCopyContextHandleIdentifier();
> 
>-		NewTaskEditorInput editorInput = new NewTaskEditorInput(taskRepository, taskData);
>+		NewTaskEditorInput editorInput = new NewTaskEditorInput(taskRepository, taskData, copyContextHandleIdentifier);
> 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
> 		TasksUiUtil.openEditor(editorInput, TaskEditor.ID_EDITOR, page);
> 		return true;
>Index: src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskSelectionDialog.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskSelectionDialog.java,v
>retrieving revision 1.25
>diff -u -r1.25 TaskSelectionDialog.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskSelectionDialog.java	27 Aug 2007 21:56:49 -0000	1.25
>+++ src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskSelectionDialog.java	22 Nov 2007 21:45:05 -0000
>@@ -42,6 +42,8 @@
> import org.eclipse.swt.events.KeyEvent;
> import org.eclipse.swt.events.ModifyEvent;
> import org.eclipse.swt.events.ModifyListener;
>+import org.eclipse.swt.events.SelectionAdapter;
>+import org.eclipse.swt.events.SelectionEvent;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.widgets.Button;
> import org.eclipse.swt.widgets.Composite;
>@@ -63,6 +65,8 @@
>  */
> public class TaskSelectionDialog extends SelectionStatusDialog {
> 
>+	private boolean createNewTask = false;
>+	
> 	/**
> 	 * Implements a {@link ViewFilter} based on content typed in the filter field
> 	 */
>@@ -281,6 +285,19 @@
> 			filterText.setSelection(0, text.length());
> 		}
> 
>+		Button newButton = new Button(area, SWT.PUSH);
>+		newButton.setText("New Task");
>+		newButton.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, false));
>+
>+		newButton.addSelectionListener(new SelectionAdapter() {
>+			@Override
>+			public void widgetSelected(SelectionEvent e) {
>+				createNewTask = true;
>+				setReturnCode(OK);
>+				close();
>+			}
>+		});
>+
> 		return area;
> 	}
> 
>@@ -297,4 +314,8 @@
> 		return super.close();
> 	}
> 
>+	public boolean isCreateNewTask() {
>+		return createNewTask;
>+	}
>+
> }
>#P org.eclipse.mylyn.jira.ui
>Index: src/org/eclipse/mylyn/internal/jira/ui/wizards/NewJiraTaskWizard.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.jira.ui/src/org/eclipse/mylyn/internal/jira/ui/wizards/NewJiraTaskWizard.java,v
>retrieving revision 1.22
>diff -u -r1.22 NewJiraTaskWizard.java
>--- src/org/eclipse/mylyn/internal/jira/ui/wizards/NewJiraTaskWizard.java	16 Nov 2007 06:40:23 -0000	1.22
>+++ src/org/eclipse/mylyn/internal/jira/ui/wizards/NewJiraTaskWizard.java	22 Nov 2007 21:45:10 -0000
>@@ -67,6 +67,8 @@
> 
> 	@Override
> 	public boolean performFinish() {
>+		String copyContextHandleIdentifier = null;
>+
> 		AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
> 				JiraUiPlugin.REPOSITORY_KIND);
> 
>@@ -80,11 +82,14 @@
> 		Project project = projectPage.getSelectedProject();
> 		taskDataHandler.initializeTaskData(taskData, server, project);
> 		if (taskSelection != null) {
>-			taskDataHandler.cloneTaskData(taskSelection.getTaskData(), taskData);
>-		}		
>+			if (taskSelection.getTaskData() != null) {
>+				taskDataHandler.cloneTaskData(taskSelection.getTaskData(), taskData);
>+			}
>+			copyContextHandleIdentifier = taskSelection.getCopyContextHandleIdentifier();
>+		}
> 		taskData.setAttributeValue(RepositoryTaskAttribute.PRODUCT, project.getName());
> 
>-		NewTaskEditorInput editorInput = new NewTaskEditorInput(taskRepository, taskData);
>+		NewTaskEditorInput editorInput = new NewTaskEditorInput(taskRepository, taskData, copyContextHandleIdentifier);
> 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
> 		TasksUiUtil.openEditor(editorInput, TaskEditor.ID_EDITOR, page);
> 		return true;
>#P org.eclipse.mylyn.context.ui
>Index: src/org/eclipse/mylyn/internal/context/ui/actions/ContextCopyAction.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ContextCopyAction.java,v
>retrieving revision 1.14
>diff -u -r1.14 ContextCopyAction.java
>--- src/org/eclipse/mylyn/internal/context/ui/actions/ContextCopyAction.java	22 Nov 2007 01:28:49 -0000	1.14
>+++ src/org/eclipse/mylyn/internal/context/ui/actions/ContextCopyAction.java	22 Nov 2007 21:45:11 -0000
>@@ -17,9 +17,11 @@
> import org.eclipse.mylyn.internal.context.core.InteractionContext;
> import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants;
> import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
>+import org.eclipse.mylyn.internal.tasks.ui.actions.NewTaskAction;
> import org.eclipse.mylyn.internal.tasks.ui.actions.TaskSelectionDialog;
> import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
> import org.eclipse.mylyn.tasks.core.AbstractTask;
>+import org.eclipse.mylyn.tasks.core.TaskSelection;
> import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
> import org.eclipse.ui.IViewPart;
> import org.eclipse.ui.PlatformUI;
>@@ -77,6 +79,15 @@
> 			return;
> 		}
> 
>+		if (dialog.isCreateNewTask()) {
>+			NewTaskAction action = new NewTaskAction();
>+			final TaskSelection taskSelection;
>+			taskSelection = new TaskSelection(sourceTask.getHandleIdentifier());
>+			if (action.showWizard(taskSelection) == Dialog.OK) {
>+				return;
>+			}
>+		}
>+
> 		Object result = dialog.getFirstResult();
> 
> 		AbstractTask targetTask = null;

Actions: View | Diff

Attachments on bug 206840: 83374 | 83586 | 83587