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

Merge branch 'master' of git.labs.intellij.net:idea/community

Browse Source
This commit is contained in:
Bas Leijdekkers
2012-02-28 11:48:55 +01:00
parent f1eec242b7 cc62d087be
commit ed7dfc64ec
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/tasks/tasks-api/src/com/intellij/tasks/LocalTask.java
+2
View File
@@ -44,4 +44,6 @@ public abstract class LocalTask extends Task {
public boolean isDefault() {
return false;
}
public abstract void setAssociatedChangelistId(String associatedChangelistId);
}
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/CreateChangelistAction.java
+2 -2
View File
@@ -19,8 +19,8 @@ package com.intellij.tasks.actions;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.Presentation;
import com.intellij.openapi.ui.Messages;
import com.intellij.tasks.LocalTask;
import com.intellij.tasks.TaskManager;
import com.intellij.tasks.Task;
import com.intellij.tasks.impl.TaskManagerImpl;
import com.intellij.tasks.impl.TaskUtil;
@@ -45,7 +45,7 @@ public class CreateChangelistAction extends BaseTaskAction {
@Override
public void actionPerformed(AnActionEvent e) {
Task activeTask = getActiveTask(e);
LocalTask activeTask = getActiveTask(e);
String name = Messages.showInputDialog(getProject(e), "Changelist name:", "Create Changelist", null, TaskUtil.getChangeListName(activeTask), null);
if (name != null) {
TaskManagerImpl manager = (TaskManagerImpl)getTaskManager(e);
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/LocalTaskImpl.java
+1
View File
@@ -196,6 +196,7 @@ public class LocalTaskImpl extends LocalTask {
myChangeLists = changeLists;
}
@Override
public void setAssociatedChangelistId(String associatedChangelistId) {
myAssociatedChangelistId = associatedChangelistId;
}
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskManagerImpl.java
+4 -3
View File
@@ -310,7 +310,7 @@ public class TaskManagerImpl extends TaskManager implements ProjectComponent, Pe
}
myContextManager.restoreContext(origin);
final Task task = doActivate(origin, true);
final LocalTask task = doActivate(origin, true);
if (isVcsEnabled()) {
List<ChangeListInfo> changeLists = getOpenChangelists(task);
@@ -340,17 +340,18 @@ public class TaskManagerImpl extends TaskManager implements ProjectComponent, Pe
myActiveTask.setUpdated(new Date());
}
public void createChangeList(Task task, String name) {
public void createChangeList(LocalTask task, String name) {
String comment = TaskUtil.getChangeListComment(this, task);
createChangeList(task, name, comment);
}
public void createChangeList(Task task, String name, String comment) {
public void createChangeList(LocalTask task, String name, String comment) {
LocalChangeList changeList = myChangeListManager.findChangeList(name);
if (changeList == null) {
changeList = myChangeListManager.addChangeList(name, comment);
}
myChangeListManager.setDefaultChangeList(changeList);
task.setAssociatedChangelistId(changeList.getId());
getOpenChangelists(task).add(new ChangeListInfo(changeList));
}