Attachment 84110 Details for Bug 211080 – fix serializing tasks in TaskTransfer

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

[patch] fix serializing tasks in TaskTransfer

clipboard.txt (text/plain), 4.18 KB, created by Steffen Pingel

on 2007-11-29 18:06:11 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Steffen Pingel

Created: 2007-11-29 18:06:11 EST

Size: 4.18 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/internal/tasks/ui/TaskTransfer.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskTransfer.java,v
>retrieving revision 1.3
>diff -u -r1.3 TaskTransfer.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/TaskTransfer.java	10 Jul 2007 00:30:39 -0000	1.3
>+++ src/org/eclipse/mylyn/internal/tasks/ui/TaskTransfer.java	29 Nov 2007 23:04:31 -0000
>@@ -50,11 +50,11 @@
> 
> 	@Override
> 	protected void javaToNative(Object data, TransferData transferData) {
>-		if (!(data instanceof AbstractTask[])) {
>+		if (!(data instanceof Object[])) {
> 			return;
> 		}
> 
>-		AbstractTask[] tasks = (AbstractTask[]) data;
>+		Object[] tasks = (Object[]) data;
> 		int resourceCount = tasks.length;
> 
> 		try {
>@@ -66,7 +66,9 @@
> 
> 			//write each resource
> 			for (int i = 0; i < tasks.length; i++) {
>-				writeResource(dataOut, tasks[i]);
>+				if (tasks[i] instanceof AbstractTask) {
>+					dataOut.writeUTF(((AbstractTask) tasks[i]).getHandleIdentifier());
>+				}
> 			}
> 
> 			//cleanup
>@@ -103,7 +105,4 @@
> 		return TasksUiPlugin.getTaskListManager().getTaskList().getTask(handle);
> 	}
> 
>-	private void writeResource(DataOutputStream dataOut, AbstractTask task) throws IOException {
>-		dataOut.writeUTF(task.getHandleIdentifier());
>-	}
> }
>Index: src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java,v
>retrieving revision 1.44
>diff -u -r1.44 TaskListDropAdapter.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java	25 Oct 2007 18:22:41 -0000	1.44
>+++ src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java	29 Nov 2007 23:04:31 -0000
>@@ -20,10 +20,7 @@
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.NullProgressMonitor;
> import org.eclipse.jface.dialogs.MessageDialog;
>-import org.eclipse.jface.viewers.ISelection;
>-import org.eclipse.jface.viewers.IStructuredSelection;
> import org.eclipse.jface.viewers.StructuredSelection;
>-import org.eclipse.jface.viewers.TreeViewer;
> import org.eclipse.jface.viewers.Viewer;
> import org.eclipse.jface.viewers.ViewerDropAdapter;
> import org.eclipse.mylyn.context.core.ContextCorePlugin;
>@@ -82,18 +79,12 @@
> 	public boolean performDrop(Object data) {
> 		Object currentTarget = getCurrentTarget();
> 		List<AbstractTask> tasksToMove = new ArrayList<AbstractTask>();
>-		ISelection selection = ((TreeViewer) getViewer()).getSelection();
> 		if (isUrl(data) && createTaskFromUrl(data)) {
> 			tasksToMove.add(newTask);
>-		} else if (TaskTransfer.getInstance().isSupportedType(currentTransfer)) {
>-			for (Object selectedObject : ((IStructuredSelection) selection).toList()) {
>-				AbstractTask toMove = null;
>-				if (selectedObject instanceof AbstractTask) {
>-					toMove = (AbstractTask) selectedObject;
>-				}
>-				if (toMove != null) {
>-					tasksToMove.add(toMove);
>-				}
>+		} else if (TaskTransfer.getInstance().isSupportedType(currentTransfer) && data instanceof AbstractTask[]) {
>+			AbstractTask[] tasks = (AbstractTask[]) data;
>+			for (AbstractTask task : tasks) {
>+				tasksToMove.add(task);
> 			}
> 		} else if (data instanceof String && createTaskFromString((String) data)) {
> 			tasksToMove.add(newTask);
>@@ -302,11 +293,10 @@
> 	public boolean validateDrop(Object targetObject, int operation, TransferData transferType) {
> 		currentTransfer = transferType;
> 
>-		Object selectedObject = ((IStructuredSelection) ((TreeViewer) getViewer()).getSelection()).getFirstElement();
> 		if (FileTransfer.getInstance().isSupportedType(currentTransfer)) {
> 			// handle all files
> 			return true;
>-		} else if (selectedObject != null && !(selectedObject instanceof AbstractRepositoryQuery)) {
>+		} else if (TaskTransfer.getInstance().isSupportedType(currentTransfer)) {
> 			if (getCurrentTarget() instanceof TaskCategory || getCurrentTarget() instanceof UnfiledCategory
> 					|| getCurrentTarget() instanceof ScheduledTaskContainer) {
> 				return true;

Actions: View | Diff

Attachments on bug 211080: 84110 | 84111 | 84223 | 84224