Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkersten2008-05-16 14:31:07 -0400
committermkersten2008-05-16 14:31:07 -0400
commit2d2bfd6ec1ba6a088c517385d81c36ce7232ab83 (patch)
tree8f9f32ec831b0be23dc588786cf2002e82bdd582
parent9e857753f1207c57f3c9bb1d4208047ae25de731 (diff)
downloadorg.eclipse.mylyn.tasks-2d2bfd6ec1ba6a088c517385d81c36ce7232ab83.tar.gz
org.eclipse.mylyn.tasks-2d2bfd6ec1ba6a088c517385d81c36ce7232ab83.tar.xz
org.eclipse.mylyn.tasks-2d2bfd6ec1ba6a088c517385d81c36ce7232ab83.zip
RESOLVED - bug 215424: [sandbox] fix potential race condition in UI Usage Monitor logging and Tasks UI startup
https://bugs.eclipse.org/bugs/show_bug.cgi?id=215424
-rw-r--r--org.eclipse.mylyn.help.ui/cheatsheets/TaskFocus.xml2
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalRepositoryConnector.java6
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java3
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java2
4 files changed, 7 insertions, 6 deletions
diff --git a/org.eclipse.mylyn.help.ui/cheatsheets/TaskFocus.xml b/org.eclipse.mylyn.help.ui/cheatsheets/TaskFocus.xml
index e7ee6c9ee..6c941ff0f 100644
--- a/org.eclipse.mylyn.help.ui/cheatsheets/TaskFocus.xml
+++ b/org.eclipse.mylyn.help.ui/cheatsheets/TaskFocus.xml
@@ -18,7 +18,7 @@ You need an existing project for this sheet.
<description>
In the Task List view, click on the right mouse button, then select <b>New &gt; Category</b>. Enter <b>Tutorials</b> for the category&apos;s name.
<br/><br/>
-Then right click on the <b>Tutorials</b> category and select <b>New &gt; Task</b>. In the <b>New Task</b> dialog select <b>Local Tasks</b> then click on the <b>Finish</b> button.
+Then right click on the <b>Tutorials</b> category and select <b>New &gt; Task</b>. In the <b>New Task</b> dialog select <b>Local</b> then click on the <b>Finish</b> button.
Enter <b>Learn task-focus</b> for the task&apos;s title and change the priority to <b>High</b>. You can add some notes, too.
<br/><br/>
Right click on the new task and select <b>Activate</b> to activate the task.
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalRepositoryConnector.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalRepositoryConnector.java
index c3fe15702..65de9f2c4 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalRepositoryConnector.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalRepositoryConnector.java
@@ -26,7 +26,7 @@ import org.eclipse.mylyn.tasks.core.sync.ISynchronizationContext;
*/
public class LocalRepositoryConnector extends AbstractLegacyRepositoryConnector {
- public static final String REPOSITORY_LABEL = "Local Tasks";
+ public static final String REPOSITORY_LABEL = "Local";
public static final String CONNECTOR_KIND = "local";
@@ -92,8 +92,8 @@ public class LocalRepositoryConnector extends AbstractLegacyRepositoryConnector
}
@Override
- public IStatus performQuery(TaskRepository repository, IRepositoryQuery query,
- TaskDataCollector resultCollector, ISynchronizationContext event, IProgressMonitor monitor) {
+ public IStatus performQuery(TaskRepository repository, IRepositoryQuery query, TaskDataCollector resultCollector,
+ ISynchronizationContext event, IProgressMonitor monitor) {
// ignore
return null;
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
index 91cceadeb..c41980cae 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
@@ -626,7 +626,8 @@ public class TasksUiPlugin extends AbstractUIPlugin {
private void loadTemplateRepositories() {
// Add standard local task repository
- getLocalTaskRepository();
+ TaskRepository localRepository = getLocalTaskRepository();
+ localRepository.setRepositoryLabel(LocalRepositoryConnector.REPOSITORY_LABEL);
// Add the automatically created templates
for (AbstractRepositoryConnector connector : repositoryManager.getRepositoryConnectors()) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java
index 2e6d24734..c6666c37a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java
@@ -334,7 +334,7 @@ public class TasksUiUtil {
final IWizard wizard;
List<TaskRepository> repositories = TasksUi.getRepositoryManager().getAllRepositories();
if (taskRepository == null && repositories.size() == 1) {
- // only the Local Tasks connector is available
+ // only the Local repository connector is available
taskRepository = repositories.get(0);
}

Back to the top