diff options
| -rw-r--r-- | org.eclipse.mylyn.tasks.core/plugin.xml | 1 | ||||
| -rw-r--r-- | org.eclipse.mylyn.tasks.ui/plugin.xml | 2 | ||||
| -rw-r--r-- | org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java | 16 |
3 files changed, 12 insertions, 7 deletions
diff --git a/org.eclipse.mylyn.tasks.core/plugin.xml b/org.eclipse.mylyn.tasks.core/plugin.xml index 7e069b60b..79953cd62 100644 --- a/org.eclipse.mylyn.tasks.core/plugin.xml +++ b/org.eclipse.mylyn.tasks.core/plugin.xml @@ -3,6 +3,7 @@ <?eclipse version="3.0"?> <plugin> <extension-point id="templates" name="templates" schema="schema/templates.exsd"/> + <!-- <extension point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors"> diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml index 0b232b51f..218852049 100644 --- a/org.eclipse.mylyn.tasks.ui/plugin.xml +++ b/org.eclipse.mylyn.tasks.ui/plugin.xml @@ -5,10 +5,12 @@ <extension-point id="repositories" name="Task Repositories" schema="schema/repositories.exsd"/> <extension-point id="editors" name="Task Editors" schema="schema/editors.exsd"/> + <!-- <extension point="org.eclipse.mylar.context.core.bridges"> <contextStore class="org.eclipse.mylar.internal.tasks.ui.WorkspaceAwareContextStore"/> </extension> + --> <extension point="org.eclipse.ui.views"> <category name="Mylar" id="org.eclipse.mylar"/> diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java index 75684f0e9..1f585b77d 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java @@ -54,6 +54,7 @@ import org.eclipse.mylar.internal.tasks.ui.TaskListNotificationQueryIncoming; import org.eclipse.mylar.internal.tasks.ui.TaskListNotificationReminder; import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants; import org.eclipse.mylar.internal.tasks.ui.TaskListSynchronizationScheduler; +import org.eclipse.mylar.internal.tasks.ui.WorkspaceAwareContextStore; import org.eclipse.mylar.internal.tasks.ui.util.TaskListSaveManager; import org.eclipse.mylar.internal.tasks.ui.util.TaskListWriter; import org.eclipse.mylar.internal.tasks.ui.util.TasksUiExtensionReader; @@ -367,6 +368,9 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { super.start(context); // NOTE: Startup order is very sensitive try { + // TODO: move this back to the extension point, bug 167784 + ContextCorePlugin.setContextStore(new WorkspaceAwareContextStore()); + WebClientUtil.initCommonsLoggingSettings(); initializeDefaultPreferences(getPreferenceStore()); taskListWriter = new TaskListWriter(); @@ -383,7 +387,6 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { // NOTE: initializing extensions in start(..) has caused race // conditions previously - TasksUiExtensionReader.initStartupExtensions(taskListWriter); readOfflineReports(); for (ITaskListExternalizer externalizer : taskListWriter.getExternalizers()) { @@ -392,17 +395,17 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { } } taskRepositoryManager.readRepositories(getRepositoriesFilePath()); - taskListWriter.setTaskDataManager(offlineTaskManager); - + + // NOTE: task list must be read before Task List view can be initialized taskListManager.init(); taskListManager.addActivityListener(CONTEXT_TASK_ACTIVITY_LISTENER); taskListManager.readExistingOrCreateNewList(); initialized = true; - + PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { public void run() { - try { + try { TasksUiExtensionReader.initWorkbenchUiExtensions(); PlatformUI.getWorkbench().addWindowListener(WINDOW_LISTENER); @@ -434,8 +437,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { getPreferenceStore().addPropertyChangeListener(synchronizationScheduler); getPreferenceStore().addPropertyChangeListener(taskListManager); - // XXX: get rid of this, hack to make decorators show up - // on startup + // TODO: get rid of this, hack to make decorators show up on startup TaskRepositoriesView repositoriesView = TaskRepositoriesView.getFromActivePerspective(); if (repositoriesView != null) { repositoriesView.getViewer().refresh(); |