From e10e30aa53745d5bbfc1e6f4016ff2c9f7e12c70 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Fri, 28 Sep 2012 11:58:17 +0400
Subject: [PATCH] EA-39203 - NPE: TaskUtil.formatTask

---
 .../src/com/intellij/openapi/vcs/changes/LocalChangeList.java | 2 +-
 .../src/com/intellij/tasks/impl/TaskManagerImpl.java          | 4 ++--
 .../tasks-core/src/com/intellij/tasks/impl/TaskUtil.java      | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/LocalChangeList.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/LocalChangeList.java
index 4337b48897d6..fbb3cfbf6302 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/LocalChangeList.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/LocalChangeList.java
@@ -55,7 +55,7 @@ public abstract class LocalChangeList implements Cloneable, ChangeList {
   @Nullable
   public abstract String getComment();
 
-  public abstract void setComment(String comment);
+  public abstract void setComment(@Nullable String comment);
 
   public abstract boolean isDefault();
 
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskManagerImpl.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskManagerImpl.java
index b37f186915ad..7a7520e6935d 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskManagerImpl.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskManagerImpl.java
@@ -360,7 +360,7 @@ public class TaskManagerImpl extends TaskManager implements ProjectComponent, Pe
 
   public String getChangelistName(Task task) {
     TaskRepository repository = task.getRepository();
-    if (repository != null) {
+    if (repository != null && myConfig.changelistNameFormat != null) {
       return TaskUtil.formatTask(task, myConfig.changelistNameFormat);
     }
     return task.getSummary();
@@ -377,7 +377,7 @@ public class TaskManagerImpl extends TaskManager implements ProjectComponent, Pe
     createChangeList(task, name, comment);
   }
 
-  public void createChangeList(LocalTask task, String name, String comment) {
+  public void createChangeList(LocalTask task, String name, @Nullable String comment) {
     LocalChangeList changeList = myChangeListManager.findChangeList(name);
     if (changeList == null) {
       myChangeListManager.removeChangeListListener(myChangeListListener);
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskUtil.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskUtil.java
index e48e04525c85..bc1ae8fd2d06 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskUtil.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskUtil.java
@@ -19,6 +19,7 @@ package com.intellij.tasks.impl;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.tasks.Task;
 import com.intellij.tasks.TaskRepository;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.text.DateFormat;
@@ -36,7 +37,7 @@ public class TaskUtil {
   private static final Pattern DATE_PATTERN = Pattern.compile("(\\d\\d\\d\\d[/-]\\d\\d[/-]\\d\\d).*(\\d\\d:\\d\\d:\\d\\d).*");
   private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
 
-  public static String formatTask(Task task, String format) {
+  public static String formatTask(@NotNull Task task, String format) {
     return format.replace("{id}", task.getId()).replace("{number}", task.getNumber())
       .replace("{project}", task.getProject()).replace("{summary}", task.getSummary());
   }