MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-39203 - NPE: TaskUtil.formatTask

Browse Source
This commit is contained in:
Dmitry Avdeev
2012-09-28 11:58:17 +04:00
parent 9a9d3360e5
commit e10e30aa53
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-api/src/com/intellij/openapi/vcs/changes/LocalChangeList.java
+1 -1
View File
@@ -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();
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskManagerImpl.java
+2 -2
View File
@@ -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);
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskUtil.java
+2 -1
View File
@@ -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());
}