Version update

5 files changed, 30 insertions, 26 deletions

diff --git a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java b/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java
index 4ddf641d4..03dbfba0f 100644
--- a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java
+++ b/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java
@@ -69,7 +69,7 @@ public class UiLegendDialog extends PopupDialog {
 	@Override
 	public int open() {
 		int open = super.open();
-		getShell().setLocation(getShell().getLocation().x, 20);
+//		getShell().setLocation(getShell().getLocation().x, getShell().getLocation().y+20);
 		getShell().setFocus();
 		return open;
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationManager.java
index 8df027eb6..4ea3e0712 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationManager.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationManager.java
@@ -74,15 +74,14 @@ public class TaskListNotificationManager implements IPropertyChangeListener {
 										popup.setBlockOnOpen(false);
 										popup.open();
 										
-										for (int i = 2; i <= 6; i+= 2) {
-											popup.getShell().setLocation(popup.getShell().getLocation().x, popup.getShell().getLocation().y - i);
-											try {
-												Thread.sleep(70);
-											} catch (InterruptedException e) {
-												// ignore
-											}
-										}
-										
+//										for (int i = 2; i <= 6; i+= 2) {
+//											popup.getShell().setLocation(popup.getShell().getLocation().x, popup.getShell().getLocation().y - i);
+//											try {
+//												Thread.sleep(70);
+//											} catch (InterruptedException e) {
+//												// ignore
+//											}
+//										}
 										closeJob.setSystem(runSystem);
 										closeJob.schedule(CLOSE_POPUP_DELAY);
 										popup.getShell().addShellListener(SHELL_LISTENER);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationPopup.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationPopup.java
index a105b2e98..6df5b21b1 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationPopup.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationPopup.java
@@ -154,7 +154,7 @@ public class TaskListNotificationPopup extends PopupDialog {
 		section.setTextClient(hyperlink);
 
 		form.pack();
-		return parent;
+		return form;
 	}
 
 	/**
@@ -166,7 +166,7 @@ public class TaskListNotificationPopup extends PopupDialog {
 	}
 
 	private Rectangle restoreBounds() {
-		bounds = form.getBounds();
+		bounds = getShell().getBounds();
 		Rectangle maxBounds = null;
 
 		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTipHandler.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTipHandler.java
index 76d82b674..be52b5d66 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTipHandler.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTipHandler.java
@@ -288,7 +288,6 @@ public class TaskListToolTipHandler {
 			@Override
 			public void mouseDown(MouseEvent e) {
 				hideTooltip();
-				tipWidget = null;
 			}
 		});
 
@@ -297,7 +296,11 @@ public class TaskListToolTipHandler {
 
 			@Override
 			public void mouseExit(MouseEvent e) {
-				hideTooltip();
+				// TODO can these conditions be simplified? see bug 131776
+				if (tipShell != null && !tipShell.isDisposed() && tipShell.getDisplay() != null
+						&& !tipShell.getDisplay().isDisposed() && tipShell.isVisible()) {
+					tipShell.setVisible(false);
+				}
 				tipWidget = null;
 			}
 
@@ -374,12 +377,8 @@ public class TaskListToolTipHandler {
 	}
 
 	private void hideTooltip() {
-		// TODO: can these conditions be simplified? see bug 131776
-		if (tipShell != null && !tipShell.isDisposed() && tipShell.getDisplay() != null
-				&& !tipShell.getDisplay().isDisposed() && tipShell.isVisible()) {
-//			tipShell.setVisible(false);
-			tipShell.close();
-			tipShell = null;
+		if (tipShell != null && !tipShell.isDisposed() && tipShell.isVisible()) {
+			tipShell.setVisible(false);
 		}
 	}
 
@@ -387,12 +386,20 @@ public class TaskListToolTipHandler {
 		hideTooltip();
 
 		AbstractTaskContainer element = getTaskListElement(tipWidget);
-
+		if (element == null) {
+			return;
+		}
+		
 		Shell parent = PlatformUI.getWorkbench().getDisplay().getActiveShell();
 		if (parent == null) {
 			return;
 		}
 
+		// dispose old tooltip
+		if (tipShell != null && !tipShell.isDisposed() && tipShell.getShell() != null) {
+			tipShell.close();
+		}
+
 		tipShell = new Shell(parent.getDisplay(), SWT.TOOL | SWT.NO_FOCUS | SWT.MODELESS | SWT.ON_TOP);
 		GridLayout gridLayout = new GridLayout();
 		gridLayout.numColumns = 2;
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 13c34cc30..91a231018 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
@@ -875,10 +875,8 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 		hookOpenAction();
 		contributeToActionBars();
 
-		if (!SWT.getPlatform().equals("carbon")) {
-			TaskListToolTipHandler taskListToolTipHandler = new TaskListToolTipHandler();
-			taskListToolTipHandler.activateHoverHelp(getViewer().getControl());
-		}
+		TaskListToolTipHandler taskListToolTipHandler = new TaskListToolTipHandler();
+		taskListToolTipHandler.activateHoverHelp(getViewer().getControl());
 
 		// Set to empty string to disable native tooltips (windows only?)
 		// bug#160897
@@ -1714,7 +1712,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 					.getWorkingSets()));
 			Set<IWorkingSet> tasksSets = new HashSet<IWorkingSet>(allSets);
 			for (IWorkingSet workingSet : allSets) {
-				if (!workingSet.getId().equalsIgnoreCase(TaskWorkingSetUpdater.ID_TASK_WORKING_SET)) {
+				if (workingSet.getId() == null || !workingSet.getId().equalsIgnoreCase(TaskWorkingSetUpdater.ID_TASK_WORKING_SET)) {
 					tasksSets.remove(workingSet);
 				}
 			}