Merge branch 'east825/IDEA-136499'
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Thu, 18 Feb 2016 16:11:32 +0000 (19:11 +0300)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Thu, 18 Feb 2016 16:11:32 +0000 (19:11 +0300)
1  2 
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskManagerImpl.java

index bc0ccb8e886cd5f0a817ff8b0f219caf79e700c5,7533b46dd3c7c66d6b88a783b943f13595569944..0e4dcbb397616ed9b5ce32018fe664662a8f48ad
@@@ -1,5 -1,5 +1,5 @@@
  /*
 - * Copyright 2000-2015 JetBrains s.r.o.
 + * Copyright 2000-2016 JetBrains s.r.o.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@@ -78,7 -78,7 +78,7 @@@ import java.util.concurrent.TimeoutExce
  @State(
    name = "TaskManager",
    storages = {
 -    @Storage(file = StoragePathMacros.WORKSPACE_FILE)
 +    @Storage(StoragePathMacros.WORKSPACE_FILE)
    }
  )
  public class TaskManagerImpl extends TaskManager implements ProjectComponent, PersistentStateComponent<TaskManagerImpl.Config>,
      if (task.isIssue()) {
        StartupManager.getInstance(myProject).runWhenProjectIsInitialized(new Runnable() {
          public void run() {
-           ProgressManager.getInstance().run(new com.intellij.openapi.progress.Task.Backgroundable(myProject, "Updating " + task.getId()) {
+           ProgressManager.getInstance().run(new com.intellij.openapi.progress.Task.Backgroundable(myProject, "Updating " + task.getPresentableId()) {
  
              public void run(@NotNull ProgressIndicator indicator) {
                updateIssue(task.getId());