NEW - bug 185564: Sometimes a wrong task is activated on new task list

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

4 files changed, 11 insertions, 99 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/icons/elcl16/warning.gif b/org.eclipse.mylyn.tasks.ui/icons/elcl16/warning.gif
index 35260475d..6e4474856 100644
--- a/org.eclipse.mylyn.tasks.ui/icons/elcl16/warning.gif
+++ b/org.eclipse.mylyn.tasks.ui/icons/elcl16/warning.gif
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/CompositeSynchronizationImageDescriptor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/CompositeSynchronizationImageDescriptor.java
deleted file mode 100644
index 7479d6f12..000000000
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/CompositeSynchronizationImageDescriptor.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 - 2006 Mylar eclipse.org project and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Mylar project committers - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylar.internal.tasks.ui;
-
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-
-/**
- * @author Mik Kersten
- */
-public class CompositeSynchronizationImageDescriptor extends CompositeImageDescriptor {
-
-	private ImageData base;
-	
-	private ImageData overlay;
-	
-	protected Point size;
-	
-	public CompositeSynchronizationImageDescriptor(ImageDescriptor icon, ImageDescriptor overlay) {
-		this.base = getImageData(icon);
-		if (overlay != null) {
-			this.overlay = getImageData(overlay);
-		}
-		this.size = new Point(CompositeTaskImageDescriptor.WIDTH, base.height);
-	}
-	
-	@Override
-	protected void drawCompositeImage(int width, int height) {
-		if (overlay != null) {
-			drawImage(overlay, 2, 0);
-		}
-		drawImage(base, 13, 2);
-	}
-
-	private ImageData getImageData(ImageDescriptor descriptor) {
-		ImageData data = descriptor.getImageData(); 
-		// see bug 51965: getImageData can return null
-		if (data == null) {
-			data = DEFAULT_IMAGE_DATA;
-		}
-		return data;
-	}
-
-	@Override
-	protected Point getSize() {
-		return new Point(size.x, size.y);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiImages.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiImages.java
index 4295581f5..824f0b30b 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiImages.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiImages.java
@@ -41,10 +41,6 @@ public class TasksUiImages {
 
 	private static final String T_OVR = "ovr16";
 
-//	public static final Point SIZE = new Point(16, 16);
-
-//	public static final Point SIZE_WIDE = new Point(30, 16);
-
 	private static final URL baseURL = TasksUiPlugin.getDefault().getBundle().getEntry("/icons/");
 
 	public static final ImageDescriptor TASK_ACTIVE = create(T_TOOL, "task-active.gif");
@@ -167,15 +163,6 @@ public class TasksUiImages {
 	public static final ImageDescriptor STATUS_NORMAL_CONFLICT = createWithOverlay(STATUS_NORMAL, OVERLAY_CONFLICT,
 			true, true);
 
-//	public static final ImageDescriptor STATUS_CONTEXT_INCOMING = createWithOverlay(STATUS_CONTEXT, OVERLAY_INCOMMING,
-//			true, true);
-//
-//	public static final ImageDescriptor STATUS_CONTEXT_OUTGOING = createWithOverlay(STATUS_CONTEXT, OVERLAY_OUTGOING,
-//			true, true);
-//
-//	public static final ImageDescriptor STATUS_CONTEXT_CONFLICT = createWithOverlay(STATUS_CONTEXT, OVERLAY_CONFLICT,
-//			true, true);
-
 	public static final ImageDescriptor QUERY = create(T_TOOL, "query.gif");
 
 	public static final ImageDescriptor QUERY_NEW = create(T_TOOL, "query-new.gif");
@@ -304,24 +291,6 @@ public class TasksUiImages {
 		}
 		return image;
 	}
-
-	public static Image getCompositeSynchronizationImage(ImageDescriptor icon, ImageDescriptor overlay) {
-		if (icon == null) {
-			return null;
-		}
-		String key = "" + icon.hashCode();
-		if (overlay != null) {
-			key += overlay.hashCode();
-		}
-				
-		Image image = getImageRegistry().get(key);
-		if (image == null) {
-			CompositeSynchronizationImageDescriptor imageDescriptor = new CompositeSynchronizationImageDescriptor(icon, overlay);
-			image = imageDescriptor.createImage(true);
-			getImageRegistry().put(key, image);
-		}
-		return image;
-	}
 	
 	private static ImageRegistry getImageRegistry() {
 		if (imageRegistry == null) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
index 9bde724ad..caeb95d93 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
@@ -115,6 +115,7 @@ import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.graphics.Region;
 import org.eclipse.swt.widgets.Composite;
@@ -815,22 +816,23 @@ public class TaskListView extends ViewPart {
 		
 		getViewer().getTree().addMouseListener(new MouseListener() {
 
-			public void mouseDoubleClick(MouseEvent e) {
-			}
-
 			public void mouseDown(MouseEvent e) {
-				TreeItem[] selected = getViewer().getTree().getSelection();
-				if (selected.length == 1) {
-					Object selectedObject = selected[0].getData();
-					if (selectedObject instanceof ITask || selectedObject instanceof AbstractQueryHit) {
-						if (e.x > activationImageOffset-2 && e.x < activationImageOffset-2+18) {
-							taskListCellModifier.toggleTaskActivation((ITaskListElement) selectedObject);
+				Object selected = ((Tree)e.widget).getItem(new Point(e.x, e.y));
+				if (selected instanceof TreeItem) {
+					if (((TreeItem)selected).getData() instanceof ITask || ((TreeItem)selected).getData() instanceof AbstractQueryHit) {
+						if (e.x > activationImageOffset-8 && e.x < activationImageOffset-2+18) {
+							taskListCellModifier.toggleTaskActivation((ITaskListElement)((TreeItem)selected).getData());
 						}
 					}
 				}
 			}
+			
+			public void mouseDoubleClick(MouseEvent e) {
+				// ignore
+			}
 
 			public void mouseUp(MouseEvent e) {
+				// ignore
 			}
 
 		});