Misc release wrap-up fixes.

5 files changed, 11 insertions, 7 deletions

diff --git a/org.eclipse.mylyn.bugzilla.ui/plugin.xml b/org.eclipse.mylyn.bugzilla.ui/plugin.xml
index f22f771e1..bf217a622 100644
--- a/org.eclipse.mylyn.bugzilla.ui/plugin.xml
+++ b/org.eclipse.mylyn.bugzilla.ui/plugin.xml
@@ -119,7 +119,7 @@
    <extension point="org.eclipse.ui.viewActions"> 
 		<viewContribution 
 			id="org.eclipse.mylar.bugzilla.ui.tasklist.actions" 
-	   		targetID="org.eclipse.mylar.tasklist.ui.views.TaskListView">
+	   		targetID="org.eclipse.mylar.tasks.ui.views.TaskListView">
   			<action
 	            class="org.eclipse.mylar.bugzilla.ui.actions.RefreshBugzillaReportsAction"
 	            enablesFor="*"
@@ -167,7 +167,7 @@
          point="org.eclipse.ui.popupMenus">
       <viewerContribution
             id="org.eclipse.mylar.bugzilla.ui.viewerContribution1"
-            targetID="org.eclipse.mylar.tasklist.ui.views.TaskListView">
+            targetID="org.eclipse.mylar.tasks.ui.views.TaskListView">
          <action
                class="org.eclipse.mylar.bugzilla.ui.actions.CreateBugzillaTaskAction"
                enablesFor="*"
diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml
index 4e9337134..095784127 100644
--- a/org.eclipse.mylyn.tasks.ui/plugin.xml
+++ b/org.eclipse.mylyn.tasks.ui/plugin.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <plugin>
-   <extension-point id="taskListContributor" name="TaskList Contributor" schema="schema/taskListContributor.exsd"/>
+    <extension-point id="taskListContributor" name="TaskList Contributor" schema="schema/taskListContributor.exsd"/>
 
     <extension point="org.eclipse.ui.perspectiveExtensions">
           <perspectiveExtension targetID="org.eclipse.jdt.ui.JavaPerspective">
-               <viewShortcut id="org.eclipse.mylar.tasklist.ui.views.TaskListView"/>
-               <view id="org.eclipse.mylar.tasklist.ui.views.TaskListView"
+               <viewShortcut id="org.eclipse.mylar.tasks.ui.views.TaskListView"/>
+               <view id="org.eclipse.mylar.tasks.ui.views.TaskListView"
                     relative="org.eclipse.ui.views.ContentOutline"
                     relationship="top"/>
           </perspectiveExtension>
 		  <perspectiveExtension targetID="org.eclipse.jdt.ui.JavaBrowsingPerspective">
-               <viewShortcut id="org.eclipse.mylar.tasklist.ui.views.TaskListView"/>
+               <viewShortcut id="org.eclipse.mylar.tasks.ui.views.TaskListView"/>
           </perspectiveExtension>
 	</extension>
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/TaskListManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/TaskListManager.java
index c0ded66a3..95ac67606 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/TaskListManager.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/TaskListManager.java
@@ -139,6 +139,7 @@ public class TaskListManager {
     	updateTaskscapeReferenceHelper(rootTasks, prevDir);
     	
     }
+
     public void updateTaskscapeReferenceHelper(List<ITask> list, String prevDir) {
     	for (ITask task : list) {
 			if (!task.getPath().startsWith("task-")) {
@@ -166,6 +167,7 @@ public class TaskListManager {
 //			updateTaskscapeReferenceHelper(task.getChildren(), prevDir);
     	}
     }
+    
     public void setTaskListFile(File f) {
     	if (this.taskListFile.exists()) {
     		this.taskListFile.delete();
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/TaskActivateAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/TaskActivateAction.java
index 76ed0ff3c..1e9028aae 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/TaskActivateAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/TaskActivateAction.java
@@ -12,6 +12,7 @@
 package org.eclipse.mylar.tasklist.ui.actions;
 
 import org.eclipse.jface.action.Action;
+import org.eclipse.mylar.core.MylarPlugin;
 import org.eclipse.mylar.tasklist.ITask;
 import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
 
@@ -30,6 +31,7 @@ public class TaskActivateAction extends Action {
 	}
 	
 	public void run() {	
+		MylarPlugin.getContextManager().actionObserved(this, Boolean.TRUE.toString());
 		MylarTasklistPlugin.getTaskListManager().activateTask(task);
 	}
 }
\ No newline at end of file
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/TaskDeactivateAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/TaskDeactivateAction.java
index bea2b6bf9..2595b6ed9 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/TaskDeactivateAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/TaskDeactivateAction.java
@@ -35,7 +35,7 @@ public class TaskDeactivateAction extends Action {
 	}
 	
 	public void run() {
-//        MylarPlugin.getDefault().actionObserved(this);
+		MylarPlugin.getContextManager().actionObserved(this, Boolean.FALSE.toString());
         MylarTasklistPlugin.getTaskListManager().deactivateTask(task);
         IWorkbenchPage page = MylarTasklistPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();