Progress on: 154435: Mylar's wizard names

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

2 files changed, 19 insertions, 14 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml
index a4ed4a2d3..112f5ea49 100644
--- a/org.eclipse.mylyn.tasks.ui/plugin.xml
+++ b/org.eclipse.mylyn.tasks.ui/plugin.xml
@@ -36,31 +36,32 @@
 
     <extension point="org.eclipse.ui.newWizards">
       <wizard
-            category="org.eclipse.mylar.wizards"
-            class="org.eclipse.mylar.internal.tasks.ui.planner.TaskActivityWizard"
-            icon="icons/eview16/task-list.gif"
-            id="org.eclipse.mylar.tasklist.report.ui.planningGameWizard"
-            name="Task Activity Report (Experimental)">
-      </wizard>
-      <wizard
-            canFinishEarly="true"
+            canFinishEarly="true" 
             category="org.eclipse.mylar.wizards"
             class="org.eclipse.mylar.internal.tasks.ui.wizards.NewLocalTaskWizard"
+            hasPages="false"
             icon="icons/etool16/task-new.gif"
-            id="org.eclipse.mylar.tasklist.wizard.new.task"
-            name="New Task"/>
+            id="org.eclipse.mylar.tasks.ui.wizard.new.task"
+            name="Task"/>
 	  <wizard
             category="org.eclipse.mylar.wizards"
             class="org.eclipse.mylar.internal.tasks.ui.wizards.NewRepositoryTaskWizard"
             icon="icons/etool16/task-repository-new.gif"
-            id="org.eclipse.mylar.tasklist.wizard.new.repository.task"
-            name="New Repository Task"/>
+            id="org.eclipse.mylar.tasks.ui.wizard.new.repository.task"
+            name="Repository Task"/>
       <wizard
             category="org.eclipse.mylar.wizards"
             class="org.eclipse.mylar.internal.tasks.ui.wizards.NewQueryWizard"
             icon="icons/etool16/query-new.gif"
-            id="org.eclipse.mylar.tasklist.wizard.new.query"
-            name="New Query"/>
+            id="org.eclipse.mylar.tasks.ui.wizard.new.query"
+            name="Query"/>
+	  <wizard
+            category="org.eclipse.mylar.wizards"
+            class="org.eclipse.mylar.internal.tasks.ui.planner.TaskActivityWizard"
+            icon="icons/eview16/task-list.gif"
+            id="org.eclipse.mylar.tasks.ui.activity.report"
+            name="Task Activity Report (Experimental)">
+      </wizard> 
 	</extension>
 
   <extension
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskRepositoryManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskRepositoryManager.java
index baae1a53b..7892bc785 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskRepositoryManager.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskRepositoryManager.java
@@ -21,6 +21,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.mylar.context.core.MylarStatusHandler;
 import org.eclipse.mylar.internal.tasks.core.TaskRepositoriesExternalizer;
 import org.eclipse.mylar.tasks.core.AbstractRepositoryTask;
@@ -371,6 +372,9 @@ public class TaskRepositoryManager {
 	}
 
 	public boolean saveRepositories() {
+		if (!Platform.isRunning()) {
+			return false;
+		}
 		Set<TaskRepository> repositoriesToWrite = new HashSet<TaskRepository>(getAllRepositories());
 		// if for some reason a repository is added/changed to equal one in the
 		// orphaned set the orphan is discarded